incyclist-services 1.4.13 → 1.4.15

package/lib/activities/base/utils/activity.js

@@ -111,15 +111,15 @@ let Activity = (() => {
                 return !!this.info.details;
             }
             getTitle() {
-                var _b;
+                var _b, _c, _d, _e, _f, _g;
                 let title = this.info.summary.title;
                 if (title === model_1.DEFAULT_ACTIVITY_TITLE) {
-                    if ((_b = this.details.route) === null || _b === void 0 ? void 0 : _b.title) {
-                        title = this.details.route.title;
+                    if ((_c = (_b = this.details) === null || _b === void 0 ? void 0 : _b.route) === null || _c === void 0 ? void 0 : _c.title) {
+                        title = (_d = this.details) === null || _d === void 0 ? void 0 : _d.route.title;
                     }
                     else {
-                        title = this.details.route.name;
-                        const route = (0, routes_1.useRouteList)().getRouteDescription(this.details.route.id);
+                        title = (_e = this.details) === null || _e === void 0 ? void 0 : _e.route.name;
+                        const route = (0, routes_1.useRouteList)().getRouteDescription((_g = (_f = this.details) === null || _f === void 0 ? void 0 : _f.route) === null || _g === void 0 ? void 0 : _g.id);
                         if (route) {
                             title = route.title;
                         }

package/lib/activities/list/service.js

@@ -341,12 +341,12 @@ let ActivityListService = (() => {
             const points = logs.map(p => { var _a; return ({ lat: p.lat, lng: (_a = p.lng) !== null && _a !== void 0 ? _a : p.lon }); });
             const props = {
                 title: this.selected.getTitle(),
-                distance: activity.distance,
-                duration: activity.time,
+                distance: activity === null || activity === void 0 ? void 0 : activity.distance,
+                duration: activity === null || activity === void 0 ? void 0 : activity.time,
                 elevation: this.selected.getElevation(),
-                startPos: activity.segment ? undefined : activity.startPos,
-                segment: activity.segment,
-                started: new Date(activity.startTime),
+                startPos: (activity === null || activity === void 0 ? void 0 : activity.segment) ? undefined : activity === null || activity === void 0 ? void 0 : activity.startPos,
+                segment: activity === null || activity === void 0 ? void 0 : activity.segment,
+                started: activity ? new Date(activity.startTime) : undefined,
                 showMap: true,
                 points,
                 activity,

package/lib/devices/ride/service.js

@@ -601,6 +601,7 @@ let DeviceRideService = (() => {
                 return;
             ai.ivToCheck = (0, timers_1.setInterval)(() => { check(); }, 1000);
             ai.isHealthy = true;
+            ai.isRestarting = false;
             if (ai.dataStatus !== undefined && ai.dataStatus !== 'green') {
                 ai.dataStatus = 'green';
                 const { enabledCapabilities } = this.getEnabledCapabilities(ai);
@@ -628,19 +629,21 @@ let DeviceRideService = (() => {
         prepareReconnect(unhealthy) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a;
-                this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
-                this.reconnectBusy = true;
-                if (unhealthy.isRestarting)
+                this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, isRestarting: unhealthy.isRestarting });
+                if (unhealthy.isRestarting) {
+                    this.logEvent({ message: 'skipped reconnect - device already restarting', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                     return;
+                }
                 yield (0, sleep_1.sleep)(1000);
                 if (unhealthy.isHealthy || unhealthy.isRestarting) {
                     this.logEvent({ message: 'skipped reconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                     return;
                 }
-                this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                 const ifName = unhealthy.adapter.getInterface();
                 const adapters = (_a = this.rideAdapters) === null || _a === void 0 ? void 0 : _a.filter(ai => ai.adapter.getInterface() === ifName);
-                if (!adapters.find(ai => ai.isHealthy) && adapters.length > 1) {
+                const stillHealthy = adapters.filter(ai => ai.isHealthy);
+                this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, stillHealthy: stillHealthy === null || stillHealthy === void 0 ? void 0 : stillHealthy.length, onSameInterface: adapters.length });
+                if (!(stillHealthy === null || stillHealthy === void 0 ? void 0 : stillHealthy.length) && adapters.length > 1) {
                     yield this.reconnectInterface(ifName, adapters);
                 }
                 else {
@@ -790,7 +793,6 @@ let DeviceRideService = (() => {
                     }
                     if (success) {
                         this.startHealthCheck(unhealthy);
-                        unhealthy.isRestarting = false;
                         unhealthy.isStarted = true;
                     }
                     else {
@@ -798,6 +800,7 @@ let DeviceRideService = (() => {
                             yield (0, sleep_1.sleep)(1000);
                     }
                 } while (!stopRequested && !success);
+                unhealthy.isRestarting = false;
                 this.emit('stop-adapter-confirmed', unhealthy.udid);
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "incyclist-devices": "^2.3.8",
+    "incyclist-devices": "^2.3.13",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",