incyclist-services 1.0.37 → 1.0.40

package/lib/devices/access/service.js

@@ -281,8 +281,6 @@ class DeviceAccessService extends events_1.default {
                     i.removeAllListeners('device');
                     i.off('data', onDataHandlers[i.getName()]);
                     this.interfaces[i.getName()].isScanning = false;
-                    if (i.getName() === 'tcpip')
-                        this.interfaces[i.getName()];
                 });
                 adapters.forEach(adapter => adapter.removeAllListeners('data'));
                 this.emitScanStateChange('stopped');
@@ -418,7 +416,6 @@ class DeviceAccessService extends events_1.default {
             const remaining = selectedInterfaces.filter(i => interfaceFilter.includes(i));
             interfaces = remaining.map(name => this.interfaces[name].interface);
         }
-        console.log('~~getINterfacesForScan', filter, interfaces);
         return interfaces;
     }
 }

package/lib/devices/configuration/service.d.ts

@@ -23,6 +23,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     protected logEvent(e: any): void;
     protected logError(err: Error, fn: string): void;
     init(): Promise<void>;
+    protected isNewUi(): any;
     protected verifyCapabilitySettings(): void;
     protected initCapabilties(): void;
     protected initInterfaces(): void;
@@ -40,8 +41,10 @@ export declare class DeviceConfigurationService extends EventEmitter {
     select(udid: string, capability: ExtendedIncyclistCapability, props?: {
         noRecursive?: boolean;
         legacy?: boolean;
+        emit?: boolean;
     }): void;
-    unselect(capability: ExtendedIncyclistCapability): void;
+    private selectSingleDevice;
+    unselect(capability: ExtendedIncyclistCapability, shouldEmit?: boolean): void;
     add(deviceSettings: IncyclistDeviceSettings, props?: {
         legacy?: boolean;
     }): string;
@@ -57,7 +60,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     setMode(udid: string, mode: string): void;
     setModeSettings(udid: string, mode: string, settings: any): void;
     emitModeChanged(udid: string, mode: string, settings: any): void;
-    getAdapters(): AdapterInfo[];
+    getAdapters(onlySelected?: boolean): AdapterInfo[];
     getAllAdapters(): AdapterInfo[];
     getSelected(capability: ExtendedIncyclistCapability): IncyclistDeviceAdapter | undefined;
     protected isDisabled(capability: ExtendedIncyclistCapability): boolean;

package/lib/devices/configuration/service.js

@@ -99,11 +99,19 @@ class DeviceConfigurationService extends events_1.default {
             this.emitInitialized();
         });
     }
+    isNewUi() {
+        return (this.userSettings.isInitialized && this.userSettings.get('NEW_UI', false));
+    }
     verifyCapabilitySettings() {
         const { capabilities } = this.settings;
-        const isNewUi = this.userSettings.get('NEW_UI', false);
-        if (isNewUi)
+        const isNewUi = this.isNewUi();
+        if (isNewUi) {
+            const bikeCapIdx = capabilities.findIndex(c => c.capability === 'bike');
+            if (bikeCapIdx !== -1) {
+                capabilities.splice(bikeCapIdx, 1);
+            }
             return;
+        }
         for (const capability of ['bike', incyclist_devices_1.IncyclistCapability.Control]) {
             const info = capabilities.find(c => c.capability === capability);
             if (info && info.devices.length > 0 && info.selected === undefined)
@@ -144,11 +152,16 @@ class DeviceConfigurationService extends events_1.default {
         }
     }
     initCapabilties() {
+        const isNewUi = this.isNewUi();
+        const target = [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Cadence, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate];
+        if (!isNewUi) {
+            target.push('bike');
+        }
         if (!this.settings)
             this.settings = {};
         if (!this.settings.capabilities)
             this.settings.capabilities = [];
-        [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Cadence, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate, 'bike'].forEach(capability => {
+        target.forEach(capability => {
             if (!this.settings.capabilities.find(c => c.capability === capability))
                 this.settings.capabilities.push({ capability, devices: [], selected: undefined, disabled: false });
         });
@@ -172,6 +185,11 @@ class DeviceConfigurationService extends events_1.default {
         var _a, _b, _c, _d, _e;
         const { gearSelection, connections, modeSettings = {} } = settings;
         this.logEvent({ message: 'converting settings.json', gearSelection, connections });
+        const isNewUi = this.isNewUi();
+        const all = [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Cadence, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate];
+        if (!isNewUi) {
+            all.push('bike');
+        }
         const gears = (0, clone_1.default)(gearSelection || {});
         const { bikes = [], hrms = [] } = gears;
         this.settings = { interfaces: [], devices: [], capabilities: [] };
@@ -221,12 +239,13 @@ class DeviceConfigurationService extends events_1.default {
                 }
                 this.adapters[udid] = adapter;
             }
-            ['bike', incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.Cadence].forEach((cc) => {
+            const target = all.filter(c => c !== incyclist_devices_1.IncyclistCapability.HeartRate);
+            target.forEach((cc) => {
                 if (cc !== incyclist_devices_1.IncyclistCapability.Control || adapter.hasCapability(cc))
                     this.addToCapability(udid, cc);
                 if (isSelected) {
                     const cap = cc;
-                    if (cap === 'bike' || adapter.hasCapability(cap)) {
+                    if ((!isNewUi && cap === 'bike') || adapter.hasCapability(cap)) {
                         const selectedDevice = capabilities.find(c => c.capability === cap);
                         selectedDevice.selected = udid;
                     }
@@ -350,9 +369,10 @@ class DeviceConfigurationService extends events_1.default {
         this.emitCapabiltyChanged();
     }
     select(udid, capability, props) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         this.logEvent({ message: 'select device', udid, capability, props });
-        const { noRecursive = false, legacy = false } = props || {};
+        const isNewUi = this.isNewUi();
+        const { noRecursive = false, legacy = false, emit = true } = props || {};
         const deviceSettings = (_b = (_a = this.settings.devices) === null || _a === void 0 ? void 0 : _a.find(d => d.udid === udid)) === null || _b === void 0 ? void 0 : _b.settings;
         if (!deviceSettings)
             return;
@@ -361,24 +381,30 @@ class DeviceConfigurationService extends events_1.default {
             this.logEvent({ message: 'error: could not find adapter', fn: 'select', udid, capability, adapters: (_c = Object.keys(this.adapters)) === null || _c === void 0 ? void 0 : _c.join(',') });
             return;
         }
-        if (capability === 'bike' && !adapter.isControllable())
+        if (isNewUi) {
+            if (capability === 'bike')
+                return;
+            this.selectSingleDevice(udid, capability);
+            if (emit)
+                this.emitCapabiltyChanged(capability);
+            this.updateUserSettings();
             return;
-        const isControl = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) || (legacy && capability === 'bike');
-        this.addToCapability(udid, capability);
-        const capSettings = (_d = this.settings.capabilities) === null || _d === void 0 ? void 0 : _d.find(c => c.capability === capability);
-        capSettings.selected = udid;
-        if (capSettings.disabled)
-            delete capSettings.disabled;
+        }
+        if ((capability === 'bike') && !adapter.isControllable())
+            return;
+        const isControl = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) || (legacy && !isNewUi && capability === 'bike');
+        this.selectSingleDevice(udid, capability);
         this.emitCapabiltyChanged(capability);
         if (noRecursive)
             return;
         if (isControl) {
             if (capability !== 'bike' && capability !== incyclist_devices_1.IncyclistCapability.Control) {
-                this.select(udid, 'bike', { noRecursive: true, legacy });
+                if (!isNewUi)
+                    this.select(udid, 'bike', { noRecursive: true, legacy });
                 this.select(udid, incyclist_devices_1.IncyclistCapability.Control, { noRecursive: true, legacy });
             }
             else {
-                if (capability === 'bike' && isControl) {
+                if (!isNewUi && capability === 'bike' && isControl) {
                     this.select(udid, incyclist_devices_1.IncyclistCapability.Control, { noRecursive: true, legacy });
                     this.select(udid, incyclist_devices_1.IncyclistCapability.Power, { noRecursive: true, legacy });
                     if (legacy) {
@@ -406,13 +432,21 @@ class DeviceConfigurationService extends events_1.default {
                 });
             }
         }
-        else if (!isControl && capability === 'bike') {
+        else if (!isControl && !isNewUi && capability === 'bike') {
             this.unselect(incyclist_devices_1.IncyclistCapability.Control);
             this.select(udid, incyclist_devices_1.IncyclistCapability.Power, { noRecursive: true, legacy });
         }
         this.updateUserSettings();
     }
-    unselect(capability) {
+    selectSingleDevice(udid, capability) {
+        var _a;
+        this.addToCapability(udid, capability);
+        const capSettings = (_a = this.settings.capabilities) === null || _a === void 0 ? void 0 : _a.find(c => c.capability === capability);
+        capSettings.selected = udid;
+        if (capSettings.disabled)
+            delete capSettings.disabled;
+    }
+    unselect(capability, shouldEmit = true) {
         this.logEvent({ message: 'unselect device', capability });
         if (!this.settings || !this.settings.capabilities)
             return;
@@ -420,11 +454,13 @@ class DeviceConfigurationService extends events_1.default {
         if (settings) {
             settings.selected = null;
             this.updateUserSettings();
-            this.emitCapabiltyChanged(settings.capability);
+            if (shouldEmit)
+                this.emitCapabiltyChanged(settings.capability);
         }
     }
     add(deviceSettings, props) {
         var _a, _b;
+        const isNewUi = this.isNewUi();
         let udid = this.getUdid(deviceSettings);
         const { legacy = false } = props || {};
         this.logEvent({ message: 'add device', udid, deviceSettings, legacy });
@@ -449,10 +485,10 @@ class DeviceConfigurationService extends events_1.default {
         this.initCapabilties();
         this.settings.capabilities.forEach(c => {
             if (c.devices.includes(udid))
-                return;
+                return udid;
             const isBike = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control);
             const isPower = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Power);
-            if (legacy) {
+            if (legacy && !isNewUi) {
                 const isBikeCap = c.capability === 'bike';
                 const isControlCap = c.capability === incyclist_devices_1.IncyclistCapability.Control;
                 const isHrmCap = c.capability === incyclist_devices_1.IncyclistCapability.HeartRate;
@@ -470,7 +506,7 @@ class DeviceConfigurationService extends events_1.default {
                 }
             }
             else {
-                if (adapter.hasCapability(c.capability) || (c.capability === 'bike' && (isBike || isPower))) {
+                if (adapter.hasCapability(c.capability) || (!isNewUi && c.capability === 'bike' && (isBike || isPower))) {
                     c.devices.push(udid);
                     if (!c.selected && !c.disabled && (isBike || c.capability === incyclist_devices_1.IncyclistCapability.HeartRate))
                         c.selected = udid;
@@ -491,7 +527,6 @@ class DeviceConfigurationService extends events_1.default {
         const singleDelete = capability && ((capability !== 'bike' && capability !== incyclist_devices_1.IncyclistCapability.Control) || forceSingle);
         if (singleDelete) {
             const record = capabilities.find(c => c.capability === capability);
-            console.log('~~~ record', record);
             if (record) {
                 const deviceIdx = record.devices.findIndex(d => d === udid);
                 if (record.selected === udid) {
@@ -505,10 +540,8 @@ class DeviceConfigurationService extends events_1.default {
                     }
                 }
                 if (deviceIdx !== -1) {
-                    console.log('~~~ remove device', deviceIdx);
                     record.devices.splice(deviceIdx, 1);
                     if (forceSingle) {
-                        console.log('~~~ emit Update', deviceIdx);
                         this.emitCapabiltyChanged(capability);
                         this.updateUserSettings();
                     }
@@ -540,6 +573,9 @@ class DeviceConfigurationService extends events_1.default {
         }
     }
     addToCapability(udid, capability) {
+        const isNewUi = this.isNewUi();
+        if (isNewUi && capability === 'bike')
+            return;
         if (!this.settings)
             this.settings = {};
         if (!this.settings.capabilities)
@@ -587,7 +623,7 @@ class DeviceConfigurationService extends events_1.default {
         this.userSettings.set('interfaces', this.settings.interfaces);
     }
     canStartRide() {
-        const isNewUi = this.userSettings.get('NEW_UI', false);
+        const isNewUi = this.isNewUi();
         const { devices, capabilities } = this.settings || {};
         if (!devices || !capabilities)
             return false;
@@ -623,7 +659,7 @@ class DeviceConfigurationService extends events_1.default {
                 modes = adapter.getSupportedCyclingModes();
                 if (!mode) {
                     modeObj = adapter.getDefaultCyclingMode();
-                    mode = modeObj.getName();
+                    mode = modeObj === null || modeObj === void 0 ? void 0 : modeObj.getName();
                 }
             }
             settings = (device.modes ? device.modes[mode] : undefined) || {};
@@ -668,7 +704,18 @@ class DeviceConfigurationService extends events_1.default {
     emitModeChanged(udid, mode, settings) {
         this.emit('mode-changed', udid, mode, settings);
     }
-    getAdapters() {
+    getAdapters(onlySelected = true) {
+        if (!onlySelected) {
+            const udids = Object.keys(this.adapters);
+            if (!udids || udids.length === 0)
+                return [];
+            const info = [];
+            udids.forEach(udid => {
+                const adapter = this.adapters[udid];
+                info.push({ udid, adapter, capabilities: adapter.getCapabilities() });
+            });
+            return info;
+        }
         const { capabilities, devices } = this.settings || {};
         const adapters = [];
         capabilities.forEach(c => {

package/lib/devices/pairing/model.d.ts

@@ -1,6 +1,7 @@
-import { DeviceData, DeviceSettings, IncyclistCapability } from "incyclist-devices";
+import { DeviceData, DeviceSettings, IncyclistCapability, IncyclistDeviceAdapter } from "incyclist-devices";
 import { EnrichedInterfaceSetting } from "../access";
-import { AdapterRideInfo, RideServiceCheckFilter } from "../ride";
+import { RideServiceCheckFilter } from "../ride";
+import { AdapterInfo } from "../configuration";
 export interface DevicePairingData {
     udid: string;
     name: string;
@@ -9,6 +10,7 @@ export interface DevicePairingData {
     value?: number;
     unit?: string;
     selected: boolean;
+    interfaceInactive?: boolean;
 }
 export interface CapabilityData {
     capability: IncyclistCapability;
@@ -17,7 +19,7 @@ export interface CapabilityData {
     connectState?: DevicePairingStatus;
     deviceName: string;
     deviceNames: string;
-    selected: string;
+    selected?: string;
     disabled: boolean;
     interface: string;
     devices: Array<DevicePairingData>;
@@ -30,23 +32,34 @@ export interface PairingProps {
     filter?: RideServiceCheckFilter;
     enforcedScan?: boolean;
 }
-export interface PairingInfo {
-    promiseCheck?: Promise<boolean>;
-    promiseStart?: Promise<boolean>;
-    promiseScan?: Promise<DeviceSettings[]>;
-    props: PairingProps;
+export interface PairingState {
+    capabilities?: Array<CapabilityData>;
+    interfaces?: Array<EnrichedInterfaceSetting>;
+    canStartRide?: boolean;
+    adapters?: Array<AdapterInfo>;
+}
+export interface InternalPairingState extends PairingState {
+    initialized: boolean;
+    stopRequested?: boolean;
+    stopped?: boolean;
+    check?: {
+        promise: Promise<boolean>;
+    };
+    scan?: {
+        promise: Promise<DeviceSettings[]>;
+        adapters?: Array<{
+            udid: string;
+            adapter: IncyclistDeviceAdapter;
+            handler: any;
+        }>;
+    };
+    props?: PairingProps;
     data?: Array<{
         udid: string;
         data: DeviceData;
         ts: number;
     }>;
 }
-export interface PairingState {
-    capabilities?: Array<CapabilityData>;
-    interfaces?: Array<EnrichedInterfaceSetting>;
-    canStartRide?: boolean;
-    adapters?: Array<AdapterRideInfo>;
-}
 export interface DeviceSelectState {
     capability: IncyclistCapability;
     devices: Array<DevicePairingData>;

package/lib/devices/pairing/service.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { DeviceAccessService } from "../access/service";
-import { CapabilityInformation, DeviceConfigurationInfo, DeviceConfigurationService, IncyclistDeviceSettings, InterfaceSetting } from "../configuration";
-import { CapabilityData, DevicePairingData, DevicePairingStatus, DeviceSelectState, PairingInfo, PairingProps, PairingSettings, PairingState } from "./model";
+import { AdapterInfo, CapabilityInformation, DeviceConfigurationInfo, DeviceConfigurationService, IncyclistDeviceSettings, InterfaceSetting } from "../configuration";
+import { CapabilityData, DevicePairingData, DevicePairingStatus, DeviceSelectState, InternalPairingState, PairingProps, PairingSettings, PairingState } from "./model";
 import { EventLogger } from 'gd-eventlog';
-import { DeviceData, IncyclistCapability } from "incyclist-devices";
-import { AdapterRideInfo, AdapterStateInfo, DeviceRideService } from "../ride";
+import { DeviceData, IncyclistCapability, IncyclistDeviceAdapter } from "incyclist-devices";
+import { AdapterStateInfo, DeviceRideService } from "../ride";
 import EventEmitter from "events";
 export declare const mappedCapability: (c: CapabilityInformation) => CapabilityData;
 export declare const mappedCapabilities: (capabilities: DeviceConfigurationInfo) => Array<CapabilityData>;
@@ -18,16 +18,15 @@ export declare class DevicePairingService extends EventEmitter {
     protected configuration: DeviceConfigurationService;
     protected access: DeviceAccessService;
     protected rideService: DeviceRideService;
-    protected initialized: boolean;
     protected logger: EventLogger;
     protected debug: any;
-    protected pairingInfo: PairingInfo;
     protected settings: PairingSettings;
-    protected state: PairingState;
+    protected state: InternalPairingState;
+    protected deviceSelectState: DeviceSelectState | null;
     protected onPairingStartedHandler: any;
     protected onPairingSuccessHandler: any;
     protected onPairingErrorHandler: any;
-    protected onPairingDataHandler: any;
+    protected onDeviceDataHandler: any;
     protected onScanningDataHandler: any;
     protected onInterfaceConfigChangedHandler: any;
     protected onConfigurationUpdateHandler: any;
@@ -36,12 +35,16 @@ export declare class DevicePairingService extends EventEmitter {
     static getInstance(): DevicePairingService;
     constructor(services?: Services);
     start(onStateChanged: (newState: PairingState) => void): Promise<void>;
+    protected initConfigHandlers(): void;
+    protected removeConfigHandlers(): void;
     stop(): Promise<void>;
     startDeviceSelection(capability: IncyclistCapability, onDeviceSelectStateChanged: (newState: DeviceSelectState) => void): DeviceSelectState;
     stopDeviceSelection(): Promise<void>;
     selectDevice(capability: IncyclistCapability, udid: string, addAll?: boolean): Promise<void>;
-    delectDevice(capability: IncyclistCapability, udid: string, deleteAll?: boolean): Promise<void>;
+    deleteDevice(capability: IncyclistCapability, udid: string, deleteAll?: boolean): Promise<void>;
     changeInterfaceSettings(name: string, settings: InterfaceSetting): Promise<void>;
+    private restart;
+    protected _stop(): Promise<void>;
     protected logEvent(event: any): void;
     protected setDebug(enabled: boolean): void;
     protected logError(err: Error, fn: string): void;
@@ -49,7 +52,7 @@ export declare class DevicePairingService extends EventEmitter {
     protected getCapabilityDevice(capability: IncyclistCapability | CapabilityData, udid?: string): DevicePairingData;
     protected onConfigLoaded(capabilitiesLoaded: DeviceConfigurationInfo, interfacesLoaded: Array<InterfaceSetting>): Promise<void>;
     protected waitForInit(): Promise<void>;
-    protected lazyInit(): Promise<void>;
+    protected getExternaState(toEmit: PairingState): PairingState;
     protected emitStateChange(newState?: PairingState): void;
     protected onInterfaceConfigChanged(ifName: string, settings: InterfaceSetting): void;
     protected mergeState(current: any, newState: any): void;
@@ -63,26 +66,43 @@ export declare class DevicePairingService extends EventEmitter {
     protected removeScanningCallbacks(): void;
     protected onPairingStatusUpdate(udid: string, connectState: DevicePairingStatus, notify?: boolean): void;
     protected onPairingStarted(): void;
+    protected checkDevicePairingState(): any[];
     protected onPairingSuccess(info: AdapterStateInfo | string): void;
     protected onPairingError(info: AdapterStateInfo | string): void;
     protected verifyNoRecentData(data: DeviceData, udid: string): boolean;
-    protected onPairingData(data: DeviceData, udid: string): void;
+    protected onDeviceData(data: DeviceData, udid: string): void;
     protected onDeviceDetected(deviceSettings: IncyclistDeviceSettings): void;
+    private markConnected;
     protected disconnectInterface(name: string): void;
-    protected disableInterfaceInCapabilities(name: string): boolean;
     protected connectInterface(name: string): void;
-    protected enableInterfaceInCapabilities(name: string): boolean;
     protected checkCanStart(): boolean;
     protected checkPairingSuccess(): boolean;
+    private stopScanning;
+    private stopPairing;
     protected run(props?: PairingProps): Promise<void>;
+    private startPairing;
+    private processConnectedDevices;
+    private startScanning;
+    protected deregisterScanningDataHandlers(): void;
+    protected cleanupScan(): void;
     protected getPairingRetryDelay(): number;
-    protected stopAdaptersOnInterface(ifaceName: string): Promise<void>;
-    protected getDeviceAdapter(udid: string): import("incyclist-devices").IncyclistDeviceAdapter;
-    protected stopAdaptersWithCapability(capability: IncyclistCapability | CapabilityData): Promise<void>;
-    protected pauseAdapters(adapters: AdapterRideInfo[], enforced?: boolean): void;
+    protected getScanDelay(): number;
+    protected pauseScanDelay(): Promise<boolean>;
+    protected getAdaptersOnInterface(ifaceName: string): AdapterInfo[];
+    protected stopAdaptersOnInterface(ifaceName: string, maxRetry?: number): Promise<void>;
+    protected disableAdaptersOnInterface(name: string): void;
+    protected failAdaptersOnInterface(name: string): void;
+    protected enableAdaptersOnInterface(name: string): void;
+    protected getDeviceAdapter(udid: string): IncyclistDeviceAdapter;
+    protected stopAdaptersWithCapability(capability: IncyclistCapability | CapabilityData, udid?: string): Promise<void>;
+    protected pauseAdapters(adapters: AdapterInfo[], enforced?: boolean): void;
     protected getDeviceSelectionState(): DeviceSelectState;
     protected emitDeviceSelectState(c: CapabilityData): void;
-    protected selectCapabilityDevice(capability: IncyclistCapability, udid: string): void;
-    protected deleteCapabilityDevice(capability: IncyclistCapability, udid: string): void;
+    protected selectCapabilityDevice(capability: IncyclistCapability, udid: string, emitUpdate?: boolean): boolean;
+    protected deleteCapabilityDevice(capability: IncyclistCapability, udid: string, shouldEmit?: boolean): void;
+    protected isScanning(): boolean;
+    protected isPairing(): boolean;
+    protected _stopDeviceSelection(changed: boolean): Promise<void>;
+    private numberOfSelectedCababilities;
 }
 export declare const useDevicePairing: () => DevicePairingService;