incyclist-services 1.7.139 → 1.8.1

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

@@ -720,7 +720,7 @@ let ActiveRidesService = (() => {
             if (!this.current || !this.isOnline)
                 return;
             const topic = `incyclist/activity/${this.session}/${this.getRouteHash()}/update`;
-            this.getMessageQueue().sendMessage(topic, payload);
+            this.getMessageQueue().sendMessage(topic, { ...payload, ts: Date.now() });
         }
         async onActivityUpdateEvent(session, payload) {
             try {

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

@@ -42,6 +42,9 @@ const list_1 = require("../list");
 const sleep_1 = require("../../utils/sleep");
 const workouts_1 = require("../../workouts");
 const devices_1 = require("../../devices");
+const service_1 = require("../../fileaccess/service");
+const service_2 = require("../../routes/video-availability/service");
+const pageActions_1 = require("../../routes/video-availability/pageActions");
 let ActivitiesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -52,6 +55,9 @@ let ActivitiesPageService = (() => {
     let _getActivityList_decorators;
     let _getWorkoutList_decorators;
     let _getDevicePairing_decorators;
+    let _getFolderAccess_decorators;
+    let _getAvailability_decorators;
+    let _getVideoActions_decorators;
     var ActivitiesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -59,9 +65,15 @@ let ActivitiesPageService = (() => {
             _getActivityList_decorators = [decorators_1.Injectable];
             _getWorkoutList_decorators = [decorators_1.Injectable];
             _getDevicePairing_decorators = [decorators_1.Injectable];
+            _getFolderAccess_decorators = [decorators_1.Injectable];
+            _getAvailability_decorators = [decorators_1.Injectable];
+            _getVideoActions_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getActivityList_decorators, { kind: "method", name: "getActivityList", static: false, private: false, access: { has: obj => "getActivityList" in obj, get: obj => obj.getActivityList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getFolderAccess_decorators, { kind: "method", name: "getFolderAccess", static: false, private: false, access: { has: obj => "getFolderAccess" in obj, get: obj => obj.getFolderAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getAvailability_decorators, { kind: "method", name: "getAvailability", static: false, private: false, access: { has: obj => "getAvailability" in obj, get: obj => obj.getAvailability }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getVideoActions_decorators, { kind: "method", name: "getVideoActions", static: false, private: false, access: { has: obj => "getVideoActions" in obj, get: obj => obj.getVideoActions }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -71,6 +83,9 @@ let ActivitiesPageService = (() => {
         listState;
         detailActivityId;
         isOpen = false;
+        rideAgainRoute;
+        rideAgainCheck = null;
+        rideAgainVideoUpdateHandler = this.onRideAgainVideoUpdate.bind(this);
         constructor() {
             super('ActivitiesPage');
         }
@@ -78,6 +93,7 @@ let ActivitiesPageService = (() => {
             if (this.isOpen) {
                 this.getActivityList().closeList();
                 this.stopEventListener();
+                this.closeRideAgainCheck();
             }
             try {
                 this.logEvent({ message: 'page shown', page: 'Activities' });
@@ -102,6 +118,7 @@ let ActivitiesPageService = (() => {
                 this.logEvent({ message: 'page closed', page: 'Activities' });
                 this.getActivityList().closeList();
                 this.stopEventListener();
+                this.closeRideAgainCheck();
                 this.isOpen = false;
                 super.closePage();
             }
@@ -121,6 +138,7 @@ let ActivitiesPageService = (() => {
         resumePage() {
             try {
                 this.startEventListener();
+                this.getAvailability().onForeground().catch(err => this.logError(err, 'resumePage'));
                 return super.resumePage();
             }
             catch (err) {
@@ -131,7 +149,8 @@ let ActivitiesPageService = (() => {
             const props = {
                 loading: this.listState.loading,
                 activities: this.listState.activities,
-                detailActivityId: this.detailActivityId
+                detailActivityId: this.detailActivityId,
+                rideAgainCheck: this.rideAgainCheck
             };
             return props;
         }
@@ -165,16 +184,128 @@ let ActivitiesPageService = (() => {
                 return { activityId, attachedWorkout: null };
             }
         }
-        onRideAgain(route) {
+        async onRideAgain(route) {
             try {
-                const pairing = this.getDevicePairing();
-                const readyToStart = pairing.isReadyToStart();
-                this.logEvent({ message: 'Attempting to start a ride again', id: route?.id, title: route?.title, readyToStart });
-                const next = readyToStart ? '/rideDeviceOK' : '/pairingStart';
-                this.moveTo(next);
+                if (!route?.id || !this.getVideoActions().isSupported()) {
+                    this.navigateToRide(route);
+                    return 'started';
+                }
+                let status;
+                try {
+                    await this.getFolderAccess().activateAll();
+                    status = await this.getAvailability().refresh(route.id);
+                }
+                catch (err) {
+                    this.logError(err, 'onRideAgain');
+                    this.navigateToRide(route);
+                    return 'started';
+                }
+                if (status.state === 'ready' || status.state === 'unknown') {
+                    this.closeRideAgainCheck();
+                    this.navigateToRide(route);
+                    return 'started';
+                }
+                this.openRideAgainCheck(route);
+                return 'blocked';
             }
             catch (err) {
                 this.logError(err, 'onRideAgain');
+                return 'started';
+            }
+        }
+        onRideAgainCheckClosed() {
+            try {
+                this.closeRideAgainCheck();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onRideAgainCheckClosed');
+            }
+        }
+        onRideAgainCheckStart() {
+            const route = this.rideAgainRoute;
+            if (!route)
+                return Promise.resolve('blocked');
+            return this.onRideAgain(route);
+        }
+        onVideoDownloadPressed(routeId) {
+            try {
+                this.getVideoActions().onVideoDownloadPressed(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoDownloadPressed');
+            }
+        }
+        onVideoDownloadConfirmed(routeId, choice) {
+            try {
+                this.getVideoActions().onVideoDownloadConfirmed(routeId, choice);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoDownloadConfirmed');
+            }
+        }
+        onVideoDownloadDismissed(routeId) {
+            try {
+                this.getVideoActions().onVideoDownloadDismissed(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoDownloadDismissed');
+            }
+        }
+        onVideoStop(routeId) {
+            try {
+                this.getVideoActions().onVideoStop(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoStop');
+            }
+        }
+        onVideoRetry(routeId) {
+            try {
+                this.getVideoActions().onVideoRetry(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoRetry');
+            }
+        }
+        onVideoKeepInstead(routeId) {
+            try {
+                this.getVideoActions().onVideoKeepInstead(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoKeepInstead');
+            }
+        }
+        onVideoRemovePressed(routeId) {
+            try {
+                this.getVideoActions().onVideoRemovePressed(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoRemovePressed');
+            }
+        }
+        onVideoRemoveConfirmed(routeId) {
+            try {
+                this.getVideoActions().onVideoRemoveConfirmed(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoRemoveConfirmed');
+            }
+        }
+        onVideoRemoveDismissed(routeId) {
+            try {
+                this.getVideoActions().onVideoRemoveDismissed(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onVideoRemoveDismissed');
+            }
+        }
+        async onConfirmAccess(routeId) {
+            try {
+                await this.getVideoActions().onConfirmAccess(routeId);
+            }
+            catch (err) {
+                this.logError(err, 'onConfirmAccess');
             }
         }
         onClearWorkoutSelection() {
@@ -198,6 +329,70 @@ let ActivitiesPageService = (() => {
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
+        navigateToRide(route) {
+            const pairing = this.getDevicePairing();
+            const readyToStart = pairing.isReadyToStart();
+            this.logEvent({ message: 'Attempting to start a ride again', id: route?.id, title: route?.title, readyToStart });
+            const next = readyToStart ? '/rideDeviceOK' : '/pairingStart';
+            this.moveTo(next);
+        }
+        openRideAgainCheck(route) {
+            this.rideAgainRoute = route;
+            this.rideAgainCheck = {
+                routeId: route.id,
+                routeTitle: route.title ?? '',
+                video: this.getVideoActions().getDisplayProps(route.id),
+                downloadedWhileOpen: false
+            };
+            this.subscribeToRideAgainVideoUpdates();
+            this.updatePageDisplay();
+        }
+        closeRideAgainCheck() {
+            if (!this.rideAgainCheck && !this.rideAgainRoute)
+                return;
+            this.unsubscribeFromRideAgainVideoUpdates();
+            this.rideAgainRoute = undefined;
+            this.rideAgainCheck = null;
+        }
+        subscribeToRideAgainVideoUpdates() {
+            try {
+                this.unsubscribeFromRideAgainVideoUpdates();
+                this.getAvailability().on('route-video-update', this.rideAgainVideoUpdateHandler);
+                this.getVideoActions().on('route-video-actions-update', this.rideAgainVideoUpdateHandler);
+            }
+            catch (err) {
+                this.logError(err, 'subscribeToRideAgainVideoUpdates');
+            }
+        }
+        unsubscribeFromRideAgainVideoUpdates() {
+            try {
+                this.getAvailability().off('route-video-update', this.rideAgainVideoUpdateHandler);
+                this.getVideoActions().off('route-video-actions-update', this.rideAgainVideoUpdateHandler);
+            }
+            catch (err) {
+                this.logError(err, 'unsubscribeFromRideAgainVideoUpdates');
+            }
+        }
+        onRideAgainVideoUpdate(routeId) {
+            try {
+                const route = this.rideAgainRoute;
+                if (!route || !this.rideAgainCheck)
+                    return;
+                if (routeId && routeId !== route.id)
+                    return;
+                const status = this.getAvailability().getStatus(route.id);
+                const nowReady = status.state === 'ready' || status.state === 'unknown';
+                this.rideAgainCheck = {
+                    ...this.rideAgainCheck,
+                    video: this.getVideoActions().getDisplayProps(route.id),
+                    downloadedWhileOpen: this.rideAgainCheck.downloadedWhileOpen || nowReady
+                };
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onRideAgainVideoUpdate');
+            }
+        }
         onStateUpdate(state) {
             if (state)
                 this.listState = state;
@@ -226,6 +421,15 @@ let ActivitiesPageService = (() => {
         getDevicePairing() {
             return (0, devices_1.useDevicePairing)();
         }
+        getFolderAccess() {
+            return (0, service_1.useFolderAccess)();
+        }
+        getAvailability() {
+            return (0, service_2.useRouteVideoAvailability)();
+        }
+        getVideoActions() {
+            return (0, pageActions_1.useRouteVideoPageActions)();
+        }
     };
     return ActivitiesPageService = _classThis;
 })();

package/lib/cjs/activities/ride/service.js

@@ -101,6 +101,7 @@ let ActivityRideService = (() => {
         isSaveDone;
         isDonateShown;
         isSummaryShown;
+        stopPromise;
         statsCalculator;
         durationCalculator;
         deviceDataHandler = this.onDeviceData.bind(this);
@@ -183,6 +184,17 @@ let ActivityRideService = (() => {
             }
         }
         async stop() {
+            if (this.stopPromise !== undefined)
+                return this.stopPromise;
+            this.stopPromise = this.doStop();
+            try {
+                await this.stopPromise;
+            }
+            finally {
+                delete this.stopPromise;
+            }
+        }
+        async doStop() {
             this.stopWorker();
             if (!this.observer || !this.activity)
                 return;
@@ -206,7 +218,9 @@ let ActivityRideService = (() => {
             delete this.observer;
         }
         async cleanup() {
-            if (this.state !== 'idle' && this.state !== 'completed')
+            if (this.stopPromise !== undefined)
+                await this.stopPromise;
+            else if (this.state !== 'idle' && this.state !== 'completed')
                 await this.stop();
             delete this.activity;
         }
@@ -1161,7 +1175,7 @@ let ActivityRideService = (() => {
         getTotalDistance() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;
@@ -1181,7 +1195,7 @@ let ActivityRideService = (() => {
         getTotalElevation() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;

package/lib/cjs/api/bindings/index.js

@@ -67,6 +67,7 @@ let IncyclistBindings = (() => {
         serial;
         crypto;
         fetch;
+        fileAccess;
         ant;
         ble;
         wifi;

package/lib/cjs/fileaccess/externalFiles.js

@@ -117,20 +117,9 @@ let ExternalFileService = (() => {
         async ensureLocal(path, opts) {
             const start = Date.now();
             const binding = this.getBindings()?.fileAccess;
-            if (!path || !binding || !binding.isSupported())
-                return { ok: true, downloaded: false, waitedMs: 0 };
-            if (path.startsWith('http://') || path.startsWith('https://') || path.startsWith('content://'))
-                return { ok: true, downloaded: false, waitedMs: 0 };
-            let location;
-            try {
-                location = binding.classifyLocation(path);
-            }
-            catch (err) {
-                this.logError(err, 'ensureLocal:classifyLocation');
-                return { ok: true, downloaded: false, waitedMs: 0 };
-            }
-            if (location !== 'icloud')
-                return { ok: true, downloaded: false, waitedMs: 0 };
+            const skip = this.resolveSkip(path, binding);
+            if (skip)
+                return skip;
             const timeoutMs = opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
             const isCancelled = opts?.isCancelled ?? (() => false);
             try {
@@ -139,7 +128,7 @@ let ExternalFileService = (() => {
                     return { ok: false, reason: 'access-lost' };
                 if (probe.state === 'not-found')
                     return { ok: false, reason: 'not-found' };
-                let availability = await binding.getAvailability(path);
+                const availability = await binding.getAvailability(path);
                 if (this.isLocallyAvailable(availability))
                     return { ok: true, downloaded: false, waitedMs: Date.now() - start };
                 if (availability.downloadError)
@@ -149,29 +138,47 @@ let ExternalFileService = (() => {
                 if (isCancelled())
                     return { ok: false, reason: 'cancelled' };
                 await binding.startDownload(path);
-                let interval = INITIAL_POLL_INTERVAL_MS;
-                for (;;) {
-                    const elapsed = Date.now() - start;
-                    if (elapsed >= timeoutMs)
-                        return { ok: false, reason: 'timeout' };
-                    if (isCancelled())
-                        return { ok: false, reason: 'cancelled' };
-                    if (this.isOffline())
-                        return { ok: false, reason: 'offline' };
-                    await (0, sleep_1.sleep)(Math.max(0, Math.min(interval, timeoutMs - elapsed)));
-                    interval = BACKOFF_POLL_INTERVAL_MS;
-                    availability = await binding.getAvailability(path);
-                    if (this.isLocallyAvailable(availability))
-                        return { ok: true, downloaded: true, waitedMs: Date.now() - start };
-                    if (availability.downloadError)
-                        return this.downloadFailedResult(availability.downloadError);
-                }
+                return await this.pollUntilAvailable(binding, path, start, timeoutMs, isCancelled);
             }
             catch (err) {
                 this.logError(err, 'ensureLocal');
                 return { ok: false, reason: 'download-failed' };
             }
         }
+        resolveSkip(path, binding) {
+            if (!path || !binding?.isSupported())
+                return { ok: true, downloaded: false, waitedMs: 0 };
+            if (path.startsWith('http://') || path.startsWith('https://') || path.startsWith('content://'))
+                return { ok: true, downloaded: false, waitedMs: 0 };
+            let location;
+            try {
+                location = binding.classifyLocation(path);
+            }
+            catch (err) {
+                this.logError(err, 'ensureLocal:classifyLocation');
+                return { ok: true, downloaded: false, waitedMs: 0 };
+            }
+            return location !== 'icloud' ? { ok: true, downloaded: false, waitedMs: 0 } : undefined;
+        }
+        async pollUntilAvailable(binding, path, start, timeoutMs, isCancelled) {
+            let interval = INITIAL_POLL_INTERVAL_MS;
+            for (;;) {
+                const elapsed = Date.now() - start;
+                if (elapsed >= timeoutMs)
+                    return { ok: false, reason: 'timeout' };
+                if (isCancelled())
+                    return { ok: false, reason: 'cancelled' };
+                if (this.isOffline())
+                    return { ok: false, reason: 'offline' };
+                await (0, sleep_1.sleep)(Math.max(0, Math.min(interval, timeoutMs - elapsed)));
+                interval = BACKOFF_POLL_INTERVAL_MS;
+                const availability = await binding.getAvailability(path);
+                if (this.isLocallyAvailable(availability))
+                    return { ok: true, downloaded: true, waitedMs: Date.now() - start };
+                if (availability.downloadError)
+                    return this.downloadFailedResult(availability.downloadError);
+            }
+        }
         isLocallyAvailable(availability) {
             return !availability.isUbiquitous || availability.downloadStatus === 'current' || availability.downloadStatus === 'downloaded';
         }

package/lib/cjs/fileaccess/service.js

@@ -104,20 +104,7 @@ let FolderAccessService = (() => {
                 const id = existing?.id ?? (0, uuid_1.v4)();
                 await this.releaseScope(id);
                 const location = this.classify(canonical);
-                let activation = await this.tryActivate(id, grant);
-                let source = 'pick';
-                let token = grant;
-                if (!activation.ok) {
-                    const captured = await this.tryCapture(canonical);
-                    if (captured) {
-                        const capturedActivation = await this.tryActivate(id, captured);
-                        if (capturedActivation.ok) {
-                            activation = capturedActivation;
-                            source = 'captured';
-                            token = captured;
-                        }
-                    }
-                }
+                const { activation, source, token } = await this.activateWithFallback(id, canonical, grant);
                 const record = {
                     id,
                     folder: canonical,
@@ -130,20 +117,13 @@ let FolderAccessService = (() => {
                     lastError: activation.ok ? undefined : (activation.error ?? grantError ?? 'no grant')
                 };
                 this.upsert(record);
-                this.activation[id] = activation.ok ? 'active' : (token ? 'failed' : 'no-grant');
-                if (activation.ok) {
+                this.activation[id] = this.activationStatus(activation.ok, !!token);
+                if (activation.ok)
                     this.resolvedPaths[id] = activation.resolvedPath ?? canonical;
-                    this.logEvent({
-                        message: source === 'captured' ? 'folder grant captured' : 'folder grant stored',
-                        location, name: this.folderName(canonical)
-                    });
-                }
-                else {
-                    this.logEvent({
-                        message: 'folder grant unverified',
-                        location, name: this.folderName(canonical), error: record.lastError
-                    });
-                }
+                if (activation.ok)
+                    this.logGrantActivated(source, location, canonical);
+                else
+                    this.logGrantUnverified(location, canonical, record.lastError);
                 await this.save(record);
                 this.rebuildCoverage();
                 this.emitAccessChanged(canonical);
@@ -152,6 +132,40 @@ let FolderAccessService = (() => {
                 this.logError(err, 'registerGrant');
             }
         }
+        async activateWithFallback(id, canonical, grant) {
+            let activation = await this.tryActivate(id, grant);
+            let source = 'pick';
+            let token = grant;
+            if (!activation.ok) {
+                const captured = await this.tryCapture(canonical);
+                if (captured) {
+                    const capturedActivation = await this.tryActivate(id, captured);
+                    if (capturedActivation.ok) {
+                        activation = capturedActivation;
+                        source = 'captured';
+                        token = captured;
+                    }
+                }
+            }
+            return { activation, source, token };
+        }
+        activationStatus(ok, hasToken) {
+            if (ok)
+                return 'active';
+            return hasToken ? 'failed' : 'no-grant';
+        }
+        logGrantActivated(source, location, canonical) {
+            this.logEvent({
+                message: source === 'captured' ? 'folder grant captured' : 'folder grant stored',
+                location, name: this.folderName(canonical)
+            });
+        }
+        logGrantUnverified(location, canonical, lastError) {
+            this.logEvent({
+                message: 'folder grant unverified',
+                location, name: this.folderName(canonical), error: lastError
+            });
+        }
         isCovered(path) {
             if (!this.isSupported())
                 return false;
@@ -434,7 +448,7 @@ let FolderAccessService = (() => {
         folderName(folder) {
             if (!folder)
                 return undefined;
-            return folder.split('/').filter(s => s.length > 0).at(-1);
+            return folder.split('/').findLast(s => s.length > 0);
         }
         logAccessState(path, location, state, transient, errno) {
             this.logEvent({ message: 'access state', location, name: this.folderName(path), state, transient, errno });

package/lib/cjs/fileaccess/utils.js

@@ -36,8 +36,12 @@ const canonicalPath = (url) => {
     if (/^\/[A-Za-z]:/.exec(path))
         path = path.substring(1);
     path = path.replace(/\/{2,}/g, SEPARATOR);
-    if (path.length > 1)
-        path = path.replace(/\/+$/, '');
+    if (path.length > 1) {
+        let end = path.length;
+        while (end > 1 && path[end - 1] === SEPARATOR)
+            end--;
+        path = path.slice(0, end);
+    }
     if (!path)
         return undefined;
     if (path === '/private/var')

package/lib/cjs/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./avatars"), exports);
 __exportStar(require("./base/types"), exports);
 __exportStar(require("./coaches"), exports);
 __exportStar(require("./devices"), exports);
+__exportStar(require("./fileaccess"), exports);
 __exportStar(require("./i18n"), exports);
 __exportStar(require("./maps"), exports);
 __exportStar(require("./monitoring"), exports);