Release 1.13.15

Author: janjongboom

cli/daemon.ts

@@ -22,6 +22,7 @@ import { EventEmitter } from "tsee";
 import { getCliVersion, initCliApp, setupCliApp } from './init-cli-app';
 import { Mutex } from 'async-mutex';
 import WebSocket from 'ws';
+import encodeLabel from '../shared/encoding';
 
 const TCP_PREFIX = '\x1b[32m[WS ]\x1b[0m';
 const SERIAL_PREFIX = '\x1b[33m[SER]\x1b[0m';
@@ -34,6 +35,8 @@ const apiKeyArgvIx = process.argv.indexOf('--api-key');
 const apiKeyArgv = apiKeyArgvIx !== -1 ? process.argv[apiKeyArgvIx + 1] : undefined;
 const baudRateArgvIx = process.argv.indexOf('--baud-rate');
 const baudRateArgv = baudRateArgvIx !== -1 ? process.argv[baudRateArgvIx + 1] : undefined;
+const whichDeviceArgvIx = process.argv.indexOf('--which-device');
+const whichDeviceArgv = whichDeviceArgvIx !== -1 ? Number(process.argv[whichDeviceArgvIx + 1]) : undefined;
 
 let configFactory: Config;
 let serial: SerialConnector | undefined;
@@ -53,7 +56,7 @@ const cliOptions = {
 };
 
 class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
-    snapshot: (buffer: Buffer) => void
+    snapshot: (buffer: Buffer, filename: string) => void
 }>) implements RemoteMgmtDevice  {
     private _config: EdgeImpulseConfig;
     private _serial: SerialConnector;
@@ -116,6 +119,10 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
         return this._deviceConfig.snapshot.supportsStreaming;
     }
 
+    supportsSnapshotStreamingWhileCapturing() {
+        return false;
+    }
+
     async stopSnapshotStreamFromSignal() {
         if (!this._waitingForSnapshotToStart && !this._snapshotStream) {
             return;
@@ -211,7 +218,7 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
                         height: height,
                     }, 80);
 
-                    this.emit('snapshot', jpegImageData.data);
+                    this.emit('snapshot', jpegImageData.data, '');
                     this._lastSnapshot = new Date();
                 }
             }
@@ -350,11 +357,12 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
 
             let headers: { [k: string]: string} = {
                 'x-api-key': this._deviceConfig.upload.apiKey,
-                'x-file-name': filename,
+                'x-file-name': encodeLabel(filename),
                 'Content-Type': (!processed.attachments ? processed.contentType : 'multipart/form-data'),
                 'Connection': 'keep-alive'
             };
-            headers['x-label'] = s.label;
+
+            headers['x-label'] = encodeLabel(s.label);
 
             let url = this._config.endpoints.internal.ingestion + s.path;
             console.log(SERIAL_PREFIX, 'Uploading to', url);
@@ -427,8 +435,8 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
                         await request.post(url, {
                             headers: {
                                 'x-api-key': this._deviceConfig.upload.apiKey,
-                                'x-file-name': deviceResponse.filename,
-                                'x-label': dr.label,
+                                'x-file-name': encodeLabel(deviceResponse.filename),
+                                'x-label': encodeLabel(dr.label),
                                 'Content-Type': 'application/octet-stream'
                             },
                             body: deviceResponse.file,
@@ -439,7 +447,7 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
                         await request.post(url, {
                             headers: {
                                 'x-api-key': this._deviceConfig.upload.apiKey,
-                                'x-file-name': deviceResponse.filename,
+                                'x-file-name': encodeLabel(deviceResponse.filename),
                                 'Content-Type': 'application/cbor'
                             },
                             body: deviceResponse.file,
@@ -482,7 +490,7 @@ class SerialDevice extends (EventEmitter as new () => TypedEmitter<{
         console.log('    Ingestion:', config.endpoints.internal.ingestion);
         console.log('');
 
-        let deviceId = await findSerial();
+        let deviceId = await findSerial(whichDeviceArgv);
         await connectToSerial(config, deviceId, baudRate, (cleanArgv || apiKeyArgv) ? true : false);
     }
     catch (ex) {

cli/data-forwarder.ts

@@ -16,6 +16,7 @@ import { Config, EdgeImpulseConfig } from './config';
 import { findSerial } from './find-serial';
 import crypto from 'crypto';
 import { getCliVersion, initCliApp, setupCliApp } from './init-cli-app';
+import encodeLabel from '../shared/encoding';
 
 const TCP_PREFIX = '\x1b[32m[WS ]\x1b[0m';
 const SERIAL_PREFIX = '\x1b[33m[SER]\x1b[0m';
@@ -30,6 +31,8 @@ const frequencyArgvIx = process.argv.indexOf('--frequency');
 const frequencyArgv = frequencyArgvIx !== -1 ? Number(process.argv[frequencyArgvIx + 1]) : undefined;
 const baudRateArgvIx = process.argv.indexOf('--baud-rate');
 const baudRateArgv = baudRateArgvIx !== -1 ? process.argv[baudRateArgvIx + 1] : undefined;
+const whichDeviceArgvIx = process.argv.indexOf('--which-device');
+const whichDeviceArgv = whichDeviceArgvIx !== -1 ? Number(process.argv[whichDeviceArgvIx + 1]) : undefined;
 
 const cliOptions = {
     appName: 'Edge Impulse data forwarder',
@@ -75,7 +78,7 @@ let configFactory: Config;
         console.log('    Ingestion:', config.endpoints.internal.ingestion);
         console.log('');
 
-        let serialPath = await findSerial();
+        let serialPath = await findSerial(whichDeviceArgv);
         await connectToSerial(config, serialPath, baudRate, (cleanArgv || apiKeyArgv) ? true : false);
     }
     catch (ex) {
@@ -385,8 +388,8 @@ async function connectToSerial(eiConfig: EdgeImpulseConfig, serialPath: string,
                     await request.post(eiConfig.endpoints.internal.ingestion + s.path, {
                         headers: {
                             'x-api-key': dataForwarderConfig.apiKey,
-                            'x-file-name': s.label + '.json',
-                            'x-label': s.label,
+                            'x-file-name': encodeLabel(s.label + '.json'),
+                            'x-label': encodeLabel(s.label),
                             'Content-Type': 'application/json'
                         },
                         body: encoded,

cli/eta-flash-tool/flashtool.ts

@@ -57,7 +57,7 @@ let configFactory = new Config();
             /* noop */
         }
 
-        let deviceId = await findSerial();
+        let deviceId = await findSerial(undefined);
         await connectToSerial(deviceId);
     }
     catch (ex) {

cli/find-serial.ts

@@ -7,7 +7,7 @@ function sleep(ms: number) {
     return new Promise((res) => setTimeout(res, ms));
 }
 
-export async function findSerial() {
+export async function findSerial(whichDeviceIndex: number | undefined) {
     let filteredDevices;
     while (1) {
         let allDevices = await SerialConnector.list();
@@ -39,6 +39,13 @@ export async function findSerial() {
     let deviceId = filteredDevices[0].path;
 
     if (filteredDevices.length > 1) {
+        if (typeof whichDeviceIndex === 'number') {
+            if (!filteredDevices[whichDeviceIndex]) {
+                throw new Error('--which-device index was not found');
+            }
+            return filteredDevices[whichDeviceIndex].path;
+        }
+
         let deviceRes = <{ device: string }>await inquirer.prompt([{
             type: 'list',
             choices: filteredDevices.map(d => ({

cli/himax-flash-tool/flashtool.ts

@@ -57,7 +57,7 @@ let configFactory = new Config();
             /* noop */
         }
 
-        let deviceId = await findSerial();
+        let deviceId = await findSerial(undefined);
         await connectToSerial(deviceId);
     }
     catch (ex) {