orbit-codex-bridge 0.1.0 → 0.1.2

package/relay-agent.mjs

@@ -1,11 +1,13 @@
 import http from 'node:http';
 import https from 'node:https';
+import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import WebSocket from 'ws';
 
 const maxBody = 12 * 1024 * 1024;
 const isLoopback = url => ['localhost','127.0.0.1','[::1]'].includes(url.hostname);
+const root = path.dirname(fileURLToPath(import.meta.url));
 
 export function createRelayAgent(options = {}) {
   const relay = new URL(options.relayUrl || process.env.ORBIT_RELAY_URL || '');
@@ -14,6 +16,11 @@ export function createRelayAgent(options = {}) {
   const deviceId = options.deviceId || process.env.ORBIT_RELAY_DEVICE_ID || '';
   const onReady = options.onReady || (() => {});
   const onError = options.onError || (() => {});
+  const onState = options.onState || (() => {});
+  const heartbeatInterval = options.heartbeatInterval ?? 15000;
+  const heartbeatTimeout = options.heartbeatTimeout ?? 45000;
+  const reconnectDelay = options.reconnectDelay ?? 1000;
+  if (heartbeatInterval <= 0 || heartbeatTimeout <= heartbeatInterval || reconnectDelay < 0) throw new Error('连接心跳参数无效。');
   if (relay.username || relay.password || relay.search || relay.hash || relay.pathname !== '/agent'
     || !(relay.protocol === 'wss:' || relay.protocol === 'ws:' && isLoopback(relay))) {
     throw new Error('ORBIT_RELAY_URL 必须为 wss://域名/agent；仅本地测试允许 ws。');
@@ -27,6 +34,7 @@ export function createRelayAgent(options = {}) {
   let stopped = true;
   let reconnectTimer;
   let readyTimer;
+  let heartbeatTimer;
   let retry = 0;
   const bridges = new Map();
   const requests = new Set();
@@ -42,51 +50,90 @@ export function createRelayAgent(options = {}) {
     requests.clear();
   }
 
-  function localRequest(message, cloudSocket) {
+  function requestLocal(method, targetPath, headers, body, cloudSocket) {
+    return new Promise((resolve,reject) => {
+      if (socket !== cloudSocket || cloudSocket.readyState !== WebSocket.OPEN) return reject(new Error('云端连接已断开。'));
+      if (requests.size >= 100) return reject(new Error('电脑端请求过多，请稍后重试。'));
+      const target = new URL(targetPath,local);
+      const transport = target.protocol === 'https:' ? https : http;
+      const request = transport.request(target,{method,headers:{...headers,host:local.host,origin:local.origin},timeout:25000},response => {
+        const chunks = [];
+        let size = 0;
+        response.on('data',chunk => {
+          size += chunk.length;
+          if (size > maxBody) request.destroy(new Error('本机响应过大。'));
+          else chunks.push(chunk);
+        });
+        response.on('error',error => request.destroy(error));
+        response.on('end',() => {
+          requests.delete(request);
+          resolve({statusCode:response.statusCode || 502,headers:{
+            'content-type':response.headers['content-type'] || 'application/json',
+            ...(response.headers['set-cookie'] ? {'set-cookie':response.headers['set-cookie']} : {})
+          },body:Buffer.concat(chunks)});
+        });
+      });
+      requests.add(request);
+      request.on('timeout',() => request.destroy(new Error('本机 Orbit 响应超时。')));
+      request.on('error',error => {
+        requests.delete(request);
+        reject(error);
+      });
+      request.end(body);
+    });
+  }
+
+  function respondLocal(message, cloudSocket, result) {
+    if (socket === cloudSocket && cloudSocket.readyState === WebSocket.OPEN) {
+      cloudSocket.send(JSON.stringify({type:'http-response',requestId:message.requestId,...result,body:result.body.toString('base64')}));
+    }
+  }
+
+  async function localRequest(message, cloudSocket) {
     if (typeof message.path !== 'string' || !message.path.startsWith('/api/') || message.path.startsWith('//')
       || !['GET','POST'].includes(message.method)) return cloudSocket.close(1008,'Invalid local target');
     const target = new URL(message.path,local);
     if (target.origin !== local.origin) return cloudSocket.close(1008,'Invalid local target');
     const body = Buffer.from(message.body || '', 'base64');
-    if (body.length > maxBody || requests.size >= 100) return;
-    const transport = target.protocol === 'https:' ? https : http;
-    let finished = false;
-    const respond = (statusCode,headers,responseBody) => {
-      if (finished) return;
-      finished = true;
-      if (socket === cloudSocket && cloudSocket.readyState === WebSocket.OPEN) {
-        cloudSocket.send(JSON.stringify({type:'http-response',requestId:message.requestId,statusCode,headers,body:responseBody.toString('base64')}));
-      }
-    };
+    if (body.length > maxBody) return;
     const headers = {};
-    for (const name of ['accept','content-type','cookie','host','origin','user-agent']) {
+    for (const name of ['accept','content-type','cookie','user-agent']) {
       const value = message.headers?.[name];
       if (typeof value === 'string') headers[name] = value;
     }
-    const request = transport.request(target,{method:message.method,headers,timeout:25000},response => {
-      const chunks = [];
-      let size = 0;
-      response.on('data',chunk => {
-        size += chunk.length;
-        if (size > maxBody) request.destroy(new Error('本机响应过大。'));
-        else chunks.push(chunk);
-      });
-      response.on('error',error => request.destroy(error));
-      response.on('end',() => {
-        requests.delete(request);
-        respond(response.statusCode || 502,{
-          'content-type':response.headers['content-type'] || 'application/json',
-          ...(response.headers['set-cookie'] ? {'set-cookie':response.headers['set-cookie']} : {})
-        },Buffer.concat(chunks));
+    try {
+      respondLocal(message,cloudSocket,await requestLocal(message.method,message.path,headers,body,cloudSocket));
+    } catch (error) {
+      respondLocal(message,cloudSocket,{statusCode:502,headers:{},body:Buffer.from(JSON.stringify({error:error.message}))});
+    }
+  }
+
+  async function connectAccount(message, cloudSocket) {
+    try {
+      const cookie = message.headers?.cookie || '';
+      if (cookie) {
+        const current = await requestLocal('GET','/api/status',{cookie},undefined,cloudSocket);
+        if (current.statusCode === 200) {
+          respondLocal(message,cloudSocket,{statusCode:200,headers:{},body:Buffer.from('{"ok":true}')});
+          return;
+        }
+        if (current.statusCode !== 401) throw new Error('本机连接状态异常。');
+      }
+      const filename = options.pairingKeyFile || process.env.ORBIT_PAIRING_KEY_FILE || path.join(root,'.runtime','pairing-key');
+      const pairingKey = String(options.pairingKey || await fs.readFile(filename,'utf8')).trim();
+      if (!/^[a-zA-Z0-9_-]{20,100}$/.test(pairingKey)) throw new Error('本机凭证不可用。');
+      const paired = await requestLocal('POST','/api/pair',{'content-type':'application/json'},
+        Buffer.from(JSON.stringify({code:pairingKey})),cloudSocket);
+      if (paired.statusCode !== 200 || !paired.headers['set-cookie']?.some(value => /^orbit_session=[a-zA-Z0-9_-]{20,100};/.test(value))) {
+        throw new Error('本机鉴权未完成。');
+      }
+      respondLocal(message,cloudSocket,{statusCode:200,headers:paired.headers,body:Buffer.from('{"ok":true}')});
+    } catch {
+      respondLocal(message,cloudSocket,{
+        statusCode:503,headers:{},
+        body:Buffer.from(JSON.stringify({error:'电脑连接器未能完成账号连接，请在电脑上运行 orbit restart，或更新连接器后重试。',code:'local_account_connect_failed'}))
       });
-    });
-    requests.add(request);
-    request.on('timeout',() => request.destroy(new Error('本机 Orbit 响应超时。')));
-    request.on('error',error => {
-      requests.delete(request);
-      respond(502,{'content-type':'application/json'},Buffer.from(JSON.stringify({error:error.message})));
-    });
-    request.end(body);
+    }
   }
 
   function openLocalSocket(message, cloudSocket) {
@@ -95,8 +142,8 @@ export function createRelayAgent(options = {}) {
     target.protocol = target.protocol === 'https:' ? 'wss:' : 'ws:';
     const localSocket = new WebSocket(target,{
       headers:{
-        Cookie:message.headers?.cookie || '', Origin:message.headers?.origin || '',
-        Host:message.headers?.host || local.host
+        Cookie:message.headers?.cookie || '', Origin:local.origin,
+        Host:local.host
       },
       maxPayload:maxBody,handshakeTimeout:8000
     });
@@ -122,8 +169,29 @@ export function createRelayAgent(options = {}) {
     if (stopped) return;
     const cloudSocket = new WebSocket(relay,{maxPayload:18*1024*1024,handshakeTimeout:10000});
     socket = cloudSocket;
+    onState({status:'connecting'});
     readyTimer = setTimeout(() => cloudSocket.terminate(),15000);
-    cloudSocket.on('open',() => cloudSocket.send(JSON.stringify({type:'agent-auth',token,deviceId})));
+    let pendingPing = null;
+    let pingSentAt = 0;
+    cloudSocket.on('open',() => {
+      cloudSocket.send(JSON.stringify({type:'agent-auth',token,deviceId,capabilities:['account-connect']}));
+      heartbeatTimer = setInterval(() => {
+        if (socket !== cloudSocket || cloudSocket.readyState !== WebSocket.OPEN) return;
+        if (pendingPing !== null) {
+          if (Date.now() - pingSentAt >= heartbeatTimeout) {
+            onError(new Error('云端心跳超时，正在自动重连。'));
+            cloudSocket.terminate();
+          }
+          return;
+        }
+        pendingPing = `${Date.now()}`;
+        pingSentAt = Date.now();
+        cloudSocket.ping(pendingPing);
+      },heartbeatInterval);
+    });
+    cloudSocket.on('pong',data => {
+      if (data.toString() === pendingPing) pendingPing = null;
+    });
     cloudSocket.on('error',error => { if (!stopped) onError(error); });
     cloudSocket.on('message',raw => {
       if (socket !== cloudSocket) return;
@@ -131,8 +199,9 @@ export function createRelayAgent(options = {}) {
       try { message = JSON.parse(raw.toString()); } catch { cloudSocket.close(1003,'Invalid relay message'); return; }
       if (!message || typeof message !== 'object') return;
       if (message.type === 'agent-ready') {
-        clearTimeout(readyTimer);retry = 0;onReady(message);return;
+        clearTimeout(readyTimer);retry = 0;onState({status:'online'});onReady(message);return;
       }
+      if (message.type === 'account-connect') return void connectAccount(message,cloudSocket);
       if (message.type === 'http-request') return localRequest(message,cloudSocket);
       if (message.type === 'ws-open') return openLocalSocket(message,cloudSocket);
       const bridge = bridges.get(message.bridgeId);
@@ -151,11 +220,19 @@ export function createRelayAgent(options = {}) {
         else bridge.socket.terminate();
       }
     });
-    cloudSocket.on('close',() => {
+    cloudSocket.on('close',(code,reason) => {
       if (socket !== cloudSocket) return;
-      socket = null;clearTimeout(readyTimer);clearLocalConnections();
+      socket = null;clearTimeout(readyTimer);clearInterval(heartbeatTimer);clearLocalConnections();
       if (!stopped) {
-        const delay = Math.min(30000,1000 * 2 ** Math.min(5,retry++));
+        if (code === 1008 || code === 1012 && reason.toString() === 'Replaced by a newer agent') {
+          stopped = true;
+          const detail = code === 1008 ? '电脑凭证被拒绝，请检查账号或重新登录。' : '连接已由另一个 Orbit 实例接管。';
+          onState({status:'blocked',reason:detail});
+          onError(new Error(detail));
+          return;
+        }
+        const delay = Math.min(30000,reconnectDelay * 2 ** Math.min(5,retry++));
+        onState({status:'reconnecting',retryIn:delay,reason:reason.toString() || `连接断开 (${code})`});
         reconnectTimer = setTimeout(connect,delay);
       }
     });
@@ -164,7 +241,7 @@ export function createRelayAgent(options = {}) {
   return {
     start() { if (!stopped) return; stopped = false;connect(); },
     stop() {
-      stopped = true;clearTimeout(reconnectTimer);clearTimeout(readyTimer);
+      stopped = true;clearTimeout(reconnectTimer);clearTimeout(readyTimer);clearInterval(heartbeatTimer);
       const previous = socket;socket = null;previous?.terminate();clearLocalConnections();
     }
   };

package/relay-server.mjs

@@ -254,12 +254,15 @@ export function createRelayServer(options = {}) {
     return devices[0];
   }
 
-  async function proxyHttp(request,response,authenticated) {
+  async function proxyHttp(request,response,authenticated,accountConnect = false) {
     let device;
     try{device=chooseDevice(request,authenticated.user)}
     catch(error){return json(response,error.status||409,{error:safeError(error),code:error.code||'device_unavailable'})}
     const agent=agents.get(device.id);
     if(!agent||agent.socket.readyState!==WebSocket.OPEN)return json(response,503,{error:`电脑“${device.name}”当前不在线。`});
+    if(accountConnect&&!agent.accountConnect)return json(response,409,{
+      error:'请在电脑上更新 Orbit 连接器到 0.1.2 或更高版本后重试。',code:'connector_upgrade_required'
+    });
     const body=await readBody(request);
     if (!store.hasSession(authenticated.tokenHash,authenticated.user.id)) return json(response,401,{error:'请先登录云端工作台。',code:'cloud_login_required'});
     chooseDevice(request, store.getUser(authenticated.user.id));
@@ -273,9 +276,12 @@ export function createRelayServer(options = {}) {
       pendingHttp.set(requestId,{resolve,reject,timer,deviceId:device.id,agent,userId:authenticated.user.id,sessionHash:authenticated.tokenHash});
     });
     try{
-      sendAgent(agent,{type:'http-request',requestId,method:request.method,path:request.url,headers,body:body.toString('base64')});
+      sendAgent(agent,accountConnect
+        ? {type:'account-connect',requestId,headers:{cookie:headers.cookie}}
+        : {type:'http-request',requestId,method:request.method,path:request.url,headers,body:body.toString('base64')});
       const result=await promise;
       if (!store.hasSession(authenticated.tokenHash,authenticated.user.id)) return json(response,401,{error:'请先登录云端工作台。',code:'cloud_login_required'});
+      chooseDevice(request,store.getUser(authenticated.user.id));
       response.writeHead(result.statusCode,responseHeaders(result.headers,device.id,secureCookie));
       response.end(Buffer.from(result.body||'','base64'));
     }catch(error){if(!response.destroyed)json(response,502,{error:safeError(error)})}
@@ -530,12 +536,13 @@ export function createRelayServer(options = {}) {
         if(!device)return json(response,403,{error:'设备不属于当前账号。'});
         return json(response,200,{device:publicDevice(device)});
       }
-      if(isLocalApi(url.pathname,request.method)){
+      const accountConnect=url.pathname==='/api/cloud/connect'&&request.method==='POST';
+      if(accountConnect||isLocalApi(url.pathname,request.method)){
         if(request.method!=='GET'&&!sameOrigin(request,true))return json(response,403,{error:'来源校验失败。'});
         const current=userSession(request);if(!current)return json(response,401,{error:'请先登录云端工作台。',code:'cloud_login_required'});
         const devices=store.devicesForUser(current.user.id);
         if(devices.length>Number(current.user.maxDevices))return json(response,403,{error:'设备数量超出套餐额度。'});
-        return await proxyHttp(request,response,current);
+        return await proxyHttp(request,response,current,accountConnect);
       }
       const file=staticTarget(url.pathname);
       if(file&&['GET','HEAD'].includes(request.method)){
@@ -565,7 +572,8 @@ export function createRelayServer(options = {}) {
             agent=store.authenticateDevice(message.token,message.deviceId);
             if(!agent){clearTimeout(authTimer);return websocket.close(1008,'Agent authentication failed')}
             clearTimeout(authTimer);
-            const entry={socket:websocket,deviceId:agent.id,userId:agent.userId,name:agent.name,isAlive:true};
+            const entry={socket:websocket,deviceId:agent.id,userId:agent.userId,name:agent.name,isAlive:true,
+              accountConnect:Array.isArray(message.capabilities)&&message.capabilities.includes('account-connect')};
             const previous=agents.get(agent.id);
             if(previous&&previous.socket!==websocket)closeDeviceConnections(agent.id,1012,'Replaced by a newer agent');
             agents.set(agent.id,entry);

package/relay-store.mjs

@@ -21,7 +21,7 @@ function safeString(value, label, max = 120) {
 }
 
 function validPassword(value) {
-  if(typeof value!=='string'||value.length<12||value.length>256||/[\u0000-\u001f\u007f]/.test(value))throw new Error('密码需要 12–256 个字符，不能包含控制字符。');
+  if(typeof value!=='string'||value.length<6||value.length>256||/[\u0000-\u001f\u007f]/.test(value))throw new Error('密码需要 6–256 个字符，不能包含控制字符。');
   return value;
 }
 

package/server.mjs

@@ -11,6 +11,7 @@ import { CodexRpc } from './lib/rpc.mjs';
 import { DesktopRpc } from './lib/desktop.mjs';
 
 const root = path.dirname(fileURLToPath(import.meta.url));
+const packageVersion = JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8')).version;
 const sessionLifetime = 12 * 60 * 60 * 1000;
 const safeError = error => String(error.message || error).replace(/Bearer\s+\S+/gi, 'Bearer [REDACTED]').replace(/(?:sk-|sk_)[\w-]{12,}/g, '[REDACTED]').slice(0, 700);
 
@@ -118,7 +119,7 @@ export function createOrbitServer(options = {}) {
     const threads = store.list();
     for (const id of session.enabled.keys()) controlFor(session, id);
     return {
-      product: 'Orbit', version: '0.1.0', device: os.hostname(), platform: process.platform, home,
+      product: 'Orbit', version: packageVersion, device: os.hostname(), platform: process.platform, home,
       threadCount: threads.length, projectCount: new Set(threads.map(thread => thread.projectId)).size,
       archivedCount: threads.filter(thread => thread.archived).length, lockedCount: threads.filter(thread => thread.locked).length,
       bridge: 'connected', transport: 'websocket', readOnlyMirror: true,
@@ -308,7 +309,8 @@ export function createOrbitServer(options = {}) {
     const body = message.params || {};
     const id = body.threadId;
     if (message.method === 'thread.subscribe') {
-      if (id && !store.row(id)) throw new Error('会话不存在。');
+      const row = id ? store.row(id) : null;
+      if (id && !row) throw new Error('会话不存在。');
       if (socket.desktopSubscription && socket.desktopSubscription !== (id || null)) unwatchDesktop(socket);
       socket.subscription = id || null;
       let runtime = null;
@@ -327,6 +329,10 @@ export function createOrbitServer(options = {}) {
           };
         }
       }
+      if (executionMode === 'desktop' && runtime?.attached && body.autoControl === true
+        && !row.archived && !String(row.source).startsWith('{')) {
+        session.enabled.set(id, {sharedExecution:true,desktop:true,writable:false,expires:Date.now() + 1800000});
+      }
       const control = controlFor(session, id);
       const approvals = control ? (executionMode === 'desktop' ? runtime?.approvals || [] : [...rpc.approvals.values()].filter(request => request.params.threadId === id).map(request => ({ ...request.params, requestId: String(request.id), method: request.method }))) : [];
       return { subscribed: id || null, control, runtime, settings: control ? session.preferences.get(id) || null : null, turnId: runtime?.turnId || rpc.threads.get(id)?.turnId || null, approvals };
@@ -476,10 +482,10 @@ export function createOrbitServer(options = {}) {
 if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
   const app = createOrbitServer();
   const info = await app.listen();
-  console.log(`Orbit 0.1.0 · ${info.url}`);
+  console.log(`Orbit ${packageVersion} · ${info.url}`);
   console.log(`Native conversations: ${app.store.list().length} · default read-only`);
   console.log(`Pairing key file: ${info.credentialPath}`);
-  console.log(`Execution channel: ${app.rpc.mode || 'cold-resume'} · desktop hot-attach is opt-in per conversation.`);
+  console.log(`Execution channel: ${app.rpc.mode || 'cold-resume'} · desktop chats support automatic hot attach.`);
   const shutdown = async () => { await app.close(); process.exit(0); };
   process.once('SIGINT', shutdown); process.once('SIGTERM', shutdown);
 }