@qqbrowser/qbot-claw-launcher 0.9.68 → 0.9.70
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/installer.js +6 -6
- package/dist/service.js +5 -5
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/dist/installer.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
"use strict";var
|
|
2
|
-
`)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.isInstalling=!1,exports.PYTHON_DIR=u.default.join(
|
|
3
|
-
`);c.default.writeFileSync(t,n,"utf-8"),(0,
|
|
1
|
+
"use strict";var P=exports&&exports.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PYTHON_DIR=exports.isInstalling=exports.installState=void 0,exports.runQBotClaw=E,exports.configAndRunQBotClaw=N,exports.runInstall=S;const c=P(require("fs")),u=P(require("path")),_=require("child_process"),s=require("./config"),f=require("./utils"),p=require("./state"),d=require("./quarantine"),a=require("./reportLog"),w=require("./service"),O=require("./openai-proxy");function g(t,n,r,o){if(t&&t.writable){const i=n>0?Math.round(r/n*1e4)/100:0;try{t.write(JSON.stringify({status:"downloading",progress:i,totalSteps:n,currentStep:r,message:o})+`
|
|
2
|
+
`)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.isInstalling=!1,exports.PYTHON_DIR=u.default.join(s.QBOT_CLAW_DIR,"python");function E(t,n){return new Promise(r=>{const o=(0,p.readState)(),i=(0,_.spawn)(s.QBOTCLAW_BIN,t,{stdio:["ignore","pipe","pipe"],env:{PATH:s.NODE_BIN_DIR,HOME:process.env.HOME,OPENCLAW_TELEMETRY_GALIELO_GUID:process.env.QB_GUID||"",OPENCLAW_TELEMETRY_GALIELO_QIEMI36:process.env.QB_QIMEI36||"",QBOTCLAW_LLM_BASE_URL:`http://127.0.0.1:${o.port}/v1`,QBOTCLAW_LLM_API_KEY:O.proxyApiKey}});(0,a.log)(`[QBotClaw] \u6267\u884C: QBotClaw ${t.join(" ")}`),i.stdout.on("data",e=>{const l=e.toString();if(n&&n.writable)try{n.write(l)}catch{}}),i.stderr.on("data",e=>{const l=e.toString();if(n&&n.writable)try{n.write(l)}catch{}}),i.on("close",e=>{(0,a.log)(`[QBotClaw] \u6267\u884C\u5B8C\u6210\uFF0C\u9000\u51FA\u7801: ${e}`),r()}),i.on("error",e=>{(0,a.log)(`[QBotClaw] \u542F\u52A8\u5931\u8D25: ${e.message}`),r()})})}function y(){c.default.existsSync(s.QBOT_CLAW_DIR)||c.default.mkdirSync(s.QBOT_CLAW_DIR,{recursive:!0})}function I(){const t=u.default.join(exports.PYTHON_DIR,"pip.conf");if(c.default.existsSync(t)){(0,a.log)("pip.conf \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7");return}const n=["[global]","index-url = https://mirrors.tencent.com/pypi/simple/",`cache-dir = ${u.default.join(exports.PYTHON_DIR,".pip-cache")}`,"","[install]",`prefix = ${exports.PYTHON_DIR}`,""].join(`
|
|
3
|
+
`);c.default.writeFileSync(t,n,"utf-8"),(0,a.log)(`\u5DF2\u5199\u5165 pip.conf: ${t}`)}async function T(t){if(c.default.existsSync(s.MCPORTER_BIN)){(0,a.log)("mcporter \u5DF2\u5B89\u88C5\uFF0C\u8DF3\u8FC7");return}(0,a.log)("\u5F00\u59CB\u5B89\u88C5 mcporter..."),await new Promise((n,r)=>{const o=(0,_.spawn)(s.NPM_BIN,["--userconfig",s.NPM_RC,"install","-g","mcporter"],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(s.NPM_BIN)}:${process.env.PATH}`}});o.stdout.on("data",i=>{const e=`[mcporter] ${i.toString().trim()}`;(0,a.log)(e),g(t,0,0,e)}),o.stderr.on("data",i=>{const e=`[mcporter] ${i.toString().trim()}`;(0,a.log)(e),g(t,0,0,e)}),o.on("close",i=>{i===0?((0,a.log)("mcporter \u5B89\u88C5\u6210\u529F"),n()):r(new Error(`mcporter \u5B89\u88C5\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${i}`))}),o.on("error",r)})}function C(t,n){return new Promise((r,o)=>{const i=(0,_.spawn)(s.NPM_BIN,["--userconfig",s.NPM_RC,...t],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(s.NPM_BIN)}:${process.env.PATH}`}});i.stdout.on("data",e=>{const l=`[npm] ${e.toString().trim()}`;(0,a.log)(l)}),i.stderr.on("data",e=>{const l=`[npm] ${e.toString().trim()}`;(0,a.log)(l)}),i.on("close",e=>{e===0?((0,a.log)(`${n} \u6210\u529F`),r()):o(new Error(`${n} \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}`))}),i.on("error",o)})}async function m(t){const n=`${s.NPM_PACKAGE_NAME}@${t}`;(0,a.log)(`\u5F00\u59CB\u5B89\u88C5 ${n}\uFF08--ignore-scripts\uFF0C\u4EC5\u4E0B\u8F7D\u89E3\u538B\uFF09...`),await C(["install","-g","--ignore-scripts",n],`${n} \u4E0B\u8F7D\u89E3\u538B`)}async function $(t){const n=`${s.NPM_PACKAGE_NAME}@${t}`;(0,a.log)("\u5F00\u59CB npm rebuild\uFF08\u6267\u884C postinstall \u811A\u672C\uFF09..."),await C(["rebuild","-g",s.NPM_PACKAGE_NAME],`${n} rebuild`),(0,a.log)(`${n} \u5B89\u88C5\u6210\u529F`)}async function L(t,n,r,o){try{const l=await(0,f.execCommand)(`"${s.NODE_BIN}" "${s.QBOTCLAW_BIN}" config validate --json`);(0,a.log)(`[config validate] \u8F93\u51FA: ${l}`);const A=JSON.parse(l);A.valid!==!0?((0,a.log)(`[config validate] \u914D\u7F6E\u6821\u9A8C\u672A\u901A\u8FC7\uFF08valid=${A.valid}\uFF09\uFF0C\u5F3A\u5236\u8986\u76D6\u914D\u7F6E`),o=!0):(0,a.log)("[config validate] \u914D\u7F6E\u6821\u9A8C\u901A\u8FC7")}catch(l){(0,a.log)(`[config validate] \u6267\u884C\u5931\u8D25: ${l.message}\uFF0C\u5F3A\u5236\u8986\u76D6\u914D\u7F6E`),o=!0}let i;if((0,a.log)(`\u8986\u76D6\u7528\u6237\u5DF2\u6709\u914D\u7F6E: ${o}`),!o&&c.default.existsSync(s.QBOT_CLAW_CONFIG_PATH))i=s.QBOT_CLAW_CONFIG_PATH,(0,a.log)(`\u4F7F\u7528\u5DF2\u6709\u914D\u7F6E\u6587\u4EF6: ${i}`);else{const l=u.default.join(s.NPM_GLOBAL_MODULES,s.NPM_PACKAGE_NAME,"preset-config.json");if(!c.default.existsSync(l)){(0,a.log)(`npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165: ${l}`);return}i=l,(0,a.log)(`\u4F7F\u7528 npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E: ${i}`)}let e;try{e=JSON.parse(c.default.readFileSync(i,"utf-8")),(0,a.log)(`\u5DF2\u8BFB\u53D6\u914D\u7F6E: ${i}`)}catch(l){(0,a.log)(`\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25: ${i}\uFF0C${l.message}\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165`);return}t!==void 0&&(e.gateway={...e.gateway??{},port:t},(0,a.log)(`\u5DF2\u5C06 gateway.port=${t} \u5199\u5165\u914D\u7F6E`)),e.plugins=e.plugins??{},e.plugins.entries=e.plugins.entries??{},e.plugins.entries["x5use-browser-control"]=e.plugins.entries["x5use-browser-control"]??{},e.plugins.entries["x5use-browser-control"].config={...e.plugins.entries["x5use-browser-control"].config??{},wsPort:r,httpPort:n},(0,a.log)(`\u5DF2\u5C06 x5use-browser-control wsPort=${r}, httpPort=${n} \u5199\u5165\u914D\u7F6E`),c.default.writeFileSync(s.QBOT_CLAW_CONFIG_PATH,JSON.stringify(e,null,2),"utf-8"),(0,a.log)(`\u914D\u7F6E\u6587\u4EF6\u5DF2\u5199\u5165: ${s.QBOT_CLAW_CONFIG_PATH}`)}function B(t){const n=u.default.join(s.QBOT_CLAW_DIR,".env"),r=`OPENCLAW_GATEWAY_TOKEN=${t}
|
|
4
4
|
`;try{if(c.default.existsSync(n)){const e=c.default.readFileSync(n,"utf-8").split(`
|
|
5
5
|
`).filter(l=>!l.startsWith("OPENCLAW_GATEWAY_TOKEN=")).filter(l=>l!=="").join(`
|
|
6
6
|
`)+`
|
|
7
|
-
`+
|
|
8
|
-
`)}catch{}return}exports.isInstalling=!0,exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,
|
|
9
|
-
`)}catch{}}catch(
|
|
7
|
+
`+r;c.default.writeFileSync(n,e,"utf-8")}else c.default.writeFileSync(n,r,"utf-8");(0,a.log)(`\u5DF2\u5C06 OPENCLAW_GATEWAY_TOKEN \u5199\u5165 ${n}`)}catch(o){(0,a.log)(`\u5199\u5165 .env \u6587\u4EF6\u5931\u8D25: ${o.message}`)}}async function N(t){const n=(0,p.readState)();let r;n.gatewayPort&&!await(0,p.isPortAvailable)(n.gatewayPort)?(r=n.gatewayPort,(0,a.log)(`\u68C0\u6D4B\u5230 QBotClaw gateway \u5DF2\u5728\u7AEF\u53E3 ${r} \u8FD0\u884C\uFF0C\u590D\u7528\u539F\u7AEF\u53E3`)):r=await(0,f.findAvailablePort)(),(0,a.log)(`\u540E\u53F0\u542F\u52A8 QBotClaw gateway run --port ${r} --force`);const o=await(0,f.findAvailablePort)(s.DEFAULT_MCP_HTTP_PORT),i=await(0,f.findAvailablePort)();await L(r,o,i,t),B((0,w.getOrCreateGatewayToken)());const e=(0,_.spawn)(s.QBOTCLAW_BIN,["gateway","run","--port",String(r),"--force"],{stdio:"ignore",env:{PATH:s.NODE_BIN_DIR,HOME:process.env.HOME,OPENCLAW_NO_RESPAWN:"true",VENUS_API_KEY:"E9isWWfAr4VIFuIa5RbJaPxD@2040",OPENCLAW_TELEMETRY_GALIELO_GUID:process.env.QB_GUID||"",OPENCLAW_TELEMETRY_GALIELO_QIEMI36:process.env.QB_QIMEI36||"",OPENCLAW_GATEWAY_TOKEN:(0,w.getOrCreateGatewayToken)(),QBOTCLAW_LLM_BASE_URL:`http://127.0.0.1:${n.port}/v1`,QBOTCLAW_LLM_API_KEY:O.proxyApiKey}});e.unref();const l=e.pid;(0,a.log)(`QBotClaw gateway \u5DF2\u5728\u540E\u53F0\u542F\u52A8\uFF0CPID: ${l}\uFF0C\u7AEF\u53E3: ${r}, token ${(0,w.getOrCreateGatewayToken)()}`),(0,p.writeState)({...(0,p.readState)(),gatewayPid:l,gatewayPort:r,mcpHttpPort:o,mcpWsPort:i})}function S(t,n,r){if(exports.isInstalling){if((0,a.log)("[runInstall] \u5B89\u88C5\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u62D2\u7EDD\u91CD\u590D\u6267\u884C"),t&&t.writable)try{t.end(JSON.stringify({status:"failed",progress:0,message:"\u5B89\u88C5\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u8BF7\u52FF\u91CD\u590D\u64CD\u4F5C"})+`
|
|
8
|
+
`)}catch{}return}exports.isInstalling=!0,exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,a.log)(`\u5F00\u59CB\u5B89\u88C5 ${s.NPM_PACKAGE_NAME}@${n}`),(async()=>{try{(0,p.stopGateway)(),y(),I();const o=5;let i=0;g(t,o,i,"\u5F00\u59CB\u5B89\u88C5 mcporter..."),await T(t),i++,g(t,o,i,"\u5F00\u59CB\u4E0B\u8F7D\u89E3\u538B QBotClaw..."),await m(n),i++,g(t,o,i,"npmDownloadQBotClaw \u5B8C\u6210"),await(0,d.fullScanClearQuarantine)("npm install --ignore-scripts \u5B8C\u6210\u540E\uFF0Crebuild \u524D"),i++,await(0,d.watchWorkspaceQuarantine)().catch(e=>{(0,a.log)(`[quarantine] watchWorkspaceQuarantine \u542F\u52A8\u5F02\u5E38: ${e.message}`)}),g(t,o,i,"\u5F00\u59CB npm rebuild..."),await $(n),i++,g(t,o,i,"npmRebuildQBotClaw \u5B8C\u6210");try{c.default.existsSync(s.OPENCLAW_BIN)||(c.default.symlinkSync(s.QBOTCLAW_BIN,s.OPENCLAW_BIN),(0,a.log)(`\u5DF2\u521B\u5EFA\u8F6F\u94FE\u63A5: ${s.OPENCLAW_BIN} -> ${s.QBOTCLAW_BIN}`))}catch(e){(0,a.log)(`\u521B\u5EFA openclaw \u8F6F\u94FE\u63A5\u5931\u8D25: ${e.message}`)}if(await(0,d.stopWatchWorkspaceQuarantine)().catch(e=>{(0,a.log)(`[quarantine] stopWatchWorkspaceQuarantine \u5F02\u5E38: ${e.message}`)}),exports.installState={status:"success",message:"\u5B89\u88C5\u6210\u529F",endTime:new Date().toISOString()},(0,a.log)("\u5B89\u88C5\u6210\u529F"),(0,a.refreshClawVersion)(n),g(t,o,i,"\u5F00\u59CB\u914D\u7F6E\u5E76\u542F\u52A8 QBotClaw gateway..."),await N(r),i++,t.writable)try{const e=(0,w.getOrCreateGatewayToken)();t.end(JSON.stringify({status:"done",progress:100,message:"\u5B89\u88C5\u6210\u529F",gatewayToken:e})+`
|
|
9
|
+
`)}catch{}}catch(o){if(await(0,d.stopWatchWorkspaceQuarantine)().catch(()=>{}),exports.installState={status:"failed",message:o.message,endTime:new Date().toISOString()},(0,a.log)(`\u5B89\u88C5\u5931\u8D25: ${o.message}`),t&&t.writable)try{t.end(JSON.stringify({status:"failed",progress:0,message:o.message})+`
|
|
10
10
|
`)}catch{}}finally{exports.isInstalling=!1}})()}
|
package/dist/service.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
"use strict";var
|
|
2
|
-
`),process.stdout.uncork(),(0,
|
|
3
|
-
`),process.stdout.uncork(),(0,
|
|
4
|
-
`),process.stdout.uncork();return}try{process.kill(t.pid,"SIGTERM");const
|
|
5
|
-
`),process.stdout.uncork()}catch(
|
|
1
|
+
"use strict";var w=exports&&exports.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.getOrCreateGatewayToken=f,exports.startService=R,exports.stopService=N;const S=w(require("fs")),y=require("crypto"),d=require("./server"),e=require("./state"),v=require("./config"),n=require("./version"),_=require("./installer"),k=require("./utils"),r=require("./reportLog");let l,c;function f(){return c||(c=require("crypto").randomBytes(24).toString("hex"),c||"0526bec85002fe65ef10d33df0a8dfbe76917cd125f5a4ad")}async function q(){const t=(0,e.readState)();if(!t.pid||!t.port)return null;try{process.kill(t.pid,0)}catch{return(0,e.clearState)(),null}if(await(0,e.isPortAvailable)(t.port))return(0,r.log)("\u7AEF\u53E3\u672A\u88AB\u5360\u7528\uFF0C\u8BF4\u660E\u72B6\u6001\u6587\u4EF6\u8FC7\u671F"),(0,e.clearState)(),null;const o=t.launcherVersion??null;if((0,r.log)(`[service] \u68C0\u6D4B\u5230\u6B63\u5728\u8FD0\u884C\u7684\u670D\u52A1\u7248\u672C: ${o??"unknown"}\uFF0C\u5F53\u524D\u7248\u672C: ${n.LAUNCHER_VERSION}`),o===n.LAUNCHER_VERSION)return(0,r.log)(`[service] \u7248\u672C\u4E00\u81F4\uFF0C\u590D\u7528\u5DF2\u6709\u670D\u52A1 (pid: ${t.pid}, port: ${t.port})`),!1;(0,r.log)(`[service] \u7248\u672C\u4E0D\u4E00\u81F4 (\u8FD0\u884C\u4E2D: ${o??"unknown"}, \u5F53\u524D: ${n.LAUNCHER_VERSION})\uFF0C\u6740\u6389\u65E7\u8FDB\u7A0B pid: ${t.pid}\uFF0C\u91CD\u65B0\u542F\u52A8`);try{process.kill(t.pid,"SIGTERM")}catch{}return(0,e.clearState)(),!0}async function R(t,s){if(await q()===!1){const a=(0,e.readState)();process.stdout.write(JSON.stringify({state:"success",pid:a.pid,port:a.port})+`
|
|
2
|
+
`),process.stdout.uncork(),(0,r.log)(`[service] \u7248\u672C\u4E00\u81F4\uFF0C\u590D\u7528\u5DF2\u6709\u670D\u52A1 (pid: ${a.pid}, port: ${a.port})`);return}const u=await(0,e.findAvailablePort)();d.server.listen(u,"127.0.0.1",()=>{l=(0,y.randomUUID)();const a=f();if((0,e.writeState)({pid:process.pid,port:u,token:l,launcherVersion:n.LAUNCHER_VERSION,...t?{ppid:t}:{}}),process.stdout.write(JSON.stringify({state:"success",pid:process.pid,port:u,token:l,gatewayToken:a})+`
|
|
3
|
+
`),process.stdout.uncork(),(0,d.watchParentProcess)(t),!S.default.existsSync(v.QBOTCLAW_BIN)){(0,r.log)("[service] qbotclaw \u672A\u5B89\u88C5\uFF0C\u4E0D\u81EA\u52A8\u542F\u52A8");return}(0,k.getQBotClawVersion)().then(p=>{const i=(0,e.readState)();if(p!==s){(0,r.log)(`[service] qbotclaw \u672C\u5730\u7248\u672C (${p??"unknown"}) \u4E0E\u671F\u671B\u7248\u672C (${s}) \u4E0D\u4E00\u81F4\uFF0C\u505C\u6B62\u5F53\u524D qbotclaw \u8FDB\u7A0B`),(0,e.stopGateway)();return}else i.gatewayPid&&i.gatewayPort?(0,r.log)(`[service] qbotclaw \u5DF2\u5728\u8FD0\u884C\uFF0Cpid: ${i.gatewayPid}, port: ${i.gatewayPort}`):((0,r.log)("[service] \u68C0\u6D4B\u5230 qbotclaw\uFF0C\u7248\u672C\u5339\u914D\uFF0C\u81EA\u52A8\u542F\u52A8 gateway..."),(0,_.configAndRunQBotClaw)().catch(g=>{(0,r.log)(`[service] \u81EA\u52A8\u542F\u52A8 gateway \u5931\u8D25: ${g.message}`)}))})}),process.on("SIGTERM",()=>{(0,e.stopGateway)(),(0,e.clearState)(),(0,r.flushLogs)().finally(()=>{process.exit(0)})})}function N(){const t=(0,e.readState)();if(!t.pid){process.stdout.write(JSON.stringify({state:"err",pid:0,port:0})+`
|
|
4
|
+
`),process.stdout.uncork();return}try{process.kill(t.pid,"SIGTERM");const s=t.pid,o=t.port??0;(0,e.clearState)(),process.stdout.write(JSON.stringify({state:"success",pid:s,port:o})+`
|
|
5
|
+
`),process.stdout.uncork()}catch(s){s.code==="ESRCH"&&(0,e.clearState)(),process.stdout.write(JSON.stringify({state:"err",pid:0,port:0})+`
|
|
6
6
|
`),process.stdout.uncork()}}
|
package/dist/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LAUNCHER_VERSION=void 0,exports.LAUNCHER_VERSION="0.9.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LAUNCHER_VERSION=void 0,exports.LAUNCHER_VERSION="0.9.70";
|