@qqbrowser/qbot-claw-launcher 0.9.86 → 0.9.88
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/build.js +1 -1
- package/dist/config.js +1 -1
- package/dist/installer.js +9 -8
- package/dist/qqbrowser-skill-installer.js +2 -0
- package/dist/report.js +1 -0
- package/dist/service.js +5 -5
- package/package.json +1 -1
package/dist/build.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.IS_DEBUG_BUILD=exports.LAUNCHER_VERSION=void 0,exports.LAUNCHER_VERSION="0.9.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.IS_DEBUG_BUILD=exports.LAUNCHER_VERSION=void 0,exports.LAUNCHER_VERSION="0.9.88",exports.IS_DEBUG_BUILD=!1;
|
package/dist/config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";var
|
|
1
|
+
"use strict";var o=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.NPM_REGISTRIES=exports.DEFAULT_MCP_HTTP_PORT=exports.SESSIONS_FILE=exports.STATE_FILE=exports.PYTHON_DIR=exports.MCPORTER_BIN=exports.OPENCLAW_BIN=exports.QBOTCLAW_BIN=exports.GALILEO_CONFIG_PATH=exports.NPM_GLOBAL_MODULES=exports.NPM_PACKAGE_NAME=exports.QBOT_CLAW_CONFIG_PATH=exports.NODE_BIN_DIR=exports.NPM_RC=exports.NPM_BIN=exports.PYTHON_BIN=exports.NODE_BIN=exports.QBOT_CLAW_DIR=void 0;const _=o(require("path")),n=o(require("os"));exports.QBOT_CLAW_DIR=_.default.join(n.default.homedir(),".qbotclaw"),exports.NODE_BIN=_.default.join(exports.QBOT_CLAW_DIR,"node","bin","node"),exports.PYTHON_BIN=_.default.join(exports.QBOT_CLAW_DIR,"python","bin","python3"),exports.NPM_BIN=_.default.join(exports.QBOT_CLAW_DIR,"node","bin","npm"),exports.NPM_RC=_.default.join(exports.QBOT_CLAW_DIR,"node",".npmrc"),exports.NODE_BIN_DIR=_.default.dirname(exports.NODE_BIN),exports.QBOT_CLAW_CONFIG_PATH=_.default.join(exports.QBOT_CLAW_DIR,".openclaw-qbot.json"),exports.NPM_PACKAGE_NAME="@qqbrowser/openclaw-qbot",exports.NPM_GLOBAL_MODULES=_.default.join(exports.QBOT_CLAW_DIR,"node","lib","node_modules"),exports.GALILEO_CONFIG_PATH=_.default.join(exports.NPM_GLOBAL_MODULES,"@qqbrowser/openclaw-qbot","extensions","openclaw-telemetry-galileo-embedded","galileo.config.json"),exports.QBOTCLAW_BIN=_.default.join(exports.QBOT_CLAW_DIR,"node","bin","qb-qbot-claw"),exports.OPENCLAW_BIN=_.default.join(exports.QBOT_CLAW_DIR,"node","bin","openclaw"),exports.MCPORTER_BIN=_.default.join(exports.QBOT_CLAW_DIR,"node","bin","mcporter"),exports.PYTHON_DIR=_.default.join(exports.QBOT_CLAW_DIR,"python"),exports.STATE_FILE=_.default.join(exports.QBOT_CLAW_DIR,"launcher.json"),exports.SESSIONS_FILE=_.default.join(exports.QBOT_CLAW_DIR,"agents","main","sessions","sessions.json"),exports.DEFAULT_MCP_HTTP_PORT=38789,exports.NPM_REGISTRIES=["https://mirrors.cloud.tencent.com/npm/","https://repo.huaweicloud.com/repository/npm/","https://registry.npmjs.org/"];
|
package/dist/installer.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
"use strict";var O=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=
|
|
2
|
-
`)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.isInstalling=!1
|
|
3
|
-
`);
|
|
4
|
-
`;try{
|
|
5
|
-
|
|
1
|
+
"use strict";var O=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=T,exports.configAndRunQBotClaw=C,exports.runInstall=b;const g=O(require("fs")),u=O(require("path")),A=require("child_process"),s=require("./config"),w=require("./utils"),d=require("./state"),m=require("./quarantine"),n=require("./reportLog"),E=require("./service"),S=require("./openai-proxy"),f=require("./report"),L=require("./qqbrowser-skill-installer");let I="qqbrowser-skill-control";function _(t,o,i,l){if(t&&t.writable){const a=o>0?Math.round(i/o*1e4)/100:0;try{t.write(JSON.stringify({status:"downloading",progress:a,totalSteps:o,currentStep:i,message:l})+`
|
|
2
|
+
`)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.isInstalling=!1;const y=require("./config");Object.defineProperty(exports,"PYTHON_DIR",{enumerable:!0,get:function(){return y.PYTHON_DIR}});function T(t,o){return(0,n.log)(`[QBotClaw] \u6267\u884C: QBotClaw ${t.join(" ")}`),new Promise(i=>{const l=(0,d.readState)(),a=(0,A.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:${l.port}/v1`,QBOTCLAW_LLM_API_KEY:S.proxyApiKey}});(0,n.log)(`[QBotClaw] \u6267\u884C: QBotClaw ${t.join(" ")}`),a.stdout.on("data",e=>{const r=e.toString();if(o&&o.writable)try{o.write(r)}catch{}}),a.stderr.on("data",e=>{const r=e.toString();if(o&&o.writable)try{o.write(r)}catch{}}),a.on("close",e=>{(0,n.log)(`[QBotClaw] \u6267\u884C\u5B8C\u6210\uFF0C\u9000\u51FA\u7801: ${e}`),i()}),a.on("error",e=>{(0,n.log)(`[QBotClaw] \u542F\u52A8\u5931\u8D25: ${e.message}`),i()})})}function B(){g.default.existsSync(s.QBOT_CLAW_DIR)||g.default.mkdirSync(s.QBOT_CLAW_DIR,{recursive:!0})}function Q(){const t=u.default.join(y.PYTHON_DIR,"pip.conf");if(g.default.existsSync(t)){(0,n.log)("pip.conf \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7");return}const o=["[global]","index-url = https://mirrors.tencent.com/pypi/simple/",`cache-dir = ${u.default.join(y.PYTHON_DIR,".pip-cache")}`,"","[install]",`prefix = ${y.PYTHON_DIR}`,""].join(`
|
|
3
|
+
`);g.default.writeFileSync(t,o,"utf-8"),(0,n.log)(`\u5DF2\u5199\u5165 pip.conf: ${t}`)}async function h(t){if(g.default.existsSync(s.MCPORTER_BIN)){(0,n.log)("mcporter \u5DF2\u5B89\u88C5\uFF0C\u8DF3\u8FC7");return}const o=Date.now();(0,n.log)("\u5F00\u59CB\u5B89\u88C5 mcporter...");try{await new Promise((i,l)=>{const a=(0,A.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}`}});a.stdout.on("data",e=>{const r=`[mcporter] ${e.toString().trim()}`;(0,n.log)(r),_(t,0,0,r)}),a.stderr.on("data",e=>{const r=`[mcporter] ${e.toString().trim()}`;(0,n.log)(r),_(t,0,0,r)}),a.on("close",e=>{e===0?((0,n.log)("mcporter \u5B89\u88C5\u6210\u529F"),i()):l(new Error(`mcporter \u5B89\u88C5\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}`))}),a.on("error",l)}),(0,f.report)({event_name:"qbot_claw_mcporter_install",result:"1",cost_ms:String(Date.now()-o)})}catch(i){throw(0,f.report)({event_name:"qbot_claw_mcporter_install",result:"0",cost_ms:String(Date.now()-o),error:i.message}),i}}function $(t,o){return new Promise((i,l)=>{const a=(0,A.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}`}});a.stdout.on("data",e=>{const r=`[npm] ${e.toString().trim()}`;(0,n.log)(r)}),a.stderr.on("data",e=>{const r=`[npm] ${e.toString().trim()}`;(0,n.log)(r)}),a.on("close",e=>{e===0?((0,n.log)(`${o} \u6210\u529F`),i()):l(new Error(`${o} \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}`))}),a.on("error",l)})}function M(){const t=u.default.join(s.QBOT_CLAW_DIR,"node",".npm-cache","_logs");try{if(!g.default.existsSync(t)){(0,n.log)(`[dumpNpmLogs] npm \u65E5\u5FD7\u76EE\u5F55\u4E0D\u5B58\u5728: ${t}`);return}const o=g.default.readdirSync(t).filter(i=>g.default.statSync(u.default.join(t,i)).isFile()).sort((i,l)=>{const a=g.default.statSync(u.default.join(t,i));return g.default.statSync(u.default.join(t,l)).mtimeMs-a.mtimeMs}).slice(0,3);if(o.length===0){(0,n.log)(`[dumpNpmLogs] npm \u65E5\u5FD7\u76EE\u5F55\u4E3A\u7A7A: ${t}`);return}(0,n.log)(`[dumpNpmLogs] \u8BFB\u53D6\u6700\u65B0\u7684 ${o.length} \u4E2A npm \u65E5\u5FD7\u6587\u4EF6:`);for(const i of o){const l=u.default.join(t,i);try{const a=g.default.readFileSync(l,"utf-8");(0,n.log)(`[npm-log] ===== ${i} =====
|
|
4
|
+
${a}`)}catch(a){(0,n.log)(`[npm-log] \u8BFB\u53D6\u65E5\u5FD7\u6587\u4EF6\u5931\u8D25 ${i}: ${a.message}`)}}}catch(o){(0,n.log)(`[dumpNpmLogs] \u8BFB\u53D6 npm \u65E5\u5FD7\u76EE\u5F55\u5931\u8D25: ${o.message}`)}}async function D(t){const o=`${s.NPM_PACKAGE_NAME}@${t}`,i=`${o} \u4E0B\u8F7D\u89E3\u538B`;(0,n.log)(`\u5F00\u59CB\u5B89\u88C5 ${o}\uFF08--ignore-scripts\uFF0C\u4EC5\u4E0B\u8F7D\u89E3\u538B\uFF09...`);let l;for(let a=0;a<s.NPM_REGISTRIES.length;a++){const e=s.NPM_REGISTRIES[a];try{(0,n.log)(`[${i}] \u5C1D\u8BD5\u4F7F\u7528\u6E90 (${a+1}/${s.NPM_REGISTRIES.length}): ${e}`),await $(["install","-g","--ignore-scripts","--registry",e,o],i);return}catch(r){l=r,(0,n.log)(`[${i}] \u6E90 ${e} \u5931\u8D25: ${r.message}`),a<s.NPM_REGISTRIES.length-1&&(0,n.log)(`[${i}] \u5C06\u5C1D\u8BD5\u4E0B\u4E00\u4E2A\u6E90...`)}}throw(0,n.log)(`\u5B89\u88C5 ${o} \u6240\u6709\u6E90\u5747\u5931\u8D25`),M(),l}async function W(t){const o=`${s.NPM_PACKAGE_NAME}@${t}`;(0,n.log)("\u5F00\u59CB npm rebuild\uFF08\u6267\u884C postinstall \u811A\u672C\uFF09..."),await $(["rebuild","-g",s.NPM_PACKAGE_NAME],`${o} rebuild`),(0,n.log)(`${o} \u5B89\u88C5\u6210\u529F`)}async function v(t,o,i,l,a){try{const c=await(0,w.execCommand)(`"${s.NODE_BIN}" "${s.QBOTCLAW_BIN}" config validate --json`);(0,n.log)(`[config validate] \u8F93\u51FA: ${c}`);const p=JSON.parse(c);p.valid!==!0?((0,n.log)(`[config validate] \u914D\u7F6E\u6821\u9A8C\u672A\u901A\u8FC7\uFF08valid=${p.valid}\uFF09\uFF0C\u5F3A\u5236\u8986\u76D6\u914D\u7F6E`),a=!0):(0,n.log)("[config validate] \u914D\u7F6E\u6821\u9A8C\u901A\u8FC7")}catch(c){(0,n.log)(`[config validate] \u6267\u884C\u5931\u8D25: ${c.message}\uFF0C\u5F3A\u5236\u8986\u76D6\u914D\u7F6E`),a=!0}let e;if((0,n.log)(`\u8986\u76D6\u7528\u6237\u5DF2\u6709\u914D\u7F6E: ${a}`),!a&&g.default.existsSync(s.QBOT_CLAW_CONFIG_PATH))e=s.QBOT_CLAW_CONFIG_PATH,(0,n.log)(`\u4F7F\u7528\u5DF2\u6709\u914D\u7F6E\u6587\u4EF6: ${e}`);else{const c=u.default.join(s.NPM_GLOBAL_MODULES,s.NPM_PACKAGE_NAME,"preset-config.json");if(!g.default.existsSync(c)){(0,n.log)(`npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165: ${c}`);return}e=c,(0,n.log)(`\u4F7F\u7528 npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E: ${e}`)}let r;try{r=JSON.parse(g.default.readFileSync(e,"utf-8")),(0,n.log)(`\u5DF2\u8BFB\u53D6\u914D\u7F6E: ${e}`)}catch(c){(0,n.log)(`\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25: ${e}\uFF0C${c.message}\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165`);return}r.gateway={...r.gateway??{},port:t},r.gateway.auth={...r.gateway.auth??{},token:o},(0,n.log)(`\u5DF2\u5199\u5165 gateway.port=${t}, gateway.token=${o}`),r.plugins=r.plugins??{},r.plugins.entries=r.plugins.entries??{},r.plugins.entries[I]=r.plugins.entries[I]??{},r.plugins.entries[I].config={...r.plugins.entries[I].config??{},wsPort:l},(0,n.log)(`\u5DF2\u5C06 ${I} wsPort=${l} \u5199\u5165\u914D\u7F6E`),g.default.writeFileSync(s.QBOT_CLAW_CONFIG_PATH,JSON.stringify(r,null,2),"utf-8"),(0,n.log)(`\u914D\u7F6E\u6587\u4EF6\u5DF2\u5199\u5165: ${s.QBOT_CLAW_CONFIG_PATH}`)}function R(){try{if(!g.default.existsSync(s.GALILEO_CONFIG_PATH)){(0,n.log)(`[galileo] \u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7: ${s.GALILEO_CONFIG_PATH}`);return}const t=g.default.readFileSync(s.GALILEO_CONFIG_PATH,"utf-8"),o=JSON.parse(t),i=o.galileo;if(!i){(0,n.log)("[galileo] \u914D\u7F6E\u6587\u4EF6\u4E2D\u7F3A\u5C11 galileo \u5B57\u6BB5\uFF0C\u8DF3\u8FC7");return}const l=process.env.QB_QIMEI36||"";i.userId==="userid"&&l?(i.userId=l,i.customAttributes={qimei36:l,guid:process.env.QB_GUID||""},g.default.writeFileSync(s.GALILEO_CONFIG_PATH,JSON.stringify(o,null,2),"utf-8"),(0,n.log)(`[galileo] \u5DF2\u5C06 userId \u66F4\u65B0\u4E3A ${l}\uFF0CcustomAttributes \u5DF2\u5199\u5165`)):(0,n.log)(`[galileo] \u65E0\u9700\u66F4\u65B0\uFF08userId=${i.userId}, QB_QIMEI36=${l||"\u7A7A"})`)}catch(t){(0,n.log)(`[galileo] \u8BFB\u53D6/\u5199\u5165\u914D\u7F6E\u5931\u8D25: ${t.message}`)}}async function C(t=!0,o){const i=Date.now(),l=await(0,w.getQBotClawVersion)()??"unknown";try{R();const a=(0,d.readState)();let e;a.gatewayPort&&!await(0,d.isPortAvailable)(a.gatewayPort)?(e=a.gatewayPort,(0,n.log)(`\u68C0\u6D4B\u5230 QBotClaw gateway \u5DF2\u5728\u7AEF\u53E3 ${e} \u8FD0\u884C\uFF0C\u590D\u7528\u539F\u7AEF\u53E3`)):e=await(0,w.findAvailablePort)(),(0,n.log)(`\u540E\u53F0\u542F\u52A8 QBotClaw gateway run --port ${e} --force`);const r=await(0,w.findAvailablePort)(s.DEFAULT_MCP_HTTP_PORT),c=await(0,w.findAvailablePort)(),p=(0,E.getOrCreateGatewayToken)();await v(e,p,r,c,o),G(p),(0,n.log)(`\u6E05\u7A7A\u9694\u79BB\u5C5E\u6027: ${t}`),t&&await(0,m.fullScanClearQuarantine)("configAndRunQBotClaw \u524D");const N=(0,A.spawn)(s.QBOTCLAW_BIN,["gateway","run","--port",String(e),"--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||"",QBOTCLAW_LLM_BASE_URL:`http://127.0.0.1:${a.port}/v1`,QBOTCLAW_LLM_API_KEY:S.proxyApiKey}});N.unref();const P=N.pid;(0,n.log)(`QBotClaw gateway \u5DF2\u5728\u540E\u53F0\u542F\u52A8\uFF0CPID: ${P}\uFF0C\u7AEF\u53E3: ${e}, token ${(0,E.getOrCreateGatewayToken)()}`),(0,d.writeState)({...(0,d.readState)(),gatewayPid:P,gatewayPort:e,mcpHttpPort:r,mcpWsPort:c}),(0,f.report)({event_name:"qbot_claw_started",version:l,result:"1",cost_ms:String(Date.now()-i)})}catch(a){throw(0,f.report)({event_name:"qbot_claw_started",version:l,result:"0",cost_ms:String(Date.now()-i),error:a.message}),a}}function G(t){const o=u.default.join(s.QBOT_CLAW_DIR,".env"),i=`OPENCLAW_GATEWAY_TOKEN=${t}
|
|
5
|
+
`;try{if(g.default.existsSync(o)){const e=g.default.readFileSync(o,"utf-8").split(`
|
|
6
|
+
`).filter(r=>!r.startsWith("OPENCLAW_GATEWAY_TOKEN=")).filter(r=>r!=="").join(`
|
|
6
7
|
`)+`
|
|
7
|
-
`+
|
|
8
|
-
`)}catch{}return}exports.isInstalling=!0,exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,
|
|
9
|
-
`)}catch{}}catch(a){if(await(0,
|
|
8
|
+
`+i;g.default.writeFileSync(o,e,"utf-8")}else g.default.writeFileSync(o,i,"utf-8");(0,n.log)(`\u5DF2\u5C06 OPENCLAW_GATEWAY_TOKEN \u5199\u5165 ${o}`)}catch(l){(0,n.log)(`\u5199\u5165 .env \u6587\u4EF6\u5931\u8D25: ${l.message}`)}}function b(t,o,i){if(exports.isInstalling){if((0,n.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"})+`
|
|
9
|
+
`)}catch{}return}exports.isInstalling=!0,exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,n.log)(`\u5F00\u59CB\u5B89\u88C5 ${s.NPM_PACKAGE_NAME}@${o}`),(0,f.report)({event_name:"qbot_claw_install_start"});const l=Date.now();(async()=>{try{(0,d.stopGateway)(),B(),Q();const a=6;let e=0;_(t,a,e,"\u5F00\u59CB\u5B89\u88C5 qqbrowser-skill..."),await(0,L.installQQBrowserSkill)(c=>_(t,a,e,c)),e++,_(t,a,e,"\u5F00\u59CB\u5B89\u88C5 mcporter..."),await h(t),e++,_(t,a,e,"\u5F00\u59CB\u4E0B\u8F7D\u89E3\u538B QBotClaw...");const r=Date.now();try{await D(o),e++,_(t,a,e,"npmDownloadQBotClaw \u5B8C\u6210"),await(0,m.fullScanClearQuarantine)("npm install --ignore-scripts \u5B8C\u6210\u540E\uFF0Crebuild \u524D"),e++,await(0,m.watchWorkspaceQuarantine)().catch(p=>{(0,n.log)(`[quarantine] watchWorkspaceQuarantine \u542F\u52A8\u5F02\u5E38: ${p.message}`)}),_(t,a,e,"\u5F00\u59CB npm rebuild..."),await W(o),e++,_(t,a,e,"npmRebuildQBotClaw \u5B8C\u6210");const c=Date.now()-r;(0,f.report)({event_name:"qbot_claw_npm_install",result:"1",cost_ms:String(c)})}catch(c){const p=Date.now()-r;throw(0,f.report)({event_name:"qbot_claw_npm_install",result:"0",cost_ms:String(p),error:c.message}),c}try{g.default.existsSync(s.OPENCLAW_BIN)||(g.default.symlinkSync(s.QBOTCLAW_BIN,s.OPENCLAW_BIN),(0,n.log)(`\u5DF2\u521B\u5EFA\u8F6F\u94FE\u63A5: ${s.OPENCLAW_BIN} -> ${s.QBOTCLAW_BIN}`))}catch(c){(0,n.log)(`\u521B\u5EFA openclaw \u8F6F\u94FE\u63A5\u5931\u8D25: ${c.message}`)}if(await(0,m.stopWatchWorkspaceQuarantine)().catch(c=>{(0,n.log)(`[quarantine] stopWatchWorkspaceQuarantine \u5F02\u5E38: ${c.message}`)}),exports.installState={status:"success",message:"\u5B89\u88C5\u6210\u529F",endTime:new Date().toISOString()},(0,n.log)("\u5B89\u88C5\u6210\u529F"),(0,f.report)({event_name:"qbot_claw_install_done",version:o,result:"1",cost_ms:String(Date.now()-l)}),(0,n.refreshClawVersion)(o),_(t,a,e,"\u5F00\u59CB\u914D\u7F6E\u5E76\u542F\u52A8 QBotClaw gateway..."),await C(!1,i),e++,t.writable)try{const c=(0,E.getOrCreateGatewayToken)();t.end(JSON.stringify({status:"done",progress:100,message:"\u5B89\u88C5\u6210\u529F",gatewayToken:c})+`
|
|
10
|
+
`)}catch{}}catch(a){if(await(0,m.stopWatchWorkspaceQuarantine)().catch(()=>{}),exports.installState={status:"failed",message:a.message,endTime:new Date().toISOString()},(0,n.log)(`\u5B89\u88C5\u5931\u8D25: ${a.message}`),(0,f.report)({event_name:"qbot_claw_install_done",version:o,result:"0",cost_ms:String(Date.now()-l),error:a.message}),t&&t.writable)try{t.end(JSON.stringify({status:"failed",progress:0,message:a.message})+`
|
|
10
11
|
`)}catch{}}finally{exports.isInstalling=!1}})()}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
"use strict";var b=exports&&exports.__importDefault||function(r){return r&&r.__esModule?r:{default:r}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.installQQBrowserSkill=$;const u=b(require("fs")),k=require("child_process"),q=require("./config"),e=require("./reportLog"),n=require("./report"),m="https://test.pypi.org/simple/",f="https://mirrors.tencent.com/pypi/simple/",g=!1,p=g?m:f;function w(r,l,t){return new Promise(s=>{let c="";const _=(0,k.spawn)(r,l,{stdio:["ignore","pipe","pipe"]});_.stdout.on("data",o=>{const i=o.toString().trim();i&&((0,e.log)(`[qqbrowser-skill] ${i}`),t(`[qqbrowser-skill] ${i}`))}),_.stderr.on("data",o=>{const i=o.toString().trim();i&&(c+=i+`
|
|
2
|
+
`,(0,e.log)(`[qqbrowser-skill] ${i}`),t(`[qqbrowser-skill] ${i}`))}),_.on("close",o=>{s({code:o??1,stderr:c})}),_.on("error",o=>{(0,e.log)(`[qqbrowser-skill] \u547D\u4EE4\u6267\u884C\u5931\u8D25: ${o.message}`),s({code:1,stderr:o.message})})})}const a="qqbrowser-skill";async function $(r){const l=Date.now();try{if((0,e.log)("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5..."),r("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5..."),process.platform==="darwin"){if(!u.default.existsSync(q.PYTHON_BIN)){(0,e.log)(`[qqbrowser-skill] \u5185\u7F6E Python \u4E0D\u5B58\u5728: ${q.PYTHON_BIN}\uFF0C\u8DF3\u8FC7\u5B89\u88C5`),r("[qqbrowser-skill] \u5185\u7F6E Python \u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u5B89\u88C5"),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:"\u5185\u7F6E Python \u4E0D\u5B58\u5728"});return}(0,e.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${a}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:t,stderr:s}=await w(q.PYTHON_BIN,["-m","pip","install","--upgrade","-i",p,"--prefix",q.PYTHON_DIR,a],r);if(t!==0){(0,e.log)(`[qqbrowser-skill] pip install \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${t}\uFF0Cstderr: ${s}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${t}\uFF09`),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:s});return}}else if(process.platform==="win32"){(0,e.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${a}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:t,stderr:s}=await w("pip",["install","--upgrade","-i",p,"--prefix",q.PYTHON_DIR,a],r);if(t!==0){(0,e.log)(`[qqbrowser-skill] pip install \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${t}\uFF0Cstderr: ${s}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${t}\uFF09`),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:s});return}}else{(0,e.log)(`[qqbrowser-skill] \u4E0D\u652F\u6301\u7684\u5E73\u53F0: ${process.platform}\uFF0C\u8DF3\u8FC7\u5B89\u88C5`),r("[qqbrowser-skill] \u4E0D\u652F\u6301\u7684\u5E73\u53F0\uFF0C\u8DF3\u8FC7\u5B89\u88C5"),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:`\u4E0D\u652F\u6301\u7684\u5E73\u53F0: ${process.platform}`});return}(0,e.log)("[qqbrowser-skill] \u5B89\u88C5\u5B8C\u6210"),r("[qqbrowser-skill] \u5B89\u88C5\u5B8C\u6210"),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"1",cost_ms:String(Date.now()-l)})}catch(t){(0,e.log)(`[qqbrowser-skill] \u5B89\u88C5\u8FC7\u7A0B\u4E2D\u53D1\u751F\u5F02\u5E38: ${t.message}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5F02\u5E38: ${t.message}`),(0,n.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:t.message})}}
|
package/dist/report.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.report=void 0;const r=require("./build"),c=require("./reportLog"),e=process.env.QB_GUID,o=process.env.QB_QIMEI36,a="QBOT_CLAW_INSTALL_EVENT",i=t=>{const s={appVersion:r.LAUNCHER_VERSION,sdkId:"js",sdkVersion:"1.0.0",mainAppKey:"0WEB05459VG6RK7B",platformId:3,common:{A1:e,machine_id:e,A2:e,A3:o,A162:o},events:[{eventCode:a,eventTime:Date.now(),mapValue:{...t}}]};fetch("https://otheve.beacon.qq.com/analytics/v2_upload",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},body:JSON.stringify(s)}).catch(n=>{(0,c.log)(`[report] \u4E0A\u62A5\u5931\u8D25: ${n.message}`)})};exports.report=i;
|
package/dist/service.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
"use strict";var
|
|
2
|
-
`),process.stdout.uncork(),(0,r.log)(`[service] \u7248\u672C\u4E00\u81F4\uFF0C\u590D\u7528\u5DF2\u6709\u670D\u52A1 (pid: ${
|
|
3
|
-
`),process.stdout.uncork()}),process.on("SIGTERM",()=>{(0,t.stopGateway)(),(0,t.clearState)(),(0,r.flushLogs)().finally(()=>{process.exit(0)})})}function
|
|
4
|
-
`),process.stdout.uncork();return}try{process.kill(e.pid,"SIGTERM");const
|
|
5
|
-
`),process.stdout.uncork()}catch(
|
|
1
|
+
"use strict";var v=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.readCurrentGatewayToken=d,exports.getOrCreateGatewayToken=S,exports.startService=b,exports.stopService=C;const f=v(require("fs")),k=require("crypto"),y=require("./server"),t=require("./state"),u=require("./config"),p=require("./build"),q=require("./installer"),O=require("./utils"),r=require("./reportLog"),n=require("./report");let w,i;const g="0526bec85002fe65ef10d33df0a8dfbe76917cd125f5a4ad";function d(){try{if(!f.default.existsSync(u.QBOT_CLAW_CONFIG_PATH))return(0,r.log)(`[service] \u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728: ${u.QBOT_CLAW_CONFIG_PATH}`),g;const e=f.default.readFileSync(u.QBOT_CLAW_CONFIG_PATH,"utf-8");return JSON.parse(e)?.gateway?.auth?.token||g}catch(e){return(0,r.log)(`[service] \u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6 gateway.auth.token \u5931\u8D25: ${e.message}`),g}}function S(){return i||(i=require("crypto").randomBytes(24).toString("hex"),(0,r.log)(`[service] \u751F\u6210\u65B0\u7684 gateway token: ${i}`),i||d())}async function T(){const e=(0,t.readState)();if(!e.pid||!e.port)return null;try{process.kill(e.pid,0)}catch{return(0,t.clearState)(),null}if(await(0,t.isPortAvailable)(e.port))return(0,r.log)("\u7AEF\u53E3\u672A\u88AB\u5360\u7528\uFF0C\u8BF4\u660E\u72B6\u6001\u6587\u4EF6\u8FC7\u671F"),(0,t.clearState)(),null;const s=e.launcherVersion??null;if((0,r.log)(`[service] \u68C0\u6D4B\u5230\u6B63\u5728\u8FD0\u884C\u7684\u670D\u52A1\u7248\u672C: ${s??"unknown"}\uFF0C\u5F53\u524D\u7248\u672C: ${p.LAUNCHER_VERSION}`),s===p.LAUNCHER_VERSION)return(0,r.log)(`[service] \u7248\u672C\u4E00\u81F4\uFF0C\u590D\u7528\u5DF2\u6709\u670D\u52A1 (pid: ${e.pid}, port: ${e.port})`),!1;(0,r.log)(`[service] \u7248\u672C\u4E0D\u4E00\u81F4 (\u8FD0\u884C\u4E2D: ${s??"unknown"}, \u5F53\u524D: ${p.LAUNCHER_VERSION})\uFF0C\u6740\u6389\u65E7\u8FDB\u7A0B pid: ${e.pid}\uFF0C\u91CD\u65B0\u542F\u52A8`);try{process.kill(e.pid,"SIGTERM")}catch{}return(0,t.clearState)(),!0}async function b(e,o){if(await T()===!1){const a=(0,t.readState)();process.stdout.write(JSON.stringify({state:"success",pid:a.pid,port:a.port,gatewayToken:d()})+`
|
|
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 _=await(0,t.findAvailablePort)();y.server.listen(_,"127.0.0.1",async()=>{w=(0,k.randomUUID)(),(0,t.writeState)({pid:process.pid,port:_,token:w,launcherVersion:p.LAUNCHER_VERSION,...e?{ppid:e}:{}}),(0,y.watchParentProcess)(e),(0,n.report)({event_name:"qbot_claw_try_start"});let a;if(f.default.existsSync(u.QBOTCLAW_BIN))try{const c=await(0,O.getQBotClawVersion)(),l=(0,t.readState)();c!==o?((0,r.log)(`[service] qbotclaw \u672C\u5730\u7248\u672C (${c??"unknown"}) \u4E0E\u671F\u671B\u7248\u672C (${o}) \u4E0D\u4E00\u81F4\uFF0C\u505C\u6B62\u5F53\u524D qbotclaw \u8FDB\u7A0B`),(0,n.report)({event_name:"qbot_claw_need_update"}),(0,t.stopGateway)()):l.gatewayPid&&l.gatewayPort?((0,r.log)(`[service] qbotclaw \u5DF2\u5728\u8FD0\u884C\uFF0Cpid: ${l.gatewayPid}, port: ${l.gatewayPort}`),a=d(),(0,n.report)({event_name:"qbot_claw_version_match"}),(0,n.report)({event_name:"qbot_claw_reuse"})):((0,r.log)("[service] \u68C0\u6D4B\u5230 qbotclaw\uFF0C\u7248\u672C\u5339\u914D\uFF0C\u81EA\u52A8\u542F\u52A8 gateway..."),(0,n.report)({event_name:"qbot_claw_version_match"}),await(0,q.configAndRunQBotClaw)(),a=S())}catch(c){(0,r.log)(`[service] \u81EA\u52A8\u542F\u52A8 gateway \u5931\u8D25: ${c.message}`)}else(0,r.log)("[service] qbotclaw \u672A\u5B89\u88C5\uFF0C\u4E0D\u81EA\u52A8\u542F\u52A8"),(0,n.report)({event_name:"qbot_claw_need_install"});process.stdout.write(JSON.stringify({state:"success",pid:process.pid,port:_,token:w,gatewayToken:a})+`
|
|
3
|
+
`),process.stdout.uncork()}),process.on("SIGTERM",()=>{(0,t.stopGateway)(),(0,t.clearState)(),(0,r.flushLogs)().finally(()=>{process.exit(0)})})}function C(){const e=(0,t.readState)();if(!e.pid){process.stdout.write(JSON.stringify({state:"err",pid:0,port:0})+`
|
|
4
|
+
`),process.stdout.uncork();return}try{process.kill(e.pid,"SIGTERM");const o=e.pid,s=e.port??0;(0,t.clearState)(),process.stdout.write(JSON.stringify({state:"success",pid:o,port:s})+`
|
|
5
|
+
`),process.stdout.uncork()}catch(o){o.code==="ESRCH"&&(0,t.clearState)(),process.stdout.write(JSON.stringify({state:"err",pid:0,port:0})+`
|
|
6
6
|
`),process.stdout.uncork()}}
|