incyclist-services 1.7.17 → 1.7.18

package/lib/cjs/devices/access/service.js

@@ -271,6 +271,16 @@ let DeviceAccessService = (() => {
             this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName] });
             return disconnected;
         }
+        async terminate(ifaceName) {
+            await this.disconnect(ifaceName);
+            if (!ifaceName) {
+                const promises = Object.keys(this.interfaces).map(i => this.terminate(i));
+                await Promise.allSettled(promises);
+                return;
+            }
+            const impl = this.getInterface(ifaceName);
+            await impl.terminate();
+        }
         async scan(filter = {}, props = {}) {
             this.logEvent({ message: 'device scan start', filter, props });
             const detected = [];

package/lib/cjs/devices/page/service.js

@@ -166,7 +166,7 @@ let DevicesPageService = (() => {
                 const caps = this.state.capabilities ?? [];
                 const ifs = this.state.interfaces ?? [];
                 (0, access_1.useDeviceAccess)().enrichWithAccessState(ifs);
-                const interfaces = ifs.map(i => this.getInterfaceDisplayProps(i));
+                const interfaces = ifs.map(i => { return this.getInterfaceDisplayProps(i); });
                 const capProps = caps.map(c => this.getCapabilityDisplayProps(c));
                 const loading = this.promiseOpen != undefined;
                 const CP = (cap) => capProps.find(c => c.capability === cap);
@@ -204,6 +204,7 @@ let DevicesPageService = (() => {
         }
         getInterfaceSettingsObserver() {
             this.interfaceSettingsObserver = this.interfaceSettingsObserver ?? new types_1.Observer();
+            return this.interfaceSettingsObserver;
         }
         getInterfaceSettingsDisplayProps() {
             if (!this.openedInterfaceSettings)
@@ -219,6 +220,11 @@ let DevicesPageService = (() => {
         disableInterface(i) { }
         reconnectInterface(i) { }
         refreshInterface(i) { }
+        closeInterfaceSettings() {
+            this.openedInterfaceSettings = undefined;
+            this.interfaceSettingsObserver?.stop();
+            this.updatePage();
+        }
         getCapabilityDisplayProps(data) {
             const { capability: cap, deviceName, connectState, value, unit, disabled } = data;
             const capability = this.getTCapability(cap);
@@ -281,15 +287,9 @@ let DevicesPageService = (() => {
         }
         openInterfaceSettings(i) {
             const info = this.state.interfaces.find(id => id.name === i);
-            console.log('# open interface settings', i, info);
             this.openedInterfaceSettings = i;
             this.updatePage();
         }
-        closeInterfaceSettings() {
-            this.openedInterfaceSettings = undefined;
-            this.interfaceSettingsObserver?.stop();
-            this.updatePage();
-        }
         onEnableCapability(enabled) {
             const all = this.state.capabilities ?? [];
             const requested = all.find(c => c.capability === this.openedCapability);

package/lib/cjs/ui/service.js

@@ -144,7 +144,7 @@ let UserInterfaceServcie = (() => {
                     pages_1.IncyclistPageService.closePage();
                     await (0, utils_1.waitNextTick)();
                     await (0, devices_1.useDevicePairing)().exit();
-                    await (0, devices_1.useDeviceAccess)().disconnect();
+                    await (0, devices_1.useDeviceAccess)().terminate();
                     this.appState = 'Stopped';
                     this.logEvent({ message: 'onAppExit finished' });
                     this.isTerminated = true;

package/lib/esm/devices/access/service.js

@@ -265,6 +265,16 @@ let DeviceAccessService = (() => {
             this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName] });
             return disconnected;
         }
+        async terminate(ifaceName) {
+            await this.disconnect(ifaceName);
+            if (!ifaceName) {
+                const promises = Object.keys(this.interfaces).map(i => this.terminate(i));
+                await Promise.allSettled(promises);
+                return;
+            }
+            const impl = this.getInterface(ifaceName);
+            await impl.terminate();
+        }
         async scan(filter = {}, props = {}) {
             this.logEvent({ message: 'device scan start', filter, props });
             const detected = [];

package/lib/esm/devices/page/service.js

@@ -163,7 +163,7 @@ let DevicesPageService = (() => {
                 const caps = this.state.capabilities ?? [];
                 const ifs = this.state.interfaces ?? [];
                 useDeviceAccess().enrichWithAccessState(ifs);
-                const interfaces = ifs.map(i => this.getInterfaceDisplayProps(i));
+                const interfaces = ifs.map(i => { return this.getInterfaceDisplayProps(i); });
                 const capProps = caps.map(c => this.getCapabilityDisplayProps(c));
                 const loading = this.promiseOpen != undefined;
                 const CP = (cap) => capProps.find(c => c.capability === cap);
@@ -201,6 +201,7 @@ let DevicesPageService = (() => {
         }
         getInterfaceSettingsObserver() {
             this.interfaceSettingsObserver = this.interfaceSettingsObserver ?? new Observer();
+            return this.interfaceSettingsObserver;
         }
         getInterfaceSettingsDisplayProps() {
             if (!this.openedInterfaceSettings)
@@ -216,6 +217,11 @@ let DevicesPageService = (() => {
         disableInterface(i) { }
         reconnectInterface(i) { }
         refreshInterface(i) { }
+        closeInterfaceSettings() {
+            this.openedInterfaceSettings = undefined;
+            this.interfaceSettingsObserver?.stop();
+            this.updatePage();
+        }
         getCapabilityDisplayProps(data) {
             const { capability: cap, deviceName, connectState, value, unit, disabled } = data;
             const capability = this.getTCapability(cap);
@@ -278,15 +284,9 @@ let DevicesPageService = (() => {
         }
         openInterfaceSettings(i) {
             const info = this.state.interfaces.find(id => id.name === i);
-            console.log('# open interface settings', i, info);
             this.openedInterfaceSettings = i;
             this.updatePage();
         }
-        closeInterfaceSettings() {
-            this.openedInterfaceSettings = undefined;
-            this.interfaceSettingsObserver?.stop();
-            this.updatePage();
-        }
         onEnableCapability(enabled) {
             const all = this.state.capabilities ?? [];
             const requested = all.find(c => c.capability === this.openedCapability);

package/lib/esm/ui/service.js

@@ -141,7 +141,7 @@ let UserInterfaceServcie = (() => {
                     IncyclistPageService.closePage();
                     await waitNextTick();
                     await useDevicePairing().exit();
-                    await useDeviceAccess().disconnect();
+                    await useDeviceAccess().terminate();
                     this.appState = 'Stopped';
                     this.logEvent({ message: 'onAppExit finished' });
                     this.isTerminated = true;

package/lib/types/devices/access/service.d.ts

@@ -22,6 +22,7 @@ export declare class DeviceAccessService extends IncyclistService {
     connect(ifaceName?: string): Promise<boolean>;
     private getScanTimeout;
     disconnect(ifaceName?: string): Promise<boolean>;
+    terminate(ifaceName?: string): Promise<void>;
     scan(filter?: ScanFilter, props?: {
         timeout?: number;
         includeKnown?: boolean;

package/lib/types/devices/page/service.d.ts

@@ -19,19 +19,19 @@ export declare class DevicesPageService extends IncyclistPageService {
     pausePage(): Promise<void>;
     resumePage(): Promise<void>;
     getPageDisplayProperties(): PairingDisplayProps;
-    getInterfaceSettingsObserver(): void;
+    getInterfaceSettingsObserver(): Observer;
     getInterfaceSettingsDisplayProps(): InterfaceSettingsDisplayProps;
     enableInterface(i?: TInterface): void;
     disableInterface(i?: TInterface): void;
     reconnectInterface(i?: TInterface): void;
     refreshInterface(i?: TInterface): void;
+    closeInterfaceSettings(): void;
     protected getCapabilityDisplayProps(data: CapabilityData): CapabilityDisplayProps;
     protected mapInterfaceState(state: InterfaceState): InterfaceDisplayState;
     protected getInterfaceDisplayProps(info: EnrichedInterfaceSetting): InterfaceDisplayProps;
     protected getDeviceListDisplayProps(): DeviceSelectionProps | undefined;
     protected updatePage(): void;
     protected openInterfaceSettings(i: TInterface): void;
-    protected closeInterfaceSettings(): void;
     protected onEnableCapability(enabled: boolean): void;
     protected openDeviceSelection(cap: IncyclistCapability): void;
     protected onDeviceSelected(d: DevicePairingData, addAll?: boolean): void;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.17",
+  "version": "1.7.18",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "axios": "^1.13.5",
-    "incyclist-devices": "^3.0.8",
+    "incyclist-devices": "^3.0.9",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",