incyclist-devices 2.1.4 → 2.1.5

package/lib/ble/base/adapter.js

@@ -141,10 +141,8 @@ class BleAdapter extends adpater_1.default {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const wasPaused = this.paused;
             const wasStopped = this.stopped;
-            if (wasPaused)
-                this.resume();
+            this.resume();
             if (this.started && !wasStopped)
                 return true;
             this.stopped = false;

package/lib/ble/base/comms.js

@@ -61,10 +61,12 @@ class BleComms extends events_1.default {
         return this.connectState.isConnected;
     }
     pause() {
+        this.ble.pauseLogging();
         this.paused = true;
     }
     resume() {
         this.paused = false;
+        this.ble.resumeLogging();
     }
     getServiceUUids() {
         throw new Error("Method not implemented.");
@@ -282,6 +284,7 @@ class BleComms extends events_1.default {
     }
     connect(props) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.ble.resumeLogging();
             if (!this.ble.isConnected()) {
                 try {
                     yield this.ble.connect();
@@ -382,6 +385,7 @@ class BleComms extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { id, name, address } = this;
             this.logEvent({ message: 'disconnect requested', device: { id, name, address } });
+            this.ble.pauseLogging();
             this.connectState.isDisconnecting = true;
             if (this.workerIv) {
                 this.stopWorker();

package/lib/ble/bindings/linux.d.ts

@@ -9,6 +9,8 @@ export declare class BleLinuxBinding extends EventEmitter implements BleBinding
     static getInstance(): any;
     startScanning(serviceUUIDs?: string[] | undefined, allowDuplicates?: boolean | undefined, callback?: ((error?: Error | undefined) => void) | undefined): void;
     stopScanning(callback?: (() => void) | undefined): void;
+    pauseLogging(): void;
+    resumeLogging(): void;
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
 }
 declare const Binding: any;

package/lib/ble/bindings/linux.js

@@ -23,6 +23,10 @@ class BleLinuxBinding extends events_1.default {
     stopScanning(callback) {
         throw new Error('Method not implemented.');
     }
+    pauseLogging() {
+    }
+    resumeLogging() {
+    }
     on(eventName, listener) {
         super.addListener(eventName, listener);
         if (eventName === 'stateChange') {

package/lib/ble/bindings/mock.js

@@ -29,6 +29,10 @@ class Binding extends events_1.default {
         return Binding._instance;
     }
     init() { }
+    pauseLogging() {
+    }
+    resumeLogging() {
+    }
     addMock(peripheral) {
         this.peripherals.push(peripheral);
     }

package/lib/ble/ble-interface.d.ts

@@ -43,6 +43,7 @@ export default class BleInterface extends EventEmitter implements IncyclistInter
         comms: BleComms;
         cb: (data: any) => void;
     }[];
+    loggingPaused: boolean;
     static _instance: BleInterface;
     static getInstance(props?: {
         binding?: BleBinding;
@@ -57,6 +58,9 @@ export default class BleInterface extends EventEmitter implements IncyclistInter
     stopConnectSensor(): void;
     waitForSensorConnectionFinish(): Promise<void>;
     getAdapterFactory(): BleAdapterFactory;
+    pauseLogging(): void;
+    resumeLogging(): void;
+    isDebugEnabled(): boolean;
     logEvent(event: any): void;
     onStateChange(state: BleInterfaceState): void;
     onError(err: any): void;

package/lib/ble/ble-interface.js

@@ -51,6 +51,7 @@ class BleInterface extends events_1.default {
             this.logger = props.logger;
         else
             this.logger = new gd_eventlog_1.EventLogger('BLE');
+        this.loggingPaused = false;
     }
     getBinding() { return this.binding; }
     setBinding(binding) { if (binding)
@@ -75,12 +76,38 @@ class BleInterface extends events_1.default {
     getAdapterFactory() {
         return adapter_factory_1.default.getInstance();
     }
-    logEvent(event) {
-        if (this.logger) {
-            this.logger.logEvent(event);
+    pauseLogging() {
+        this.logEvent({ message: 'pause logging on BLE Interface' });
+        this.loggingPaused = true;
+        try {
+            this.getBinding().pauseLogging();
         }
+        catch (_a) { }
+    }
+    resumeLogging() {
+        const event = { message: 'resume logging on BLE Interface' };
+        this.logger.logEvent(event);
+        if (this.isDebugEnabled()) {
+            console.log('~~~ BLE', event);
+        }
+        this.loggingPaused = false;
+        try {
+            this.getBinding().resumeLogging();
+        }
+        catch (_a) { }
+    }
+    isDebugEnabled() {
         const w = global.window;
         if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG) {
+            return true;
+        }
+        return false;
+    }
+    logEvent(event) {
+        if (this.logger && !this.loggingPaused) {
+            this.logger.logEvent(event);
+        }
+        if (this.isDebugEnabled()) {
             console.log('~~~ BLE', event);
         }
     }
@@ -98,6 +125,7 @@ class BleInterface extends events_1.default {
         this.logEvent({ message: 'error', error: err.message, stack: err.stack });
     }
     connect(to) {
+        this.resumeLogging();
         const timeout = this.props.timeout || to || 2000;
         return new Promise((resolve, reject) => {
             if (this.connectState.isConnected) {
@@ -186,6 +214,7 @@ class BleInterface extends events_1.default {
                 this.connectState.timeout = null;
             }
             this.logEvent({ message: 'disconnect result: success' });
+            this.pauseLogging();
             return true;
         });
     }

package/lib/ble/types.d.ts

@@ -8,6 +8,8 @@ export type BleInterfaceState = 'unknown' | 'resetting' | 'unsupported' | 'unaut
 export interface BleBinding extends EventEmitter {
     startScanning(serviceUUIDs?: string[], allowDuplicates?: boolean, callback?: (error?: Error) => void): void;
     stopScanning(callback?: () => void): void;
+    pauseLogging(): any;
+    resumeLogging(): any;
     _bindings: any;
     state: BleInterfaceState;
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",