@yach.zhiyinlou.com/yach 2.16.1-beta.0 → 2.16.1-beta.2
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/src/core/device-flow.js +3 -1
- package/dist/src/core/device-flow.js.map +1 -1
- package/dist/src/core/fetch.js +4 -2
- package/dist/src/core/fetch.js.map +1 -1
- package/dist/src/core/web-sender.js +66 -0
- package/dist/src/core/web-sender.js.map +1 -0
- package/dist/src/core/webchat-reply.js +177 -0
- package/dist/src/core/webchat-reply.js.map +1 -0
- package/dist/src/core/yach-ticket.js +84 -13
- package/dist/src/core/yach-ticket.js.map +1 -1
- package/dist/src/messaging/inbound/handler.js +1 -0
- package/dist/src/messaging/inbound/handler.js.map +1 -1
- package/dist/src/tools/auto-auth.js +66 -18
- package/dist/src/tools/auto-auth.js.map +1 -1
- package/dist/src/tools/index.js +8 -26
- package/dist/src/tools/index.js.map +1 -1
- package/package.json +3 -2
- package/dist/src/webchat/auth.js +0 -142
- package/dist/src/webchat/auth.js.map +0 -1
- package/dist/src/webchat/gateway.js +0 -136
- package/dist/src/webchat/gateway.js.map +0 -1
- package/dist/src/webchat/service.js +0 -312
- package/dist/src/webchat/service.js.map +0 -1
- package/dist/src/webchat/types.js +0 -7
- package/dist/src/webchat/types.js.map +0 -1
|
@@ -22,7 +22,7 @@ export class YachAppScopeError extends Error {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
export async function sendYachAuthCard(params) {
|
|
25
|
-
const { baseUrl, appKey, appSecret, deviceCode, toUserId, groupTid, conversationType } = params;
|
|
25
|
+
const { baseUrl, appKey, appSecret, deviceCode, toUserId, groupTid, conversationType, sourceType } = params;
|
|
26
26
|
const appToken = await getAccessToken(baseUrl, { appKey, appSecret });
|
|
27
27
|
const body = {
|
|
28
28
|
access_token: appToken,
|
|
@@ -33,6 +33,8 @@ export async function sendYachAuthCard(params) {
|
|
|
33
33
|
body.to_userid = toUserId;
|
|
34
34
|
if (conversationType === "2" && groupTid)
|
|
35
35
|
body.group_tid = groupTid;
|
|
36
|
+
if (sourceType !== undefined)
|
|
37
|
+
body.source_type = sourceType;
|
|
36
38
|
const resp = await oapiFetch(`${baseUrl}/openapi/v2/auth/apply/send`, {
|
|
37
39
|
method: "POST",
|
|
38
40
|
headers: { "Content-Type": "application/json" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AAEtC,2CAA2C;AAC3C,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,GAAW;QACrB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAaD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AAEtC,2CAA2C;AAC3C,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,GAAW;QACrB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAaD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAatC;IACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC5G,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtE,MAAM,IAAI,GAA4B;QACpC,YAAY,EAAE,QAAQ;QACtB,SAAS,EAAE,UAAU;QACrB,iBAAiB,EAAE,MAAM,CAAC,gBAAgB,CAAC;KAC5C,CAAC;IACF,IAAI,gBAAgB,KAAK,GAAG,IAAI,QAAQ;QAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IACpE,IAAI,gBAAgB,KAAK,GAAG,IAAI,QAAQ;QAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IACpE,IAAI,UAAU,KAAK,SAAS;QAAE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAG5D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,6BAA6B,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAK9B,CAAC;IAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC;IAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,WAAW,CAAC,mBAAmB,EAAE,qCAAqC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC9F,MAAM,IAAI,iBAAiB,CAAC,uDAAuD,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClH,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,WAAW,CAAC,mBAAmB,EAAE,uBAAuB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5G,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/C,IAAI,MAAM,KAAK,oBAAoB,EAAE,CAAC;QACpC,WAAW,CAAC,mBAAmB,EAAE,+BAA+B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxF,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,WAAW,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,OAAO,WAAW,CAAC;AACrB,CAAC;AA8BD,uEAAuE;AAEvE;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,MAKpD;IACC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE9C,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,GAAG,OAAO,8BAA8B,CAAC;IAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IAEnC,MAAM,WAAW,GAA4B,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;IACxE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE7D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE;QAC1C,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;KAClC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAE/B,IAAI,IAA6B,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAA0B,CAAC;IAC7C,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAI,IAAI,CAAC,GAAc,IAAI,QAAQ,IAAI,EAAE,CAAC;QACnD,WAAW,CAAC,mBAAmB,EAAE,4BAA4B,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5H,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAA8B,CAAC;IAChD,MAAM,SAAS,GAAI,GAAG,CAAC,UAAqB,IAAI,GAAG,CAAC;IACpD,MAAM,QAAQ,GAAI,GAAG,CAAC,QAAmB,IAAI,CAAC,CAAC;IAE/C,WAAW,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC7H,OAAO;QACL,UAAU,EAAE,GAAG,CAAC,WAAqB;QACrC,eAAe,EAAE,EAAE,EAAE,uCAAuC;QAC5D,SAAS;QACT,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,0EAA0E;AAE1E,SAAS,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC7C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,gBAAgB,CACtB,OAAO,EACP,GAAG,EAAE;YACH,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,IAAI,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;QACpD,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAYzC;IACC,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,iBAAiB,GAAG,GAAG,CAAC;IAE9B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC7E,IAAI,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC/B,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC;IAE1D,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,GAAG,OAAO,wBAAwB,CAAC;IAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,IAAI,QAAQ,GAAG,iBAAiB,EAAE,CAAC;QAC7D,QAAQ,EAAE,CAAC;QACX,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,CAAC,gBAAgB,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1C,MAAM,KAAK,CAAC,QAAQ,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,IAA6B,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;YAChG,MAAM,IAAI,GAAG,MAAM,SAAS,CAC1B,QAAQ,EACR,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EACnG,EAAE,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,CAC5B,CAAC;YACF,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAA4B,CAAC;QACxD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;YACvC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,EAAE,iBAAiB,CAAC,CAAC;YACrD,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAA0B,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,GAA0C,CAAC;QAE5D,IAAI,QAAQ,KAAK,GAAG,IAAI,GAAG,EAAE,YAAY,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAI,GAAG,CAAC,aAAwB,IAAI,EAAE,CAAC;YACzD,MAAM,cAAc,GAAI,GAAG,CAAC,UAAqB,IAAI,IAAI,CAAC;YAC1D,IAAI,gBAAgB,GAAI,GAAG,CAAC,wBAAmC,IAAI,MAAM,CAAC;YAC1E,IAAI,CAAC,YAAY;gBAAE,gBAAgB,GAAG,cAAc,CAAC;YAErD,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE;oBACL,WAAW,EAAE,GAAG,CAAC,YAAsB;oBACvC,YAAY;oBACZ,SAAS,EAAE,cAAc;oBACzB,gBAAgB;oBAChB,KAAK,EAAG,GAAG,CAAC,MAAiB,IAAK,GAAG,CAAC,KAAgB,IAAI,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;iBAClG;aACF,CAAC;QACJ,CAAC;QAED,mBAAmB;IACrB,CAAC;IAED,IAAI,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QAClC,GAAG,CAAC,IAAI,CAAC,sBAAsB,iBAAiB,WAAW,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACtE,CAAC"}
|
package/dist/src/core/fetch.js
CHANGED
|
@@ -95,7 +95,9 @@ export async function oapiFetch(url, init, options) {
|
|
|
95
95
|
const method = init?.method ?? "GET";
|
|
96
96
|
const reqBody = typeof init?.body === "string" ? init.body.slice(0, 1_000_000) : undefined;
|
|
97
97
|
const versionArea = configManager.getVersionArea();
|
|
98
|
-
|
|
98
|
+
// 仅新查询接口选择隐藏Token查询参数,旧调用的日志行为不变。
|
|
99
|
+
const logUrl = options?.omitQueryFromLog ? url.split("?")[0] : url;
|
|
100
|
+
log.debug(`${method} ${logUrl} versionArea: ${versionArea}`, reqBody ? { body: reqBody } : undefined);
|
|
99
101
|
const res = await fetch(url, {
|
|
100
102
|
...init,
|
|
101
103
|
headers: {
|
|
@@ -105,7 +107,7 @@ export async function oapiFetch(url, init, options) {
|
|
|
105
107
|
},
|
|
106
108
|
});
|
|
107
109
|
const text = await res.clone().text();
|
|
108
|
-
log.debug(`${method} ${
|
|
110
|
+
log.debug(`${method} ${logUrl} → ${res.status}`, { body: text.slice(0, 500) });
|
|
109
111
|
const bizErr = parseBusinessError(text);
|
|
110
112
|
const bizIgnored = bizErr && options?.ignoreBizCodes?.includes(bizErr.bizCode);
|
|
111
113
|
if (!res.ok || (bizErr && !bizIgnored)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/core/fetch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/core/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { getAccessToken } from "./app-token.js";
|
|
2
|
+
import { oapiFetch } from "./fetch.js";
|
|
3
|
+
// 主人属于应用账号;缓存和并发去重只减少重复 HTTP请求,不依赖 Channel SDK。
|
|
4
|
+
const CACHE_TTL_MS = 5 * 60 * 1000;
|
|
5
|
+
// key为[接口地址,账号ID,appKey];senderId是主人业务UUID,expiresAt是缓存失效时间戳。
|
|
6
|
+
const cache = new Map();
|
|
7
|
+
// 同账号正在进行的查询:多个工具共享一次Promise,结束即移除,失败也允许下次重试。
|
|
8
|
+
const inFlight = new Map();
|
|
9
|
+
/**
|
|
10
|
+
* 只执行一次GET查询,不做缓存或消息投递。
|
|
11
|
+
* account提供应用凭证;baseUrl是去掉末尾斜杠的接口地址;返回obj.sender_id原字符串。
|
|
12
|
+
*/
|
|
13
|
+
async function querySenderId(account, baseUrl) {
|
|
14
|
+
let appToken;
|
|
15
|
+
try {
|
|
16
|
+
appToken = await getAccessToken(baseUrl, { appKey: account.appKey, appSecret: account.appSecret });
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
throw new Error("获取应用访问凭证失败,请稍后重试。");
|
|
20
|
+
}
|
|
21
|
+
let response;
|
|
22
|
+
try {
|
|
23
|
+
response = await oapiFetch(`${baseUrl}/openapi/v2/openclaw/plugin/get_uuid/by/token?access_token=${encodeURIComponent(appToken)}`, { method: "GET" }, { omitQueryFromLog: true });
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
// 请求异常可能包含 URL,不把带 Token的 URL作为工具结果返回。
|
|
27
|
+
throw new Error("无法获取用户 ID,请稍后重试。");
|
|
28
|
+
}
|
|
29
|
+
if (!response.ok)
|
|
30
|
+
throw new Error(`无法获取用户 ID(HTTP ${response.status}),请稍后重试。`);
|
|
31
|
+
const data = await response.json();
|
|
32
|
+
if (data.code !== 200 || typeof data.obj?.sender_id !== "string" || !data.obj.sender_id.trim()) {
|
|
33
|
+
throw new Error("无法获取用户 ID,授权失败。");
|
|
34
|
+
}
|
|
35
|
+
// 业务 UUID是opaque字符串,可能是大整数字符串,不能转成 Number。
|
|
36
|
+
return data.obj.sender_id;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* 从Control UI已选定的应用账号获取主人UUID,复用短缓存/并发请求。
|
|
40
|
+
* 不要求Channel SDK在线;Yach上下文不会调用,Yach发送者仍来自原消息。
|
|
41
|
+
*/
|
|
42
|
+
export async function resolveWebSenderId(account) {
|
|
43
|
+
if (!account.configured || !account.appKey || !account.appSecret) {
|
|
44
|
+
throw new Error(`账号 ${account.accountId} 未配置,无法发起授权。`);
|
|
45
|
+
}
|
|
46
|
+
const baseUrl = account.baseUrl.replace(/\/+$/, "");
|
|
47
|
+
const key = JSON.stringify([baseUrl, account.accountId, account.appKey]);
|
|
48
|
+
const saved = cache.get(key);
|
|
49
|
+
if (saved && saved.expiresAt > Date.now())
|
|
50
|
+
return saved.senderId;
|
|
51
|
+
const pending = inFlight.get(key);
|
|
52
|
+
if (pending)
|
|
53
|
+
return pending;
|
|
54
|
+
const request = querySenderId(account, baseUrl).then((senderId) => {
|
|
55
|
+
cache.set(key, { senderId, expiresAt: Date.now() + CACHE_TTL_MS });
|
|
56
|
+
return senderId;
|
|
57
|
+
});
|
|
58
|
+
inFlight.set(key, request);
|
|
59
|
+
try {
|
|
60
|
+
return await request;
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
inFlight.delete(key);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=web-sender.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"web-sender.js","sourceRoot":"","sources":["../../../src/core/web-sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { getYachRuntime } from "./runtime.js";
|
|
2
|
+
import { enqueueChatTask } from "../messaging/outbound/chat-queue.js";
|
|
3
|
+
// 模块加载Promise:只加载一次SDK,多个通知/恢复共用,不是授权任务状态。
|
|
4
|
+
let sdkPromise;
|
|
5
|
+
/** 动态加载并确认三个公开函数可用;当前安装包缺types声明,不能静态导入其类型。 */
|
|
6
|
+
export function loadWebTranscriptSdk() {
|
|
7
|
+
if (!sdkPromise) {
|
|
8
|
+
// 此 SDK子路径只有 JS导出,动态加载避免依赖缺失的类型声明。
|
|
9
|
+
const specifier = "openclaw/plugin-sdk/session-transcript-runtime";
|
|
10
|
+
sdkPromise = import(specifier).then((sdk) => {
|
|
11
|
+
for (const name of ["appendAssistantMirrorMessageByIdentity", "readSessionTranscriptEvents", "publishSessionTranscriptUpdateByIdentity"]) {
|
|
12
|
+
if (typeof sdk[name] !== "function")
|
|
13
|
+
throw new Error(`OpenClaw SDK 不支持 Web 会话:${name}`);
|
|
14
|
+
}
|
|
15
|
+
return sdk;
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
return sdkPromise;
|
|
19
|
+
}
|
|
20
|
+
/** 从组织虾ticket取原会话身份;缺信息时不猜目标、不改用知音楼IM。 */
|
|
21
|
+
function sessionIdentity(ticket) {
|
|
22
|
+
if (ticket.source !== "orgclaw-zxl" || !ticket.agentId || !ticket.sessionKey || !ticket.sessionId) {
|
|
23
|
+
throw new Error("组织虾授权缺少原 Web 会话信息");
|
|
24
|
+
}
|
|
25
|
+
return { agentId: ticket.agentId, sessionKey: ticket.sessionKey, sessionId: ticket.sessionId };
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 将固定授权反馈写入原Web聊天记录,不调用模型、不发送知音楼IM。
|
|
29
|
+
* @param ticket 授权发起时保存的来源和原会话信息。
|
|
30
|
+
* @param text 沿用知音楼渠道语气的用户可见文案。
|
|
31
|
+
* @param cfg 当前OpenClaw配置,用于SDK会话写入。
|
|
32
|
+
* @param messageId 本次通知的唯一ID,同时用于幂等和来源标记,不是用户UUID。
|
|
33
|
+
* @param deps 测试依赖;生产调用省略。
|
|
34
|
+
*/
|
|
35
|
+
export async function notifyWebSession(ticket, text, cfg, messageId, deps = {}) {
|
|
36
|
+
const sdk = deps.sdk ?? await loadWebTranscriptSdk();
|
|
37
|
+
const result = await sdk.appendAssistantMirrorMessageByIdentity({
|
|
38
|
+
...sessionIdentity(ticket), config: cfg, text, idempotencyKey: messageId,
|
|
39
|
+
deliveryMirror: { kind: "channel-final", sourceMessageId: messageId }, updateMode: "inline",
|
|
40
|
+
});
|
|
41
|
+
if (!result.ok)
|
|
42
|
+
throw new Error(`Web 会话通知写入失败:${result.reason}`);
|
|
43
|
+
}
|
|
44
|
+
/** 只保留有消息ID的assistant事件,用户消息和工具调用不作为助手答案发布。 */
|
|
45
|
+
function entries(events) {
|
|
46
|
+
return events.filter((event) => {
|
|
47
|
+
const row = event;
|
|
48
|
+
return !!row && typeof row.id === "string" && !!row.message && row.message.role === "assistant";
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
/** 提取可见文字作比较/展示,忽略thinking、tool call等非文字内容。 */
|
|
52
|
+
function messageText(entry) {
|
|
53
|
+
const content = entry.message.content;
|
|
54
|
+
if (typeof content === "string")
|
|
55
|
+
return content.trim();
|
|
56
|
+
if (!Array.isArray(content))
|
|
57
|
+
return "";
|
|
58
|
+
return content.filter((part) => part?.type === "text").map((part) => part.text).join("\n").trim();
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 插件主动在原Web会话发起一轮回复,沿用现有per-chat队列,不新增状态服务。
|
|
62
|
+
* @param ticket 原用户UUID、会话身份及等待授权的工具调用信息。
|
|
63
|
+
* @param cfg 原OpenClaw配置,沿用既有模型、工具和会话策略。
|
|
64
|
+
* @param messageId 本次合成恢复输入的ID,用作MessageSid及补交回复ID前缀。
|
|
65
|
+
* @param deps 测试可替换SDK/模型运行时,生产不传。
|
|
66
|
+
*/
|
|
67
|
+
export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
68
|
+
const identity = sessionIdentity(ticket);
|
|
69
|
+
const sdk = deps.sdk ?? await loadWebTranscriptSdk();
|
|
70
|
+
const runtime = deps.runtime ?? getYachRuntime();
|
|
71
|
+
const { promise } = enqueueChatTask({
|
|
72
|
+
accountId: ticket.accountId, chatId: `webchat:${identity.sessionKey}`,
|
|
73
|
+
task: async () => {
|
|
74
|
+
// 本轮开始前的消息基线,用于识别模型后来写入的回答,不能拿它作“已发布”集合。
|
|
75
|
+
const beforeIds = new Set(entries(await sdk.readSessionTranscriptEvents(identity)).map((entry) => entry.id));
|
|
76
|
+
// 仅本轮的消息ID→已发布正文,避免多个block重复刷新不变的内容;不是任务状态。
|
|
77
|
+
const publishedText = new Map();
|
|
78
|
+
const publish = async (entry, text = messageText(entry)) => {
|
|
79
|
+
if (publishedText.get(entry.id) === text)
|
|
80
|
+
return;
|
|
81
|
+
await sdk.publishSessionTranscriptUpdateByIdentity({
|
|
82
|
+
// 聊天正文只发布可见文本,思考/tool call块不再次作为答案推送。
|
|
83
|
+
...identity, update: { message: { ...entry.message, content: [{ type: "text", text }] }, messageId: entry.id },
|
|
84
|
+
});
|
|
85
|
+
publishedText.set(entry.id, text);
|
|
86
|
+
};
|
|
87
|
+
// 最终/直接回复:复用本轮已存的模型消息,仅补写未保存的文字或附件。
|
|
88
|
+
const deliver = async (reply) => {
|
|
89
|
+
const text = reply.text?.trim();
|
|
90
|
+
const mediaUrls = [...new Set([...(reply.mediaUrls ?? []), ...(reply.mediaUrl ? [reply.mediaUrl] : [])])];
|
|
91
|
+
if ((!text || /^(NO_REPLY|HEARTBEAT_OK)$/.test(text)) && !mediaUrls.length)
|
|
92
|
+
return;
|
|
93
|
+
const current = entries(await sdk.readSessionTranscriptEvents(identity));
|
|
94
|
+
// 模型通常已把回答写入历史;复用消息 ID发布,避免又贴一份模型回答。
|
|
95
|
+
const existing = current.find((entry) => {
|
|
96
|
+
if (beforeIds.has(entry.id))
|
|
97
|
+
return false;
|
|
98
|
+
const entryText = messageText(entry);
|
|
99
|
+
return text ? entryText === text : mediaUrls.every((url) => entryText.includes(url));
|
|
100
|
+
});
|
|
101
|
+
if (existing) {
|
|
102
|
+
const existingText = messageText(existing);
|
|
103
|
+
await publish(existing, existingText);
|
|
104
|
+
const missing = mediaUrls.filter((url) => !existingText.includes(url));
|
|
105
|
+
if (!missing.length)
|
|
106
|
+
return;
|
|
107
|
+
await append(undefined, missing);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
await append(text, mediaUrls);
|
|
111
|
+
}
|
|
112
|
+
};
|
|
113
|
+
// 本轮补交消息的序号,只用于生成消息幂等键,不是授权/模型重试次数。
|
|
114
|
+
let replyNumber = 0;
|
|
115
|
+
// 镜像补交缺失回复;新行inline已发布,不再发送第二份消息更新。
|
|
116
|
+
const append = async (text, mediaUrls) => {
|
|
117
|
+
const result = await sdk.appendAssistantMirrorMessageByIdentity({
|
|
118
|
+
...identity, config: cfg, text, mediaUrls,
|
|
119
|
+
idempotencyKey: `${messageId}:reply:${replyNumber++}`, updateMode: "inline",
|
|
120
|
+
});
|
|
121
|
+
if (!result.ok)
|
|
122
|
+
throw new Error(`Web 回复写入失败:${result.reason}`);
|
|
123
|
+
// 新消息的 inline追加已发布;只有 SDK复用了旧 ID才需要刷新,避免双重事件。
|
|
124
|
+
if (beforeIds.has(result.messageId)) {
|
|
125
|
+
const existing = entries(await sdk.readSessionTranscriptEvents(identity)).find((row) => row.id === result.messageId);
|
|
126
|
+
if (existing)
|
|
127
|
+
await publish(existing);
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
// SDK通过onError报告的写入/投递异常,派发结束后交回授权入口处理。
|
|
131
|
+
let deliveryError;
|
|
132
|
+
const tool = ticket.toolName ? ` 待执行工具:${ticket.toolName},原调用标识:${ticket.toolCallId ?? ticket.msgId}。` : "";
|
|
133
|
+
const params = ticket.toolInput === undefined ? "" : JSON.stringify(ticket.toolInput, (key, value) => /token|secret|password/i.test(key) ? "[已隐藏]" : value);
|
|
134
|
+
// 开头沿用Yach合成恢复消息;只补Web原工具参考,不把它当新的用户要求。
|
|
135
|
+
const text = "用户授权已完成,请继续执行之前的操作。不要重复已完成的写操作;如用户已取消或改变要求,以最新要求为准。" + tool
|
|
136
|
+
+ (params ? `\n原工具参数(仅作数据参考):${params}` : "");
|
|
137
|
+
const ctx = runtime.channel.reply.finalizeInboundContext({
|
|
138
|
+
Body: text, BodyForAgent: text, RawBody: text, CommandBody: text,
|
|
139
|
+
SessionKey: identity.sessionKey, AccountId: ticket.accountId, SenderId: ticket.senderId,
|
|
140
|
+
From: ticket.senderId, To: identity.sessionKey, Provider: "webchat", Surface: "webchat", ChatType: "direct",
|
|
141
|
+
OriginatingChannel: "webchat", OriginatingTo: identity.sessionKey, MessageSid: messageId, Timestamp: Date.now(),
|
|
142
|
+
});
|
|
143
|
+
await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
|
|
144
|
+
ctx, cfg,
|
|
145
|
+
replyOptions: {
|
|
146
|
+
suppressTyping: true, sourceReplyDeliveryMode: "automatic",
|
|
147
|
+
},
|
|
148
|
+
dispatcherOptions: {
|
|
149
|
+
deliver: async (payload, info) => {
|
|
150
|
+
if (info.kind === "block") {
|
|
151
|
+
// 流式文字由原生Agent事件展示,只刷新已经落盘的模型消息,不插入每个文本块。
|
|
152
|
+
for (const entry of entries(await sdk.readSessionTranscriptEvents(identity))) {
|
|
153
|
+
if (beforeIds.has(entry.id))
|
|
154
|
+
continue;
|
|
155
|
+
const entryText = messageText(entry);
|
|
156
|
+
if (entryText)
|
|
157
|
+
await publish(entry, entryText);
|
|
158
|
+
}
|
|
159
|
+
if (payload.mediaUrl || payload.mediaUrls?.length)
|
|
160
|
+
await deliver({ mediaUrl: payload.mediaUrl, mediaUrls: payload.mediaUrls });
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
if (info.kind === "tool" && !payload.isError && !payload.mediaUrl && !payload.mediaUrls?.length)
|
|
164
|
+
return;
|
|
165
|
+
await deliver(payload);
|
|
166
|
+
},
|
|
167
|
+
onError: (error) => { deliveryError = error; },
|
|
168
|
+
},
|
|
169
|
+
});
|
|
170
|
+
// SDK负责会话排队和实际模型运行;返回不代表业务成功,用户看原会话的真实回复。
|
|
171
|
+
if (deliveryError)
|
|
172
|
+
throw deliveryError;
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
await promise;
|
|
176
|
+
}
|
|
177
|
+
//# sourceMappingURL=webchat-reply.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webchat-reply.js","sourceRoot":"","sources":["../../../src/core/webchat-reply.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,8 @@
|
|
|
11
11
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
12
12
|
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
|
|
13
13
|
import { getYachConfig } from "./runtime.js";
|
|
14
|
+
import { listYachAccountIds, resolveYachAccount } from "../accounts/index.js";
|
|
15
|
+
import { resolveWebSenderId } from "./web-sender.js";
|
|
14
16
|
// ── AsyncLocalStorage ─────────────────────────────────────────────────────
|
|
15
17
|
const store = new AsyncLocalStorage();
|
|
16
18
|
// ── 公开 API ──────────────────────────────────────────────────────────────
|
|
@@ -40,10 +42,10 @@ export function ticketElapsed() {
|
|
|
40
42
|
// sessionKey → agent:main:yach:{account}:{direct|group}:{peer}
|
|
41
43
|
// 因此工具执行时若 ALS 无 ticket,就用该 ctx 重建一个。
|
|
42
44
|
//
|
|
43
|
-
//
|
|
44
|
-
//
|
|
45
|
-
//
|
|
46
|
-
//
|
|
45
|
+
// Yach 仅限「用户消息触发的工具调用」:requesterSenderId 来自真实入站,
|
|
46
|
+
// 缺失时不重建,也不会改走 Web 查询。组织虾 Web 仅在核心明确标记
|
|
47
|
+
// messageChannel=webchat 且提供完整原会话身份时,以应用 Token 查询主人 UUID。
|
|
48
|
+
// cron / subagent / heartbeat / 未知渠道绝不触发 UUID 查询。
|
|
47
49
|
/**
|
|
48
50
|
* 把核心下发的账号标识(appKey / accountId)解析为插件侧账号 ID:
|
|
49
51
|
* 先按 appKey 匹配 channels.yach.accounts,命中返回其 ID;否则原样归一化。
|
|
@@ -67,20 +69,74 @@ function resolveAccountIdForToolContext(ctx) {
|
|
|
67
69
|
}
|
|
68
70
|
return normalizeAccountId(raw);
|
|
69
71
|
}
|
|
72
|
+
/** 检查核心提供的会话标识是否为有效非空字符串,不生成或猜测会话身份。 */
|
|
73
|
+
function isNonEmptyString(value) {
|
|
74
|
+
return typeof value === "string" && value.trim().length > 0;
|
|
75
|
+
}
|
|
70
76
|
/**
|
|
71
|
-
*
|
|
72
|
-
*
|
|
73
|
-
* 仅当 ctx 明确属于 yach 渠道且 requesterSenderId 存在(真实用户消息触发)时
|
|
74
|
-
* 重建;cron/subagent 等无发送者场景返回 undefined,不伪造发送者身份。
|
|
77
|
+
* 选择Control UI对应的应用账号:个人虾只有一个配置时直接使用;多个账号才做ID/appKey匹配。
|
|
78
|
+
* SDK账号标识可能是网关内部名称,单账号不因此拒绝;旧Yach默认账号兜底函数不变。
|
|
75
79
|
*/
|
|
76
|
-
|
|
80
|
+
function resolveWebAccountForToolContext(ctx) {
|
|
81
|
+
let accounts;
|
|
82
|
+
try {
|
|
83
|
+
const cfg = getYachConfig();
|
|
84
|
+
accounts = listYachAccountIds(cfg)
|
|
85
|
+
.map((accountId) => resolveYachAccount({ cfg, accountId }))
|
|
86
|
+
// 与原工具客户端一样,只要求应用凭证配置;不要求消息通道启用或在线。
|
|
87
|
+
.filter((account) => account.configured);
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
if (accounts.length === 1)
|
|
93
|
+
return accounts[0];
|
|
94
|
+
const raw = ctx.deliveryContext?.accountId?.trim() || ctx.agentAccountId?.trim();
|
|
95
|
+
const matches = raw
|
|
96
|
+
? accounts.filter((account) => account.appKey === raw || account.accountId === normalizeAccountId(raw))
|
|
97
|
+
: accounts;
|
|
98
|
+
if (matches.length !== 1)
|
|
99
|
+
return undefined;
|
|
100
|
+
return matches[0];
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* 用 OpenClawPluginToolContext 异步重建 Ticket(ALS 兜底)。
|
|
104
|
+
* Web 仅支持当前 messageChannel=webchat 且完整原会话身份的组织虾入口;
|
|
105
|
+
* Yach 必须有真实 requesterSenderId,始终保留原 ID,绝不查询 UUID。
|
|
106
|
+
*/
|
|
107
|
+
export async function rebuildTicketFromToolContext(ctx) {
|
|
77
108
|
if (!ctx)
|
|
78
109
|
return undefined;
|
|
79
110
|
const delivery = ctx.deliveryContext;
|
|
111
|
+
// 新SDK优先取本轮来源;旧SDK仅给deliveryContext.channel时兼容明确的webchat。
|
|
112
|
+
const messageChannel = ctx.messageChannel ?? delivery?.channel;
|
|
113
|
+
if (messageChannel === "webchat") {
|
|
114
|
+
const { sessionKey, sessionId, agentId } = ctx;
|
|
115
|
+
if (!isNonEmptyString(sessionKey) || !isNonEmptyString(sessionId) || !isNonEmptyString(agentId)) {
|
|
116
|
+
return undefined;
|
|
117
|
+
}
|
|
118
|
+
const account = resolveWebAccountForToolContext(ctx);
|
|
119
|
+
if (!account)
|
|
120
|
+
return undefined;
|
|
121
|
+
// 组织虾使用应用主人 UUID;恢复轮复用缓存,不把 SDK客户端标识当业务用户。
|
|
122
|
+
const senderId = await resolveWebSenderId(account);
|
|
123
|
+
return {
|
|
124
|
+
source: "orgclaw-zxl",
|
|
125
|
+
sessionKey,
|
|
126
|
+
sessionId,
|
|
127
|
+
agentId,
|
|
128
|
+
msgId: sessionId,
|
|
129
|
+
// 仅兼容既有必填字段;Web 通知不能用此目标发送 Yach IM。
|
|
130
|
+
toId: senderId,
|
|
131
|
+
senderId,
|
|
132
|
+
accountId: account.accountId,
|
|
133
|
+
conversationType: "1",
|
|
134
|
+
startTime: Date.now(),
|
|
135
|
+
};
|
|
136
|
+
}
|
|
80
137
|
if (delivery?.channel && delivery.channel !== "yach")
|
|
81
138
|
return undefined;
|
|
82
|
-
//
|
|
83
|
-
// 缺失(cron/subagent/heartbeat)时不从 sessionKey 猜测,避免误用会话归属用户。
|
|
139
|
+
// 缺失(cron/subagent/heartbeat)时不猜发送者,也不映射为 Web。
|
|
84
140
|
const senderId = ctx.requesterSenderId;
|
|
85
141
|
if (!senderId)
|
|
86
142
|
return undefined;
|
|
@@ -88,6 +144,7 @@ export function rebuildTicketFromToolContext(ctx) {
|
|
|
88
144
|
const isGroup = to.startsWith("group:");
|
|
89
145
|
const toId = isGroup ? to.replace(/^group:/, "") : senderId;
|
|
90
146
|
return {
|
|
147
|
+
source: "yach",
|
|
91
148
|
// msgId 无来源时用 sessionId 保证唯一性(仅用于日志关联/合成消息前缀)
|
|
92
149
|
msgId: ctx.sessionId ?? "tool-ctx",
|
|
93
150
|
toId,
|
|
@@ -104,9 +161,23 @@ export function rebuildTicketFromToolContext(ctx) {
|
|
|
104
161
|
export async function runToolWithContext(ctx, fn) {
|
|
105
162
|
if (getYachTicket())
|
|
106
163
|
return fn();
|
|
107
|
-
const ticket = rebuildTicketFromToolContext(ctx);
|
|
108
|
-
if (!ticket)
|
|
164
|
+
const ticket = await rebuildTicketFromToolContext(ctx);
|
|
165
|
+
if (!ticket) {
|
|
166
|
+
// 仅记录重建失败的核心字段,便于排查Docker版本差异;不能打印含密钥的完整ctx/config。
|
|
167
|
+
console.warn("[yach] tool-context-unavailable", JSON.stringify({
|
|
168
|
+
hasContext: !!ctx,
|
|
169
|
+
fields: Object.keys(ctx ?? {}),
|
|
170
|
+
messageChannel: ctx?.messageChannel ?? null,
|
|
171
|
+
deliveryChannel: ctx?.deliveryContext?.channel ?? null,
|
|
172
|
+
sessionKey: ctx?.sessionKey ?? null,
|
|
173
|
+
sessionId: ctx?.sessionId ?? null,
|
|
174
|
+
agentId: ctx?.agentId ?? null,
|
|
175
|
+
agentAccountId: ctx?.agentAccountId ?? null,
|
|
176
|
+
deliveryAccountId: ctx?.deliveryContext?.accountId ?? null,
|
|
177
|
+
hasSenderId: !!ctx?.requesterSenderId,
|
|
178
|
+
}));
|
|
109
179
|
return fn();
|
|
180
|
+
}
|
|
110
181
|
return withYachTicket(ticket, fn);
|
|
111
182
|
}
|
|
112
183
|
//# sourceMappingURL=yach-ticket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"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"}
|