@qqbrowser/qbot-claw-launcher 0.10.5 → 0.10.7
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/qqbrowser-skill-installer.js +1 -1
- package/dist/service.js +3 -6
- 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.10.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.IS_DEBUG_BUILD=exports.LAUNCHER_VERSION=void 0,exports.LAUNCHER_VERSION="0.10.7",exports.IS_DEBUG_BUILD=!1;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
"use strict";var k=exports&&exports.__importDefault||function(r){return r&&r.__esModule?r:{default:r}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.installQQBrowserSkill=d;const m=k(require("fs")),f=require("child_process"),q=require("./config"),t=require("./reportLog"),_=require("./report"),g="https://test.pypi.org/simple/",$="https://mirrors.tencent.com/pypi/simple/",p=!1,b=p?g:$,u=p?"test.pypi.org":"mirrors.tencent.com";function w(r,l,e){return new Promise(s=>{let n="";const a=(0,f.spawn)(r,l,{stdio:["ignore","pipe","pipe"],windowsHide:!0});a.stdout.on("data",o=>{const i=o.toString().trim();i&&((0,t.log)(`[qqbrowser-skill] ${i}`),e(`[qqbrowser-skill] ${i}`))}),a.stderr.on("data",o=>{const i=o.toString().trim();i&&(n+=i+`
|
|
2
|
-
`,(0,t.log)(`[qqbrowser-skill] ${i}`),e(`[qqbrowser-skill] ${i}`))}),a.on("close",o=>{s({code:o??1,stderr:n})}),a.on("error",o=>{(0,t.log)(`[qqbrowser-skill] \u547D\u4EE4\u6267\u884C\u5931\u8D25: ${o.message}`),s({code:1,stderr:o.message})})})}const c="qqbrowser-skill";async function d(r){const l=Date.now();try{if((0,t.log)("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5 support-trusted-host & force-reinstall"),r("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5..."),process.platform==="darwin"){if(!m.default.existsSync(q.PYTHON_BIN)){(0,t.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,_.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,t.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${c}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:e,stderr:s}=await w(q.PYTHON_BIN,["-m","pip","install","--force-reinstall","-i",b,"--trusted-host",u,"--prefix",q.PYTHON_DIR,c],r);if(e!==0){(0,t.log)(`[qqbrowser-skill] pip install \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}\uFF0Cstderr: ${s}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${e}\uFF09`),(0,_.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:s});return}try{(0,t.log)(`[qqbrowser-skill] \u6E05\u9664 Python \u76EE\u5F55\u9694\u79BB\u5C5E\u6027: ${q.PYTHON_DIR}`),r("[qqbrowser-skill] \u6B63\u5728\u6E05\u9664\u9694\u79BB\u5C5E\u6027...");const{code:n,stderr:a}=await w("/usr/bin/xattr",["-rd","com.apple.quarantine",q.PYTHON_DIR],r);n!==0?(0,t.log)(`[qqbrowser-skill] xattr \u6E05\u9664\u9694\u79BB\u5C5E\u6027\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${n}\uFF09\uFF0Cstderr: ${a}`):(0,t.log)("[qqbrowser-skill] \u9694\u79BB\u5C5E\u6027\u6E05\u9664\u5B8C\u6210")}catch(n){(0,t.log)(`[qqbrowser-skill] xattr \u6267\u884C\u5F02\u5E38: ${n.message}`)}}else if(process.platform==="win32"){(0,t.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${c}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:e,stderr:s}=await w("pip",["install","--force-reinstall","-i",b,"--trusted-host",u,"--
|
|
2
|
+
`,(0,t.log)(`[qqbrowser-skill] ${i}`),e(`[qqbrowser-skill] ${i}`))}),a.on("close",o=>{s({code:o??1,stderr:n})}),a.on("error",o=>{(0,t.log)(`[qqbrowser-skill] \u547D\u4EE4\u6267\u884C\u5931\u8D25: ${o.message}`),s({code:1,stderr:o.message})})})}const c="qqbrowser-skill";async function d(r){const l=Date.now();try{if((0,t.log)("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5 support-trusted-host & force-reinstall"),r("[qqbrowser-skill] \u5F00\u59CB\u5B89\u88C5..."),process.platform==="darwin"){if(!m.default.existsSync(q.PYTHON_BIN)){(0,t.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,_.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,t.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${c}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:e,stderr:s}=await w(q.PYTHON_BIN,["-m","pip","install","--force-reinstall","-i",b,"--trusted-host",u,"--prefix",q.PYTHON_DIR,c],r);if(e!==0){(0,t.log)(`[qqbrowser-skill] pip install \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}\uFF0Cstderr: ${s}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${e}\uFF09`),(0,_.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:s});return}try{(0,t.log)(`[qqbrowser-skill] \u6E05\u9664 Python \u76EE\u5F55\u9694\u79BB\u5C5E\u6027: ${q.PYTHON_DIR}`),r("[qqbrowser-skill] \u6B63\u5728\u6E05\u9664\u9694\u79BB\u5C5E\u6027...");const{code:n,stderr:a}=await w("/usr/bin/xattr",["-rd","com.apple.quarantine",q.PYTHON_DIR],r);n!==0?(0,t.log)(`[qqbrowser-skill] xattr \u6E05\u9664\u9694\u79BB\u5C5E\u6027\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${n}\uFF09\uFF0Cstderr: ${a}`):(0,t.log)("[qqbrowser-skill] \u9694\u79BB\u5C5E\u6027\u6E05\u9664\u5B8C\u6210")}catch(n){(0,t.log)(`[qqbrowser-skill] xattr \u6267\u884C\u5F02\u5E38: ${n.message}`)}}else if(process.platform==="win32"){(0,t.log)(`[qqbrowser-skill] \u4F7F\u7528 pip \u5B89\u88C5/\u5347\u7EA7: ${c}`),r("[qqbrowser-skill] \u6B63\u5728\u901A\u8FC7 pip \u5B89\u88C5/\u5347\u7EA7...");const{code:e,stderr:s}=await w("pip",["install","--force-reinstall","-i",b,"--trusted-host",u,"--prefix",q.PYTHON_DIR,c],r);if(e!==0){(0,t.log)(`[qqbrowser-skill] pip install \u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${e}\uFF0Cstderr: ${s}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801: ${e}\uFF09`),(0,_.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:s});return}}else{(0,t.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,_.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,t.log)("[qqbrowser-skill] \u5B89\u88C5\u5B8C\u6210"),r("[qqbrowser-skill] \u5B89\u88C5\u5B8C\u6210"),(0,_.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"1",cost_ms:String(Date.now()-l)})}catch(e){(0,t.log)(`[qqbrowser-skill] \u5B89\u88C5\u8FC7\u7A0B\u4E2D\u53D1\u751F\u5F02\u5E38: ${e.message}`),r(`[qqbrowser-skill] \u5B89\u88C5\u5F02\u5E38: ${e.message}`),(0,_.report)({event_name:"qbot_claw_qqbrowser_skill_install",result:"0",cost_ms:String(Date.now()-l),error:e.message})}}
|
package/dist/service.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";var S=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.readCurrentGatewayToken=
|
|
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 o=e.pid,a=e.port??0;(0,t.clearState)(),process.stdout.write(JSON.stringify({state:"success",pid:o,port:a})+`
|
|
5
|
-
`),process.stdout.uncork()}catch(o){o.code==="ESRCH"&&(0,t.clearState)(),process.stdout.write(JSON.stringify({state:"err",pid:0,port:0})+`
|
|
6
|
-
`),process.stdout.uncork()}}
|
|
1
|
+
"use strict";var S=exports&&exports.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.readCurrentGatewayToken=w,exports.getOrCreateGatewayToken=v,exports.startService=b,exports.stopService=O;const f=S(require("fs")),k=require("crypto"),y=require("./server"),t=require("./state"),p=require("./config"),_=require("./build"),q=require("./installer"),T=require("./utils"),r=require("./reportLog"),o=require("./report");let d,s;const g="0526bec85002fe65ef10d33df0a8dfbe76917cd125f5a4ad";function w(){try{if(!f.default.existsSync(p.QBOT_CLAW_CONFIG_PATH))return(0,r.log)(`[service] \u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728: ${p.QBOT_CLAW_CONFIG_PATH}`),g;const e=f.default.readFileSync(p.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 v(){return s||(s=require("crypto").randomBytes(24).toString("hex"),(0,r.log)(`[service] \u751F\u6210\u65B0\u7684 gateway token: ${s}`),s||w())}async function $(){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 i=e.launcherVersion??null;if((0,r.log)(`[service] \u68C0\u6D4B\u5230\u6B63\u5728\u8FD0\u884C\u7684\u670D\u52A1\u7248\u672C: ${i??"unknown"}\uFF0C\u5F53\u524D\u7248\u672C: ${_.LAUNCHER_VERSION}`),i===_.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: ${i??"unknown"}, \u5F53\u524D: ${_.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,n){if(await $()===!1){const a=(0,t.readState)();process.stdout.write(JSON.stringify({state:"success",pid:a.pid,port:a.port,gatewayToken:w()})+`
|
|
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 c=await(0,t.findAvailablePort)();y.server.listen(c,"127.0.0.1",async()=>{d=(0,k.randomUUID)(),(0,t.writeState)({pid:process.pid,port:c,token:d,launcherVersion:_.LAUNCHER_VERSION,...e?{ppid:e}:{}}),(0,y.watchParentProcess)(e),(0,o.report)({event_name:"qbot_claw_try_start"});let a;if(f.default.existsSync(p.QBOTCLAW_BIN))try{const l=await(0,T.getQBotClawVersion)(),u=(0,t.readState)();l!==n?((0,r.log)(`[service] qbotclaw \u672C\u5730\u7248\u672C (${l??"unknown"}) \u4E0E\u671F\u671B\u7248\u672C (${n}) \u4E0D\u4E00\u81F4\uFF0C\u505C\u6B62\u5F53\u524D qbotclaw \u8FDB\u7A0B`),(0,o.report)({event_name:"qbot_claw_need_update"}),(0,t.stopGateway)()):u.gatewayPid&&u.gatewayPort?((0,r.log)(`[service] qbotclaw \u5DF2\u5728\u8FD0\u884C\uFF0Cpid: ${u.gatewayPid}, port: ${u.gatewayPort}`),a=w(),(0,o.report)({event_name:"qbot_claw_version_match"}),(0,o.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,o.report)({event_name:"qbot_claw_version_match"}),await(0,q.configAndRunQBotClaw)(),a=v())}catch(l){(0,r.log)(`[service] \u81EA\u52A8\u542F\u52A8 gateway \u5931\u8D25: ${l.message}`)}else(0,r.log)("[service] qbotclaw \u672A\u5B89\u88C5\uFF0C\u4E0D\u81EA\u52A8\u542F\u52A8"),(0,o.report)({event_name:"qbot_claw_need_install"});(0,r.log)(`[service] \u670D\u52A1\u542F\u52A8\u6210\u529F\uFF0Cpid: ${process.pid}, port: ${c}, token: ${d}`),process.stdout.write(JSON.stringify({state:"success",pid:process.pid,port:c,token:d,gatewayToken:a})+`
|
|
3
|
+
`),process.stdout.uncork()}),process.on("SIGTERM",()=>{(0,t.stopGateway)(),(0,t.clearState)(),(0,r.flushLogs)().finally(()=>{process.exit(0)})})}function O(){(0,t.stopGateway)();const e=(0,t.readState)();if(!e.pid){(0,t.clearState)();return}try{process.kill(e.pid,"SIGTERM")}catch{}(0,t.clearState)()}
|