@livedesk/client 0.1.239 → 0.1.241

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

@@ -1022,9 +1022,9 @@ function isLoopbackRequest(req) {
   return address === '127.0.0.1' || address === '::1' || address === 'localhost' || !address;
 }
 
-function isTrustedApiOrigin(value, trustedWebOrigins) {
-  const rawOrigin = normalizeString(value, 300);
-  const origin = normalizeOrigin(rawOrigin);
+function isTrustedApiOrigin(value, trustedWebOrigins) {
+  const rawOrigin = normalizeString(value, 300);
+  const origin = normalizeOrigin(rawOrigin);
   if (!origin) return false;
   if (trustedWebOrigins.has(origin)) return true;
   try {
@@ -1048,10 +1048,10 @@ function isTrustedLocalRequest(req, host, port, options = {}) {
   const requestHost = normalizeString(req.headers.host, 300).split(':')[0].toLowerCase();
   if (requestHost && requestHost !== host.toLowerCase() && requestHost !== 'localhost' && requestHost !== '127.0.0.1') return false;
 
-  // Chromium can mark modulepreload/stylesheet requests as cross-site. Static
-  // assets are not privileged. An opaque Origin (`null`) is never accepted for
-  // an API route because it cannot distinguish the LiveDesk shell from an
-  // attacker-controlled file, sandbox, or data page.
+  // Chromium can mark modulepreload/stylesheet requests as cross-site. Static
+  // assets are not privileged. An opaque Origin (`null`) is never accepted for
+  // an API route because it cannot distinguish the LiveDesk shell from an
+  // attacker-controlled file, sandbox, or data page.
   if (options.allowStaticCrossSite === true) {
     return true;
   }
@@ -1071,9 +1071,9 @@ function isTrustedLocalRequest(req, host, port, options = {}) {
     || fetchSite === 'none';
 }
 
-function resolveCorsOrigin(requestOrigin, port, trustedWebOrigins) {
-  const origin = normalizeString(requestOrigin, 300);
-  return origin && isTrustedApiOrigin(origin, trustedWebOrigins)
+function resolveCorsOrigin(requestOrigin, port, trustedWebOrigins) {
+  const origin = normalizeString(requestOrigin, 300);
+  return origin && isTrustedApiOrigin(origin, trustedWebOrigins)
     ? normalizeOrigin(origin)
     : `http://127.0.0.1:${port}`;
 }

package/src/runtime/hub-wake-listener.js

@@ -1,159 +1,159 @@
-const DEFAULT_HUB_WAKE_URL = 'https://livedesk-wake.lovecrdm.workers.dev';
-const DEFAULT_RETRY_DELAYS_MS = [1000, 2000, 5000, 10_000, 30_000];
-
-function normalizeUrl(value) {
-  const configured = String(value || DEFAULT_HUB_WAKE_URL).trim();
-  if (!configured || /^(off|disabled|none)$/i.test(configured)) return '';
-  const url = new URL(configured);
-  if (url.protocol === 'http:') url.protocol = 'ws:';
-  if (url.protocol === 'https:') url.protocol = 'wss:';
-  if (url.protocol !== 'ws:' && url.protocol !== 'wss:') {
-    throw new Error(`unsupported-hub-wake-protocol:${url.protocol}`);
-  }
-  url.pathname = '/v1/wait';
-  url.search = '';
-  url.hash = '';
-  return url.toString();
-}
-
-function parseWakeMessage(value) {
-  try {
-    const parsed = JSON.parse(String(value || ''));
-    return parsed?.type === 'hub-online' ? parsed : null;
-  } catch {
-    return null;
-  }
-}
-
-export function resolveHubWakeUrl(value = process.env.LIVEDESK_WAKE_URL) {
-  return normalizeUrl(value);
-}
-
-export async function createHubWakeListener(options = {}) {
-  const url = resolveHubWakeUrl(options.url);
-  if (!url) return null;
-
-  const WebSocketImpl = options.WebSocketImpl || (await import('ws')).default;
-  const retryDelaysMs = Array.isArray(options.retryDelaysMs) && options.retryDelaysMs.length > 0
-    ? options.retryDelaysMs.map(value => Math.max(100, Number(value) || 1000))
-    : DEFAULT_RETRY_DELAYS_MS;
-  const getAccessToken = typeof options.getAccessToken === 'function'
-    ? options.getAccessToken
-    : async () => String(options.accessToken || '').trim();
-  let stopped = false;
-  let socket = null;
-  let retryTimer = null;
-  let retryAttempt = 0;
-  let connectionGeneration = 0;
-  let settle;
-
-  const promise = new Promise(resolve => {
-    settle = resolve;
-  });
-
-  const closeSocket = current => {
-    if (!current) return;
-    try {
-      current.close();
-    } catch {
-      // Continue to the exact-socket termination fallback below.
-    }
-    try {
-      if (typeof current.terminate === 'function') current.terminate();
-    } catch {
-      // The listener is best-effort and polling remains the fallback.
-    }
-  };
-
-  const close = () => {
-    if (stopped) return;
-    stopped = true;
-    connectionGeneration += 1;
-    if (retryTimer) {
-      clearTimeout(retryTimer);
-      retryTimer = null;
-    }
-    const current = socket;
-    socket = null;
-    closeSocket(current);
-  };
-
-  const scheduleReconnect = connect => {
-    if (stopped || retryTimer) return;
-    const delayMs = retryDelaysMs[Math.min(retryAttempt, retryDelaysMs.length - 1)];
-    retryAttempt += 1;
-    retryTimer = setTimeout(() => {
-      retryTimer = null;
-      void connect();
-    }, delayMs);
-    retryTimer.unref?.();
-  };
-
-  const connect = async () => {
-    if (stopped) return;
-    const generation = ++connectionGeneration;
-    let accessToken = '';
-    try {
-      accessToken = String(await getAccessToken() || '').trim();
-    } catch {
-      accessToken = '';
-    }
-    if (stopped || generation !== connectionGeneration) return;
-    if (!accessToken) {
-      scheduleReconnect(connect);
-      return;
-    }
-
-    let current;
-    try {
-      current = new WebSocketImpl(url, {
-        headers: { Authorization: `Bearer ${accessToken}` }
-      });
-      if (stopped || generation !== connectionGeneration) {
-        closeSocket(current);
-        return;
-      }
-      socket = current;
-    } catch {
-      scheduleReconnect(connect);
-      return;
-    }
-
-    current.once('open', () => {
-      if (stopped || generation !== connectionGeneration || socket !== current) {
-        closeSocket(current);
-        return;
-      }
-      retryAttempt = 0;
-    });
-    current.on('message', raw => {
-      const event = parseWakeMessage(raw);
-      if (!event || stopped) return;
-      settle?.(event);
-      settle = null;
-      close();
-    });
-    current.once('close', () => {
-      if (socket === current) socket = null;
-      if (generation !== connectionGeneration) return;
-      scheduleReconnect(connect);
-    });
-    current.once('error', () => {
-      closeSocket(current);
-      if (generation === connectionGeneration) scheduleReconnect(connect);
-    });
-  };
-
-  void connect();
-  return {
-    url,
-    promise,
-    close,
-    inspect: () => ({
-      stopped,
-      connectionGeneration,
-      socketActive: socket !== null,
-      retryTimerActive: retryTimer !== null
-    })
-  };
-}
+const DEFAULT_HUB_WAKE_URL = 'https://livedesk-wake.lovecrdm.workers.dev';
+const DEFAULT_RETRY_DELAYS_MS = [1000, 2000, 5000, 10_000, 30_000];
+
+function normalizeUrl(value) {
+  const configured = String(value || DEFAULT_HUB_WAKE_URL).trim();
+  if (!configured || /^(off|disabled|none)$/i.test(configured)) return '';
+  const url = new URL(configured);
+  if (url.protocol === 'http:') url.protocol = 'ws:';
+  if (url.protocol === 'https:') url.protocol = 'wss:';
+  if (url.protocol !== 'ws:' && url.protocol !== 'wss:') {
+    throw new Error(`unsupported-hub-wake-protocol:${url.protocol}`);
+  }
+  url.pathname = '/v1/wait';
+  url.search = '';
+  url.hash = '';
+  return url.toString();
+}
+
+function parseWakeMessage(value) {
+  try {
+    const parsed = JSON.parse(String(value || ''));
+    return parsed?.type === 'hub-online' ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+
+export function resolveHubWakeUrl(value = process.env.LIVEDESK_WAKE_URL) {
+  return normalizeUrl(value);
+}
+
+export async function createHubWakeListener(options = {}) {
+  const url = resolveHubWakeUrl(options.url);
+  if (!url) return null;
+
+  const WebSocketImpl = options.WebSocketImpl || (await import('ws')).default;
+  const retryDelaysMs = Array.isArray(options.retryDelaysMs) && options.retryDelaysMs.length > 0
+    ? options.retryDelaysMs.map(value => Math.max(100, Number(value) || 1000))
+    : DEFAULT_RETRY_DELAYS_MS;
+  const getAccessToken = typeof options.getAccessToken === 'function'
+    ? options.getAccessToken
+    : async () => String(options.accessToken || '').trim();
+  let stopped = false;
+  let socket = null;
+  let retryTimer = null;
+  let retryAttempt = 0;
+  let connectionGeneration = 0;
+  let settle;
+
+  const promise = new Promise(resolve => {
+    settle = resolve;
+  });
+
+  const closeSocket = current => {
+    if (!current) return;
+    try {
+      current.close();
+    } catch {
+      // Continue to the exact-socket termination fallback below.
+    }
+    try {
+      if (typeof current.terminate === 'function') current.terminate();
+    } catch {
+      // The listener is best-effort and polling remains the fallback.
+    }
+  };
+
+  const close = () => {
+    if (stopped) return;
+    stopped = true;
+    connectionGeneration += 1;
+    if (retryTimer) {
+      clearTimeout(retryTimer);
+      retryTimer = null;
+    }
+    const current = socket;
+    socket = null;
+    closeSocket(current);
+  };
+
+  const scheduleReconnect = connect => {
+    if (stopped || retryTimer) return;
+    const delayMs = retryDelaysMs[Math.min(retryAttempt, retryDelaysMs.length - 1)];
+    retryAttempt += 1;
+    retryTimer = setTimeout(() => {
+      retryTimer = null;
+      void connect();
+    }, delayMs);
+    retryTimer.unref?.();
+  };
+
+  const connect = async () => {
+    if (stopped) return;
+    const generation = ++connectionGeneration;
+    let accessToken = '';
+    try {
+      accessToken = String(await getAccessToken() || '').trim();
+    } catch {
+      accessToken = '';
+    }
+    if (stopped || generation !== connectionGeneration) return;
+    if (!accessToken) {
+      scheduleReconnect(connect);
+      return;
+    }
+
+    let current;
+    try {
+      current = new WebSocketImpl(url, {
+        headers: { Authorization: `Bearer ${accessToken}` }
+      });
+      if (stopped || generation !== connectionGeneration) {
+        closeSocket(current);
+        return;
+      }
+      socket = current;
+    } catch {
+      scheduleReconnect(connect);
+      return;
+    }
+
+    current.once('open', () => {
+      if (stopped || generation !== connectionGeneration || socket !== current) {
+        closeSocket(current);
+        return;
+      }
+      retryAttempt = 0;
+    });
+    current.on('message', raw => {
+      const event = parseWakeMessage(raw);
+      if (!event || stopped) return;
+      settle?.(event);
+      settle = null;
+      close();
+    });
+    current.once('close', () => {
+      if (socket === current) socket = null;
+      if (generation !== connectionGeneration) return;
+      scheduleReconnect(connect);
+    });
+    current.once('error', () => {
+      closeSocket(current);
+      if (generation === connectionGeneration) scheduleReconnect(connect);
+    });
+  };
+
+  void connect();
+  return {
+    url,
+    promise,
+    close,
+    inspect: () => ({
+      stopped,
+      connectionGeneration,
+      socketActive: socket !== null,
+      retryTimerActive: retryTimer !== null
+    })
+  };
+}