oomi-ai 0.2.49 → 0.3.0

package/bin/sessionBridgeState.js

@@ -1,78 +1,78 @@
-const WS_CONNECTING = 0;
-const WS_OPEN = 1;
-
-/**
- * Ensure session state exists so client frames can be buffered before client.open arrives.
- */
-export function ensureSessionBridge({ sessions, sessionId, createSocket }) {
-  const id = String(sessionId || '').trim();
-  if (!id) return null;
-
-  const existing = sessions.get(id);
-  if (existing) return existing;
-
-  const socket = createSocket(id);
-  const next = {
-    socket,
-    queue: [],
-    connectAccepted: false,
-    waitingForConnect: [],
-  };
-  sessions.set(id, next);
-  return next;
-}
-
-/**
- * Forward a frame to the gateway socket or queue it while connecting.
- */
-export function forwardFrameToSession(sessionBridge, frameText, options = {}) {
-  if (!sessionBridge || !sessionBridge.socket || typeof frameText !== 'string' || !frameText) {
-    return 'dropped';
-  }
-
-  if (options.requiresConnectAccepted === true && sessionBridge.connectAccepted !== true) {
-    if (!Array.isArray(sessionBridge.waitingForConnect)) {
-      sessionBridge.waitingForConnect = [];
-    }
-    sessionBridge.waitingForConnect.push(frameText);
-    return 'waiting_for_connect';
-  }
-
-  const { socket } = sessionBridge;
-  if (socket.readyState === WS_OPEN) {
-    socket.send(frameText);
-    return 'sent';
-  }
-
-  if (socket.readyState === WS_CONNECTING) {
-    sessionBridge.queue.push(frameText);
-    return 'queued';
-  }
-
-  return 'dropped';
-}
-
-export function flushWaitingForConnect(sessionBridge) {
-  if (!sessionBridge) return [];
-
-  sessionBridge.connectAccepted = true;
-  const pending = Array.isArray(sessionBridge.waitingForConnect)
-    ? sessionBridge.waitingForConnect.splice(0, sessionBridge.waitingForConnect.length)
-    : [];
-
-  return pending.map((frameText) => ({
-    frameText,
-    result: forwardFrameToSession(sessionBridge, frameText),
-  }));
-}
-
-export function flushSessionQueue(sessionBridge) {
-  if (!sessionBridge || !sessionBridge.socket) return;
-  const socket = sessionBridge.socket;
-  while (sessionBridge.queue.length > 0 && socket.readyState === WS_OPEN) {
-    const nextFrame = sessionBridge.queue.shift();
-    if (typeof nextFrame === 'string' && nextFrame) {
-      socket.send(nextFrame);
-    }
-  }
-}
+const WS_CONNECTING = 0;
+const WS_OPEN = 1;
+
+/**
+ * Ensure session state exists so client frames can be buffered before client.open arrives.
+ */
+export function ensureSessionBridge({ sessions, sessionId, createSocket }) {
+  const id = String(sessionId || '').trim();
+  if (!id) return null;
+
+  const existing = sessions.get(id);
+  if (existing) return existing;
+
+  const socket = createSocket(id);
+  const next = {
+    socket,
+    queue: [],
+    connectAccepted: false,
+    waitingForConnect: [],
+  };
+  sessions.set(id, next);
+  return next;
+}
+
+/**
+ * Forward a frame to the gateway socket or queue it while connecting.
+ */
+export function forwardFrameToSession(sessionBridge, frameText, options = {}) {
+  if (!sessionBridge || !sessionBridge.socket || typeof frameText !== 'string' || !frameText) {
+    return 'dropped';
+  }
+
+  if (options.requiresConnectAccepted === true && sessionBridge.connectAccepted !== true) {
+    if (!Array.isArray(sessionBridge.waitingForConnect)) {
+      sessionBridge.waitingForConnect = [];
+    }
+    sessionBridge.waitingForConnect.push(frameText);
+    return 'waiting_for_connect';
+  }
+
+  const { socket } = sessionBridge;
+  if (socket.readyState === WS_OPEN) {
+    socket.send(frameText);
+    return 'sent';
+  }
+
+  if (socket.readyState === WS_CONNECTING) {
+    sessionBridge.queue.push(frameText);
+    return 'queued';
+  }
+
+  return 'dropped';
+}
+
+export function flushWaitingForConnect(sessionBridge) {
+  if (!sessionBridge) return [];
+
+  sessionBridge.connectAccepted = true;
+  const pending = Array.isArray(sessionBridge.waitingForConnect)
+    ? sessionBridge.waitingForConnect.splice(0, sessionBridge.waitingForConnect.length)
+    : [];
+
+  return pending.map((frameText) => ({
+    frameText,
+    result: forwardFrameToSession(sessionBridge, frameText),
+  }));
+}
+
+export function flushSessionQueue(sessionBridge) {
+  if (!sessionBridge || !sessionBridge.socket) return;
+  const socket = sessionBridge.socket;
+  while (sessionBridge.queue.length > 0 && socket.readyState === WS_OPEN) {
+    const nextFrame = sessionBridge.queue.shift();
+    if (typeof nextFrame === 'string' && nextFrame) {
+      socket.send(nextFrame);
+    }
+  }
+}

package/lib/openclawPaths.js

@@ -1,87 +1,86 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-
-function trimString(value) {
-  return typeof value === 'string' ? value.trim() : '';
-}
-
-export function resolveOpenclawHome() {
-  const explicitHome = trimString(process.env.OPENCLAW_HOME);
-  if (explicitHome) {
-    return path.resolve(explicitHome);
-  }
-
-  return path.join(os.homedir(), '.openclaw');
-}
-
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+function trimString(value) {
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+function isWindowsAbsolutePath(value) {
+  return /^[A-Za-z]:[\\/]/.test(value) || /^\\\\[^\\]+\\[^\\]+/.test(value);
+}
+
+function resolveConfiguredPath(value) {
+  if (process.platform !== 'win32' && isWindowsAbsolutePath(value)) {
+    return value;
+  }
+
+  return path.resolve(value);
+}
+
+export function resolveOpenclawHome() {
+  const explicitHome = trimString(process.env.OPENCLAW_HOME);
+  if (explicitHome) {
+    return resolveConfiguredPath(explicitHome);
+  }
+
+  return path.join(os.homedir(), '.openclaw');
+}
+
 export function resolveOpenclawWorkspaceRoot() {
   const explicitWorkspace = trimString(process.env.OPENCLAW_WORKSPACE);
   if (explicitWorkspace) {
-    return path.resolve(explicitWorkspace);
+    return resolveConfiguredPath(explicitWorkspace);
+  }
+
+  const openclawHome = resolveOpenclawHome();
+  const managedWorkspace = path.join(openclawHome, 'workspace');
+  if (fs.existsSync(managedWorkspace)) {
+    return managedWorkspace;
   }
-
-  const openclawHome = resolveOpenclawHome();
-  const managedWorkspace = path.join(openclawHome, 'workspace');
-  if (fs.existsSync(managedWorkspace)) {
-    return managedWorkspace;
-  }
-
-  return openclawHome;
-}
 
-export function resolveOpenclawLegacyPersonasDir() {
-  return resolveOpenclawPath('personas');
+  return openclawHome;
 }
 
 export function resolveOpenclawPath(...parts) {
   return path.join(resolveOpenclawHome(), ...parts);
 }
-
-export function resolveOpenclawConfigCandidates() {
-  return [
-    resolveOpenclawPath('clawdbot.json'),
-    resolveOpenclawPath('openclaw.json'),
-  ];
-}
-
+
+export function resolveOpenclawConfigCandidates() {
+  return [
+    resolveOpenclawPath('openclaw.json'),
+    resolveOpenclawPath('clawdbot.json'),
+  ];
+}
+
 export function resolveOpenclawSkillsDir() {
   return resolveOpenclawPath('skills');
 }
 
-export function resolveOpenclawPersonasDir() {
-  const explicitPersonas = trimString(process.env.OPENCLAW_PERSONAS_DIR);
-  if (explicitPersonas) {
-    return path.resolve(explicitPersonas);
-  }
+export function resolveOpenclawIdentityPath() {
+  return resolveOpenclawPath('identity', 'device.json');
+}
+
+export function resolveOpenclawUpdateStatePath() {
+  return resolveOpenclawPath('oomi-ai-update-check.json');
+}
+
+export function resolveOpenclawBridgeStatePath() {
+  return resolveOpenclawPath('oomi-bridge.json');
+}
+
+export function resolveOpenclawBridgeStatusPath() {
+  return resolveOpenclawPath('oomi-bridge-status.json');
+}
+
+export function resolveOpenclawBridgeLockPath() {
+  return resolveOpenclawPath('oomi-bridge.lock');
+}
+
+export function resolveOpenclawBridgeLiveLogPath() {
+  return resolveOpenclawPath('logs', 'oomi-bridge-live.log');
+}
 
-  return path.join(resolveOpenclawWorkspaceRoot(), 'personas');
+export function resolveOpenclawProfilePath(fileName = 'oomi-openclaw-profile.json') {
+  return resolveOpenclawPath(fileName);
 }
-
-export function resolveOpenclawIdentityPath() {
-  return resolveOpenclawPath('identity', 'device.json');
-}
-
-export function resolveOpenclawUpdateStatePath() {
-  return resolveOpenclawPath('oomi-ai-update-check.json');
-}
-
-export function resolveOpenclawBridgeStatePath() {
-  return resolveOpenclawPath('oomi-bridge.json');
-}
-
-export function resolveOpenclawBridgeStatusPath() {
-  return resolveOpenclawPath('oomi-bridge-status.json');
-}
-
-export function resolveOpenclawBridgeLockPath() {
-  return resolveOpenclawPath('oomi-bridge.lock');
-}
-
-export function resolveOpenclawBridgeLiveLogPath() {
-  return resolveOpenclawPath('logs', 'oomi-bridge-live.log');
-}
-
-export function resolveOpenclawProfilePath(fileName = 'oomi-openclaw-profile.json') {
-  return resolveOpenclawPath(fileName);
-}