incyclist-services 1.5.69 → 1.5.71

package/lib/activities/ride/service.js

@@ -175,7 +175,6 @@ let ActivityRideService = (() => {
                 this.tsPauseStart = undefined;
                 delete this.tsStart;
                 yield (0, utils_1.waitNextTick)();
-                this.cleanup();
                 delete this.observer;
             });
         }

package/lib/devices/ride/service.js

@@ -125,7 +125,7 @@ let DeviceRideService = (() => {
             return this.data;
         }
         getRideAdapters() {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             if ((_a = this.rideAdapters) === null || _a === void 0 ? void 0 : _a.length)
                 return this.rideAdapters;
             try {
@@ -150,11 +150,24 @@ let DeviceRideService = (() => {
                 if (this.simulatorEnforced) {
                     this.setRequestedCapabilties(this.rideAdapters);
                 }
+                if (this.rideAdapters.length === 0) {
+                    const devices = this.getDeviceConfiguration();
+                    const adapter = (_c = (_b = devices.getSelected(incyclist_devices_1.IncyclistCapability.Control)) !== null && _b !== void 0 ? _b : devices.getSelected(incyclist_devices_1.IncyclistCapability.Power)) !== null && _c !== void 0 ? _c : devices.getSelected(incyclist_devices_1.IncyclistCapability.Speed);
+                    if (adapter) {
+                        const adapters = (_d = this.getConfiguredAdapters(true)) !== null && _d !== void 0 ? _d : [];
+                        this.logEvent({ message: 'error',
+                            error: 'incorrect device configuration',
+                            adapters: adapters.map(ai => `${ai.udid}, ${ai.isControl ? '(C)' : ''}`).join('|'),
+                            configuredControlDevice: configuredControlDevice === null || configuredControlDevice === void 0 ? void 0 : configuredControlDevice.udid,
+                            controlDevice: controlDevice === null || controlDevice === void 0 ? void 0 : controlDevice.udid,
+                            simulatorEnforced: this.simulatorEnforced });
+                    }
+                }
                 return this.rideAdapters;
             }
             catch (err) {
                 this.logError(err, 'getRideAdapters');
-                return (_b = this.rideAdapters) !== null && _b !== void 0 ? _b : [];
+                return (_e = this.rideAdapters) !== null && _e !== void 0 ? _e : [];
             }
         }
         getAllAdapters() {
@@ -547,6 +560,7 @@ let DeviceRideService = (() => {
                     logProps.bikeType = (_b = bike.getCyclingMode()) === null || _b === void 0 ? void 0 : _b.getSetting('bikeType');
                 }
                 startProps.capabilities = ai.capabilities;
+                ai.isStarted = false;
                 this.logEvent(Object.assign({ message: `${startType} ${sType} request` }, logProps));
                 return ai.adapter.start(startProps)
                     .then((success) => __awaiter(this, void 0, void 0, function* () {
@@ -901,8 +915,8 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
                 this.cleanInternalCache();
-                delete this.rideAdapters;
                 const adapters = this.getRideAdapters();
+                this.logEvent({ message: 'sending start request', retry: false, deviceInfo: adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo.bind(this)) });
                 this.emit('start-request', adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo.bind(this)));
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)
@@ -915,7 +929,8 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
                 const selected = this.getRideAdapters();
-                this.emit('start-request', selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo));
+                this.logEvent({ message: 'sending start request', retry: true, deviceInfo: selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo.bind(this)) });
+                this.emit('start-request', selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo.bind(this)));
                 const adapters = selected.filter(ai => !ai.adapter.isStarted());
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)

package/lib/ride/display/service.js

@@ -795,7 +795,6 @@ let RideDisplayService = (() => {
                 .on('route-updated', this.onRouteUpdated.bind(this));
         }
         onStateUpdate() {
-            console.log('# state update', this.state);
             this.checkStartStatus();
             this.updateStartOverlay();
         }
@@ -1016,6 +1015,9 @@ let RideDisplayService = (() => {
         isStartDeviceReadyToStart() {
             var _a, _b;
             const devices = (_a = this.deviceInfo) !== null && _a !== void 0 ? _a : [];
+            if (devices.length === 0) {
+                return false;
+            }
             const mandatory = (_b = devices === null || devices === void 0 ? void 0 : devices.filter(d => d.isControl)) !== null && _b !== void 0 ? _b : [];
             return !(mandatory === null || mandatory === void 0 ? void 0 : mandatory.length) || mandatory.filter(d => d.status === 'Started').length == mandatory.length;
         }

package/lib/ride/route/RLVDisplayService.js

@@ -189,11 +189,11 @@ let RLVDisplayService = (() => {
                 return this.infotext;
             }
             checkFinishOptions(position) {
-                var _b, _c;
-                if (this.videos.length === 0 || !((_b = this.currentVideo) === null || _b === void 0 ? void 0 : _b.loaded)) {
+                var _b, _c, _d, _e;
+                if (!((_b = this.videos) === null || _b === void 0 ? void 0 : _b.length) || !((_c = this.currentVideo) === null || _c === void 0 ? void 0 : _c.loaded)) {
                     return super.checkFinishOptions(position);
                 }
-                if (!((_c = this.currentVideo) === null || _c === void 0 ? void 0 : _c.next)) {
+                if (!((_d = this.currentVideo) === null || _d === void 0 ? void 0 : _d.next) || ((_e = this.videos) === null || _e === void 0 ? void 0 : _e.length) === 1) {
                     return super.checkFinishOptions(position);
                 }
                 const finished = this.checkIsRouteFinished(position);
@@ -347,8 +347,12 @@ let RLVDisplayService = (() => {
                 video.loaded = false;
                 video.error = this.buildVideoError(error);
                 if (!video.isInitial) {
-                    this.logEvent({ message: 'could not load next video', error: this.buildVideoError(error) });
-                    this.videos = [this.currentVideo];
+                    this.logEvent({ message: 'could not load next video', video: this.getVideoUrl(video), error: error.message, errorCode: error.code });
+                    const errIdx = this.videos.indexOf(video);
+                    if (errIdx !== -1) {
+                        this.videos.splice(errIdx);
+                        this.logEvent({ message: 'changed video config', videos: this.videos.map(v => this.getVideoUrl(v)).join('|') });
+                    }
                 }
                 this.emit('state-update');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.5.69",
+  "version": "1.5.71",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },