@signalk/streams 6.0.0 → 6.2.0

package/dist/mdns-ws.d.ts

@@ -16,6 +16,7 @@ interface MdnsWsOptions {
     type?: string;
     subscription?: string;
     selfHandling?: string;
+    token?: string;
     remoteSelf?: string;
     ignoreServers?: string[];
     selfsignedcert?: boolean;
@@ -29,8 +30,12 @@ export default class MdnsWs extends Transform {
     private readonly dataDebug;
     private handleContext;
     private signalkClient?;
+    private fetchedMetaPaths;
     constructor(options: MdnsWsOptions);
+    private verifyRemoteToken;
+    private setProviderStatus;
     private connectClient;
+    private fetchMetaIfNeeded;
     _transform(chunk: unknown, encoding: BufferEncoding, done: TransformCallback): void;
 }
 export {};

package/dist/mdns-ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mdns-ws.d.ts","sourceRoot":"","sources":["../src/mdns-ws.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,OAAO,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAElD,UAAU,aAAa;IACrB,GAAG,EAAE;QACH,MAAM,EAAE;YACN,mBAAmB,IAAI,MAAM,CAAA;YAC7B,eAAe,IAAI,MAAM,CAAA;SAC1B,CAAA;QACD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAOD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,aAAa,CAAC,CAAQ;gBAElB,OAAO,EAAE,aAAa;IAuDlC,OAAO,CAAC,aAAa;IA8ErB,UAAU,CACR,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;CAGR"}
+{"version":3,"file":"mdns-ws.d.ts","sourceRoot":"","sources":["../src/mdns-ws.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAKrD,OAAO,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAElD,UAAU,aAAa;IACrB,GAAG,EAAE;QACH,MAAM,EAAE;YACN,mBAAmB,IAAI,MAAM,CAAA;YAC7B,eAAe,IAAI,MAAM,CAAA;SAC1B,CAAA;QACD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAOD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,aAAa,CAAC,CAAQ;IAC9B,OAAO,CAAC,gBAAgB,CAAoB;gBAEhC,OAAO,EAAE,aAAa;IAuDlC,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,aAAa;IAmIrB,OAAO,CAAC,iBAAiB;IA0BzB,UAAU,CACR,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;CAGR"}

package/dist/mdns-ws.js

@@ -14,9 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = require("stream");
+const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
 const client_1 = require("@signalk/client");
+const signalk_schema_1 = require("@signalk/signalk-schema");
 class MdnsWs extends stream_1.Transform {
     options;
     selfHost;
@@ -26,6 +32,7 @@ class MdnsWs extends stream_1.Transform {
     dataDebug;
     handleContext;
     signalkClient;
+    fetchedMetaPaths = new Set();
     constructor(options) {
         super({ objectMode: true });
         this.options = options;
@@ -74,13 +81,64 @@ class MdnsWs extends stream_1.Transform {
             this.options.app.setProviderError(this.options.providerId, 'This connection is deprecated and must be deleted');
         }
     }
+    verifyRemoteToken() {
+        const protocol = this.options.type === 'wss' ? https_1.default : http_1.default;
+        return new Promise((resolve, reject) => {
+            const reqOptions = {
+                hostname: this.options.host,
+                port: this.options.port,
+                path: '/signalk/v1/api/self',
+                method: 'GET',
+                headers: {
+                    Authorization: `JWT ${this.options.token}`
+                },
+                rejectUnauthorized: !(this.options.selfsignedcert === true)
+            };
+            const req = protocol.request(reqOptions, (response) => {
+                response.resume();
+                resolve(response.statusCode === 200);
+            });
+            req.on('error', (err) => reject(err));
+            req.setTimeout(10000, () => {
+                req.destroy(new Error('Token verification timed out'));
+            });
+            req.end();
+        });
+    }
+    setProviderStatus(message, isError) {
+        if (!isError) {
+            this.options.app.setProviderStatus(this.options.providerId, message);
+        }
+        else {
+            this.options.app.setProviderError(this.options.providerId, message);
+        }
+    }
     connectClient(client) {
+        this.fetchedMetaPaths.clear();
         client
             .connect()
             .then(() => {
             this.options.app.setProviderStatus(this.options.providerId, `ws connection connected to ${client.options.hostname}:${client.options.port}`);
             console.log(`ws connection connected to ${client.options.hostname}:${client.options.port}`);
-            if (this.options.selfHandling === 'useRemoteSelf') {
+            if (this.options.token) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const conn = client.connection;
+                conn.send(JSON.stringify({ token: this.options.token }));
+                conn.setAuthenticated(this.options.token, 'JWT');
+                this.debug('Sent authentication token to remote server');
+                this.verifyRemoteToken()
+                    .then((isValid) => {
+                    if (!isValid) {
+                        this.setProviderStatus(`Authentication failed for ${client.options.hostname}:${client.options.port} — token may be invalid or revoked`, true);
+                        conn.disconnect();
+                    }
+                })
+                    .catch((err) => {
+                    this.debug('Token verification error: ' + err.message);
+                });
+            }
+            if (this.options.selfHandling !== 'manualSelf' &&
+                this.options.selfHandling !== 'noSelf') {
                 client
                     .API()
                     .then((api) => api.get('/self'))
@@ -135,6 +193,48 @@ class MdnsWs extends stream_1.Transform {
                 });
             }
             this.push(data);
+            if (data?.updates) {
+                for (const update of data.updates) {
+                    const values = update.values;
+                    if (values) {
+                        for (const pv of values) {
+                            if (!this.fetchedMetaPaths.has(pv.path)) {
+                                this.fetchedMetaPaths.add(pv.path);
+                                this.fetchMetaIfNeeded(client, data.context, pv.path);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        client.on('disconnect', () => {
+            const hint = this.options.token
+                ? ' — check that the token is valid on the remote server'
+                : ' — the remote server may require authentication';
+            this.setProviderStatus(`Disconnected from ${client.options.hostname}:${client.options.port}${hint}`, true);
+        });
+        client.on('error', (err) => {
+            this.setProviderStatus(`Connection error: ${err.message}`, true);
+        });
+    }
+    fetchMetaIfNeeded(client, context, path) {
+        if ((0, signalk_schema_1.getMetadata)('vessels.self.' + path)) {
+            return;
+        }
+        client
+            .API()
+            .then((api) => api.getMeta(`/vessels/self/${path.replace(/\./g, '/')}`))
+            .then((meta) => {
+            if (meta) {
+                this.debug(`fetched meta for ${path} from remote`);
+                this.push({
+                    context,
+                    updates: [{ meta: [{ path, value: meta }] }]
+                });
+            }
+        })
+            .catch((err) => {
+            this.debug(`failed to fetch meta for ${path}: ${err.message}`);
         });
     }
     _transform(chunk, encoding, done) {

package/dist/serialport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialport.d.ts","sourceRoot":"","sources":["../src/serialport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC7C,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;QACrD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,MAAM,CAA+C;IAC7D,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,gBAAgB,CAA6C;gBAEzD,OAAO,EAAE,mBAAmB;IAqDxC,KAAK,IAAI,IAAI;IAwDb,GAAG,IAAI,IAAI;IAWX,UAAU,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;IAKP,OAAO,CAAC,iBAAiB;CAS1B"}
+{"version":3,"file":"serialport.d.ts","sourceRoot":"","sources":["../src/serialport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC7C,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;QACrD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,MAAM,CAA+C;IAC7D,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,gBAAgB,CAA6C;gBAEzD,OAAO,EAAE,mBAAmB;IAyDxC,KAAK,IAAI,IAAI;IAwDb,GAAG,IAAI,IAAI;IAWX,UAAU,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;IAKP,OAAO,CAAC,iBAAiB;CAS1B"}

package/dist/serialport.js

@@ -28,29 +28,33 @@ class SerialStream extends stream_1.Transform {
             : [this.options.toStdout].filter(Boolean);
         const standardOutEventName = `serial-${this.options.providerId}-toStdout`;
         stdOutEvents.push(standardOutEventName);
-        const onDrain = () => {
-            pendingWrites--;
-        };
         for (const event of stdOutEvents) {
             this.options.app.on(event, (d) => {
+                if (!this.serial) {
+                    return;
+                }
                 if (pendingWrites > this.maxPendingWrites) {
                     this.debug('Buffer overflow, not writing:' + d);
                     return;
                 }
                 this.debug('Writing:' + d);
-                if (Buffer.isBuffer(d)) {
-                    this.serial?.write(d);
-                }
-                else {
-                    this.serial?.write(d + '\r\n');
-                }
+                const data = Buffer.isBuffer(d) ? d : d + '\r\n';
+                const flushed = this.serial.write(data, (err) => {
+                    if (err) {
+                        this.debug('Write error: ' + err.message);
+                    }
+                });
                 setImmediate(() => {
                     this.options.app.emit('connectionwrite', {
                         providerId: this.options.providerId
                     });
                 });
-                pendingWrites++;
-                this.serial?.drain(onDrain);
+                if (!flushed) {
+                    pendingWrites++;
+                    this.serial.once('drain', () => {
+                        pendingWrites--;
+                    });
+                }
             });
         }
         this.options.app.emitPropertyValue('serialport', {

package/dist/tcp.d.ts

@@ -20,6 +20,7 @@ export default class TcpStream extends Transform {
     private readonly options;
     private readonly debug;
     private readonly debugData;
+    private static readonly DEFAULT_TIMEOUT_SECONDS;
     private readonly noDataReceivedTimeout;
     private tcpStream;
     private reconnector;

package/dist/tcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tcp.d.ts","sourceRoot":"","sources":["../src/tcp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC7C,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAQ;IAC9C,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,WAAW,CAAsC;gBAE7C,OAAO,EAAE,UAAU;IAW/B,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC;IAmFnD,GAAG,IAAI,IAAI;IAOX,UAAU,CACR,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,iBAAiB,GAC1B,IAAI;CAGR"}
+{"version":3,"file":"tcp.d.ts","sourceRoot":"","sources":["../src/tcp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC7C,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAK;IACpD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAQ;IAC9C,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,WAAW,CAAsC;gBAE7C,OAAO,EAAE,UAAU;IAgB/B,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC;IAmFnD,GAAG,IAAI,IAAI;IAOX,UAAU,CACR,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,iBAAiB,GAC1B,IAAI;CAGR"}

package/dist/tcp.js

@@ -10,14 +10,18 @@ class TcpStream extends stream_1.Transform {
     options;
     debug;
     debugData;
+    static DEFAULT_TIMEOUT_SECONDS = 60;
     noDataReceivedTimeout;
     tcpStream;
     reconnector = null;
     constructor(options) {
         super();
         this.options = options;
+        const parsedTimeout = Number.parseInt((this.options.noDataReceivedTimeout + '').trim());
         this.noDataReceivedTimeout =
-            Number.parseInt((this.options.noDataReceivedTimeout + '').trim()) * 1000;
+            (isNaN(parsedTimeout)
+                ? TcpStream.DEFAULT_TIMEOUT_SECONDS
+                : parsedTimeout) * 1000;
         const createDebug = options.createDebug ?? require('debug');
         this.debug = createDebug('signalk:streams:tcp');
         this.debug(`noDataReceivedTimeout:${this.noDataReceivedTimeout}`);
@@ -52,7 +56,7 @@ class TcpStream extends stream_1.Transform {
         this.reconnector = (0, reconnect_core_1.default)((opts) => {
             return net_1.default.connect(opts);
         })({ maxDelay: 5 * 1000 }, (tcpStream) => {
-            if (!isNaN(this.noDataReceivedTimeout)) {
+            if (this.noDataReceivedTimeout > 0) {
                 tcpStream.setTimeout(this.noDataReceivedTimeout);
                 this.debug(`Setting socket idle timeout ${this.options.host}:${this.options.port} ${this.noDataReceivedTimeout}`);
                 tcpStream.on('timeout', () => {

package/dist/udp.d.ts

@@ -5,6 +5,7 @@ interface UdpOptions {
     host?: string;
     app: {
         on(event: string, cb: (...args: any[]) => void): void;
+        setProviderStatus(id: string, msg: string): void;
         setProviderError(id: string, msg: string): void;
     };
     providerId: string;

package/dist/udp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"udp.d.ts","sourceRoot":"","sources":["../src/udp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAY,MAAM,QAAQ,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,SAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAwB;gBAE1B,OAAO,EAAE,UAAU;IAO/B,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC;IAqCnD,UAAU,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;IAIP,GAAG,IAAI,IAAI;CASZ"}
+{"version":3,"file":"udp.d.ts","sourceRoot":"","sources":["../src/udp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAY,MAAM,QAAQ,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAEvD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,EAAE;QAEH,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI,CAAA;QACrD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;QAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAChD,CAAA;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,SAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAwB;gBAE1B,OAAO,EAAE,UAAU;IAO/B,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC;IA0CnD,UAAU,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;IAIP,GAAG,IAAI,IAAI;CASZ"}

package/dist/udp.js

@@ -34,6 +34,8 @@ class Udp extends stream_1.Transform {
         });
         socket.bind(this.options.port, () => {
             socket.setBroadcast(true);
+            const addr = socket.address();
+            this.options.app.setProviderStatus(this.options.providerId, `Listening on UDP port ${addr.port}`);
         });
         return pipeTo;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "Utilities for handling streams of Signal K data",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,7 +51,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SignalK/signalk-server-node.git"
+    "url": "git+https://github.com/SignalK/signalk-server.git",
+    "directory": "packages/streams"
   },
   "keywords": [
     "Signal",