@qqbrowser/qbot-claw-launcher 0.9.48 → 0.9.49

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/config.js CHANGED
@@ -1 +1 @@
1
- "use strict";var n=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.STATE_FILE=exports.MCPORTER_BIN=exports.OPENCLAW_BIN=exports.QBOTCLAW_BIN=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 _=n(require("path")),o=n(require("os"));exports.QBOT_CLAW_DIR=_.default.join(o.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.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.STATE_FILE=_.default.join(exports.QBOT_CLAW_DIR,"launcher.json");
1
+ "use strict";var n=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.DEFAULT_MCP_HTTP_PORT=exports.STATE_FILE=exports.MCPORTER_BIN=exports.OPENCLAW_BIN=exports.QBOTCLAW_BIN=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 _=n(require("path")),o=n(require("os"));exports.QBOT_CLAW_DIR=_.default.join(o.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.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.STATE_FILE=_.default.join(exports.QBOT_CLAW_DIR,"launcher.json"),exports.DEFAULT_MCP_HTTP_PORT=38789;
package/dist/installer.js CHANGED
@@ -1,5 +1,5 @@
1
- "use strict";var d=exports&&exports.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PYTHON_DIR=exports.installState=void 0,exports.runQBotClaw=m,exports.configAndRunQBotClaw=N,exports.runInstall=B;const l=d(require("fs")),u=d(require("path")),g=require("child_process"),i=require("./config"),w=require("./utils"),p=require("./state"),_=require("./quarantine"),o=require("./reportLog");function c(t,n,r,a){if(t&&t.writable){const e=n>0?Math.round(r/n*1e4)/100:0;try{t.write(JSON.stringify({status:"downloading",progress:e,totalSteps:n,currentStep:r,message:a})+`
2
- `)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.PYTHON_DIR=u.default.join(i.QBOT_CLAW_DIR,"python");function m(t,n){return new Promise(r=>{const a=(0,g.spawn)(i.QBOTCLAW_BIN,t,{stdio:["ignore","pipe","pipe"],env:{PATH:i.NODE_BIN_DIR,HOME:process.env.HOME,OPENCLAW_TELEMETRY_GALIELO_GUID:process.env.QB_GUID||"",OPENCLAW_TELEMETRY_GALIELO_QIEMI36:process.env.QB_QIMEI36||""}});(0,o.log)(`[QBotClaw] \u6267\u884C: QBotClaw ${t.join(" ")}`),a.stdout.on("data",e=>{const s=e.toString();if(n&&n.writable)try{n.write(s)}catch{}}),a.stderr.on("data",e=>{const s=e.toString();if(n&&n.writable)try{n.write(s)}catch{}}),a.on("close",e=>{(0,o.log)(`[QBotClaw] \u6267\u884C\u5B8C\u6210\uFF0C\u9000\u51FA\u7801: ${e}`),r()}),a.on("error",e=>{(0,o.log)(`[QBotClaw] \u542F\u52A8\u5931\u8D25: ${e.message}`),r()})})}function A(){l.default.existsSync(i.QBOT_CLAW_DIR)||l.default.mkdirSync(i.QBOT_CLAW_DIR,{recursive:!0})}function C(){const t=u.default.join(exports.PYTHON_DIR,"pip.conf");if(l.default.existsSync(t)){(0,o.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
- `);l.default.writeFileSync(t,n,"utf-8"),(0,o.log)(`\u5DF2\u5199\u5165 pip.conf: ${t}`)}async function O(t){if(l.default.existsSync(i.MCPORTER_BIN)){(0,o.log)("mcporter \u5DF2\u5B89\u88C5\uFF0C\u8DF3\u8FC7");return}(0,o.log)("\u5F00\u59CB\u5B89\u88C5 mcporter..."),await new Promise((n,r)=>{const a=(0,g.spawn)(i.NPM_BIN,["--userconfig",i.NPM_RC,"install","-g","mcporter"],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(i.NPM_BIN)}:${process.env.PATH}`}});a.stdout.on("data",e=>{const s=`[mcporter] ${e.toString().trim()}`;(0,o.log)(s),c(t,0,0,s)}),a.stderr.on("data",e=>{const s=`[mcporter] ${e.toString().trim()}`;(0,o.log)(s),c(t,0,0,s)}),a.on("close",e=>{e===0?((0,o.log)("mcporter \u5B89\u88C5\u6210\u529F"),n()):r(new Error(`mcporter \u5B89\u88C5\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}`))}),a.on("error",r)})}function P(t,n){return new Promise((r,a)=>{const e=(0,g.spawn)(i.NPM_BIN,["--userconfig",i.NPM_RC,...t],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(i.NPM_BIN)}:${process.env.PATH}`}});e.stdout.on("data",s=>{const f=`[npm] ${s.toString().trim()}`;(0,o.log)(f)}),e.stderr.on("data",s=>{const f=`[npm] ${s.toString().trim()}`;(0,o.log)(f)}),e.on("close",s=>{s===0?((0,o.log)(`${n} \u6210\u529F`),r()):a(new Error(`${n} \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${s}`))}),e.on("error",a)})}async function I(t){const n=`${i.NPM_PACKAGE_NAME}@${t}`;(0,o.log)(`\u5F00\u59CB\u5B89\u88C5 ${n}\uFF08--ignore-scripts\uFF0C\u4EC5\u4E0B\u8F7D\u89E3\u538B\uFF09...`),await P(["install","-g","--ignore-scripts",n],`${n} \u4E0B\u8F7D\u89E3\u538B`)}async function E(t){const n=`${i.NPM_PACKAGE_NAME}@${t}`;(0,o.log)("\u5F00\u59CB npm rebuild\uFF08\u6267\u884C postinstall \u811A\u672C\uFF09..."),await P(["rebuild","-g",i.NPM_PACKAGE_NAME],`${n} rebuild`),(0,o.log)(`${n} \u5B89\u88C5\u6210\u529F`)}async function $(t,n,r){let a;if(l.default.existsSync(i.QBOT_CLAW_CONFIG_PATH))a=i.QBOT_CLAW_CONFIG_PATH,(0,o.log)(`\u4F7F\u7528\u5DF2\u6709\u914D\u7F6E\u6587\u4EF6: ${a}`);else{const s=u.default.join(i.NPM_GLOBAL_MODULES,i.NPM_PACKAGE_NAME,"preset-config.json");if(!l.default.existsSync(s)){(0,o.log)(`npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165: ${s}`);return}a=s,(0,o.log)(`\u4F7F\u7528 npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E: ${a}`)}let e;try{e=JSON.parse(l.default.readFileSync(a,"utf-8")),(0,o.log)(`\u5DF2\u8BFB\u53D6\u914D\u7F6E: ${a}`)}catch(s){(0,o.log)(`\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25: ${a}\uFF0C${s.message}\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165`);return}t!==void 0&&(e.gateway={...e.gateway??{},port:t},(0,o.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,o.log)(`\u5DF2\u5C06 x5use-browser-control wsPort=${r}, httpPort=${n} \u5199\u5165\u914D\u7F6E`),l.default.writeFileSync(i.QBOT_CLAW_CONFIG_PATH,JSON.stringify(e,null,2),"utf-8"),(0,o.log)(`\u914D\u7F6E\u6587\u4EF6\u5DF2\u5199\u5165: ${i.QBOT_CLAW_CONFIG_PATH}`)}async function N(){const t=(0,p.readState)();let n;t.gatewayPort&&!await(0,p.isPortAvailable)(t.gatewayPort)?(n=t.gatewayPort,(0,o.log)(`\u68C0\u6D4B\u5230 QBotClaw gateway \u5DF2\u5728\u7AEF\u53E3 ${n} \u8FD0\u884C\uFF0C\u590D\u7528\u539F\u7AEF\u53E3`)):n=await(0,w.findAvailablePort)(),(0,o.log)(`\u540E\u53F0\u542F\u52A8 QBotClaw gateway run --port ${n} --force`);const r=await(0,w.findAvailablePort)(),a=await(0,w.findAvailablePort)();await $(n,r,a);const e=(0,g.spawn)(i.QBOTCLAW_BIN,["gateway","run","--port",String(n),"--force"],{stdio:"ignore",env:{PATH:i.NODE_BIN_DIR,HOME:process.env.HOME,OPENCLAW_NO_RESPAWN:"true",OPENCLAW_TELEMETRY_GALIELO_GUID:process.env.QB_GUID||"",OPENCLAW_TELEMETRY_GALIELO_QIEMI36:process.env.QB_QIMEI36||""}});e.unref();const s=e.pid;(0,o.log)(`QBotClaw gateway \u5DF2\u5728\u540E\u53F0\u542F\u52A8\uFF0CPID: ${s}\uFF0C\u7AEF\u53E3: ${n}`),(0,p.writeState)({...(0,p.readState)(),gatewayPid:s,gatewayPort:n,mcpHttpPort:r,mcpWsPort:a})}function B(t,n){exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,o.log)(`\u5F00\u59CB\u5B89\u88C5 ${i.NPM_PACKAGE_NAME}@${n}`),(async()=>{try{A(),C(),await(0,_.watchWorkspaceQuarantine)().catch(e=>{(0,o.log)(`[quarantine] watchWorkspaceQuarantine \u542F\u52A8\u5F02\u5E38: ${e.message}`)});const r=5;let a=0;c(t,r,a,"\u5F00\u59CB\u5B89\u88C5 mcporter..."),await O(t),a++,c(t,r,a,"\u5F00\u59CB\u4E0B\u8F7D\u89E3\u538B QBotClaw..."),await I(n),a++,c(t,r,a,"npmDownloadQBotClaw \u5B8C\u6210"),await(0,_.fullScanClearQuarantine)("npm install --ignore-scripts \u5B8C\u6210\u540E\uFF0Crebuild \u524D"),a++,c(t,r,a,"\u5F00\u59CB npm rebuild..."),await E(n),a++,c(t,r,a,"npmRebuildQBotClaw \u5B8C\u6210");try{l.default.existsSync(i.OPENCLAW_BIN)||(l.default.symlinkSync(i.QBOTCLAW_BIN,i.OPENCLAW_BIN),(0,o.log)(`\u5DF2\u521B\u5EFA\u8F6F\u94FE\u63A5: ${i.OPENCLAW_BIN} -> ${i.QBOTCLAW_BIN}`))}catch(e){(0,o.log)(`\u521B\u5EFA openclaw \u8F6F\u94FE\u63A5\u5931\u8D25: ${e.message}`)}if(await(0,_.stopWatchWorkspaceQuarantine)().catch(e=>{(0,o.log)(`[quarantine] stopWatchWorkspaceQuarantine \u5F02\u5E38: ${e.message}`)}),exports.installState={status:"success",message:"\u5B89\u88C5\u6210\u529F",endTime:new Date().toISOString()},(0,o.log)("\u5B89\u88C5\u6210\u529F"),(0,o.refreshClawVersion)(n),c(t,r,a,"\u5F00\u59CB\u914D\u7F6E\u5E76\u542F\u52A8 QBotClaw gateway..."),await N(),a++,t.writable)try{t.end(JSON.stringify({status:"done",progress:100,message:"\u5B89\u88C5\u6210\u529F"})+`
1
+ "use strict";var d=exports&&exports.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PYTHON_DIR=exports.installState=void 0,exports.runQBotClaw=N,exports.configAndRunQBotClaw=A,exports.runInstall=B;const l=d(require("fs")),u=d(require("path")),g=require("child_process"),i=require("./config"),w=require("./utils"),p=require("./state"),_=require("./quarantine"),o=require("./reportLog");function c(t,n,r,a){if(t&&t.writable){const e=n>0?Math.round(r/n*1e4)/100:0;try{t.write(JSON.stringify({status:"downloading",progress:e,totalSteps:n,currentStep:r,message:a})+`
2
+ `)}catch{}}}exports.installState={status:"idle",message:"\u672A\u5F00\u59CB"},exports.PYTHON_DIR=u.default.join(i.QBOT_CLAW_DIR,"python");function N(t,n){return new Promise(r=>{const a=(0,g.spawn)(i.QBOTCLAW_BIN,t,{stdio:["ignore","pipe","pipe"],env:{PATH:i.NODE_BIN_DIR,HOME:process.env.HOME,OPENCLAW_TELEMETRY_GALIELO_GUID:process.env.QB_GUID||"",OPENCLAW_TELEMETRY_GALIELO_QIEMI36:process.env.QB_QIMEI36||""}});(0,o.log)(`[QBotClaw] \u6267\u884C: QBotClaw ${t.join(" ")}`),a.stdout.on("data",e=>{const s=e.toString();if(n&&n.writable)try{n.write(s)}catch{}}),a.stderr.on("data",e=>{const s=e.toString();if(n&&n.writable)try{n.write(s)}catch{}}),a.on("close",e=>{(0,o.log)(`[QBotClaw] \u6267\u884C\u5B8C\u6210\uFF0C\u9000\u51FA\u7801: ${e}`),r()}),a.on("error",e=>{(0,o.log)(`[QBotClaw] \u542F\u52A8\u5931\u8D25: ${e.message}`),r()})})}function m(){l.default.existsSync(i.QBOT_CLAW_DIR)||l.default.mkdirSync(i.QBOT_CLAW_DIR,{recursive:!0})}function C(){const t=u.default.join(exports.PYTHON_DIR,"pip.conf");if(l.default.existsSync(t)){(0,o.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
+ `);l.default.writeFileSync(t,n,"utf-8"),(0,o.log)(`\u5DF2\u5199\u5165 pip.conf: ${t}`)}async function E(t){if(l.default.existsSync(i.MCPORTER_BIN)){(0,o.log)("mcporter \u5DF2\u5B89\u88C5\uFF0C\u8DF3\u8FC7");return}(0,o.log)("\u5F00\u59CB\u5B89\u88C5 mcporter..."),await new Promise((n,r)=>{const a=(0,g.spawn)(i.NPM_BIN,["--userconfig",i.NPM_RC,"install","-g","mcporter"],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(i.NPM_BIN)}:${process.env.PATH}`}});a.stdout.on("data",e=>{const s=`[mcporter] ${e.toString().trim()}`;(0,o.log)(s),c(t,0,0,s)}),a.stderr.on("data",e=>{const s=`[mcporter] ${e.toString().trim()}`;(0,o.log)(s),c(t,0,0,s)}),a.on("close",e=>{e===0?((0,o.log)("mcporter \u5B89\u88C5\u6210\u529F"),n()):r(new Error(`mcporter \u5B89\u88C5\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}`))}),a.on("error",r)})}function P(t,n){return new Promise((r,a)=>{const e=(0,g.spawn)(i.NPM_BIN,["--userconfig",i.NPM_RC,...t],{stdio:["ignore","pipe","pipe"],env:{...process.env,PATH:`${u.default.dirname(i.NPM_BIN)}:${process.env.PATH}`}});e.stdout.on("data",s=>{const f=`[npm] ${s.toString().trim()}`;(0,o.log)(f)}),e.stderr.on("data",s=>{const f=`[npm] ${s.toString().trim()}`;(0,o.log)(f)}),e.on("close",s=>{s===0?((0,o.log)(`${n} \u6210\u529F`),r()):a(new Error(`${n} \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${s}`))}),e.on("error",a)})}async function I(t){const n=`${i.NPM_PACKAGE_NAME}@${t}`;(0,o.log)(`\u5F00\u59CB\u5B89\u88C5 ${n}\uFF08--ignore-scripts\uFF0C\u4EC5\u4E0B\u8F7D\u89E3\u538B\uFF09...`),await P(["install","-g","--ignore-scripts",n],`${n} \u4E0B\u8F7D\u89E3\u538B`)}async function O(t){const n=`${i.NPM_PACKAGE_NAME}@${t}`;(0,o.log)("\u5F00\u59CB npm rebuild\uFF08\u6267\u884C postinstall \u811A\u672C\uFF09..."),await P(["rebuild","-g",i.NPM_PACKAGE_NAME],`${n} rebuild`),(0,o.log)(`${n} \u5B89\u88C5\u6210\u529F`)}async function $(t,n,r){let a;if(l.default.existsSync(i.QBOT_CLAW_CONFIG_PATH))a=i.QBOT_CLAW_CONFIG_PATH,(0,o.log)(`\u4F7F\u7528\u5DF2\u6709\u914D\u7F6E\u6587\u4EF6: ${a}`);else{const s=u.default.join(i.NPM_GLOBAL_MODULES,i.NPM_PACKAGE_NAME,"preset-config.json");if(!l.default.existsSync(s)){(0,o.log)(`npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165: ${s}`);return}a=s,(0,o.log)(`\u4F7F\u7528 npm \u5168\u5C40\u5B89\u88C5\u76EE\u5F55\u4E2D\u7684\u914D\u7F6E: ${a}`)}let e;try{e=JSON.parse(l.default.readFileSync(a,"utf-8")),(0,o.log)(`\u5DF2\u8BFB\u53D6\u914D\u7F6E: ${a}`)}catch(s){(0,o.log)(`\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25: ${a}\uFF0C${s.message}\uFF0C\u8DF3\u8FC7\u914D\u7F6E\u5199\u5165`);return}t!==void 0&&(e.gateway={...e.gateway??{},port:t},(0,o.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,o.log)(`\u5DF2\u5C06 x5use-browser-control wsPort=${r}, httpPort=${n} \u5199\u5165\u914D\u7F6E`),l.default.writeFileSync(i.QBOT_CLAW_CONFIG_PATH,JSON.stringify(e,null,2),"utf-8"),(0,o.log)(`\u914D\u7F6E\u6587\u4EF6\u5DF2\u5199\u5165: ${i.QBOT_CLAW_CONFIG_PATH}`)}async function A(){const t=(0,p.readState)();let n;t.gatewayPort&&!await(0,p.isPortAvailable)(t.gatewayPort)?(n=t.gatewayPort,(0,o.log)(`\u68C0\u6D4B\u5230 QBotClaw gateway \u5DF2\u5728\u7AEF\u53E3 ${n} \u8FD0\u884C\uFF0C\u590D\u7528\u539F\u7AEF\u53E3`)):n=await(0,w.findAvailablePort)(),(0,o.log)(`\u540E\u53F0\u542F\u52A8 QBotClaw gateway run --port ${n} --force`);const r=await(0,w.findAvailablePort)(i.DEFAULT_MCP_HTTP_PORT),a=await(0,w.findAvailablePort)();await $(n,r,a);const e=(0,g.spawn)(i.QBOTCLAW_BIN,["gateway","run","--port",String(n),"--force"],{stdio:"ignore",env:{PATH:i.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||""}});e.unref();const s=e.pid;(0,o.log)(`QBotClaw gateway \u5DF2\u5728\u540E\u53F0\u542F\u52A8\uFF0CPID: ${s}\uFF0C\u7AEF\u53E3: ${n}`),(0,p.writeState)({...(0,p.readState)(),gatewayPid:s,gatewayPort:n,mcpHttpPort:r,mcpWsPort:a})}function B(t,n){exports.installState={status:"downloading",message:"\u6B63\u5728\u5B89\u88C5...",startTime:new Date().toISOString()},(0,o.log)(`\u5F00\u59CB\u5B89\u88C5 ${i.NPM_PACKAGE_NAME}@${n}`),(async()=>{try{m(),C();const r=5;let a=0;c(t,r,a,"\u5F00\u59CB\u5B89\u88C5 mcporter..."),await E(t),a++,c(t,r,a,"\u5F00\u59CB\u4E0B\u8F7D\u89E3\u538B QBotClaw..."),await I(n),a++,c(t,r,a,"npmDownloadQBotClaw \u5B8C\u6210"),await(0,_.fullScanClearQuarantine)("npm install --ignore-scripts \u5B8C\u6210\u540E\uFF0Crebuild \u524D"),a++,await(0,_.watchWorkspaceQuarantine)().catch(e=>{(0,o.log)(`[quarantine] watchWorkspaceQuarantine \u542F\u52A8\u5F02\u5E38: ${e.message}`)}),c(t,r,a,"\u5F00\u59CB npm rebuild..."),await O(n),a++,c(t,r,a,"npmRebuildQBotClaw \u5B8C\u6210");try{l.default.existsSync(i.OPENCLAW_BIN)||(l.default.symlinkSync(i.QBOTCLAW_BIN,i.OPENCLAW_BIN),(0,o.log)(`\u5DF2\u521B\u5EFA\u8F6F\u94FE\u63A5: ${i.OPENCLAW_BIN} -> ${i.QBOTCLAW_BIN}`))}catch(e){(0,o.log)(`\u521B\u5EFA openclaw \u8F6F\u94FE\u63A5\u5931\u8D25: ${e.message}`)}if(await(0,_.stopWatchWorkspaceQuarantine)().catch(e=>{(0,o.log)(`[quarantine] stopWatchWorkspaceQuarantine \u5F02\u5E38: ${e.message}`)}),exports.installState={status:"success",message:"\u5B89\u88C5\u6210\u529F",endTime:new Date().toISOString()},(0,o.log)("\u5B89\u88C5\u6210\u529F"),(0,o.refreshClawVersion)(n),c(t,r,a,"\u5F00\u59CB\u914D\u7F6E\u5E76\u542F\u52A8 QBotClaw gateway..."),await A(),a++,t.writable)try{t.end(JSON.stringify({status:"done",progress:100,message:"\u5B89\u88C5\u6210\u529F"})+`
4
4
  `)}catch{}}catch(r){if(await(0,_.stopWatchWorkspaceQuarantine)().catch(()=>{}),exports.installState={status:"failed",message:r.message,endTime:new Date().toISOString()},(0,o.log)(`\u5B89\u88C5\u5931\u8D25: ${r.message}`),t&&t.writable)try{t.end(JSON.stringify({status:"failed",progress:0,message:r.message})+`
5
5
  `)}catch{}}})()}
package/dist/server.js CHANGED
@@ -1,6 +1,6 @@
1
- "use strict";var y=exports&&exports.__importDefault||function(s){return s&&s.__esModule?s:{default:s}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.server=void 0,exports.watchParentProcess=N;const O=y(require("http")),m=y(require("fs")),C=y(require("path")),a=require("./config"),u=require("./utils"),r=require("./reportLog"),$=require("./installer"),f=require("./state"),S=require("child_process"),P={"Access-Control-Allow-Origin":"*","Access-Control-Allow-Methods":"GET, POST, PUT, DELETE, OPTIONS","Access-Control-Allow-Headers":"Content-Type, Authorization, X-Requested-With","Access-Control-Max-Age":"86400"};function T(s){for(const[t,i]of Object.entries(P))s.setHeader(t,i)}exports.server=O.default.createServer(async(s,t)=>{const i=s.url||"";if(T(t),s.method==="OPTIONS"){t.writeHead(204,P),t.end();return}if(i==="/api/version"){let g="unknown";try{const c=C.default.join(__dirname,"..","package.json");g=JSON.parse(m.default.readFileSync(c,"utf-8")).version||"unknown"}catch{}let n="unknown";try{n=(await(0,u.execCommand)(`"${a.NODE_BIN}" -v`)).trim(),(0,r.log)(`[version] node \u7248\u672C: ${n}`)}catch(c){(0,r.log)(`[version] \u83B7\u53D6 node \u7248\u672C\u5931\u8D25: ${c.message}`),n=`error: ${c.message}`}const e=await(0,u.getQBotClawVersion)()??"0.0.0";(0,r.log)(`[version] qbotclaw \u7248\u672C: ${e}`);let o="0.0.0";if(m.default.existsSync(a.MCPORTER_BIN))try{o=(await(0,u.execCommand)(`"${a.NODE_BIN}" "${a.MCPORTER_BIN}" --version`)).trim(),(0,r.log)(`[version] mcporter \u7248\u672C: ${o}`)}catch(c){(0,r.log)(`[version] \u83B7\u53D6 mcporter \u7248\u672C\u5931\u8D25: ${c.message}`),o=`error: ${c.message}`}let h="0.0.0";if(m.default.existsSync(a.PYTHON_BIN))try{h=(await(0,u.execCommand)(`"${a.PYTHON_BIN}" --version`)).trim(),(0,r.log)(`[version] python \u7248\u672C: ${h}`)}catch(c){(0,r.log)(`[version] \u83B7\u53D6 python \u7248\u672C\u5931\u8D25: ${c.message}`),h=`error: ${c.message}`}(0,u.sendJSON)(t,200,{status:"\u6210\u529F",launcher:g,node:n,qbotclaw:e,mcporter:o,python:h});return}if(i==="/api/port"){const g=exports.server.address(),n=g&&typeof g=="object"?g.port:null,e=(0,f.readState)();(0,u.sendJSON)(t,200,{status:"\u6210\u529F",launcher:n,qbotclaw:e.gatewayPort??2e3,mcpHttp:e.mcpHttpPort??18081,mcpWs:e.mcpWsPort??8765});return}if(i.startsWith("/api/install")&&!i.startsWith("/api/install/")){if($.installState.status==="downloading"){(0,u.sendJSON)(t,200,{ok:"downloading",message:"\u6B63\u5728\u5B89\u88C5\u4E2D..."});return}const n=new URL(i,"http://localhost").searchParams.get("version")||void 0;if(!n){(0,u.sendJSON)(t,400,{status:"\u5931\u8D25",message:"\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 version\uFF0C\u7528\u6CD5: GET /api/install?version=x.x.x"});return}t.writeHead(200,{...P,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"}),(0,$.runInstall)(t,n);return}if(i.startsWith("/api/watch")){const n=new URL(i,"http://localhost").searchParams.get("ppid");if(!n||isNaN(Number(n))){(0,u.sendJSON)(t,400,{status:"\u5931\u8D25",message:"\u7F3A\u5C11\u6709\u6548\u7684 ppid \u53C2\u6570\uFF0C\u7528\u6CD5: GET /api/watch?ppid=12345"});return}const e=parseInt(n,10);try{process.kill(e,0)}catch{(0,u.sendJSON)(t,400,{status:"\u5931\u8D25",message:`\u8FDB\u7A0B ${e} \u4E0D\u5B58\u5728`});return}const o=(0,f.readState)();(0,f.writeState)({...o,ppid:e}),N(e),(0,u.sendJSON)(t,200,{status:"\u6210\u529F",message:`\u5DF2\u5F00\u59CB\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${e}`});return}if(i==="/api/qbotclaw"&&s.method==="POST"){let g="";s.on("data",n=>{g+=n.toString()}),s.on("end",()=>{let n;try{const e=JSON.parse(g);if(!Array.isArray(e.args)||e.args.length===0){(0,u.sendJSON)(t,400,{status:"\u5931\u8D25",message:"\u53C2\u6570 args \u5FC5\u987B\u662F\u975E\u7A7A\u6570\u7EC4"});return}n=e.args.map(o=>String(o))}catch{(0,u.sendJSON)(t,400,{status:"\u5931\u8D25",message:"\u8BF7\u6C42\u4F53\u5FC5\u987B\u662F\u5408\u6CD5\u7684 JSON"});return}if(!m.default.existsSync(a.QBOTCLAW_BIN)){(0,u.sendJSON)(t,404,{status:"\u5931\u8D25",message:`qbotclaw \u53EF\u6267\u884C\u6587\u4EF6\u4E0D\u5B58\u5728: ${a.QBOTCLAW_BIN}`});return}t.writeHead(200,{...P,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"}),(0,$.runQBotClaw)(n,t).then(()=>{t.end(`
1
+ "use strict";var $=exports&&exports.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.server=void 0,exports.watchParentProcess=O;const T=$(require("http")),h=$(require("fs")),C=$(require("path")),n=require("./config"),g=require("./utils"),a=require("./reportLog"),_=require("./installer"),m=require("./state"),S=require("child_process"),f={"Access-Control-Allow-Origin":"*","Access-Control-Allow-Methods":"GET, POST, PUT, DELETE, OPTIONS","Access-Control-Allow-Headers":"Content-Type, Authorization, X-Requested-With","Access-Control-Max-Age":"86400"};function N(i){for(const[e,u]of Object.entries(f))i.setHeader(e,u)}exports.server=T.default.createServer(async(i,e)=>{const u=i.url||"";if(N(e),i.method==="OPTIONS"){e.writeHead(204,f),e.end();return}if(u==="/api/version"){let s="unknown";try{const c=C.default.join(__dirname,"..","package.json");s=JSON.parse(h.default.readFileSync(c,"utf-8")).version||"unknown"}catch{}let r="unknown";try{r=(await(0,g.execCommand)(`"${n.NODE_BIN}" -v`)).trim(),(0,a.log)(`[version] node \u7248\u672C: ${r}`)}catch(c){(0,a.log)(`[version] \u83B7\u53D6 node \u7248\u672C\u5931\u8D25: ${c.message}`),r=`error: ${c.message}`}const t=await(0,g.getQBotClawVersion)()??"0.0.0";(0,a.log)(`[version] qbotclaw \u7248\u672C: ${t}`);let o="0.0.0";if(h.default.existsSync(n.MCPORTER_BIN))try{o=(await(0,g.execCommand)(`"${n.NODE_BIN}" "${n.MCPORTER_BIN}" --version`)).trim(),(0,a.log)(`[version] mcporter \u7248\u672C: ${o}`)}catch(c){(0,a.log)(`[version] \u83B7\u53D6 mcporter \u7248\u672C\u5931\u8D25: ${c.message}`),o=`error: ${c.message}`}let p="0.0.0";if(h.default.existsSync(n.PYTHON_BIN))try{p=(await(0,g.execCommand)(`"${n.PYTHON_BIN}" --version`)).trim(),(0,a.log)(`[version] python \u7248\u672C: ${p}`)}catch(c){(0,a.log)(`[version] \u83B7\u53D6 python \u7248\u672C\u5931\u8D25: ${c.message}`),p=`error: ${c.message}`}(0,g.sendJSON)(e,200,{status:"\u6210\u529F",launcher:s,node:r,qbotclaw:t,mcporter:o,python:p});return}if(u==="/api/port"){const s=exports.server.address(),r=s&&typeof s=="object"?s.port:null,t=(0,m.readState)();(0,g.sendJSON)(e,200,{status:"\u6210\u529F",launcher:r,qbotclaw:t.gatewayPort??2e3,mcpHttp:t.mcpHttpPort??n.DEFAULT_MCP_HTTP_PORT,mcpWs:t.mcpWsPort??8765});return}if(u==="/api/status"){const s=(0,m.readState)(),r=[];if(s.gatewayPid)try{process.kill(s.gatewayPid,0)}catch{r.push(`gateway \u8FDB\u7A0B (pid: ${s.gatewayPid}) \u5DF2\u9000\u51FA`)}else r.push("gateway \u8FDB\u7A0B\u672A\u542F\u52A8\uFF08\u72B6\u6001\u4E2D\u65E0 gatewayPid\uFF09");const t=[{name:"gateway",port:s.gatewayPort},{name:"mcpHttp",port:s.mcpHttpPort},{name:"mcpWs",port:s.mcpWsPort}];for(const{name:o,port:p}of t){if(!p){r.push(`${o} \u7AEF\u53E3\u672A\u914D\u7F6E\uFF08\u72B6\u6001\u4E2D\u65E0\u5BF9\u5E94\u7AEF\u53E3\u53F7\uFF09`);continue}await(0,m.isPortAvailable)(p)&&r.push(`${o} \u7AEF\u53E3 (${p}) \u65E0\u670D\u52A1\u76D1\u542C`)}r.length===0?(0,g.sendJSON)(e,200,{ok:!0,message:"\u6240\u6709\u670D\u52A1\u8FD0\u884C\u6B63\u5E38"}):(0,g.sendJSON)(e,200,{ok:!1,message:r.join("\uFF1B")});return}if(u==="/api/restart"){try{const s=(0,m.readState)();if(s.gatewayPid)try{process.kill(s.gatewayPid,"SIGTERM"),(0,a.log)(`[restart] \u5DF2\u53D1\u9001 SIGTERM \u7ED9\u65E7 gateway \u8FDB\u7A0B pid: ${s.gatewayPid}`)}catch{(0,a.log)(`[restart] \u65E7 gateway \u8FDB\u7A0B ${s.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA\uFF0C\u5FFD\u7565`)}const{gatewayPid:r,gatewayPort:t,mcpHttpPort:o,mcpWsPort:p,...c}=s;(0,m.writeState)(c),(0,a.log)("[restart] \u5DF2\u6E05\u9664 gatewayPid, gatewayPort, mcpHttpPort, mcpWsPort"),await(0,_.configAndRunQBotClaw)(),(0,a.log)("[restart] QBotClaw gateway \u91CD\u542F\u5B8C\u6210");const d=(0,m.readState)(),l=exports.server.address(),w=l&&typeof l=="object"?l.port:null;(0,g.sendJSON)(e,200,{ok:!0,message:"QBotClaw gateway \u91CD\u542F\u6210\u529F",launcher:w,qbotclaw:d.gatewayPort??2e3,mcpHttp:d.mcpHttpPort??n.DEFAULT_MCP_HTTP_PORT,mcpWs:d.mcpWsPort??8765})}catch(s){(0,a.log)(`[restart] \u91CD\u542F\u5931\u8D25: ${s.message}`),(0,g.sendJSON)(e,500,{ok:!1,message:`\u91CD\u542F\u5931\u8D25: ${s.message}`})}return}if(u.startsWith("/api/install")&&!u.startsWith("/api/install/")){if(_.installState.status==="downloading"){(0,g.sendJSON)(e,200,{ok:"downloading",message:"\u6B63\u5728\u5B89\u88C5\u4E2D..."});return}const r=new URL(u,"http://localhost").searchParams.get("version")||void 0;if(!r){(0,g.sendJSON)(e,400,{status:"\u5931\u8D25",message:"\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 version\uFF0C\u7528\u6CD5: GET /api/install?version=x.x.x"});return}e.writeHead(200,{...f,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"}),(0,_.runInstall)(e,r);return}if(u.startsWith("/api/watch")){const r=new URL(u,"http://localhost").searchParams.get("ppid");if(!r||isNaN(Number(r))){(0,g.sendJSON)(e,400,{status:"\u5931\u8D25",message:"\u7F3A\u5C11\u6709\u6548\u7684 ppid \u53C2\u6570\uFF0C\u7528\u6CD5: GET /api/watch?ppid=12345"});return}const t=parseInt(r,10);try{process.kill(t,0)}catch{(0,g.sendJSON)(e,400,{status:"\u5931\u8D25",message:`\u8FDB\u7A0B ${t} \u4E0D\u5B58\u5728`});return}const o=(0,m.readState)();(0,m.writeState)({...o,ppid:t}),O(t),(0,g.sendJSON)(e,200,{status:"\u6210\u529F",message:`\u5DF2\u5F00\u59CB\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${t}`});return}if(u==="/api/qbotclaw"&&i.method==="POST"){let s="";i.on("data",r=>{s+=r.toString()}),i.on("end",()=>{let r;try{const t=JSON.parse(s);if(!Array.isArray(t.args)||t.args.length===0){(0,g.sendJSON)(e,400,{status:"\u5931\u8D25",message:"\u53C2\u6570 args \u5FC5\u987B\u662F\u975E\u7A7A\u6570\u7EC4"});return}r=t.args.map(o=>String(o))}catch{(0,g.sendJSON)(e,400,{status:"\u5931\u8D25",message:"\u8BF7\u6C42\u4F53\u5FC5\u987B\u662F\u5408\u6CD5\u7684 JSON"});return}if(!h.default.existsSync(n.QBOTCLAW_BIN)){(0,g.sendJSON)(e,404,{status:"\u5931\u8D25",message:`qbotclaw \u53EF\u6267\u884C\u6587\u4EF6\u4E0D\u5B58\u5728: ${n.QBOTCLAW_BIN}`});return}e.writeHead(200,{...f,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"}),(0,_.runQBotClaw)(r,e).then(()=>{e.end(`
2
2
  [\u6267\u884C\u6210\u529F]
3
- `)}).catch(e=>{t.end(`
4
- [\u542F\u52A8\u5931\u8D25: ${e.message}]
5
- `)})});return}if(i.startsWith("/api/uninstall")){const n=new URL(i,"http://localhost").searchParams.get("keepWorkspace")==="true";t.writeHead(200,{...P,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"});const e=(o,h,c)=>{if(t.writable)try{t.write(JSON.stringify({status:o,file:h,msg:c})+`
6
- `)}catch{}};try{e("\u6210\u529F","","\u6B63\u5728\u505C\u6B62 QBotClaw...");const o=(0,f.readState)();if(o.gatewayPid)try{process.kill(o.gatewayPid,"SIGTERM"),(0,r.log)(`[uninstall] \u5DF2\u505C\u6B62 QBotClaw gateway \u8FDB\u7A0B pid: ${o.gatewayPid}`),e("\u6210\u529F","",`\u5DF2\u505C\u6B62 QBotClaw gateway \u8FDB\u7A0B pid: ${o.gatewayPid}`)}catch{(0,r.log)(`[uninstall] QBotClaw gateway \u8FDB\u7A0B ${o.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA`),e("\u6210\u529F","",`QBotClaw gateway \u8FDB\u7A0B ${o.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA`)}else e("\u6210\u529F","","QBotClaw \u672A\u5728\u8FD0\u884C");e("\u6210\u529F","",`\u6B63\u5728\u6267\u884C npm uninstall -g ${a.NPM_PACKAGE_NAME}...`);try{await new Promise((c,d)=>{const l=(0,S.spawn)(a.NPM_BIN,["--userconfig",a.NPM_RC,"uninstall","-g",a.NPM_PACKAGE_NAME],{env:{...process.env,PATH:`${a.NODE_BIN_DIR}:${process.env.PATH}`}});l.stdout?.on("data",p=>{(0,r.log)(`[uninstall] npm: ${p.toString().trim()}`)}),l.stderr?.on("data",p=>{(0,r.log)(`[uninstall] npm stderr: ${p.toString().trim()}`)}),l.on("close",p=>{p===0?c():d(new Error(`npm uninstall \u9000\u51FA\u7801: ${p}`))}),l.on("error",p=>d(p))}),(0,r.log)(`[uninstall] npm uninstall -g ${a.NPM_PACKAGE_NAME} \u6210\u529F`),e("\u6210\u529F","",`npm uninstall -g ${a.NPM_PACKAGE_NAME} \u6210\u529F`)}catch(c){(0,r.log)(`[uninstall] npm uninstall \u5931\u8D25: ${c.message}`),e("\u5931\u8D25","",`npm uninstall \u5931\u8D25: ${c.message}`)}e("\u6210\u529F","",`\u6B63\u5728\u6E05\u7406\u76EE\u5F55 ${a.QBOT_CLAW_DIR}...`);const h=[];if(m.default.existsSync(a.QBOT_CLAW_DIR)){const c=m.default.readdirSync(a.QBOT_CLAW_DIR);for(const d of c){const l=C.default.join(a.QBOT_CLAW_DIR,d);if(n&&d==="workspace"){e("\u6210\u529F",l,"\u4FDD\u7559 workspace \u76EE\u5F55");continue}try{m.default.statSync(l).isDirectory()?m.default.rmSync(l,{recursive:!0,force:!0}):m.default.unlinkSync(l),e("\u6210\u529F",l,"\u5DF2\u5220\u9664")}catch(p){(0,r.log)(`[uninstall] \u5220\u9664\u5931\u8D25: ${l} - ${p.message}`),e("\u5931\u8D25",l,`\u5220\u9664\u5931\u8D25: ${p.message}`),h.push(l)}}if(h.length>0){e("\u6210\u529F","",`${h.length} \u4E2A\u9879\u76EE\u5220\u9664\u5931\u8D25\uFF0C\u4F7F\u7528 rm \u547D\u4EE4\u91CD\u8BD5...`);for(const d of h)try{(0,S.execSync)(`rm -rf "${d}"`),(0,r.log)(`[uninstall] rm -rf \u91CD\u8BD5\u6210\u529F: ${d}`),e("\u6210\u529F",d,"rm \u91CD\u8BD5\u5220\u9664\u6210\u529F")}catch(l){(0,r.log)(`[uninstall] rm -rf \u91CD\u8BD5\u4E5F\u5931\u8D25: ${d} - ${l.message}`),e("\u5931\u8D25",d,`rm \u91CD\u8BD5\u4E5F\u5931\u8D25: ${l.message}`)}}if(n)e("\u6210\u529F",a.QBOT_CLAW_DIR,"\u4FDD\u7559\u6839\u76EE\u5F55\uFF08workspace \u6A21\u5F0F\uFF09");else try{m.default.rmSync(a.QBOT_CLAW_DIR,{recursive:!0,force:!0}),e("\u6210\u529F",a.QBOT_CLAW_DIR,"\u5DF2\u5220\u9664\u6839\u76EE\u5F55")}catch(d){(0,r.log)(`[uninstall] \u5220\u9664\u6839\u76EE\u5F55\u5931\u8D25: ${d.message}`);try{(0,S.execSync)(`rm -rf "${a.QBOT_CLAW_DIR}"`),e("\u6210\u529F",a.QBOT_CLAW_DIR,"rm \u91CD\u8BD5\u5220\u9664\u6839\u76EE\u5F55\u6210\u529F")}catch(l){e("\u5931\u8D25",a.QBOT_CLAW_DIR,`\u5220\u9664\u6839\u76EE\u5F55\u5931\u8D25: ${l.message}`)}}}else e("\u6210\u529F",a.QBOT_CLAW_DIR,"\u76EE\u5F55\u4E0D\u5B58\u5728\uFF0C\u65E0\u9700\u6E05\u7406");e("\u6210\u529F","","\u5378\u8F7D\u5B8C\u6210")}catch(o){(0,r.log)(`[uninstall] \u5378\u8F7D\u8FC7\u7A0B\u5F02\u5E38: ${o.message}`),e("\u5931\u8D25","",`\u5378\u8F7D\u8FC7\u7A0B\u5F02\u5E38: ${o.message}`)}t.end(),setTimeout(()=>{(0,r.log)("[uninstall] \u5378\u8F7D\u6D41\u7A0B\u7ED3\u675F\uFF0Clauncher \u8FDB\u7A0B\u9000\u51FA"),process.exit(0)},500);return}(0,u.sendJSON)(t,404,{status:"\u5931\u8D25",message:"\u63A5\u53E3\u4E0D\u5B58\u5728"})});let w=null,_=null;function N(s){if(!s)return;if(w&&_===s){(0,r.log)(`[watchParentProcess] \u5DF2\u5728\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${s}\uFF0C\u8DF3\u8FC7\u91CD\u590D\u76D1\u542C`);return}w?((0,r.log)(`[watchParentProcess] \u5DF2\u6709\u76D1\u63A7\uFF08ppid: ${_}\uFF09\uFF0C\u505C\u6B62\u65E7\u7684\u76D1\u63A7\uFF0C\u91CD\u65B0\u76D1\u63A7 ppid: ${s}`),clearInterval(w),w=null,_=null):(0,r.log)(`[watchParentProcess] \u5F00\u59CB\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${s}`);const t=setInterval(()=>{try{process.kill(s,0)}catch{(0,r.log)(`[watchParentProcess] \u7236\u8FDB\u7A0B ${s} \u5DF2\u9000\u51FA\uFF0C\u5F00\u59CB\u6E05\u7406\u5E76\u9000\u51FA`),clearInterval(t),w=null,_=null;const i=(0,f.readState)();if(i.gatewayPid)try{process.kill(i.gatewayPid,"SIGTERM"),(0,r.log)(`[watchParentProcess] \u5DF2\u53D1\u9001 SIGTERM \u7ED9 qbotclaw \u8FDB\u7A0B pid: ${i.gatewayPid}`)}catch{(0,r.log)(`[watchParentProcess] qbotclaw \u8FDB\u7A0B ${i.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA\uFF0C\u5FFD\u7565`)}(0,f.clearState)(),(0,r.log)("[watchParentProcess] \u72B6\u6001\u5DF2\u6E05\u7406\uFF0C\u5173\u95ED server \u5E76\u9000\u51FA"),exports.server.close(()=>{(0,r.log)("[watchParentProcess] server \u5DF2\u5173\u95ED\uFF0C\u8FDB\u7A0B\u9000\u51FA"),process.exit(0)}),setTimeout(()=>{(0,r.log)("[watchParentProcess] server.close \u8D85\u65F6\uFF0C\u5F3A\u5236\u9000\u51FA"),process.exit(0)},3e3).unref()}},3e3);t.unref(),w=t,_=s}
3
+ `)}).catch(t=>{e.end(`
4
+ [\u542F\u52A8\u5931\u8D25: ${t.message}]
5
+ `)})});return}if(u.startsWith("/api/uninstall")){const r=new URL(u,"http://localhost").searchParams.get("keepWorkspace")==="true";e.writeHead(200,{...f,"Content-Type":"text/plain; charset=utf-8","Transfer-Encoding":"chunked","Cache-Control":"no-cache"});const t=(o,p,c)=>{if(e.writable)try{e.write(JSON.stringify({status:o,file:p,msg:c})+`
6
+ `)}catch{}};try{t("\u6210\u529F","","\u6B63\u5728\u505C\u6B62 QBotClaw...");const o=(0,m.readState)();if(o.gatewayPid)try{process.kill(o.gatewayPid,"SIGTERM"),(0,a.log)(`[uninstall] \u5DF2\u505C\u6B62 QBotClaw gateway \u8FDB\u7A0B pid: ${o.gatewayPid}`),t("\u6210\u529F","",`\u5DF2\u505C\u6B62 QBotClaw gateway \u8FDB\u7A0B pid: ${o.gatewayPid}`)}catch{(0,a.log)(`[uninstall] QBotClaw gateway \u8FDB\u7A0B ${o.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA`),t("\u6210\u529F","",`QBotClaw gateway \u8FDB\u7A0B ${o.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA`)}else t("\u6210\u529F","","QBotClaw \u672A\u5728\u8FD0\u884C");t("\u6210\u529F","",`\u6B63\u5728\u6267\u884C npm uninstall -g ${n.NPM_PACKAGE_NAME}...`);try{await new Promise((c,d)=>{const l=(0,S.spawn)(n.NPM_BIN,["--userconfig",n.NPM_RC,"uninstall","-g",n.NPM_PACKAGE_NAME],{env:{...process.env,PATH:`${n.NODE_BIN_DIR}:${process.env.PATH}`}});l.stdout?.on("data",w=>{(0,a.log)(`[uninstall] npm: ${w.toString().trim()}`)}),l.stderr?.on("data",w=>{(0,a.log)(`[uninstall] npm stderr: ${w.toString().trim()}`)}),l.on("close",w=>{w===0?c():d(new Error(`npm uninstall \u9000\u51FA\u7801: ${w}`))}),l.on("error",w=>d(w))}),(0,a.log)(`[uninstall] npm uninstall -g ${n.NPM_PACKAGE_NAME} \u6210\u529F`),t("\u6210\u529F","",`npm uninstall -g ${n.NPM_PACKAGE_NAME} \u6210\u529F`)}catch(c){(0,a.log)(`[uninstall] npm uninstall \u5931\u8D25: ${c.message}`),t("\u5931\u8D25","",`npm uninstall \u5931\u8D25: ${c.message}`)}t("\u6210\u529F","",`\u6B63\u5728\u6E05\u7406\u76EE\u5F55 ${n.QBOT_CLAW_DIR}...`);const p=[];if(h.default.existsSync(n.QBOT_CLAW_DIR)){const c=h.default.readdirSync(n.QBOT_CLAW_DIR);for(const d of c){const l=C.default.join(n.QBOT_CLAW_DIR,d);if(r&&d==="workspace"){t("\u6210\u529F",l,"\u4FDD\u7559 workspace \u76EE\u5F55");continue}try{h.default.statSync(l).isDirectory()?h.default.rmSync(l,{recursive:!0,force:!0}):h.default.unlinkSync(l),t("\u6210\u529F",l,"\u5DF2\u5220\u9664")}catch(w){(0,a.log)(`[uninstall] \u5220\u9664\u5931\u8D25: ${l} - ${w.message}`),t("\u5931\u8D25",l,`\u5220\u9664\u5931\u8D25: ${w.message}`),p.push(l)}}if(p.length>0){t("\u6210\u529F","",`${p.length} \u4E2A\u9879\u76EE\u5220\u9664\u5931\u8D25\uFF0C\u4F7F\u7528 rm \u547D\u4EE4\u91CD\u8BD5...`);for(const d of p)try{(0,S.execSync)(`rm -rf "${d}"`),(0,a.log)(`[uninstall] rm -rf \u91CD\u8BD5\u6210\u529F: ${d}`),t("\u6210\u529F",d,"rm \u91CD\u8BD5\u5220\u9664\u6210\u529F")}catch(l){(0,a.log)(`[uninstall] rm -rf \u91CD\u8BD5\u4E5F\u5931\u8D25: ${d} - ${l.message}`),t("\u5931\u8D25",d,`rm \u91CD\u8BD5\u4E5F\u5931\u8D25: ${l.message}`)}}if(r)t("\u6210\u529F",n.QBOT_CLAW_DIR,"\u4FDD\u7559\u6839\u76EE\u5F55\uFF08workspace \u6A21\u5F0F\uFF09");else try{h.default.rmSync(n.QBOT_CLAW_DIR,{recursive:!0,force:!0}),t("\u6210\u529F",n.QBOT_CLAW_DIR,"\u5DF2\u5220\u9664\u6839\u76EE\u5F55")}catch(d){(0,a.log)(`[uninstall] \u5220\u9664\u6839\u76EE\u5F55\u5931\u8D25: ${d.message}`);try{(0,S.execSync)(`rm -rf "${n.QBOT_CLAW_DIR}"`),t("\u6210\u529F",n.QBOT_CLAW_DIR,"rm \u91CD\u8BD5\u5220\u9664\u6839\u76EE\u5F55\u6210\u529F")}catch(l){t("\u5931\u8D25",n.QBOT_CLAW_DIR,`\u5220\u9664\u6839\u76EE\u5F55\u5931\u8D25: ${l.message}`)}}}else t("\u6210\u529F",n.QBOT_CLAW_DIR,"\u76EE\u5F55\u4E0D\u5B58\u5728\uFF0C\u65E0\u9700\u6E05\u7406");t("\u6210\u529F","","\u5378\u8F7D\u5B8C\u6210")}catch(o){(0,a.log)(`[uninstall] \u5378\u8F7D\u8FC7\u7A0B\u5F02\u5E38: ${o.message}`),t("\u5931\u8D25","",`\u5378\u8F7D\u8FC7\u7A0B\u5F02\u5E38: ${o.message}`)}e.end(),setTimeout(()=>{(0,a.log)("[uninstall] \u5378\u8F7D\u6D41\u7A0B\u7ED3\u675F\uFF0Clauncher \u8FDB\u7A0B\u9000\u51FA"),process.exit(0)},500);return}(0,g.sendJSON)(e,404,{status:"\u5931\u8D25",message:"\u63A5\u53E3\u4E0D\u5B58\u5728"})});let P=null,y=null;function O(i){if(!i)return;if(P&&y===i){(0,a.log)(`[watchParentProcess] \u5DF2\u5728\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${i}\uFF0C\u8DF3\u8FC7\u91CD\u590D\u76D1\u542C`);return}P?((0,a.log)(`[watchParentProcess] \u5DF2\u6709\u76D1\u63A7\uFF08ppid: ${y}\uFF09\uFF0C\u505C\u6B62\u65E7\u7684\u76D1\u63A7\uFF0C\u91CD\u65B0\u76D1\u63A7 ppid: ${i}`),clearInterval(P),P=null,y=null):(0,a.log)(`[watchParentProcess] \u5F00\u59CB\u76D1\u63A7\u7236\u8FDB\u7A0B ppid: ${i}`);const e=setInterval(()=>{try{process.kill(i,0)}catch{(0,a.log)(`[watchParentProcess] \u7236\u8FDB\u7A0B ${i} \u5DF2\u9000\u51FA\uFF0C\u5F00\u59CB\u6E05\u7406\u5E76\u9000\u51FA`),clearInterval(e),P=null,y=null;const u=(0,m.readState)();if(u.gatewayPid)try{process.kill(u.gatewayPid,"SIGTERM"),(0,a.log)(`[watchParentProcess] \u5DF2\u53D1\u9001 SIGTERM \u7ED9 qbotclaw \u8FDB\u7A0B pid: ${u.gatewayPid}`)}catch{(0,a.log)(`[watchParentProcess] qbotclaw \u8FDB\u7A0B ${u.gatewayPid} \u53EF\u80FD\u5DF2\u9000\u51FA\uFF0C\u5FFD\u7565`)}(0,m.clearState)(),(0,a.log)("[watchParentProcess] \u72B6\u6001\u5DF2\u6E05\u7406\uFF0C\u5173\u95ED server \u5E76\u9000\u51FA"),exports.server.close(()=>{(0,a.log)("[watchParentProcess] server \u5DF2\u5173\u95ED\uFF0C\u8FDB\u7A0B\u9000\u51FA"),process.exit(0)}),setTimeout(()=>{(0,a.log)("[watchParentProcess] server.close \u8D85\u65F6\uFF0C\u5F3A\u5236\u9000\u51FA"),process.exit(0)},3e3).unref()}},3e3);e.unref(),P=e,y=i}
package/dist/utils.js CHANGED
@@ -1 +1 @@
1
- "use strict";var c=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.execCommand=u,exports.sendJSON=p,exports.getQBotClawVersion=m,exports.compareVersion=_,exports.findAvailablePort=h;const a=c(require("http")),f=c(require("fs")),d=require("child_process"),i=require("./config");function u(e){return new Promise((r,n)=>{(0,d.exec)(e,(t,s,o)=>{if(t){n(new Error(o||t.message));return}r(s.trim())})})}function p(e,r,n){const t=JSON.stringify(n);e.writeHead(r,{"Content-Type":"application/json","Content-Length":Buffer.byteLength(t),"Access-Control-Allow-Origin":"*","Access-Control-Allow-Methods":"GET, POST, PUT, DELETE, OPTIONS","Access-Control-Allow-Headers":"Content-Type, Authorization, X-Requested-With"}),e.end(t)}async function m(){if(!f.default.existsSync(i.QBOTCLAW_BIN))return null;try{const e=(await u(`"${i.NODE_BIN}" "${i.QBOTCLAW_BIN}" --version`)).trim();return e?/^\d+\.\d+\.\d+$/.test(e)?e:"0.0.0":null}catch{return null}}function _(e,r){const n=e.split(".").map(Number),t=r.split(".").map(Number),s=Math.max(n.length,t.length);for(let o=0;o<s;o++){const l=(n[o]||0)-(t[o]||0);if(l!==0)return l}return 0}function h(){return new Promise((e,r)=>{const n=a.default.createServer();n.listen(0,"127.0.0.1",()=>{const t=n.address(),s=t&&typeof t=="object"?t.port:null;n.close(o=>{o||s===null?r(o||new Error("\u65E0\u6CD5\u83B7\u53D6\u53EF\u7528\u7AEF\u53E3")):e(s)})}),n.on("error",r)})}
1
+ "use strict";var u=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.execCommand=f,exports.sendJSON=_,exports.getQBotClawVersion=w,exports.compareVersion=h,exports.findAvailablePort=y;const d=u(require("http")),m=u(require("fs")),p=require("child_process"),c=require("./config");function f(e){return new Promise((n,o)=>{(0,p.exec)(e,(r,s,t)=>{if(r){o(new Error(t||r.message));return}n(s.trim())})})}function _(e,n,o){const r=JSON.stringify(o);e.writeHead(n,{"Content-Type":"application/json","Content-Length":Buffer.byteLength(r),"Access-Control-Allow-Origin":"*","Access-Control-Allow-Methods":"GET, POST, PUT, DELETE, OPTIONS","Access-Control-Allow-Headers":"Content-Type, Authorization, X-Requested-With"}),e.end(r)}async function w(){if(!m.default.existsSync(c.QBOTCLAW_BIN))return null;try{const e=(await f(`"${c.NODE_BIN}" "${c.QBOTCLAW_BIN}" --version`)).trim();return e?/^\d+\.\d+\.\d+$/.test(e)?e:"0.0.0":null}catch{return null}}function h(e,n){const o=e.split(".").map(Number),r=n.split(".").map(Number),s=Math.max(o.length,r.length);for(let t=0;t<s;t++){const i=(o[t]||0)-(r[t]||0);if(i!==0)return i}return 0}async function y(e){const n=async o=>new Promise((r,s)=>{const t=d.default.createServer();t.listen(o,"127.0.0.1",()=>{const i=t.address(),a=i&&typeof i=="object"?i.port:null;t.close(l=>{l||a===null?s(l||new Error("\u65E0\u6CD5\u83B7\u53D6\u53EF\u7528\u7AEF\u53E3")):r(a)})}),t.on("error",s)});if(e!=null)try{return await n(e)}catch{return await n(0)}return await n(0)}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qqbrowser/qbot-claw-launcher",
3
- "version": "0.9.48",
3
+ "version": "0.9.49",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "bin": {