wps-multitool-mcp 1.0.2 → 1.0.3
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/bridge/cancellable.d.ts.map +1 -1
- package/dist/bridge/cancellable.js +4 -0
- package/dist/bridge/cancellable.js.map +1 -1
- package/dist/bridge/index.js +105 -16
- package/dist/bridge/index.js.map +1 -1
- package/dist/bridge/ps-child.d.ts +27 -1
- package/dist/bridge/ps-child.d.ts.map +1 -1
- package/dist/bridge/ps-child.js +137 -3
- package/dist/bridge/ps-child.js.map +1 -1
- package/dist/cli/install.d.ts +7 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +98 -0
- package/dist/cli/install.js.map +1 -1
- package/dist/client/action-routes.generated.d.ts +3 -2
- package/dist/client/action-routes.generated.d.ts.map +1 -1
- package/dist/client/action-routes.generated.js +5 -12
- package/dist/client/action-routes.generated.js.map +1 -1
- package/dist/client/addon-channel.d.ts +104 -0
- package/dist/client/addon-channel.d.ts.map +1 -0
- package/dist/client/addon-channel.js +491 -0
- package/dist/client/addon-channel.js.map +1 -0
- package/dist/client/mac-poll-server.d.ts.map +1 -0
- package/dist/client/mac-poll-server.js.map +1 -0
- package/dist/client/ps-daemon.d.ts +1 -0
- package/dist/client/ps-daemon.d.ts.map +1 -1
- package/dist/client/ps-daemon.js +8 -4
- package/dist/client/ps-daemon.js.map +1 -1
- package/dist/client/wps-client.d.ts +3 -1
- package/dist/client/wps-client.d.ts.map +1 -1
- package/dist/client/wps-client.js +82 -9
- package/dist/client/wps-client.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/server/backend-selector.d.ts +51 -0
- package/dist/server/backend-selector.d.ts.map +1 -0
- package/dist/server/backend-selector.js +104 -0
- package/dist/server/backend-selector.js.map +1 -0
- package/dist/server/target-context.d.ts +32 -0
- package/dist/server/target-context.d.ts.map +1 -0
- package/dist/server/target-context.js +47 -0
- package/dist/server/target-context.js.map +1 -0
- package/dist/server/tool-annotations.d.ts.map +1 -1
- package/dist/server/tool-annotations.generated.js +8 -8
- package/dist/server/tool-annotations.generated.js.map +1 -1
- package/dist/server/tool-annotations.js +20 -8
- package/dist/server/tool-annotations.js.map +1 -1
- package/dist/server/tool-registry.d.ts.map +1 -1
- package/dist/server/tool-registry.js +5 -1
- package/dist/server/tool-registry.js.map +1 -1
- package/dist/server/tool-tiers.d.ts +3 -2
- package/dist/server/tool-tiers.d.ts.map +1 -1
- package/dist/server/tool-tiers.js +3 -2
- package/dist/server/tool-tiers.js.map +1 -1
- package/dist/server/tool-verification.d.ts +3 -3
- package/dist/server/tool-verification.js +3 -3
- package/dist/tools/common/batch.js +18 -18
- package/dist/tools/common/general.d.ts.map +1 -1
- package/dist/tools/common/general.js +12 -8
- package/dist/tools/common/general.js.map +1 -1
- package/dist/tools/common/repair.js +18 -18
- package/dist/tools/common/snapshot.d.ts.map +1 -1
- package/dist/tools/common/snapshot.js +4 -1
- package/dist/tools/common/snapshot.js.map +1 -1
- package/dist/tools/common/status.js +27 -27
- package/dist/tools/excel/data.d.ts.map +1 -1
- package/dist/tools/excel/data.js +24 -7
- package/dist/tools/excel/data.js.map +1 -1
- package/dist/tools/excel/formula.d.ts +9 -0
- package/dist/tools/excel/formula.d.ts.map +1 -1
- package/dist/tools/excel/formula.js +64 -6
- package/dist/tools/excel/formula.js.map +1 -1
- package/dist/tools/excel/sheet.d.ts.map +1 -1
- package/dist/tools/excel/sheet.js +30 -5
- package/dist/tools/excel/sheet.js.map +1 -1
- package/dist/tools/excel/workbook.d.ts.map +1 -1
- package/dist/tools/excel/workbook.js +3 -1
- package/dist/tools/excel/workbook.js.map +1 -1
- package/dist/tools/ppt/beautify-advanced.js +88 -88
- package/dist/tools/ppt/chart-flow.d.ts.map +1 -1
- package/dist/tools/ppt/chart-flow.js +5 -0
- package/dist/tools/ppt/chart-flow.js.map +1 -1
- package/dist/tools/ppt/misc.d.ts.map +1 -1
- package/dist/tools/ppt/misc.js +96 -82
- package/dist/tools/ppt/misc.js.map +1 -1
- package/dist/tools/ppt/presentation.d.ts.map +1 -1
- package/dist/tools/ppt/presentation.js +5 -1
- package/dist/tools/ppt/presentation.js.map +1 -1
- package/dist/tools/ppt/shape-basic.d.ts.map +1 -1
- package/dist/tools/ppt/shape-basic.js +4 -0
- package/dist/tools/ppt/shape-basic.js.map +1 -1
- package/dist/tools/ppt/slide-ops.js +159 -159
- package/dist/tools/ppt/slide-ops.js.map +1 -1
- package/dist/tools/ppt/slide.js +1 -1
- package/dist/tools/ppt/slide.js.map +1 -1
- package/dist/tools/word/academic.d.ts.map +1 -1
- package/dist/tools/word/academic.js +93 -83
- package/dist/tools/word/academic.js.map +1 -1
- package/dist/tools/word/content.d.ts.map +1 -1
- package/dist/tools/word/content.js +98 -66
- package/dist/tools/word/content.js.map +1 -1
- package/dist/tools/word/document.d.ts.map +1 -1
- package/dist/tools/word/document.js +120 -58
- package/dist/tools/word/document.js.map +1 -1
- package/dist/tools/word/format.d.ts.map +1 -1
- package/dist/tools/word/format.js +41 -35
- package/dist/tools/word/format.js.map +1 -1
- package/dist/tools/word/gaps.d.ts.map +1 -1
- package/dist/tools/word/gaps.js +11 -5
- package/dist/tools/word/gaps.js.map +1 -1
- package/dist/tools/word/professional.d.ts.map +1 -1
- package/dist/tools/word/professional.js +123 -111
- package/dist/tools/word/professional.js.map +1 -1
- package/dist/tools/word/proofread.d.ts.map +1 -1
- package/dist/tools/word/proofread.js +42 -38
- package/dist/tools/word/proofread.js.map +1 -1
- package/dist/tools/word/target.d.ts +74 -0
- package/dist/tools/word/target.d.ts.map +1 -0
- package/dist/tools/word/target.js +130 -0
- package/dist/tools/word/target.js.map +1 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +31 -1
- package/dist/utils/logger.js.map +1 -1
- package/dist/version.js +1 -1
- package/package.json +72 -66
- package/scripts/wps-com.ps1 +8867 -8255
- package/scripts/wps-comd.ps1 +40 -1
- package/skills/wps-multitool/SKILL.md +130 -129
- package/skills/wps-multitool/references/dsh.md +88 -0
- package/skills/wps-multitool/references/errors.md +61 -61
- package/skills/wps-multitool/references/recipes.md +82 -82
- package/skills/wps-multitool/references/routing.md +87 -87
|
@@ -0,0 +1,491 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Input: 动作名、参数、应用键、实例名(与 B0 转发点签名一致,见 wps-client.ts execWpsAction)
|
|
4
|
+
* Output: 动作结果(Promise<unknown>,与 Windows 通道同形)
|
|
5
|
+
* Pos: Linux/macOS 加载项通道的 Node 侧服务(B2 骨架,长轮询版)。一旦我被修改,请更新我的头部注释,以及所属目录的md。
|
|
6
|
+
*
|
|
7
|
+
* 为什么由本模块持有服务(计划 §3.1)
|
|
8
|
+
* --------------------------------
|
|
9
|
+
* 桥(src/bridge/**)是 Windows 专用:spawn PowerShell、监听 \\.\pipe\,Linux 上两者都不存在。
|
|
10
|
+
* 所以加载项通道由 MCP server 进程本身持有:独立端口、独立认证,与面板只读端口 27731
|
|
11
|
+
* 物理分开(C2)——执行通道能改文档,暴露面必须小于只读通道。
|
|
12
|
+
*
|
|
13
|
+
* 连接方向(计划 §4.4)
|
|
14
|
+
* ------------------
|
|
15
|
+
* 加载项跑在 WPS 进程内的 webview 里,主动【出站】连 Node;Node 不去连 WPS
|
|
16
|
+
* (让 WPS 监听端口要动防火墙,且嵌入式 webview 未必能监听)。
|
|
17
|
+
*
|
|
18
|
+
* 三型同端口 + 握手声明型别(计划 §12.1,B2 定案)
|
|
19
|
+
* ---------------------------------------------
|
|
20
|
+
* S1 实测三型对象模型互相看不见(wps 只有 Documents / et 只有 Workbooks / wpp 只有
|
|
21
|
+
* Presentations),Linux 侧必须部署三个加载项,各自连到同一个端口,靠握手 body 的
|
|
22
|
+
* type 字段记会话。同型后来者覆盖前者(WPS 重启后加载项重连的场景)。
|
|
23
|
+
*
|
|
24
|
+
* 传输:长轮询(计划 §4.6)
|
|
25
|
+
* ----------------------
|
|
26
|
+
* 加载项 GET /poll 取任务(无任务挂起到 10s)、POST /result 交结果。
|
|
27
|
+
* 轮询的已知风险照记:WPS 最小化/省电时 webview 定时器可能被节流到分钟级——
|
|
28
|
+
* 不报错、不掉线、只是慢(R6)。spike 用轮询,上线按 §4.6 评估换 WS;
|
|
29
|
+
* 协议帧与 Windows 管道同构({ id, action, params, app },ps-daemon.ts:150),
|
|
30
|
+
* 换 transport 不改动作层、不用重测覆盖率。
|
|
31
|
+
*
|
|
32
|
+
* 失败语义(红线,照抄 ps-daemon.ts:24-28 的契约)
|
|
33
|
+
* ---------------------------------------------
|
|
34
|
+
* AddonUnavailableError 只能表示【请求从未送出】(无该型会话 / 会话在途忙 /
|
|
35
|
+
* 未被取走的任务被顶替)。调用方可安全重试或降级。
|
|
36
|
+
* 任务已被 /poll 的响应送达加载项之后出的任何错(超时、无回包),都可能已经在
|
|
37
|
+
* WPS 里执行了一半 —— 绝不自动重放,一律如实抛普通 Error。
|
|
38
|
+
* "已送出"的边界 = /poll 的 HTTP 响应写出到 socket;poll 请求在写出前断开,
|
|
39
|
+
* 任务退回轮询池。写出失败无法回退,由超时兜底(不重放)。
|
|
40
|
+
*
|
|
41
|
+
* 排队(计划 §4.5 / 任务卡 §0)
|
|
42
|
+
* --------------------------
|
|
43
|
+
* 每会话同时只挂 1 个待执行任务(与桥"STA 在途恒为 1"对齐):
|
|
44
|
+
* - 轮询池里已有未取走任务,新调用到达 → 旧任务从未送出,判 AddonUnavailableError,新任务顶上;
|
|
45
|
+
* - 已有任务在途(已送达加载项未回)→ 新请求从未送出,判 AddonUnavailableError(不排队堆积)。
|
|
46
|
+
*
|
|
47
|
+
* instance 参数:v1 轮询版忽略。S1 实测 Linux WPS 单实例(R15),Windows 的实例池隔离
|
|
48
|
+
* 不存在,多目标语义由动作层"同实例内按名钉文档"承接。
|
|
49
|
+
*
|
|
50
|
+
* 本模块由谁启动:MCP server 进程按需调用 start();测试可传 { port, token } 随机端口自起自停。
|
|
51
|
+
*/
|
|
52
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
53
|
+
if (k2 === undefined) k2 = k;
|
|
54
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
55
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
56
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
57
|
+
}
|
|
58
|
+
Object.defineProperty(o, k2, desc);
|
|
59
|
+
}) : (function(o, m, k, k2) {
|
|
60
|
+
if (k2 === undefined) k2 = k;
|
|
61
|
+
o[k2] = m[k];
|
|
62
|
+
}));
|
|
63
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
64
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
65
|
+
}) : function(o, v) {
|
|
66
|
+
o["default"] = v;
|
|
67
|
+
});
|
|
68
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
69
|
+
var ownKeys = function(o) {
|
|
70
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
71
|
+
var ar = [];
|
|
72
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
73
|
+
return ar;
|
|
74
|
+
};
|
|
75
|
+
return ownKeys(o);
|
|
76
|
+
};
|
|
77
|
+
return function (mod) {
|
|
78
|
+
if (mod && mod.__esModule) return mod;
|
|
79
|
+
var result = {};
|
|
80
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
81
|
+
__setModuleDefault(result, mod);
|
|
82
|
+
return result;
|
|
83
|
+
};
|
|
84
|
+
})();
|
|
85
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
86
|
+
exports.AddonUnavailableError = exports.ADDON_PORT = void 0;
|
|
87
|
+
exports.start = start;
|
|
88
|
+
exports.stop = stop;
|
|
89
|
+
exports.status = status;
|
|
90
|
+
exports.sessionCounters = sessionCounters;
|
|
91
|
+
exports.call = call;
|
|
92
|
+
const http = __importStar(require("http"));
|
|
93
|
+
const uuid_1 = require("uuid");
|
|
94
|
+
/** 执行通道端口(C2:与面板只读端口 27731 物理分开)。只 bind 127.0.0.1。 */
|
|
95
|
+
exports.ADDON_PORT = (() => {
|
|
96
|
+
const v = parseInt(process.env.WPS_ADDON_PORT || '27740', 10);
|
|
97
|
+
return Number.isFinite(v) && v > 0 ? v : 27740;
|
|
98
|
+
})();
|
|
99
|
+
/** 长轮询挂起上限:无任务时 /poll 最多挂这么久就回 idle,让加载项重新发起 */
|
|
100
|
+
const POLL_HANG_MS = 10_000;
|
|
101
|
+
/** 单动作上限沿用桥口径(ps-daemon.ts:46-49);每次调用时重读,便于按场景临时收紧 */
|
|
102
|
+
function callTimeoutMs() {
|
|
103
|
+
const v = parseInt(process.env.WPS_DAEMON_TIMEOUT || '120000', 10);
|
|
104
|
+
return Number.isFinite(v) && v > 0 ? v : 120000;
|
|
105
|
+
}
|
|
106
|
+
/** 通道【整条】不可用(请求从未送出)时抛这个;调用方可安全重试/降级。 */
|
|
107
|
+
class AddonUnavailableError extends Error {
|
|
108
|
+
constructor(message) {
|
|
109
|
+
super(message);
|
|
110
|
+
this.name = 'AddonUnavailableError';
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
exports.AddonUnavailableError = AddonUnavailableError;
|
|
114
|
+
const ADDON_TYPES = ['wps', 'et', 'wpp'];
|
|
115
|
+
/**
|
|
116
|
+
* 动作路由(任务卡 §0 拍死的 v1 简化):word→wps 会话、excel→et、ppt→wpp、common→wps。
|
|
117
|
+
* common 挂在文字型上是 v1 的简化 —— Windows 侧 common 动作多是进程级(quitWps/wpsStatus 等),
|
|
118
|
+
* B3 动作层实现时若发现需要按动作名细分会话,改这里一个函数就够。
|
|
119
|
+
*/
|
|
120
|
+
function sessionTypeOf(app) {
|
|
121
|
+
switch (app) {
|
|
122
|
+
case 'excel':
|
|
123
|
+
return 'et';
|
|
124
|
+
case 'ppt':
|
|
125
|
+
return 'wpp';
|
|
126
|
+
default:
|
|
127
|
+
return 'wps';
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
const sessions = new Map();
|
|
131
|
+
const sessionById = new Map();
|
|
132
|
+
let server = null;
|
|
133
|
+
let currentPort = 0;
|
|
134
|
+
let currentToken = '';
|
|
135
|
+
function disposeTask(task, err) {
|
|
136
|
+
clearTimeout(task.timer);
|
|
137
|
+
task.reject(err);
|
|
138
|
+
}
|
|
139
|
+
/** 会话终结(被同型覆盖 / 通道停止):pending=从未送出;inflight=可能执行了一半,绝不判"未送出" */
|
|
140
|
+
function disposeSession(s, reason) {
|
|
141
|
+
if (s.pending) {
|
|
142
|
+
disposeTask(s.pending, new AddonUnavailableError(`WPS 加载项通道:任务 ${s.pending.action} 在送达前会话失效(${reason}),请求从未送出,可安全重试`));
|
|
143
|
+
s.pending = null;
|
|
144
|
+
}
|
|
145
|
+
if (s.inflight) {
|
|
146
|
+
disposeTask(s.inflight, new Error(`WPS 加载项通道:任务 ${s.inflight.action} 已送达加载项后会话失效(${reason}),可能已在 WPS 里执行了一半 —— 不重放,请人工核实`));
|
|
147
|
+
s.inflight = null;
|
|
148
|
+
}
|
|
149
|
+
if (s.pollWait) {
|
|
150
|
+
clearTimeout(s.pollWait.timer);
|
|
151
|
+
try {
|
|
152
|
+
s.pollWait.reply(404, { error: `会话已失效(${reason}),请重新握手` });
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
/* 响应可能已不可写 */
|
|
156
|
+
}
|
|
157
|
+
s.pollWait = null;
|
|
158
|
+
}
|
|
159
|
+
sessionById.delete(s.sessionId);
|
|
160
|
+
}
|
|
161
|
+
/** 任务从轮询池转入在途:重置计时器只计剩余额度(总上限 = 单动作超时,不因排队翻倍) */
|
|
162
|
+
function promoteToInflight(s, task) {
|
|
163
|
+
clearTimeout(task.timer);
|
|
164
|
+
const remain = Math.max(task.createdAt + callTimeoutMs() - Date.now(), 1);
|
|
165
|
+
task.timer = setTimeout(() => onTaskTimeout(task, s), remain);
|
|
166
|
+
s.inflight = task;
|
|
167
|
+
}
|
|
168
|
+
/** 把轮询池顶端的任务随【挂起中的 /poll】送达:从这一刻起任务"已送出" */
|
|
169
|
+
function deliverPending(s) {
|
|
170
|
+
const task = s.pending;
|
|
171
|
+
const wait = s.pollWait;
|
|
172
|
+
if (!task || !wait)
|
|
173
|
+
return;
|
|
174
|
+
s.pending = null;
|
|
175
|
+
s.pollWait = null;
|
|
176
|
+
clearTimeout(wait.timer);
|
|
177
|
+
promoteToInflight(s, task);
|
|
178
|
+
try {
|
|
179
|
+
wait.reply(200, { id: task.id, action: task.action, params: task.params, app: task.app });
|
|
180
|
+
}
|
|
181
|
+
catch {
|
|
182
|
+
/* 写出失败无法回退:任务按已送出处理,由超时兜底如实抛(不重放) */
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
function onTaskTimeout(task, s) {
|
|
186
|
+
if (s.pending === task) {
|
|
187
|
+
s.pending = null;
|
|
188
|
+
task.reject(new AddonUnavailableError(`WPS 加载项通道:动作 ${task.action} 等待 ${callTimeoutMs()}ms 仍无人取走(type=${s.type})。` +
|
|
189
|
+
'请求从未送出,可安全重试;若持续出现,检查加载项是否已从 WPS UI 打开(Linux 必须手动打开)'));
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
if (s.inflight === task) {
|
|
193
|
+
s.inflight = null;
|
|
194
|
+
task.reject(new Error(`WPS 加载项通道:动作 ${task.action} 已送达加载项后超时(${callTimeoutMs()}ms,type=${s.type})。` +
|
|
195
|
+
'可能已在 WPS 里执行了一半 —— 绝不自动重放,请人工核实'));
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
/* ---------------------------------------------------------------------------
|
|
199
|
+
* HTTP 端点(三个:/handshake、/poll、/result)
|
|
200
|
+
* 执行通道不做 CORS(计划 §4.4):不回 Access-Control-* 头,OPTIONS 直接 405。
|
|
201
|
+
* ------------------------------------------------------------------------ */
|
|
202
|
+
function readBody(req) {
|
|
203
|
+
return new Promise((resolve, reject) => {
|
|
204
|
+
let size = 0;
|
|
205
|
+
const chunks = [];
|
|
206
|
+
req.on('data', (c) => {
|
|
207
|
+
size += c.length;
|
|
208
|
+
if (size > 2 * 1024 * 1024) {
|
|
209
|
+
reject(new Error('请求体超过 2MB 上限'));
|
|
210
|
+
req.destroy();
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
chunks.push(c);
|
|
214
|
+
});
|
|
215
|
+
req.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
|
|
216
|
+
req.on('error', reject);
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
function sendJson(res, status, body) {
|
|
220
|
+
// 刻意不带 CORS 头(C2):面板只读通道的宽松策略不许套到能写文档的执行通道上
|
|
221
|
+
res.writeHead(status, { 'Content-Type': 'application/json; charset=utf-8' });
|
|
222
|
+
res.end(JSON.stringify(body));
|
|
223
|
+
}
|
|
224
|
+
async function handleHandshake(req, res) {
|
|
225
|
+
let body;
|
|
226
|
+
try {
|
|
227
|
+
body = JSON.parse((await readBody(req)) || '{}');
|
|
228
|
+
}
|
|
229
|
+
catch {
|
|
230
|
+
sendJson(res, 400, { error: 'handshake 请求体必须是 JSON' });
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
if (String(body.token ?? '') !== currentToken) {
|
|
234
|
+
sendJson(res, 401, { error: '令牌不匹配:加载项侧的 token 与服务端不一致(WPS_ADDON_TOKEN / 启动日志)' });
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
const type = body.type;
|
|
238
|
+
if (typeof type !== 'string' || !ADDON_TYPES.includes(type)) {
|
|
239
|
+
sendJson(res, 400, { error: `type 必须是 ${ADDON_TYPES.join('|')} 之一(三型对象模型隔离,S1 实测)` });
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
const old = sessions.get(type);
|
|
243
|
+
if (old)
|
|
244
|
+
disposeSession(old, `被同型(${type})新加载项覆盖`);
|
|
245
|
+
const s = {
|
|
246
|
+
sessionId: (0, uuid_1.v4)(),
|
|
247
|
+
type: type,
|
|
248
|
+
addonVersion: String(body.addonVersion ?? ''),
|
|
249
|
+
connectedAt: new Date().toISOString(),
|
|
250
|
+
pending: null,
|
|
251
|
+
inflight: null,
|
|
252
|
+
pollWait: null,
|
|
253
|
+
};
|
|
254
|
+
sessions.set(s.type, s);
|
|
255
|
+
sessionById.set(s.sessionId, s);
|
|
256
|
+
sendJson(res, 200, { sessionId: s.sessionId, pollIntervalMs: 50 });
|
|
257
|
+
}
|
|
258
|
+
function handlePoll(_req, res, url) {
|
|
259
|
+
const sessionId = url.searchParams.get('sessionId') || '';
|
|
260
|
+
const s = sessionById.get(sessionId);
|
|
261
|
+
if (!s) {
|
|
262
|
+
sendJson(res, 404, { error: '会话不存在或已失效,请重新握手' });
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
// 上一轮挂起的 poll 还没回话就又来 poll:先回掉旧的(idle),避免连接堆积
|
|
266
|
+
if (s.pollWait) {
|
|
267
|
+
clearTimeout(s.pollWait.timer);
|
|
268
|
+
try {
|
|
269
|
+
s.pollWait.reply(200, { idle: true });
|
|
270
|
+
}
|
|
271
|
+
catch {
|
|
272
|
+
/* 旧连接可能已断 */
|
|
273
|
+
}
|
|
274
|
+
s.pollWait = null;
|
|
275
|
+
}
|
|
276
|
+
if (s.pending) {
|
|
277
|
+
// 任务先挂、poll 后到:没有挂起中的 poll 可借,直接用当前这条响应送帧
|
|
278
|
+
const task = s.pending;
|
|
279
|
+
s.pending = null;
|
|
280
|
+
promoteToInflight(s, task);
|
|
281
|
+
sendJson(res, 200, { id: task.id, action: task.action, params: task.params, app: task.app });
|
|
282
|
+
return;
|
|
283
|
+
}
|
|
284
|
+
const wait = {
|
|
285
|
+
reply: (status, body) => {
|
|
286
|
+
if (res.writableEnded || res.destroyed)
|
|
287
|
+
return;
|
|
288
|
+
sendJson(res, status, body);
|
|
289
|
+
},
|
|
290
|
+
timer: null,
|
|
291
|
+
};
|
|
292
|
+
wait.timer = setTimeout(() => {
|
|
293
|
+
if (s.pollWait && s.pollWait.reply === wait.reply) {
|
|
294
|
+
s.pollWait = null;
|
|
295
|
+
wait.reply(200, { idle: true });
|
|
296
|
+
}
|
|
297
|
+
}, POLL_HANG_MS);
|
|
298
|
+
s.pollWait = wait;
|
|
299
|
+
// 客户端在响应写出前断开:撤下挂起等待即可,任务(若有)本来就不在这条连接上。
|
|
300
|
+
// 为什么挂 res 不挂 req:Node ≥13 的 IncomingMessage 'close' 在【消息完成】时就触发
|
|
301
|
+
// (GET 无 body,完成得极早),会把正常挂起的长轮询误判成断开(实测 routeProbe
|
|
302
|
+
// 的第 4 个用例因此"无人取走");ServerResponse 'close' 只在连接真断或响应写完时
|
|
303
|
+
// 触发,配合 writableEnded 就能区分"还没写出就断了"与"已写出正常收尾"。
|
|
304
|
+
res.on('close', () => {
|
|
305
|
+
if (res.writableEnded)
|
|
306
|
+
return; // 响应已写出(帧或 idle 已送达),不是断开
|
|
307
|
+
if (s.pollWait && s.pollWait.reply === wait.reply) {
|
|
308
|
+
clearTimeout(wait.timer);
|
|
309
|
+
s.pollWait = null;
|
|
310
|
+
}
|
|
311
|
+
});
|
|
312
|
+
}
|
|
313
|
+
async function handleResult(req, res) {
|
|
314
|
+
let body;
|
|
315
|
+
try {
|
|
316
|
+
body = JSON.parse((await readBody(req)) || '{}');
|
|
317
|
+
}
|
|
318
|
+
catch {
|
|
319
|
+
sendJson(res, 400, { error: 'result 请求体必须是 JSON' });
|
|
320
|
+
return;
|
|
321
|
+
}
|
|
322
|
+
const s = sessionById.get(String(body.sessionId ?? ''));
|
|
323
|
+
if (!s) {
|
|
324
|
+
sendJson(res, 404, { error: '会话不存在或已失效' });
|
|
325
|
+
return;
|
|
326
|
+
}
|
|
327
|
+
const task = s.inflight;
|
|
328
|
+
if (!task || task.id !== String(body.id ?? '')) {
|
|
329
|
+
sendJson(res, 409, { error: '没有匹配的在途任务(可能已超时或会话被覆盖)' });
|
|
330
|
+
return;
|
|
331
|
+
}
|
|
332
|
+
s.inflight = null;
|
|
333
|
+
clearTimeout(task.timer);
|
|
334
|
+
if (body.ok === false) {
|
|
335
|
+
const why = String(body.error ?? '加载项返回失败');
|
|
336
|
+
const unsupported = body.unsupported ? `(unsupported=${String(body.unsupported)})` : '';
|
|
337
|
+
task.reject(new Error(`WPS 加载项通道:动作 ${task.action} 执行失败${unsupported}:${why}`));
|
|
338
|
+
}
|
|
339
|
+
else {
|
|
340
|
+
task.resolve(body.data);
|
|
341
|
+
}
|
|
342
|
+
sendJson(res, 200, { received: true });
|
|
343
|
+
}
|
|
344
|
+
async function route(req, res) {
|
|
345
|
+
const url = new URL(req.url || '/', 'http://127.0.0.1');
|
|
346
|
+
try {
|
|
347
|
+
if (req.method === 'POST' && url.pathname === '/handshake') {
|
|
348
|
+
await handleHandshake(req, res);
|
|
349
|
+
return;
|
|
350
|
+
}
|
|
351
|
+
if (req.method === 'GET' && url.pathname === '/poll') {
|
|
352
|
+
handlePoll(req, res, url);
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
355
|
+
if (req.method === 'POST' && url.pathname === '/result') {
|
|
356
|
+
await handleResult(req, res);
|
|
357
|
+
return;
|
|
358
|
+
}
|
|
359
|
+
if (req.method === 'OPTIONS') {
|
|
360
|
+
// 执行通道不做 CORS(C2):预检一律拒绝
|
|
361
|
+
sendJson(res, 405, { error: '执行通道不做 CORS,浏览器来源请走 27731 只读面板' });
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
sendJson(res, 404, { error: `未知端点 ${req.method} ${url.pathname}(可用:POST /handshake、GET /poll、POST /result)` });
|
|
365
|
+
}
|
|
366
|
+
catch (e) {
|
|
367
|
+
if (!res.writableEnded) {
|
|
368
|
+
sendJson(res, 500, { error: `通道内部错误:${e instanceof Error ? e.message : String(e)}` });
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
/**
|
|
373
|
+
* 起通道服务。幂等:已在跑时返回现有端口与令牌。
|
|
374
|
+
* 令牌来源优先级:显式参数 > WPS_ADDON_TOKEN > 启动时随机生成(打到 stderr `[addon-channel] token=…`,
|
|
375
|
+
* 不进任何文件、不进 git —— 任务卡 §0 红线)。
|
|
376
|
+
*/
|
|
377
|
+
function start(opts = {}) {
|
|
378
|
+
if (server)
|
|
379
|
+
return Promise.resolve({ port: currentPort, token: currentToken, tokenGenerated: false });
|
|
380
|
+
let generated = false;
|
|
381
|
+
if (opts.token) {
|
|
382
|
+
currentToken = opts.token;
|
|
383
|
+
}
|
|
384
|
+
else if (process.env.WPS_ADDON_TOKEN) {
|
|
385
|
+
currentToken = process.env.WPS_ADDON_TOKEN;
|
|
386
|
+
}
|
|
387
|
+
else {
|
|
388
|
+
currentToken = (0, uuid_1.v4)().replace(/-/g, '');
|
|
389
|
+
generated = true;
|
|
390
|
+
// 令牌只在 stderr 出现一次;不写日志文件、不写任何被 git 跟踪的文件
|
|
391
|
+
console.error(`[addon-channel] token=${currentToken}`);
|
|
392
|
+
}
|
|
393
|
+
return new Promise((resolve, reject) => {
|
|
394
|
+
const srv = http.createServer((req, res) => {
|
|
395
|
+
void route(req, res);
|
|
396
|
+
});
|
|
397
|
+
srv.on('error', (err) => {
|
|
398
|
+
server = null;
|
|
399
|
+
reject(err);
|
|
400
|
+
});
|
|
401
|
+
srv.listen(opts.port ?? exports.ADDON_PORT, '127.0.0.1', () => {
|
|
402
|
+
server = srv;
|
|
403
|
+
currentPort = srv.address().port;
|
|
404
|
+
resolve({ port: currentPort, token: currentToken, tokenGenerated: generated });
|
|
405
|
+
});
|
|
406
|
+
});
|
|
407
|
+
}
|
|
408
|
+
/** 停通道并终结全部会话(测试收尾 / 进程退出前调用) */
|
|
409
|
+
function stop() {
|
|
410
|
+
for (const s of Array.from(sessions.values())) {
|
|
411
|
+
disposeSession(s, '通道停止');
|
|
412
|
+
}
|
|
413
|
+
sessions.clear();
|
|
414
|
+
sessionById.clear();
|
|
415
|
+
if (!server)
|
|
416
|
+
return Promise.resolve();
|
|
417
|
+
const srv = server;
|
|
418
|
+
server = null;
|
|
419
|
+
currentPort = 0;
|
|
420
|
+
return new Promise((resolve) => srv.close(() => resolve()));
|
|
421
|
+
}
|
|
422
|
+
/** 三型各自的连接状态(给 B6 的 wps_backend_status 用;本轮只导出数据,不注册工具) */
|
|
423
|
+
function status() {
|
|
424
|
+
const one = (t) => {
|
|
425
|
+
const s = sessions.get(t);
|
|
426
|
+
if (!s)
|
|
427
|
+
return { connected: false };
|
|
428
|
+
return {
|
|
429
|
+
connected: true,
|
|
430
|
+
sessionId: s.sessionId,
|
|
431
|
+
addonVersion: s.addonVersion,
|
|
432
|
+
connectedAt: s.connectedAt,
|
|
433
|
+
pending: s.pending !== null,
|
|
434
|
+
inflight: s.inflight !== null,
|
|
435
|
+
};
|
|
436
|
+
};
|
|
437
|
+
return {
|
|
438
|
+
transport: 'long-poll',
|
|
439
|
+
port: currentPort,
|
|
440
|
+
started: server !== null,
|
|
441
|
+
sessions: { wps: one('wps'), et: one('et'), wpp: one('wpp') },
|
|
442
|
+
};
|
|
443
|
+
}
|
|
444
|
+
/** 在途单任务位的原始计数(给 status 之外的诊断用,测试也用它断言"只送达一次") */
|
|
445
|
+
function sessionCounters(type) {
|
|
446
|
+
const s = sessions.get(type);
|
|
447
|
+
return { pending: s && s.pending ? 1 : 0, inflight: s && s.inflight ? 1 : 0 };
|
|
448
|
+
}
|
|
449
|
+
/**
|
|
450
|
+
* 加载项通道的动作入口(B0 转发点签名:wps-client.ts:280-283)。
|
|
451
|
+
* 全程不排队:轮询池单任务位,顶替/在途忙一律判"从未送出"。
|
|
452
|
+
*/
|
|
453
|
+
function call(action, params = {}, app = 'common', instance = 'user') {
|
|
454
|
+
void instance; // v1 忽略:Linux 单实例(S1 R15),多目标由动作层按名钉文档承接
|
|
455
|
+
const type = sessionTypeOf(String(app));
|
|
456
|
+
const s = sessions.get(type);
|
|
457
|
+
if (!s) {
|
|
458
|
+
return Promise.reject(new AddonUnavailableError(`WPS 加载项通道:没有已连接的 ${type} 型加载项会话(动作=${action},app=${app})。` +
|
|
459
|
+
'请求从未送出,可安全重试。若持续出现:确认对应加载项已从 WPS「工具 → WPS 加载项」打开,' +
|
|
460
|
+
'且服务端口/令牌一致(WPS_ADDON_PORT / WPS_ADDON_TOKEN)'));
|
|
461
|
+
}
|
|
462
|
+
if (s.inflight) {
|
|
463
|
+
return Promise.reject(new AddonUnavailableError(`WPS 加载项通道:${type} 型会话上一动作(${s.inflight.action})仍在途,单任务位不排队。` +
|
|
464
|
+
`动作 ${action} 从未送出,可安全重试`));
|
|
465
|
+
}
|
|
466
|
+
if (s.pending) {
|
|
467
|
+
const old = s.pending;
|
|
468
|
+
s.pending = null;
|
|
469
|
+
disposeTask(old, new AddonUnavailableError(`WPS 加载项通道:任务 ${old.action} 被更新的调用顶替(单任务位),从未送达加载项,可安全重试`));
|
|
470
|
+
}
|
|
471
|
+
const task = {
|
|
472
|
+
id: (0, uuid_1.v4)(),
|
|
473
|
+
action,
|
|
474
|
+
params,
|
|
475
|
+
app: String(app),
|
|
476
|
+
createdAt: Date.now(),
|
|
477
|
+
timer: null,
|
|
478
|
+
resolve: () => undefined,
|
|
479
|
+
reject: () => undefined,
|
|
480
|
+
};
|
|
481
|
+
task.timer = setTimeout(() => onTaskTimeout(task, s), callTimeoutMs());
|
|
482
|
+
s.pending = task;
|
|
483
|
+
// 已有挂起中的 /poll:立即随它送达(任务"已送出"的边界 = 响应写出)
|
|
484
|
+
if (s.pollWait)
|
|
485
|
+
deliverPending(s);
|
|
486
|
+
return new Promise((resolve, reject) => {
|
|
487
|
+
task.resolve = resolve;
|
|
488
|
+
task.reject = reject;
|
|
489
|
+
});
|
|
490
|
+
}
|
|
491
|
+
//# sourceMappingURL=addon-channel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addon-channel.js","sourceRoot":"","sources":["../../src/client/addon-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mac-poll-server.d.ts","sourceRoot":"","sources":["../../src/client/mac-poll-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA+OH;;;GAGG;AACH,cAAM,aAAa;IACjB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,IAAI,CAAiB;IAC7B,yDAAyD;IACzD,OAAO,CAAC,YAAY,CAAa;IAEjC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACG,KAAK,CAAC,UAAU,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6DtD;;;OAGG;IACH,OAAO,CAAC,UAAU;IAkBlB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAgCpB;;;;;;OAMG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IA2CrH;;OAEG;IACH,OAAO,CAAC,cAAc;IAItB;;;OAGG;YACW,SAAS;IAyBvB;;OAEG;IACH,IAAI,IAAI,IAAI;IAeZ;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAGjC;AAGD,eAAO,MAAM,aAAa,eAAsB,CAAC;AAEjD,eAAe,aAAa,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mac-poll-server.js","sourceRoot":"","sources":["../../src/client/mac-poll-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ps-daemon.d.ts","sourceRoot":"","sources":["../../src/client/ps-daemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAmCH,eAAO,MAAM,WAAW,QAAmD,CAAC;AAE5E,uCAAuC;AACvC,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAQD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,UAAU,CAA6B;IAC/C,eAAe;IACf,OAAO,CAAC,SAAS,CAAK;IAEtB,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,KAAK,IAAI,iBAAiB,CAY7B;IAED;;;;;;OAMG;IACG,IAAI,CACR,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,GAAG,GAAE,MAAiB,EACtB,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,
|
|
1
|
+
{"version":3,"file":"ps-daemon.d.ts","sourceRoot":"","sources":["../../src/client/ps-daemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAmCH,eAAO,MAAM,WAAW,QAAmD,CAAC;AAE5E,uCAAuC;AACvC,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAQD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,UAAU,CAA6B;IAC/C,eAAe;IACf,OAAO,CAAC,SAAS,CAAK;IAEtB,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,KAAK,IAAI,iBAAiB,CAY7B;IAED;;;;;;OAMG;IACG,IAAI,CACR,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,GAAG,GAAE,MAAiB,EACtB,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAO,GACrD,OAAO,CAAC,OAAO,CAAC;IA8DnB,uBAAuB;YACT,UAAU;IAQxB,6CAA6C;IACvC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAItC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAqBf,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,eAAe;YAST,OAAO;IA0BrB,wCAAwC;IACxC,OAAO,CAAC,YAAY;IAsDpB,8BAA8B;IAC9B,OAAO,CAAC,YAAY;IAwCpB,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,WAAW;CAepB;AAMD,yCAAyC;AACzC,eAAO,MAAM,QAAQ,UAAiB,CAAC;AAEvC,eAAe,QAAQ,CAAC"}
|
package/dist/client/ps-daemon.js
CHANGED
|
@@ -149,7 +149,10 @@ class PsDaemon {
|
|
|
149
149
|
}
|
|
150
150
|
await this.ensureConnected();
|
|
151
151
|
const id = (0, uuid_1.v4)();
|
|
152
|
-
|
|
152
|
+
// instance 是【路由键】不是 COM 参数:桥据此决定投给哪个子进程(user / sandbox-N)。
|
|
153
|
+
// 缺省写 user,让桥端只认一个字段,不用到处判 undefined。
|
|
154
|
+
const instance = (opts.instance || 'user').trim() || 'user';
|
|
155
|
+
const line = JSON.stringify({ id, action, params, app, instance });
|
|
153
156
|
const timeoutMs = callTimeoutMs();
|
|
154
157
|
return new Promise((resolve, reject) => {
|
|
155
158
|
const timer = setTimeout(() => {
|
|
@@ -169,7 +172,8 @@ class PsDaemon {
|
|
|
169
172
|
this.cancelled += 1;
|
|
170
173
|
reject(new cancellable_1.CancelError(`请求已被取消(动作=${action},应用=${app})`));
|
|
171
174
|
// 通知桥(fire-and-forget:桥回不回都不影响本端已经放弃)
|
|
172
|
-
|
|
175
|
+
// 必须带上 instance:桥按 (app, instance) 定位子进程,漏了会撤到别人的队列里。
|
|
176
|
+
void this.sendCancel(id, app, instance).catch(() => {
|
|
173
177
|
/* 通知失败无所谓,本端已经不等了 */
|
|
174
178
|
});
|
|
175
179
|
}, { once: true });
|
|
@@ -187,9 +191,9 @@ class PsDaemon {
|
|
|
187
191
|
});
|
|
188
192
|
}
|
|
189
193
|
/** 给桥发一条取消指令(不等待结果) */
|
|
190
|
-
async sendCancel(targetId, app) {
|
|
194
|
+
async sendCancel(targetId, app, instance = 'user') {
|
|
191
195
|
try {
|
|
192
|
-
await this.call('__cancel', { targetId }, app);
|
|
196
|
+
await this.call('__cancel', { targetId }, app, { instance });
|
|
193
197
|
}
|
|
194
198
|
catch {
|
|
195
199
|
/* 忽略:取消通知是尽力而为 */
|