orbit-codex-bridge 0.1.1 → 0.1.3

package/public/style.css

@@ -37,4 +37,34 @@
 .activity-diff .diff-added{color:#a8d89a;background:#47614845}
 .activity-diff .diff-removed{color:#edb0a7;background:#70474445}
 .activity-empty{margin:8px 0;color:#9ba38e;font-size:10px}
+.turn-mode-label{font-size:10px;color:#8b9785}
+.turn-mode-select{max-width:95px;border:1px solid #e2e7dc;background:#f7f8f4;border-radius:6px;padding:5px 7px;color:#506045;font-size:10px}
+.turn-mode-select:disabled{opacity:.55}
+.composer-toolbar .turn-mode-label,.composer-toolbar .turn-mode-select,.composer-toolbar #attach-files{flex:none}
+.composer-toolbar #composer-mode{min-width:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
+.composer-attachments{display:flex;flex-wrap:wrap;gap:6px;margin-top:8px}
+.composer-attachment{display:inline-flex;align-items:center;gap:6px;max-width:100%;padding:5px 7px;border:1px solid #dfe6d5;border-radius:6px;background:#f7f9f2;color:#68795a;font-size:9px}
+.composer-attachment>span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.composer-attachment svg{width:13px;height:13px}
+.composer-attachment button{width:20px;height:20px;border-radius:4px;color:#8b9785;font-size:16px;line-height:1}
+.composer-attachment button:hover{background:#e8eddf}
+.composer-attachment button:disabled{opacity:.5}
+.file-browser-dialog{width:min(560px,calc(100vw - 28px));max-width:560px;max-height:min(78dvh,760px);padding:0;border:1px solid #dfe5d7;border-radius:13px;background:#fbfcf8;color:#354536;box-shadow:0 20px 80px #17251a40}
+.file-browser-dialog::backdrop{background:#1b2c22a8;backdrop-filter:blur(3px)}
+.file-browser-panel{display:flex;flex-direction:column;max-height:min(78dvh,760px);padding:20px}
+.file-browser-panel>header{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;border-bottom:1px solid var(--line);padding-bottom:12px}
+.file-browser-panel h2{margin:0;font-size:17px;font-weight:550}
+.file-browser-panel header p{margin:5px 0 0;max-width:360px;overflow-wrap:anywhere;color:#7d8a72;font-size:10px}
+.file-browser-notice{font-size:10px;line-height:1.7;color:#899380}
+.file-browser-list{overflow:auto;min-height:100px;max-height:52dvh;border:1px solid var(--line);border-radius:8px;background:#fff}
+.file-browser-entry{width:100%;min-height:43px;display:flex;align-items:center;gap:10px;padding:8px 12px;border-bottom:1px solid #eef0e9;text-align:left}
+.file-browser-entry:last-child{border-bottom:0}
+.file-browser-entry:hover{background:#f3f6ed}
+.file-browser-entry>span{color:#80916d;flex:none}
+.file-browser-entry svg{width:15px;height:15px}
+.file-browser-entry strong{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:11px;font-weight:450}
+.file-browser-entry small{margin-left:auto;flex:none;color:#929d88;font-size:9px}
+.file-browser-parent{background:#f8faf4;color:#647653}
+.file-browser-empty{padding:16px;color:#909b84;font-size:10px}
+@media(max-width:760px){.composer-toolbar{flex-wrap:wrap}.composer-toolbar #composer-mode{flex:1 1 65px}.turn-mode-select{max-width:92px}.composer-attachment{max-width:100%}.file-browser-panel{padding:16px}.session-settings-bar{gap:5px}.session-settings-bar #browse-files{padding:6px 8px;font-size:9px}}
 @media(max-width:760px){.message-head .message-copy,.copy-code{opacity:1}.activity-message{margin-left:0}.activity-content{padding-left:14px}.activity-meta{max-width:40%;white-space:normal}.message-attachments{margin-left:0}.message-body pre{padding-top:38px}}

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 || '');
@@ -48,53 +50,92 @@ 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']} : {}),
+            ...Object.fromEntries(['content-disposition','content-length','accept-ranges','content-range','etag']
+              .filter(name=>typeof response.headers[name]==='string').map(name=>[name,response.headers[name]]))
+          },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','user-agent']) {
+    for (const name of ['accept','content-type','cookie','user-agent','range','if-range','if-none-match']) {
       const value = message.headers?.[name];
       if (typeof value === 'string') headers[name] = value;
     }
-    headers.host = local.host;
-    headers.origin = local.origin;
-    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) {
@@ -135,7 +176,7 @@ export function createRelayAgent(options = {}) {
     let pendingPing = null;
     let pingSentAt = 0;
     cloudSocket.on('open',() => {
-      cloudSocket.send(JSON.stringify({type:'agent-auth',token,deviceId}));
+      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) {
@@ -162,6 +203,7 @@ export function createRelayAgent(options = {}) {
       if (message.type === 'agent-ready') {
         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);

package/relay-server.mjs

@@ -71,13 +71,24 @@ function responseHeaders(headers, deviceId, secureCookie) {
     const token = paired.split(';')[0].slice('orbit_session='.length);
     safe['Set-Cookie'] = `${deviceCookieName(deviceId)}=${token}; HttpOnly; SameSite=Strict; Path=/; Max-Age=${token ? 43200 : 0}${secureCookie ? '; Secure' : ''}`;
   }
+  const contentType=headers?.['content-type'];
+  if(typeof contentType==='string'&&/^(?:application\/(?:json|pdf|zip|octet-stream)|text\/[a-z0-9.+-]+(?:;\s*charset=utf-8)?|image\/(?:png|jpeg|gif|webp|svg\+xml))$/i.test(contentType))safe['Content-Type']=contentType;
+  const disposition=headers?.['content-disposition'];
+  if(typeof disposition==='string'&&disposition.length<=1000
+    &&/^attachment;\s*filename="[^"\r\n]{1,180}";\s*filename\*=UTF-8''[a-zA-Z0-9%._~-]{1,600}$/.test(disposition))safe['Content-Disposition']=disposition;
+  const length=headers?.['content-length'];
+  if(/^\d{1,8}$/.test(String(length||'')))safe['Content-Length']=length;
+  if(/^(?:bytes \d+-\d+\/\d+|bytes \*\/\d+)$/.test(headers?.['content-range']||''))safe['Content-Range']=headers['content-range'];
+  if(headers?.['accept-ranges']==='bytes')safe['Accept-Ranges']='bytes';
+  if(typeof headers?.etag==='string'&&/^"orbit-\d+-\d+"$/.test(headers.etag))safe.ETag=headers.etag;
   return safe;
 }
 
 function isLocalApi(pathname, method) {
   if (method === 'GET') return ['/api/status','/api/threads','/api/models'].includes(pathname)
-    || /^\/api\/threads\/[a-zA-Z0-9_-]{8,120}\/messages$/.test(pathname);
-  return method === 'POST' && ['/api/pair','/api/logout','/api/pair/qr'].includes(pathname);
+    || /^\/api\/threads\/[a-zA-Z0-9_-]{8,120}\/(?:messages|files|file)$/.test(pathname);
+  return method === 'POST' && (['/api/pair','/api/logout','/api/pair/qr'].includes(pathname)
+    || /^\/api\/threads\/[a-zA-Z0-9_-]{8,120}\/attachments(?:\/remove)?$/.test(pathname));
 }
 
 function json(response, status, body, headers = {}) {
@@ -254,18 +265,21 @@ 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.3 或更高版本后重试。',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));
     const requestId=crypto.randomUUID();
     const headers={};
-    for(const name of ['accept','content-type','host','origin','user-agent'])if(request.headers[name])headers[name]=request.headers[name];
+    for(const name of ['accept','content-type','host','origin','user-agent','range','if-range','if-none-match'])if(request.headers[name])headers[name]=request.headers[name];
     headers.cookie = localCookie(request,device.id);
     if(pendingHttp.size>=500)return json(response,429,{error:'请求过多，请稍后重试。'});
     const promise=new Promise((resolve,reject)=>{
@@ -273,9 +287,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 +547,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 +583,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);