@agentunion/fastaun-browser 0.5.14 → 0.5.16
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/CHANGELOG.md +44 -0
- package/_packed_docs/CHANGELOG.md +44 -0
- package/_packed_docs/agent.md/SCHEMA.md +15 -8
- package/_packed_docs/aun/345/210/206/345/270/203/345/274/217/346/265/213/350/257/225/350/277/220/350/241/214/346/214/207/345/215/227.md +85 -4
- package/_packed_docs/aun/346/265/213/350/257/225/350/277/220/350/241/214/346/214/207/345/215/227.md +1 -1
- package/dist/agent-md-schema.d.ts.map +1 -1
- package/dist/agent-md-schema.js +6 -0
- package/dist/agent-md-schema.js.map +1 -1
- package/dist/agent-md.d.ts +1 -0
- package/dist/agent-md.d.ts.map +1 -1
- package/dist/agent-md.js +2 -0
- package/dist/agent-md.js.map +1 -1
- package/dist/bundle.js +421 -264
- package/dist/client/delivery.d.ts.map +1 -1
- package/dist/client/delivery.js +2 -4
- package/dist/client/delivery.js.map +1 -1
- package/dist/client/lifecycle.d.ts.map +1 -1
- package/dist/client/lifecycle.js +5 -1
- package/dist/client/lifecycle.js.map +1 -1
- package/dist/client/rpc-pipeline.d.ts +1 -0
- package/dist/client/rpc-pipeline.d.ts.map +1 -1
- package/dist/client/rpc-pipeline.js +10 -8
- package/dist/client/rpc-pipeline.js.map +1 -1
- package/dist/client/v2-e2ee.d.ts.map +1 -1
- package/dist/client/v2-e2ee.js +24 -13
- package/dist/client/v2-e2ee.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +46 -28
- package/dist/client.js.map +1 -1
- package/dist/events.d.ts +25 -12
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js +164 -79
- package/dist/events.js.map +1 -1
- package/dist/group-index.js +1 -1
- package/dist/group-index.js.map +1 -1
- package/dist/logger.d.ts +9 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +29 -7
- package/dist/logger.js.map +1 -1
- package/dist/result.d.ts +1 -2
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +2 -2
- package/dist/result.js.map +1 -1
- package/dist/transport.d.ts +5 -1
- package/dist/transport.d.ts.map +1 -1
- package/dist/transport.js +57 -32
- package/dist/transport.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/dist/events.d.ts
CHANGED
|
@@ -11,8 +11,9 @@ export declare class Subscription {
|
|
|
11
11
|
private _dispatcher;
|
|
12
12
|
private _event;
|
|
13
13
|
private _handler;
|
|
14
|
+
private _protocol;
|
|
14
15
|
private _active;
|
|
15
|
-
constructor(dispatcher: EventDispatcher, event: string, handler: EventHandler);
|
|
16
|
+
constructor(dispatcher: EventDispatcher, event: string, handler: EventHandler, protocol?: boolean);
|
|
16
17
|
/** 取消订阅 */
|
|
17
18
|
unsubscribe(): void;
|
|
18
19
|
}
|
|
@@ -20,16 +21,8 @@ export declare class Subscription {
|
|
|
20
21
|
export declare class EventDispatcher {
|
|
21
22
|
private _log;
|
|
22
23
|
setLogger(log: ModuleLogger): void;
|
|
23
|
-
private
|
|
24
|
-
private
|
|
25
|
-
private _draining;
|
|
26
|
-
private _drainScheduled;
|
|
27
|
-
private _handlerDepth;
|
|
28
|
-
private _synchronousHandlerDepth;
|
|
29
|
-
private _drainPromise;
|
|
30
|
-
private _drainResolve;
|
|
31
|
-
private _closing;
|
|
32
|
-
private _closed;
|
|
24
|
+
private _app;
|
|
25
|
+
private _protocol;
|
|
33
26
|
/**
|
|
34
27
|
* 订阅事件,返回订阅句柄。
|
|
35
28
|
*
|
|
@@ -38,21 +31,41 @@ export declare class EventDispatcher {
|
|
|
38
31
|
* 对象调用 unsubscribe() 来取消。
|
|
39
32
|
*/
|
|
40
33
|
subscribe(event: string, handler: EventHandler): Subscription;
|
|
34
|
+
/** 订阅 SDK 内部协议事件。 */
|
|
35
|
+
subscribeProtocol(event: string, handler: EventHandler): Subscription;
|
|
36
|
+
private _subscribe;
|
|
41
37
|
/** 取消订阅 */
|
|
42
|
-
unsubscribe(event: string, handler: EventHandler): void;
|
|
38
|
+
unsubscribe(event: string, handler: EventHandler, protocol?: boolean): void;
|
|
39
|
+
/** 取消协议事件订阅。 */
|
|
40
|
+
unsubscribeProtocol(event: string, handler: EventHandler): void;
|
|
43
41
|
/**
|
|
44
42
|
* 发布事件。事件总是异步进入 FIFO 队列;调用方 await 时等待该事件处理完成。
|
|
45
43
|
* drain 中派生事件只入队,不等待自身,避免事件处理器互相等待形成死锁。
|
|
46
44
|
*/
|
|
47
45
|
publish(event: string, payload: EventPayload): Promise<void>;
|
|
46
|
+
/** 发布协议事件。调用方 await 时等待协议处理完成。 */
|
|
47
|
+
publishProtocol(event: string, payload: EventPayload): Promise<void>;
|
|
48
|
+
private _publish;
|
|
48
49
|
/** 将事件放入异步 FIFO 队列,不等待处理器执行完成。 */
|
|
49
50
|
enqueue(event: string, payload: EventPayload): void;
|
|
51
|
+
/** 将协议事件放入独立异步 FIFO 队列,不等待处理器执行完成。 */
|
|
52
|
+
enqueueProtocol(event: string, payload: EventPayload): void;
|
|
53
|
+
private _enqueue;
|
|
50
54
|
/** 将非事件 observer 放入同一 FIFO 队列。 */
|
|
51
55
|
enqueueTask(task: QueuedTask): void;
|
|
56
|
+
/** 将协议层 observer 放入协议 FIFO 队列。 */
|
|
57
|
+
enqueueProtocolTask(task: QueuedTask): void;
|
|
58
|
+
private _enqueueTask;
|
|
52
59
|
/** 关闭调度器,排空已经入队的应用事件后拒绝后续事件。 */
|
|
53
60
|
close(): Promise<void>;
|
|
61
|
+
/** 关闭协议调度器,排空已经入队的协议事件后拒绝后续事件。 */
|
|
62
|
+
closeProtocol(): Promise<void>;
|
|
63
|
+
private _close;
|
|
54
64
|
/** 等待当前队列排空;事件 handler 重入时直接返回,避免自等待。 */
|
|
55
65
|
flush(): Promise<void>;
|
|
66
|
+
/** 等待协议层当前队列排空。 */
|
|
67
|
+
flushProtocol(): Promise<void>;
|
|
68
|
+
private _flush;
|
|
56
69
|
private finishClose;
|
|
57
70
|
private scheduleDrain;
|
|
58
71
|
private _drain;
|
package/dist/events.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,eAAe;AACf,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,KAAK,GACL;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAA;CAAE,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAO3E,KAAK,UAAU,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,eAAe;AACf,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,KAAK,GACL;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAA;CAAE,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAO3E,KAAK,UAAU,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAoD7C,iCAAiC;AACjC,qBAAa,YAAY;IACvB,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,OAAO,CAAQ;gBAEX,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,UAAQ;IAO/F,WAAW;IACX,WAAW,IAAI,IAAI;CAKpB;AAED,4CAA4C;AAC5C,qBAAa,eAAe;IAC1B,OAAO,CAAC,IAAI,CAA0B;IACtC,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAElC,OAAO,CAAC,IAAI,CAAkC;IAC9C,OAAO,CAAC,SAAS,CAAkC;IAEnD;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,YAAY;IAI7D,qBAAqB;IACrB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,YAAY;IAIrE,OAAO,CAAC,UAAU;IAOlB,WAAW;IACX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,UAAQ,GAAG,IAAI;IAYzE,gBAAgB;IAChB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAI/D;;;OAGG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,kCAAkC;IAC5B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAI5D,QAAQ;IAkBtB,kCAAkC;IAClC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAInD,sCAAsC;IACtC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAI3D,OAAO,CAAC,QAAQ;IAShB,kCAAkC;IAClC,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAInC,kCAAkC;IAClC,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAI3C,OAAO,CAAC,YAAY;IAYpB,gCAAgC;IAC1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,kCAAkC;IAC5B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YAItB,MAAM;IAUpB,yCAAyC;IACnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,mBAAmB;IACb,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YAItB,MAAM;IAMpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,aAAa;YASP,MAAM;IA8BpB,iDAAiD;IACjD,oBAAoB,IAAI,OAAO;YAIjB,YAAY;YAsBZ,WAAW;CA+B1B"}
|
package/dist/events.js
CHANGED
|
@@ -1,21 +1,56 @@
|
|
|
1
1
|
// ── 事件调度器 ──────────────────────────────────────────
|
|
2
2
|
const _noopLog = { error: () => { }, warn: () => { }, info: () => { }, debug: () => { } };
|
|
3
|
+
function createQueueState() {
|
|
4
|
+
return {
|
|
5
|
+
handlers: new Map(),
|
|
6
|
+
queue: [],
|
|
7
|
+
draining: false,
|
|
8
|
+
drainScheduled: false,
|
|
9
|
+
handlerDepth: 0,
|
|
10
|
+
synchronousHandlerDepth: 0,
|
|
11
|
+
drainPromise: null,
|
|
12
|
+
drainResolve: null,
|
|
13
|
+
closing: false,
|
|
14
|
+
closed: false,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
function cloneEventPayload(value) {
|
|
18
|
+
if (Array.isArray(value))
|
|
19
|
+
return value.map((item) => cloneEventPayload(item));
|
|
20
|
+
if (value instanceof Error) {
|
|
21
|
+
const error = value;
|
|
22
|
+
const rawCode = error.localCode ?? error.stringCode ?? error.code;
|
|
23
|
+
const code = rawCode === undefined || rawCode === null || rawCode === '' || rawCode === -1
|
|
24
|
+
? 'INTERNAL_ERROR'
|
|
25
|
+
: rawCode;
|
|
26
|
+
return { code: code, message: error.message || error.name };
|
|
27
|
+
}
|
|
28
|
+
if (value !== null && typeof value === 'object') {
|
|
29
|
+
const clone = {};
|
|
30
|
+
for (const [key, item] of Object.entries(value))
|
|
31
|
+
clone[key] = cloneEventPayload(item);
|
|
32
|
+
return clone;
|
|
33
|
+
}
|
|
34
|
+
return value;
|
|
35
|
+
}
|
|
3
36
|
/** 订阅句柄,调用 unsubscribe() 取消监听 */
|
|
4
37
|
export class Subscription {
|
|
5
38
|
_dispatcher;
|
|
6
39
|
_event;
|
|
7
40
|
_handler;
|
|
41
|
+
_protocol;
|
|
8
42
|
_active = true;
|
|
9
|
-
constructor(dispatcher, event, handler) {
|
|
43
|
+
constructor(dispatcher, event, handler, protocol = false) {
|
|
10
44
|
this._dispatcher = dispatcher;
|
|
11
45
|
this._event = event;
|
|
12
46
|
this._handler = handler;
|
|
47
|
+
this._protocol = protocol;
|
|
13
48
|
}
|
|
14
49
|
/** 取消订阅 */
|
|
15
50
|
unsubscribe() {
|
|
16
51
|
if (!this._active)
|
|
17
52
|
return;
|
|
18
|
-
this._dispatcher.unsubscribe(this._event, this._handler);
|
|
53
|
+
this._dispatcher.unsubscribe(this._event, this._handler, this._protocol);
|
|
19
54
|
this._active = false;
|
|
20
55
|
}
|
|
21
56
|
}
|
|
@@ -23,16 +58,8 @@ export class Subscription {
|
|
|
23
58
|
export class EventDispatcher {
|
|
24
59
|
_log = _noopLog;
|
|
25
60
|
setLogger(log) { this._log = log; }
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
_draining = false;
|
|
29
|
-
_drainScheduled = false;
|
|
30
|
-
_handlerDepth = 0;
|
|
31
|
-
_synchronousHandlerDepth = 0;
|
|
32
|
-
_drainPromise = null;
|
|
33
|
-
_drainResolve = null;
|
|
34
|
-
_closing = false;
|
|
35
|
-
_closed = false;
|
|
61
|
+
_app = createQueueState();
|
|
62
|
+
_protocol = createQueueState();
|
|
36
63
|
/**
|
|
37
64
|
* 订阅事件,返回订阅句柄。
|
|
38
65
|
*
|
|
@@ -41,108 +68,160 @@ export class EventDispatcher {
|
|
|
41
68
|
* 对象调用 unsubscribe() 来取消。
|
|
42
69
|
*/
|
|
43
70
|
subscribe(event, handler) {
|
|
44
|
-
|
|
71
|
+
return this._subscribe(this._app, event, handler, false);
|
|
72
|
+
}
|
|
73
|
+
/** 订阅 SDK 内部协议事件。 */
|
|
74
|
+
subscribeProtocol(event, handler) {
|
|
75
|
+
return this._subscribe(this._protocol, event, handler, true);
|
|
76
|
+
}
|
|
77
|
+
_subscribe(state, event, handler, protocol) {
|
|
78
|
+
const list = state.handlers.get(event) ?? [];
|
|
45
79
|
list.push(handler);
|
|
46
|
-
|
|
47
|
-
return new Subscription(this, event, handler);
|
|
80
|
+
state.handlers.set(event, list);
|
|
81
|
+
return new Subscription(this, event, handler, protocol);
|
|
48
82
|
}
|
|
49
83
|
/** 取消订阅 */
|
|
50
|
-
unsubscribe(event, handler) {
|
|
51
|
-
const
|
|
84
|
+
unsubscribe(event, handler, protocol = false) {
|
|
85
|
+
const state = protocol ? this._protocol : this._app;
|
|
86
|
+
const list = state.handlers.get(event);
|
|
52
87
|
if (!list)
|
|
53
88
|
return;
|
|
54
89
|
const filtered = list.filter((h) => h !== handler);
|
|
55
90
|
if (filtered.length > 0) {
|
|
56
|
-
|
|
91
|
+
state.handlers.set(event, filtered);
|
|
57
92
|
}
|
|
58
93
|
else {
|
|
59
|
-
|
|
94
|
+
state.handlers.delete(event);
|
|
60
95
|
}
|
|
61
96
|
}
|
|
97
|
+
/** 取消协议事件订阅。 */
|
|
98
|
+
unsubscribeProtocol(event, handler) {
|
|
99
|
+
this.unsubscribe(event, handler, true);
|
|
100
|
+
}
|
|
62
101
|
/**
|
|
63
102
|
* 发布事件。事件总是异步进入 FIFO 队列;调用方 await 时等待该事件处理完成。
|
|
64
103
|
* drain 中派生事件只入队,不等待自身,避免事件处理器互相等待形成死锁。
|
|
65
104
|
*/
|
|
66
105
|
async publish(event, payload) {
|
|
67
|
-
|
|
106
|
+
await this._publish(this._app, event, payload);
|
|
107
|
+
}
|
|
108
|
+
/** 发布协议事件。调用方 await 时等待协议处理完成。 */
|
|
109
|
+
async publishProtocol(event, payload) {
|
|
110
|
+
await this._publish(this._protocol, event, payload);
|
|
111
|
+
}
|
|
112
|
+
async _publish(state, event, payload) {
|
|
113
|
+
if (state.closed || state.closing)
|
|
68
114
|
return;
|
|
69
115
|
let resolveItem;
|
|
70
116
|
const itemDone = new Promise((resolve) => { resolveItem = resolve; });
|
|
71
|
-
|
|
72
|
-
run: () => this.dispatchNow(event, payload),
|
|
117
|
+
state.queue.push({
|
|
118
|
+
run: () => this.dispatchNow(state, event, payload),
|
|
73
119
|
resolve: resolveItem,
|
|
74
120
|
});
|
|
75
121
|
// Handler 内部重新发布只入队即可;等待自身完成会与当前 handler 自锁。
|
|
76
|
-
if (
|
|
122
|
+
if (state.handlerDepth > 0)
|
|
77
123
|
return;
|
|
78
|
-
if (
|
|
79
|
-
|
|
124
|
+
if (state.drainPromise === null) {
|
|
125
|
+
state.drainPromise = new Promise((resolve) => { state.drainResolve = resolve; });
|
|
80
126
|
}
|
|
81
|
-
this.scheduleDrain();
|
|
127
|
+
this.scheduleDrain(state);
|
|
128
|
+
if (state === this._app && this._protocol.handlerDepth > 0)
|
|
129
|
+
return;
|
|
82
130
|
await itemDone;
|
|
83
131
|
}
|
|
84
132
|
/** 将事件放入异步 FIFO 队列,不等待处理器执行完成。 */
|
|
85
133
|
enqueue(event, payload) {
|
|
86
|
-
|
|
134
|
+
this._enqueue(this._app, event, payload);
|
|
135
|
+
}
|
|
136
|
+
/** 将协议事件放入独立异步 FIFO 队列,不等待处理器执行完成。 */
|
|
137
|
+
enqueueProtocol(event, payload) {
|
|
138
|
+
this._enqueue(this._protocol, event, payload);
|
|
139
|
+
}
|
|
140
|
+
_enqueue(state, event, payload) {
|
|
141
|
+
const publish = state === this._protocol
|
|
142
|
+
? this.publishProtocol(event, payload)
|
|
143
|
+
: this.publish(event, payload);
|
|
144
|
+
void publish.catch((exc) => {
|
|
87
145
|
this._log.warn(`event ${event} enqueue failed:`, exc);
|
|
88
146
|
});
|
|
89
147
|
}
|
|
90
148
|
/** 将非事件 observer 放入同一 FIFO 队列。 */
|
|
91
149
|
enqueueTask(task) {
|
|
92
|
-
|
|
150
|
+
this._enqueueTask(this._app, task);
|
|
151
|
+
}
|
|
152
|
+
/** 将协议层 observer 放入协议 FIFO 队列。 */
|
|
153
|
+
enqueueProtocolTask(task) {
|
|
154
|
+
this._enqueueTask(this._protocol, task);
|
|
155
|
+
}
|
|
156
|
+
_enqueueTask(state, task) {
|
|
157
|
+
if (state.closed || state.closing)
|
|
93
158
|
return;
|
|
94
|
-
|
|
95
|
-
run: () => this.dispatchTask(task),
|
|
159
|
+
state.queue.push({
|
|
160
|
+
run: () => this.dispatchTask(state, task),
|
|
96
161
|
resolve: () => { },
|
|
97
162
|
});
|
|
98
|
-
if (
|
|
99
|
-
|
|
163
|
+
if (state.drainPromise === null) {
|
|
164
|
+
state.drainPromise = new Promise((resolve) => { state.drainResolve = resolve; });
|
|
100
165
|
}
|
|
101
|
-
this.scheduleDrain();
|
|
166
|
+
this.scheduleDrain(state);
|
|
102
167
|
}
|
|
103
168
|
/** 关闭调度器,排空已经入队的应用事件后拒绝后续事件。 */
|
|
104
169
|
async close() {
|
|
105
|
-
|
|
170
|
+
await this._close(this._app);
|
|
171
|
+
}
|
|
172
|
+
/** 关闭协议调度器,排空已经入队的协议事件后拒绝后续事件。 */
|
|
173
|
+
async closeProtocol() {
|
|
174
|
+
await this._close(this._protocol);
|
|
175
|
+
}
|
|
176
|
+
async _close(state) {
|
|
177
|
+
if (state.closed)
|
|
106
178
|
return;
|
|
107
|
-
|
|
179
|
+
state.closing = true;
|
|
108
180
|
// 事件 handler 在同步调用段内触发 close 时,等待当前 drain 会自锁。
|
|
109
181
|
// 由 drain 的 finally 在处理完当前队列后完成关闭。
|
|
110
|
-
if (
|
|
182
|
+
if (state.synchronousHandlerDepth > 0)
|
|
111
183
|
return;
|
|
112
|
-
if (
|
|
113
|
-
await
|
|
114
|
-
this.finishClose();
|
|
184
|
+
if (state.drainPromise !== null)
|
|
185
|
+
await state.drainPromise;
|
|
186
|
+
this.finishClose(state);
|
|
115
187
|
}
|
|
116
188
|
/** 等待当前队列排空;事件 handler 重入时直接返回,避免自等待。 */
|
|
117
189
|
async flush() {
|
|
118
|
-
|
|
190
|
+
await this._flush(this._app);
|
|
191
|
+
}
|
|
192
|
+
/** 等待协议层当前队列排空。 */
|
|
193
|
+
async flushProtocol() {
|
|
194
|
+
await this._flush(this._protocol);
|
|
195
|
+
}
|
|
196
|
+
async _flush(state) {
|
|
197
|
+
if (state.synchronousHandlerDepth > 0)
|
|
119
198
|
return;
|
|
120
|
-
if (
|
|
121
|
-
await
|
|
199
|
+
if (state.drainPromise !== null)
|
|
200
|
+
await state.drainPromise;
|
|
122
201
|
await Promise.resolve();
|
|
123
202
|
}
|
|
124
|
-
finishClose() {
|
|
125
|
-
if (!
|
|
203
|
+
finishClose(state) {
|
|
204
|
+
if (!state.closing || state.closed || state.draining || state.drainScheduled || state.queue.length > 0)
|
|
126
205
|
return;
|
|
127
|
-
|
|
128
|
-
|
|
206
|
+
state.closed = true;
|
|
207
|
+
state.handlers.clear();
|
|
129
208
|
}
|
|
130
|
-
scheduleDrain() {
|
|
131
|
-
if (
|
|
209
|
+
scheduleDrain(state) {
|
|
210
|
+
if (state.draining || state.drainScheduled || state.queue.length === 0)
|
|
132
211
|
return;
|
|
133
|
-
|
|
212
|
+
state.drainScheduled = true;
|
|
134
213
|
queueMicrotask(() => {
|
|
135
|
-
|
|
136
|
-
void this._drain();
|
|
214
|
+
state.drainScheduled = false;
|
|
215
|
+
void this._drain(state);
|
|
137
216
|
});
|
|
138
217
|
}
|
|
139
|
-
async _drain() {
|
|
140
|
-
if (
|
|
218
|
+
async _drain(state) {
|
|
219
|
+
if (state.draining)
|
|
141
220
|
return;
|
|
142
|
-
|
|
221
|
+
state.draining = true;
|
|
143
222
|
try {
|
|
144
|
-
while (
|
|
145
|
-
const item =
|
|
223
|
+
while (state.queue.length > 0) {
|
|
224
|
+
const item = state.queue.shift();
|
|
146
225
|
try {
|
|
147
226
|
await item.run();
|
|
148
227
|
}
|
|
@@ -155,38 +234,38 @@ export class EventDispatcher {
|
|
|
155
234
|
}
|
|
156
235
|
}
|
|
157
236
|
finally {
|
|
158
|
-
|
|
159
|
-
const resolve =
|
|
160
|
-
|
|
161
|
-
|
|
237
|
+
state.draining = false;
|
|
238
|
+
const resolve = state.drainResolve;
|
|
239
|
+
state.drainResolve = null;
|
|
240
|
+
state.drainPromise = null;
|
|
162
241
|
resolve?.();
|
|
163
|
-
this.finishClose();
|
|
164
|
-
if (
|
|
165
|
-
if (
|
|
166
|
-
|
|
242
|
+
this.finishClose(state);
|
|
243
|
+
if (state.queue.length > 0 && !state.closed) {
|
|
244
|
+
if (state.drainPromise === null) {
|
|
245
|
+
state.drainPromise = new Promise((nextResolve) => { state.drainResolve = nextResolve; });
|
|
167
246
|
}
|
|
168
|
-
this.scheduleDrain();
|
|
247
|
+
this.scheduleDrain(state);
|
|
169
248
|
}
|
|
170
249
|
}
|
|
171
250
|
}
|
|
172
251
|
/** 当前是否正在调用应用 handler 或 observer。供生命周期入口识别重入。 */
|
|
173
252
|
isDispatchingHandler() {
|
|
174
|
-
return this.
|
|
253
|
+
return this._app.handlerDepth > 0 || this._protocol.handlerDepth > 0;
|
|
175
254
|
}
|
|
176
|
-
async dispatchTask(task) {
|
|
255
|
+
async dispatchTask(state, task) {
|
|
177
256
|
let result;
|
|
178
|
-
|
|
257
|
+
state.handlerDepth += 1;
|
|
179
258
|
try {
|
|
180
|
-
|
|
259
|
+
state.synchronousHandlerDepth += 1;
|
|
181
260
|
result = task();
|
|
182
261
|
}
|
|
183
262
|
catch (exc) {
|
|
184
263
|
this._log.warn('event task execution exception:', exc);
|
|
185
|
-
|
|
264
|
+
state.handlerDepth -= 1;
|
|
186
265
|
return;
|
|
187
266
|
}
|
|
188
267
|
finally {
|
|
189
|
-
|
|
268
|
+
state.synchronousHandlerDepth -= 1;
|
|
190
269
|
}
|
|
191
270
|
try {
|
|
192
271
|
await result;
|
|
@@ -195,26 +274,29 @@ export class EventDispatcher {
|
|
|
195
274
|
this._log.warn('event task execution exception:', exc);
|
|
196
275
|
}
|
|
197
276
|
finally {
|
|
198
|
-
|
|
277
|
+
state.handlerDepth -= 1;
|
|
199
278
|
}
|
|
200
279
|
}
|
|
201
|
-
async dispatchNow(event, payload) {
|
|
280
|
+
async dispatchNow(state, event, payload) {
|
|
202
281
|
// 浅拷贝 handler 列表:防止迭代过程中 subscribe/unsubscribe 修改原数组导致跳过或重复执行。
|
|
203
|
-
const handlers = [...(
|
|
282
|
+
const handlers = [...(state.handlers.get(event) ?? [])];
|
|
283
|
+
const applicationPayload = state === this._protocol && this._app.handlers.has(event)
|
|
284
|
+
? cloneEventPayload(payload)
|
|
285
|
+
: undefined;
|
|
204
286
|
for (const handler of handlers) {
|
|
205
287
|
let result;
|
|
206
|
-
|
|
288
|
+
state.handlerDepth += 1;
|
|
207
289
|
try {
|
|
208
|
-
|
|
290
|
+
state.synchronousHandlerDepth += 1;
|
|
209
291
|
result = handler(payload);
|
|
210
292
|
}
|
|
211
293
|
catch (exc) {
|
|
212
294
|
this._log.warn(`event ${event} handler execution exception:`, exc);
|
|
213
|
-
|
|
295
|
+
state.handlerDepth -= 1;
|
|
214
296
|
continue;
|
|
215
297
|
}
|
|
216
298
|
finally {
|
|
217
|
-
|
|
299
|
+
state.synchronousHandlerDepth -= 1;
|
|
218
300
|
}
|
|
219
301
|
try {
|
|
220
302
|
await result;
|
|
@@ -223,9 +305,12 @@ export class EventDispatcher {
|
|
|
223
305
|
this._log.warn(`event ${event} handler execution exception:`, exc);
|
|
224
306
|
}
|
|
225
307
|
finally {
|
|
226
|
-
|
|
308
|
+
state.handlerDepth -= 1;
|
|
227
309
|
}
|
|
228
310
|
}
|
|
311
|
+
if (applicationPayload !== undefined) {
|
|
312
|
+
this.enqueue(event, applicationPayload);
|
|
313
|
+
}
|
|
229
314
|
}
|
|
230
315
|
}
|
|
231
316
|
//# sourceMappingURL=events.js.map
|
package/dist/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
|
package/dist/group-index.js
CHANGED
|
@@ -188,7 +188,7 @@ export async function verifyGroupIndex(body, signer) {
|
|
|
188
188
|
}
|
|
189
189
|
const verified = await signer.verify(groupIndexSigningPayload(parsed.meta, parsed.entries), signature);
|
|
190
190
|
if (!verified.ok)
|
|
191
|
-
return resultErr(verified.error.code, verified.error.message || 'group index verify failed'
|
|
191
|
+
return resultErr(verified.error.code, verified.error.message || 'group index verify failed');
|
|
192
192
|
if (!verified.data.valid)
|
|
193
193
|
return resultOk({ valid: false, reason: 'signature verification failed' });
|
|
194
194
|
return resultOk({ valid: true, meta: parsed.meta, entries: canonicalEntries(parsed.entries) });
|
package/dist/group-index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-index.js","sourceRoot":"","sources":["../src/group-index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"group-index.js","sourceRoot":"","sources":["../src/group-index.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.d.ts
CHANGED
|
@@ -14,13 +14,21 @@
|
|
|
14
14
|
* 占位符仅支持 %s(按 args 顺序替换,多余的 args 拼到末尾)
|
|
15
15
|
* - error error level supports Error as last param: logger.error('msg', err)
|
|
16
16
|
*/
|
|
17
|
+
export interface LogContext {
|
|
18
|
+
readonly direction: 'outbound' | 'inbound';
|
|
19
|
+
readonly peerAid: string;
|
|
20
|
+
readonly aid?: string;
|
|
21
|
+
}
|
|
17
22
|
export interface ModuleLogger {
|
|
18
23
|
error(msg: string, ...args: unknown[]): void;
|
|
19
24
|
warn(msg: string, ...args: unknown[]): void;
|
|
20
25
|
info(msg: string, ...args: unknown[]): void;
|
|
21
26
|
debug(msg: string, ...args: unknown[]): void;
|
|
22
27
|
isDebugEnabled?(): boolean;
|
|
28
|
+
withContext?(context: LogContext): ModuleLogger;
|
|
23
29
|
}
|
|
30
|
+
export declare function trafficLogContext(direction: LogContext['direction'], data: unknown): LogContext;
|
|
31
|
+
export declare function withLogContext(logger: ModuleLogger, context: LogContext): ModuleLogger;
|
|
24
32
|
export interface AUNLoggerOptions {
|
|
25
33
|
debug: boolean;
|
|
26
34
|
aunPath?: string;
|
|
@@ -32,7 +40,7 @@ export declare class AUNLogger {
|
|
|
32
40
|
private _aid;
|
|
33
41
|
private _minLevel;
|
|
34
42
|
constructor(opts: AUNLoggerOptions);
|
|
35
|
-
for(module: string): ModuleLogger;
|
|
43
|
+
for(module: string, context?: LogContext): ModuleLogger;
|
|
36
44
|
isDebugEnabled(): boolean;
|
|
37
45
|
bindAid(aid: string): void;
|
|
38
46
|
bindDeviceId(deviceId: string): void;
|
package/dist/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,cAAc,CAAC,IAAI,OAAO,CAAC;IAC3B,WAAW,CAAC,CAAC,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC;CACjD;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,UAAU,CAa/F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,CAEtF;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA6BD,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,gBAAgB;IAMlC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY;IAYvD,cAAc,IAAI,OAAO;IAIzB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI1B,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIpC,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,KAAK;IAuCb,OAAO,CAAC,IAAI;CAQb"}
|