From 2636531f6490a7e9fce680c94c5027abe10363ac Mon Sep 17 00:00:00 2001
From: codecolorist <codecolorist@gmail.com>
Date: Tue, 7 Aug 2018 19:42:41 +0800
Subject: [PATCH] now you can display syslog

---
 app.js                         | 39 +++++++++++++++++-----------------
 bin/cli.js                     | 32 +++++++++++++++++++++++++++-
 gui/src/views/Inspect.vue      |  3 +++
 gui/src/views/tabs/Console.vue |  6 +++++-
 gui/src/vuex/mods/console.js   |  5 +++++
 gui/src/vuex/types.js          |  3 +++
 lib/config.js                  |  4 ++++
 lib/rpc.js                     | 12 ++++++-----
 scripts/dev-all.js             |  2 +-
 9 files changed, 78 insertions(+), 28 deletions(-)
 create mode 100644 lib/config.js

diff --git a/app.js b/app.js
index c234249..a83e58c 100644
--- a/app.js
+++ b/app.js
@@ -54,10 +54,6 @@ router
     ctx.body = { status: 'ok', pid }
   })
 
-const port = parseInt(process.env.PORT, 10) || 31337
-const host = process.env.HOST || 'localhost'
-
-
 app
   .use(compress({
     filter(contentType) {
@@ -97,21 +93,24 @@ if (process.env.NODE_ENV === 'development') {
   app.use(logger())
 }
 
-console.info(`listening on http://${host}:${port}`.green)
-const server = http.createServer(app.callback())
-channels.attach(server)
-server.listen(port, host)
-
-
-process.on('unhandledRejection', (err) => {
-  console.error('An unhandledRejection occurred: ')
-  console.error(`Rejection: ${err}`)
-  console.error(err.stack)
-
-  channels.broadcast('unhandledRejection', {
-    err: err.toString(),
-    stack: err.stack,
+function start({ host, port }) {
+  console.info(`listening on http://${host}:${port}`.green)
+  const server = http.createServer(app.callback())
+  channels.attach(server)
+  server.listen(port, host)
+  process.on('unhandledRejection', (err) => {
+    console.error('An unhandledRejection occurred: '.red)
+    console.error(`Rejection: ${err}`.red)
+    console.error(err.stack)
+
+    channels.broadcast('unhandledRejection', {
+      err: err.toString(),
+      stack: err.stack,
+    })
   })
-})
+}
 
-module.exports = app
+module.exports = {
+  app,
+  start,
+}
diff --git a/bin/cli.js b/bin/cli.js
index e02eb4a..91874c8 100755
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -1,3 +1,33 @@
 #!/usr/bin/env node
+const net = require('net')
 
-require('../app.js')
+const app = require('../app')
+const config = require('../lib/config')
+
+function usage() {
+  console.log('usage: passionfruit {server|syslog}')
+  process.exit(-1)
+}
+
+function syslog() {
+  const port = parseInt(process.argv[3], 10)
+  if (Number.isNaN(port))
+    console.log('usage: passionfruit console [port]')
+
+  net.connect({ host: 'localhost', port })
+    .on('end', () => process.exit(0))
+    .pipe(process.stdout)
+}
+
+function main() {
+  if (process.argv.length > 2) {
+    const action = process.argv[2].toLowerCase()
+    if (action === 'syslog')
+      return syslog()
+    if (action !== 'server')
+      return usage()
+  }
+  return app.start(config)
+}
+
+main()
diff --git a/gui/src/views/Inspect.vue b/gui/src/views/Inspect.vue
index 0895260..1f6abb6 100644
--- a/gui/src/views/Inspect.vue
+++ b/gui/src/views/Inspect.vue
@@ -135,6 +135,7 @@ import { mapGetters, mapActions, mapMutations } from 'vuex'
 import { AsyncSearch, debounce } from '~/lib/utils'
 import {
   GET_SOCKET, STORE_SOCKET,
+  STORE_SYSLOG_SERVER_PORT,
   CONSOLE_UNREAD, CONSOLE_APPEND, CONSOLE_CLEAR,
   DOWNLOADING, PROGRESS,
   ALL_HOOKS, DELETE_HOOK,
@@ -202,6 +203,7 @@ export default {
             this.$toast.open(`an exception has occured: ${err}`)
           }
         })
+        .on('syslog-port', this.setSyslogServerPort)
         .on('console', this.consoleAppend)
         .on('app', ({ app, device }) => {
           this.device = device 
@@ -241,6 +243,7 @@ export default {
     }),
     ...mapMutations({
       storeSocket: STORE_SOCKET,
+      setSyslogServerPort: STORE_SYSLOG_SERVER_PORT,
       consoleAppend: CONSOLE_APPEND,
       consoleClear: CONSOLE_CLEAR,
     })
diff --git a/gui/src/views/tabs/Console.vue b/gui/src/views/tabs/Console.vue
index 7bccf02..49746f8 100644
--- a/gui/src/views/tabs/Console.vue
+++ b/gui/src/views/tabs/Console.vue
@@ -10,6 +10,9 @@
           <span>Clear</span>
         </button>
       </p>
+      <p class="control">Use
+        <code>nc localhost {{ port }}</code> or
+        <code>passionfruit syslog {{ port }}</code> in terminal to view NSLog</p>
     </b-field>
     <ul class="console">
       <li v-for="(item, i) in list" :key="i">
@@ -51,7 +54,7 @@
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import {
-  CONSOLE_ACTIVE, CONSOLE_CLEAR,
+  CONSOLE_ACTIVE, CONSOLE_CLEAR, GET_SYSLOG_SERVER_PORT,
   CONSOLE_LIST, CONSOLE_UNREAD, CONSOLE_RUNNING
 } from '~/vuex/types'
 
@@ -66,6 +69,7 @@ export default {
       }
     },
     ...mapGetters({
+      port: GET_SYSLOG_SERVER_PORT,
       list: CONSOLE_LIST,
       unread: CONSOLE_UNREAD,
     })
diff --git a/gui/src/vuex/mods/console.js b/gui/src/vuex/mods/console.js
index 36aadd5..65b2e61 100644
--- a/gui/src/vuex/mods/console.js
+++ b/gui/src/vuex/mods/console.js
@@ -7,9 +7,13 @@ export const state = {
   unread: 0,
   active: false,
   logging: true,
+  syslogServerPort: 0,
 }
 
 export const mutations = {
+  [types.STORE_SYSLOG_SERVER_PORT](state, port) {
+    state.syslogServerPort = port
+  },
   [types.CONSOLE_RUNNING](state, on) {
     state.logging = on
   },
@@ -40,4 +44,5 @@ export const getters = {
   [types.CONSOLE_LIST]: state => state.list,
   [types.CONSOLE_UNREAD]: state => state.unread,
   [types.CONSOLE_RUNNING]: state => state.loggine,
+  [types.GET_SYSLOG_SERVER_PORT]: state => state.syslogServerPort,
 }
\ No newline at end of file
diff --git a/gui/src/vuex/types.js b/gui/src/vuex/types.js
index d676ae9..cedad69 100644
--- a/gui/src/vuex/types.js
+++ b/gui/src/vuex/types.js
@@ -53,3 +53,6 @@ export const SET_DOWNLOAD_TOTAL = 'SET_DOWNLOAD_TOTAL'
 export const UPDATE_BYTES = 'UPDATE_BYTES'
 export const DOWNLOAD_TOTAL_SIZE = 'DOWNLOAD_TOTAL_SIZE'
 export const DOWNLOADED_SIZE = 'DOWNLOADED_SIZE'
+
+export const STORE_SYSLOG_SERVER_PORT = 'STORE_SYSLOG_SERVER_PORT'
+export const GET_SYSLOG_SERVER_PORT = 'GET_SYSLOG_SERVER_PORT'
\ No newline at end of file
diff --git a/lib/config.js b/lib/config.js
new file mode 100644
index 0000000..e159bb1
--- /dev/null
+++ b/lib/config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  port: parseInt(process.env.PORT, 10) || 31337,
+  host: process.env.HOST || 'localhost',
+}
diff --git a/lib/rpc.js b/lib/rpc.js
index 043493a..3c038f9 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -91,7 +91,7 @@ class RpcHandler extends Handler {
       this.syslogClients.add(client)
       console.log(`new client ${ip}`)
       const writable = new BannerStream({ socket: client })
-      fs.createReadStream(this.syslogFile).pipe(writable)
+      fs.createReadStream(this.syslogFile).on('error', () => {}).pipe(writable)
       client.on('end', () => {
         console.log(`client ${ip} disconnected`)
         this.syslogClients.delete(client)
@@ -100,8 +100,9 @@ class RpcHandler extends Handler {
     this.syslogServer = server
     return new Promise((resolve, reject) => {
       server.listen({ host: 'localhost', port: 0 }, () => {
-        console.log(`nc localhost ${server.address().port}`.yellow)
-        resolve()
+        const serverPort = server.address().port
+        console.log(`nc localhost ${serverPort}`.yellow)
+        resolve(serverPort)
       }).on('error', reject)
     })
   }
@@ -112,7 +113,8 @@ class RpcHandler extends Handler {
     script.destroyed.connect(() => {
       socket.emit('script_destroyed')
       socket.disconnect(true)
-      this.syslogClients.forEach(client => client.close())
+      this.syslogClients.forEach(client => client.end('process has been terminated'.gray))
+      this.syslogServer.close()
     })
     script.message.connect((message, data) => {
       const mapping = {
@@ -130,7 +132,7 @@ class RpcHandler extends Handler {
     this.script = script
     this.agent = script.exports
 
-    await this.createSysLogServer()
+    this.socket.emit('syslog-port', await this.createSysLogServer())
   }
 
   handleSend({ payload }, data) {
diff --git a/scripts/dev-all.js b/scripts/dev-all.js
index cada809..88d4376 100755
--- a/scripts/dev-all.js
+++ b/scripts/dev-all.js
@@ -15,7 +15,7 @@ compile.run(true)
 const TAG_SERVER = '[Server]'.magenta
 
 nodemon({
-  script: 'app.js',
+  script: 'bin/cli.js',
   ext: 'js json',
   watch: ['lib', 'app.js', 'scripts'],
 })