@qqvu/openclaw-channel 1.0.36 → 1.0.38
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/message-adapter.d.ts +2 -0
- package/dist/message-adapter.d.ts.map +1 -1
- package/dist/message-adapter.js +22 -2
- package/dist/message-adapter.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/websocket-client.d.ts +3 -0
- package/dist/websocket-client.d.ts.map +1 -1
- package/dist/websocket-client.js +47 -2
- package/dist/websocket-client.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,8 +5,10 @@ import type { PufferfishMessage, OpenClawMessage } from './types.js';
|
|
|
5
5
|
*/
|
|
6
6
|
export declare class MessageAdapter {
|
|
7
7
|
private static readonly httpUrlPattern;
|
|
8
|
+
private static readonly fsUrlPattern;
|
|
8
9
|
private static readonly httpUrlSearchPattern;
|
|
9
10
|
private isHttpUrl;
|
|
11
|
+
private isMediaResourceUrl;
|
|
10
12
|
private pickHttpUrl;
|
|
11
13
|
private extractFirstHttpUrlFromUnknown;
|
|
12
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-adapter.d.ts","sourceRoot":"","sources":["../src/message-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAErE;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IAE1E,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,8BAA8B;IAmCtC;;;;;;;OAOG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,eAAe;
|
|
1
|
+
{"version":3,"file":"message-adapter.d.ts","sourceRoot":"","sources":["../src/message-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAErE;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAmB;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IAE1E,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,8BAA8B;IAmCtC;;;;;;;OAOG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,eAAe;IA0I1D;;OAEG;IACH,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM;IAIzC;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAIvC;;OAEG;IACH,OAAO,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;CAGvC"}
|
package/dist/message-adapter.js
CHANGED
|
@@ -4,13 +4,21 @@
|
|
|
4
4
|
*/
|
|
5
5
|
export class MessageAdapter {
|
|
6
6
|
static httpUrlPattern = /^https?:\/\/\S+$/i;
|
|
7
|
+
static fsUrlPattern = /^fs:\d+@\S+$/i;
|
|
7
8
|
static httpUrlSearchPattern = /https?:\/\/[^\s"'`<>]+/gi;
|
|
8
9
|
isHttpUrl(value) {
|
|
9
10
|
return typeof value === 'string' && MessageAdapter.httpUrlPattern.test(value.trim());
|
|
10
11
|
}
|
|
12
|
+
isMediaResourceUrl(value) {
|
|
13
|
+
if (typeof value !== 'string')
|
|
14
|
+
return false;
|
|
15
|
+
const trimmed = value.trim();
|
|
16
|
+
return (MessageAdapter.httpUrlPattern.test(trimmed) ||
|
|
17
|
+
MessageAdapter.fsUrlPattern.test(trimmed));
|
|
18
|
+
}
|
|
11
19
|
pickHttpUrl(...candidates) {
|
|
12
20
|
for (const candidate of candidates) {
|
|
13
|
-
if (!this.
|
|
21
|
+
if (!this.isMediaResourceUrl(candidate))
|
|
14
22
|
continue;
|
|
15
23
|
return candidate.trim();
|
|
16
24
|
}
|
|
@@ -94,7 +102,19 @@ export class MessageAdapter {
|
|
|
94
102
|
};
|
|
95
103
|
// 入站 WS 的 msg.content 在 Pufferfish 里通常是 MessageContent(base64(JSON))，
|
|
96
104
|
// 这里先尝试解码，拿到真实 text/url 再映射到 OpenClaw。
|
|
97
|
-
const
|
|
105
|
+
const contentCandidates = [
|
|
106
|
+
msg.content,
|
|
107
|
+
msg?.rawContent,
|
|
108
|
+
msg?.metadata?.rawContent,
|
|
109
|
+
msg?.metadata?.RawContent,
|
|
110
|
+
msg?.metadata?.content,
|
|
111
|
+
msg?.metadata?.Content,
|
|
112
|
+
msg?.metadata?.messageContent,
|
|
113
|
+
msg?.metadata?.MessageContent,
|
|
114
|
+
].filter((v) => typeof v === 'string' && v.trim().length > 0);
|
|
115
|
+
const decoded = contentCandidates
|
|
116
|
+
.map((candidate) => this.tryDecodeMessageContent(candidate))
|
|
117
|
+
.find((v) => v != null) ?? null;
|
|
98
118
|
const normalizedType = (() => {
|
|
99
119
|
const kind = typeof decoded?.kind === 'string' ? decoded.kind.toLowerCase() : '';
|
|
100
120
|
if (kind === 'text')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-adapter.js","sourceRoot":"","sources":["../src/message-adapter.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,OAAO,cAAc;IACjB,MAAM,CAAU,cAAc,GAAG,mBAAmB,CAAC;IACrD,MAAM,CAAU,oBAAoB,GAAG,0BAA0B,CAAC;IAElE,SAAS,CAAC,KAAc;QAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;IAEO,WAAW,CAAC,GAAG,UAAqB;QAC1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"message-adapter.js","sourceRoot":"","sources":["../src/message-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export interface PufferfishMessage {
|
|
|
6
6
|
messageId: string;
|
|
7
7
|
chatId: string;
|
|
8
8
|
userId: number;
|
|
9
|
-
type: 'text' | 'image' | 'file' | 'audio' | 'video';
|
|
9
|
+
type: 'text' | 'image' | 'file' | 'audio' | 'video' | 'normal' | string;
|
|
10
10
|
content: string;
|
|
11
11
|
metadata?: Record<string, any>;
|
|
12
12
|
timestamp: number;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,mCAAmC;AACnC,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -23,6 +23,9 @@ export declare class PufferfishWebSocketClient extends EventEmitter {
|
|
|
23
23
|
constructor(account: PufferfishAccount);
|
|
24
24
|
private prefix;
|
|
25
25
|
private tokenDigest;
|
|
26
|
+
private pickString;
|
|
27
|
+
private pickNumber;
|
|
28
|
+
private normalizeInboundMessage;
|
|
26
29
|
/** 服务端重新签发运行 token 时同步，避免重连仍用旧 token */
|
|
27
30
|
updateAccount(account: PufferfishAccount): void;
|
|
28
31
|
isOpen(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.d.ts","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAC;AAGvE;;;;;;;;;GASG;AACH,qBAAa,yBAA0B,SAAQ,YAAY;IACzD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAsB;gBAE/C,OAAO,EAAE,iBAAiB;IAKtC,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,WAAW;IAOnB,wCAAwC;IACxC,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAI/C,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-client.d.ts","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAC;AAGvE;;;;;;;;;GASG;AACH,qBAAa,yBAA0B,SAAQ,YAAY;IACzD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAsB;gBAE/C,OAAO,EAAE,iBAAiB;IAKtC,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,uBAAuB;IA+B/B,wCAAwC;IACxC,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAI/C,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4H9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAelB;;OAEG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAMrB;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAa1B"}
|
package/dist/websocket-client.js
CHANGED
|
@@ -37,6 +37,46 @@ export class PufferfishWebSocketClient extends EventEmitter {
|
|
|
37
37
|
// 仅用于排查 token 是否变化，避免输出明文 token
|
|
38
38
|
return Buffer.from(value).toString('base64').slice(0, 12);
|
|
39
39
|
}
|
|
40
|
+
pickString(...values) {
|
|
41
|
+
for (const value of values) {
|
|
42
|
+
if (typeof value === 'string' && value.trim())
|
|
43
|
+
return value.trim();
|
|
44
|
+
}
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
pickNumber(...values) {
|
|
48
|
+
for (const value of values) {
|
|
49
|
+
if (typeof value === 'number' && Number.isFinite(value))
|
|
50
|
+
return value;
|
|
51
|
+
if (typeof value === 'string' && value.trim()) {
|
|
52
|
+
const n = Number(value);
|
|
53
|
+
if (Number.isFinite(n))
|
|
54
|
+
return n;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
normalizeInboundMessage(parsed) {
|
|
60
|
+
const msgObj = parsed ?? {};
|
|
61
|
+
const metadata = {
|
|
62
|
+
...(typeof msgObj?.metadata === 'object' && msgObj.metadata ? msgObj.metadata : {}),
|
|
63
|
+
...(typeof msgObj?.Metadata === 'object' && msgObj.Metadata ? msgObj.Metadata : {}),
|
|
64
|
+
rawPayload: msgObj,
|
|
65
|
+
};
|
|
66
|
+
return {
|
|
67
|
+
messageId: this.pickString(msgObj.messageId, msgObj.MessageId, msgObj.id, msgObj.ID) ?? '',
|
|
68
|
+
chatId: this.pickString(msgObj.chatId, msgObj.ChatID, msgObj.ChatId, msgObj.chatID) ?? '',
|
|
69
|
+
userId: this.pickNumber(msgObj.userId, msgObj.UserID, msgObj.UserId, msgObj.uid) ?? 0,
|
|
70
|
+
type: (this.pickString(msgObj.type, msgObj.Type, msgObj.messageType, msgObj.MessageType) ??
|
|
71
|
+
'text'),
|
|
72
|
+
content: this.pickString(msgObj.content, msgObj.Content, msgObj.rawContent, msgObj.RawContent, metadata?.rawContent, metadata?.RawContent) ?? '',
|
|
73
|
+
metadata,
|
|
74
|
+
timestamp: this.pickNumber(msgObj.timestamp, msgObj.Timestamp, msgObj.createdAt, msgObj.CreatedAt) ??
|
|
75
|
+
Math.floor(Date.now() / 1000),
|
|
76
|
+
isStream: Boolean(msgObj.isStream ?? msgObj.IsStream),
|
|
77
|
+
streamEnd: Boolean(msgObj.streamEnd ?? msgObj.StreamEnd),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
40
80
|
/** 服务端重新签发运行 token 时同步，避免重连仍用旧 token */
|
|
41
81
|
updateAccount(account) {
|
|
42
82
|
this.account = account;
|
|
@@ -106,7 +146,10 @@ export class PufferfishWebSocketClient extends EventEmitter {
|
|
|
106
146
|
return;
|
|
107
147
|
}
|
|
108
148
|
}
|
|
109
|
-
const message = parsed;
|
|
149
|
+
const message = this.normalizeInboundMessage(parsed);
|
|
150
|
+
const parsedKeys = parsed && typeof parsed === 'object'
|
|
151
|
+
? Object.keys(parsed).slice(0, 16).join(',')
|
|
152
|
+
: '';
|
|
110
153
|
console.log(`${this.prefix()} Inbound message received` +
|
|
111
154
|
` messageId=${message?.messageId ?? 'unknown'}` +
|
|
112
155
|
` chatId=${message?.chatId ?? 'unknown'}` +
|
|
@@ -114,7 +157,9 @@ export class PufferfishWebSocketClient extends EventEmitter {
|
|
|
114
157
|
` type=${message?.type ?? 'unknown'}` +
|
|
115
158
|
` isStream=${message?.isStream ?? false}` +
|
|
116
159
|
` streamEnd=${message?.streamEnd ?? false}` +
|
|
117
|
-
` rawLen=${raw.length}`
|
|
160
|
+
` rawLen=${raw.length}` +
|
|
161
|
+
` parsedKeys=${parsedKeys}` +
|
|
162
|
+
` contentPreview=${String(message?.content ?? '').slice(0, 180)}`);
|
|
118
163
|
this.ackInboundMessage(message?.messageId);
|
|
119
164
|
this.emit('message', message);
|
|
120
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;;GASG;AACH,MAAM,OAAO,yBAA0B,SAAQ,YAAY;IACjD,EAAE,GAAqB,IAAI,CAAC,CAAc,iBAAiB;IAC3D,OAAO,CAAoB,CAAe,OAAO;IACjD,cAAc,GAA0B,IAAI,CAAC,CAAE,QAAQ;IACvD,cAAc,GAA0B,IAAI,CAAC,CAAE,QAAQ;IACvD,YAAY,GAAG,KAAK,CAAC,CAAqB,UAAU;IACpD,eAAe,GAAG,IAAI,CAAC,CAAmB,WAAW;IACrD,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC,CAAM,2BAA2B;IACrE,UAAU,GAAa,EAAE,CAAC,CAAgB,mBAAmB;IAC7D,MAAM,CAAU,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAE3D,YAAY,OAA0B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEO,MAAM;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,SAAS,CAAC;QACvD,OAAO,8BAA8B,SAAS,gBAAgB,SAAS,GAAG,CAAC;IAC7E,CAAC;IAEO,WAAW,CAAC,KAAa;QAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACtB,gCAAgC;QAChC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAEO,UAAU,CAAC,GAAG,MAAiB;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE;gBAAE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACrE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,UAAU,CAAC,GAAG,MAAiB;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACtE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC9C,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAAE,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,uBAAuB,CAAC,MAAW;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG;YACf,GAAG,CAAC,OAAO,MAAM,EAAE,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,GAAG,CAAC,OAAO,MAAM,EAAE,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,UAAU,EAAE,MAAM;SACnB,CAAC;QAEF,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;YAC1F,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YACzF,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;YACrF,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;gBACtF,MAAM,CAAQ;YAChB,OAAO,EACL,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,UAAU,EACjB,QAAQ,EAAE,UAAU,EACpB,QAAQ,EAAE,UAAU,CACrB,IAAI,EAAE;YACT,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;gBAChG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC/B,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;YACrD,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC;SACzD,CAAC;IACJ,CAAC;IAED,wCAAwC;IACxC,aAAa,CAAC,OAA0B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC;IACnE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,UAAU,MAAM,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;YACvB,IAAI,CAAC;gBACH,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CACT,GAAG,IAAI,CAAC,MAAM,EAAE,gBAAgB;gBAC9B,cAAc,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClC,eAAe,UAAU,EAAE;gBAC3B,aAAa,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC1C,gBAAgB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACtD,UAAU,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAClC,wBAAwB,CAC3B,CAAC;YACF,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvB,+BAA+B;gBAC/B,IAAI,CAAC,IAAI,CAAC;oBACR,MAAM,EAAE,OAAO;oBACf,aAAa,EAAE,yBAAyB,CAAC,aAAa;iBACvD,CAAC,CAAC;gBACH,IAAI,CAAC,cAAc,EAAE,CAAC;gBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAoB,EAAE,EAAE;gBAC7C,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAQ,CAAC;oBACtC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;wBACnD,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;4BAC3B,8BAA8B;4BAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;4BAChE,MAAM,gBAAgB,GACpB,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;4BACvF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;4BAC/B,OAAO,CAAC,GAAG,CACT,GAAG,IAAI,CAAC,MAAM,EAAE,gBAAgB;gCAC9B,WAAW,gBAAgB,EAAE;gCAC7B,qBAAqB,MAAM,CAAC,gBAAgB,IAAI,SAAS,EAAE,CAC9D,CAAC;4BACF,OAAO;wBACT,CAAC;wBACD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;4BACvB,4CAA4C;4BAC5C,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;4BACnC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;4BAC9D,OAAO;wBACT,CAAC;oBACH,CAAC;oBACD,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;oBACrD,MAAM,UAAU,GAAG,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;wBACrD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC5C,CAAC,CAAC,EAAE,CAAC;oBACP,OAAO,CAAC,GAAG,CACT,GAAG,IAAI,CAAC,MAAM,EAAE,2BAA2B;wBACzC,cAAe,OAAe,EAAE,SAAS,IAAI,SAAS,EAAE;wBACxD,WAAY,OAAe,EAAE,MAAM,IAAI,SAAS,EAAE;wBAClD,WAAY,OAAe,EAAE,MAAM,IAAI,SAAS,EAAE;wBAClD,SAAU,OAAe,EAAE,IAAI,IAAI,SAAS,EAAE;wBAC9C,aAAc,OAAe,EAAE,QAAQ,IAAI,KAAK,EAAE;wBAClD,cAAe,OAAe,EAAE,SAAS,IAAI,KAAK,EAAE;wBACpD,WAAW,GAAG,CAAC,MAAM,EAAE;wBACvB,eAAe,UAAU,EAAE;wBAC3B,mBAAmB,MAAM,CAAE,OAAe,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAC7E,CAAC;oBACF,IAAI,CAAC,iBAAiB,CAAE,OAAe,EAAE,SAAS,CAAC,CAAC;oBACpD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAChC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC;oBACrC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;gBACjG,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;gBAE7C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC5B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,OAAO,CAAC,KAAK,CACX,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS;oBACvB,cAAc,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBAClC,eAAe,UAAU,EAAE;oBAC3B,gBAAgB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACtD,UAAU,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EACpC,KAAK,CACN,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACtB,kBAAkB;YACpB,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;QAED,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,IAAS;QACZ,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACrD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,SAAkB;QAC1C,MAAM,EAAE,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO;QAEzC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,OAAO,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC;YAC5E,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,mCAAmC;QACrC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;YACrC,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;gBACrD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YACjB,CAAC;QACH,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ;IACrB,CAAC;IAED;;OAEG;IACK,aAAa;QACnB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC"}
|