codexunlimit 0.1.0-web.8 → 0.1.0-web.9

package/license-client.mjs

@@ -12,6 +12,7 @@ const LOCAL_DENIALS=new Set(['activation_required','license_signature_invalid','
 function serviceError(code,status=503,retryAfter=1){const error=new RelayError(status,code);error.transient=true;error.authoritative=false;error.retryAfter=retryAfter;return error;}
 function normalizeFailure(error){
   const code=typeof error?.code==='string'?error.code:error?.message;
+  if(code==='license_lease_expired')return serviceError(code,503,error?.retryAfter??1);
   if(error?.transient||error?.status>=500||error?.status===429||['license_server_unavailable','license_response_invalid','license_service_busy','try_later','ingress_rate_limit','ingress_busy','ingress_capacity'].includes(code))return serviceError(code==='license_service_busy'||error?.status===429?'license_service_busy':'license_server_unavailable',error?.status===429?429:503,error?.retryAfter??1);
   if(TERMINAL_DENIALS.has(code)||LOCAL_DENIALS.has(code)){const failure=new RelayError(403,code);failure.authoritative=error?.authoritative!==false;return failure;}
   return serviceError('license_server_unavailable');
@@ -67,14 +68,15 @@ export class LicenseClient {
     this.state=state;this.publicKey=publicKey;this.request=request;this.device=device??loadDevice(state);this.now=now;this.pending=null;this.nextAttempt=0;this.lastFailure=null;this.failures=0;
     this.wallStart=now();this.monotonicStart=performance.now();
   }
-  check(envelope=this.state.get('license.lease'),feature='desktop'){
+  check(envelope=this.state.get('license.lease'),feature='desktop',{allowExpired=false}={}){
     let claims;try{claims=verifyEnvelope(envelope,this.publicKey);}catch{throw Error('license_signature_invalid');}
     const now=this.now(),last=this.state.get('license.clock')??0;
     if(now<last-30000||now<this.wallStart+performance.now()-this.monotonicStart-30000)throw Error('clock_rollback_detected');
     if(claims.kind!=='tdh-relay-lease-v1'||claims.product!=='tdh-relay'||claims.deviceId!==this.device.deviceId||
       claims.keyHash!==hash(this.device.publicKey)||!Array.isArray(claims.features)||!claims.features.includes(feature)||!Number.isFinite(claims.licenseExpiresAt)||
       !Number.isFinite(claims.issuedAt)||!Number.isFinite(claims.expiresAt)||claims.issuedAt>now+60000||
-      claims.expiresAt<=now||claims.expiresAt>claims.issuedAt+600000||claims.expiresAt>claims.licenseExpiresAt)throw Error('license_invalid_or_expired');
+      claims.expiresAt<=claims.issuedAt||claims.expiresAt>claims.issuedAt+600000||claims.expiresAt>claims.licenseExpiresAt)throw Error('license_invalid_or_expired');
+    if(!allowExpired&&claims.expiresAt<=now)throw serviceError('license_lease_expired');
     if(now>last+10000)this.state.set('license.clock',now);
     return claims;
   }
@@ -98,9 +100,12 @@ export class LicenseClient {
     const activationId=this.state.get('license.activation');if(!activationId)throw Error('activation_required');
     this.pending=(async()=>{
       try{
-        const proof=await this.proof('renew:'+activationId);
-        const response=await this.request('renew',{...proof,activationId});
-        try{return this.save(response);}catch(error){error.authoritative=false;throw error;}
+        for(let attempt=0;;attempt++){
+          const proof=await this.proof('renew:'+activationId);
+          const response=await this.request('renew',{...proof,activationId});
+          try{return this.save(response);}
+          catch(error){error.authoritative=false;if(error.code!=='license_lease_expired'||attempt>=1)throw error;}
+        }
       }catch(error){
         const failure=normalizeFailure(error);this.lastFailure=failure;
         if(TERMINAL_DENIALS.has(failure.code)&&failure.authoritative){
@@ -121,7 +126,21 @@ export class LicenseClient {
       }else if((!current||online)&&this.lastFailure)throw this.lastFailure;
     }
     if(this.state.get('license.denied'))throw new RelayError(403,'license_revoked');
-    try{return this.check(undefined,feature);}catch(error){if(this.lastFailure?.transient)throw this.lastFailure;throw new RelayError(403,error.message);}
+    try{return this.check(undefined,feature);}catch(error){if(this.lastFailure?.transient)throw this.lastFailure;throw normalizeFailure(error);}
+  }
+  async forRequest(feature='desktop'){
+    try{if(!this.state.get('license.denied'))return this.check(undefined,feature,{allowExpired:true});}catch{}
+    return this.ensure(feature);
+  }
+  acceptLease(encoded){
+    if(typeof encoded!=='string'||encoded.length>4096||this.state.get('license.denied'))return false;
+    try{
+      const envelope=JSON.parse(Buffer.from(encoded,'base64url')),claims=this.check(envelope);
+      if(claims.activationId!==this.state.get('license.activation'))return false;
+      const current=this.check(undefined,'desktop',{allowExpired:true});
+      if(claims.licenseId!==current.licenseId||claims.issuedAt<current.issuedAt||claims.issuedAt===current.issuedAt&&claims.expiresAt<=current.expiresAt)return false;
+      this.save({lease:envelope});return true;
+    }catch{return false;}
   }
   status(){
     try{const c=this.check();return {active:!this.state.get('license.denied'),licenseId:c.licenseId,activationId:c.activationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexunlimit",
-  "version": "0.1.0-web.8",
+  "version": "0.1.0-web.9",
   "private": false,
   "description": "Codex Unlimit — trò chuyện và quản lý kết nối trên máy của bạn",
   "type": "module",

package/product.mjs

@@ -1,4 +1,4 @@
-export const VERSION='0.1.0-web.8';
+export const VERSION='0.1.0-web.9';
 export const PRODUCT='codexunlimit-connector';
 export const DEFAULT_PORT=18457;
 export const LICENSE_ORIGIN='https://codexunlimit.tudonghoa.me';

package/relay.mjs

@@ -8,7 +8,7 @@ import {isImageRoute,gatewayRequest} from './image-http.mjs';
 
 const CONTEXT_HEADERS=['content-type','content-encoding','chatgpt-account-id','session_id','session-id','conversation_id','originator','version','openai-beta','x-codex-beta-features','x-codex-parent-thread-id','x-codex-turn-metadata','x-codex-turn-state'];
 export function signedHeaders(license,state,method,route,authorization,body=Buffer.alloc(0),headers=new Headers()){
-  const envelope=state.get('license.lease');license.check(envelope);
+  const envelope=state.get('license.lease');license.check(envelope,'desktop',{allowExpired:true});
   const timestamp=Date.now(),nonce=crypto.randomBytes(24).toString('base64url'),key=license.device.privateKey;
   const bodyHash=hash(body??Buffer.alloc(0));
   const contextHeaders=isImageRoute(route)?[...CONTEXT_HEADERS,'x-codex-image-turn-id']:CONTEXT_HEADERS;
@@ -64,9 +64,10 @@ export function createConnector(state,{license,localApp,pool,onStop=()=>{},prepa
       const chunks=[];let size=0;for await(const chunk of req){size+=chunk.length;if(size>limit)throw Object.assign(Error('request_too_large'),{status:413});chunks.push(chunk);}
       clearTimeout(bodyTimer);const payload=req.method==='POST'?Buffer.concat(chunks):undefined;chunks.length=0;
       // Sign only after upload completes, so a slow upload cannot age the proof out.
-      controller.signal.throwIfAborted();await license.ensure('desktop');controller.signal.throwIfAborted();
+      controller.signal.throwIfAborted();await license.forRequest('desktop');controller.signal.throwIfAborted();
       for(const [key,value]of Object.entries(signedHeaders(license,state,req.method,req.url,authorization,payload,headers)))headers.set(key,value);
       const response=await request(origin+req.url,{method:req.method,headers,body:payload,redirect:'error',signal:AbortSignal.any([controller.signal,AbortSignal.timeout(isImageRoute(req.url)?630000:1800000)])});
+      license.acceptLease(response.headers.get('x-cu-lease'));
       pool?.observe({token:authorization.slice(7),accountId:headers.get('chatgpt-account-id')??undefined},response);
       if(response.status>=400&&!(response.headers.get('content-type')??'').toLowerCase().startsWith('application/json')){
         response.body?.cancel().catch(()=>{});status=response.status===429?429:503;const wait=Number(response.headers.get('retry-after'));res.setHeader('retry-after',String(Number.isFinite(wait)&&wait>0?Math.min(60,Math.ceil(wait)):3));

package/web/messages.js

@@ -19,6 +19,7 @@ export const errors={
   request_integrity_failed:'Yêu cầu chưa được xác thực. Cập nhật Codex Unlimit rồi thử lại.',
   license_server_unavailable:'Chưa liên lạc được máy chủ kiểm tra key. Kiểm tra mạng rồi chọn Kiểm tra thời hạn.',
   license_service_busy:'Máy chủ kiểm tra key đang bận. Chờ vài giây rồi thử lại; đây không phải thông báo key hết hạn.',
+  license_lease_expired:'Phiên xác thực tạm thời đã hết hạn. Chọn Kiểm tra thời hạn để lấy phiên mới; nếu lặp lại, kiểm tra ngày giờ trên máy.',
   license_invalid_or_expired:'Key đã hết hạn hoặc bị thu hồi. Liên hệ nơi cấp key.',
   license_revoked:'Key đã bị thu hồi. Liên hệ nơi cấp key.',
   device_limit_reached:'Key đã đủ số máy được phép dùng. Mở trang khách hàng để kiểm tra thiết bị.',