@livedesk/client 0.1.225 → 0.1.226

package/bin/livedesk-client.js

@@ -90,6 +90,7 @@ let agentRestartRequest = null;
 let linuxVideoAccelerationStatus = null;
 let discoveryWakeController = new AbortController();
 let networkChangeMonitor = null;
+let deviceRoleMutationTail = Promise.resolve();
 const sessionRefreshesInFlight = new WeakMap();
 const disposeAgentTerminationHandlers = installAgentTerminationHandlers({
     getAgentProcess: () => activeAgentProcess
@@ -177,6 +178,17 @@ export function requestLocalDiscoveryWake(reason = 'local-trigger') {
     previous.abort(String(reason || 'local-trigger'));
 }
 
+export function enqueueDeviceRoleMutation(operation) {
+    if (typeof operation !== 'function') {
+        return Promise.reject(new TypeError('device-role-mutation-operation-required'));
+    }
+    const pending = deviceRoleMutationTail
+        .catch(() => undefined)
+        .then(operation);
+    deviceRoleMutationTail = pending.catch(() => undefined);
+    return pending;
+}
+
 function networkInterfaceSignature() {
     return Object.entries(os.networkInterfaces())
         .flatMap(([name, entries]) => (entries || [])
@@ -1204,12 +1216,18 @@ function isTransientNetworkError(error) {
     return /fetch failed|network|dns|socket|connection|timeout|getaddrinfo/i.test(getNestedErrorMessage(error));
 }
 
-function formatDiscoveryError(error) {
+export function formatDiscoveryError(error) {
     if (isTransientNetworkError(error)) {
         const code = getNestedErrorCode(error);
         return `Network is not ready yet${code ? ` (${code})` : ''}. Waiting for DNS/Wi-Fi after sleep.`;
     }
-    return error instanceof Error ? error.message : String(error);
+    const message = getNestedErrorMessage(error);
+    if (message) return message;
+    for (const key of ['error_description', 'reason', 'details', 'hint', 'error', 'code']) {
+        const value = error?.[key];
+        if (typeof value === 'string' && value.trim()) return value.trim();
+    }
+    return 'LiveDesk could not read the current Hub registration yet.';
 }
 
 function createHubDiscoveryError(code, message, cause = null) {
@@ -1387,6 +1405,27 @@ async function activateSupabaseSession(supabase, session) {
     }
     return activeSession;
 }
+
+export async function activateRoleChangeSession(supabase, currentSession = null) {
+    if (!supabase?.auth) {
+        throw new Error('Google sign-in is temporarily unavailable. Try again in a moment.');
+    }
+    const current = normalizeRuntimeAuthSession(currentSession, { requireRefreshToken: true });
+    let session = current.ok ? current.session : await refreshSessionIfNeeded(supabase);
+    if (!session?.access_token) {
+        throw new Error('Sign in again before switching this computer to Hub.');
+    }
+    try {
+        return await activateSupabaseSession(supabase, session);
+    } catch (error) {
+        if (!isRefreshTokenAlreadyUsedError(error)) throw error;
+        session = await refreshSessionIfNeeded(supabase);
+        if (!session?.access_token) {
+            throw new Error('Sign in again before switching this computer to Hub.');
+        }
+        return activateSupabaseSession(supabase, session);
+    }
+}
 
 function escapeHtml(value) {
     return String(value ?? '')
@@ -3105,14 +3144,17 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         res.end(JSON.stringify(hubClientPortPreflightError(portPreflight)));
                         return;
                     }
-                    const session = await refreshSessionIfNeeded(supabase);
-                    const expectedRoleVersion = Number(dashboardState.roleVersion || 0);
-                    const { data, error } = await supabase.rpc('set_livedesk_device_role', {
-                        p_device_id: deviceId,
-                        p_role: 'hub',
-                        p_assigned_hub_id: null,
-                        p_expected_role_version: expectedRoleVersion > 0 ? expectedRoleVersion : null
-                    });
+                    const session = await activateRoleChangeSession(
+                        supabase,
+                        dashboardState.choice?.session || savedSession
+                    );
+                    const expectedRoleVersion = Number(dashboardState.roleVersion || 0);
+                    const { data, error } = await enqueueDeviceRoleMutation(() => supabase.rpc('set_livedesk_device_role', {
+                        p_device_id: deviceId,
+                        p_role: 'hub',
+                        p_assigned_hub_id: null,
+                        p_expected_role_version: expectedRoleVersion > 0 ? expectedRoleVersion : null
+                    }));
                     const result = Array.isArray(data) ? data[0] : data;
                     if (error || result?.ok === false || !session?.access_token) {
                         const reason = error?.message || result?.reason || 'role-change-rejected';
@@ -3415,26 +3457,31 @@ async function chooseClientConnection(supabase, options = {}) {
                     relayEndpoint: options.relayEndpoint
                 });
             },
-            changeRole: async (role, snapshot) => {
+            changeRole: async (role, snapshot, currentSession) => {
                 const activeSupabase = await getSupabase();
                 if (!activeSupabase) {
-                    return { ok: false, error: 'supabase-session-required' };
+                    return { ok: false, error: 'Google sign-in is temporarily unavailable. Try again in a moment.' };
                 }
                 const portPreflight = await preflightHubClientPort();
                 if (!portPreflight.ok) {
                     return hubClientPortPreflightError(portPreflight);
                 }
-                const session = await refreshSessionIfNeeded(activeSupabase);
-                if (!session?.access_token) {
-                    return { ok: false, error: 'supabase-session-required' };
-                }
-                const expectedRoleVersion = Number(snapshot?.roleVersion || 0);
-                const { data, error } = await activeSupabase.rpc('set_livedesk_device_role', {
-                    p_device_id: options.deviceId,
-                    p_role: role,
-                    p_assigned_hub_id: null,
-                    p_expected_role_version: expectedRoleVersion > 0 ? expectedRoleVersion : null
-                });
+                let session;
+                try {
+                    session = await activateRoleChangeSession(activeSupabase, currentSession);
+                } catch (error) {
+                    return { ok: false, error: formatDiscoveryError(error) };
+                }
+                if (!session?.access_token) {
+                    return { ok: false, error: 'Sign in again before switching this computer to Hub.' };
+                }
+                const expectedRoleVersion = Number(snapshot?.roleVersion || 0);
+                const { data, error } = await enqueueDeviceRoleMutation(() => activeSupabase.rpc('set_livedesk_device_role', {
+                    p_device_id: options.deviceId,
+                    p_role: role,
+                    p_assigned_hub_id: null,
+                    p_expected_role_version: expectedRoleVersion > 0 ? expectedRoleVersion : null
+                }));
                 const result = Array.isArray(data) ? data[0] : data;
                 if (error || result?.ok === false) {
                     return { ok: false, error: error?.message || result?.reason || 'role-change-rejected' };
@@ -3853,7 +3900,9 @@ export async function runFreshHubRegistryLookup(resolveFreshTarget, options = {}
     }
     const timeoutMs = normalizeFreshRegistryTimeoutMs(options.timeoutMs);
     const controller = new AbortController();
+    const externalSignal = options.signal;
     let timeoutHandle = null;
+    let removeExternalAbort = () => undefined;
     const lookupOutcome = Promise.resolve()
         .then(() => resolveFreshTarget(controller.signal))
         .then(
@@ -3867,6 +3916,17 @@ export async function runFreshHubRegistryLookup(resolveFreshTarget, options = {}
         );
     });
     const outcomes = [lookupOutcome, timeoutOutcome];
+    if (externalSignal) {
+        outcomes.push(new Promise(resolveAbort => {
+            const onAbort = () => resolveAbort({ type: 'local-trigger' });
+            if (externalSignal.aborted) {
+                onAbort();
+                return;
+            }
+            externalSignal.addEventListener('abort', onAbort, { once: true });
+            removeExternalAbort = () => externalSignal.removeEventListener('abort', onAbort);
+        }));
+    }
     if (options.wakePromise && typeof options.wakePromise.then === 'function') {
         outcomes.push(Promise.resolve(options.wakePromise).then(
             event => ({ type: 'hub-online', event }),
@@ -3875,7 +3935,12 @@ export async function runFreshHubRegistryLookup(resolveFreshTarget, options = {}
     }
     const outcome = await Promise.race(outcomes).finally(() => {
         clearTimeout(timeoutHandle);
+        removeExternalAbort();
     });
+    if (outcome.type === 'local-trigger') {
+        controller.abort('local-trigger');
+        return outcome;
+    }
     if (outcome.type === 'hub-online') {
         controller.abort('hub-online');
         return outcome;
@@ -4050,22 +4115,33 @@ export async function resolveManagerFromSupabase(supabase, options = {}) {
     };
 }
 
-async function registerClientDeviceWithSupabase(supabase, options = {}) {
-    if (!options.deviceId || !options.session?.access_token) {
-        return null;
-    }
-    try {
-        const { data, error } = await supabase.rpc('register_livedesk_device', {
-            p_device_id: options.deviceId,
-            p_device_name: options.deviceName || os.hostname(),
-            p_role: 'client',
-            p_assigned_hub_id: options.assignedHubId || null,
-            p_platform: os.platform(),
-            p_os_version: os.release(),
-            p_app_version: readPackageVersion()
-        });
-        const result = Array.isArray(data) ? data[0] : data;
-        if (error || result?.ok === false) {
+async function registerClientDeviceWithSupabase(supabase, options = {}) {
+    if (!options.deviceId || !options.session?.access_token) {
+        return null;
+    }
+    if (roleRestartRequest?.role) {
+        return { ok: false, skipped: true, reason: 'role-transition-pending' };
+    }
+    try {
+        const { data, error } = await enqueueDeviceRoleMutation(() => {
+            if (roleRestartRequest?.role) {
+                return { data: { ok: false, skipped: true, reason: 'role-transition-pending' }, error: null };
+            }
+            return supabase.rpc('register_livedesk_device', {
+                p_device_id: options.deviceId,
+                p_device_name: options.deviceName || os.hostname(),
+                p_role: 'client',
+                p_assigned_hub_id: options.assignedHubId || null,
+                p_platform: os.platform(),
+                p_os_version: os.release(),
+                p_app_version: readPackageVersion()
+            });
+        });
+        const result = Array.isArray(data) ? data[0] : data;
+        if (result?.skipped === true && result?.reason === 'role-transition-pending') {
+            return result;
+        }
+        if (error || result?.ok === false) {
             console.warn(`[LiveDesk Client] Device role registration unavailable: ${error?.message || result?.reason || 'unknown-error'}`);
         }
         return error ? null : result;
@@ -4117,9 +4193,14 @@ export async function waitForManagerFromSupabase(supabase, options = {}) {
                     }),
                     {
                         timeoutMs: options.freshTimeoutMs,
-                        wakePromise: wakeListener?.promise
+                        wakePromise: wakeListener?.promise,
+                        signal: discoveryWakeController.signal
                     }
                 );
+                if (outcome.type === 'local-trigger') {
+                    if (shouldStop()) return null;
+                    continue;
+                }
                 if (outcome.type === 'hub-online') {
                     wakeListener?.close();
                     wakeListener = null;
@@ -4285,6 +4366,18 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
             } catch (error) {
                 initialDiscoveryError = error;
             }
+            if (roleRestartRequest?.role) {
+                return {
+                    ...parsed,
+                    manager,
+                    pair,
+                    slot: normalizeSlotNumber(parsed.slot),
+                    connectionPage,
+                    forwarded,
+                    rediscoverOnDisconnect: shouldLogin,
+                    rediscoverOnInvalidPair: shouldLogin
+                };
+            }
             discoverySource = resolved?.discoverySource || 'supabase';
             if (resolved?.discoverySource === 'cache') {
                 writeSavedSessionToFile(session);
@@ -4303,7 +4396,7 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
                 });
                 discoverySource = 'supabase';
             }
-            if (!resolved && roleRestartRequest?.role) {
+            if (roleRestartRequest?.role) {
                 return {
                     ...parsed,
                     manager,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.225",
+  "version": "0.1.226",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {

package/src/runtime/client-runtime-server.js

@@ -1856,7 +1856,11 @@ export function createClientRuntimeServer(options = {}) {
         return;
       }
       try {
-        const result = await options.changeRole?.('hub', runtime.getSnapshot());
+        const result = await options.changeRole?.(
+          'hub',
+          runtime.getSnapshot(),
+          lastChoice?.session || savedSession || null
+        );
         respondJson(result?.ok === false ? 409 : 200, result || { ok: false, error: 'role-change-unavailable' });
       } catch (error) {
         respondJson(409, { ok: false, error: normalizeString(error?.message || error) });
@@ -1870,7 +1874,11 @@ export function createClientRuntimeServer(options = {}) {
         return;
       }
       try {
-        const result = await options.changeRole?.('hub', runtime.getSnapshot());
+        const result = await options.changeRole?.(
+          'hub',
+          runtime.getSnapshot(),
+          lastChoice?.session || savedSession || null
+        );
         respondJson(result?.ok === false ? 409 : 200, result || { ok: false, error: 'role-change-unavailable' });
       } catch (error) {
         respondJson(409, { ok: false, error: normalizeString(error?.message || error) });