@xgjktech/xg_cwork_im 1.18.1 → 1.18.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/index.js +8 -7
- package/dist/index.js.map +1 -1
- package/dist/src/account-connection.d.ts.map +1 -1
- package/dist/src/account-connection.js +24 -11
- package/dist/src/account-connection.js.map +1 -1
- package/dist/src/account-reconciler.d.ts +8 -5
- package/dist/src/account-reconciler.d.ts.map +1 -1
- package/dist/src/account-reconciler.js +8 -5
- package/dist/src/account-reconciler.js.map +1 -1
- package/dist/src/channel.d.ts +4 -3
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +9 -3
- package/dist/src/channel.js.map +1 -1
- package/dist/src/plan-stat-event.d.ts +5 -1
- package/dist/src/plan-stat-event.d.ts.map +1 -1
- package/dist/src/plan-stat-event.js +54 -3
- package/dist/src/plan-stat-event.js.map +1 -1
- package/dist/src/plan-stat-event.test.js +142 -15
- package/dist/src/plan-stat-event.test.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -53,7 +53,7 @@ function isGatewayProcess() {
|
|
|
53
53
|
*/
|
|
54
54
|
const MODULE_EPOCH = nextModuleEpoch();
|
|
55
55
|
/** 插件自身版本。⚠️ 手动维护：每次发版 bump package.json version 时同步改这里。 */
|
|
56
|
-
const PLUGIN_VERSION = "1.18.
|
|
56
|
+
const PLUGIN_VERSION = "1.18.2";
|
|
57
57
|
console.log(`[xg_cwork_im] [reload] module imported epoch=${MODULE_EPOCH} pid=${process.pid} title=${(process.title || "(none)").trim()} ` +
|
|
58
58
|
`pluginVersion=${PLUGIN_VERSION}`);
|
|
59
59
|
const plugin = {
|
|
@@ -77,10 +77,10 @@ const plugin = {
|
|
|
77
77
|
registerExecEnvHook(api);
|
|
78
78
|
registerCronAppKeyBindingHook(api);
|
|
79
79
|
api.registerChannel({ plugin: xgCworkImChannelPlugin });
|
|
80
|
-
//
|
|
81
|
-
//
|
|
82
|
-
//
|
|
83
|
-
|
|
80
|
+
// 通道配置变更（含账号增删/改）由 openclaw 8.1 的 reload 计划处理：见 channel 插件声明的
|
|
81
|
+
// `reload.configPrefixes + accountScopedRestart`。账号连接生命周期由框架按账号调用
|
|
82
|
+
// gateway.startAccount/stopAccount 驱动，register 不再自启连接，避免同账号多套 WS。
|
|
83
|
+
// （注意不能再走 6.x 的 registerReload({hotPrefixes}) 自轮询——那会与账号级重启互斥。）
|
|
84
84
|
// 插件热重载/卸载时由 OpenClaw 退役旧 registry 触发。
|
|
85
85
|
// teardown 决策不在此处做：OpenClaw 的 registry 代际交替（含/不含本插件的 agent/model
|
|
86
86
|
// runtime 代）会频繁触发 cleanup，reason=restart/disable 都不能代表「真卸载」；若按
|
|
@@ -98,10 +98,11 @@ const plugin = {
|
|
|
98
98
|
},
|
|
99
99
|
});
|
|
100
100
|
if (!isGatewayProcess()) {
|
|
101
|
-
|
|
101
|
+
// 非 gateway 宿主：不注册通道事件/停机监听（连接由框架 gateway.startAccount 托管，
|
|
102
|
+
// 与 process.title 无关，这里仅收敛事件订阅范围）。
|
|
103
|
+
console.warn(`[xg_cwork_im] 非 gateway 进程（process.title=${process.title || "(unknown)"}），跳过事件订阅`);
|
|
102
104
|
return;
|
|
103
105
|
}
|
|
104
|
-
accountReconciler.start();
|
|
105
106
|
api.on("gateway_stop", async () => {
|
|
106
107
|
if (!requestFullTeardownOnce()) {
|
|
107
108
|
return; // 多个 register 各自注册了 gateway_stop，只执行一次全量 teardown。
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,4BAA4B,EAC5B,mBAAmB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,mBAAmB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACH,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,GACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACvG,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAsB7F;;;;;GAKG;AACH,SAAS,gBAAgB;IACrB,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,+CAA+C;IAC/C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,OAAO,IAAI,CAAC,CAAC,gCAAgC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;AAEvC,4DAA4D;AAC5D,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,OAAO,CAAC,GAAG,CACP,gDAAgD,YAAY,QAAQ,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG;IAC9H,iBAAiB,cAAc,EAAE,CACpC,CAAC;AAEF,MAAM,MAAM,GAA0B;IAClC,EAAE,EAAE,aAAa;IACjB,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,2CAA2C;IACxD,YAAY,EAAE,uBAAuB,EAAE;IACvC,QAAQ,CAAC,GAAsB;QAC3B,4CAA4C;QAC5C,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;QACtC,qBAAqB,EAAE,CAAC;QACxB,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CACP,+CAA+C,YAAY,gBAAgB,WAAW,GAAG;YACzF,WAAW,kBAAkB,EAAE,YAAY,OAAO,CAAC,KAAK,IAAI,QAAQ,GAAG;YACvE,iBAAiB,cAAc,GAAG;YAClC,mBAAoB,GAAG,CAAC,OAAgC,CAAC,OAAO,IAAI,WAAW,EAAE,CACpF,CAAC;QACF,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACjC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzB,6BAA6B,CAAC,GAAG,CAAC,CAAC;QACnC,GAAG,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAExD,8DAA8D;QAC9D,kEAAkE;QAClE,kEAAkE;QAClE,gEAAgE;QAEhE,uCAAuC;QACvC,iEAAiE;QACjE,+DAA+D;QAC/D,4DAA4D;QAC5D,yDAAyD;QACzD,yEAAyE;QACzE,yBAAyB;QACzB,GAAG,CAAC,SAAS,CAAC,wBAAwB,CAAC;YACnC,EAAE,EAAE,qBAAqB;YACzB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACnB,MAAM,MAAM,GAAI,GAAuC,EAAE,MAAM,IAAI,QAAQ,CAAC;gBAC5E,OAAO,CAAC,GAAG,CACP,8CAA8C,YAAY,gBAAgB,WAAW,GAAG;oBACxF,UAAU,MAAM,QAAQ,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CACpF,CAAC;gBACF,MAAM,mBAAmB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;YAClF,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACtB,2DAA2D;YAC3D,mCAAmC;YACnC,OAAO,CAAC,IAAI,CACR,4CAA4C,OAAO,CAAC,KAAK,IAAI,WAAW,UAAU,CACrF,CAAC;YACF,OAAO;QACX,CAAC;QAED,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAC9B,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBAC7B,OAAO,CAAC,mDAAmD;YAC/D,CAAC;YACD,OAAO,CAAC,GAAG,CACP,mEAAmE,YAAY,EAAE,CACpF,CAAC;YACF,MAAM,mBAAmB,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvC,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC;YAClD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,OAAO,CAAC,KAAK,CACT,gDAAgD,4BAA4B,EAAE,oBAAoB,KAAK,CAAC,eAAe,UAAU,KAAK,CAAC,KAAK,GAAG;gBAC/I,oBAAoB,gBAAgB,IAAI,QAAQ,YAAY,OAAO,IAAI,QAAQ,YAAY,OAAO,IAAI,QAAQ,EAAE,CACnH,CAAC;YACF,IAAI,gBAAgB,KAAK,aAAa;gBAAE,OAAO;YAC/C,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;gBAAE,OAAO;YACjC,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CACT,sDAAsD,4BAA4B,EAAE,oBAAoB,KAAK,CAAC,eAAe,GAAG;gBAChI,WAAW,OAAO,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAC3F,CAAC;YACF,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnB,gBAAgB,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9D,CAAC;YACD,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAClD,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAEtD,YAAY,CAAC;gBACT,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,OAAO;gBACP,OAAO;gBACP,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,KAAK,EAAE;oBACH,eAAe,EAAE,KAAK,CAAC,eAAe;oBACtC,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;iBACrB;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,CAAC,KAAK,CACT,8CAA8C,4BAA4B,EAAE,qBAAqB,KAAK,CAAC,gBAAgB,UAAU,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,CAC7J,CAAC;YACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;YACD,qBAAqB,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,UAAU;gBAAE,OAAM;YAC3B,MAAM,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC9C,IAAI,CAAC,EAAE;gBAAE,OAAM;YACf,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC1C,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,KAAK,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YACvD,IAAI,KAAK,EAAE,CAAC;gBACR,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;YACpD,CAAC;YAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;YAEnE,MAAM,CAAC,cAAc,CAAC;gBAClB,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,YAAY,EAAE,EAAE,CAAC,YAAY;gBAC7B,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,QAAQ,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM;gBAC5D,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;YAEnB,gFAAgF;YAChF,gEAAgE;YAChE,kEAAkE;YAClE,4CAA4C;YAC5C,IACI,KAAK,CAAC,QAAQ,KAAK,gBAAgB;gBACnC,KAAK,CAAC,MAAM,KAAK,IAAI;gBACrB,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;gBAC/B,KAAK,CAAC,MAAkC,CAAC,OAAO,KAAK,IAAI,EAC5D,CAAC;gBACC,MAAM,MAAM,GAA4B;oBACpC,GAAI,KAAK,CAAC,MAAkC;oBAC5C,OAAO,EAAE,KAAK;iBACjB,CAAC;gBACF,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBACrF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC;gBACD,OAAO,EAAE,MAAM,EAAE,CAAC;YACtB,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,UAAU;gBAAE,OAAM;YAC3B,MAAM,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC9C,IAAI,CAAC,EAAE;gBAAE,OAAM;YACf,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC1C,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,KAAK,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YACvD,IAAI,KAAK,EAAE,CAAC;gBACR,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;YACpD,CAAC;YAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAE/C,MAAM,CAAC,cAAc,CAAC;gBAClB,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,YAAY,EAAE,EAAE,CAAC,YAAY;gBAC7B,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,KAAK,CAAC,KAAK;oBACpB,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,SAAS;oBACtC,CAAC,CAAC,IAAI,KAAK,QAAQ;aAC1B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC;YACD,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YACrD,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YACvD,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YAC/D,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,gDAAgD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,uEAAuE;QACvE,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,iBAAiB,GAAG,CAAC,GAA0B,EAAE,EAAE,CACrD,sBAAsB,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;gBACjG,QAAQ,CAAC;YAEb,MAAM,YAAY,GAAG,CAAC,GAA0B,EAAE,EAAE,CAAC,CAAC;gBAClD,gBAAgB,EAAE,GAAG,CAAC,cAAc,IAAI,SAAS;gBACjD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,SAAS;aACxD,CAAC,CAAC;YAEH,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,qBAAqB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EACpE,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YACF,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,yBAAyB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EACxE,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YACF,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;gBACtC,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,SAAS;gBAC3C,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;gBACjC,gBAAgB,EAAE,GAAG,CAAC,cAAc,IAAI,SAAS;gBACjD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,SAAS;gBACrD,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,SAAS;aACpD,CAAC,EACN,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YAEF,IAAI,CAAC;gBACD,GAAG,CAAC,iCAAiC,CACjC,8BAA8B,CAAC;oBAC3B,WAAW;oBACX,YAAY;oBACZ,aAAa;oBACb,kBAAkB;iBACrB,CAAC,EACF,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CACtC,CAAC;YACN,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,kEAAkE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClG,CAAC;YAED,IAAI,CAAC;gBACD,6BAA6B,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,8DAA8D,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9F,CAAC;YAED,IAAI,CAAC;gBACD,kCAAkC,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,mEAAmE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnG,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;CACJ,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAoCtE,OAAO,KAAK,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,EAAE,MAAM,OAAO,CAAC;CACvC;AAED,MAAM,WAAW,4BAA4B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,iDAAiD;IAEjD,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,cAAc,CAAC;CACtC;AA6CD;;;GAGG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,4BAA4B,GACrC,OAAO,CAAC,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAoCtE,OAAO,KAAK,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,EAAE,MAAM,OAAO,CAAC;CACvC;AAED,MAAM,WAAW,4BAA4B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,iDAAiD;IAEjD,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,cAAc,CAAC;CACtC;AA6CD;;;GAGG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,4BAA4B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CA+gBlC"}
|
|
@@ -19,7 +19,7 @@ import { applySyncMappingFromWsParams } from "./apply-sync-mapping.js";
|
|
|
19
19
|
import { startWebSocket } from "./connection.js";
|
|
20
20
|
import { deregisterStreamClient, registerStreamClient } from "./agent-stream-client-registry.js";
|
|
21
21
|
import { removePlanWsClientsByClient } from "./plan-ws-registry.js";
|
|
22
|
-
import { getSharedRuntime } from "./process-shared-store.js";
|
|
22
|
+
import { getSharedMap, getSharedRuntime } from "./process-shared-store.js";
|
|
23
23
|
import { dispatchMentionedReply } from "./dispatch-mentioned-reply.js";
|
|
24
24
|
import { finalizeRoundInterrupt, prepareRoundInterrupt } from "./interrupt-round.js";
|
|
25
25
|
import { parseImChatType, resolveOpenClawChatType, resolveOpenClawWasMentioned, resolveInboundTrigger, shouldDispatchInboundReply, } from "./inbound-chat-type.js";
|
|
@@ -105,20 +105,33 @@ export async function startAccountConnection(params) {
|
|
|
105
105
|
if (abortSignal?.aborted) {
|
|
106
106
|
throw new Error(`${logPrefix} Connection aborted during token acquisition`);
|
|
107
107
|
}
|
|
108
|
-
|
|
109
|
-
|
|
108
|
+
// 进程级 robotMention 去重：ws-notify/IM 会对同一条消息向本机器人重复推送（多副本/多帧），
|
|
109
|
+
// 去重必须跨插件副本（globalThis 共享）才有效；否则每个副本各自处理 → 空 settle 秒回
|
|
110
|
+
// "No reply was generated…" 后再由另一副本跑真实回复。
|
|
111
|
+
const recentMentions = getSharedMap("xg-im-recent-robot-mentions");
|
|
112
|
+
const RECENT_MENTION_WINDOW_MS = 60_000;
|
|
110
113
|
const isDuplicate = (msgId) => {
|
|
111
|
-
|
|
114
|
+
const key = `${accountId}:${msgId}`;
|
|
115
|
+
const now = Date.now();
|
|
116
|
+
const seenAt = recentMentions.get(key);
|
|
117
|
+
if (seenAt !== undefined && now - seenAt < RECENT_MENTION_WINDOW_MS) {
|
|
112
118
|
return true;
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
for (
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
+
}
|
|
120
|
+
if (recentMentions.size >= 5_000) {
|
|
121
|
+
for (const [k, t] of recentMentions) {
|
|
122
|
+
if (now - t > RECENT_MENTION_WINDOW_MS)
|
|
123
|
+
recentMentions.delete(k);
|
|
124
|
+
}
|
|
125
|
+
if (recentMentions.size >= 5_000) {
|
|
126
|
+
const iter = recentMentions.keys();
|
|
127
|
+
for (let i = 0; i < 1_000; i++) {
|
|
128
|
+
const val = iter.next().value;
|
|
129
|
+
if (val !== undefined)
|
|
130
|
+
recentMentions.delete(val);
|
|
131
|
+
}
|
|
119
132
|
}
|
|
120
133
|
}
|
|
121
|
-
|
|
134
|
+
recentMentions.set(key, now);
|
|
122
135
|
return false;
|
|
123
136
|
};
|
|
124
137
|
const handleMessage = async (msg) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* 账号连接 Reconciler（openclaw 8.1 框架驱动）。
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* 账号生命周期由 openclaw 按账号调用 channel.gateway.startAccount → startAccountLifecycle
|
|
5
|
+
* 托管（每账号一个框架持有的 AbortSignal）；配置变更走 channel 插件声明的
|
|
6
|
+
* reload.configPrefixes + accountScopedRestart 做账号级 stop→start。
|
|
7
7
|
*
|
|
8
8
|
* 运行中账号：Map<accountId, AccountRun>；每个账号一个 AbortController + 一个连接句柄。
|
|
9
|
-
*
|
|
9
|
+
* 幂等（syncAccount 按 accountId 去重、指纹变化先停后启）：
|
|
10
10
|
* - 新增 → 启动
|
|
11
11
|
* - 删除 / enabled=false → 停止
|
|
12
12
|
* - 指纹变化 → 重启
|
|
13
13
|
* - 指纹不变 → 空转（非连接字段由每次入站重读最新 config 生效）
|
|
14
|
+
*
|
|
15
|
+
* 说明：start()/poll 轮询仅在 6.x 无账号级生命周期时由 index.ts 调用；8.1 下 register
|
|
16
|
+
* 不再自启连接（避免同账号多套 WebSocket），start/poll 保留仅供测试与显式兜底使用。
|
|
14
17
|
*/
|
|
15
18
|
import type { OpenClawConfig, PluginRuntime } from "openclaw/plugin-sdk/core";
|
|
16
19
|
import { type Logger } from "./channel-log.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-reconciler.d.ts","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"account-reconciler.d.ts","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAIzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKlE,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CASxD;AAMD,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAwBnF;AAYD,MAAM,WAAW,wBAAwB;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,iBAAiB;IAQd,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,EAAE,CAA8B;IACxC,OAAO,CAAC,IAAI,CAAiC;IAC7C,OAAO,CAAC,SAAS,CAA+C;IAChE,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,OAAO,CAAS;gBAEK,OAAO,GAAE,wBAA6B;IAEnE,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,UAAU,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI;IAInC,KAAK,IAAI,IAAI;IAWP,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB7C,kEAAkE;IAC5D,qBAAqB,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpE,yCAAyC;IACnC,WAAW,CACb,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,UAAU,EAClB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;IAgChB,OAAO,CAAC,QAAQ;IAwChB,OAAO,CAAC,OAAO;IAWf,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,IAAI;YAaE,SAAS;IAyBvB,OAAO,CAAC,eAAe;CAU1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,mBAG7B,CAAC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* 账号连接 Reconciler（openclaw 8.1 框架驱动）。
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* 账号生命周期由 openclaw 按账号调用 channel.gateway.startAccount → startAccountLifecycle
|
|
5
|
+
* 托管（每账号一个框架持有的 AbortSignal）；配置变更走 channel 插件声明的
|
|
6
|
+
* reload.configPrefixes + accountScopedRestart 做账号级 stop→start。
|
|
7
7
|
*
|
|
8
8
|
* 运行中账号：Map<accountId, AccountRun>；每个账号一个 AbortController + 一个连接句柄。
|
|
9
|
-
*
|
|
9
|
+
* 幂等（syncAccount 按 accountId 去重、指纹变化先停后启）：
|
|
10
10
|
* - 新增 → 启动
|
|
11
11
|
* - 删除 / enabled=false → 停止
|
|
12
12
|
* - 指纹变化 → 重启
|
|
13
13
|
* - 指纹不变 → 空转（非连接字段由每次入站重读最新 config 生效）
|
|
14
|
+
*
|
|
15
|
+
* 说明：start()/poll 轮询仅在 6.x 无账号级生命周期时由 index.ts 调用；8.1 下 register
|
|
16
|
+
* 不再自启连接（避免同账号多套 WebSocket），start/poll 保留仅供测试与显式兜底使用。
|
|
14
17
|
*/
|
|
15
18
|
import { getXgImConfig, normalizeRobotKey } from "./channel-config.js";
|
|
16
19
|
import { startAccountConnection } from "./account-connection.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-reconciler.js","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"account-reconciler.js","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"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"}
|
package/dist/src/channel.d.ts
CHANGED
|
@@ -6,9 +6,10 @@
|
|
|
6
6
|
* 忙碌排队/插话由 OpenClaw 原生 messages.queue 处理，见 docs/插件实现逻辑说明.md）。
|
|
7
7
|
* 单账号 WebSocket 连接运行见 account-connection.ts。
|
|
8
8
|
*
|
|
9
|
-
* 账号生命周期由
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* 账号生命周期由 openclaw 8.1 框架驱动：注册本通道插件后，框架按账号调用
|
|
10
|
+
* gateway.startAccount（→ account-reconciler.startAccountLifecycle）并持有每账号
|
|
11
|
+
* AbortSignal；配置变更走 reload.configPrefixes + accountScopedRestart 做账号级
|
|
12
|
+
* stop→start。插件 register 不再自启连接，避免同账号重复 WebSocket。
|
|
12
13
|
*/
|
|
13
14
|
import type { PluginRuntime, XgImChannelPlugin } from "./types.js";
|
|
14
15
|
export declare function setXgImRuntime(rt: PluginRuntime): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAWH,OAAO,KAAK,EAAuB,aAAa,EAAmB,iBAAiB,EAAc,MAAM,YAAY,CAAC;AAMrH,wBAAgB,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAEtD;AAID,eAAO,MAAM,sBAAsB,EAAE,iBAqJpC,CAAC"}
|
package/dist/src/channel.js
CHANGED
|
@@ -6,9 +6,10 @@
|
|
|
6
6
|
* 忙碌排队/插话由 OpenClaw 原生 messages.queue 处理，见 docs/插件实现逻辑说明.md）。
|
|
7
7
|
* 单账号 WebSocket 连接运行见 account-connection.ts。
|
|
8
8
|
*
|
|
9
|
-
* 账号生命周期由
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* 账号生命周期由 openclaw 8.1 框架驱动：注册本通道插件后，框架按账号调用
|
|
10
|
+
* gateway.startAccount（→ account-reconciler.startAccountLifecycle）并持有每账号
|
|
11
|
+
* AbortSignal；配置变更走 reload.configPrefixes + accountScopedRestart 做账号级
|
|
12
|
+
* stop→start。插件 register 不再自启连接，避免同账号重复 WebSocket。
|
|
12
13
|
*/
|
|
13
14
|
import { randomUUID } from "node:crypto";
|
|
14
15
|
import { buildChannelConfigSchema } from "openclaw/plugin-sdk/core";
|
|
@@ -34,6 +35,11 @@ export const xgCworkImChannelPlugin = {
|
|
|
34
35
|
aliases: ["xg_cwork_im", "im"],
|
|
35
36
|
},
|
|
36
37
|
configSchema: buildChannelConfigSchema(XgImConfigSchema),
|
|
38
|
+
reload: {
|
|
39
|
+
configPrefixes: ["channels.xg_cwork_im"],
|
|
40
|
+
// openclaw 8.1+ 支持账号级 stop→start；SDK 类型尚未声明该字段，运行时属性存在即生效。
|
|
41
|
+
accountScopedRestart: true,
|
|
42
|
+
},
|
|
37
43
|
capabilities: {
|
|
38
44
|
chatTypes: ["direct", "group"],
|
|
39
45
|
reactions: false,
|
package/dist/src/channel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,15 +14,19 @@ export declare function sendPlanStat(params: {
|
|
|
14
14
|
}): void;
|
|
15
15
|
/**
|
|
16
16
|
* 登记 WS client（供后续 PLAN_STAT 增量路由），登记完立刻 fire-and-forget 触发一次快照：
|
|
17
|
-
*
|
|
17
|
+
* 反查该群未完成的计划，只发最新一份 PLAN_STAT（source: "snapshot"）。
|
|
18
|
+
* 同群残留的多份旧未完成计划不再逐个推给前端（前端按群只展示最新计划）；
|
|
19
|
+
* 若最新一份超过 1 小时未更新，则视为已失败/过期，快照也不发（不留死计划在展示位）。
|
|
18
20
|
*
|
|
19
21
|
* dispatch 是热路径：整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
|
|
20
22
|
* WS 绑定本身（登记必须先于快照执行、且不受快照结果影响）。
|
|
21
23
|
*
|
|
22
24
|
* `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现；测试可传入假实现
|
|
23
25
|
* 模拟反查异常（红线防御性场景——即便被注入的反查实现意外抛出，本函数也绝不外抛）。
|
|
26
|
+
* `deps.nowMs` 供测试注入固定时钟，缺省取 Date.now()。
|
|
24
27
|
*/
|
|
25
28
|
export declare function registerPlanWsClientAndSnapshot(groupId: string, client: ImStreamClient, replyToMsgId: string, deps?: {
|
|
26
29
|
listPlansByOrigin: (channel: string, to: string) => Plan[];
|
|
30
|
+
nowMs?: number;
|
|
27
31
|
}): void;
|
|
28
32
|
//# sourceMappingURL=plan-stat-event.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMtD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAG3C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,GAAG,IAAI,CA4BtF;
|
|
1
|
+
{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMtD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAG3C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,GAAG,IAAI,CA4BtF;AA8CD;;;;;;;;;;;;GAYG;AACH,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,cAAc,EACtB,YAAY,EAAE,MAAM,EACpB,IAAI,GAAE;IACF,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,EAAE,CAAC;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;CACM,GAC1B,IAAI,CAkCN"}
|
|
@@ -41,19 +41,59 @@ export function sendPlanStat(params) {
|
|
|
41
41
|
function isUnfinished(plan) {
|
|
42
42
|
return !isPlanCancelled(plan) && plan.tasks.some((task) => task.status !== "completed");
|
|
43
43
|
}
|
|
44
|
+
/** 解析时间戳（ISO 或 epoch）；无效按 0 处理。 */
|
|
45
|
+
function planTime(plan, key) {
|
|
46
|
+
const raw = plan[key];
|
|
47
|
+
if (typeof raw === "string" && raw.trim() !== "") {
|
|
48
|
+
const ts = Date.parse(raw);
|
|
49
|
+
if (!Number.isNaN(ts))
|
|
50
|
+
return ts;
|
|
51
|
+
}
|
|
52
|
+
return 0;
|
|
53
|
+
}
|
|
54
|
+
/** 取「最新」一份：优先 updatedAt（缺失时回退 createdAt）；键相同再比 createdAt，仍相同保持入参顺序。 */
|
|
55
|
+
function pickNewestPlan(plans) {
|
|
56
|
+
if (plans.length === 0)
|
|
57
|
+
return undefined;
|
|
58
|
+
return plans.reduce((newest, plan) => {
|
|
59
|
+
const newestKey = planTime(newest, "updatedAt") || planTime(newest, "createdAt") || 0;
|
|
60
|
+
const planKey = planTime(plan, "updatedAt") || planTime(plan, "createdAt") || 0;
|
|
61
|
+
if (planKey > newestKey)
|
|
62
|
+
return plan;
|
|
63
|
+
if (planKey === newestKey) {
|
|
64
|
+
const newestCreated = planTime(newest, "createdAt");
|
|
65
|
+
const planCreated = planTime(plan, "createdAt");
|
|
66
|
+
return planCreated > newestCreated ? plan : newest;
|
|
67
|
+
}
|
|
68
|
+
return newest;
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
/** 快照新鲜度阈值：最新未完成计划超过 1 小时未更新，视为已失败/过期，快照不再推给前端。 */
|
|
72
|
+
const PLAN_SNAPSHOT_STALE_MS = 60 * 60 * 1_000;
|
|
73
|
+
/** 「新鲜」判定：以 updatedAt（缺失回退 createdAt）距 now 不超过 1 小时；取不到时间一律视为过期。 */
|
|
74
|
+
function isPlanSnapshotFresh(plan, nowMs) {
|
|
75
|
+
const lastUpdateMs = planTime(plan, "updatedAt") || planTime(plan, "createdAt") || 0;
|
|
76
|
+
if (!lastUpdateMs)
|
|
77
|
+
return false;
|
|
78
|
+
return nowMs - lastUpdateMs <= PLAN_SNAPSHOT_STALE_MS;
|
|
79
|
+
}
|
|
44
80
|
/**
|
|
45
81
|
* 登记 WS client（供后续 PLAN_STAT 增量路由），登记完立刻 fire-and-forget 触发一次快照：
|
|
46
|
-
*
|
|
82
|
+
* 反查该群未完成的计划，只发最新一份 PLAN_STAT（source: "snapshot"）。
|
|
83
|
+
* 同群残留的多份旧未完成计划不再逐个推给前端（前端按群只展示最新计划）；
|
|
84
|
+
* 若最新一份超过 1 小时未更新，则视为已失败/过期，快照也不发（不留死计划在展示位）。
|
|
47
85
|
*
|
|
48
86
|
* dispatch 是热路径：整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
|
|
49
87
|
* WS 绑定本身（登记必须先于快照执行、且不受快照结果影响）。
|
|
50
88
|
*
|
|
51
89
|
* `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现；测试可传入假实现
|
|
52
90
|
* 模拟反查异常（红线防御性场景——即便被注入的反查实现意外抛出，本函数也绝不外抛）。
|
|
91
|
+
* `deps.nowMs` 供测试注入固定时钟，缺省取 Date.now()。
|
|
53
92
|
*/
|
|
54
93
|
export function registerPlanWsClientAndSnapshot(groupId, client, replyToMsgId, deps = { listPlansByOrigin }) {
|
|
55
94
|
setPlanWsClient(groupId, client, replyToMsgId);
|
|
56
95
|
try {
|
|
96
|
+
const nowMs = deps.nowMs ?? Date.now();
|
|
57
97
|
const plans = deps.listPlansByOrigin("xg_cwork_im", groupId);
|
|
58
98
|
const unfinishedPlans = plans.filter(isUnfinished);
|
|
59
99
|
if (unfinishedPlans.length > 1) {
|
|
@@ -63,9 +103,20 @@ export function registerPlanWsClientAndSnapshot(groupId, client, replyToMsgId, d
|
|
|
63
103
|
planIds: unfinishedPlans.map((plan) => plan.planId),
|
|
64
104
|
}));
|
|
65
105
|
}
|
|
66
|
-
|
|
67
|
-
|
|
106
|
+
// 快照只发最新一份：同群多份未完成计划时旧计划被丢弃，仅遥测提示。
|
|
107
|
+
const newest = pickNewestPlan(unfinishedPlans);
|
|
108
|
+
if (!newest)
|
|
109
|
+
return;
|
|
110
|
+
if (!isPlanSnapshotFresh(newest, nowMs)) {
|
|
111
|
+
console.warn("[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
112
|
+
to: groupId,
|
|
113
|
+
planId: newest.planId,
|
|
114
|
+
updatedAt: newest.updatedAt ?? null,
|
|
115
|
+
createdAt: newest.createdAt ?? null,
|
|
116
|
+
}));
|
|
117
|
+
return;
|
|
68
118
|
}
|
|
119
|
+
sendPlanStat({ plan: newest, source: "snapshot" });
|
|
69
120
|
}
|
|
70
121
|
catch (err) {
|
|
71
122
|
console.warn(`${LOG_PREFIX} 会话快照失败，已吞 groupId=${groupId}: ${String(err)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAa,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,UAAU,GAAG,iCAAiC,CAAC;AAErD;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,IAAU;IACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC9C,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,MAAmD;IAC5E,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;IACrC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAC3B,IAAI,OAAO,KAAK,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CACR,GAAG,UAAU,4CAA4C,IAAI,CAAC,MAAM,YAAY,OAAO,IAAI,QAAQ,EAAE,CACxG,CAAC;QACF,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,sCAAsC,IAAI,CAAC,MAAM,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7F,OAAO;IACX,CAAC;IAED,KAAK,MAAM,CAAC,MAAM;SACb,SAAS,CAAC;QACP,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;KAC3C,CAAC;SACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,gBAAgB,IAAI,CAAC,MAAM,YAAY,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACX,CAAC;AAED,uDAAuD;AACvD,SAAS,YAAY,CAAC,IAAU;IAC5B,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC;AAC5F,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,13 @@ function makeRecordingClient() {
|
|
|
25
25
|
};
|
|
26
26
|
return { client, calls };
|
|
27
27
|
}
|
|
28
|
+
/** 快照测试固定时钟：新鲜度判定统一以此为准，避免依赖真实 now。 */
|
|
29
|
+
const SNAPSHOT_NOW = Date.parse("2026-07-27T12:00:00.000Z");
|
|
30
|
+
const MIN = 60_000;
|
|
31
|
+
const HOUR = 60 * MIN;
|
|
32
|
+
const DAY = 24 * HOUR;
|
|
33
|
+
/** 相对 SNAPSHOT_NOW 距今 msAgo 毫秒的 ISO 时间。 */
|
|
34
|
+
const ago = (msAgo) => new Date(SNAPSHOT_NOW - msAgo).toISOString();
|
|
28
35
|
function captureWarnLines(fn) {
|
|
29
36
|
const original = console.warn;
|
|
30
37
|
const lines = [];
|
|
@@ -143,75 +150,191 @@ describe("sendPlanStat: 🔴 fire-and-forget 红线", () => {
|
|
|
143
150
|
});
|
|
144
151
|
});
|
|
145
152
|
describe("registerPlanWsClientAndSnapshot: 快照路径", () => {
|
|
146
|
-
it("cancelled
|
|
153
|
+
it("cancelled 计划不推送，未取消未完成计划照常推送（新鲜计划）", () => {
|
|
147
154
|
const { client, calls } = makeRecordingClient();
|
|
148
155
|
const active = makePlan({
|
|
149
156
|
planId: "plan-active",
|
|
150
157
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
158
|
+
createdAt: ago(40 * MIN),
|
|
159
|
+
updatedAt: ago(30 * MIN),
|
|
151
160
|
tasks: [{ title: "继续推进", status: "in_progress" }],
|
|
152
161
|
});
|
|
153
162
|
const cancelled = makePlan({
|
|
154
163
|
planId: "plan-cancelled",
|
|
155
164
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
156
165
|
status: "cancelled",
|
|
157
|
-
cancelledAt:
|
|
166
|
+
cancelledAt: ago(1 * MIN),
|
|
158
167
|
tasks: [{ title: "旧阻塞", status: "blocked", note: "不应再推" }],
|
|
159
168
|
});
|
|
160
169
|
const finished = makePlan({
|
|
161
170
|
planId: "plan-finished",
|
|
162
171
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
172
|
+
createdAt: ago(20 * MIN),
|
|
173
|
+
updatedAt: ago(20 * MIN),
|
|
163
174
|
tasks: [{ title: "已完成", status: "completed" }],
|
|
164
175
|
});
|
|
165
176
|
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
166
177
|
listPlansByOrigin: () => [cancelled, active, finished],
|
|
178
|
+
nowMs: SNAPSHOT_NOW,
|
|
167
179
|
});
|
|
168
180
|
assert.equal(calls.length, 1);
|
|
169
181
|
assert.equal(calls[0].data.plan.planId, active.planId);
|
|
170
182
|
assert.equal(calls[0].data.source, "snapshot");
|
|
171
183
|
});
|
|
172
|
-
it("同群存在 2
|
|
184
|
+
it("同群存在 2 份未完成计划时只发最新一份，另输出一行 multi-active 结构化遥测", () => {
|
|
173
185
|
const { client, calls } = makeRecordingClient();
|
|
174
|
-
const
|
|
175
|
-
planId: "plan-
|
|
186
|
+
const older = makePlan({
|
|
187
|
+
planId: "plan-older",
|
|
176
188
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
189
|
+
createdAt: ago(7 * DAY),
|
|
190
|
+
updatedAt: ago(2 * HOUR),
|
|
177
191
|
tasks: [{ title: "t1", status: "in_progress" }],
|
|
178
192
|
});
|
|
179
|
-
const
|
|
180
|
-
planId: "plan-
|
|
193
|
+
const newer = makePlan({
|
|
194
|
+
planId: "plan-newer",
|
|
181
195
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
196
|
+
createdAt: ago(40 * MIN),
|
|
197
|
+
updatedAt: ago(5 * MIN),
|
|
182
198
|
tasks: [{ title: "t1", status: "blocked", note: "n" }],
|
|
183
199
|
});
|
|
184
200
|
const finished = makePlan({
|
|
185
|
-
planId: "plan-
|
|
201
|
+
planId: "plan-finished",
|
|
186
202
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
203
|
+
createdAt: ago(20 * MIN),
|
|
204
|
+
updatedAt: ago(20 * MIN),
|
|
187
205
|
tasks: [{ title: "t1", status: "completed" }],
|
|
188
206
|
});
|
|
189
207
|
const lines = captureWarnLines(() => {
|
|
190
208
|
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
191
|
-
listPlansByOrigin: () => [
|
|
209
|
+
listPlansByOrigin: () => [older, newer, finished],
|
|
210
|
+
nowMs: SNAPSHOT_NOW,
|
|
192
211
|
});
|
|
193
212
|
});
|
|
194
|
-
assert.equal(calls.length,
|
|
195
|
-
assert.
|
|
196
|
-
|
|
197
|
-
assert.deepEqual(planIds, ["plan-a", "plan-b"]);
|
|
213
|
+
assert.equal(calls.length, 1, "同群多份未完成计划只推最新一份快照");
|
|
214
|
+
assert.equal(calls[0].data.source, "snapshot");
|
|
215
|
+
assert.equal(calls[0].data.plan.planId, newer.planId);
|
|
198
216
|
assert.deepEqual(lines, [
|
|
199
217
|
"[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
|
|
200
218
|
to: "g-1",
|
|
201
219
|
count: 2,
|
|
202
|
-
planIds: ["plan-
|
|
220
|
+
planIds: ["plan-older", "plan-newer"],
|
|
221
|
+
}),
|
|
222
|
+
]);
|
|
223
|
+
});
|
|
224
|
+
it("updatedAt 相同/缺失时回退 createdAt 判定最新", () => {
|
|
225
|
+
const { client, calls } = makeRecordingClient();
|
|
226
|
+
const createdEarly = makePlan({
|
|
227
|
+
planId: "plan-created-early",
|
|
228
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
229
|
+
createdAt: ago(50 * MIN),
|
|
230
|
+
updatedAt: ago(10 * MIN),
|
|
231
|
+
tasks: [{ title: "t1", status: "in_progress" }],
|
|
232
|
+
});
|
|
233
|
+
const createdRecent = makePlan({
|
|
234
|
+
planId: "plan-created-recent",
|
|
235
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
236
|
+
createdAt: ago(20 * MIN),
|
|
237
|
+
updatedAt: ago(10 * MIN),
|
|
238
|
+
tasks: [{ title: "t1", status: "blocked", note: "n" }],
|
|
239
|
+
});
|
|
240
|
+
const noTimestamp = makePlan({
|
|
241
|
+
planId: "plan-no-ts",
|
|
242
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
243
|
+
createdAt: undefined,
|
|
244
|
+
updatedAt: undefined,
|
|
245
|
+
tasks: [{ title: "t1", status: "in_progress" }],
|
|
246
|
+
});
|
|
247
|
+
const lines = captureWarnLines(() => {
|
|
248
|
+
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
249
|
+
listPlansByOrigin: () => [createdEarly, createdRecent, noTimestamp],
|
|
250
|
+
nowMs: SNAPSHOT_NOW,
|
|
251
|
+
});
|
|
252
|
+
});
|
|
253
|
+
assert.equal(calls.length, 1, "updatedAt 相同则比 createdAt，取更近创建的一份");
|
|
254
|
+
assert.equal(calls[0].data.plan.planId, createdRecent.planId);
|
|
255
|
+
assert.deepEqual(lines, [
|
|
256
|
+
"[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
|
|
257
|
+
to: "g-1",
|
|
258
|
+
count: 3,
|
|
259
|
+
planIds: ["plan-created-early", "plan-created-recent", "plan-no-ts"],
|
|
260
|
+
}),
|
|
261
|
+
]);
|
|
262
|
+
});
|
|
263
|
+
it("最新一份超过 1 小时未更新 → 视为已失败，快照不发 + stale 遥测", () => {
|
|
264
|
+
const { client, calls } = makeRecordingClient();
|
|
265
|
+
const stale = makePlan({
|
|
266
|
+
planId: "plan-stale",
|
|
267
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
268
|
+
createdAt: ago(3 * HOUR),
|
|
269
|
+
updatedAt: ago(2 * HOUR),
|
|
270
|
+
tasks: [{ title: "t1", status: "in_progress" }],
|
|
271
|
+
});
|
|
272
|
+
const lines = captureWarnLines(() => {
|
|
273
|
+
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
274
|
+
listPlansByOrigin: () => [stale],
|
|
275
|
+
nowMs: SNAPSHOT_NOW,
|
|
276
|
+
});
|
|
277
|
+
});
|
|
278
|
+
assert.equal(calls.length, 0, "过期计划视为失败，快照不推给前端");
|
|
279
|
+
assert.deepEqual(lines, [
|
|
280
|
+
"[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
281
|
+
to: "g-1",
|
|
282
|
+
planId: "plan-stale",
|
|
283
|
+
updatedAt: stale.updatedAt,
|
|
284
|
+
createdAt: stale.createdAt,
|
|
285
|
+
}),
|
|
286
|
+
]);
|
|
287
|
+
});
|
|
288
|
+
it("恰好 1 小时未更新仍新鲜照常发送；取不到时间戳视为过期不发", () => {
|
|
289
|
+
const { client, calls } = makeRecordingClient();
|
|
290
|
+
const boundary = makePlan({
|
|
291
|
+
planId: "plan-boundary",
|
|
292
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
293
|
+
createdAt: ago(2 * HOUR),
|
|
294
|
+
updatedAt: ago(HOUR),
|
|
295
|
+
tasks: [{ title: "t1", status: "in_progress" }],
|
|
296
|
+
});
|
|
297
|
+
const noTimestamp = makePlan({
|
|
298
|
+
planId: "plan-no-ts",
|
|
299
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
300
|
+
createdAt: undefined,
|
|
301
|
+
updatedAt: undefined,
|
|
302
|
+
tasks: [{ title: "t1", status: "in_progress" }],
|
|
303
|
+
});
|
|
304
|
+
const lines = captureWarnLines(() => {
|
|
305
|
+
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
306
|
+
listPlansByOrigin: () => [boundary],
|
|
307
|
+
nowMs: SNAPSHOT_NOW,
|
|
308
|
+
});
|
|
309
|
+
registerPlanWsClientAndSnapshot("g-1", client, "msg-2", {
|
|
310
|
+
listPlansByOrigin: () => [noTimestamp],
|
|
311
|
+
nowMs: SNAPSHOT_NOW,
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
assert.equal(calls.length, 1);
|
|
315
|
+
assert.equal(calls[0].data.plan.planId, boundary.planId, "恰 1 小时未过期仍发");
|
|
316
|
+
assert.deepEqual(lines, [
|
|
317
|
+
"[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
318
|
+
to: "g-1",
|
|
319
|
+
planId: "plan-no-ts",
|
|
320
|
+
updatedAt: null,
|
|
321
|
+
createdAt: null,
|
|
203
322
|
}),
|
|
204
323
|
]);
|
|
205
324
|
});
|
|
206
325
|
it("同群只有 1 份或 0 份未完成计划时不输出 multi-active 遥测", () => {
|
|
207
|
-
const { client } = makeRecordingClient();
|
|
326
|
+
const { client, calls } = makeRecordingClient();
|
|
208
327
|
const active = makePlan({
|
|
209
328
|
planId: "plan-active",
|
|
210
329
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
330
|
+
createdAt: ago(20 * MIN),
|
|
331
|
+
updatedAt: ago(10 * MIN),
|
|
211
332
|
});
|
|
212
333
|
const finished = makePlan({
|
|
213
334
|
planId: "plan-finished",
|
|
214
335
|
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
336
|
+
createdAt: ago(20 * MIN),
|
|
337
|
+
updatedAt: ago(20 * MIN),
|
|
215
338
|
tasks: [{ title: "完成", status: "completed" }],
|
|
216
339
|
});
|
|
217
340
|
const cancelled = makePlan({
|
|
@@ -222,12 +345,16 @@ describe("registerPlanWsClientAndSnapshot: 快照路径", () => {
|
|
|
222
345
|
const lines = captureWarnLines(() => {
|
|
223
346
|
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
224
347
|
listPlansByOrigin: () => [active, finished, cancelled],
|
|
348
|
+
nowMs: SNAPSHOT_NOW,
|
|
225
349
|
});
|
|
226
350
|
registerPlanWsClientAndSnapshot("g-1", client, "msg-2", {
|
|
227
351
|
listPlansByOrigin: () => [finished, cancelled],
|
|
352
|
+
nowMs: SNAPSHOT_NOW,
|
|
228
353
|
});
|
|
229
354
|
});
|
|
230
355
|
assert.deepEqual(lines, []);
|
|
356
|
+
assert.equal(calls.length, 1, "只发 g-1 唯一一份未完成计划的快照");
|
|
357
|
+
assert.equal(calls[0].data.plan.planId, active.planId);
|
|
231
358
|
});
|
|
232
359
|
it("🔴 反查抛异常 → registerPlanWsClientAndSnapshot 不抛，且登记本身仍然成功", () => {
|
|
233
360
|
const { client, calls } = makeRecordingClient();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.test.js","sourceRoot":"","sources":["../../src/plan-stat-event.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEjG,SAAS,QAAQ,CAAC,YAA2B,EAAE;IAC3C,OAAO;QACH,MAAM,EAAE,QAAQ;QAChB,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,0BAA0B;QACrC,SAAS,EAAE,0BAA0B;QACrC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC3C,GAAG,SAAS;KACf,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB;IACxB,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAmB;QAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC/B,WAAW,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC5B,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,GAAG,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;KACvB,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAc;IACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;QAClC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC;IACF,IAAI,CAAC;QACD,EAAE,EAAE,CAAC;IACT,CAAC;YAAS,CAAC;QACP,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,UAAU,CAAC,GAAG,EAAE;IACZ,0BAA0B,EAAE,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACvE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzE,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAa,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACrD,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC;YAClB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE;SAC3E,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,EAAE,CAAC;QACzC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,aAAsB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QAC9D,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,aAAsB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QAC9D,MAAM,IAAI,GAAG,QAAQ,CAAC;YAClB,MAAM;YACN,MAAM,EAAE,WAAW;YACnB,WAAW,EAAE,0BAA0B;SAC1C,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;QACxB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAClD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChF,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAC;QACxF,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAmB;YAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YAC/B,WAAW,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YAC5B,SAAS,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YACpC,CAAC;YACD,GAAG,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;SACvB,CAAC;QACF,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzE,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAmB;YAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YAC/B,WAAW,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,GAAG,EAAE,GAAG,CAAC,CAAC;YAC7C,GAAG,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;SACvB,CAAC;QACF,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzE,yDAAyD;QACzD,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACnD,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,QAAQ,CAAC;YACpB,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;SACpD,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,QAAQ,CAAC;YACvB,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,MAAM,EAAE,WAAW;YACnB,WAAW,EAAE,0BAA0B;YACvC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC7D,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,QAAQ,CAAC;YACtB,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;SACjD,CAAC,CAAC;QAEH,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;YACpD,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC;SACzD,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,MAAM,WAAW,GAAG,QAAQ,CAAC;YACzB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;SAClD,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,QAAQ,CAAC;YACzB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,QAAQ,CAAC;YACtB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,EAAE;YAChC,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;gBACpD,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC;aAChE,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,IAAI,CAAC,IAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE;YACpB,8CAA8C,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC5D,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;aAChC,CAAC;SACL,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,QAAQ,CAAC;YACpB,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;SAChD,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,QAAQ,CAAC;YACtB,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;SAChD,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,QAAQ,CAAC;YACvB,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE;YAC7C,MAAM,EAAE,WAAW;SACtB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,EAAE;YAChC,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;gBACpD,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC;aACzD,CAAC,CAAC;YACH,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;gBACpD,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC;aACjD,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAC/D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;YACrB,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;gBACpD,iBAAiB,EAAE,GAAG,EAAE;oBACpB,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAEtD,+CAA+C;QAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzE,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,0BAA0B,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"plan-stat-event.test.js","sourceRoot":"","sources":["../../src/plan-stat-event.test.ts"],"names":[],"mappings":"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"}
|