Merge pull request #13 from SuperFlyTV/fix/casparcg-2.4

feat: add setting to choose process stdin encoding

src/main/index.js

@@ -65,13 +65,15 @@ if (configVersion < 1) {
     args: config.get('args.casparcg', ''),
     health: config.get('health.casparcg', true) ? 'casparcg' : undefined,
     autoStart: true,
+    sendCommands: 'utf16le',
   })
   processes.push({
     id: 'scanner',
     name: 'Media Scanner',
     exeName: 'scanner.exe',
     args: config.get('args.media-scanner', ''),
     autoStart: true,
+    sendCommands: undefined,
   })
 
   if (config.store.exe) {
@@ -93,6 +95,21 @@ if (configVersion < 1) {
   config.delete('exe')
   config.delete('health')
 }
+if (configVersion < 2) {
+  const processes = config.get('processes')
+  for (let process of processes) {
+    if (!('sendCommands' in process)) {
+      if (process.id === 'scanner') {
+        process.sendCommands = undefined
+      } else {
+        process.sendCommands = 'utf8'
+      }
+    }
+  }
+
+  config.set('processes', processes)
+  config.set('version', 2)
+}
 
 let mainWindow
 const winURL = !isProduction ? `http://localhost:9080` : `file://${__dirname}/index.html`

src/main/process.js

@@ -39,6 +39,8 @@ export class ProcessMonitor {
 
     this.logFile = !!this.config.logMode
 
+    this.pipeStatus(this.currentStatus) // update showSendCommand
+
     if (changed) {
       if (this.healthMon) {
         this.healthMon.stop()
@@ -175,8 +177,8 @@ export class ProcessMonitor {
   }
 
   sendCommand(command) {
-    if (this.process) {
-      this.process.write(command)
+    if (this.process && this.config.sendCommands) {
+      this.process.write(command, this.config.sendCommands)
     }
   }
 
@@ -212,7 +214,14 @@ export class ProcessMonitor {
   }
   pipeStatus(status) {
     this.currentStatus = status
-    this.ipcWrapper.send('process.status', JSON.stringify({ id: this.id, status: status }))
+    this.ipcWrapper.send(
+      'process.status',
+      JSON.stringify({
+        id: this.id,
+        status: status,
+        showCommandSend: !!this.config.sendCommands,
+      })
+    )
   }
 
   ensureLogFileHandleCorrect() {

src/main/respawn/index.js

@@ -194,9 +194,9 @@ Monitor.prototype.start = function () {
   if (this.status === 'running') this.emit('start')
 }
 
-Monitor.prototype.write = function (command) {
+Monitor.prototype.write = function (command, encoding) {
   if (this.status === 'running' && this.child && this.child.stdin) {
-    this.child.stdin.write(command + '\n')
+    this.child.stdin.write(command + '\n', encoding)
   }
 }
 

src/renderer/components/ProcessTab.vue

@@ -11,7 +11,7 @@
             {{ l.content }}
           </li>
         </ul>
-        <b-form ref="commandForm" @submit.prevent="onSubmit">
+        <b-form ref="commandForm" @submit.prevent="onSubmit" v-bind:class="{ hidden: !data.showCommandSend }">
           <b-input-group>
             <b-form-input placeholder="Enter a command" id="command"></b-form-input>
             <b-button type="submit">Send</b-button>
@@ -103,4 +103,8 @@ export default {
 #log-panel li.log.warning {
   color: orange;
 }
+
+.hidden {
+  display: none;
+}
 </style>

src/renderer/components/Settings.vue

@@ -34,6 +34,7 @@
                 { key: 'exeName', label: 'Executable' },
                 { key: 'args', label: 'Arguments' },
                 { key: 'health', label: 'Health Check' },
+                { key: 'sendCommands', label: 'Send Commands' },
                 { key: 'log', label: 'Save log' },
                 { key: 'start', label: 'Auto start' },
                 'actions',
@@ -70,6 +71,14 @@
                   class="mb-3"
                 />
               </template>
+              <template #cell(sendCommands)="data">
+                <b-form-select
+                  :id="'sendCommands' + data.index"
+                  v-model="config.processes[data.index].sendCommands"
+                  :options="sendCommandsOptions"
+                  class="mb-3"
+                />
+              </template>
               <template #cell(log)="data">
                 <b-form-checkbox :id="'processLog' + data.index" v-model="config.processes[data.index].logMode" />
               </template>
@@ -169,6 +178,11 @@ export default {
         { value: undefined, text: 'None' },
         { value: 'casparcg', text: 'CasparCG Ping' },
       ],
+      sendCommandsOptions: [
+        { value: undefined, text: 'Disabled' },
+        { value: 'utf8', text: 'Generic process' },
+        { value: 'utf16le', text: 'CasparCG 2.4+' },
+      ],
       config: {
         api: {
           staticPaths: [],

src/renderer/store/modules/Process.js

@@ -7,6 +7,7 @@ function ensureStateExists(state, id) {
     state[id] = {
       log: [],
       status: 'unknown',
+      showCommandSend: false,
     }
   }
 }
@@ -31,10 +32,11 @@ const mutations = {
     state[id].log.splice(0)
   },
 
-  SET_STATUS(state, { id, status }) {
+  SET_STATUS(state, { id, status, showCommandSend }) {
     ensureStateExists(state, id)
 
     state[id].status = status
+    state[id].showCommandSend = showCommandSend
   },
 }