grix-connector 4.1.0 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter/claude/claude-bridge-server.js +1 -1
- package/dist/adapter/claude/claude-tools.js +1 -1
- package/dist/adapter/claude/claude-worker-client.js +1 -1
- package/dist/adapter/claude/mcp-http-launcher.js +2 -2
- package/dist/adapter/claude/result-timeout.js +1 -1
- package/dist/assets/dsh-bridge/{grix-dsh-bridge-4.1.0.tgz → grix-dsh-bridge-4.2.0.tgz} +0 -0
- package/dist/assets/dsh-bridge/manifest.json +4 -4
- package/dist/bridge/bridge.js +1 -1
- package/dist/core/access/allowlist-store.js +1 -1
- package/dist/core/file-ops/list-files.js +1 -1
- package/dist/core/installer/npm-registry.js +4 -4
- package/dist/core/runtime/health.js +1 -1
- package/dist/core/upgrade/npm-upgrader.js +2 -2
- package/dist/core/upgrade/upgrade-checker.js +1 -1
- package/dist/grix.js +6 -6
- package/dist/log.js +2 -2
- package/dist/mcp/stream-http/config.js +1 -1
- package/dist/mcp/stream-http/connection-binding.js +1 -1
- package/dist/mcp/stream-http/security.js +1 -1
- package/dist/mcp/stream-http/tool-executor.js +1 -1
- package/dist/mcp/stream-http/tool-registry.js +1 -1
- package/dist/mcp/stream-http/tool-schemas.js +1 -1
- package/dist/service/service-manager.js +3 -3
- package/package.json +1 -1
- package/scripts/upgrade-guardian.mjs +78 -3
- package/scripts/upgrade-guardian.sh +100 -75
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{execFile as fe,execFileSync as A}from"node:child_process";import{randomUUID as K}from"node:crypto";import{promisify as de}from"node:util";import{uptime as le}from"node:os";import{closeSync as pe,copyFileSync as ge,cpSync as _e,existsSync as f,linkSync as me,mkdirSync as S,mkdtempSync as he,openSync as we,readFileSync as P,renameSync as h,rmSync as p,statfsSync as Se,symlinkSync as ke,unlinkSync as O,writeFileSync as I}from"node:fs";import{basename as y,dirname as m,join as d,relative as X,resolve as s,sep as N}from"node:path";import{GRIX_PATHS as D}from"../log/index.js";import{appendRotatingFileSync as Ee}from"../log/rotation.js";import{getMachineName as Pe}from"../util/host-info.js";import{resolveInstallId as ye}from"../util/install-id.js";import{npmInstallWithMirror as xe,probeRegistries as ve,resolveNpmInvocation as M}from"../installer/npm-registry.js";import{resolveWindowsServiceRuntimeDir as q}from"../../service/service-paths.js";const Ie=de(fe);class u extends Error{code;constructor(t,r){super(r),this.name="UpgradeError",this.code=t}}const De=/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;function C(e){const t=String(e??"").trim().replace(/^v(?=\d)/,"");if(!De.test(t))throw new u("INVALID_VERSION",`Invalid connector upgrade version: ${String(e)}`);return t}const G=".grix-upgrade-backup",Ne=".grix-upgrade-failed",Z=".grix-upgrade-backup",Q=".grix-upgrade-next",$e="upgrade-wrapper.pause.json",Ae="upgrade-rollback.intent.json",Re=".grix-connector-upgrade.lock",ee=[250,750],R=[100,250,750,1500];function te(){return d(D.log,"upgrade.log")}function k(){return d(D.data,"upgrade-pending.json")}function it(){return f(k())}function l(){const e=k();if(!f(e))return null;try{return JSON.parse(P(e,"utf-8"))}catch{return null}}function ot(e,t,r){const n={from_version:e,target_version:t,upgraded_at:new Date().toISOString(),crash_count:0,transaction_id:K(),...r?{phase:r}:{}},i=k();S(m(i),{recursive:!0});let a;try{a=we(i,"wx",384)}catch(o){throw o?.code==="EEXIST"?new u("UPGRADE_IN_PROGRESS","Another connector upgrade transaction is already active"):o}try{I(a,JSON.stringify(n),"utf-8")}catch(o){try{O(i)}catch{}throw o}finally{pe(a)}return n}function at(e){const t=e.package_dir;if(!t)return null;const r=s(t);if(!r.includes(`${N}node_modules${N}`))return null;try{const n=JSON.parse(P(d(r,"package.json"),"utf-8"));return n.name!=="grix-connector"||typeof n.version!="string"?null:n.version.trim().replace(/^v/,"")||null}catch{return null}}function be(e,t){S(m(e),{recursive:!0});const r=`${e}.tmp-${process.pid}`;I(r,JSON.stringify(t),"utf-8"),h(r,e)}function v(e,t){const r=l();if(!r)throw new u("PENDING_MISSING","Upgrade transaction is missing");if(t&&r.transaction_id!==t)throw new u("UPGRADE_TRANSACTION_CHANGED","Upgrade transaction ownership changed");const n={...r,...e};return be(k(),n),n}function W(){return d(D.data,$e)}function Fe(){return d(D.data,Ae)}function ct(e,t){const r=l();if(!r?.transaction_id||r.phase!=="staged"||t&&r.transaction_id!==t)throw new u("INVALID_UPGRADE_STATE","Windows upgrade is not staged for activation");const n=W();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;return I(i,JSON.stringify({transaction_id:r.transaction_id}),"utf-8"),h(i,n),v({phase:"handoff_ready",old_pid:e,old_command_line:Ue(e)??void 0,old_boot_time:Date.now()-le()*1e3,activation_started_at:new Date().toISOString(),wrapper_pause_file:n},r.transaction_id)}function Ue(e){if(process.platform!=="win32"||!Number.isInteger(e)||e<=0)return null;try{const t=`${process.env.SystemRoot||"C:\\Windows"}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;return A(t,["-NoProfile","-NonInteractive","-WindowStyle","Hidden","-Command",`(Get-CimInstance Win32_Process -Filter 'ProcessId=${e}').CommandLine`],{encoding:"utf-8",timeout:3e3,windowsHide:!0}).trim()||null}catch{return null}}function st(e,t){const r=l();if(!r?.transaction_id||r.transaction_id!==e||r.phase!=="verifying")throw new u("INVALID_UPGRADE_STATE","Windows upgrade is not awaiting verification");const n=Fe();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;I(i,JSON.stringify({transaction_id:e,message:t}),"utf-8"),h(i,n);const a=W();S(m(a),{recursive:!0});const o=`${a}.tmp-${process.pid}`;return I(o,JSON.stringify({transaction_id:e}),"utf-8"),h(o,a),v({phase:"rolling_back",guardian_pid:void 0,error_code:"STARTUP_CRASH",error_msg:t,wrapper_pause_file:a},e)}function ut(){try{p(W(),{force:!0})}catch{}}function Le(e=l()){if(Y(e)){try{p(s(e.staging_prefix),{recursive:!0,force:!0})}catch{}if(re(e))try{p(s(e.runtime_next_dir),{recursive:!0,force:!0})}catch{}}}function re(e){if(!e?.runtime_dir||!e.runtime_backup_dir||!e.runtime_next_dir)return!1;const t=s(e.runtime_dir),r=q(D.base),n=d(m(m(r)),"runtime"),i=t===s(n),a=t===s(r)&&/^GrixConnectorDaemon-[0-9a-f]{12}$/.test(y(t))&&y(m(t))==="runtimes"&&y(m(m(t)))==="grix-connector";return(i||a)&&s(e.runtime_backup_dir)===`${t}${Z}`&&s(e.runtime_next_dir)===`${t}${Q}`}function V(e){return d(s(e),Re)}function B(e){try{const t=f(e)&&!f(d(e,"owner.json"))?e:d(e,"owner.json"),r=JSON.parse(P(t,"utf-8"));return typeof r.transaction_id=="string"&&typeof r.pending_file=="string"?r:null}catch{return null}}function ne(e){if(!e||!f(e.pending_file))return!1;try{return JSON.parse(P(e.pending_file,"utf-8")).transaction_id===e.transaction_id}catch{return!0}}function Te(e){const t=l();if(!t?.transaction_id)throw new u("PENDING_MISSING","Upgrade transaction disappeared before npm staging");const r=V(e),n={transaction_id:t.transaction_id,pending_file:k()};v({npm_prefix:s(e),npm_lock_file:r},t.transaction_id);const i=`${r}.candidate-${t.transaction_id}-${K()}`;try{I(i,JSON.stringify(n),{encoding:"utf-8",flag:"wx"}),me(i,r),p(i,{force:!0})}catch(a){try{p(i,{force:!0})}catch{}if(!f(r))throw a;const o=B(r);if(o?.transaction_id===t.transaction_id&&s(o.pending_file)===s(k()))return;throw new u(ne(o)?"UPGRADE_IN_PROGRESS":"UPGRADE_LOCK_RECOVERY_REQUIRED",ne(o)?`Another Windows service root is upgrading the shared npm prefix ${s(e)}`:`A stale or incomplete Windows upgrade lock requires recovery at ${r}`)}}function Oe(e=l(),t={}){if(!e?.transaction_id||!e.npm_prefix||!e.npm_lock_file)return!0;const r=V(e.npm_prefix);if(s(e.npm_lock_file)!==r)return!1;if(!f(r))return!0;const n=B(r);if(!n)return!1;if(n.transaction_id!==e.transaction_id||s(n.pending_file)!==s(k()))return!0;const i=t.remove??p,a=t.sleep??(o=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,o)});for(let o=0;;o+=1)try{return i(r,{recursive:!0,force:!0}),!f(r)}catch(c){const g=c?.code;if((g==="EBUSY"||g==="EPERM"||g==="EACCES")&&o<R.length){a(R[o]);continue}return E(`shared npm-prefix lock release failed at ${r}: ${c instanceof Error?c.message:String(c)}`),!1}}function b(e,t){const r=s(e);return s(t)===`${r}${G}`&&r.includes(`${N}node_modules${N}`)&&y(r)==="grix-connector"}function Me(e,t){const r=X(s(e),s(t));return r!==""&&r!==".."&&!r.startsWith(`..${N}`)}function Y(e){if(!e?.npm_prefix||!e.staging_prefix||!e.staged_package_dir)return!1;const t=s(e.npm_prefix),r=s(e.staging_prefix),n=s(e.staged_package_dir);return m(r)===t&&y(r).startsWith(".grix-upgrade-stage-")&&Me(r,n)&&y(m(n))==="node_modules"&&y(n)==="grix-connector"}function Ce(e,t){const r=l();!r||!b(e,t)||v({package_dir:s(e),backup_dir:s(t)},r.transaction_id)}function Ge(e){if(!b(e.packageDir,e.backupDir))throw new u("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe global package path");if(!Y({npm_prefix:e.npmPrefix,staging_prefix:e.stagingPrefix,staged_package_dir:e.stagedPackageDir}))throw new u("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe npm staging path");const t=l();if(!t)throw new u("PENDING_MISSING","Upgrade transaction disappeared during staging");let r;try{const n=JSON.parse(P(d(e.packageDir,"package.json"),"utf-8"));if(n.name!=="grix-connector"||typeof n.version!="string")throw new Error("invalid metadata");r=C(n.version)}catch(n){throw new u("VERSION_VERIFY_FAILED",`Unable to identify the active global package before staging: ${n instanceof Error?n.message:String(n)}`)}v({phase:"staged",package_from_version:r,npm_prefix:s(e.npmPrefix),package_dir:s(e.packageDir),backup_dir:s(e.backupDir),staged_package_dir:s(e.stagedPackageDir),staging_prefix:s(e.stagingPrefix)},t.transaction_id)}function We(e,t,r={}){const n=l();if(!n?.transaction_id)throw new u("PENDING_MISSING","Upgrade transaction disappeared before runtime staging");const i=q(D.base),a=`${i}${Z}`,o=`${i}${Q}`;v({runtime_dir:i,runtime_backup_dir:a,runtime_next_dir:o},n.transaction_id);const c=r.copyTree??_e,g=r.copyFile??ge,T=r.sleep??(x=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,x)});for(let x=0;;x+=1)try{S(m(i),{recursive:!0}),p(o,{recursive:!0,force:!0}),S(o,{recursive:!0}),c(d(e.stagedPackageDir,"dist"),d(o,"dist"),{recursive:!0,force:!0}),g(d(e.stagedPackageDir,"package.json"),d(o,"package.json"));const _=d(e.stagedPackageDir,"node_modules");f(_)&&c(_,d(o,"node_modules"),{recursive:!0,force:!0});const w=U(o,"grix-connector",t);L(o,w);return}catch(_){try{p(o,{recursive:!0,force:!0})}catch{}const w=_?.code;if(w==="ENOSPC")throw new u("DISK_FULL",`Insufficient space for the isolated Windows runtime: ${_.message}`);if((w==="EBUSY"||w==="EPERM"||w==="EACCES"||w==="ENOTEMPTY")&&x<ee.length){T(ee[x]);continue}throw new u("RUNTIME_STAGE_FAILED",`Could not prepare the isolated Windows runtime before shutdown: ${_ instanceof Error?_.message:String(_)}`)}}function F(e,t){if(!f(e))return!0;const r=t.remove??p,n=t.sleep??(i=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,i)});for(let i=0;;i+=1)try{if(r(e,{recursive:!0,force:!0}),!f(e))return!0;throw Object.assign(new Error(`path still exists after removal: ${e}`),{code:"EBUSY"})}catch(a){const o=a?.code;if((o==="EBUSY"||o==="EPERM"||o==="EACCES"||o==="ENOTEMPTY")&&i<R.length){n(R[i]);continue}return E(`upgrade artifact cleanup failed at ${e}: ${a instanceof Error?a.message:String(a)}`),!1}}function ft(e=l(),t={}){if(e?.transaction_id&&l()?.transaction_id!==e.transaction_id)return!1;let r=!0,n=process.platform!=="win32";if(e?.npm_lock_file||e?.npm_prefix){if(!e.transaction_id||!e.npm_lock_file||!e.npm_prefix)return!1;const o=V(e.npm_prefix);if(s(e.npm_lock_file)!==o)return!1;if(f(o)){const c=B(o);if(c?.transaction_id!==e.transaction_id||s(c.pending_file)!==s(k()))return!1;n=!0}else{if(e.backup_dir&&f(e.backup_dir))return!1;n=!1}}const i=e?.package_dir,a=e?.backup_dir;return n&&i&&a&&b(i,a)&&(r=F(a,t)&&r),Y(e)&&(r=F(s(e.staging_prefix),t)&&r),re(e)&&(r=F(s(e.runtime_backup_dir),t)&&r,r=F(s(e.runtime_next_dir),t)&&r),r}function dt(e=l()){const t=e?.package_dir,r=e?.backup_dir;if(!t||!r||!b(t,r)||!f(r))return!1;const n=`${t}${Ne}`;try{return p(n,{recursive:!0,force:!0}),f(t)&&h(t,n),h(r,t),p(n,{recursive:!0,force:!0}),E(`atomic rollback restored ${t}`),!0}catch(i){try{!f(t)&&f(n)&&h(n,t)}catch{}return E(`atomic rollback failed: ${i instanceof Error?i.message:String(i)}`),!1}}function ie(e,t={}){const r=k();if(e){const n=l();if(!n)return!0;if(n.transaction_id!==e)return!1}if(f(r))try{(t.unlink??O)(r)}catch{return!1}return!f(r)}function lt(e=l(),t={}){if(!e?.transaction_id)return ie(void 0,{unlink:t.unlinkPending});const r=l();if(r?.transaction_id!==e.transaction_id)return!1;const n=r.phase==="finalizing"?r:v({phase:"finalizing"},e.transaction_id);return Oe(n,{remove:t.removeLock,sleep:t.sleep})?ie(e.transaction_id,{unlink:t.unlinkPending}):!1}function E(e){const t=`[${new Date().toISOString()}] ${e}
|
|
2
|
-
`;try{
|
|
1
|
+
import{execFile as _t,execFileSync as b}from"node:child_process";import{randomUUID as X}from"node:crypto";import{promisify as mt}from"node:util";import{uptime as ht}from"node:os";import{closeSync as wt,copyFileSync as St,cpSync as yt,existsSync as d,linkSync as kt,mkdirSync as S,mkdtempSync as Et,openSync as Pt,readFileSync as P,renameSync as h,rmSync as g,statfsSync as It,symlinkSync as vt,unlinkSync as C,writeFileSync as D}from"node:fs";import{basename as I,dirname as m,join as l,relative as q,resolve as s,sep as N}from"node:path";import{GRIX_PATHS as $}from"../log/index.js";import{appendRotatingFileSync as xt}from"../log/rotation.js";import{getMachineName as Dt}from"../util/host-info.js";import{resolveInstallId as $t}from"../util/install-id.js";import{NPM_REGISTRIES as Nt,npmInstallWithMirror as Rt,probeRegistries as At,resolveNpmInvocation as F}from"../installer/npm-registry.js";import{resolveWindowsServiceRuntimeDir as Z}from"../../service/service-paths.js";const Q=mt(_t);class f extends Error{code;constructor(r,e){super(e),this.name="UpgradeError",this.code=r}}const bt=/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;function G(t){const r=String(t??"").trim().replace(/^v(?=\d)/,"");if(!bt.test(r))throw new f("INVALID_VERSION",`Invalid connector upgrade version: ${String(t)}`);return r}const W=".grix-upgrade-backup",Ft=".grix-upgrade-failed",tt=".grix-upgrade-backup",rt=".grix-upgrade-next",Ut="upgrade-wrapper.pause.json",Lt="upgrade-rollback.intent.json",Tt=".grix-connector-upgrade.lock",et=[250,750],U=[100,250,750,1500];function nt(){return l($.log,"upgrade.log")}function y(){return l($.data,"upgrade-pending.json")}function dr(){let t=null;try{t=p()}catch{return{in_progress:!1}}if(!t)return{in_progress:!1};const r=t.phase??"staged";return{in_progress:!(r==="failed"||r==="rolled_back"),phase:r,from:t.from_version,target:t.target_version}}function lr(){return d(y())}function p(){const t=y();if(!d(t))return null;try{return JSON.parse(P(t,"utf-8"))}catch{return null}}function pr(t,r,e){const n={from_version:t,target_version:r,upgraded_at:new Date().toISOString(),crash_count:0,transaction_id:X(),...e?{phase:e}:{}},i=y();S(m(i),{recursive:!0});let a;try{a=Pt(i,"wx",384)}catch(o){throw o?.code==="EEXIST"?new f("UPGRADE_IN_PROGRESS","Another connector upgrade transaction is already active"):o}try{D(a,JSON.stringify(n),"utf-8")}catch(o){try{C(i)}catch{}throw o}finally{wt(a)}return n}function gr(t){const r=t.package_dir;if(!r)return null;const e=s(r);if(!e.includes(`${N}node_modules${N}`))return null;try{const n=JSON.parse(P(l(e,"package.json"),"utf-8"));return n.name!=="grix-connector"||typeof n.version!="string"?null:n.version.trim().replace(/^v/,"")||null}catch{return null}}function Mt(t,r){S(m(t),{recursive:!0});const e=`${t}.tmp-${process.pid}`;D(e,JSON.stringify(r),"utf-8"),h(e,t)}function x(t,r){const e=p();if(!e)throw new f("PENDING_MISSING","Upgrade transaction is missing");if(r&&e.transaction_id!==r)throw new f("UPGRADE_TRANSACTION_CHANGED","Upgrade transaction ownership changed");const n={...e,...t};return Mt(y(),n),n}function V(){return l($.data,Ut)}function Ot(){return l($.data,Lt)}function _r(t,r){const e=p();if(!e?.transaction_id||e.phase!=="staged"||r&&e.transaction_id!==r)throw new f("INVALID_UPGRADE_STATE","Windows upgrade is not staged for activation");const n=V();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;return D(i,JSON.stringify({transaction_id:e.transaction_id}),"utf-8"),h(i,n),x({phase:"handoff_ready",old_pid:t,old_command_line:Ct(t)??void 0,old_boot_time:Date.now()-ht()*1e3,activation_started_at:new Date().toISOString(),wrapper_pause_file:n},e.transaction_id)}function Ct(t){if(process.platform!=="win32"||!Number.isInteger(t)||t<=0)return null;try{const r=`${process.env.SystemRoot||"C:\\Windows"}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;return b(r,["-NoProfile","-NonInteractive","-WindowStyle","Hidden","-Command",`(Get-CimInstance Win32_Process -Filter 'ProcessId=${t}').CommandLine`],{encoding:"utf-8",timeout:3e3,windowsHide:!0}).trim()||null}catch{return null}}function mr(t,r){const e=p();if(!e?.transaction_id||e.transaction_id!==t||e.phase!=="verifying")throw new f("INVALID_UPGRADE_STATE","Windows upgrade is not awaiting verification");const n=Ot();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;D(i,JSON.stringify({transaction_id:t,message:r}),"utf-8"),h(i,n);const a=V();S(m(a),{recursive:!0});const o=`${a}.tmp-${process.pid}`;return D(o,JSON.stringify({transaction_id:t}),"utf-8"),h(o,a),x({phase:"rolling_back",guardian_pid:void 0,error_code:"STARTUP_CRASH",error_msg:r,wrapper_pause_file:a},t)}function hr(){try{g(V(),{force:!0})}catch{}}function Gt(t=p()){if(H(t)){try{g(s(t.staging_prefix),{recursive:!0,force:!0})}catch{}if(it(t))try{g(s(t.runtime_next_dir),{recursive:!0,force:!0})}catch{}}}function it(t){if(!t?.runtime_dir||!t.runtime_backup_dir||!t.runtime_next_dir)return!1;const r=s(t.runtime_dir),e=Z($.base),n=l(m(m(e)),"runtime"),i=r===s(n),a=r===s(e)&&/^GrixConnectorDaemon-[0-9a-f]{12}$/.test(I(r))&&I(m(r))==="runtimes"&&I(m(m(r)))==="grix-connector";return(i||a)&&s(t.runtime_backup_dir)===`${r}${tt}`&&s(t.runtime_next_dir)===`${r}${rt}`}function B(t){return l(s(t),Tt)}function Y(t){try{const r=d(t)&&!d(l(t,"owner.json"))?t:l(t,"owner.json"),e=JSON.parse(P(r,"utf-8"));return typeof e.transaction_id=="string"&&typeof e.pending_file=="string"?e:null}catch{return null}}function ot(t){if(!t||!d(t.pending_file))return!1;try{return JSON.parse(P(t.pending_file,"utf-8")).transaction_id===t.transaction_id}catch{return!0}}function Wt(t){const r=p();if(!r?.transaction_id)throw new f("PENDING_MISSING","Upgrade transaction disappeared before npm staging");const e=B(t),n={transaction_id:r.transaction_id,pending_file:y()};x({npm_prefix:s(t),npm_lock_file:e},r.transaction_id);const i=`${e}.candidate-${r.transaction_id}-${X()}`;try{D(i,JSON.stringify(n),{encoding:"utf-8",flag:"wx"}),kt(i,e),g(i,{force:!0})}catch(a){try{g(i,{force:!0})}catch{}if(!d(e))throw a;const o=Y(e);if(o?.transaction_id===r.transaction_id&&s(o.pending_file)===s(y()))return;throw new f(ot(o)?"UPGRADE_IN_PROGRESS":"UPGRADE_LOCK_RECOVERY_REQUIRED",ot(o)?`Another Windows service root is upgrading the shared npm prefix ${s(t)}`:`A stale or incomplete Windows upgrade lock requires recovery at ${e}`)}}function Vt(t=p(),r={}){if(!t?.transaction_id||!t.npm_prefix||!t.npm_lock_file)return!0;const e=B(t.npm_prefix);if(s(t.npm_lock_file)!==e)return!1;if(!d(e))return!0;const n=Y(e);if(!n)return!1;if(n.transaction_id!==t.transaction_id||s(n.pending_file)!==s(y()))return!0;const i=r.remove??g,a=r.sleep??(o=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,o)});for(let o=0;;o+=1)try{return i(e,{recursive:!0,force:!0}),!d(e)}catch(c){const u=c?.code;if((u==="EBUSY"||u==="EPERM"||u==="EACCES")&&o<U.length){a(U[o]);continue}return _(`shared npm-prefix lock release failed at ${e}: ${c instanceof Error?c.message:String(c)}`),!1}}function L(t,r){const e=s(t);return s(r)===`${e}${W}`&&e.includes(`${N}node_modules${N}`)&&I(e)==="grix-connector"}function Bt(t,r){const e=q(s(t),s(r));return e!==""&&e!==".."&&!e.startsWith(`..${N}`)}function H(t){if(!t?.npm_prefix||!t.staging_prefix||!t.staged_package_dir)return!1;const r=s(t.npm_prefix),e=s(t.staging_prefix),n=s(t.staged_package_dir);return m(e)===r&&I(e).startsWith(".grix-upgrade-stage-")&&Bt(e,n)&&I(m(n))==="node_modules"&&I(n)==="grix-connector"}function Yt(t,r){const e=p();!e||!L(t,r)||x({package_dir:s(t),backup_dir:s(r)},e.transaction_id)}function Ht(t){if(!L(t.packageDir,t.backupDir))throw new f("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe global package path");if(!H({npm_prefix:t.npmPrefix,staging_prefix:t.stagingPrefix,staged_package_dir:t.stagedPackageDir}))throw new f("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe npm staging path");const r=p();if(!r)throw new f("PENDING_MISSING","Upgrade transaction disappeared during staging");let e;try{const n=JSON.parse(P(l(t.packageDir,"package.json"),"utf-8"));if(n.name!=="grix-connector"||typeof n.version!="string")throw new Error("invalid metadata");e=G(n.version)}catch(n){throw new f("VERSION_VERIFY_FAILED",`Unable to identify the active global package before staging: ${n instanceof Error?n.message:String(n)}`)}x({phase:"staged",activation_strategy:t.activationStrategy,package_from_version:e,npm_prefix:s(t.npmPrefix),package_dir:s(t.packageDir),backup_dir:s(t.backupDir),staged_package_dir:s(t.stagedPackageDir),staging_prefix:s(t.stagingPrefix)},r.transaction_id)}function jt(t,r,e={}){const n=p();if(!n?.transaction_id)throw new f("PENDING_MISSING","Upgrade transaction disappeared before runtime staging");const i=Z($.base),a=`${i}${tt}`,o=`${i}${rt}`;x({runtime_dir:i,runtime_backup_dir:a,runtime_next_dir:o},n.transaction_id);const c=e.copyTree??yt,u=e.copyFile??St,k=e.sleep??(v=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,v)});for(let v=0;;v+=1)try{S(m(i),{recursive:!0}),g(o,{recursive:!0,force:!0}),S(o,{recursive:!0}),c(l(t.stagedPackageDir,"dist"),l(o,"dist"),{recursive:!0,force:!0}),u(l(t.stagedPackageDir,"package.json"),l(o,"package.json"));const w=l(t.stagedPackageDir,"node_modules");d(w)&&c(w,l(o,"node_modules"),{recursive:!0,force:!0});const E=M(o,"grix-connector",r);O(o,E);return}catch(w){try{g(o,{recursive:!0,force:!0})}catch{}const E=w?.code;if(E==="ENOSPC")throw new f("DISK_FULL",`Insufficient space for the isolated Windows runtime: ${w.message}`);if((E==="EBUSY"||E==="EPERM"||E==="EACCES"||E==="ENOTEMPTY")&&v<et.length){k(et[v]);continue}throw new f("RUNTIME_STAGE_FAILED",`Could not prepare the isolated Windows runtime before shutdown: ${w instanceof Error?w.message:String(w)}`)}}function T(t,r){if(!d(t))return!0;const e=r.remove??g,n=r.sleep??(i=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,i)});for(let i=0;;i+=1)try{if(e(t,{recursive:!0,force:!0}),!d(t))return!0;throw Object.assign(new Error(`path still exists after removal: ${t}`),{code:"EBUSY"})}catch(a){const o=a?.code;if((o==="EBUSY"||o==="EPERM"||o==="EACCES"||o==="ENOTEMPTY")&&i<U.length){n(U[i]);continue}return _(`upgrade artifact cleanup failed at ${t}: ${a instanceof Error?a.message:String(a)}`),!1}}function wr(t=p(),r={}){if(t?.transaction_id&&p()?.transaction_id!==t.transaction_id)return!1;let e=!0,n=process.platform!=="win32";if(t?.npm_lock_file||t?.npm_prefix){if(!t.transaction_id||!t.npm_lock_file||!t.npm_prefix)return!1;const o=B(t.npm_prefix);if(s(t.npm_lock_file)!==o)return!1;if(d(o)){const c=Y(o);if(c?.transaction_id!==t.transaction_id||s(c.pending_file)!==s(y()))return!1;n=!0}else{if(t.backup_dir&&d(t.backup_dir))return!1;n=!1}}const i=t?.package_dir,a=t?.backup_dir;return n&&i&&a&&L(i,a)&&(e=T(a,r)&&e),H(t)&&(e=T(s(t.staging_prefix),r)&&e),it(t)&&(e=T(s(t.runtime_backup_dir),r)&&e,e=T(s(t.runtime_next_dir),r)&&e),e}function Sr(t=p()){const r=t?.package_dir,e=t?.backup_dir;if(!r||!e||!L(r,e)||!d(e))return!1;const n=`${r}${Ft}`;try{return g(n,{recursive:!0,force:!0}),d(r)&&h(r,n),h(e,r),g(n,{recursive:!0,force:!0}),_(`atomic rollback restored ${r}`),!0}catch(i){try{!d(r)&&d(n)&&h(n,r)}catch{}return _(`atomic rollback failed: ${i instanceof Error?i.message:String(i)}`),!1}}function at(t,r={}){const e=y();if(t){const n=p();if(!n)return!0;if(n.transaction_id!==t)return!1}if(d(e))try{(r.unlink??C)(e)}catch{return!1}return!d(e)}function yr(t=p(),r={}){if(!t?.transaction_id)return at(void 0,{unlink:r.unlinkPending});const e=p();if(e?.transaction_id!==t.transaction_id)return!1;const n=e.phase==="finalizing"?e:x({phase:"finalizing"},t.transaction_id);return Vt(n,{remove:r.removeLock,sleep:r.sleep})?at(t.transaction_id,{unlink:r.unlinkPending}):!1}function _(t){const r=`[${new Date().toISOString()}] ${t}
|
|
2
|
+
`;try{xt(nt(),r)}catch{}}function kr(t=4096){const r=nt();if(!d(r))return"";try{const e=P(r,"utf-8");return e.length<=t?e:e.slice(-t)}catch{return""}}function ct(){try{const t=F(["--version"]);return b(t.command,t.args,{encoding:"utf-8",timeout:1e4,windowsHide:!0}).trim()}catch{throw new f("NPM_NOT_FOUND","npm is not available or timed out")}}const R=1e6;function st(){let t;try{t=j(["prefix","-g"])}catch{return R}try{const r=It(t),e=Math.floor(Number(r.bavail)*Number(r.bsize)/(1024*1024));return!Number.isFinite(e)||e<0?R:Math.min(e,R)}catch{return R}}function Er(){let t;try{t=ct()}catch(e){return{ok:!1,errorCode:"NPM_NOT_FOUND",errorMsg:e instanceof Error?e.message:"npm not available"}}const r=st();return r<100?{ok:!1,errorCode:"DISK_FULL",errorMsg:`Only ${r}MB free disk space (need >= 100MB)`,npmVersion:t,diskFreeMb:r}:{ok:!0,npmVersion:t,diskFreeMb:r}}function Pr(){let t="";try{t=ct()}catch{}let r=R;try{r=st()}catch{}return{npm_version:t,node_version:process.version,disk_free_mb:r,platform:process.platform,arch:process.arch,host_name:Dt(),install_id:$t()}}function M(t,r,e){const n=l(t,"package.json");let i;try{i=JSON.parse(P(n,"utf-8"))}catch{throw new f("VERSION_VERIFY_FAILED",`Unable to read staged package metadata: ${n}`)}if(i.name!==r||i.version?.replace(/^v(?=\d)/,"")!==e)throw new f("VERSION_MISMATCH",`Staged package ${String(i.name)}@${String(i.version)} does not match ${r}@${e}`);return i}function Jt(t){return typeof t.bin=="string"?[[I(t.name),t.bin]]:!t.bin||typeof t.bin!="object"?[]:Object.entries(t.bin).filter(r=>typeof r[1]=="string")}function O(t,r){const e=Jt(r);if(e.length===0)throw new f("VERSION_VERIFY_FAILED",`Staged package ${r.name} has no executable bin`);for(const[,n]of e){const i=l(t,n);if(!d(i))throw new f("VERSION_VERIFY_FAILED",`Staged package entrypoint is missing: ${i}`)}return e}function zt(t,r,e){if(process.platform==="win32")return;const n=l(t,"bin");S(n,{recursive:!0});for(const[i,a]of e){const o=l(n,i);if(d(o))continue;const c=`${o}.grix-upgrade-${process.pid}`;try{C(c)}catch{}vt(q(n,l(r,a)),c),h(c,o)}}function Kt(t){const r=s(t.activePackageDir),e=s(t.stagedPackageDir),n=`${r}${W}`,i=M(e,t.packageName,t.version),a=O(e,i);d(n)&&(d(r)?g(n,{recursive:!0,force:!0}):h(n,r)),Yt(r,n);let o=!1;try{d(r)&&(h(r,n),o=!0),h(e,r);const c=M(r,t.packageName,t.version),u=O(r,c);return zt(t.npmPrefix,r,u),{packageDir:r,backupDir:n}}catch(c){try{d(r)&&g(r,{recursive:!0,force:!0}),o&&d(n)&&h(n,r)}catch{}throw c}}function j(t,r=1e4){try{const e=F(t);return b(e.command,e.args,{encoding:"utf-8",timeout:r,windowsHide:!0}).trim()}catch{throw new f("NPM_NOT_FOUND",`Unable to resolve npm ${t.join(" ")}`)}}function J(t){return j(t)}const ut=Nt.find(t=>t.id==="official")?.url??"https://registry.npmjs.org";async function Xt(t,r,e){const n=["view",`${t}@${r}`,"dist.integrity","--registry",e,"--no-audit","--no-fund"],i=F(n),{stdout:a}=await Q(i.command,i.args,{timeout:1e4,windowsHide:!0});return a.trim()}async function qt(t,r,e,n={}){if(!e)return;let i;try{i=new URL(e).origin}catch{return}if(i===new URL(ut).origin)return;const a=n.fetchIntegrity??Xt;let o;try{o=await a(t,r,ut)}catch(u){_(`integrity cross-check skipped: official registry unreachable (${u instanceof Error?u.message:String(u)})`);return}if(!o){_("integrity cross-check skipped: official registry returned no dist.integrity");return}let c;try{c=await a(t,r,e)}catch(u){_(`integrity cross-check skipped: mirror metadata unreadable (${u instanceof Error?u.message:String(u)})`);return}if(!c){_("integrity cross-check skipped: mirror returned no dist.integrity");return}if(c!==o)throw new f("INTEGRITY_MISMATCH",`Mirror ${e} reports dist.integrity ${c} but official npm reports ${o} for ${t}@${r}`);_(`integrity cross-check passed for ${t}@${r} via ${e}`)}async function ft(t,r,e,n={},i=process.platform==="win32"?"staged":"atomic"){const a=`${t}@${r}`,o=J(["prefix","-g"]),c=J(["root","-g"]);S(o,{recursive:!0}),i==="staged"&&Wt(o);const u=Et(l(o,".grix-upgrade-stage-"));try{_(`staging npm install ${a} under ${u}`);const k=n.installWithMirror??Rt,{registry:v,registryUrl:w}=await k(a,e,10*1024*1024,{prefix:u,...i==="staged"?{env:{...process.env,GRIX_UPGRADE_STAGING:"1"}}:{}});await(n.verifyIntegrityConsensus??qt)(t,r,w);const dt=J(["root","-g","--prefix",u]),A=l(dt,t),lt=M(A,t,r),pt=O(A,lt),gt=l(A,pt[0][1]),z=b(process.execPath,[gt,"--version"],{encoding:"utf-8",timeout:15e3,maxBuffer:2*1024*1024,windowsHide:!0}).trim().replace(/^v(?=\d)/,"");if(z!==r)throw new f("VERSION_MISMATCH",`Staged CLI reported ${z||"<empty>"}, expected ${r}`);const K=l(c,t);return{npmPrefix:o,packageDir:K,backupDir:`${s(K)}${W}`,stagedPackageDir:A,stagingPrefix:u,registry:v}}catch(k){try{g(u,{recursive:!0,force:!0})}catch{}throw k}}async function Zt(t,r,e,n){const i=await ft(t,r,e,n,"atomic");try{const a=Kt({packageName:t,version:r,npmPrefix:i.npmPrefix,activePackageDir:i.packageDir,stagedPackageDir:i.stagedPackageDir});_(`atomic package switch succeeded via ${i.registry}; backup=${a.backupDir}`)}finally{try{g(i.stagingPrefix,{recursive:!0,force:!0})}catch{}}}async function Ir(t,r,e=12e4,n={}){r=G(r);const i=p()?.transaction_id,a=`${t}@${r}`,o=n.activationMode??(process.platform==="win32"?"staged":"atomic");_(`npm install -g ${a} starting (${o} staging with mirror fallback)`);try{if(o==="staged"){const c=await ft(t,r,e,n,o);try{Ht({...c,activationStrategy:process.platform==="win32"?"wrapper-runtime":"service-start"}),process.platform==="win32"&&jt(c,r)}catch(u){try{g(c.stagingPrefix,{recursive:!0,force:!0})}catch{}throw u}return _(`staged package verified via ${c.registry}; waiting for guardian activation`),{activationRequired:!0,packageDir:c.packageDir,backupDir:c.backupDir,stagedPackageDir:c.stagedPackageDir,stagingPrefix:c.stagingPrefix}}else return await Zt(t,r,e,n),{activationRequired:!1}}catch(c){if(o==="staged"){const k=p();i&&k?.transaction_id===i&&Gt(k)}if(c instanceof f)throw c;const u=c instanceof Error?c.message:String(c);throw _(`npm install failed: ${u}`),/timed out|ETIMEDOUT/i.test(u)?new f("NPM_TIMEOUT",`npm install timed out after ${e/1e3}s (tried all mirrors): ${u}`):u.includes("EACCES")||u.includes("permission denied")?new f("NPM_INSTALL_FAILED",`Permission denied: ${u}`):u.includes("ENOSPC")||u.includes("no space left")?new f("DISK_FULL",`Disk full: ${u}`):u.includes("404")||u.includes("not found")?new f("NPM_INSTALL_FAILED",`Package not found: ${u}`):new f("NPM_INSTALL_FAILED",u)}}function vr(t){let r;try{r=j(["root","-g"])}catch{throw new f("VERSION_VERIFY_FAILED","Unable to resolve the global npm package directory")}let e;try{const n=l(r,"grix-connector","package.json"),i=JSON.parse(P(n,"utf-8"));if(i.name!=="grix-connector"||typeof i.version!="string"||!i.version.trim())throw new Error("invalid package metadata");e=i.version.trim().replace(/^v(?=\d)/,"")}catch{throw new f("VERSION_VERIFY_FAILED","Unable to read the installed grix-connector version")}if(e!==t)throw new f("VERSION_MISMATCH",`Installed version ${e} does not match expected ${t}`);return e}async function xr(t,r){r=G(r);let e=!1;for(const n of await At())try{const i=["view",`${t}@${r}`,"version","--registry",n.url,"--no-audit","--no-fund"],a=F(i),{stdout:o}=await Q(a.command,a.args,{timeout:8e3,windowsHide:!0});if(o.trim())return!0}catch(i){const a=i,o=a.stderr||a.message||String(i);/ETARGET|No matching version|notarget|E404/i.test(o)&&(e=!0)}return!e}export{f as UpgradeError,Wt as acquireNpmPrefixUpgradeLock,_r as armWindowsUpgradeHandoff,mr as armWindowsUpgradeRollback,st as checkDiskSpace,ct as checkNpmAvailable,wr as cleanupPendingBackup,Pr as collectEnvInfo,Kt as commitStagedGlobalPackage,Gt as discardPendingStaging,yr as finalizePendingTransaction,kr as getUpgradeLogTail,xr as isVersionAvailable,G as normalizeUpgradeVersion,Ir as npmInstall,lr as pendingExists,Er as preflightCheck,jt as prepareStagedWindowsRuntime,p as readPending,gr as readPendingPackageVersion,Vt as releasePendingUpgradeLock,at as removePending,hr as removeWindowsHandoffFiles,Sr as rollbackPendingInstall,x as updatePending,_ as upgradeLog,dr as upgradeStatusSnapshot,vr as verifyInstalledVersion,qt as verifyMirrorIntegrityConsensus,Ot as windowsRollbackIntentPath,V as windowsWrapperPausePath,pr as writePending,Mt as writePendingData};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{existsSync as v,mkdirSync as F,readFileSync as A,renameSync as j,writeFileSync as z}from"node:fs";import{join as _,dirname as K}from"node:path";import{spawn as E}from"node:child_process";import{log as f}from"../log/index.js";import{GRIX_PATHS as w}from"../log/index.js";import{resolveClientVersion as b}from"../util/client-version.js";import{UpgradeError as S,armWindowsUpgradeHandoff as X,armWindowsUpgradeRollback as J,cleanupPendingBackup as I,collectEnvInfo as Y,discardPendingStaging as D,finalizePendingTransaction as P,getUpgradeLogTail as Z,isVersionAvailable as Q,npmInstall as ee,normalizeUpgradeVersion as te,pendingExists as U,preflightCheck as re,readPending as T,readPendingPackageVersion as ie,removeWindowsHandoffFiles as ae,rollbackPendingInstall as ne,updatePending as k,upgradeLog as n,verifyInstalledVersion as se,writePending as oe}from"./npm-upgrader.js";import{isRetriableRegistryError as ce,isTransientInstallError as de}from"../installer/npm-registry.js";const le=360*60*1e3,ue=300*1e3,N=1800*1e3,pe=2,he=3,$="grix-connector",G=1e4,O=15,fe=2e3,ge=8e3,_e=1e3,me=2e3,we=120*1e3,M=1e4,ve=6e4,ye=3,Ae=600*1e3,Pe=new Set(["preparing","staged","handoff_ready","activating","verifying","healthy","rolling_back","rolled_back","finalizing","failed"]),W=600*1e3;function L(s,e=W){const t=Date.parse(s.activation_started_at??s.upgraded_at??"");return Number.isNaN(t)?!0:Date.now()-t>e}function C(s){const e=Date.parse(s.verification_started_at??s.activation_started_at??"");return Number.isNaN(e)||Date.now()-e>we}function be(s){if((s.guardian_handback_count??0)>=ye)return!1;const e=Date.parse(s.guardian_handback_at??"");return Number.isNaN(e)?!0:Date.now()-e>=Ae}function Se(s){if(!Number.isInteger(s)||(s??0)<=0)return!1;try{return process.kill(s,0),!0}catch{return!1}}function R(){const s=_(w.base,"bin"),e=_(s,"upgrade-guardian.mjs");if(v(e))return e;const t=_(s,"upgrade-guardian.fallback.mjs");return v(t)?t:null}function V(s){if(!Se(s.guardian_pid))return!1;try{const t=JSON.parse(A(_(w.data,"upgrade-monitor-heartbeat.json"),"utf-8"));if(t.transaction_id===s.transaction_id&&t.pid===s.guardian_pid&&typeof t.updated_at=="number"&&Date.now()-t.updated_at<=M)return!0}catch{}const e=Date.parse(s.guardian_started_at??"");return Number.isFinite(e)&&Date.now()-e<=M}function H(s){return new URL(s.replace(/^wss:/,"https:").replace(/^ws:/,"http:")).origin}function q(){return _(w.data,"upgrade-state.json")}function x(){const s=q();if(!v(s))return{daily_attempts:{},version_attempts:{}};try{return JSON.parse(A(s,"utf-8"))}catch{return{daily_attempts:{},version_attempts:{}}}}function Te(s){const e=q();F(K(e),{recursive:!0});const t=e+".tmp";z(t,JSON.stringify(s),"utf-8"),j(t,e)}function B(){return new Date().toISOString().slice(0,10)}class Me{agentConfigs;isBusy;closeAdmission;options;timer=null;initialTimer=null;pendingTimer=null;guardianWaitLoggedAt=0;guardianWaitLoggedPhase="";running=!1;stopped=!1;constructor(e,t,i,r={}){this.agentConfigs=e,this.isBusy=t,this.closeAdmission=i,this.options=r}async start(){await this.handlePendingOnStartup(),this.initialTimer=setTimeout(()=>{this.stopped||(this.runCheck(),!this.stopped&&(this.timer=setInterval(()=>this.runCheck(),le)))},ue)}stop(){this.stopped=!0,this.initialTimer&&(clearTimeout(this.initialTimer),this.initialTimer=null),this.timer&&(clearInterval(this.timer),this.timer=null),this.pendingTimer&&(clearTimeout(this.pendingTimer),this.pendingTimer=null)}triggerCheck(){this.stopped||this.runCheck()}async checkForUpdate(){return this.agentConfigs.length===0?{available:!1}:(await Promise.all(this.agentConfigs.map(i=>this.queryUpgrade(i)))).find(i=>i.available&&i.release)??{available:!1}}async handlePendingOnStartup(){if(!U())return;let e=T();if(!e){n("daemon startup: pending journal is unreadable; preserving it and blocking automatic upgrade for manual recovery");return}if(e.phase&&!Pe.has(e.phase)&&(e=k({phase:"failed",error_code:"INVALID_UPGRADE_STATE",error_msg:`Unknown upgrade transaction phase: ${String(e.phase)}`},e.transaction_id)),e.phase==="finalizing"){P(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for its shared lock to be released`),this.schedulePendingReconcile());return}if(e.phase==="preparing"||e.phase==="staged"){const c=!!(e.wrapper_pause_file&&v(e.wrapper_pause_file));if(e.phase==="staged"&&c){this.schedulePendingReconcile();return}D(e),e=k({phase:"rolled_back",error_code:"UPGRADE_INTERRUPTED",error_msg:"Upgrade stopped before Windows activation started"})}if(e.phase==="verifying"){if(V(e)&&!C(e)){this.schedulePendingReconcile();return}if(C(e)&&e.transaction_id&&(this.options.platform??process.platform)==="win32"&&this.options.requestGracefulShutdown){const c=`Target ${e.target_version} did not become healthy before the Windows verification deadline`;J(e.transaction_id,c),n(`${c}; requesting graceful shutdown for offline rollback`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.schedulePendingReconcile();return}const t=new Set(["handoff_ready","activating","rolling_back"]);if(e.phase&&t.has(e.phase)){if(V(e)){this.logGuardianWait(e),this.schedulePendingReconcile();return}if(L(e)&&e.transaction_id&&(this.options.platform??process.platform)==="win32"&&this.options.requestGracefulShutdown&&be(e)){const c=`Guardian did not settle ${e.phase} for ${e.target_version} before the Windows activation deadline`;k({guardian_handback_count:(e.guardian_handback_count??0)+1,guardian_handback_at:new Date().toISOString()},e.transaction_id),n(`${c}; requesting graceful shutdown so the wrapper re-runs the guardian`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.logGuardianWait(e),this.schedulePendingReconcile();return}if(e.phase==="failed"){n(`daemon startup: upgrade transaction requires manual recovery: ${e.error_msg??e.error_code??"unknown error"}`);return}const i=ie(e),r=b(),a=e.phase==="healthy",o=e.phase==="rolled_back",p=!i||i===e.target_version,d=a?r===e.target_version&&i===e.target_version:!o&&r===e.target_version&&p;if(!d&&p&&!o){if(!L(e)){n(`daemon startup: runtime ${r} is waiting for guardian activation of ${e.target_version} (active package=${i??"unknown"})`),this.schedulePendingReconcile();return}n(`daemon startup: activation wait for ${e.target_version} expired (> ${W/6e4}min); no guardian will finish the switch, reporting by version verdict`)}const u=d?{from_version:e.from_version,to_version:e.target_version,status:"success"}:{from_version:e.from_version,to_version:e.target_version,status:"rolled_back",error_code:e.error_code??"STARTUP_CRASH",error_msg:e.error_msg,crash_count:e.crash_count};if(n(d?`daemon startup: version matches target ${e.target_version}, upgrade succeeded`:`daemon startup: runtime=${r}, active package=${i??"unknown"}, target=${e.target_version}; rolled back`),d){const c=await this.confirmHealthz(ge,a?e.target_version:void 0,a?e.old_pid:void 0,a?e.activation_started_at:void 0);if(a&&!c){n("guardian marked healthy but target-version healthz is not yet observable; retrying reconciliation"),this.schedulePendingReconcile();return}n(c?"healthz confirmed healthy, reporting success":"healthz not confirmed within window; reporting success on version-match (guardian still guards crashes)")}if(!I(e)){n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for antivirus-held artifact cleanup`),this.schedulePendingReconcile();return}if(await this.reportUpgrade(u)){P(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} could not release its shared lock; retrying reconciliation`),this.schedulePendingReconcile());return}this.retryStartupReport(u,e,!1)}schedulePendingReconcile(){this.stopped||this.pendingTimer||(this.pendingTimer=setTimeout(()=>{this.pendingTimer=null,!this.stopped&&this.handlePendingOnStartup().catch(e=>{f.warn("upgrade",`Pending reconciliation failed: ${e instanceof Error?e.message:e}`),this.schedulePendingReconcile()})},me))}logGuardianWait(e){const t=String(e.phase??""),i=Date.now();t===this.guardianWaitLoggedPhase&&i-this.guardianWaitLoggedAt<ve||(this.guardianWaitLoggedPhase=t,this.guardianWaitLoggedAt=i,n(`transaction ${e.transaction_id??"legacy"} is ${t}; waiting for guardian verdict`))}async resumeWindowsGuardian(){if(this.options.resumeWindowsGuardian){await this.options.resumeWindowsGuardian();return}const e=R();if(!e)return;E(process.execPath,[e,"activate","--root",w.base],{detached:!0,stdio:"ignore",windowsHide:!0}).unref()}async retryStartupReport(e,t,i){const r=t?.transaction_id,a=()=>{const o=T();if(!(r&&o?.transaction_id!==r)){if(i&&!I(t)){n(`terminal backup cleanup is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile();return}P(t)||(n(`terminal shared lock release is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile())}};for(let o=2;o<=O;o++){if(this.stopped)return;const p=fe*(o-1)+Math.floor(Math.random()*1e3);if(await new Promise(d=>setTimeout(d,p)),this.stopped)return;if(await this.reportUpgrade(e)){a();return}}n(`startup report (${e.status}) not delivered after ${O} attempts; clearing pending to unblock future checks`),a()}async confirmHealthz(e,t,i,r){let a="19579";try{const d=_(w.data,"health-port");v(d)&&(a=A(d,"utf-8").trim()||a)}catch{}const o=`http://127.0.0.1:${a}/healthz`,p=Date.now()+e;for(;Date.now()<p&&!this.stopped;){try{const d=await fetch(o,{signal:AbortSignal.timeout(2e3)});if(d.ok){if(!t)return!0;const u=await d.json();if(u.status==="ok"&&u.version===t&&typeof u.pid=="number"&&u.pid>0&&u.pid!==i)try{const c=JSON.parse(A(_(w.base,"daemon-status.json"),"utf-8")),g=Date.parse(r??"");return!!(c.state==="running"&&c.pid===u.pid&&typeof c.updated_at=="number"&&Number.isFinite(g)&&c.updated_at>=g)}catch{return!1}}}catch{}await new Promise(d=>setTimeout(d,_e))}return!1}async runCheck(){if(!this.running){this.running=!0;try{await this.check()}catch(e){f.error("upgrade",`Check failed: ${e instanceof Error?e.message:e}`)}finally{this.running=!1}}}async check(){if(U()){await this.handlePendingOnStartup();return}if(this.agentConfigs.length===0)return;const i=(await Promise.all(this.agentConfigs.map(l=>this.queryUpgrade(l)))).find(l=>l.available&&l.release)?.release;if(!i)return;const r=b();let a;try{a=te(i.version)}catch(l){const h=l;await this.reportUpgrade({from_version:r,to_version:String(i.version),status:"failed",error_code:h.code??"INVALID_VERSION",error_msg:h.message});return}const o=i.force,p=this.options.platform??process.platform,d=this.options.env??process.env;if(p==="win32"){const l=R(),h=d.GRIX_WRAPPER_SUPERVISED==="1";if(!h||!l||!this.options.requestGracefulShutdown){const m=`Windows automatic upgrade requires a refreshed service installation (${[...h?[]:["managed wrapper"],...l?[]:["external guardian"],...this.options.requestGracefulShutdown?[]:["graceful shutdown hook"]].join(", ")})`;n(m),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:"WINDOWS_UPGRADE_UNSUPPORTED",error_msg:m});return}}if(!o&&!this.checkRateLimit(a))return;const u=re();if(!u.ok){await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:u.errorCode,error_msg:u.errorMsg});return}if(!await Q($,a)){n(`target ${a} not resolvable on any registry yet; skipping this cycle (no failure recorded)`);return}n(`upgrade start: ${r} -> ${a}`);const c=Date.now();let g;try{if(g=oe(r,a,p==="win32"?"preparing":void 0).transaction_id,(await ee($,a))?.activationRequired||se(a),n("npm install verified, reporting installed"),await this.reportUpgrade({from_version:r,to_version:a,status:"installed",duration_ms:Date.now()-c}),n("shutting down for restart"),!await this.waitUntilIdle())throw n("upgrade aborted: checker stopped during wait"),this.options.reopenLifecycleAdmission?.(),new S("UPGRADE_ABORTED","Upgrade was aborted before lifecycle handoff");if(p==="win32"){if(!R())throw new S("WINDOWS_UPGRADE_UNSUPPORTED","Windows external guardian disappeared before lifecycle handoff");X(process.pid,g),n("Windows handoff armed; requesting graceful daemon shutdown"),await this.options.requestGracefulShutdown("upgrade")}else this.startGuardian(),process.kill(process.pid,"SIGTERM")}catch(l){const h=l instanceof S?l.code:"NPM_INSTALL_FAILED",y=l instanceof Error?l.message:String(l);n(`upgrade failed: ${h} ${y}`);const m=T();if(g&&m?.transaction_id===g&&(p==="win32"?(ae(),D(m)):ne(m)&&n("upgrade failed before restart; previous package restored atomically"),P(m)||(n(`failed transaction ${g} is waiting for shared lock release`),this.schedulePendingReconcile()),this.options.reopenLifecycleAdmission?.()),h==="UPGRADE_IN_PROGRESS")return;ce(y)||de(y)||h==="NPM_TIMEOUT"?n(`failure is retriable (${h}); skipping cooldown, will retry next cycle`):this.recordFailure(a),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:h,error_msg:y,duration_ms:Date.now()-c,upgrade_log:Z()})}}async waitUntilIdle(){if(this.closeAdmission?.(),!this.isBusy?.())return!this.stopped;n("active tasks detected, waiting until idle before restart (no max wait)");const e=5e3,t=600*1e3;let i=Date.now();for(;this.isBusy()&&!this.stopped;)await new Promise(r=>setTimeout(r,e)),Date.now()-i>=t&&(i=Date.now(),n("still waiting for active tasks to finish before restart"));return this.stopped?!1:(n("all tasks completed, proceeding with restart"),!0)}checkRateLimit(e){const t=x();if(t.last_failure_at){const o=Date.now()-new Date(t.last_failure_at).getTime();if(o<N)return f.info("upgrade",`In cooldown, ${(N-o)/6e4}m remaining`),!1}const i=t.version_attempts[e]??0;if(i>=he)return f.info("upgrade",`Version ${e} already tried ${i} times, skipping`),!1;const r=B(),a=t.daily_attempts[r]??0;return a>=pe?(f.info("upgrade",`Already ${a} attempts today, skipping`),!1):!0}recordFailure(e){const t=x(),i=B();t.last_failure_at=new Date().toISOString(),t.last_failure_version=e,t.daily_attempts[i]=(t.daily_attempts[i]??0)+1,t.version_attempts[e]=(t.version_attempts[e]??0)+1,Te(t)}async queryUpgrade(e){const i=`${H(e.wsUrl)}/v1/agent-api/upgrade/check?`+new URLSearchParams({client_type:"grix-connector",client_version:b(),channel:e.channel??"stable",platform:process.platform,arch:process.arch}).toString();try{const r=await fetch(i,{headers:{Authorization:`Bearer ${e.apiKey}`},signal:AbortSignal.timeout(G)});if(!r.ok)return f.warn("upgrade",`Check API returned ${r.status}`),{available:!1};const a=await r.json();return a.code!==0?{available:!1}:a.data}catch(r){return f.warn("upgrade",`Check API error: ${r instanceof Error?r.message:r}`),{available:!1}}}async reportUpgrade(e){if(this.agentConfigs.length===0)return!1;const t={client_type:"grix-connector",...e.npm_version?e:{...e,...Y()}};return(await Promise.all(this.agentConfigs.map(async r=>{const o=`${H(r.wsUrl)}/v1/agent-api/upgrade/report`;try{return(await fetch(o,{method:"POST",headers:{Authorization:`Bearer ${r.apiKey}`,"Content-Type":"application/json"},body:JSON.stringify(t),signal:AbortSignal.timeout(G)})).ok}catch{return!1}}))).some(r=>r)}startGuardian(){const e=_(w.base,"bin","upgrade-guardian.sh");if(process.platform==="win32"||!v(e)){f.info("upgrade","Guardian not available on this platform, skipping");return}try{const t=E(e,[],{detached:!0,stdio:"ignore"});t.unref(),n(`guardian started (pid ${t.pid})`)}catch(t){f.warn("upgrade",`Failed to start guardian: ${t instanceof Error?t.message:t}`)}}}export{Me as UpgradeChecker};
|
|
1
|
+
import{existsSync as v,mkdirSync as z,readFileSync as A,renameSync as K,writeFileSync as X}from"node:fs";import{join as g,dirname as J}from"node:path";import{spawn as I}from"node:child_process";import{log as f}from"../log/index.js";import{GRIX_PATHS as m}from"../log/index.js";import{resolveClientVersion as R}from"../util/client-version.js";import{UpgradeError as P,armWindowsUpgradeHandoff as D,armWindowsUpgradeRollback as Y,cleanupPendingBackup as U,collectEnvInfo as Z,discardPendingStaging as N,finalizePendingTransaction as T,getUpgradeLogTail as Q,isVersionAvailable as ee,npmInstall as te,normalizeUpgradeVersion as re,pendingExists as $,preflightCheck as ae,readPending as k,readPendingPackageVersion as ie,removeWindowsHandoffFiles as ne,rollbackPendingInstall as se,updatePending as E,upgradeLog as n,verifyInstalledVersion as oe,writePending as ce}from"./npm-upgrader.js";import{isRetriableRegistryError as de,isTransientInstallError as le}from"../installer/npm-registry.js";const ue=360*60*1e3,pe=300*1e3,O=1800*1e3,he=2,fe=3,ge=10,G="grix-connector",M=1e4,W=15,_e=2e3,me=8e3,we=1e3,ve=2e3,ye=120*1e3,C=1e4,Se=6e4,be=3,Ae=600*1e3,Pe=new Set(["preparing","staged","handoff_ready","activating","verifying","healthy","rolling_back","rolled_back","finalizing","failed"]),L=600*1e3;function x(s,e=L){const t=Date.parse(s.activation_started_at??s.upgraded_at??"");return Number.isNaN(t)?!0:Date.now()-t>e}function q(s){const e=Date.parse(s.verification_started_at??s.activation_started_at??"");return Number.isNaN(e)||Date.now()-e>ye}function Te(s){if((s.guardian_handback_count??0)>=be)return!1;const e=Date.parse(s.guardian_handback_at??"");return Number.isNaN(e)?!0:Date.now()-e>=Ae}function Re(s){if(!Number.isInteger(s)||(s??0)<=0)return!1;try{return process.kill(s,0),!0}catch{return!1}}function b(){const s=g(m.base,"bin"),e=g(s,"upgrade-guardian.mjs");if(v(e))return e;const t=g(s,"upgrade-guardian.fallback.mjs");return v(t)?t:null}function V(s){if(!Re(s.guardian_pid))return!1;try{const t=JSON.parse(A(g(m.data,"upgrade-monitor-heartbeat.json"),"utf-8"));if(t.transaction_id===s.transaction_id&&t.pid===s.guardian_pid&&typeof t.updated_at=="number"&&Date.now()-t.updated_at<=C)return!0}catch{}const e=Date.parse(s.guardian_started_at??"");return Number.isFinite(e)&&Date.now()-e<=C}function H(s){return new URL(s.replace(/^wss:/,"https:").replace(/^ws:/,"http:")).origin}function B(){return g(m.data,"upgrade-state.json")}function F(){const s=B();if(!v(s))return{daily_attempts:{},version_attempts:{}};try{return JSON.parse(A(s,"utf-8"))}catch{return{daily_attempts:{},version_attempts:{}}}}function ke(s){const e=B();z(J(e),{recursive:!0});const t=e+".tmp";X(t,JSON.stringify(s),"utf-8"),K(t,e)}function j(){return new Date().toISOString().slice(0,10)}class Ce{agentConfigs;isBusy;closeAdmission;options;timer=null;initialTimer=null;pendingTimer=null;guardianWaitLoggedAt=0;guardianWaitLoggedPhase="";recordedRollbackFailures=new Set;posixGuardianResumeAttempted=new Set;running=!1;stopped=!1;constructor(e,t,i,r={}){this.agentConfigs=e,this.isBusy=t,this.closeAdmission=i,this.options=r}async start(){await this.handlePendingOnStartup(),this.initialTimer=setTimeout(()=>{this.stopped||(this.runCheck(),!this.stopped&&(this.timer=setInterval(()=>this.runCheck(),ue)))},pe)}stop(){this.stopped=!0,this.initialTimer&&(clearTimeout(this.initialTimer),this.initialTimer=null),this.timer&&(clearInterval(this.timer),this.timer=null),this.pendingTimer&&(clearTimeout(this.pendingTimer),this.pendingTimer=null)}triggerCheck(){this.stopped||this.runCheck()}async checkForUpdate(){return this.agentConfigs.length===0?{available:!1}:(await Promise.all(this.agentConfigs.map(i=>this.queryUpgrade(i)))).find(i=>i.available&&i.release)??{available:!1}}async handlePendingOnStartup(){if(!$())return;let e=k();if(!e){n("daemon startup: pending journal is unreadable; preserving it and blocking automatic upgrade for manual recovery");return}if(e.phase&&!Pe.has(e.phase)&&(e=E({phase:"failed",error_code:"INVALID_UPGRADE_STATE",error_msg:`Unknown upgrade transaction phase: ${String(e.phase)}`},e.transaction_id)),e.phase==="finalizing"){T(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for its shared lock to be released`),this.schedulePendingReconcile());return}if(e.phase==="preparing"||e.phase==="staged"){const o=!!(e.wrapper_pause_file&&v(e.wrapper_pause_file));if(e.phase==="staged"&&o){this.schedulePendingReconcile();return}N(e),e=E({phase:"rolled_back",error_code:"UPGRADE_INTERRUPTED",error_msg:"Upgrade stopped before Windows activation started"})}if(e.phase==="verifying"){if(V(e)&&!q(e)){this.schedulePendingReconcile();return}if(q(e)&&e.transaction_id&&["win32","darwin"].includes(this.options.platform??process.platform)&&this.options.requestGracefulShutdown){const o=`Target ${e.target_version} did not become healthy before the Windows verification deadline`;Y(e.transaction_id,o),n(`${o}; requesting graceful shutdown for offline rollback`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.schedulePendingReconcile();return}const t=new Set(["handoff_ready","activating","rolling_back"]);if(e.phase&&t.has(e.phase)){if(V(e)){this.logGuardianWait(e),this.schedulePendingReconcile();return}if(x(e)&&e.transaction_id&&(this.options.platform??process.platform)==="win32"&&this.options.requestGracefulShutdown&&Te(e)){const o=`Guardian did not settle ${e.phase} for ${e.target_version} before the Windows activation deadline`;E({guardian_handback_count:(e.guardian_handback_count??0)+1,guardian_handback_at:new Date().toISOString()},e.transaction_id),n(`${o}; requesting graceful shutdown so the wrapper re-runs the guardian`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.logGuardianWait(e),this.schedulePendingReconcile();return}if(e.phase==="failed"){n(`daemon startup: upgrade transaction requires manual recovery: ${e.error_msg??e.error_code??"unknown error"}`);return}const i=ie(e),r=R(),a=e.phase==="healthy",c=e.phase==="rolled_back",p=!i||i===e.target_version,d=a?r===e.target_version&&i===e.target_version:!c&&r===e.target_version&&p;if(!d&&p&&!c){if(!x(e)){if((this.options.platform??process.platform)!=="win32"&&i===e.target_version){const o=e.transaction_id??`${e.target_version}@${e.upgraded_at}`;this.posixGuardianResumeAttempted.has(o)||(this.posixGuardianResumeAttempted.add(o),n(`resuming POSIX guardian for stalled activation of ${e.target_version}`),this.startGuardian())}this.logThrottled("posix-activation-wait",`daemon startup: runtime ${r} is waiting for guardian activation of ${e.target_version} (active package=${i??"unknown"})`),this.schedulePendingReconcile();return}n(`daemon startup: activation wait for ${e.target_version} expired (> ${L/6e4}min); no guardian will finish the switch, reporting by version verdict`)}const u=d?{from_version:e.from_version,to_version:e.target_version,status:"success"}:{from_version:e.from_version,to_version:e.target_version,status:"rolled_back",error_code:e.error_code??"STARTUP_CRASH",error_msg:e.error_msg,crash_count:e.crash_count};if(n(d?`daemon startup: version matches target ${e.target_version}, upgrade succeeded`:`daemon startup: runtime=${r}, active package=${i??"unknown"}, target=${e.target_version}; rolled back`),!d){const o=e.transaction_id??`${e.target_version}@${e.upgraded_at}`;this.recordedRollbackFailures.has(o)||(this.recordedRollbackFailures.add(o),this.recordFailure(e.target_version))}if(d){const o=await this.confirmHealthz(me,a?e.target_version:void 0,a?e.old_pid:void 0,a?e.activation_started_at:void 0);if(a&&!o){n("guardian marked healthy but target-version healthz is not yet observable; retrying reconciliation"),this.schedulePendingReconcile();return}n(o?"healthz confirmed healthy, reporting success":"healthz not confirmed within window; reporting success on version-match (guardian still guards crashes)")}if(!U(e)){n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for antivirus-held artifact cleanup`),this.schedulePendingReconcile();return}if(await this.reportUpgrade(u)){T(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} could not release its shared lock; retrying reconciliation`),this.schedulePendingReconcile());return}this.retryStartupReport(u,e,!1)}schedulePendingReconcile(){this.stopped||this.pendingTimer||(this.pendingTimer=setTimeout(()=>{this.pendingTimer=null,!this.stopped&&this.handlePendingOnStartup().catch(e=>{f.warn("upgrade",`Pending reconciliation failed: ${e instanceof Error?e.message:e}`),this.schedulePendingReconcile()})},ve))}logThrottled(e,t){const i=Date.now();e===this.guardianWaitLoggedPhase&&i-this.guardianWaitLoggedAt<Se||(this.guardianWaitLoggedPhase=e,this.guardianWaitLoggedAt=i,n(t))}logGuardianWait(e){const t=String(e.phase??"");this.logThrottled(`guardian:${t}`,`transaction ${e.transaction_id??"legacy"} is ${t}; waiting for guardian verdict`)}async resumeWindowsGuardian(){if(this.options.resumeWindowsGuardian){await this.options.resumeWindowsGuardian();return}const e=b();if(!e)return;I(process.execPath,[e,"activate","--root",m.base],{detached:!0,stdio:"ignore",windowsHide:!0}).unref()}async retryStartupReport(e,t,i){const r=t?.transaction_id,a=()=>{const c=k();if(!(r&&c?.transaction_id!==r)){if(i&&!U(t)){n(`terminal backup cleanup is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile();return}T(t)||(n(`terminal shared lock release is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile())}};for(let c=2;c<=W;c++){if(this.stopped)return;const p=_e*(c-1)+Math.floor(Math.random()*1e3);if(await new Promise(d=>setTimeout(d,p)),this.stopped)return;if(await this.reportUpgrade(e)){a();return}}n(`startup report (${e.status}) not delivered after ${W} attempts; clearing pending to unblock future checks`),a()}async confirmHealthz(e,t,i,r){let a="19579";try{const d=g(m.data,"health-port");v(d)&&(a=A(d,"utf-8").trim()||a)}catch{}const c=`http://127.0.0.1:${a}/healthz`,p=Date.now()+e;for(;Date.now()<p&&!this.stopped;){try{const d=await fetch(c,{signal:AbortSignal.timeout(2e3)});if(d.ok){if(!t)return!0;const u=await d.json();if(u.status==="ok"&&u.version===t&&typeof u.pid=="number"&&u.pid>0&&u.pid!==i)try{const o=JSON.parse(A(g(m.base,"daemon-status.json"),"utf-8")),y=Date.parse(r??"");return!!(o.state==="running"&&o.pid===u.pid&&typeof o.updated_at=="number"&&Number.isFinite(y)&&o.updated_at>=y)}catch{return!1}}}catch{}await new Promise(d=>setTimeout(d,we))}return!1}async runCheck(){if(!this.running){this.running=!0;try{await this.check()}catch(e){f.error("upgrade",`Check failed: ${e instanceof Error?e.message:e}`)}finally{this.running=!1}}}async check(){if($()){await this.handlePendingOnStartup();return}if(this.agentConfigs.length===0)return;const i=(await Promise.all(this.agentConfigs.map(l=>this.queryUpgrade(l)))).find(l=>l.available&&l.release)?.release;if(!i)return;const r=R();let a;try{a=re(i.version)}catch(l){const h=l;await this.reportUpgrade({from_version:r,to_version:String(i.version),status:"failed",error_code:h.code??"INVALID_VERSION",error_msg:h.message});return}const c=i.force,p=this.options.platform??process.platform,d=this.options.env??process.env;if(p==="win32"){const l=b(),h=d.GRIX_WRAPPER_SUPERVISED==="1";if(!h||!l||!this.options.requestGracefulShutdown){const _=`Windows automatic upgrade requires a refreshed service installation (${[...h?[]:["managed wrapper"],...l?[]:["external guardian"],...this.options.requestGracefulShutdown?[]:["graceful shutdown hook"]].join(", ")})`;n(_),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:"WINDOWS_UPGRADE_UNSUPPORTED",error_msg:_});return}}const u=p==="darwin"&&!!b()&&!!this.options.requestGracefulShutdown;if(p==="darwin"&&!u&&n("macOS transactional upgrade prerequisites missing; falling back to the legacy guardian flow"),!c&&!this.checkRateLimit(a))return;const o=ae();if(!o.ok){await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:o.errorCode,error_msg:o.errorMsg});return}if(!await ee(G,a)){n(`target ${a} not resolvable on any registry yet; skipping this cycle (no failure recorded)`);return}n(`upgrade start: ${r} -> ${a}`);const y=Date.now();let w;try{if(w=ce(r,a,p==="win32"||u?"preparing":void 0).transaction_id,(await te(G,a,void 0,u?{activationMode:"staged"}:{}))?.activationRequired||oe(a),n("npm install verified, reporting installed"),await this.reportUpgrade({from_version:r,to_version:a,status:"installed",duration_ms:Date.now()-y}),n("shutting down for restart"),!await this.waitUntilIdle())throw n("upgrade aborted: checker stopped during wait"),this.options.reopenLifecycleAdmission?.(),new P("UPGRADE_ABORTED","Upgrade was aborted before lifecycle handoff");if(p==="win32"){if(!b())throw new P("WINDOWS_UPGRADE_UNSUPPORTED","Windows external guardian disappeared before lifecycle handoff");D(process.pid,w),n("Windows handoff armed; requesting graceful daemon shutdown"),await this.options.requestGracefulShutdown("upgrade")}else if(u){if(!b())throw new P("MACOS_UPGRADE_UNSUPPORTED","macOS guardian helper disappeared before lifecycle handoff");D(process.pid,w),n("macOS handoff armed; spawning guardian before graceful daemon shutdown"),await this.resumeWindowsGuardian(),await this.options.requestGracefulShutdown("upgrade")}else this.startGuardian(),process.kill(process.pid,"SIGTERM")}catch(l){const h=l instanceof P?l.code:"NPM_INSTALL_FAILED",S=l instanceof Error?l.message:String(l);n(`upgrade failed: ${h} ${S}`);const _=k();if(w&&_?.transaction_id===w&&(p==="win32"||u?(ne(),N(_)):se(_)&&n("upgrade failed before restart; previous package restored atomically"),T(_)||(n(`failed transaction ${w} is waiting for shared lock release`),this.schedulePendingReconcile()),this.options.reopenLifecycleAdmission?.()),h==="UPGRADE_IN_PROGRESS")return;de(S)||le(S)||h==="NPM_TIMEOUT"?n(`failure is retriable (${h}); skipping cooldown, will retry next cycle`):this.recordFailure(a),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:h,error_msg:S,duration_ms:Date.now()-y,upgrade_log:Q()})}}async waitUntilIdle(){if(this.closeAdmission?.(),!this.isBusy?.())return!this.stopped;n("active tasks detected, waiting until idle before restart (no max wait)");const e=5e3,t=600*1e3;let i=Date.now();for(;this.isBusy()&&!this.stopped;)await new Promise(r=>setTimeout(r,e)),Date.now()-i>=t&&(i=Date.now(),n("still waiting for active tasks to finish before restart"));return this.stopped?!1:(n("all tasks completed, proceeding with restart"),!0)}checkRateLimit(e){const t=F();if(t.last_failure_at){const c=Date.now()-new Date(t.last_failure_at).getTime();if(c<O)return f.info("upgrade",`In cooldown, ${(O-c)/6e4}m remaining`),!1}const i=t.version_attempts[e]??0;if(i>=fe)return f.info("upgrade",`Version ${e} already tried ${i} times, skipping`),!1;const r=j(),a=t.daily_attempts[r]??0;return a>=he?(f.info("upgrade",`Already ${a} attempts today, skipping`),!1):!0}recordFailure(e){const t=F(),i=j();t.last_failure_at=new Date().toISOString(),t.last_failure_version=e,t.daily_attempts[i]=(t.daily_attempts[i]??0)+1,t.version_attempts[e]=(t.version_attempts[e]??0)+1;for(const a of Object.keys(t.daily_attempts))a<i&&delete t.daily_attempts[a];const r=Object.keys(t.version_attempts);for(const a of r.slice(0,Math.max(0,r.length-ge)))a!==e&&delete t.version_attempts[a];ke(t)}async queryUpgrade(e){const i=`${H(e.wsUrl)}/v1/agent-api/upgrade/check?`+new URLSearchParams({client_type:"grix-connector",client_version:R(),channel:e.channel??"stable",platform:process.platform,arch:process.arch}).toString();try{const r=await fetch(i,{headers:{Authorization:`Bearer ${e.apiKey}`},signal:AbortSignal.timeout(M)});if(!r.ok)return f.warn("upgrade",`Check API returned ${r.status}`),{available:!1};const a=await r.json();return a.code!==0?{available:!1}:a.data}catch(r){return f.warn("upgrade",`Check API error: ${r instanceof Error?r.message:r}`),{available:!1}}}async reportUpgrade(e){if(this.agentConfigs.length===0)return!1;const t={client_type:"grix-connector",...e.npm_version?e:{...e,...Z()}};return(await Promise.all(this.agentConfigs.map(async r=>{const c=`${H(r.wsUrl)}/v1/agent-api/upgrade/report`;try{return(await fetch(c,{method:"POST",headers:{Authorization:`Bearer ${r.apiKey}`,"Content-Type":"application/json"},body:JSON.stringify(t),signal:AbortSignal.timeout(M)})).ok}catch{return!1}}))).some(r=>r)}startGuardian(){const e=g(m.base,"bin","upgrade-guardian.sh");if(process.platform==="win32"||!v(e)){f.info("upgrade","Guardian not available on this platform, skipping");return}try{const t=I(e,[],{detached:!0,stdio:"ignore"});t.unref(),n(`guardian started (pid ${t.pid})`)}catch(t){f.warn("upgrade",`Failed to start guardian: ${t instanceof Error?t.message:t}`)}}}export{Ce as UpgradeChecker};
|
package/dist/grix.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import P from"node:path";import{writeFileSync as te}from"node:fs";import{Manager as xe}from"./manager.js";import{ensureGrixDirs as Ee,initLogger as De,log as s,installProcessLogRotation as be,setConsoleOutput as re}from"./core/log/index.js";import{HealthServer as ve,bindPortOrFail as ne}from"./core/runtime/index.js";import{writePidFile as Pe,removePidFile as O,readDaemonPid as Ie}from"./core/runtime/index.js";import{resolveRuntimePaths as j}from"./core/config/index.js";import{supportsNonMitmRelayConfig as ke}from"./core/config/provider-env.js";import{ServiceManager as Ce}from"./service/service-manager.js";import{migrateWindowsWrapper as Te}from"./service/windows-wrapper-migration.js";import{killProcessesByCommandLine as Ue,isWindowsElevated as $e,shouldSweepWindowsWrappers as _e}from"./service/process-control.js";import{buildServiceID as Fe}from"./service/service-paths.js";import{acquireDaemonLock as Le,isLockHolderSameProcess as Oe,readDaemonLock as K,releaseDaemonLock as H}from"./runtime/daemon-lock.js";import{writeDaemonStatus as
|
|
3
|
-
Run \`grix-connector --help\` to see the supported commands and options.`),process.exit(1)),
|
|
2
|
+
import P from"node:path";import{writeFileSync as te}from"node:fs";import{Manager as xe}from"./manager.js";import{ensureGrixDirs as Ee,initLogger as De,log as s,installProcessLogRotation as be,setConsoleOutput as re}from"./core/log/index.js";import{HealthServer as ve,bindPortOrFail as ne}from"./core/runtime/index.js";import{writePidFile as Pe,removePidFile as O,readDaemonPid as Ie}from"./core/runtime/index.js";import{resolveRuntimePaths as j}from"./core/config/index.js";import{supportsNonMitmRelayConfig as ke}from"./core/config/provider-env.js";import{ServiceManager as Ce}from"./service/service-manager.js";import{migrateWindowsWrapper as Te}from"./service/windows-wrapper-migration.js";import{killProcessesByCommandLine as Ue,isWindowsElevated as $e,shouldSweepWindowsWrappers as _e}from"./service/process-control.js";import{buildServiceID as Fe}from"./service/service-paths.js";import{acquireDaemonLock as Le,isLockHolderSameProcess as Oe,readDaemonLock as K,releaseDaemonLock as H}from"./runtime/daemon-lock.js";import{writeDaemonStatus as N,removeDaemonStatus as He}from"./runtime/service-state.js";import{AdminServer as Me,generateToken as Be,writeTokenFile as Ne}from"./core/admin/index.js";import{initSentry as Ge,closeSentry as W,reportFatal as V}from"./core/observability/sentry.js";import{initProxyManager as je,getProxyManager as u,relayHostsForClientType as oe,RelayStateStore as Ke,SecretStore as We}from"./core/proxy/index.js";import{stopProxyIfNobodyNeedsIt as ae,switchAgentRelayMode as X,reconcileRelayStates as se}from"./core/proxy/relay-orchestration.js";import{setAgentRelayCredential as ie,RelayCredentialError as le}from"./core/proxy/relay-credential.js";import{RelayFetchError as ce,RelayToggleCoordinator as Ve}from"./core/proxy/relay-credential-fetch.js";import{applyHermesProfileRelay as Xe,clearHermesProfileRelay as qe,discoverHermesProfiles as Je}from"./core/proxy/hermes-profile-relay.js";import{disableRelayCredential as Ye,enableRelayCredential as ze,RelayRouteError as de}from"./core/proxy/relay-credential-router.js";import{upgradeStatusSnapshot as Qe}from"./core/upgrade/npm-upgrader.js";import{resolveClientVersion as Ze}from"./core/util/client-version.js";import{parseCliArgs as et}from"./core/util/cli-args.js";const{command:D,flags:S,unknownFlags:q}=et(process.argv.slice(2));if(q.length>0&&(console.error(`Unknown option${q.length>1?"s":""}: ${q.map(o=>`--${o}`).join(", ")}
|
|
3
|
+
Run \`grix-connector --help\` to see the supported commands and options.`),process.exit(1)),S.version&&(console.log(Ze()),process.exit(0)),S.help&&(console.log(`grix-connector \u2014 Unified AI Agent Bridge
|
|
4
4
|
|
|
5
5
|
Usage: grix-connector <command> [options]
|
|
6
6
|
|
|
@@ -36,7 +36,7 @@ Examples:
|
|
|
36
36
|
grix-connector restart # Restart the service
|
|
37
37
|
`),process.exit(0)),D==="reload"){const o=Ie();o||(console.error("reload failed: daemon is not running (no pid file)"),process.exit(1));try{process.kill(o,0)}catch{console.error(`reload failed: daemon process ${o} is not running (stale pid file)`),process.exit(1)}{const p=K(j().daemonLockFile);p&&p.pid===o&&!Oe(p)&&(console.error(`reload failed: pid ${o} has been reused by another process (stale pid file)`),process.exit(1))}try{process.kill(o,"SIGHUP"),console.log(JSON.stringify({ok:!0,signaled:o},null,2)),process.exit(0)}catch(p){console.error(`reload failed: ${p instanceof Error?p.message:p}`),process.exit(1)}}const pe=["start","stop","restart","status"];if(D&&pe.includes(D)){process.platform==="win32"&&["start","stop","restart"].includes(D)&&!$e()&&console.warn(`Warning: Not running as administrator. Task Scheduler registration is skipped;
|
|
38
38
|
using Startup folder auto-start instead. For full Task Scheduler integration,
|
|
39
|
-
right-click the terminal and select "Run as administrator".`);const o=j(),p=
|
|
40
|
-
Valid commands: ${pe.join(", ")}`),process.exit(1));const l=j(),
|
|
41
|
-
`),s.error("main",o.message.replace(/\n/g," \u2014 "));const p=K(l.daemonLockFile);p?.pid===process.pid&&p.instance_id===k&&await B(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:k,updated_at:Date.now(),reason:`port_bind_${o.kind}:${o.label}:${o.port}`}).catch(()=>{}),await W(),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(1)}async function C(o){if(J)return;J=!0,s.info("main",`Received ${o}, shutting down...`),N.markShuttingDown();const p=setTimeout(()=>{s.error("main","Shutdown timed out, forcing exit"),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)},1e4);try{await n.stop(),await u()?.stop().catch(()=>{}),await b.stop(),await N.stop(),await W(),await H(l.daemonLockFile),await He(l.daemonStatusFile).catch(()=>{}),clearTimeout(p),O(),s.info("main","Shutdown complete"),process.exit(0)}catch(S){s.error("main",`Shutdown error: ${S}`),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)}}async function tt(){if(Ee(),De(),be(l.stdoutLogFile,l.stderrLogFile),re(!1),_e()){const e=Fe(l.rootDir,"win32");await Ue(e,{platform:"win32"})}try{k=(await Le(l.daemonLockFile,l.rootDir)).instance_id}catch(e){console.error(e instanceof Error?e.message:e),process.exit(1)}if(await Ge(),Pe(),s.info("main",`grix-connector starting (PID ${process.pid})`),await B(l.daemonStatusFile,{state:"starting",pid:process.pid,instance_id:k,updated_at:Date.now()}),(await Te({rootDir:l.rootDir,requestGracefulShutdown:()=>{C("wrapper-migration")}}).catch(e=>(s.warn("main",`Windows wrapper migration failed: ${e instanceof Error?e.message:e}`),null)))?.handoffStarted)return;const p=parseInt(R["health-port"]??process.env.GRIX_HEALTH_PORT??"19579",10);{const e=await ne({label:"health",port:p,envVar:"GRIX_HEALTH_PORT",cliFlag:"health-port",start:a=>N.start(a)});e&&await ue(e)}const S=P.join(l.dataDir,"health-port");te(S,String(p),"utf-8"),process.on("SIGINT",()=>C("SIGINT")),process.on("SIGTERM",()=>C("SIGTERM")),process.on("SIGHUP",()=>{J||(s.info("main","Received SIGHUP, reloading config..."),n.reload().then(e=>s.info("main",`reload done: ${JSON.stringify(e)}`)).catch(e=>s.error("main",`reload failed: ${e instanceof Error?e.message:e}`)))});let y="",d=0,T;process.on("uncaughtException",e=>{const a=e instanceof Error?e.stack??e.message:String(e);a===y?(d++,(d<=3||d%100===0)&&s.error("main",`Uncaught exception (x${d}): ${a}`)):(d>3&&s.error("main",`Previous exception repeated ${d} times total`),y=a,d=1,s.error("main",`Uncaught exception: ${e instanceof Error?e.stack:e}`),T||(T=setTimeout(()=>{d>3&&s.error("main",`Previous exception repeated ${d} times total`),y="",d=0,T=void 0},1e4).unref())),!fe(e)&&(V(e,"uncaughtException"),C("uncaughtException"))}),process.on("unhandledRejection",e=>{s.error("main",`Unhandled rejection: ${e}`),!fe(e)&&(V(e,"unhandledRejection"),C("unhandledRejection"))});const U=je(l.dataDir);await U.clearRuntimeState();const v=new Ke(P.join(l.dataDir,"proxy","relay-state.json"),{warn:e=>s.warn("main",e)}),M=new We(P.join(l.dataDir,"secrets"));n.setRelaySecretResolver(e=>M.get(e));const $={hasDirectConfig:e=>n.hasDirectRelayConfig(e),clearDirectConfig:(e,a)=>n.setAgentProvider(e,void 0,{deferRestart:a?.deferRestart===!0})},G=()=>({pm:u(),agents:n,direct:$,store:v,secrets:M}),_=U.getRelayAgents();if(_.length>0)try{await U.startIfAnyRelayAgent(),s.info("main",`mitm proxy started for relay agents: ${_.join(", ")} (per-agent; others stay direct)`)}catch(e){s.error("main",`mitm proxy FAILED to start (relay agents: ${_.join(", ")}): ${e}. These agents will REFUSE to start (they must not silently fall back to your own account). Fix the proxy or turn relay off for them. Other agents are unaffected.`)}else s.info("main",'mitm proxy idle (no agent has Grix relay enabled; enable: PUT /api/proxy/agents/<name>/enabled {"enabled":true})');let F=null;if(u()){const e=async()=>{const t=u();t&&await ae(t,n)&&s.info("main","no agent uses Grix relay anymore; mitm proxy stopped")};n.setRelayEnvSettledHandler(()=>{const t=u();t&&se(t,$,v),e().catch(r=>{s.warn("main",`failed to stop idle mitm proxy: ${r}`)})});const a=()=>{const t=u(),r=t.getRelayAgents(),i=t.getDegradedRelayAgents();return{enabled:r.length>0,relayAgents:r,staleRelayAgents:n.getAgentsWithStaleRelayEnv(),degradedRelayAgents:i,relayState:v.list(),runtime:t.getRuntimeInfo(),config:t.getConfigSnapshot()}},c=new Ve,A={status:()=>a(),setAgentRelay:async(t,r,i)=>{const g=u(),w={info:m=>s.info("main",m),warn:m=>s.warn("main",m)},h=m=>n.getAgentsStatus().find(x=>x.name===m),f=h(t);if(!r){c.cancel(t);const m=await c.runExclusive(t,async()=>{const x=await X(G(),w,{agentName:t,target:"off"});return{...a(),restarted:x.restarted,busy:x.busy,...x.pending?{pending:x.pending}:{}}});return n.reportRelayStateLocalChange(t),m}if(!f)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});if(!ke(f.clientType)&&oe(f.clientType).length===0)throw Object.assign(new Error(`client type "${f.clientType??""}" does not support Grix relay`),{code:"UNSUPPORTED_CLIENT_TYPE"});const L=await c.runExclusive(t,async()=>{const m=c.epoch(t),x=h(t);if(!x)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});const Q=String(x.agentId??"").trim();if(!Q)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const Z=c.waitCancelled(t,m);let I;try{I=await Promise.race([n.fetchRelayCredential(t,{model:i}),Z.promise.then(()=>{throw new ce("relay enable cancelled by a later disable","CANCELLED")})])}finally{Z.dispose()}c.assertCurrent(t,m);const{restarted:he,busy:we,pending:ee}=await ie(g,n,h,w,{localName:t,agentId:Q,virtualKey:I.apiKey,anthropicBaseUrl:I.anthropicBaseUrl,openaiBaseUrl:I.openaiBaseUrl,model:i,...I.directRelay!==void 0?{directRelay:I.directRelay}:{}},(Re,Se,Ae)=>n.setAgentProvider(Re,Se,{deferRestart:Ae?.deferRestart===!0}),{store:v,secrets:M,direct:$});if(c.epoch(t)!==m)throw await X(G(),w,{agentName:t,target:"off"}),new ce("relay enable cancelled by a later disable","CANCELLED");return{...a(),restarted:he,busy:we,...ee?{pending:ee}:{}}});return n.reportRelayStateLocalChange(t),L},setAgentRelayCredential:async(t,r)=>{const i=u(),g=n.getAgentsStatus(),{restarted:w,busy:h,pending:f}=await ie(i,n,E=>g.find(L=>L.name===E),{info:E=>s.info("main",E),warn:E=>s.warn("main",E)},{localName:t,agentId:r.agentId,virtualKey:r.virtualKey,anthropicBaseUrl:r.anthropicBaseUrl,openaiBaseUrl:r.openaiBaseUrl,model:r.model,...r.directRelay!==void 0?{directRelay:r.directRelay}:{}},(E,L,m)=>n.setAgentProvider(E,L,{deferRestart:m?.deferRestart===!0}),{store:v,secrets:M,direct:$});return n.reportRelayStateLocalChange(t),{...a(),restarted:w,busy:h,...f?{pending:f}:{}}},disableAll:async()=>{const t=u(),r={info:g=>s.info("main",g),warn:g=>s.warn("main",g)},i=new Set([...t.getRelayAgents(),...n.getDirectRelayConfigAgentNames(),...Object.keys(v.list())]);for(const g of i)c.cancel(g);for(const g of i)await c.runExclusive(g,()=>X(G(),r,{agentName:g,target:"off"})),n.reportRelayStateLocalChange(g);return await ae(t,n),a()},setRoute:async(t,r)=>{const i=r,g=u();return g.setRoute({routeKey:t,targetBaseUrl:i.targetBaseUrl,...i.headers?{headers:i.headers}:{},...i.model?{model:i.model}:{},...i.modelMap?{modelMap:i.modelMap}:{},...i.passthrough?{passthrough:!0}:{},...i.relayOnly?{relayOnly:!0}:{},...i.codexResponsesToChat?{codexResponsesToChat:!0}:{}}),await g.persistConfig(),a()},deleteRoute:async t=>{const r=u();r.deleteRoute(t),await r.persistConfig()},setDefaultRoute:async t=>{const r=u();return r.setDefaultRouteKey(t),await r.persistConfig(),a()},setInterceptHosts:async t=>{const r=u();return r.setInterceptHosts(t),await r.persistConfig(),a()}};F=A,b.setProxyHandler(A),n.setRelayStateApplier({getLocalState:t=>{const r=u();if(r.getRelayAgents().includes(t)){const g=n.getAgentsStatus().find(f=>f.name===t),w=`grix-gateway-${String(g?.clientType??"").trim().toLowerCase()}`;return{enabled:!0,model:r.getConfigSnapshot().routes?.find(f=>f.routeKey===w)?.model?.trim()||void 0}}const i=n.getAgentProvider(t);return i?.api_key?.trim()?{enabled:!0,model:i.model?.trim()||void 0}:{enabled:!1}},applyEnable:async(t,r,i)=>{const g=n.getAgentsStatus().find(f=>f.name===t),w=String(g?.agentId??"").trim();if(!w)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const h=await A.setAgentRelayCredential(t,{agentId:w,virtualKey:r.apiKey,anthropicBaseUrl:r.anthropicBaseUrl,openaiBaseUrl:r.openaiBaseUrl,model:i??r.model,...r.directRelay!==void 0?{directRelay:r.directRelay}:{}});return{restarted:h.restarted===!0,busy:h.busy===!0,...h.pending?{pending:h.pending}:{}}},applyDisable:async t=>{const r=await A.setAgentRelay(t,!1);return{restarted:r.restarted===!0,busy:r.busy===!0,...r.pending?{pending:r.pending}:{}}}})}if(N.setStatusProvider(()=>n.getAgentsStatus()),await n.start(et),_.length>0){const e=n.getAgentsStatus();for(const a of _){const c=e.find(t=>t.name===a);if(!c)continue;const A=oe(c.clientType);A.length!==0&&await U.setAgentRelayEnabled(a,!0,{relayHosts:A}).catch(t=>{s.warn("main",`failed to reconcile relay hosts for "${a}": ${t}`)})}}se(U,$,v);const Y=parseInt(R["admin-port"]??process.env.GRIX_ADMIN_PORT??"19580",10);b.setAgentHandler({list:()=>n.getAgentsStatus(),add:e=>n.addAgent(e),remove:e=>n.removeAgent(e),restart:e=>n.restartAgent(e),reload:()=>n.reload()}),b.setUpgradeHandler({check:()=>n.checkUpgrade(),trigger:()=>n.triggerUpgrade()}),b.setProbeHandler({probeAll:e=>n.probeAll(e),probeOne:(e,a)=>n.probeOne(e,a)}),b.setInstallHandler({listInstallable:()=>n.listInstallable(),installAgent:e=>n.installAgent(e),getInstallProgress:e=>n.getInstallProgress(e)});const z={listAgents:()=>n.getAgentsStatus(),enableManaged:(e,a,c)=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelayCredential(e,{agentId:a,virtualKey:c.virtualKey,anthropicBaseUrl:c.anthropicBaseUrl,openaiBaseUrl:c.openaiBaseUrl,model:c.model,...c.directRelay!==void 0?{directRelay:c.directRelay}:{}})},disableManaged:e=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelay(e,!1)},enableHermesProfile:(e,a)=>Xe({agentId:e,baseUrl:a.openaiBaseUrl??"",virtualKey:a.virtualKey,model:a.model??""}),disableHermesProfile:e=>qe(e)};b.setRelayCredentialHandler({listHermesProfiles:()=>Je(),enable:async(e,a)=>{const{target:c,result:A}=await ze(z,e,a);return{target:c,...A}},disable:async e=>{const{target:a,result:c}=await Ye(z,e);return{target:a,...c}}});{const e=await ne({label:"admin",port:Y,envVar:"GRIX_ADMIN_PORT",cliFlag:"admin-port",start:a=>b.start(a)});e&&await ue(e)}const me=P.join(l.dataDir,"admin-token"),ye=P.join(l.dataDir,"admin-port");Ne(me,ge),te(ye,String(Y),"utf-8"),await B(l.daemonStatusFile,{state:"running",pid:process.pid,instance_id:k,updated_at:Date.now()}),process.send&&process.send("ready"),s.info("main","grix-connector ready")}tt().catch(async o=>{const p=`Fatal: ${o instanceof Error?o.stack??o.message:String(o)}`;try{process.stderr.write(`${p}
|
|
42
|
-
`)}catch{}re(!1),s.error("main",p),V(o,"startup");const
|
|
39
|
+
right-click the terminal and select "Run as administrator".`);const o=j(),p=S["config-dir"]??(S.profile?P.join(o.configDir,S.profile):void 0),R=P.resolve(process.argv[1]||`${o.rootDir}/dist/grix.js`),y=new Ce({cliPath:R,nodePath:process.execPath});try{let d;switch(D){case"start":(await y.status({rootDir:o.rootDir})).installed?d=await y.start({rootDir:o.rootDir}):d=await y.install({rootDir:o.rootDir,configDir:p});break;case"stop":d=await y.stop({rootDir:o.rootDir});break;case"restart":(await y.status({rootDir:o.rootDir})).installed?d=await y.restart({rootDir:o.rootDir}):d=await y.install({rootDir:o.rootDir,configDir:p});break;case"status":d=await y.status({rootDir:o.rootDir});break}console.log(JSON.stringify(d,null,2)),process.exit(0)}catch(d){console.error(`${D} failed: ${d instanceof Error?d.message:d}`),process.exit(1)}}else D&&(console.error(`Unknown command: ${D}
|
|
40
|
+
Valid commands: ${pe.join(", ")}`),process.exit(1));const l=j(),tt=S["config-dir"]??(S.profile?`${l.configDir}/${S.profile}`:void 0),r=new xe({requestGracefulShutdown:()=>{C("upgrade")}}),M=new ve,ge=Be(),b=new Me(ge);let J=!1,k;async function ue(o){process.stderr.write(o.message+`
|
|
41
|
+
`),s.error("main",o.message.replace(/\n/g," \u2014 "));const p=K(l.daemonLockFile);p?.pid===process.pid&&p.instance_id===k&&await N(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:k,updated_at:Date.now(),reason:`port_bind_${o.kind}:${o.label}:${o.port}`}).catch(()=>{}),await W(),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(1)}async function C(o){if(J)return;J=!0,s.info("main",`Received ${o}, shutting down...`),M.markShuttingDown();const p=setTimeout(()=>{s.error("main","Shutdown timed out, forcing exit"),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)},1e4);try{await r.stop(),await u()?.stop().catch(()=>{}),await b.stop(),await M.stop(),await W(),await H(l.daemonLockFile),await He(l.daemonStatusFile).catch(()=>{}),clearTimeout(p),O(),s.info("main","Shutdown complete"),process.exit(0)}catch(R){s.error("main",`Shutdown error: ${R}`),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)}}async function rt(){if(Ee(),De(),be(l.stdoutLogFile,l.stderrLogFile),re(!1),_e()){const e=Fe(l.rootDir,"win32");await Ue(e,{platform:"win32"})}try{k=(await Le(l.daemonLockFile,l.rootDir)).instance_id}catch(e){console.error(e instanceof Error?e.message:e),process.exit(1)}if(await Ge(),Pe(),s.info("main",`grix-connector starting (PID ${process.pid})`),await N(l.daemonStatusFile,{state:"starting",pid:process.pid,instance_id:k,updated_at:Date.now()}),(await Te({rootDir:l.rootDir,requestGracefulShutdown:()=>{C("wrapper-migration")}}).catch(e=>(s.warn("main",`Windows wrapper migration failed: ${e instanceof Error?e.message:e}`),null)))?.handoffStarted)return;const p=parseInt(S["health-port"]??process.env.GRIX_HEALTH_PORT??"19579",10);{const e=await ne({label:"health",port:p,envVar:"GRIX_HEALTH_PORT",cliFlag:"health-port",start:a=>M.start(a)});e&&await ue(e)}const R=P.join(l.dataDir,"health-port");te(R,String(p),"utf-8"),process.on("SIGINT",()=>C("SIGINT")),process.on("SIGTERM",()=>C("SIGTERM")),process.on("SIGHUP",()=>{J||(s.info("main","Received SIGHUP, reloading config..."),r.reload().then(e=>s.info("main",`reload done: ${JSON.stringify(e)}`)).catch(e=>s.error("main",`reload failed: ${e instanceof Error?e.message:e}`)))});let y="",d=0,T;process.on("uncaughtException",e=>{const a=e instanceof Error?e.stack??e.message:String(e);a===y?(d++,(d<=3||d%100===0)&&s.error("main",`Uncaught exception (x${d}): ${a}`)):(d>3&&s.error("main",`Previous exception repeated ${d} times total`),y=a,d=1,s.error("main",`Uncaught exception: ${e instanceof Error?e.stack:e}`),T||(T=setTimeout(()=>{d>3&&s.error("main",`Previous exception repeated ${d} times total`),y="",d=0,T=void 0},1e4).unref())),!fe(e)&&(V(e,"uncaughtException"),C("uncaughtException"))}),process.on("unhandledRejection",e=>{s.error("main",`Unhandled rejection: ${e}`),!fe(e)&&(V(e,"unhandledRejection"),C("unhandledRejection"))});const U=je(l.dataDir);await U.clearRuntimeState();const v=new Ke(P.join(l.dataDir,"proxy","relay-state.json"),{warn:e=>s.warn("main",e)}),B=new We(P.join(l.dataDir,"secrets"));r.setRelaySecretResolver(e=>B.get(e));const $={hasDirectConfig:e=>r.hasDirectRelayConfig(e),clearDirectConfig:(e,a)=>r.setAgentProvider(e,void 0,{deferRestart:a?.deferRestart===!0})},G=()=>({pm:u(),agents:r,direct:$,store:v,secrets:B}),_=U.getRelayAgents();if(_.length>0)try{await U.startIfAnyRelayAgent(),s.info("main",`mitm proxy started for relay agents: ${_.join(", ")} (per-agent; others stay direct)`)}catch(e){s.error("main",`mitm proxy FAILED to start (relay agents: ${_.join(", ")}): ${e}. These agents will REFUSE to start (they must not silently fall back to your own account). Fix the proxy or turn relay off for them. Other agents are unaffected.`)}else s.info("main",'mitm proxy idle (no agent has Grix relay enabled; enable: PUT /api/proxy/agents/<name>/enabled {"enabled":true})');let F=null;if(u()){const e=async()=>{const t=u();t&&await ae(t,r)&&s.info("main","no agent uses Grix relay anymore; mitm proxy stopped")};r.setRelayEnvSettledHandler(()=>{const t=u();t&&se(t,$,v),e().catch(n=>{s.warn("main",`failed to stop idle mitm proxy: ${n}`)})});const a=()=>{const t=u(),n=t.getRelayAgents(),i=t.getDegradedRelayAgents();return{enabled:n.length>0,relayAgents:n,staleRelayAgents:r.getAgentsWithStaleRelayEnv(),degradedRelayAgents:i,relayState:v.list(),runtime:t.getRuntimeInfo(),config:t.getConfigSnapshot()}},c=new Ve,A={status:()=>a(),setAgentRelay:async(t,n,i)=>{const g=u(),w={info:m=>s.info("main",m),warn:m=>s.warn("main",m)},h=m=>r.getAgentsStatus().find(x=>x.name===m),f=h(t);if(!n){c.cancel(t);const m=await c.runExclusive(t,async()=>{const x=await X(G(),w,{agentName:t,target:"off"});return{...a(),restarted:x.restarted,busy:x.busy,...x.pending?{pending:x.pending}:{}}});return r.reportRelayStateLocalChange(t),m}if(!f)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});if(!ke(f.clientType)&&oe(f.clientType).length===0)throw Object.assign(new Error(`client type "${f.clientType??""}" does not support Grix relay`),{code:"UNSUPPORTED_CLIENT_TYPE"});const L=await c.runExclusive(t,async()=>{const m=c.epoch(t),x=h(t);if(!x)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});const Q=String(x.agentId??"").trim();if(!Q)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const Z=c.waitCancelled(t,m);let I;try{I=await Promise.race([r.fetchRelayCredential(t,{model:i}),Z.promise.then(()=>{throw new ce("relay enable cancelled by a later disable","CANCELLED")})])}finally{Z.dispose()}c.assertCurrent(t,m);const{restarted:he,busy:we,pending:ee}=await ie(g,r,h,w,{localName:t,agentId:Q,virtualKey:I.apiKey,anthropicBaseUrl:I.anthropicBaseUrl,openaiBaseUrl:I.openaiBaseUrl,model:i,...I.directRelay!==void 0?{directRelay:I.directRelay}:{}},(Se,Re,Ae)=>r.setAgentProvider(Se,Re,{deferRestart:Ae?.deferRestart===!0}),{store:v,secrets:B,direct:$});if(c.epoch(t)!==m)throw await X(G(),w,{agentName:t,target:"off"}),new ce("relay enable cancelled by a later disable","CANCELLED");return{...a(),restarted:he,busy:we,...ee?{pending:ee}:{}}});return r.reportRelayStateLocalChange(t),L},setAgentRelayCredential:async(t,n)=>{const i=u(),g=r.getAgentsStatus(),{restarted:w,busy:h,pending:f}=await ie(i,r,E=>g.find(L=>L.name===E),{info:E=>s.info("main",E),warn:E=>s.warn("main",E)},{localName:t,agentId:n.agentId,virtualKey:n.virtualKey,anthropicBaseUrl:n.anthropicBaseUrl,openaiBaseUrl:n.openaiBaseUrl,model:n.model,...n.directRelay!==void 0?{directRelay:n.directRelay}:{}},(E,L,m)=>r.setAgentProvider(E,L,{deferRestart:m?.deferRestart===!0}),{store:v,secrets:B,direct:$});return r.reportRelayStateLocalChange(t),{...a(),restarted:w,busy:h,...f?{pending:f}:{}}},disableAll:async()=>{const t=u(),n={info:g=>s.info("main",g),warn:g=>s.warn("main",g)},i=new Set([...t.getRelayAgents(),...r.getDirectRelayConfigAgentNames(),...Object.keys(v.list())]);for(const g of i)c.cancel(g);for(const g of i)await c.runExclusive(g,()=>X(G(),n,{agentName:g,target:"off"})),r.reportRelayStateLocalChange(g);return await ae(t,r),a()},setRoute:async(t,n)=>{const i=n,g=u();return g.setRoute({routeKey:t,targetBaseUrl:i.targetBaseUrl,...i.headers?{headers:i.headers}:{},...i.model?{model:i.model}:{},...i.modelMap?{modelMap:i.modelMap}:{},...i.passthrough?{passthrough:!0}:{},...i.relayOnly?{relayOnly:!0}:{},...i.codexResponsesToChat?{codexResponsesToChat:!0}:{}}),await g.persistConfig(),a()},deleteRoute:async t=>{const n=u();n.deleteRoute(t),await n.persistConfig()},setDefaultRoute:async t=>{const n=u();return n.setDefaultRouteKey(t),await n.persistConfig(),a()},setInterceptHosts:async t=>{const n=u();return n.setInterceptHosts(t),await n.persistConfig(),a()}};F=A,b.setProxyHandler(A),r.setRelayStateApplier({getLocalState:t=>{const n=u();if(n.getRelayAgents().includes(t)){const g=r.getAgentsStatus().find(f=>f.name===t),w=`grix-gateway-${String(g?.clientType??"").trim().toLowerCase()}`;return{enabled:!0,model:n.getConfigSnapshot().routes?.find(f=>f.routeKey===w)?.model?.trim()||void 0}}const i=r.getAgentProvider(t);return i?.api_key?.trim()?{enabled:!0,model:i.model?.trim()||void 0}:{enabled:!1}},applyEnable:async(t,n,i)=>{const g=r.getAgentsStatus().find(f=>f.name===t),w=String(g?.agentId??"").trim();if(!w)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const h=await A.setAgentRelayCredential(t,{agentId:w,virtualKey:n.apiKey,anthropicBaseUrl:n.anthropicBaseUrl,openaiBaseUrl:n.openaiBaseUrl,model:i??n.model,...n.directRelay!==void 0?{directRelay:n.directRelay}:{}});return{restarted:h.restarted===!0,busy:h.busy===!0,...h.pending?{pending:h.pending}:{}}},applyDisable:async t=>{const n=await A.setAgentRelay(t,!1);return{restarted:n.restarted===!0,busy:n.busy===!0,...n.pending?{pending:n.pending}:{}}}})}if(M.setStatusProvider(()=>r.getAgentsStatus()),M.setMetaProvider(()=>{const e=r.getAgentsStatus();return{ws:{connected:e.filter(a=>a.wsConnected===!0).length,total:e.length},upgrade:Qe()}}),await r.start(tt),_.length>0){const e=r.getAgentsStatus();for(const a of _){const c=e.find(t=>t.name===a);if(!c)continue;const A=oe(c.clientType);A.length!==0&&await U.setAgentRelayEnabled(a,!0,{relayHosts:A}).catch(t=>{s.warn("main",`failed to reconcile relay hosts for "${a}": ${t}`)})}}se(U,$,v);const Y=parseInt(S["admin-port"]??process.env.GRIX_ADMIN_PORT??"19580",10);b.setAgentHandler({list:()=>r.getAgentsStatus(),add:e=>r.addAgent(e),remove:e=>r.removeAgent(e),restart:e=>r.restartAgent(e),reload:()=>r.reload()}),b.setUpgradeHandler({check:()=>r.checkUpgrade(),trigger:()=>r.triggerUpgrade()}),b.setProbeHandler({probeAll:e=>r.probeAll(e),probeOne:(e,a)=>r.probeOne(e,a)}),b.setInstallHandler({listInstallable:()=>r.listInstallable(),installAgent:e=>r.installAgent(e),getInstallProgress:e=>r.getInstallProgress(e)});const z={listAgents:()=>r.getAgentsStatus(),enableManaged:(e,a,c)=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelayCredential(e,{agentId:a,virtualKey:c.virtualKey,anthropicBaseUrl:c.anthropicBaseUrl,openaiBaseUrl:c.openaiBaseUrl,model:c.model,...c.directRelay!==void 0?{directRelay:c.directRelay}:{}})},disableManaged:e=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelay(e,!1)},enableHermesProfile:(e,a)=>Xe({agentId:e,baseUrl:a.openaiBaseUrl??"",virtualKey:a.virtualKey,model:a.model??""}),disableHermesProfile:e=>qe(e)};b.setRelayCredentialHandler({listHermesProfiles:()=>Je(),enable:async(e,a)=>{const{target:c,result:A}=await ze(z,e,a);return{target:c,...A}},disable:async e=>{const{target:a,result:c}=await Ye(z,e);return{target:a,...c}}});{const e=await ne({label:"admin",port:Y,envVar:"GRIX_ADMIN_PORT",cliFlag:"admin-port",start:a=>b.start(a)});e&&await ue(e)}const me=P.join(l.dataDir,"admin-token"),ye=P.join(l.dataDir,"admin-port");Ne(me,ge),te(ye,String(Y),"utf-8"),await N(l.daemonStatusFile,{state:"running",pid:process.pid,instance_id:k,updated_at:Date.now()}),process.send&&process.send("ready"),s.info("main","grix-connector ready")}rt().catch(async o=>{const p=`Fatal: ${o instanceof Error?o.stack??o.message:String(o)}`;try{process.stderr.write(`${p}
|
|
42
|
+
`)}catch{}re(!1),s.error("main",p),V(o,"startup");const R=K(l.daemonLockFile);R?.pid===process.pid&&R.instance_id===k&&await N(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:R.instance_id,updated_at:Date.now(),reason:"startup_error"}).catch(()=>{}),await W(),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(1)});const nt=new Set(["ECONNRESET","ECONNREFUSED","ETIMEDOUT","EPIPE","EAI_AGAIN","ENOTFOUND","EHOSTUNREACH","ENETUNREACH","EIO"]);function fe(o){return o instanceof Error&&"code"in o?nt.has(o.code):!1}
|
package/dist/log.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import{createWriteStream as g,mkdirSync as l,existsSync as f}from"node:fs";import{join as
|
|
2
|
-
`)},error(o,r,...
|
|
1
|
+
import{createWriteStream as g,mkdirSync as l,existsSync as f}from"node:fs";import{join as i}from"node:path";import{homedir as m}from"node:os";const n=i(m(),".grix"),s={base:n,config:i(n,"config"),log:i(n,"log"),data:i(n,"data")};function S(){for(const o of Object.values(s))f(o)||l(o,{recursive:!0})}let a=null;function $(){const o=new Date().toISOString().slice(0,10),r=i(s.log,`grix-acp-${o}.log`);a=g(r,{flags:"a"})}function c(){return new Date().toISOString().slice(11,19)}const u={info(o,r,...t){const e=`${c()} [${o}] ${r}${t.length?" "+t.map(String).join(" "):""}`;console.log(e),a?.write(e+`
|
|
2
|
+
`)},error(o,r,...t){const e=`${c()} [${o}] ERROR ${r}${t.length?" "+t.map(String).join(" "):""}`;console.error(e),a?.write(e+`
|
|
3
3
|
`)}};export{s as GRIX_PATHS,S as ensureGrixDirs,$ as initLogger,u as log};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import*as
|
|
1
|
+
import*as n from"node:net";const i={bind:"127.0.0.1",port:0,endpoint:"/mcp",sessionTimeoutMs:18e5,invokeTimeoutMs:3e4};function s(u){const e={bind:u?.bind??i.bind,port:u?.port??i.port,endpoint:u?.endpoint??i.endpoint,sessionTimeoutMs:u?.sessionTimeoutMs??i.sessionTimeoutMs,invokeTimeoutMs:u?.invokeTimeoutMs??i.invokeTimeoutMs,allowedOrigins:u?.allowedOrigins,allowedHosts:u?.allowedHosts};return t(e.bind),e.port!==0&&o(e.port),r(e.sessionTimeoutMs),e}function t(u){if(!u||!n.isIPv4(u)&&!n.isIPv6(u))throw new Error(`\u914D\u7F6E\u6821\u9A8C\u5931\u8D25: bind \u5730\u5740 "${u}" \u4E0D\u662F\u5408\u6CD5\u7684 IPv4 \u6216 IPv6 \u5730\u5740`)}function o(u){if(!Number.isInteger(u)||u<1||u>65535)throw new Error(`\u914D\u7F6E\u6821\u9A8C\u5931\u8D25: port \u503C ${u} \u4E0D\u5728\u5408\u6CD5\u8303\u56F4 1-65535 \u5185\u6216\u4E0D\u662F\u6574\u6570`)}function r(u){if(!Number.isInteger(u)||u<1e3||u>864e5)throw new Error(`\u914D\u7F6E\u6821\u9A8C\u5931\u8D25: session_timeout_ms \u503C ${u} \u4E0D\u5728\u5408\u6CD5\u8303\u56F4 1000-86400000 \u5185`)}export{s as createDefaultGatewayConfig};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const
|
|
1
|
+
const a=3e4;class c{connectionManager;onDisconnected;bindings=new Map;constructor(n,i){this.connectionManager=n,this.onDisconnected=i}async bind(n,i){if(this.bindings.has(n))throw new Error(`Session ${n} is already bound to a connection`);const e=await this.connectWithTimeout(i),t=[],s=e.onDisconnected(()=>{this.removeBinding(n),this.onDisconnected(n)});return t.push(s),this.bindings.set(n,{sessionId:n,handle:e,subscriptions:t}),e}getHandle(n){return this.bindings.get(n)?.handle}unbind(n){const i=this.bindings.get(n);if(i){this.bindings.delete(n);for(const e of i.subscriptions)e();i.handle.disconnect()}}unbindAll(){const n=[...this.bindings.keys()];for(const i of n)this.unbind(i)}connectWithTimeout(n){return new Promise((i,e)=>{let t=!1;const s=setTimeout(()=>{t||(t=!0,e(new Error("Connection bind timeout after 30000ms")))},3e4);this.connectionManager.connect({agentId:n.agentId,apiKey:n.apiKey,url:n.wsUrl,clientType:n.clientType,capabilities:["agent_invoke"],adapterHint:`${n.clientType}/base`},{maxRetries:0}).then(o=>{t?o.disconnect():(t=!0,clearTimeout(s),i(o))}).catch(o=>{t||(t=!0,clearTimeout(s),e(o))})})}removeBinding(n){const i=this.bindings.get(n);if(i){this.bindings.delete(n);for(const e of i.subscriptions)e()}}}export{c as ConnectionBindingImpl};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function a(
|
|
1
|
+
function a(e){const t=new Set([`http://127.0.0.1:${e.serverPort}`,`http://localhost:${e.serverPort}`,...e.allowedOrigins]),o=new Set([`127.0.0.1:${e.serverPort}`,`localhost:${e.serverPort}`,...e.allowedHosts]);return{validateRequest(s){const r=i(s,t);if(!r.ok)return r;const n=l(s,o);return n.ok?{ok:!0}:n}}}function i(e,t){const o=e.headers.origin;return o?t.has(o)?{ok:!0}:{ok:!1,statusCode:403,message:`Origin not allowed: ${o}`}:{ok:!0}}function l(e,t){const o=e.headers.host;return o?t.has(o)?{ok:!0}:{ok:!1,statusCode:403,message:`Host not allowed: ${o}`}:{ok:!1,statusCode:403,message:"Missing Host header"}}export{a as createSecurityPolicy};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{toolCallToInvoke as i}from"../../core/mcp/tools.js";import{ToolRegistryImpl as l}from"./tool-registry.js";import{validateToolArgs as a}from"./tool-schemas.js";import{isEventTool as p,executeEventTool as d}from"./event-tool-executor.js";class y{registry;constructor(){this.registry=new l}async execute(
|
|
1
|
+
import{toolCallToInvoke as i}from"../../core/mcp/tools.js";import{ToolRegistryImpl as l}from"./tool-registry.js";import{validateToolArgs as a}from"./tool-schemas.js";import{isEventTool as p,executeEventTool as d}from"./event-tool-executor.js";class y{registry;constructor(){this.registry=new l}async execute(r,e,t,n){if(!this.registry.hasTool(e))return this.errorResult(`\u672A\u77E5\u5DE5\u5177: ${e}`);const s=a(e,t);if(!s.valid)return this.errorResult(`\u53C2\u6570\u6821\u9A8C\u5931\u8D25: ${s.error}`);if(r.status!=="ready")return this.errorResult(`\u8FDE\u63A5\u4E0D\u53EF\u7528: \u5F53\u524D\u72B6\u6001\u4E3A ${r.status}`);if(p(e))return this.executeEventTool(r,e,t);const o=i(e,t);try{const u=await r.agentInvoke(o.action,o.params,n);return this.normalizeResult(u)}catch(u){const c=u instanceof Error?u.message:String(u);return c.toLowerCase().includes("timeout")?this.errorResult(`\u8C03\u7528\u8D85\u65F6: ${c}`):this.errorResult(`\u8C03\u7528\u5931\u8D25: ${c}`)}}normalizeResult(r){if(r==null||typeof r!="object")return this.successResult(r??null);const e=r,t=typeof e.code=="number"?e.code:0;if(t===0){const s="data"in e?e.data:null;return this.successResult(s??null)}const n=typeof e.msg=="string"?e.msg:"\u672A\u77E5\u9519\u8BEF";return this.errorResult(`\u4E0A\u6E38\u9519\u8BEF [code=${t}]: ${n}`)}successResult(r){return{content:[{type:"text",text:JSON.stringify(r)}],isError:!1}}errorResult(r){return{content:[{type:"text",text:r}],isError:!0}}async executeEventTool(r,e,t){return e==="grix_access_control"?this.executeAccessControl(r,t):d(r,e,t)}async executeAccessControl(r,e){const t=String(e.action??""),n={pair_approve:"pair_approve",pair_deny:"pair_deny",allow_sender:"sender_allow",remove_sender:"sender_remove",set_policy:"policy_set"}[t];if(!n)return this.errorResult(`\u672A\u77E5 access_control action: ${t}`);const s={};e.code!=null&&(s.code=e.code),e.sender_id!=null&&(s.sender_id=e.sender_id),e.policy!=null&&(s.policy=e.policy);try{const o=await r.agentInvoke("claude_access_control",{verb:n,payload:s},3e4);return this.successResult(o)}catch(o){const u=o instanceof Error?o.message:String(o);return this.errorResult(`access_control \u8C03\u7528\u5931\u8D25: ${u}`)}}}export{y as ToolExecutorImpl};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{TOOLS as
|
|
1
|
+
import{TOOLS as o,EVENT_TOOLS as s}from"../../core/mcp/tools.js";const e=new Set(["grix_query","grix_group","grix_message_send","grix_message_unsend","grix_admin"]),r=new Set(["grix_reply","grix_complete","grix_event_ack","grix_composing","grix_access_control","grix_status"]);class a{tools;toolMap;constructor(){this.tools=[...o.filter(t=>e.has(t.name)),...s.filter(t=>r.has(t.name))],this.toolMap=new Map(this.tools.map(t=>[t.name,t]))}getTools(){return this.tools}getTool(t){return this.toolMap.get(t)}hasTool(t){return this.toolMap.has(t)}}export{a as ToolRegistryImpl};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const o={required:["action"],properties:{action:{type:"string",enum:["contact_search","session_search","message_history","message_search"]},id:{type:"string"},keyword:{type:"string",maxLength:200},limit:{type:"integer",minimum:1,maximum:100},offset:{type:"integer",minimum:0},sessionId:{type:"string"},beforeId:{type:"string"}}},a={required:["action"],properties:{action:{type:"string",enum:["create","detail","leave","add_members","remove_members","update_member_role","update_all_members_muted","update_member_speaking","dissolve"]},sessionId:{type:"string"},name:{type:"string",maxLength:128},memberIds:{type:"array",items:{type:"string"},maxItems:100},memberTypes:{type:"array",items:{type:"integer",enum:[1,2]}},memberId:{type:"string"},role:{type:"integer",enum:[1,2]},memberType:{type:"integer"},allMembersMuted:{type:"boolean"},isSpeakMuted:{type:"boolean"},canSpeakWhenAllMuted:{type:"boolean"}}},p={required:["sessionId","content"],properties:{sessionId:{type:"string"},content:{type:"string",maxLength:1e4},msgType:{type:"integer"},quotedMessageId:{type:"string"},threadId:{type:"string"}}},m={required:["sessionId","msgId"],properties:{sessionId:{type:"string"},msgId:{type:"string"}}},g={required:["action"],properties:{action:{type:"string",enum:["create_agent","list_categories","create_category","update_category","assign_category","rotate_api_key"]},agentName:{type:"string"},introduction:{type:"string"},isMain:{type:"boolean"},agentId:{type:"string"},categoryId:{type:"string"},name:{type:"string"},parentId:{type:"string"},sortOrder:{type:"integer"}}},y={required:["session_id","text"],properties:{event_id:{type:"string"},session_id:{type:"string"},text:{type:"string",maxLength:5e4},quoted_message_id:{type:"string"},is_final:{type:"boolean"}}},d={required:["event_id","status"],properties:{event_id:{type:"string"},status:{type:"string",enum:["responded","canceled","failed"]},msg:{type:"string",maxLength:500}}},c={required:["event_id"],properties:{event_id:{type:"string"},session_id:{type:"string"}}},l={required:["session_id","active"],properties:{session_id:{type:"string"},active:{type:"boolean"},event_id:{type:"string"}}},_={required:["action"],properties:{action:{type:"string",enum:["pair_approve","pair_deny","allow_sender","remove_sender","set_policy"]},code:{type:"string"},sender_id:{type:"string"},policy:{type:"string",enum:["allowlist","open","disabled"]}}},f={required:[],properties:{}},C={grix_query:o,grix_group:a,grix_message_send:p,grix_message_unsend:m,grix_admin:g,grix_reply:y,grix_complete:d,grix_event_ack:c,grix_composing:l,grix_access_control:_,grix_status:f};function B(
|
|
1
|
+
const o={required:["action"],properties:{action:{type:"string",enum:["contact_search","session_search","message_history","message_search"]},id:{type:"string"},keyword:{type:"string",maxLength:200},limit:{type:"integer",minimum:1,maximum:100},offset:{type:"integer",minimum:0},sessionId:{type:"string"},beforeId:{type:"string"}}},a={required:["action"],properties:{action:{type:"string",enum:["create","detail","leave","add_members","remove_members","update_member_role","update_all_members_muted","update_member_speaking","dissolve"]},sessionId:{type:"string"},name:{type:"string",maxLength:128},memberIds:{type:"array",items:{type:"string"},maxItems:100},memberTypes:{type:"array",items:{type:"integer",enum:[1,2]}},memberId:{type:"string"},role:{type:"integer",enum:[1,2]},memberType:{type:"integer"},allMembersMuted:{type:"boolean"},isSpeakMuted:{type:"boolean"},canSpeakWhenAllMuted:{type:"boolean"}}},p={required:["sessionId","content"],properties:{sessionId:{type:"string"},content:{type:"string",maxLength:1e4},msgType:{type:"integer"},quotedMessageId:{type:"string"},threadId:{type:"string"}}},m={required:["sessionId","msgId"],properties:{sessionId:{type:"string"},msgId:{type:"string"}}},g={required:["action"],properties:{action:{type:"string",enum:["create_agent","list_categories","create_category","update_category","assign_category","rotate_api_key"]},agentName:{type:"string"},introduction:{type:"string"},isMain:{type:"boolean"},agentId:{type:"string"},categoryId:{type:"string"},name:{type:"string"},parentId:{type:"string"},sortOrder:{type:"integer"}}},y={required:["session_id","text"],properties:{event_id:{type:"string"},session_id:{type:"string"},text:{type:"string",maxLength:5e4},quoted_message_id:{type:"string"},is_final:{type:"boolean"}}},d={required:["event_id","status"],properties:{event_id:{type:"string"},status:{type:"string",enum:["responded","canceled","failed"]},msg:{type:"string",maxLength:500}}},c={required:["event_id"],properties:{event_id:{type:"string"},session_id:{type:"string"}}},l={required:["session_id","active"],properties:{session_id:{type:"string"},active:{type:"boolean"},event_id:{type:"string"}}},_={required:["action"],properties:{action:{type:"string",enum:["pair_approve","pair_deny","allow_sender","remove_sender","set_policy"]},code:{type:"string"},sender_id:{type:"string"},policy:{type:"string",enum:["allowlist","open","disabled"]}}},f={required:[],properties:{}},C={grix_query:o,grix_group:a,grix_message_send:p,grix_message_unsend:m,grix_admin:g,grix_reply:y,grix_complete:d,grix_event_ack:c,grix_composing:l,grix_access_control:_,grix_status:f};function B(r,t){const e=C[r];if(!e)return{valid:!1,error:`\u672A\u77E5\u5DE5\u5177: ${r}`};for(const i of e.required)if(t[i]===void 0||t[i]===null)return{valid:!1,error:`\u7F3A\u5C11\u5FC5\u586B\u53C2\u6570: ${i}`};for(const[i,u]of Object.entries(t)){if(u==null)continue;const n=e.properties[i];if(!n)continue;const s=$(i,u,n);if(s)return{valid:!1,error:s}}return{valid:!0}}function $(r,t,e){switch(e.type){case"string":if(typeof t!="string")return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxLength!==void 0&&t.length>e.maxLength)return`\u53C2\u6570 ${r} \u8D85\u8FC7\u6700\u5927\u957F\u5EA6 ${e.maxLength}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${r} \u503C "${t}" \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"integer":if(typeof t!="number"||!Number.isInteger(t))return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof t=="number"?"\u6D6E\u70B9\u6570":typeof t}`;if(e.minimum!==void 0&&t<e.minimum)return`\u53C2\u6570 ${r} \u503C ${t} \u5C0F\u4E8E\u6700\u5C0F\u503C ${e.minimum}`;if(e.maximum!==void 0&&t>e.maximum)return`\u53C2\u6570 ${r} \u503C ${t} \u5927\u4E8E\u6700\u5927\u503C ${e.maximum}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${r} \u503C ${t} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"boolean":if(typeof t!="boolean")return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B boolean\uFF0C\u5B9E\u9645 ${typeof t}`;break;case"array":if(!Array.isArray(t))return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B array\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxItems!==void 0&&t.length>e.maxItems)return`\u53C2\u6570 ${r} \u8D85\u8FC7\u6700\u5927\u5143\u7D20\u6570 ${e.maxItems}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.items)for(let i=0;i<t.length;i++){const u=t[i];if(e.items.type==="string"&&typeof u!="string")return`\u53C2\u6570 ${r}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof u}`;if(e.items.type==="integer"){if(typeof u!="number"||!Number.isInteger(u))return`\u53C2\u6570 ${r}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof u}`;if(e.items.enum&&!e.items.enum.includes(u))return`\u53C2\u6570 ${r}[${i}] \u503C ${u} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.items.enum.join(", ")}]`}}break}}export{B as validateToolArgs};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import{createHash as C}from"node:crypto";import l from"node:fs";import j from"node:os";import o from"node:path";import v from"node:process";import{mkdir as w}from"node:fs/promises";import{setTimeout as z}from"node:timers/promises";import{resolveRuntimePaths as P}from"../core/config/paths.js";import{inspectDaemonState as S}from"../runtime/service-state.js";import{isProcessRunning as x,runCommand as p,terminateProcessTree as I,waitForProcessExit as A}from"./process-control.js";import{isLockHolderIdentityVerified as F,readDaemonLock as _}from"../runtime/daemon-lock.js";import{ServiceInstallStore as E}from"./service-install-store.js";import{getPlatformServiceAdapter as B}from"./platform-adapter.js";import{captureLogCursor as D,formatLogDelta as y}from"./log-diagnostics.js";import{buildServiceID as L,resolveWindowsServiceRuntimeDir as N,resolveServiceInstallRecordPath as T,resolveServiceStderrPath as b,resolveServiceStdoutPath as H}from"./service-paths.js";class rt{adapter;platform;homeDir;uid;nodePath;cliPath;waitForExit;terminateTree;constructor(i){this.platform=i.platform??v.platform,this.homeDir=i.homeDir??j.homedir(),this.uid=i.uid??v.getuid?.()??0,this.nodePath=i.nodePath??v.execPath,this.cliPath=i.cliPath,this.adapter=B(this.platform),this.waitForExit=i.processControl?.waitForExit??A,this.terminateTree=i.processControl?.terminateTree??I}normalizeRootDir(i){return o.resolve(String(i??"").trim())}resolveLocalServiceBaseDir(){if(this.platform==="darwin")return o.join(this.homeDir,"Library","Application Support","grix-connector");if(this.platform==="win32"){const i=String(v.env.LOCALAPPDATA??"").trim();return o.join(i&&o.isAbsolute(i)?i:o.join(this.homeDir,"AppData","Local"),"grix-connector")}return null}resolveServiceRuntimeDir(i){const t=this.resolveLocalServiceBaseDir();return t?this.platform==="win32"?N(this.normalizeRootDir(i),v.env,this.homeDir):o.join(t,"runtime"):null}resolveServiceCliPath(i){const t=this.resolveServiceRuntimeDir(i);return t?o.join(t,"dist",o.basename(this.cliPath)):this.cliPath}prepareServiceRuntime(i){const t=this.resolveServiceRuntimeDir(i);if(!t)return;const s=o.dirname(this.cliPath),r=o.dirname(s),e=o.join(t,"dist"),a=o.join(t,"node_modules");l.mkdirSync(t,{recursive:!0}),l.rmSync(e,{recursive:!0,force:!0}),l.cpSync(s,e,{recursive:!0,force:!0});const n=o.join(r,"package.json");l.existsSync(n)&&l.copyFileSync(n,o.join(t,"package.json"));const c=o.join(r,"node_modules");if(l.existsSync(c)&&(l.rmSync(a,{recursive:!0,force:!0}),this.platform==="win32"?l.cpSync(c,a,{recursive:!0,force:!0}):l.symlinkSync(l.realpathSync(c),a,"dir")),this.platform==="win32"){const d=o.join(r,"scripts","upgrade-guardian.mjs");if(l.existsSync(d)){const u=o.join(this.normalizeRootDir(i),"bin"),m=o.join(u,"upgrade-guardian.mjs"),h=o.join(u,"upgrade-guardian.fallback.mjs"),g=`${m}.tmp-${v.pid}`;l.mkdirSync(u,{recursive:!0});try{l.copyFileSync(d,g),l.renameSync(g,m),l.copyFileSync(d,h)}finally{l.rmSync(g,{force:!0})}}}}buildDescriptor(i,t,s=""){const r=this.normalizeRootDir(i),e=this.resolveServiceCliPath(r);return{schema_version:1,platform:this.platform,service_id:L(r,this.platform),node_path:this.nodePath,cli_path:e,cli_hash:this.computeServiceHash(e)??"",definition_path:s,config_dir:t??"",installed_at:0,updated_at:0}}createStore(i){return new E(T(this.normalizeRootDir(i)))}toAdapterPayload(i,t){return{serviceID:i.service_id,nodePath:i.node_path,cliPath:i.cli_path,configDir:i.config_dir||void 0,rootDir:this.normalizeRootDir(t),environmentPath:this.buildServiceEnvironmentPath()}}async resolveServiceLogPaths(i){const t=this.resolveLocalServiceBaseDir();if(t){const s=o.join(this.platform==="darwin"?o.join(this.homeDir,"Library","Logs","grix-connector"):o.join(t,"logs"),L(this.normalizeRootDir(i),this.platform));return await w(s,{recursive:!0}),{stdoutPath:o.join(s,"daemon.out.log"),stderrPath:o.join(s,"daemon.err.log")}}return await w(o.join(i,"service"),{recursive:!0}),{stdoutPath:H(i),stderrPath:b(i)}}buildServiceEnvironmentPath(){const i=[o.dirname(this.nodePath),"/opt/homebrew/bin","/usr/local/bin","/usr/bin","/bin","/usr/sbin","/sbin"],t=String(v.env.PATH??"").split(o.delimiter).filter(e=>e&&o.isAbsolute(e)).filter(e=>!e.includes("/node_modules/.bin")).filter(e=>!e.includes("/node-gyp-bin")),s=[],r=new Set;for(const e of[...i,...t]){if(r.has(e))continue;if(r.add(e),[...s,e].join(o.delimiter).length>2048)break;s.push(e)}return s.join(o.delimiter)}toStartParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toStopParams(i){return{serviceID:i.service_id,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toRestartParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toUninstallParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}async loadDescriptor(i){const t=this.createStore(i),s=await t.load();if(!s)throw new Error("\u540E\u53F0\u670D\u52A1\u8FD8\u6CA1\u6709\u5B89\u88C5\uFF0C\u8BF7\u5148\u6267\u884C service install\u3002");return{store:t,descriptor:s}}isDescriptorCurrent(i,t){if(t.node_path!==this.nodePath||t.cli_path!==this.resolveServiceCliPath(i)||!t.cli_hash)return!1;const s=this.computeServiceHash(t.cli_path),r=this.computeServiceHash(this.cliPath);return s!==null&&r!==null&&s===t.cli_hash&&r===t.cli_hash}computeFileHash(i){try{const t=l.readFileSync(i);return C("sha256").update(t).digest("hex")}catch{return null}}computeServiceHash(i){if(!this.resolveLocalServiceBaseDir())return this.computeFileHash(i);try{const t=o.dirname(i),s=C("sha256"),r=e=>{const a=l.readdirSync(e,{withFileTypes:!0}).sort((n,c)=>n.name.localeCompare(c.name));for(const n of a){const c=o.join(e,n.name);s.update(o.relative(t,c)),n.isDirectory()?r(c):n.isFile()&&s.update(l.readFileSync(c))}};return r(t),s.digest("hex")}catch{return null}}async refreshDescriptor(i,t){const s=this.normalizeRootDir(i);await w(o.join(s,"service"),{recursive:!0}),this.prepareServiceRuntime(s);const r=this.resolveServiceCliPath(s),e={...t,platform:this.platform,service_id:t.service_id||L(s,this.platform),node_path:this.nodePath,cli_path:r,cli_hash:this.computeServiceHash(r)??"",config_dir:t.config_dir},a=await this.resolveServiceLogPaths(s),n=await this.adapter.install({...this.toAdapterPayload(e,s),stdoutPath:a.stdoutPath,stderrPath:a.stderrPath,homeDir:this.homeDir,uid:this.uid,runCommand:p}),c={...e,installed_at:t.installed_at,definition_path:n?.definitionPath||e.definition_path,updated_at:Date.now()};return await this.createStore(s).save(c),c}async resolveActiveDescriptor(i){const{descriptor:t}=await this.loadDescriptor(i);return this.isDescriptorCurrent(i,t)?t:this.refreshDescriptor(i,t)}async discoverConflictingServices(i){const t=this.normalizeRootDir(i),s=L(t,this.platform);return(await this.adapter.discoverServices({homeDir:this.homeDir,runCommand:p})).filter(e=>e.serviceID!==s)}async cleanupConflictingServices(i){const t=await this.discoverConflictingServices(i);if(t.length>0){const r=t.map(e=>e.serviceID).join(", ");console.log(`\u53D1\u73B0 ${t.length} \u4E2A\u6B8B\u7559\u670D\u52A1\uFF0C\u6B63\u5728\u68C0\u67E5: ${r}`)}let s=0;for(const r of t){if(await this.adapter.isServiceLoaded({serviceID:r.serviceID,uid:this.uid,homeDir:this.homeDir,runCommand:p})){console.log(`\u8DF3\u8FC7\u6B63\u5728\u8FD0\u884C\u7684\u670D\u52A1: ${r.serviceID}`);continue}try{await this.adapter.stop({serviceID:r.serviceID,uid:this.uid,homeDir:this.homeDir,runCommand:p})}catch{}try{await this.adapter.uninstall({serviceID:r.serviceID,definitionPath:r.definitionPath,uid:this.uid,homeDir:this.homeDir,runCommand:p}),s++}catch{}}return s}captureDaemonBaseline(i){return{status:S(i.daemonStatusFile),lock:_(i.daemonLockFile)}}isDaemonReady(i,t,s){const r=S(i.daemonStatusFile),e=_(i.daemonLockFile);if(!r.running||r.state!=="running"||r.pid<=0||!e||e.pid!==r.pid||!x(e.pid)||typeof e.root_dir!="string"||o.resolve(e.root_dir)!==o.resolve(i.rootDir)||typeof e.instance_id!="string"||e.instance_id.length===0||r.instance_id!==e.instance_id)return!1;const a=r.pid!==t.status.pid||r.state!==t.status.state||r.updated_at!==t.status.updated_at||r.instance_id!==t.status.instance_id,n=!t.lock||e.pid!==t.lock.pid||e.acquired_at!==t.lock.acquired_at||e.instance_id!==t.lock.instance_id,c=a&&n,d=t.status.state==="starting"&&t.status.instance_id===e.instance_id&&t.lock?.pid===e.pid&&t.lock.instance_id===e.instance_id&&r.instance_id===e.instance_id&&r.updated_at!==t.status.updated_at,u=t.lock?.pid===e.pid&&t.lock.instance_id===e.instance_id&&t.lock.acquired_at===e.acquired_at&&(t.status.pid!==e.pid||t.status.instance_id!==e.instance_id||t.status.state!=="running")&&r.pid===e.pid&&r.instance_id===e.instance_id&&r.state==="running"&&r.updated_at!==t.status.updated_at;return!F(e)&&!c&&!d&&!u?!1:s?c||d||u:!0}canForceTerminateDaemon(i,t){const s=_(i.daemonLockFile);return t>0&&s!==null&&s.pid===t&&typeof s.root_dir=="string"&&o.resolve(s.root_dir)===o.resolve(i.rootDir)&&F(s)}defaultDaemonStartTimeoutMs(){return this.platform==="darwin"?5e4:2e4}async waitForDaemonStarted(i,t={}){const s=t.timeoutMs??this.defaultDaemonStartTimeoutMs(),r=t.baseline??this.captureDaemonBaseline(i),e=t.requireNewDaemon??!1,a=t.stdoutLogFile??i.stdoutLogFile,n=t.stderrLogFile??i.stderrLogFile,c=t.stdoutLogCursor??D(a),d=t.stderrLogCursor??D(n),u=Date.now();for(;Date.now()-u<s;){if(this.isDaemonReady(i,r,e))return;const f=S(i.daemonStatusFile);if(f.state==="failed"&&(r.status.state!=="failed"||f.pid!==r.status.pid||f.updated_at!==r.status.updated_at||f.instance_id!==r.status.instance_id)){const k=_(i.daemonLockFile),R=["daemon start failed",`status=${JSON.stringify(f)}`,`lock=${k?JSON.stringify(k):"missing"}`,y("stderr",n,d),y("stdout",a,c)].filter(Boolean);throw new Error(R.join(`
|
|
2
|
-
`))}await z(100)}const m=_(i.daemonLockFile),h=S(i.daemonStatusFile),g=[`daemon start timeout (${s}ms)`,`status=${JSON.stringify(h)}`,`lock=${m?JSON.stringify(m):"missing"}`,y("stderr",n,d),y("stdout",
|
|
3
|
-
`))}async install(i){const t=this.normalizeRootDir(i.rootDir);await this.cleanupConflictingServices(t),await w(
|
|
1
|
+
import{createHash as C}from"node:crypto";import l from"node:fs";import j from"node:os";import a from"node:path";import D from"node:process";import{mkdir as w}from"node:fs/promises";import{setTimeout as z}from"node:timers/promises";import{resolveRuntimePaths as P}from"../core/config/paths.js";import{inspectDaemonState as S}from"../runtime/service-state.js";import{isProcessRunning as x,runCommand as p,terminateProcessTree as I,waitForProcessExit as A}from"./process-control.js";import{isLockHolderIdentityVerified as F,readDaemonLock as _}from"../runtime/daemon-lock.js";import{ServiceInstallStore as E}from"./service-install-store.js";import{getPlatformServiceAdapter as T}from"./platform-adapter.js";import{captureLogCursor as v,formatLogDelta as y}from"./log-diagnostics.js";import{buildServiceID as L,resolveWindowsServiceRuntimeDir as b,resolveServiceInstallRecordPath as B,resolveServiceStderrPath as N,resolveServiceStdoutPath as H}from"./service-paths.js";class rt{adapter;platform;homeDir;uid;nodePath;cliPath;waitForExit;terminateTree;constructor(i){this.platform=i.platform??D.platform,this.homeDir=i.homeDir??j.homedir(),this.uid=i.uid??D.getuid?.()??0,this.nodePath=i.nodePath??D.execPath,this.cliPath=i.cliPath,this.adapter=T(this.platform),this.waitForExit=i.processControl?.waitForExit??A,this.terminateTree=i.processControl?.terminateTree??I}normalizeRootDir(i){return a.resolve(String(i??"").trim())}resolveLocalServiceBaseDir(){if(this.platform==="darwin")return a.join(this.homeDir,"Library","Application Support","grix-connector");if(this.platform==="win32"){const i=String(D.env.LOCALAPPDATA??"").trim();return a.join(i&&a.isAbsolute(i)?i:a.join(this.homeDir,"AppData","Local"),"grix-connector")}return null}resolveServiceRuntimeDir(i){const t=this.resolveLocalServiceBaseDir();return t?this.platform==="win32"?b(this.normalizeRootDir(i),D.env,this.homeDir):a.join(t,"runtime"):null}resolveServiceCliPath(i){const t=this.resolveServiceRuntimeDir(i);return t?a.join(t,"dist",a.basename(this.cliPath)):this.cliPath}prepareServiceRuntime(i){const t=this.resolveServiceRuntimeDir(i);if(!t)return;const s=a.dirname(this.cliPath),r=a.dirname(s),e=a.join(t,"dist"),o=a.join(t,"node_modules");l.mkdirSync(t,{recursive:!0}),l.rmSync(e,{recursive:!0,force:!0}),l.cpSync(s,e,{recursive:!0,force:!0});const n=a.join(r,"package.json");l.existsSync(n)&&l.copyFileSync(n,a.join(t,"package.json"));const c=a.join(r,"node_modules");if(l.existsSync(c)&&(l.rmSync(o,{recursive:!0,force:!0}),l.cpSync(c,o,{recursive:!0,force:!0})),this.platform==="win32"||this.platform==="darwin"){const d=a.join(r,"scripts","upgrade-guardian.mjs");if(l.existsSync(d)){const u=a.join(this.normalizeRootDir(i),"bin"),m=a.join(u,"upgrade-guardian.mjs"),h=a.join(u,"upgrade-guardian.fallback.mjs"),g=`${m}.tmp-${D.pid}`;l.mkdirSync(u,{recursive:!0});try{l.copyFileSync(d,g),l.renameSync(g,m),l.copyFileSync(d,h)}finally{l.rmSync(g,{force:!0})}}if(this.platform==="darwin"){const u=a.join(r,"scripts","upgrade-guardian.sh");if(l.existsSync(u)){const m=a.join(this.normalizeRootDir(i),"bin","upgrade-guardian.sh"),h=`${m}.tmp-${D.pid}`;try{l.copyFileSync(u,h),l.chmodSync(h,493),l.renameSync(h,m)}finally{l.rmSync(h,{force:!0})}}}}}buildDescriptor(i,t,s=""){const r=this.normalizeRootDir(i),e=this.resolveServiceCliPath(r);return{schema_version:1,platform:this.platform,service_id:L(r,this.platform),node_path:this.nodePath,cli_path:e,cli_hash:this.computeServiceHash(e)??"",definition_path:s,config_dir:t??"",installed_at:0,updated_at:0}}createStore(i){return new E(B(this.normalizeRootDir(i)))}toAdapterPayload(i,t){return{serviceID:i.service_id,nodePath:i.node_path,cliPath:i.cli_path,configDir:i.config_dir||void 0,rootDir:this.normalizeRootDir(t),environmentPath:this.buildServiceEnvironmentPath()}}async resolveServiceLogPaths(i){const t=this.resolveLocalServiceBaseDir();if(t){const s=a.join(this.platform==="darwin"?a.join(this.homeDir,"Library","Logs","grix-connector"):a.join(t,"logs"),L(this.normalizeRootDir(i),this.platform));return await w(s,{recursive:!0}),{stdoutPath:a.join(s,"daemon.out.log"),stderrPath:a.join(s,"daemon.err.log")}}return await w(a.join(i,"service"),{recursive:!0}),{stdoutPath:H(i),stderrPath:N(i)}}buildServiceEnvironmentPath(){const i=[a.dirname(this.nodePath),"/opt/homebrew/bin","/usr/local/bin","/usr/bin","/bin","/usr/sbin","/sbin"],t=String(D.env.PATH??"").split(a.delimiter).filter(e=>e&&a.isAbsolute(e)).filter(e=>!e.includes("/node_modules/.bin")).filter(e=>!e.includes("/node-gyp-bin")),s=[],r=new Set;for(const e of[...i,...t]){if(r.has(e))continue;if(r.add(e),[...s,e].join(a.delimiter).length>2048)break;s.push(e)}return s.join(a.delimiter)}toStartParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toStopParams(i){return{serviceID:i.service_id,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toRestartParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}toUninstallParams(i){return{serviceID:i.service_id,definitionPath:i.definition_path,uid:this.uid,homeDir:this.homeDir,runCommand:p}}async loadDescriptor(i){const t=this.createStore(i),s=await t.load();if(!s)throw new Error("\u540E\u53F0\u670D\u52A1\u8FD8\u6CA1\u6709\u5B89\u88C5\uFF0C\u8BF7\u5148\u6267\u884C service install\u3002");return{store:t,descriptor:s}}isDescriptorCurrent(i,t){if(t.node_path!==this.nodePath||t.cli_path!==this.resolveServiceCliPath(i)||!t.cli_hash)return!1;const s=this.computeServiceHash(t.cli_path),r=this.computeServiceHash(this.cliPath);return s!==null&&r!==null&&s===t.cli_hash&&r===t.cli_hash}computeFileHash(i){try{const t=l.readFileSync(i);return C("sha256").update(t).digest("hex")}catch{return null}}computeServiceHash(i){if(!this.resolveLocalServiceBaseDir())return this.computeFileHash(i);try{const t=a.dirname(i),s=C("sha256"),r=e=>{const o=l.readdirSync(e,{withFileTypes:!0}).sort((n,c)=>n.name.localeCompare(c.name));for(const n of o){const c=a.join(e,n.name);s.update(a.relative(t,c)),n.isDirectory()?r(c):n.isFile()&&s.update(l.readFileSync(c))}};return r(t),s.digest("hex")}catch{return null}}async refreshDescriptor(i,t){const s=this.normalizeRootDir(i);await w(a.join(s,"service"),{recursive:!0}),this.prepareServiceRuntime(s);const r=this.resolveServiceCliPath(s),e={...t,platform:this.platform,service_id:t.service_id||L(s,this.platform),node_path:this.nodePath,cli_path:r,cli_hash:this.computeServiceHash(r)??"",config_dir:t.config_dir},o=await this.resolveServiceLogPaths(s),n=await this.adapter.install({...this.toAdapterPayload(e,s),stdoutPath:o.stdoutPath,stderrPath:o.stderrPath,homeDir:this.homeDir,uid:this.uid,runCommand:p}),c={...e,installed_at:t.installed_at,definition_path:n?.definitionPath||e.definition_path,updated_at:Date.now()};return await this.createStore(s).save(c),c}async resolveActiveDescriptor(i){const{descriptor:t}=await this.loadDescriptor(i);return this.isDescriptorCurrent(i,t)?t:this.refreshDescriptor(i,t)}async discoverConflictingServices(i){const t=this.normalizeRootDir(i),s=L(t,this.platform);return(await this.adapter.discoverServices({homeDir:this.homeDir,runCommand:p})).filter(e=>e.serviceID!==s)}async cleanupConflictingServices(i){const t=await this.discoverConflictingServices(i);if(t.length>0){const r=t.map(e=>e.serviceID).join(", ");console.log(`\u53D1\u73B0 ${t.length} \u4E2A\u6B8B\u7559\u670D\u52A1\uFF0C\u6B63\u5728\u68C0\u67E5: ${r}`)}let s=0;for(const r of t){if(await this.adapter.isServiceLoaded({serviceID:r.serviceID,uid:this.uid,homeDir:this.homeDir,runCommand:p})){console.log(`\u8DF3\u8FC7\u6B63\u5728\u8FD0\u884C\u7684\u670D\u52A1: ${r.serviceID}`);continue}try{await this.adapter.stop({serviceID:r.serviceID,uid:this.uid,homeDir:this.homeDir,runCommand:p})}catch{}try{await this.adapter.uninstall({serviceID:r.serviceID,definitionPath:r.definitionPath,uid:this.uid,homeDir:this.homeDir,runCommand:p}),s++}catch{}}return s}captureDaemonBaseline(i){return{status:S(i.daemonStatusFile),lock:_(i.daemonLockFile)}}isDaemonReady(i,t,s){const r=S(i.daemonStatusFile),e=_(i.daemonLockFile);if(!r.running||r.state!=="running"||r.pid<=0||!e||e.pid!==r.pid||!x(e.pid)||typeof e.root_dir!="string"||a.resolve(e.root_dir)!==a.resolve(i.rootDir)||typeof e.instance_id!="string"||e.instance_id.length===0||r.instance_id!==e.instance_id)return!1;const o=r.pid!==t.status.pid||r.state!==t.status.state||r.updated_at!==t.status.updated_at||r.instance_id!==t.status.instance_id,n=!t.lock||e.pid!==t.lock.pid||e.acquired_at!==t.lock.acquired_at||e.instance_id!==t.lock.instance_id,c=o&&n,d=t.status.state==="starting"&&t.status.instance_id===e.instance_id&&t.lock?.pid===e.pid&&t.lock.instance_id===e.instance_id&&r.instance_id===e.instance_id&&r.updated_at!==t.status.updated_at,u=t.lock?.pid===e.pid&&t.lock.instance_id===e.instance_id&&t.lock.acquired_at===e.acquired_at&&(t.status.pid!==e.pid||t.status.instance_id!==e.instance_id||t.status.state!=="running")&&r.pid===e.pid&&r.instance_id===e.instance_id&&r.state==="running"&&r.updated_at!==t.status.updated_at;return!F(e)&&!c&&!d&&!u?!1:s?c||d||u:!0}canForceTerminateDaemon(i,t){const s=_(i.daemonLockFile);return t>0&&s!==null&&s.pid===t&&typeof s.root_dir=="string"&&a.resolve(s.root_dir)===a.resolve(i.rootDir)&&F(s)}defaultDaemonStartTimeoutMs(){return this.platform==="darwin"?5e4:2e4}async waitForDaemonStarted(i,t={}){const s=t.timeoutMs??this.defaultDaemonStartTimeoutMs(),r=t.baseline??this.captureDaemonBaseline(i),e=t.requireNewDaemon??!1,o=t.stdoutLogFile??i.stdoutLogFile,n=t.stderrLogFile??i.stderrLogFile,c=t.stdoutLogCursor??v(o),d=t.stderrLogCursor??v(n),u=Date.now();for(;Date.now()-u<s;){if(this.isDaemonReady(i,r,e))return;const f=S(i.daemonStatusFile);if(f.state==="failed"&&(r.status.state!=="failed"||f.pid!==r.status.pid||f.updated_at!==r.status.updated_at||f.instance_id!==r.status.instance_id)){const k=_(i.daemonLockFile),R=["daemon start failed",`status=${JSON.stringify(f)}`,`lock=${k?JSON.stringify(k):"missing"}`,y("stderr",n,d),y("stdout",o,c)].filter(Boolean);throw new Error(R.join(`
|
|
2
|
+
`))}await z(100)}const m=_(i.daemonLockFile),h=S(i.daemonStatusFile),g=[`daemon start timeout (${s}ms)`,`status=${JSON.stringify(h)}`,`lock=${m?JSON.stringify(m):"missing"}`,y("stderr",n,d),y("stdout",o,c)].filter(Boolean);throw new Error(g.join(`
|
|
3
|
+
`))}async install(i){const t=this.normalizeRootDir(i.rootDir);await this.cleanupConflictingServices(t),await w(a.join(t,"service"),{recursive:!0}),this.prepareServiceRuntime(t);const s=P(t),r=this.captureDaemonBaseline(s),e=this.buildDescriptor(t,i.configDir),o=await this.resolveServiceLogPaths(t),n=v(o.stdoutPath),c=v(o.stderrPath),d=await this.adapter.isServiceLoaded({serviceID:e.service_id,uid:this.uid,homeDir:this.homeDir,runCommand:p}),u=await this.adapter.install({...this.toAdapterPayload(e,t),stdoutPath:o.stdoutPath,stderrPath:o.stderrPath,homeDir:this.homeDir,uid:this.uid,runCommand:p}),m={...e,definition_path:u?.definitionPath??"",installed_at:Date.now(),updated_at:Date.now()};return await this.createStore(t).save(m),d?await this.adapter.restart(this.toRestartParams(m)):await this.adapter.start(this.toStartParams(m)),await this.waitForDaemonStarted(s,{baseline:r,requireNewDaemon:!0,stdoutLogFile:o.stdoutPath,stderrLogFile:o.stderrPath,stdoutLogCursor:n,stderrLogCursor:c}),this.status({rootDir:t})}async start(i){const t=this.normalizeRootDir(i.rootDir);await this.cleanupConflictingServices(t);const s=P(t),r=this.captureDaemonBaseline(s),e=r.status,o=v(s.stdoutLogFile),n=v(s.stderrLogFile),d=await this.createStore(t).load();if(e.running&&d&&this.isDescriptorCurrent(t,d)){if(e.state==="starting"){const h=r.lock;if(h!==null&&h.pid===e.pid&&typeof h.root_dir=="string"&&a.resolve(h.root_dir)===a.resolve(s.rootDir)&&typeof h.instance_id=="string"&&h.instance_id.length>0&&e.instance_id===h.instance_id&&F(h)){const f=await this.resolveServiceLogPaths(t);return await this.waitForDaemonStarted(s,{baseline:r,stdoutLogFile:f.stdoutPath,stderrLogFile:f.stderrPath,stdoutLogCursor:o,stderrLogCursor:n}),this.status({rootDir:t})}}if(this.isDaemonReady(s,r,!1))return this.status({rootDir:t})}const u=d?this.isDescriptorCurrent(t,d)&&e.running?d:await this.refreshDescriptor(t,d):await this.resolveActiveDescriptor(t),m=await this.resolveServiceLogPaths(t);try{e.running?await this.adapter.restart(this.toRestartParams(u)):await this.adapter.start(this.toStartParams(u))}catch(h){if(h instanceof Error&&h.message.includes("plist missing"))await this.adapter.install({...this.toAdapterPayload(u,t),stdoutPath:m.stdoutPath,stderrPath:m.stderrPath,homeDir:this.homeDir,uid:this.uid,runCommand:p}),await this.adapter.start(this.toStartParams(u));else throw h}return await this.waitForDaemonStarted(s,{baseline:r,requireNewDaemon:!0,stdoutLogFile:m.stdoutPath,stderrLogFile:m.stderrPath,stdoutLogCursor:o,stderrLogCursor:n}),this.status({rootDir:t})}async stop(i){const t=this.normalizeRootDir(i.rootDir),{descriptor:s}=await this.loadDescriptor(t),r=P(t),e=S(r.daemonStatusFile);return await this.adapter.stop(this.toStopParams(s)),e.running&&e.pid&&(await this.waitForExit(e.pid,{timeoutMs:5e3})||this.canForceTerminateDaemon(r,e.pid)&&(await this.terminateTree(e.pid,{platform:this.platform,runCommandImpl:p}),await this.waitForExit(e.pid,{timeoutMs:5e3}))),this.status({rootDir:t})}async restart(i){const t=this.normalizeRootDir(i.rootDir);await this.cleanupConflictingServices(t);const s=await this.resolveActiveDescriptor(t),r=P(t),e=this.captureDaemonBaseline(r),o=await this.resolveServiceLogPaths(t),n=v(o.stdoutPath),c=v(o.stderrPath);try{await this.adapter.restart(this.toRestartParams(s))}catch(d){if(d instanceof Error&&d.message.includes("plist missing"))await this.adapter.install({...this.toAdapterPayload(s,t),stdoutPath:o.stdoutPath,stderrPath:o.stderrPath,homeDir:this.homeDir,uid:this.uid,runCommand:p}),await this.adapter.start(this.toStartParams(s));else throw d}return await this.waitForDaemonStarted(r,{baseline:e,requireNewDaemon:!0,stdoutLogFile:o.stdoutPath,stderrLogFile:o.stderrPath,stdoutLogCursor:n,stderrLogCursor:c}),this.status({rootDir:t})}async uninstall(i){const t=this.normalizeRootDir(i.rootDir),s=this.createStore(t),r=await s.load();return r&&(await this.adapter.uninstall(this.toUninstallParams(r)),await s.clear()),this.status({rootDir:t})}async status(i){const t=this.normalizeRootDir(i.rootDir),r=await this.createStore(t).load(),e=P(t),o=S(e.daemonStatusFile);return r?{installed:!0,install_state:this.isDescriptorCurrent(t,r)?"current":"stale",service_kind:this.adapter.kind,service_id:r.service_id,definition_path:r.definition_path,root_dir:t,daemon_state:o.state,pid:o.pid,connection_state:o.connection_state,updated_at:o.updated_at,reason:o.reason}:{installed:!1,install_state:"missing",service_kind:this.adapter.kind,root_dir:t,daemon_state:o.state,pid:o.pid,reason:o.reason}}}export{rt as ServiceManager};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "grix-connector",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"description": "Connect local AI coding agents (Claude, Codex, Gemini, Qwen, DeepSeek, Cursor, OpenCode, Pi, OpenHuman, Reasonix) to the Grix scheduling platform. Also serves as an OpenClaw plugin for Grix channel transport.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|