@web-auto/camo 0.2.0 → 0.2.1

package/src/services/controller/selectors.js

@@ -1,54 +1,54 @@
-export function normalizeSelectors(rawSelectors) {
-  const out = [];
-  const pushCss = (css, extra = {}) => {
-    if (typeof css !== 'string' || !css.trim()) return;
-    out.push({
-      css: css.trim(),
-      ...(typeof extra.variant === 'string' ? { variant: extra.variant } : {}),
-      ...(Number.isFinite(Number(extra.score)) ? { score: Number(extra.score) } : {}),
-    });
-  };
-
-  const splitLegacySelector = (rawSelector) => {
-    if (typeof rawSelector !== 'string') return [];
-    return rawSelector
-      .split(',')
-      .map((item) => item.trim())
-      .filter(Boolean);
-  };
-
-  if (Array.isArray(rawSelectors)) {
-    for (const item of rawSelectors) {
-      if (typeof item === 'string') {
-        for (const css of splitLegacySelector(item)) pushCss(css);
-        continue;
-      }
-      if (item && typeof item === 'object') {
-        if (typeof item.css === 'string') {
-          pushCss(item.css, item);
-        } else if (typeof item.selector === 'string') {
-          for (const css of splitLegacySelector(item.selector)) pushCss(css, item);
-        } else if (typeof item.id === 'string' && item.id) {
-          pushCss(`#${item.id}`, item);
-        } else if (Array.isArray(item.classes) && item.classes.length > 0) {
-          pushCss(`.${item.classes.filter(Boolean).join('.')}`, item);
-        }
-      }
-    }
-  } else if (typeof rawSelectors === 'string') {
-    for (const css of splitLegacySelector(rawSelectors)) pushCss(css);
-  } else if (rawSelectors && typeof rawSelectors === 'object') {
-    if (typeof rawSelectors.css === 'string') {
-      pushCss(rawSelectors.css, rawSelectors);
-    } else if (typeof rawSelectors.selector === 'string') {
-      for (const css of splitLegacySelector(rawSelectors.selector)) pushCss(css, rawSelectors);
-    }
-  }
-
-  const dedup = new Map();
-  for (const item of out) {
-    const key = `${item.css}::${item.variant || ''}::${item.score || ''}`;
-    if (!dedup.has(key)) dedup.set(key, item);
-  }
-  return Array.from(dedup.values());
-}
+export function normalizeSelectors(rawSelectors) {
+  const out = [];
+  const pushCss = (css, extra = {}) => {
+    if (typeof css !== 'string' || !css.trim()) return;
+    out.push({
+      css: css.trim(),
+      ...(typeof extra.variant === 'string' ? { variant: extra.variant } : {}),
+      ...(Number.isFinite(Number(extra.score)) ? { score: Number(extra.score) } : {}),
+    });
+  };
+
+  const splitLegacySelector = (rawSelector) => {
+    if (typeof rawSelector !== 'string') return [];
+    return rawSelector
+      .split(',')
+      .map((item) => item.trim())
+      .filter(Boolean);
+  };
+
+  if (Array.isArray(rawSelectors)) {
+    for (const item of rawSelectors) {
+      if (typeof item === 'string') {
+        for (const css of splitLegacySelector(item)) pushCss(css);
+        continue;
+      }
+      if (item && typeof item === 'object') {
+        if (typeof item.css === 'string') {
+          pushCss(item.css, item);
+        } else if (typeof item.selector === 'string') {
+          for (const css of splitLegacySelector(item.selector)) pushCss(css, item);
+        } else if (typeof item.id === 'string' && item.id) {
+          pushCss(`#${item.id}`, item);
+        } else if (Array.isArray(item.classes) && item.classes.length > 0) {
+          pushCss(`.${item.classes.filter(Boolean).join('.')}`, item);
+        }
+      }
+    }
+  } else if (typeof rawSelectors === 'string') {
+    for (const css of splitLegacySelector(rawSelectors)) pushCss(css);
+  } else if (rawSelectors && typeof rawSelectors === 'object') {
+    if (typeof rawSelectors.css === 'string') {
+      pushCss(rawSelectors.css, rawSelectors);
+    } else if (typeof rawSelectors.selector === 'string') {
+      for (const css of splitLegacySelector(rawSelectors.selector)) pushCss(css, rawSelectors);
+    }
+  }
+
+  const dedup = new Map();
+  for (const item of out) {
+    const key = `${item.css}::${item.variant || ''}::${item.score || ''}`;
+    if (!dedup.has(key)) dedup.set(key, item);
+  }
+  return Array.from(dedup.values());
+}

package/src/services/controller/transport.js

@@ -1,125 +1,125 @@
-import WebSocket from 'ws';
-
-export function createTransport({ env = process.env, defaults = {}, debugLog = null } = {}) {
-  const getBrowserWsUrl = () => {
-    if (env.CAMO_WS_URL) return env.CAMO_WS_URL;
-    const host = env.CAMO_WS_HOST || defaults.wsHost || '127.0.0.1';
-    const port = Number(env.CAMO_WS_PORT || defaults.wsPort || 8765);
-    return `ws://${host}:${port}`;
-  };
-
-  const getBrowserHttpBase = () => {
-    if (env.CAMO_BROWSER_HTTP_BASE) return env.CAMO_BROWSER_HTTP_BASE.replace(/\/$/, '');
-    const host = env.CAMO_BROWSER_HTTP_HOST || defaults.httpHost || '127.0.0.1';
-    const port = Number(env.CAMO_BROWSER_HTTP_PORT || defaults.httpPort || 7704);
-    const protocol = env.CAMO_BROWSER_HTTP_PROTO || defaults.httpProtocol || 'http';
-    return `${protocol}://${host}:${port}`;
-  };
-
-  const browserServiceCommand = async (action, args, options = {}) => {
-    const timeoutMs = typeof options.timeoutMs === 'number' && options.timeoutMs > 0
-      ? options.timeoutMs
-      : 20000;
-    const profileId = (args?.profileId || args?.profile || args?.sessionId || '').toString();
-    const senderMeta = {
-      source: String(options?.source || env.CAMO_COMMAND_SOURCE || 'controller').trim() || 'controller',
-      cwd: String(options?.cwd || env.CAMO_COMMAND_CWD || process.cwd()).trim() || process.cwd(),
-      pid: Number(options?.pid || env.CAMO_COMMAND_PID || process.pid) || process.pid,
-      ppid: Number(options?.ppid || env.CAMO_COMMAND_PPID || process.ppid) || process.ppid,
-      argv: Array.isArray(options?.argv) ? options.argv.map((item) => String(item)) : process.argv.slice(),
-    };
-    debugLog?.('browserServiceCommand:start', { action, profileId, timeoutMs });
-    const res = await fetch(`${getBrowserHttpBase()}/command`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ action, args, meta: { sender: senderMeta } }),
-      signal: AbortSignal.timeout ? AbortSignal.timeout(timeoutMs) : undefined,
-    });
-
-    const raw = await res.text();
-    let data = {};
-    try {
-      data = raw ? JSON.parse(raw) : {};
-    } catch {
-      data = { raw };
-    }
-
-    if (!res.ok) {
-      debugLog?.('browserServiceCommand:http_err', { action, profileId, status: res.status, raw: raw?.slice?.(0, 200) });
-      throw new Error(data?.error || data?.body?.error || `browser-service command "${action}" HTTP ${res.status}`);
-    }
-    if (data && data.ok === false) {
-      debugLog?.('browserServiceCommand:ok_false', { action, profileId, error: data.error });
-      throw new Error(data.error || `browser-service command "${action}" failed`);
-    }
-    if (data && data.error) {
-      debugLog?.('browserServiceCommand:body_err', { action, profileId, error: data.error });
-      throw new Error(data.error);
-    }
-    debugLog?.('browserServiceCommand:ok', { action, profileId });
-    return data.body ?? data;
-  };
-
-  const sendWsCommand = (wsUrl, payload, timeoutMs = 15000) => new Promise((resolve, reject) => {
-    const socket = new WebSocket(wsUrl);
-    let settled = false;
-    const timeout = setTimeout(() => {
-      if (settled) return;
-      settled = true;
-      socket.terminate();
-      reject(new Error('WebSocket command timeout'));
-    }, timeoutMs);
-
-    const cleanup = () => {
-      clearTimeout(timeout);
-      socket.removeAllListeners();
-    };
-
-    socket.once('open', () => {
-      try {
-        socket.send(JSON.stringify(payload));
-      } catch (err) {
-        cleanup();
-        if (!settled) {
-          settled = true;
-          reject(err);
-        }
-      }
-    });
-
-    socket.once('message', (data) => {
-      cleanup();
-      if (settled) return;
-      settled = true;
-      try {
-        resolve(JSON.parse(data.toString('utf-8')));
-      } catch (err) {
-        reject(err);
-      } finally {
-        socket.close();
-      }
-    });
-
-    socket.once('error', (err) => {
-      cleanup();
-      if (settled) return;
-      settled = true;
-      reject(err);
-    });
-
-    socket.once('close', () => {
-      cleanup();
-      if (!settled) {
-        settled = true;
-        reject(new Error('WebSocket closed before response'));
-      }
-    });
-  });
-
-  return {
-    getBrowserWsUrl,
-    getBrowserHttpBase,
-    browserServiceCommand,
-    sendWsCommand,
-  };
-}
+import WebSocket from 'ws';
+
+export function createTransport({ env = process.env, defaults = {}, debugLog = null } = {}) {
+  const getBrowserWsUrl = () => {
+    if (env.CAMO_WS_URL) return env.CAMO_WS_URL;
+    const host = env.CAMO_WS_HOST || defaults.wsHost || '127.0.0.1';
+    const port = Number(env.CAMO_WS_PORT || defaults.wsPort || 8765);
+    return `ws://${host}:${port}`;
+  };
+
+  const getBrowserHttpBase = () => {
+    if (env.CAMO_BROWSER_HTTP_BASE) return env.CAMO_BROWSER_HTTP_BASE.replace(/\/$/, '');
+    const host = env.CAMO_BROWSER_HTTP_HOST || defaults.httpHost || '127.0.0.1';
+    const port = Number(env.CAMO_BROWSER_HTTP_PORT || defaults.httpPort || 7704);
+    const protocol = env.CAMO_BROWSER_HTTP_PROTO || defaults.httpProtocol || 'http';
+    return `${protocol}://${host}:${port}`;
+  };
+
+  const browserServiceCommand = async (action, args, options = {}) => {
+    const timeoutMs = typeof options.timeoutMs === 'number' && options.timeoutMs > 0
+      ? options.timeoutMs
+      : 20000;
+    const profileId = (args?.profileId || args?.profile || args?.sessionId || '').toString();
+    const senderMeta = {
+      source: String(options?.source || env.CAMO_COMMAND_SOURCE || 'controller').trim() || 'controller',
+      cwd: String(options?.cwd || env.CAMO_COMMAND_CWD || process.cwd()).trim() || process.cwd(),
+      pid: Number(options?.pid || env.CAMO_COMMAND_PID || process.pid) || process.pid,
+      ppid: Number(options?.ppid || env.CAMO_COMMAND_PPID || process.ppid) || process.ppid,
+      argv: Array.isArray(options?.argv) ? options.argv.map((item) => String(item)) : process.argv.slice(),
+    };
+    debugLog?.('browserServiceCommand:start', { action, profileId, timeoutMs });
+    const res = await fetch(`${getBrowserHttpBase()}/command`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ action, args, meta: { sender: senderMeta } }),
+      signal: AbortSignal.timeout ? AbortSignal.timeout(timeoutMs) : undefined,
+    });
+
+    const raw = await res.text();
+    let data = {};
+    try {
+      data = raw ? JSON.parse(raw) : {};
+    } catch {
+      data = { raw };
+    }
+
+    if (!res.ok) {
+      debugLog?.('browserServiceCommand:http_err', { action, profileId, status: res.status, raw: raw?.slice?.(0, 200) });
+      throw new Error(data?.error || data?.body?.error || `browser-service command "${action}" HTTP ${res.status}`);
+    }
+    if (data && data.ok === false) {
+      debugLog?.('browserServiceCommand:ok_false', { action, profileId, error: data.error });
+      throw new Error(data.error || `browser-service command "${action}" failed`);
+    }
+    if (data && data.error) {
+      debugLog?.('browserServiceCommand:body_err', { action, profileId, error: data.error });
+      throw new Error(data.error);
+    }
+    debugLog?.('browserServiceCommand:ok', { action, profileId });
+    return data.body ?? data;
+  };
+
+  const sendWsCommand = (wsUrl, payload, timeoutMs = 15000) => new Promise((resolve, reject) => {
+    const socket = new WebSocket(wsUrl);
+    let settled = false;
+    const timeout = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      socket.terminate();
+      reject(new Error('WebSocket command timeout'));
+    }, timeoutMs);
+
+    const cleanup = () => {
+      clearTimeout(timeout);
+      socket.removeAllListeners();
+    };
+
+    socket.once('open', () => {
+      try {
+        socket.send(JSON.stringify(payload));
+      } catch (err) {
+        cleanup();
+        if (!settled) {
+          settled = true;
+          reject(err);
+        }
+      }
+    });
+
+    socket.once('message', (data) => {
+      cleanup();
+      if (settled) return;
+      settled = true;
+      try {
+        resolve(JSON.parse(data.toString('utf-8')));
+      } catch (err) {
+        reject(err);
+      } finally {
+        socket.close();
+      }
+    });
+
+    socket.once('error', (err) => {
+      cleanup();
+      if (settled) return;
+      settled = true;
+      reject(err);
+    });
+
+    socket.once('close', () => {
+      cleanup();
+      if (!settled) {
+        settled = true;
+        reject(new Error('WebSocket closed before response'));
+      }
+    });
+  });
+
+  return {
+    getBrowserWsUrl,
+    getBrowserHttpBase,
+    browserServiceCommand,
+    sendWsCommand,
+  };
+}

package/src/utils/args.mjs

@@ -1,26 +1,26 @@
-export function resolveProfileId(args, argIndex, getDefaultProfile) {
-  let profileId = args[argIndex];
-  if (!profileId) {
-    profileId = getDefaultProfile();
-  }
-  return profileId;
-}
-
-export function ensureUrlScheme(rawUrl) {
-  if (typeof rawUrl !== 'string') return rawUrl;
-  const trimmed = rawUrl.trim();
-  if (!trimmed) return trimmed;
-  if (/^(about|chrome|file|data|blob|javascript):/i.test(trimmed)) return trimmed;
-  if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(trimmed)) return trimmed;
-  return `https://${trimmed}`;
-}
-
-export function looksLikeUrlToken(token) {
-  if (!token || typeof token !== 'string') return false;
-  if (token.includes('://')) return true;
-  return /^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+/.test(token);
-}
-
-export function getPositionals(args, startIndex = 1) {
-  return args.slice(startIndex).filter((a) => a && !a.startsWith('--'));
-}
+export function resolveProfileId(args, argIndex, getDefaultProfile) {
+  let profileId = args[argIndex];
+  if (!profileId) {
+    profileId = getDefaultProfile();
+  }
+  return profileId;
+}
+
+export function ensureUrlScheme(rawUrl) {
+  if (typeof rawUrl !== 'string') return rawUrl;
+  const trimmed = rawUrl.trim();
+  if (!trimmed) return trimmed;
+  if (/^(about|chrome|file|data|blob|javascript):/i.test(trimmed)) return trimmed;
+  if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(trimmed)) return trimmed;
+  return `https://${trimmed}`;
+}
+
+export function looksLikeUrlToken(token) {
+  if (!token || typeof token !== 'string') return false;
+  if (token.includes('://')) return true;
+  return /^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+/.test(token);
+}
+
+export function getPositionals(args, startIndex = 1) {
+  return args.slice(startIndex).filter((a) => a && !a.startsWith('--'));
+}