incyclist-services 1.5.49 → 1.5.51

package/lib/activities/active-rides/service.js

@@ -264,37 +264,45 @@ let ActiveRidesService = (() => {
         }
         getDisplayProps() {
             const items = this.get();
-            if (!items.length)
-                return [];
-            const displayProps = [];
-            items.forEach(item => {
-                var _a, _b;
-                const displayItem = {
-                    isUser: item.sessionId === this.session,
-                    name: this.getName(item),
-                    diffDistance: this.getDistanceDiff(item),
-                    distance: item.currentRideDistance,
-                    avatar: this.getAvatar(item),
-                    lap: this.getLap(item, true),
-                    power: item.currentPower,
-                    mpower: this.getRelativePower(item),
-                    speed: item.currentSpeed,
-                    lat: (_a = item.currentPosition) === null || _a === void 0 ? void 0 : _a.lat,
-                    lng: (_b = item.currentPosition) === null || _b === void 0 ? void 0 : _b.lng,
-                };
-                displayProps.push(displayItem);
-            });
-            if (displayProps.length > this.maxLength) {
-                const absDiff = (r) => Math.abs(r.diffDistance);
+            try {
+                if (!items.length)
+                    return [];
+                const displayProps = [];
+                items.forEach(item => {
+                    var _a, _b, _c, _d;
+                    if (!(item === null || item === void 0 ? void 0 : item.id) && !((_b = (_a = item === null || item === void 0 ? void 0 : item.user) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.length) && (item === null || item === void 0 ? void 0 : item.sessionId) !== this.session)
+                        return;
+                    const displayItem = {
+                        isUser: item.sessionId === this.session,
+                        name: this.getName(item),
+                        diffDistance: this.getDistanceDiff(item),
+                        distance: item.currentRideDistance,
+                        avatar: this.getAvatar(item),
+                        lap: this.getLap(item, true),
+                        power: item.currentPower,
+                        mpower: this.getRelativePower(item),
+                        speed: item.currentSpeed,
+                        lat: (_c = item.currentPosition) === null || _c === void 0 ? void 0 : _c.lat,
+                        lng: (_d = item.currentPosition) === null || _d === void 0 ? void 0 : _d.lng,
+                    };
+                    displayProps.push(displayItem);
+                });
+                if (displayProps.length > this.maxLength) {
+                    const absDiff = (r) => Math.abs(r.diffDistance);
+                    displayProps.sort((a, b) => {
+                        return absDiff(b) > absDiff(a) ? -1 : 1;
+                    });
+                    return displayProps.filter((_r, idx) => idx < this.maxLength);
+                }
                 displayProps.sort((a, b) => {
-                    return absDiff(b) > absDiff(a) ? -1 : 1;
+                    return b.diffDistance > a.diffDistance ? -1 : 1;
                 });
-                return displayProps.filter((_r, idx) => idx < this.maxLength);
+                return displayProps;
+            }
+            catch (err) {
+                this.logError(err, 'getDisplayProps', { items });
+                return [];
             }
-            displayProps.sort((a, b) => {
-                return b.diffDistance > a.diffDistance ? -1 : 1;
-            });
-            return displayProps;
         }
         validName(str) {
             if (!(str === null || str === void 0 ? void 0 : str.length))
@@ -309,6 +317,8 @@ let ActiveRidesService = (() => {
             return this.validName((_f = item.user) === null || _f === void 0 ? void 0 : _f.name) ? (_g = item.user) === null || _g === void 0 ? void 0 : _g.name : this.randomName((_h = item.user) === null || _h === void 0 ? void 0 : _h.id);
         }
         randomName(id) {
+            if (!id)
+                return 'Anonymous';
             const names = ['Alex', 'Bart', 'Cosmas', 'Dirk', 'Ernesto', 'Frank', 'Guido', 'Hans', 'Irene', 'John', 'Kai', 'Lorenzo', 'Martin', 'Naijb', 'Oswaldo', 'Pete', 'Quentin', 'Rachel', 'Sophia', 'Trevor', 'Ute', 'Vivian', 'Wil', 'Xaver', 'Younes', 'Zoe'];
             const fnKey = id.charAt(0).toLowerCase();
             const idx = !isNaN(parseInt(fnKey)) ? parseInt(fnKey) : fnKey.charCodeAt(0) - 96;
@@ -514,21 +524,25 @@ let ActiveRidesService = (() => {
             this.getMessageQueue().sendMessage(topic, payload);
         }
         onActivityStartEvent(session, payload) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const prevActive = (_a = this.others) === null || _a === void 0 ? void 0 : _a.length;
             try {
                 const others = (_b = this.others) !== null && _b !== void 0 ? _b : [];
-                if (others.find(ar => ar.sessionId === session))
+                if (others.some(ar => ar.sessionId === session))
+                    return;
+                if (((_c = payload.user) === null || _c === void 0 ? void 0 : _c.id) && ((_d = payload.user) === null || _d === void 0 ? void 0 : _d.id) === ((_e = this.current.user) === null || _e === void 0 ? void 0 : _e.id))
+                    return;
+                if (((_f = payload.user) === null || _f === void 0 ? void 0 : _f.id) && others.some(ar => { var _a, _b; return ((_a = ar.user) === null || _a === void 0 ? void 0 : _a.id) === ((_b = payload.user) === null || _b === void 0 ? void 0 : _b.id); }))
                     return;
                 const entry = Object.assign(Object.assign({ id: Date.now().toString(), tsLastUpdate: Date.now() }, payload), { sessionId: session });
                 this.addActiveRide(entry);
                 if (prevActive === 0) {
                     this.isStarted = true;
-                    this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: (_c = this.activity) === null || _c === void 0 ? void 0 : _c.id, route: (_d = this.activity.route) === null || _d === void 0 ? void 0 : _d.title, routeHash: this.getRouteHash() });
+                    this.logEvent({ message: 'group ride started', active: this.others.length + 1, activityId: (_g = this.activity) === null || _g === void 0 ? void 0 : _g.id, route: (_h = this.activity.route) === null || _h === void 0 ? void 0 : _h.title, routeHash: this.getRouteHash() });
                 }
                 else {
                     this.isStarted = true;
-                    this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_e = this.activity) === null || _e === void 0 ? void 0 : _e.id, route: (_f = this.activity.route) === null || _f === void 0 ? void 0 : _f.title, routeHash: this.getRouteHash() });
+                    this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: (_j = this.activity) === null || _j === void 0 ? void 0 : _j.id, route: (_k = this.activity.route) === null || _k === void 0 ? void 0 : _k.title, routeHash: this.getRouteHash(), user: (_l = payload === null || payload === void 0 ? void 0 : payload.user) === null || _l === void 0 ? void 0 : _l.id });
                 }
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
@@ -644,31 +658,36 @@ let ActiveRidesService = (() => {
             }
         }
         updateCoaches() {
-            if (!this.current)
-                return;
-            const coachesService = this.getCoachesService();
-            const coaches = coachesService.getCoaches();
-            if (!(coaches === null || coaches === void 0 ? void 0 : coaches.length)) {
-                this.coaches = undefined;
-                return;
-            }
-            this.coaches = coaches.map(c => {
-                var _a;
-                const props = c.getDisplayProperties();
-                const rideEntry = {
-                    id: `coach:${props.name}`,
-                    user: {
-                        name: props.name,
+            try {
+                if (!this.current)
+                    return;
+                const coachesService = this.getCoachesService();
+                const coaches = coachesService.getCoaches();
+                if (!(coaches === null || coaches === void 0 ? void 0 : coaches.length)) {
+                    this.coaches = undefined;
+                    return;
+                }
+                this.coaches = coaches.map(c => {
+                    var _a;
+                    const props = c.getDisplayProperties();
+                    const rideEntry = {
                         id: `coach:${props.name}`,
-                    },
-                    ride: (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride,
-                    tsLastUpdate: Date.now(),
-                    currentRideDistance: c.getProgess(),
-                    currentPosition: c.getPosition(),
-                    isCoach: true
-                };
-                return rideEntry;
-            });
+                        user: {
+                            name: props.name,
+                            id: `coach:${props.name}`,
+                        },
+                        ride: (_a = this.current) === null || _a === void 0 ? void 0 : _a.ride,
+                        tsLastUpdate: Date.now(),
+                        currentRideDistance: c.getProgess(),
+                        currentPosition: c.getPosition(),
+                        isCoach: true
+                    };
+                    return rideEntry;
+                });
+            }
+            catch (err) {
+                this.logError(err, 'updateCoaches');
+            }
         }
         cleanup() {
             delete this.current;

package/lib/activities/ride/service.js

@@ -334,7 +334,10 @@ let ActivityRideService = (() => {
             }
         }
         canShowDonate() {
-            if (this.isDonateShown)
+            var _a, _b, _c, _d;
+            if (!((_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.uuid))
+                return false;
+            if (this.isDonateShown || !((_d = (_c = this.activity) === null || _c === void 0 ? void 0 : _c.user) === null || _d === void 0 ? void 0 : _d.uuid))
                 return true;
             let trialGroup;
             if (this.activity.user.uuid.startsWith('1') || this.activity.user.uuid.startsWith('a')) {

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

@@ -92,6 +92,7 @@ export declare class DeviceConfigurationService extends IncyclistService {
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getAdapterFactory(): typeof AdapterFactory;
     protected getDevicesFeatureToggle(): import("incyclist-devices").FeatureToggle;
+    protected getDirectConnectInterface(): import("incyclist-devices").SerialInterface | import("incyclist-devices").AntInterface | import("incyclist-devices").BleInterface | import("incyclist-devices/lib/direct-connect/base/interface").default;
 }
 export declare const useDeviceConfiguration: () => DeviceConfigurationService;
 export {};

package/lib/devices/configuration/service.js

@@ -70,6 +70,7 @@ let DeviceConfigurationService = (() => {
     let _getUserSettings_decorators;
     let _getAdapterFactory_decorators;
     let _getDevicesFeatureToggle_decorators;
+    let _getDirectConnectInterface_decorators;
     var DeviceConfigurationService = _classThis = class extends _classSuper {
         constructor() {
             super('DeviceConfig');
@@ -115,9 +116,15 @@ let DeviceConfigurationService = (() => {
                         this.updateUserSettings();
                     if (!((_c = this.settings) === null || _c === void 0 ? void 0 : _c.devices))
                         this.settings.devices = [];
+                    let updated = false;
                     this.settings.devices.forEach(d => {
-                        if (!(d === null || d === void 0 ? void 0 : d.udid))
+                        if (!(d === null || d === void 0 ? void 0 : d.udid)) {
+                            if ((d === null || d === void 0 ? void 0 : d.settings.interface) === 'wifi') {
+                                d.udid = (0, uuid_1.v4)();
+                                updated = true;
+                            }
                             return;
+                        }
                         try {
                             this.adapters[d.udid] = this.getAdapterFromSetting(d.settings);
                         }
@@ -125,6 +132,9 @@ let DeviceConfigurationService = (() => {
                             this.logEvent({ message: 'error', fn: 'init()->Adapterfactory.create()', error: err.message, udid: d.udid, settings: d.settings, devices: this.settings.devices, stack: err.stack, });
                         }
                     });
+                    if (updated) {
+                        this.getUserSettings().set('devices', this.settings.devices);
+                    }
                     this.initWifiInterface();
                     this.verifyCapabilitySettings();
                     this.removeLegacySettings();
@@ -229,8 +239,16 @@ let DeviceConfigurationService = (() => {
             const { legacy = false } = props || {};
             const deviceAlreadyExists = udid !== undefined;
             let adapter;
+            const updateWifiSettings = (udid) => {
+                var _a, _b;
+                const settingIdx = this.settings.devices.findIndex(d => d.udid === udid);
+                if (settingIdx !== -1 && ((_b = (_a = this.settings.devices[settingIdx]) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.interface) === 'wifi') {
+                    this.settings.devices[settingIdx].settings = Object.assign(Object.assign({}, this.settings.devices[settingIdx].settings), deviceSettings);
+                }
+            };
             if (deviceAlreadyExists && this.adapters[udid]) {
                 adapter = this.adapters[udid];
+                updateWifiSettings(udid);
             }
             else {
                 this.logEvent({ message: 'add device', udid, deviceSettings, legacy });
@@ -240,7 +258,10 @@ let DeviceConfigurationService = (() => {
                     return;
                 }
                 udid = (_b = (_a = this.settings.devices) === null || _a === void 0 ? void 0 : _a.find(d => adapter.isEqual(d.settings))) === null || _b === void 0 ? void 0 : _b.udid;
-                if (!udid) {
+                if (udid) {
+                    updateWifiSettings(udid);
+                }
+                else {
                     if (!this.settings.devices)
                         this.settings.devices = [];
                     udid = (0, uuid_1.v4)();
@@ -512,6 +533,12 @@ let DeviceConfigurationService = (() => {
                 const idx = this.settings.interfaces.indexOf(wifi);
                 this.settings.interfaces[idx] = { name: 'wifi', enabled, invisible };
             }
+            const wifiDevices = this.settings.devices.filter(d => { var _a; return ((_a = d === null || d === void 0 ? void 0 : d.settings) === null || _a === void 0 ? void 0 : _a.interface) === 'wifi'; });
+            const dc = this.getDirectConnectInterface();
+            wifiDevices.forEach(d => {
+                const settings = d.settings;
+                dc.addKnownDevice(settings);
+            });
         }
         confirmWifiInterface() {
             this.getUserSettings().set('wifiConfirmed', true);
@@ -935,6 +962,9 @@ let DeviceConfigurationService = (() => {
         getDevicesFeatureToggle() {
             return (0, incyclist_devices_1.useFeatureToggle)();
         }
+        getDirectConnectInterface() {
+            return incyclist_devices_1.InterfaceFactory.create('wifi');
+        }
     };
     __setFunctionName(_classThis, "DeviceConfigurationService");
     (() => {
@@ -943,9 +973,11 @@ let DeviceConfigurationService = (() => {
         _getUserSettings_decorators = [decorators_1.Injectable];
         _getAdapterFactory_decorators = [decorators_1.Injectable];
         _getDevicesFeatureToggle_decorators = [decorators_1.Injectable];
+        _getDirectConnectInterface_decorators = [decorators_1.Injectable];
         __esDecorate(_classThis, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _getAdapterFactory_decorators, { kind: "method", name: "getAdapterFactory", static: false, private: false, access: { has: obj => "getAdapterFactory" in obj, get: obj => obj.getAdapterFactory }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _getDevicesFeatureToggle_decorators, { kind: "method", name: "getDevicesFeatureToggle", static: false, private: false, access: { has: obj => "getDevicesFeatureToggle" in obj, get: obj => obj.getDevicesFeatureToggle }, metadata: _metadata }, null, _instanceExtraInitializers);
+        __esDecorate(_classThis, null, _getDirectConnectInterface_decorators, { kind: "method", name: "getDirectConnectInterface", static: false, private: false, access: { has: obj => "getDirectConnectInterface" in obj, get: obj => obj.getDirectConnectInterface }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
         DeviceConfigurationService = _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });

package/lib/ride/display/service.js

@@ -103,7 +103,8 @@ let RideDisplayService = (() => {
                 try {
                     this.displayService = this.getRideModeService(true);
                     const ftNewUI = this.getUserSettings().get('NEW_GPX_UI', false);
-                    if (ftNewUI || this.displayService instanceof WorkoutDisplayService_1.WorkoutDisplayService) {
+                    const showLegacy = !ftNewUI && (this.displayService instanceof RLVDisplayService_1.RLVDisplayService);
+                    if (!showLegacy) {
                         this.displayService.init(this);
                         this.displayService.on('lap-completed', this.onLapCompleted.bind(this));
                         this.displayService.on('route-completed', this.onRouteCompleted.bind(this));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.5.49",
+  "version": "1.5.51",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.8.2",
-    "incyclist-devices": "^2.3.39",
+    "incyclist-devices": "^2.3.41",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",