incyclist-devices 3.0.6 → 3.0.7

package/lib/cjs/antv2/base/adapter.js

@@ -12,7 +12,7 @@ const utils_js_2 = require("../utils.js");
 const consts_js_1 = require("../consts.js");
 const sensor_factory_js_1 = __importDefault(require("../factories/sensor-factory.js"));
 const gd_eventlog_1 = require("gd-eventlog");
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const INTERFACE_NAME = 'ant';
 const MAX_RETRIES = 3;
 class AntAdapter extends adpater_js_1.default {
@@ -30,7 +30,7 @@ class AntAdapter extends adpater_js_1.default {
     sensorConnected;
     startStatus;
     startupRetryPause = 1000;
-    internalEmitter = new node_events_1.default();
+    internalEmitter = new node_events_1.EventEmitter();
     constructor(settings, props) {
         super(settings, props);
         const profile = this.getProfileName();
@@ -334,21 +334,27 @@ class AntAdapter extends adpater_js_1.default {
     async initSensor(props) {
         this.startStatus.sensorStarted = this.sensorConnected;
         if (this.startStatus.sensorStarted)
-            return;
-        this.logEvent({ message: 'start sensor', device: this.getName(), props });
+            return true;
+        const logProps = structuredClone(props ?? {});
+        logProps.routeName = logProps?.route?.title;
+        logProps.routeId = logProps?.route?.id;
+        delete logProps.route;
+        this.logEvent({ message: 'start sensor', device: this.getName(), props: logProps });
         try {
             this.sensorConnected = await this.startSensor();
             if (this.sensorConnected) {
-                this.logEvent({ message: 'sensor started', device: this.getName(), channel: this.sensor?.getChannel()?.getChannelNo(), props });
+                this.logEvent({ message: 'sensor started', device: this.getName(), channelNo: this.sensor?.getChannel()?.getChannelNo(), props: logProps });
                 this.startStatus.sensorStarted = true;
+                return true;
             }
             else {
-                this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: 'unknown', props });
+                this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: 'unknown', props: logProps });
             }
         }
         catch (err) {
-            this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: err.message, props });
+            this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: err.message, props: logProps });
         }
+        return false;
     }
     getLogProps(startProps) {
         const { user, userWeight, bikeWeight, startupTimeout, automaticReconnect } = startProps ?? {};

package/lib/cjs/antv2/base/interface.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const gd_eventlog_1 = require("gd-eventlog");
 const sensor_factory_js_1 = __importDefault(require("../factories/sensor-factory.js"));
 const utils_js_1 = require("../../utils/utils.js");
 const adapter_factory_js_1 = __importDefault(require("../factories/adapter-factory.js"));
-class AntInterface extends node_events_1.default {
+class AntInterface extends node_events_1.EventEmitter {
     static _instance = undefined;
     static INTERFACE_NAME = 'ant';
     static getInstance(props = {}) {
@@ -178,7 +178,7 @@ class AntInterface extends node_events_1.default {
         if (this.isScanning()) {
             return await this.scanPromise;
         }
-        this.activeScan = { emitter: new node_events_1.default() };
+        this.activeScan = { emitter: new node_events_1.EventEmitter() };
         const detected = [];
         const _scan = () => new Promise(async (done) => {
             const onDetected = (profile, deviceID) => {
@@ -340,7 +340,7 @@ class AntInterface extends node_events_1.default {
                 this.logEvent({ message: 'could not start sensor' });
                 channel.off('data', onData);
             }
-            this.logEvent({ message: 'sensor started', channel: sensor.getChannel()?.getChannelNo(), profile: sensor.getProfile(), deviceID: sensor.getDeviceID() });
+            this.logEvent({ message: 'sensor started', channelNo: sensor.getChannel()?.getChannelNo(), profile: sensor.getProfile(), deviceID: sensor.getDeviceID() });
             return started;
         }
         catch (err) {

package/lib/cjs/base/adpater.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../types/index.js");
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const consts_js_1 = require("./consts.js");
 const utils_js_1 = require("../utils/utils.js");
-class IncyclistDevice extends node_events_1.default {
+class IncyclistDevice extends node_events_1.EventEmitter {
     onDataFn;
     settings;
     lastUpdate;

package/lib/cjs/ble/base/interface.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BleInterfaceFactory = exports.BleInterface = void 0;
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const gd_eventlog_1 = require("gd-eventlog");
 const task_js_1 = require("../../utils/task.js");
 const peripheral_js_1 = require("./peripheral.js");
@@ -14,7 +11,7 @@ const index_js_1 = require("../factories/index.js");
 const BLE_EXPIRATION_TIMEOUT = 10 * 1000 * 60;
 const BLE_DEFAULT_CONNECT_TIMEOUT = 30 * 1000;
 let instanceCount = 0;
-class BleInterface extends node_events_1.default {
+class BleInterface extends node_events_1.EventEmitter {
     static _instance;
     static INTERFACE_NAME = 'ble';
     logger;
@@ -39,6 +36,7 @@ class BleInterface extends node_events_1.default {
     emitted = [];
     confirmedBleState;
     currentBleState;
+    stateChangeEventHandler = null;
     static getInstance(props = {}) {
         if (BleInterface._instance === undefined)
             BleInterface._instance = new BleInterface(props);
@@ -66,7 +64,7 @@ class BleInterface extends node_events_1.default {
         if (binding) {
             this.setBinding(binding);
         }
-        this.internalEvents = new node_events_1.default();
+        this.internalEvents = new node_events_1.EventEmitter();
         this.onDiscovered = this.onPeripheralFound.bind(this);
         const { enabled = true } = props;
         if (this.binding && enabled)
@@ -94,10 +92,16 @@ class BleInterface extends node_events_1.default {
     getBinding() {
         return this.binding;
     }
-    autoConnect() {
-        this.connect();
+    async autoConnect() {
+        await this.connect();
     }
     async connect(reconnect) {
+        if (this.isConnected())
+            return true;
+        if (!this.stateChangeEventHandler) {
+            this.stateChangeEventHandler = this.onBleStateChange.bind(this);
+            this.getBinding()?.on('stateChange', this.stateChangeEventHandler);
+        }
         if (!this.getBinding()) {
             this.logEvent({ message: 'BLE not available' });
             return false;
@@ -106,8 +110,6 @@ class BleInterface extends node_events_1.default {
             this.logEvent({ message: 'BLE connect - already connecting' });
             return this.connectTask.getPromise();
         }
-        if (this.isConnected())
-            return true;
         this.logEvent({ message: 'BLE connect request' });
         this.connectTask = new task_js_1.InteruptableTask(this.connectBle(), {
             timeout: this.getConnectTimeout(),
@@ -116,6 +118,9 @@ class BleInterface extends node_events_1.default {
             log: this.logEvent.bind(this),
         });
         const success = await this.connectTask.run().catch(() => false);
+        this.removeAllListeners('ble-state-change');
+        if (success)
+            this.emit('connected');
         return success;
     }
     async disconnect(connectionLost) {
@@ -126,7 +131,7 @@ class BleInterface extends node_events_1.default {
                 this.confirmedBleState = 'poweredOff';
                 return false;
             }
-            this.getBinding().removeAllListeners('error');
+            this.getBinding()?.removeAllListeners('error');
             if (!this.isConnected() && !connectionLost) {
                 this.confirmedBleState = 'poweredOff';
                 return true;
@@ -144,9 +149,16 @@ class BleInterface extends node_events_1.default {
             if (this.isConnecting())
                 await this.connectTask?.stop();
             this.emit('disconnect-done');
-            this.getBinding().removeAllListeners('stateChange');
-            this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
-            this.getBinding().on('error', this.onError.bind(this));
+            if (connectionLost) {
+                this.getBinding()?.removeAllListeners('stateChange');
+                this.stateChangeEventHandler = this.stateChangeEventHandler ?? this.onBleStateChange.bind(this);
+                this.getBinding()?.on('stateChange', this.stateChangeEventHandler);
+            }
+            else {
+                this.getBinding()?.removeAllListeners('stateChange');
+                this.stateChangeEventHandler = null;
+            }
+            this.getBinding()?.on('error', this.onError.bind(this));
             this.logEvent({ message: 'interface disconnected', interface: 'BLE' });
             this.confirmedBleState = 'poweredOff';
             return true;
@@ -156,7 +168,7 @@ class BleInterface extends node_events_1.default {
         }
         this.disconnectTask = new task_js_1.InteruptableTask(performDisconnect(), {
             timeout: this.getConnectTimeout(),
-            name: 'BLE connect',
+            name: 'BLE disconnect',
             errorOnTimeout: false,
             log: this.logEvent.bind(this),
         });
@@ -225,13 +237,13 @@ class BleInterface extends node_events_1.default {
         this.logEvent({ message: 'pausing logging' });
         this.logDisabled = true;
         try {
-            this.getBinding().pauseLogging();
+            this.getBinding()?.pauseLogging();
         }
         catch { }
     }
     resumeLogging() {
         try {
-            this.getBinding().resumeLogging();
+            this.getBinding()?.resumeLogging();
         }
         catch { }
         this.logDisabled = false;
@@ -568,27 +580,37 @@ class BleInterface extends node_events_1.default {
     addKnownDevice(_settings) {
     }
     async connectBle() {
-        this.currentBleState = this.getBinding().state;
+        this.currentBleState = this.getBinding()?.state;
         if (this.currentBleState === 'poweredOn') {
             this.onConnected();
             return true;
         }
+        else if (this.currentBleState === 'unauthorized' || this.currentBleState === 'unsupported') {
+            return false;
+        }
         const res = await this.waitForBleConnected();
         return res;
     }
     waitForBleConnected() {
         return new Promise((done) => {
-            this.getBinding().once('error', (err) => {
+            this.getBinding()?.once('error', (err) => {
                 this.logEvent({ message: 'Ble connect result: error', error: err.message });
                 return done(false);
             });
-            this.getBinding().on('stateChange', (state) => {
-                if (state === this.confirmedBleState)
-                    return;
-                this.logEvent({ message: 'BLE state change', state });
-                if (state === 'poweredOn') {
-                    this.onConnected();
-                    return done(true);
+            this.on('ble-state-change', (state) => {
+                try {
+                    if (state === 'poweredOn') {
+                        this.onConnected();
+                        this.removeAllListeners('ble-state-change');
+                        return done(true);
+                    }
+                    if (state === 'unauthorized') {
+                        this.removeAllListeners('ble-state-change');
+                        return done(false);
+                    }
+                }
+                catch (err) {
+                    console.log('# BLE waitForBleConnected error', err);
                 }
             });
         });
@@ -599,13 +621,16 @@ class BleInterface extends node_events_1.default {
     async onConnected() {
         if (this.isConnected())
             return;
-        this.confirmedBleState = 'poweredOn';
-        this.getBinding().removeAllListeners('error');
-        this.getBinding().removeAllListeners('stateChange');
-        this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
-        this.getBinding().on('error', this.onError.bind(this));
-        this.logEvent({ message: 'BLE connected' });
-        this.startPeripheralScan();
+        try {
+            this.confirmedBleState = 'poweredOn';
+            this.getBinding()?.removeAllListeners('error');
+            this.getBinding()?.on('error', this.onError.bind(this));
+            this.logEvent({ message: 'BLE connected' });
+            this.startPeripheralScan();
+        }
+        catch (err) {
+            console.log('# BLE onConnected error', err);
+        }
     }
     async onDisconnected() {
         if (this.isDisconnecting() || !this.isConnected())
@@ -616,15 +641,22 @@ class BleInterface extends node_events_1.default {
     async onBleStateChange(state) {
         if (state === this.currentBleState)
             return;
+        this.logEvent({ message: 'BLE state change', state });
         this.currentBleState = state;
-        if (state === 'poweredOff') {
-            this.onDisconnected();
+        if (this.isConnecting()) {
+            this.emit('ble-state-change', state);
+            return;
+        }
+        if (state === 'poweredOff' || state === 'unauthorized') {
+            if (this.isConnected()) {
+                this.onDisconnected();
+            }
         }
         else {
             if (this.isDisconnecting()) {
                 await this.disconnectTask.getPromise();
             }
-            this.onConnected();
+            this.connect();
         }
     }
     getAdapterFactory() {

package/lib/cjs/ble/base/peripheral.js

@@ -61,6 +61,10 @@ class BlePeripheral {
                 peripheral.on('error', this.onErrorHandler);
                 this.connected = true;
                 done();
+            })
+                .catch(() => {
+                this.connected = false;
+                done();
             });
         });
         await this.connectPromise;
@@ -69,10 +73,9 @@ class BlePeripheral {
     }
     async disconnect(connectionLost = false) {
         this.disconnecting = true;
-        if (!this.isConnected()) {
-            return true;
+        if (this.isConnected()) {
+            await this.unsubscribeAll(connectionLost);
         }
-        await this.unsubscribeAll(connectionLost);
         Object.keys(this.characteristics).forEach(uuid => {
             const c = this.characteristics[uuid];
             c.removeAllListeners();
@@ -88,7 +91,8 @@ class BlePeripheral {
                         return new Promise((done) => { this.getPeripheral().disconnect(() => { done(); }); });
                     };
                 }
-                await this.getPeripheral().disconnectAsync();
+                await this.getPeripheral().disconnectAsync()
+                    .catch(() => { });
             }
             peripheral.removeAllListeners();
         }
@@ -116,6 +120,7 @@ class BlePeripheral {
         if (this.disconnectedSignalled || this.disconnecting)
             return;
         this.disconnectedSignalled = true;
+        this.getPeripheral().removeAllListeners();
         this.ble.resumeLogging();
         this.logEvent({ message: 'peripheral disconnected', address: this.getPeripheral()?.address });
         try {
@@ -137,7 +142,8 @@ class BlePeripheral {
             const peripheral = this.getPeripheral();
             let services = [];
             if (peripheral?.discoverServicesAsync) {
-                services = await peripheral.discoverServicesAsync([]);
+                services = await peripheral.discoverServicesAsync([])
+                    .catch(() => []);
             }
             this.discoveredServiceUUIds = services.map(s => (0, utils_js_1.beautifyUUID)(s.uuid));
             this.logEvent({ message: 'discover services result', address: this.getPeripheral().address, services: this.discoveredServiceUUIds });
@@ -155,7 +161,8 @@ class BlePeripheral {
         if (!this.getPeripheral())
             return [];
         this.logEvent({ message: 'discover services and characteristics', service: serviceUUID, address: this.getPeripheral().address });
-        const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([serviceUUID], []);
+        const res = await this.getPeripheral().discoverSomeServicesAndCharacteristicsAsync([serviceUUID], [])
+            .catch(() => ({ services: [], characteristics: [] }));
         res.characteristics.forEach(c => this.characteristics[(0, utils_js_1.beautifyUUID)(c.uuid)] = c);
         return res.characteristics.map(c => {
             const { uuid, properties, name, _serviceUuid } = c;
@@ -182,7 +189,7 @@ class BlePeripheral {
                 }
                 return true;
             }
-            let c = await this.queryRawCharacteristic(characteristicUUID);
+            let c = await this.queryRawCharacteristic(characteristicUUID).catch(() => null);
             if (!c) {
                 return false;
             }

package/lib/cjs/ble/base/sensor.js

@@ -122,17 +122,24 @@ class TBleSensor extends node_events_1.EventEmitter {
         let connected = false;
         let subscribed = false;
         let success = false;
+        await (0, utils_js_1.sleep)(500);
         do {
-            if (!connected) {
-                connected = await this.startSensor(true);
+            try {
+                if (!connected) {
+                    connected = await this.startSensor(true);
+                }
+                if (connected && !subscribed) {
+                    subscribed = await this.subscribe();
+                }
             }
-            if (connected && !subscribed) {
-                subscribed = await this.subscribe();
+            catch {
             }
             success = connected && subscribed;
             if (!success) {
                 await (0, utils_js_1.sleep)(1000);
             }
+            if (!this.stopRequested)
+                this.logEvent({ message: 'reconnect sensor retry' });
         } while (!success || this.stopRequested);
         this.logEvent({ message: 'reconnect sensor completed', success, stopRequested: this.stopRequested });
         return success;

package/lib/cjs/ble/bindings/linux.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BleLinuxBinding = void 0;
-const events_1 = __importDefault(require("events"));
-class BleLinuxBinding extends events_1.default {
+const events_1 = require("events");
+class BleLinuxBinding extends events_1.EventEmitter {
     static _instance;
     _bindings;
     state;

package/lib/cjs/ble/bindings/mock.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = __importDefault(require("events"));
+const events_1 = require("events");
 const utils_js_1 = require("../../utils/utils.js");
-class Binding extends events_1.default {
+class Binding extends events_1.EventEmitter {
     static _instance;
     _bindings;
     state;
@@ -64,7 +61,7 @@ class Binding extends events_1.default {
             callback();
     }
 }
-class MockPeripheral extends events_1.default {
+class MockPeripheral extends events_1.EventEmitter {
     id;
     address;
     name;

package/lib/cjs/ble/bindings/types.js

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StaticNotifyCharacteristic = exports.StaticWriteCharacteristic = exports.StaticReadCharacteristic = exports.MockCharacteristic = exports.RESULT_UNLIKELY_ERROR = exports.RESULT_INVALID_ATTRIBUTE_LENGTH = exports.RESULT_ATTR_NOT_LONG = exports.RESULT_INVALID_OFFSET = exports.RESULT_SUCCESS = void 0;
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 exports.RESULT_SUCCESS = 0x00;
 exports.RESULT_INVALID_OFFSET = 0x07;
 exports.RESULT_ATTR_NOT_LONG = 0x0b;
 exports.RESULT_INVALID_ATTRIBUTE_LENGTH = 0x0d;
 exports.RESULT_UNLIKELY_ERROR = 0x0e;
-class MockCharacteristic extends node_events_1.default {
+class MockCharacteristic extends node_events_1.EventEmitter {
     uuid;
     properties;
     secure;

package/lib/cjs/direct-connect/base/interface.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectConnectInterfaceFactory = void 0;
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const gd_eventlog_1 = require("gd-eventlog");
 const task_js_1 = require("../../utils/task.js");
 const peripheral_js_1 = require("./peripheral.js");
@@ -16,7 +13,7 @@ const DC_TYPE = 'wahoo-fitness-tnp';
 const DC_PORT = 36866;
 const DC_EXPIRATION_TIMEOUT = 10 * 1000 * 60;
 let instanceId = 0;
-class DirectConnectInterface extends node_events_1.default {
+class DirectConnectInterface extends node_events_1.EventEmitter {
     static _instance;
     static INTERFACE_NAME = 'wifi';
     logger;
@@ -57,7 +54,7 @@ class DirectConnectInterface extends node_events_1.default {
         if (binding) {
             this.setBinding(binding);
         }
-        this.internalEvents = new node_events_1.default();
+        this.internalEvents = new node_events_1.EventEmitter();
         this.instance = ++instanceId;
         const { enabled } = props;
         if (this.binding && (enabled ?? false))
@@ -139,6 +136,7 @@ class DirectConnectInterface extends node_events_1.default {
             return false;
         }
         this.connected = true;
+        this.emit('connected');
         return true;
     }
     async disconnect() {

package/lib/cjs/direct-connect/base/peripheral.js

@@ -7,9 +7,10 @@ exports.DirectConnectPeripheral = void 0;
 const task_js_1 = require("../../utils/task.js");
 const interface_js_1 = __importDefault(require("./interface.js"));
 const index_js_1 = require("../messages/index.js");
-const node_events_1 = __importDefault(require("node:events"));
+const node_events_1 = require("node:events");
 const consts_js_1 = require("../consts.js");
 const utils_js_1 = require("../../ble/utils.js");
+let IDS = 0;
 class DirectConnectPeripheral {
     announcement;
     static instances = {};
@@ -28,12 +29,14 @@ class DirectConnectPeripheral {
     onPortCloseHandler = this.onPortClose.bind(this);
     partialBuffer = null;
     remainingBuffer = null;
-    eventEmitter = new node_events_1.default();
+    eventEmitter = new node_events_1.EventEmitter();
     subscribed = [];
     onDisconnectHandler;
     discoveredServiceUUIds;
+    id;
     constructor(announcement) {
         this.announcement = announcement;
+        this.id = ++IDS;
     }
     getInfo() {
         return {
@@ -57,6 +60,10 @@ class DirectConnectPeripheral {
             return true;
         if (this.isConnecting())
             await this.connectTask.getPromise();
+        const keys = Object.keys(DirectConnectPeripheral.instances);
+        const instances = [];
+        for (const key of keys)
+            instances.push(DirectConnectPeripheral.instances[key]);
         this.connectTask = new task_js_1.InteruptableTask(this.startConnection(), {
             timeout: 1000,
         });
@@ -378,6 +385,8 @@ class DirectConnectPeripheral {
         this.logEvent({ message: 'port error', path: this.getPath(), reason: err.message });
     }
     async onPortClose() {
+        if (this.isConnecting())
+            return;
         this.socket.removeAllListeners();
         this.socket.on('error', () => { });
         this.logEvent({ message: 'port closed', path: this.getPath() });
@@ -395,8 +404,12 @@ class DirectConnectPeripheral {
     }
     async stopConnection(connectionLost = false) {
         this.eventEmitter.removeAllListeners();
-        if (!this.isConnected())
+        if (!this.isConnected()) {
+            this.socket.removeAllListeners();
+            this.socket.destroy();
+            delete this.socket;
             return true;
+        }
         await this.unsubscribeAll(connectionLost);
         this.socket.removeAllListeners();
         return new Promise(done => {
@@ -422,6 +435,7 @@ class DirectConnectPeripheral {
         return this.msgSeqNo;
     }
     async send(seqNo, data) {
+        await this.connect();
         this.socket.write(data);
         return new Promise(done => {
             this.eventEmitter.once(`response-${seqNo}`, (response) => {

package/lib/cjs/serial/base/serial-interface.js

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_events_1 = __importDefault(require("node:events"));
-const serialport_js_1 = __importDefault(require("./serialport.js"));
+const node_events_1 = require("node:events");
+const serial_provider_js_1 = __importDefault(require("./serial-provider.js"));
 const gd_eventlog_1 = require("gd-eventlog");
 const utils_js_1 = require("../../utils/utils.js");
 const adapter_factory_js_1 = __importDefault(require("../factories/adapter-factory.js"));
 const serial_scanner_js_1 = require("./serial-scanner.js");
 const DEFAULT_SCAN_TIMEOUT = 10000;
 const MAX_PARALLEL_SCANS = 5;
-class SerialInterface extends node_events_1.default {
+class SerialInterface extends node_events_1.EventEmitter {
     ifaceName;
     binding;
     ports;
@@ -30,7 +30,7 @@ class SerialInterface extends node_events_1.default {
             if (binding)
                 instance = new SerialInterface(props);
             else {
-                instance = new SerialInterface({ ifaceName, binding: serialport_js_1.default.getInstance().getBinding(ifaceName), logger });
+                instance = new SerialInterface({ ifaceName, binding: serial_provider_js_1.default.getInstance().getBinding(ifaceName), logger });
                 if (instance)
                     SerialInterface._instances.push(instance);
             }
@@ -53,7 +53,7 @@ class SerialInterface extends node_events_1.default {
         this.inUse = [];
         this.isScanning = false;
         this.isStopScanRequested = false;
-        this.scanEvents = new node_events_1.default();
+        this.scanEvents = new node_events_1.EventEmitter();
         this.scanEvents.setMaxListeners(100);
         this.logger = props.logger || new gd_eventlog_1.EventLogger(`Serial:${ifaceName}`);
         this.connected = false;
@@ -74,7 +74,7 @@ class SerialInterface extends node_events_1.default {
     }
     setBinding(binding) {
         this.binding = binding;
-        serialport_js_1.default.getInstance().setBinding(this.ifaceName, binding);
+        serial_provider_js_1.default.getInstance().setBinding(this.ifaceName, binding);
     }
     getName() {
         return this.ifaceName;
@@ -96,7 +96,7 @@ class SerialInterface extends node_events_1.default {
     }
     async connect() {
         this.logEvent({ message: 'connecting', interface: this.ifaceName });
-        const binding = serialport_js_1.default.getInstance().getBinding(this.ifaceName);
+        const binding = serial_provider_js_1.default.getInstance().getBinding(this.ifaceName);
         if (!binding || !this.binding) {
             this.connected = false;
             this.logEvent({ message: 'connecting error', interface: this.ifaceName, reason: 'no binfing found' });
@@ -131,7 +131,7 @@ class SerialInterface extends node_events_1.default {
                 this.ports.splice(existing, 1);
             }
         }
-        const port = serialport_js_1.default.getInstance().getSerialPort(this.ifaceName, { path });
+        const port = serial_provider_js_1.default.getInstance().getSerialPort(this.ifaceName, { path });
         if (!port) {
             this.logEvent({ message: 'opening port - port does not exist', port: path });
             return null;
@@ -181,7 +181,7 @@ class SerialInterface extends node_events_1.default {
             return [];
         if (!this.isConnected())
             await this.connect();
-        const binding = serialport_js_1.default.getInstance().getBinding(this.ifaceName);
+        const binding = serial_provider_js_1.default.getInstance().getBinding(this.ifaceName);
         if (!binding || !this.binding)
             return [];
         const { port, timeout = DEFAULT_SCAN_TIMEOUT } = props;