@signalk/streams 5.1.3 → 6.0.0

package/dist/test-helpers.d.ts

@@ -0,0 +1,52 @@
+import { EventEmitter } from 'events';
+import type { CreateDebug, DebugLogger, DeltaCache } from './types';
+interface MockAppOptions {
+    selfContext?: string;
+    configPath?: string;
+    loggingDirectory?: string;
+    keepMostRecentLogsOnly?: boolean;
+    logCountToKeep?: number;
+    isNmea2000OutAvailable?: boolean;
+}
+interface MockApp extends EventEmitter {
+    selfContext: string;
+    isNmea2000OutAvailable: boolean;
+    deltaCache: DeltaCache;
+    config: {
+        configPath: string;
+        settings: {
+            loggingDirectory?: string;
+            keepMostRecentLogsOnly?: boolean;
+            logCountToKeep?: number;
+        };
+        getExternalHostname(): string;
+        getExternalPort(): number;
+    };
+    setProviderStatus(id: string, msg: string): void;
+    setProviderError(id: string, msg: string): void;
+    handleMessage(id: string, delta: object): void;
+    emitPropertyValue(name: string, value: unknown): void;
+    signalk: EventEmitter;
+    providerStatuses: Array<{
+        id: string;
+        msg: string;
+    }>;
+    providerErrors: Array<{
+        id: string;
+        msg: string;
+    }>;
+    handledMessages: Array<{
+        id: string;
+        delta: object;
+    }>;
+    propertyValues: Array<{
+        name: string;
+        value: unknown;
+    }>;
+}
+export declare function createMockApp(options?: MockAppOptions): MockApp;
+export declare function collectStreamOutput<T = unknown>(stream: NodeJS.ReadableStream): Promise<T[]>;
+export declare function noopDebug(): DebugLogger;
+export declare function createDebugStub(): CreateDebug;
+export {};
+//# sourceMappingURL=test-helpers.d.ts.map

package/dist/test-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["../src/test-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEnE,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACjC;AAED,UAAU,OAAQ,SAAQ,YAAY;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,sBAAsB,EAAE,OAAO,CAAA;IAC/B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE;YACR,gBAAgB,CAAC,EAAE,MAAM,CAAA;YACzB,sBAAsB,CAAC,EAAE,OAAO,CAAA;YAChC,cAAc,CAAC,EAAE,MAAM,CAAA;SACxB,CAAA;QACD,mBAAmB,IAAI,MAAM,CAAA;QAC7B,eAAe,IAAI,MAAM,CAAA;KAC1B,CAAA;IACD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/C,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9C,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;IACrD,OAAO,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACpD,cAAc,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAClD,eAAe,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACrD,cAAc,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACxD;AAED,wBAAgB,aAAa,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAoDnE;AAED,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,OAAO,EAC7C,MAAM,EAAE,MAAM,CAAC,cAAc,GAC5B,OAAO,CAAC,CAAC,EAAE,CAAC,CAOd;AAED,wBAAgB,SAAS,IAAI,WAAW,CAIvC;AAED,wBAAgB,eAAe,IAAI,WAAW,CAE7C"}

package/dist/test-helpers.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMockApp = createMockApp;
+exports.collectStreamOutput = collectStreamOutput;
+exports.noopDebug = noopDebug;
+exports.createDebugStub = createDebugStub;
+const events_1 = require("events");
+function createMockApp(options = {}) {
+    const emitter = new events_1.EventEmitter();
+    const signalk = new events_1.EventEmitter();
+    const providerStatuses = [];
+    const providerErrors = [];
+    const handledMessages = [];
+    const propertyValues = [];
+    const sourceDeltaStore = {};
+    const app = Object.assign(emitter, {
+        selfContext: options.selfContext ?? 'vessels.urn:mrn:imo:mmsi:000000000',
+        isNmea2000OutAvailable: options.isNmea2000OutAvailable ?? false,
+        deltaCache: {
+            setSourceDelta(key, delta) {
+                sourceDeltaStore[key] = delta;
+            }
+        },
+        config: {
+            configPath: options.configPath ?? '/tmp/test-config',
+            settings: {
+                loggingDirectory: options.loggingDirectory,
+                keepMostRecentLogsOnly: options.keepMostRecentLogsOnly,
+                logCountToKeep: options.logCountToKeep
+            },
+            getExternalHostname() {
+                return 'localhost';
+            },
+            getExternalPort() {
+                return 3000;
+            }
+        },
+        setProviderStatus(id, msg) {
+            providerStatuses.push({ id, msg });
+        },
+        setProviderError(id, msg) {
+            providerErrors.push({ id, msg });
+        },
+        handleMessage(id, delta) {
+            handledMessages.push({ id, delta });
+        },
+        emitPropertyValue(name, value) {
+            propertyValues.push({ name, value });
+        },
+        signalk,
+        providerStatuses,
+        providerErrors,
+        handledMessages,
+        propertyValues
+    });
+    return app;
+}
+function collectStreamOutput(stream) {
+    return new Promise((resolve, reject) => {
+        const results = [];
+        stream.on('data', (chunk) => results.push(chunk));
+        stream.on('end', () => resolve(results));
+        stream.on('error', reject);
+    });
+}
+function noopDebug() {
+    const fn = ((..._args) => { });
+    fn.enabled = false;
+    return fn;
+}
+function createDebugStub() {
+    return () => noopDebug();
+}

package/dist/throttle.d.ts

@@ -0,0 +1,3 @@
+import { Throttle } from 'stream-throttle';
+export default Throttle;
+//# sourceMappingURL=throttle.d.ts.map

package/dist/throttle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../src/throttle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,eAAe,QAAQ,CAAA"}

package/dist/throttle.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_throttle_1 = require("stream-throttle");
+exports.default = stream_throttle_1.Throttle;

package/dist/timestamp-throttle.d.ts

@@ -0,0 +1,17 @@
+import { Transform, TransformCallback } from 'stream';
+interface TimestampMessage {
+    timestamp: string;
+}
+type GetMilliseconds = (msg: TimestampMessage) => number;
+interface TimestampThrottleOptions {
+    getMilliseconds?: GetMilliseconds;
+}
+export default class TimestampThrottle extends Transform {
+    private lastMsgMillis;
+    private offsetMillis;
+    private readonly getMilliseconds;
+    constructor(options?: TimestampThrottleOptions);
+    _transform(msg: TimestampMessage, encoding: BufferEncoding, done: TransformCallback): void;
+}
+export {};
+//# sourceMappingURL=timestamp-throttle.d.ts.map

package/dist/timestamp-throttle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timestamp-throttle.d.ts","sourceRoot":"","sources":["../src/timestamp-throttle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAErD,UAAU,gBAAgB;IACxB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,KAAK,eAAe,GAAG,CAAC,GAAG,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAExD,UAAU,wBAAwB;IAChC,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC;AAOD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,SAAS;IACtD,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;gBAErC,OAAO,GAAE,wBAA6B;IAMlD,UAAU,CACR,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,iBAAiB,GACtB,IAAI;CAkBR"}

package/dist/timestamp-throttle.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const moment_1 = __importDefault(require("moment"));
+const stream_1 = require("stream");
+function defaultGetMilliseconds(msg) {
+    // 2014-08-15-16:00:00.083
+    return (0, moment_1.default)(msg.timestamp, 'YYYY-MM-DD-HH:mm:ss.SSS').valueOf();
+}
+class TimestampThrottle extends stream_1.Transform {
+    lastMsgMillis;
+    offsetMillis = 0;
+    getMilliseconds;
+    constructor(options = {}) {
+        super({ objectMode: true });
+        this.lastMsgMillis = Date.now();
+        this.getMilliseconds = options.getMilliseconds ?? defaultGetMilliseconds;
+    }
+    _transform(msg, encoding, done) {
+        const msgMillis = this.getMilliseconds(msg);
+        if (msgMillis < this.lastMsgMillis) {
+            this.offsetMillis = Date.now() - msgMillis;
+        }
+        this.lastMsgMillis = msgMillis;
+        const millisToCorrectSendTime = msgMillis - Date.now() + this.offsetMillis;
+        if (millisToCorrectSendTime <= 0) {
+            this.push(msg);
+            done();
+        }
+        else {
+            const doPush = this.push.bind(this, msg);
+            setTimeout(() => {
+                doPush();
+                done();
+            }, millisToCorrectSendTime);
+        }
+    }
+}
+exports.default = TimestampThrottle;

package/dist/types.d.ts

@@ -0,0 +1,8 @@
+export type DebugLogger = ((...args: unknown[]) => void) & {
+    enabled: boolean;
+};
+export type CreateDebug = (namespace: string) => DebugLogger;
+export interface DeltaCache {
+    setSourceDelta(key: string, delta: object): void;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,GAAG;IACzD,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,WAAW,CAAA;AAE5D,MAAM,WAAW,UAAU;IACzB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACjD"}

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/udp.d.ts

@@ -0,0 +1,26 @@
+import { Transform, TransformCallback } from 'stream';
+import type { CreateDebug } from './types';
+interface UdpOptions {
+    port: number;
+    host?: string;
+    app: {
+        on(event: string, cb: (...args: any[]) => void): void;
+        setProviderError(id: string, msg: string): void;
+    };
+    providerId: string;
+    outEvent?: string;
+    createDebug?: CreateDebug;
+    [key: string]: unknown;
+}
+export default class Udp extends Transform {
+    private readonly options;
+    private readonly debug;
+    private socket;
+    private pipeTo;
+    constructor(options: UdpOptions);
+    pipe<T extends NodeJS.WritableStream>(pipeTo: T): T;
+    _transform(chunk: Buffer, encoding: BufferEncoding, done: TransformCallback): void;
+    end(): this;
+}
+export {};
+//# sourceMappingURL=udp.d.ts.map

package/dist/udp.d.ts.map

@@ -0,0 +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"}

package/dist/udp.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dgram_1 = require("dgram");
+const stream_1 = require("stream");
+class Udp extends stream_1.Transform {
+    options;
+    debug;
+    socket = null;
+    pipeTo = null;
+    constructor(options) {
+        super({ objectMode: false });
+        this.options = options;
+        const createDebug = options.createDebug ?? require('debug');
+        this.debug = createDebug('signalk:streams:udp');
+    }
+    pipe(pipeTo) {
+        this.pipeTo = pipeTo;
+        super.pipe(pipeTo);
+        const socket = (0, dgram_1.createSocket)('udp4');
+        this.socket = socket;
+        if (this.options.outEvent && this.options.port !== undefined) {
+            this.options.app.on(this.options.outEvent, (d) => {
+                this.debug('sending over udp: %s', d);
+                socket.send(d, 0, d.length, this.options.port, this.options.host ?? '255.255.255.255');
+            });
+        }
+        socket.on('message', (message) => {
+            this.debug(message.toString());
+            this.push(message);
+        });
+        socket.on('error', (err) => {
+            this.options.app.setProviderError(this.options.providerId, err.message);
+            console.error('UdpProvider:' + err);
+        });
+        socket.bind(this.options.port, () => {
+            socket.setBroadcast(true);
+        });
+        return pipeTo;
+    }
+    _transform(chunk, encoding, done) {
+        done();
+    }
+    end() {
+        if (this.socket) {
+            this.socket.close();
+        }
+        if (this.pipeTo) {
+            this.pipeTo.end();
+        }
+        return this;
+    }
+}
+exports.default = Udp;

package/package.json

@@ -1,11 +1,53 @@
 {
   "name": "@signalk/streams",
-  "version": "5.1.3",
+  "version": "6.0.0",
   "description": "Utilities for handling streams of Signal K data",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "!dist/**/*.test.*"
+  ],
   "scripts": {
-    "ci": "prettier --check .",
-    "format": "prettier --write ."
+    "build": "tsc -b",
+    "watch": "tsc --watch",
+    "test": "mocha 'src/**/*.test.ts'",
+    "ci": "prettier --check src/",
+    "format": "prettier --write src/"
+  },
+  "exports": {
+    ".": "./dist/index.js",
+    "./actisense-serial": "./dist/actisense-serial.js",
+    "./autodetect": "./dist/autodetect.js",
+    "./canboatjs": "./dist/canboatjs.js",
+    "./canbus": "./dist/canbus.js",
+    "./execute": "./dist/execute.js",
+    "./filestream": "./dist/filestream.js",
+    "./folderstream": "./dist/folderstream.js",
+    "./from_json": "./dist/from_json.js",
+    "./gpiod-seatalk": "./dist/gpiod-seatalk.js",
+    "./gpsd": "./dist/gpsd.js",
+    "./keys-filter": "./dist/keys-filter.js",
+    "./liner": "./dist/liner.js",
+    "./log": "./dist/log.js",
+    "./logging": "./dist/logging.js",
+    "./mdns-ws": "./dist/mdns-ws.js",
+    "./multiplexedlog": "./dist/multiplexedlog.js",
+    "./n2kAnalyzer": "./dist/n2kAnalyzer.js",
+    "./n2k-signalk": "./dist/n2k-signalk.js",
+    "./nmea0183-signalk": "./dist/nmea0183-signalk.js",
+    "./nullprovider": "./dist/nullprovider.js",
+    "./pigpio-seatalk": "./dist/pigpio-seatalk.js",
+    "./replacer": "./dist/replacer.js",
+    "./s3": "./dist/s3.js",
+    "./serialport": "./dist/serialport.js",
+    "./simple": "./dist/simple.js",
+    "./splitting-liner": "./dist/splitting-liner.js",
+    "./tcp": "./dist/tcp.js",
+    "./tcpserver": "./dist/tcpserver.js",
+    "./throttle": "./dist/throttle.js",
+    "./timestamp-throttle": "./dist/timestamp-throttle.js",
+    "./udp": "./dist/udp.js"
   },
   "repository": {
     "type": "git",

package/actisense-serial.js

@@ -1 +0,0 @@
-module.exports = require('@canboat/canboatjs').serial

package/autodetect.js

@@ -1,198 +0,0 @@
-/*
- * Copyright 2016 Teppo Kurki <teppo.kurki@iki.fi>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const Transform = require('stream').Transform
-const Writable = require('stream').Writable
-const TimestampThrottle = require('./timestamp-throttle')
-
-const N2KJsonToSignalK = require('./n2k-signalk')
-const ActisenseSerialToJSON = require('./n2kAnalyzer')
-const canboatjs = require('./canboatjs')
-const Nmea01832SignalK = require('./nmea0183-signalk')
-const _ = require('lodash')
-
-/*
-
-Provider to handle any kind of supported input data.
-
-It will detect if the incoming data is in the 'multiplexedlog' format
-(produced by the server's logging function)and if not, then it will
-look at each incoming line to try to determine the type of data.
-
-A multiplexed log should have this format:
-
-milliseconds;discriminator;data
-where discriminator can be
-N => NMEA0183
-I => Signal K delta
-A => actisense-serial format N2K data
-
-1471172400151;N;!AIVDM,1,1,,A,13KdO60034Qk?WtRHUJQ3@ol05Cd,0*55
-1471172400152;I;{"updates":[{"source":{"label":"i2c"},"values":[{"path":"electrical.batteries.house.voltage","value":13.5741469711775},{"path":"electrical.batteries.house.current","value":0.39957033121875}],"timestamp":"2016-07-16T12:00:08.825Z"}],"context":"vessels.230029970"}
-1471172400153;A;2016-07-16T12:00:00.000Z,2,130306,105,255,8,00,d1,03,c9,23,fa,ff,ff
-*/
-
-function DeMultiplexer(options) {
-  Writable.call(this)
-
-  this.toTimestamped = new ToTimestamped(this, options)
-  this.timestampThrottle = new TimestampThrottle({
-    getMilliseconds: (msg) => msg.timestamp
-  })
-  this.splitter = new Splitter(this, options)
-  this.options = options
-
-  this.toTimestamped.on('drain', this.emit.bind(this, 'drain'))
-}
-require('util').inherits(DeMultiplexer, Writable)
-
-DeMultiplexer.prototype.pipe = function (target) {
-  return this.splitter.pipe(target)
-}
-DeMultiplexer.prototype.write = function (chunk, encoding, callback) {
-  return this.toTimestamped.write(chunk, encoding, callback)
-}
-
-function Splitter(deMultiplexer, options) {
-  Transform.call(this, { objectMode: true })
-  this.demuxEmitData = function (msg) {
-    deMultiplexer.emit('data', msg)
-  }
-
-  this.fromN2KJson = new N2KJsonToSignalK(options)
-  this.fromN2KJson.on('data', this.demuxEmitData)
-
-  if (_.isUndefined(options.useCanboatjs) || options.useCanboatjs) {
-    this.fromActisenseSerial = new canboatjs(options)
-  } else {
-    this.fromActisenseSerial = new ActisenseSerialToJSON(options)
-  }
-  this.fromActisenseSerial.pipe(this.fromN2KJson)
-
-  this.fromNMEA0183 = new Nmea01832SignalK(options)
-  this.fromNMEA0183.on('data', this.demuxEmitData)
-}
-require('util').inherits(Splitter, Transform)
-
-Splitter.prototype._transform = function (msg, encoding, _done) {
-  let done = _done
-  try {
-    switch (msg.discriminator) {
-      case 'A': {
-        msg.fromFile = true
-        const result = this.fromActisenseSerial.write(msg, encoding)
-        if (!result) {
-          this.fromActisenseSerial.once('drain', _done)
-          done = () => {}
-        }
-        break
-      }
-      case 'C':
-      case 'N':
-      case 'G':
-      case 'M':
-        this.fromNMEA0183.write(
-          { line: msg.data, timestamp: msg.timestamp },
-          encoding
-        )
-        break
-      case 'I':
-      default:
-        try {
-          const parsed = JSON.parse(msg.data)
-          const timestamp = new Date(Number(msg.timestamp))
-          parsed.updates &&
-            parsed.updates.forEach((update) => (update.timestamp = timestamp))
-          this.push(parsed)
-          this.demuxEmitData(parsed)
-        } catch (e) {
-          console.error(e)
-        }
-        break
-    }
-  } finally {
-    done()
-  }
-}
-Splitter.prototype.pipe = function (target) {
-  this.fromN2KJson.pipe(target)
-  this.fromNMEA0183.pipe(target)
-  return Transform.prototype.pipe.call(this, target)
-}
-
-function ToTimestamped(deMultiplexer, options) {
-  Transform.call(this, { objectMode: true })
-  this.deMultiplexer = deMultiplexer
-  this.options = options
-}
-require('util').inherits(ToTimestamped, Transform)
-
-// runs only once, self-assigns the actual transform functions
-// on first call
-ToTimestamped.prototype._transform = function (msg, encoding, done) {
-  //ignore empty lines in the beginning of the file, encountered in some cases
-  if (msg.trim().length === 0) {
-    done()
-    return
-  }
-
-  const line = msg.toString()
-  this.multiplexedFormat =
-    line.length > 16 && line.charAt(13) === ';' && line.split(';').length >= 3
-  if (this.multiplexedFormat) {
-    if (this.options.noThrottle) {
-      this.deMultiplexer.toTimestamped.pipe(this.deMultiplexer.splitter)
-    } else {
-      this.deMultiplexer.toTimestamped
-        .pipe(this.deMultiplexer.timestampThrottle)
-        .pipe(this.deMultiplexer.splitter)
-    }
-    this._transform = this.handleMultiplexed
-  } else {
-    this._transform = this.handleMixed
-  }
-  this._transform(msg, encoding, done)
-}
-
-ToTimestamped.prototype.handleMixed = function (msg, encoding, done) {
-  const line = msg.toString()
-  const res = { timestamp: new Date().getTime(), data: line }
-  if (line.charAt(0) === '{') {
-    res.discriminator = 'I'
-  } else if (
-    (line.charAt(0) === '$' || line.charAt(0) === '!') &&
-    !line.startsWith('!PDGY') // iKonect
-  ) {
-    res.discriminator = 'N'
-  } else {
-    res.discriminator = 'A'
-  }
-  this.push(res)
-  done()
-}
-
-ToTimestamped.prototype.handleMultiplexed = function (msg, encoding, done) {
-  const line = msg.toString()
-  const parts = line.split(';')
-  this.push({
-    timestamp: parts[0],
-    discriminator: parts[1],
-    data: parts.slice(2).join(';')
-  })
-  done()
-}
-
-module.exports = DeMultiplexer

package/canboatjs.js

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017 Signal K & Fabian Tollenaar <fabian@signalk.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const Transform = require('stream').Transform
-const FromPgn = require('@canboat/canboatjs').FromPgn
-const _ = require('lodash')
-
-function CanboatJs(options) {
-  Transform.call(this, {
-    objectMode: true
-  })
-
-  if (options.useCamelCompat === undefined) {
-    options.useCamelCompat = true
-  }
-  this.fromPgn = new FromPgn(options)
-  const createDebug = options.createDebug || require('debug')
-  const debug = createDebug('signalk:streams:canboatjs')
-
-  this.fromPgn.on('warning', (pgn, warning) => {
-    debug(`[warning] ${pgn.pgn} ${warning}`)
-    options.app.emit(`canboatjs:warning`, warning)
-  })
-
-  this.fromPgn.on('error', (pgn, err) => {
-    console.error(pgn.input, err.message)
-    options.app.emit(`canboatjs:error`, err)
-  })
-
-  this.app = options.app
-  this.analyzerOutEvent = options.analyzerOutEvent || 'N2KAnalyzerOut'
-}
-
-require('util').inherits(CanboatJs, Transform)
-
-CanboatJs.prototype._transform = function (chunk, encoding, done) {
-  if (_.isObject(chunk) && chunk.fromFile) {
-    const pgnData = this.fromPgn.parse(chunk.data)
-    if (pgnData) {
-      pgnData.timestamp = new Date(Number(chunk.timestamp)).toISOString()
-      this.push(pgnData)
-      this.app.emit(this.analyzerOutEvent, pgnData)
-    } else {
-      this.app.emit('canboatjs:unparsed:object', chunk)
-    }
-  } else {
-    const pgnData = this.fromPgn.parse(chunk)
-    if (pgnData) {
-      this.push(pgnData)
-      this.app.emit(this.analyzerOutEvent, pgnData)
-    } else {
-      this.app.emit('canboatjs:unparsed:data', chunk)
-    }
-  }
-  done()
-}
-
-module.exports = CanboatJs

package/canbus.js

@@ -1,17 +0,0 @@
-/*
- * Copyright 2018 Signal K & Scott Bender <scott@scottbender.net>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-module.exports = require('@canboat/canboatjs').canbus