@agentunion/fastaun 0.5.27 → 0.5.28
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 +36 -0
- package/_packed_docs/CHANGELOG.md +36 -0
- package/_packed_docs/INDEX.md +17 -2
- package/_packed_docs/KITE_DOCS_GUIDE.md +12 -9
- package/_packed_docs/sdk/AUN_DOCS_GUIDE.md +2 -2
- package/_packed_docs/sdk/INDEX.md +5 -3
- package/dist/agent-md-changes.d.ts +42 -0
- package/dist/agent-md-changes.js +339 -0
- package/dist/agent-md-changes.js.map +1 -0
- package/dist/agent-md-schema.d.ts +1 -0
- package/dist/agent-md-schema.js +30 -13
- package/dist/agent-md-schema.js.map +1 -1
- package/dist/agent-md.d.ts +11 -0
- package/dist/agent-md.js +86 -15
- package/dist/agent-md.js.map +1 -1
- package/dist/aid-store.d.ts +11 -0
- package/dist/aid-store.js +102 -21
- package/dist/aid-store.js.map +1 -1
- package/dist/auth.d.ts +10 -0
- package/dist/auth.js +44 -4
- package/dist/auth.js.map +1 -1
- package/dist/client/control-messages.d.ts +31 -0
- package/dist/client/control-messages.js +474 -0
- package/dist/client/control-messages.js.map +1 -0
- package/dist/client/delivery.js +10 -2
- package/dist/client/delivery.js.map +1 -1
- package/dist/client/lifecycle.js +10 -0
- package/dist/client/lifecycle.js.map +1 -1
- package/dist/client/rpc-pipeline.js +76 -13
- package/dist/client/rpc-pipeline.js.map +1 -1
- package/dist/client/v2-e2ee.d.ts +3 -0
- package/dist/client/v2-e2ee.js +5 -0
- package/dist/client/v2-e2ee.js.map +1 -1
- package/dist/client.d.ts +26 -0
- package/dist/client.js +267 -7
- package/dist/client.js.map +1 -1
- package/dist/discovery.d.ts +3 -0
- package/dist/discovery.js +52 -2
- package/dist/discovery.js.map +1 -1
- package/dist/events.js +14 -1
- package/dist/events.js.map +1 -1
- package/dist/risk-control.d.ts +68 -0
- package/dist/risk-control.js +344 -0
- package/dist/risk-control.js.map +1 -0
- package/dist/storage/lowlevel.d.ts +1 -0
- package/dist/storage/lowlevel.js +2 -2
- package/dist/storage/lowlevel.js.map +1 -1
- package/dist/tools/cross-sdk-agent.d.ts +1 -1
- package/dist/transport.d.ts +21 -1
- package/dist/transport.js +199 -20
- 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/_packed_docs/cli//345/207/255/350/257/201/344/270/216/347/273/204/347/273/207/346/234/215/345/212/241CLI/345/274/200/345/217/221/344/270/216/344/275/277/347/224/250/346/214/207/345/215/227.md +0 -869
- package/_packed_docs/sdk/0.5.27-SDK/345/272/224/347/224/250/351/233/206/346/210/220/346/214/207/345/215/227.md +0 -408
- package/_packed_docs/sdk/0.5.27-SDK/345/274/200/345/217/221/344/270/216/347/247/273/346/244/215/346/214/207/345/215/227.md +0 -410
|
@@ -0,0 +1,474 @@
|
|
|
1
|
+
import { ConnectionError, StateError, ValidationError } from '../errors.js';
|
|
2
|
+
export const MESSAGE_CLASSES = ['sdk_control', 'control', 'normal'];
|
|
3
|
+
export const CLASS_RECEIVE_METHODS = new Set([
|
|
4
|
+
'message.peers', 'message.pull', 'message.v2.pull', 'message.history', 'message.ack', 'message.v2.ack',
|
|
5
|
+
'group.pull', 'group.v2.pull', 'group.history', 'group.ack', 'group.v2.ack', 'group.ack_messages',
|
|
6
|
+
]);
|
|
7
|
+
function object(value) { return value !== null && typeof value === 'object' && !Array.isArray(value); }
|
|
8
|
+
function protocolVersion(value) {
|
|
9
|
+
const version = typeof value === 'string' && /^[1-9][0-9]*$/.test(value) ? Number(value) : value;
|
|
10
|
+
return Number.isSafeInteger(version) && Number(version) > 0 ? Number(version) : null;
|
|
11
|
+
}
|
|
12
|
+
export function messageClassOf(value) {
|
|
13
|
+
if (!object(value))
|
|
14
|
+
return 'normal';
|
|
15
|
+
let envelope = value.envelope ?? (['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(value.payload?.type) ? value.payload : undefined);
|
|
16
|
+
if (typeof value.envelope_json === 'string') {
|
|
17
|
+
try {
|
|
18
|
+
envelope = JSON.parse(value.envelope_json);
|
|
19
|
+
}
|
|
20
|
+
catch { /* 无效密文由解密管线拒绝。 */ }
|
|
21
|
+
}
|
|
22
|
+
const authenticatedClass = value.protected_headers?.message_class ?? envelope?.protected_headers?.message_class;
|
|
23
|
+
if (authenticatedClass === 'sdk_control')
|
|
24
|
+
return 'sdk_control';
|
|
25
|
+
return String(value.message_class ?? authenticatedClass ?? value.inline_message?.message_class ?? 'normal');
|
|
26
|
+
}
|
|
27
|
+
export function applicationResult(value) {
|
|
28
|
+
if (Array.isArray(value)) {
|
|
29
|
+
const next = value.filter((item) => messageClassOf(item) !== 'sdk_control').map(applicationResult);
|
|
30
|
+
return next.length === value.length && next.every((item, i) => item === value[i]) ? value : next;
|
|
31
|
+
}
|
|
32
|
+
if (!object(value))
|
|
33
|
+
return value;
|
|
34
|
+
if (messageClassOf(value) === 'sdk_control') {
|
|
35
|
+
const { messages, items, events, results, message, inline_message, envelope, envelope_json, payload, content, ...metadata } = value;
|
|
36
|
+
return { ...metadata, ...(Array.isArray(messages) ? { messages: [] } : {}) };
|
|
37
|
+
}
|
|
38
|
+
const result = { ...value };
|
|
39
|
+
for (const key of ['messages', 'items', 'events', 'results'])
|
|
40
|
+
if (Array.isArray(result[key]))
|
|
41
|
+
result[key] = applicationResult(result[key]);
|
|
42
|
+
for (const key of ['message', 'inline_message', 'result'])
|
|
43
|
+
if (object(result[key])) {
|
|
44
|
+
if (messageClassOf(result[key]) === 'sdk_control')
|
|
45
|
+
delete result[key];
|
|
46
|
+
else
|
|
47
|
+
result[key] = applicationResult(result[key]);
|
|
48
|
+
}
|
|
49
|
+
return Object.keys(result).length === Object.keys(value).length && Object.keys(result).every((key) => result[key] === value[key]) ? value : result;
|
|
50
|
+
}
|
|
51
|
+
export class ControlMessageCoordinator {
|
|
52
|
+
client;
|
|
53
|
+
locks = new Map();
|
|
54
|
+
pending = new Map();
|
|
55
|
+
workers = new Map();
|
|
56
|
+
timer = null;
|
|
57
|
+
epoch = 0;
|
|
58
|
+
constructor(client) {
|
|
59
|
+
this.client = client;
|
|
60
|
+
}
|
|
61
|
+
supports(messageClass, group = false) {
|
|
62
|
+
const classes = this.client._negotiatedCapabilities?.message_classes_v1?.[group ? 'group' : 'p2p'];
|
|
63
|
+
return Array.isArray(classes) && classes.includes(messageClass);
|
|
64
|
+
}
|
|
65
|
+
identity() {
|
|
66
|
+
const c = this.client;
|
|
67
|
+
return JSON.stringify([c._aid, c._deviceId, c._slotId, c._serviceEventIdentityVersion, c._v2RuntimeGeneration,
|
|
68
|
+
c._delivery?.captureInlineAckGeneration?.(), this.epoch]);
|
|
69
|
+
}
|
|
70
|
+
check(identity) {
|
|
71
|
+
if (identity !== this.identity() || this.client._closing)
|
|
72
|
+
throw new ConnectionError('control message connection changed');
|
|
73
|
+
}
|
|
74
|
+
key(params, group) {
|
|
75
|
+
return JSON.stringify([params.message_class, group ? params.volatile ? 'volatile_group' : 'group' : 'peer',
|
|
76
|
+
group ? params.group_id ?? params.group_aid : params.sender_aid]);
|
|
77
|
+
}
|
|
78
|
+
load(key) {
|
|
79
|
+
const c = this.client;
|
|
80
|
+
return { ...(c._tokenStore.loadInstanceState?.(c._aid, c._deviceId, c._slotId)?.message_control_v1?.[key] ?? {}) };
|
|
81
|
+
}
|
|
82
|
+
save(key, value) {
|
|
83
|
+
const c = this.client;
|
|
84
|
+
if (typeof c._tokenStore.updateInstanceState !== 'function')
|
|
85
|
+
throw new StateError('persistent control cursor storage is unavailable');
|
|
86
|
+
c._tokenStore.updateInstanceState(c._aid, c._deviceId, c._slotId, (state) => {
|
|
87
|
+
const streams = { ...(state.message_control_v1 ?? {}) };
|
|
88
|
+
if (Number(streams[key]?.after_seq ?? 0) > value.after_seq)
|
|
89
|
+
throw new StateError('control cursor cannot move backwards');
|
|
90
|
+
streams[key] = { ...value };
|
|
91
|
+
return { ...state, message_control_v1: streams };
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
async decode(row, messageClass, group, request) {
|
|
95
|
+
if (messageClassOf(row) !== messageClass)
|
|
96
|
+
throw new StateError('control message class mismatch');
|
|
97
|
+
let decoded;
|
|
98
|
+
const envelope = row.envelope_json ?? (object(row.payload) && String(row.payload.type ?? '').startsWith('e2ee.') ? JSON.stringify(row.payload) : null);
|
|
99
|
+
if (envelope) {
|
|
100
|
+
decoded = await this.client._decryptV2Message({ ...row, envelope_json: envelope }, false, false, true, true, undefined, false, 'control_pull');
|
|
101
|
+
if (!decoded)
|
|
102
|
+
throw new StateError('control message decryption is not ready');
|
|
103
|
+
const headers = decoded.protected_headers;
|
|
104
|
+
if (!object(headers) || headers.message_class !== messageClass)
|
|
105
|
+
throw new StateError('control authenticated class mismatch');
|
|
106
|
+
for (const key of ['message_class', 'sdk_control_protocol', 'sdk_control_version']) {
|
|
107
|
+
if (key in headers) {
|
|
108
|
+
if (key !== 'sdk_control_version' && key in row && row[key] !== headers[key])
|
|
109
|
+
throw new StateError('control authenticated metadata mismatch');
|
|
110
|
+
if (key === 'sdk_control_version') {
|
|
111
|
+
const version = protocolVersion(headers[key]);
|
|
112
|
+
if (version === null || key in row && protocolVersion(row[key]) !== version)
|
|
113
|
+
throw new StateError('control authenticated version mismatch');
|
|
114
|
+
decoded[key] = version;
|
|
115
|
+
}
|
|
116
|
+
else
|
|
117
|
+
decoded[key] = headers[key];
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
decoded = { ...row, from: row.from_aid ?? row.from, encrypted: false };
|
|
123
|
+
}
|
|
124
|
+
if (group) {
|
|
125
|
+
decoded.group_id = request.group_id ?? request.group_aid;
|
|
126
|
+
decoded.group_aid = row.group_aid ?? request.group_aid;
|
|
127
|
+
}
|
|
128
|
+
return { ...decoded, message_class: messageClass };
|
|
129
|
+
}
|
|
130
|
+
async consume(message) {
|
|
131
|
+
if (message.encrypted !== true || !object(message.protected_headers))
|
|
132
|
+
return;
|
|
133
|
+
const protocol = message.protected_headers.sdk_control_protocol;
|
|
134
|
+
const version = protocolVersion(message.protected_headers.sdk_control_version);
|
|
135
|
+
if (typeof protocol !== 'string' || version === null || !object(message.payload))
|
|
136
|
+
return;
|
|
137
|
+
if (typeof this.client._onSdkControl === 'function') {
|
|
138
|
+
await this.client._onSdkControl(protocol, version, message.payload, String(message.from ?? message.from_aid ?? ''));
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
checkScope(result, request, group, volatileGroup) {
|
|
142
|
+
if (!object(result) || result.message_class !== request.message_class || !Array.isArray(result.messages))
|
|
143
|
+
throw new StateError('control Pull response scope mismatch');
|
|
144
|
+
if (group) {
|
|
145
|
+
const scope = result.cursor_scope;
|
|
146
|
+
const c = this.client;
|
|
147
|
+
if (!object(scope) || scope.scope !== 'group' || scope.group_id !== (request.group_id ?? request.group_aid)
|
|
148
|
+
|| scope.aid !== c._aid || scope.device_id !== c._deviceId || scope.slot_id !== c._slotId
|
|
149
|
+
|| scope.message_class !== request.message_class || scope.storage !== (volatileGroup ? 'volatile' : 'persistent'))
|
|
150
|
+
throw new StateError('control group cursor scope mismatch');
|
|
151
|
+
}
|
|
152
|
+
else if (result.cursor_scope !== 'peer' || result.sender_aid !== request.sender_aid)
|
|
153
|
+
throw new StateError('control Pull peer scope mismatch');
|
|
154
|
+
}
|
|
155
|
+
async renewPendingAck(saved, group, key, identity) {
|
|
156
|
+
const c = this.client, ack = saved.pending_ack;
|
|
157
|
+
const target = ack.up_to_seq;
|
|
158
|
+
let after = saved.pending_ack_after_seq ?? 0;
|
|
159
|
+
if (!Number.isSafeInteger(target) || !Number.isSafeInteger(after) || after < 0 || after > target || target > saved.after_seq)
|
|
160
|
+
throw new StateError('invalid pending control ACK coverage');
|
|
161
|
+
const gateKey = `message_class/${ack.message_class}/${key}|forward|class=${ack.message_class}`;
|
|
162
|
+
let proof = '';
|
|
163
|
+
do {
|
|
164
|
+
this.check(identity);
|
|
165
|
+
const request = { message_class: ack.message_class, device_id: c._deviceId, slot_id: c._slotId, after_seq: after, head_seq: target, limit: 200,
|
|
166
|
+
...(group ? { group_id: ack.group_id } : { cursor_scope: 'peer', sender_aid: ack.sender_aid }) };
|
|
167
|
+
const result = await c._rpcPipeline.runPullSerialized(gateKey, () => c._rpcPipeline.rawCall(group ? 'group.v2.pull' : 'message.v2.pull', request, { pullGateKey: gateKey }), true);
|
|
168
|
+
this.check(identity);
|
|
169
|
+
this.checkScope(result, request, group, false);
|
|
170
|
+
const covered = result.scanned_through_seq ?? result.covered_through_seq;
|
|
171
|
+
if (result.head_seq !== target || !Number.isSafeInteger(covered) || covered < after || covered > target
|
|
172
|
+
|| covered === after && after < target || typeof result.scan_proof !== 'string' || !result.scan_proof)
|
|
173
|
+
throw new StateError('control ACK renewal coverage is invalid');
|
|
174
|
+
proof = result.scan_proof;
|
|
175
|
+
await c._rpcPipeline.rawCall(group ? 'group.v2.ack' : 'message.v2.ack', { ...ack, up_to_seq: covered, scan_proof: proof });
|
|
176
|
+
this.check(identity);
|
|
177
|
+
after = covered;
|
|
178
|
+
} while (after < target);
|
|
179
|
+
return proof;
|
|
180
|
+
}
|
|
181
|
+
async call(method, params) {
|
|
182
|
+
const c = this.client;
|
|
183
|
+
const request = { ...params };
|
|
184
|
+
const group = method.startsWith('group.');
|
|
185
|
+
const volatileGroup = group && request.volatile === true;
|
|
186
|
+
const messageClass = request.message_class ?? 'normal';
|
|
187
|
+
if (!MESSAGE_CLASSES.includes(messageClass) || (messageClass === 'normal' && !volatileGroup) || !this.supports(messageClass, group)) {
|
|
188
|
+
throw new StateError('control message class was not negotiated');
|
|
189
|
+
}
|
|
190
|
+
request.message_class = messageClass;
|
|
191
|
+
for (const [key, expected] of Object.entries({ device_id: c._deviceId, slot_id: c._slotId })) {
|
|
192
|
+
if (key in request && request[key] !== expected)
|
|
193
|
+
throw new ValidationError('control cursor must target the current instance');
|
|
194
|
+
request[key] = expected;
|
|
195
|
+
}
|
|
196
|
+
const identity = this.identity();
|
|
197
|
+
if (!group)
|
|
198
|
+
request.cursor_scope = 'peer';
|
|
199
|
+
if (method === 'message.peers') {
|
|
200
|
+
const result = await c._rpcPipeline.rawCall(method, request);
|
|
201
|
+
this.check(identity);
|
|
202
|
+
if (!object(result) || result.message_class !== messageClass || !Array.isArray(result.peers))
|
|
203
|
+
throw new StateError('control peer directory scope mismatch');
|
|
204
|
+
return result;
|
|
205
|
+
}
|
|
206
|
+
if ((!group && !request.sender_aid) || (group && !(request.group_id ?? request.group_aid)))
|
|
207
|
+
throw new ValidationError('control calls require a peer or group');
|
|
208
|
+
const key = this.key(request, group);
|
|
209
|
+
const preceding = this.locks.get(key) ?? Promise.resolve();
|
|
210
|
+
let unlock;
|
|
211
|
+
const lock = new Promise((resolve) => { unlock = resolve; });
|
|
212
|
+
this.locks.set(key, lock);
|
|
213
|
+
await preceding;
|
|
214
|
+
try {
|
|
215
|
+
this.check(identity);
|
|
216
|
+
let saved = this.load(key);
|
|
217
|
+
const ackMethod = group ? 'group.v2.ack' : 'message.v2.ack';
|
|
218
|
+
if (!method.endsWith('.history') && object(saved.pending_ack)) {
|
|
219
|
+
let proof = saved.scan_proof;
|
|
220
|
+
try {
|
|
221
|
+
await c._rpcPipeline.rawCall(ackMethod, saved.pending_ack);
|
|
222
|
+
}
|
|
223
|
+
catch (error) {
|
|
224
|
+
if (volatileGroup || !['scan_proof_expired', 'scan_proof_unavailable'].includes(error?.data?.code))
|
|
225
|
+
throw error;
|
|
226
|
+
proof = await this.renewPendingAck(saved, group, key, identity);
|
|
227
|
+
}
|
|
228
|
+
this.check(identity);
|
|
229
|
+
saved = { ...saved, scan_proof: proof, pending_ack: undefined, pending_ack_after_seq: undefined };
|
|
230
|
+
this.save(key, saved);
|
|
231
|
+
}
|
|
232
|
+
if (method.endsWith('.ack') || method === 'group.ack_messages') {
|
|
233
|
+
if (volatileGroup)
|
|
234
|
+
request.volatile_cursor = saved.volatile_cursor ?? '';
|
|
235
|
+
else {
|
|
236
|
+
const upto = request.up_to_seq ?? request.seq ?? 0;
|
|
237
|
+
if (!Number.isSafeInteger(upto) || upto < 0 || upto > Number(saved.after_seq ?? 0))
|
|
238
|
+
throw new ValidationError('control ACK exceeds durable cursor');
|
|
239
|
+
request.up_to_seq = upto;
|
|
240
|
+
request.scan_proof = saved.scan_proof ?? '';
|
|
241
|
+
}
|
|
242
|
+
return await c._rpcPipeline.rawCall(ackMethod, request);
|
|
243
|
+
}
|
|
244
|
+
const history = method.endsWith('.history');
|
|
245
|
+
delete request.window_mode;
|
|
246
|
+
delete request._rpc_background;
|
|
247
|
+
request.limit = Math.max(1, Math.min(Number(request.limit) || 50, 200));
|
|
248
|
+
const after = request.after_seq ?? saved.after_seq ?? 0;
|
|
249
|
+
if (!Number.isSafeInteger(after) || after < 0 || !history && after > Number(saved.after_seq ?? 0))
|
|
250
|
+
throw new ValidationError('control after_seq exceeds durable cursor');
|
|
251
|
+
if (!history) {
|
|
252
|
+
request.after_seq = after;
|
|
253
|
+
if (saved.volatile_cursor)
|
|
254
|
+
request.after_volatile_cursor ??= saved.volatile_cursor;
|
|
255
|
+
}
|
|
256
|
+
const wireMethod = history ? method : group ? 'group.v2.pull' : 'message.v2.pull';
|
|
257
|
+
const gateKey = `message_class/${messageClass}/${key}|forward|class=${messageClass}`;
|
|
258
|
+
const result = await c._rpcPipeline.runPullSerialized(gateKey, () => c._rpcPipeline.rawCall(wireMethod, request, { pullGateKey: gateKey }), true);
|
|
259
|
+
this.check(identity);
|
|
260
|
+
this.checkScope(result, request, group, volatileGroup);
|
|
261
|
+
const head = result.head_seq;
|
|
262
|
+
const covered = volatileGroup ? 0 : result.scanned_through_seq ?? result.covered_through_seq;
|
|
263
|
+
if (!volatileGroup && (!Number.isSafeInteger(head) || !Number.isSafeInteger(covered) || covered < 0 || covered > head
|
|
264
|
+
|| !history && covered < after || request.head_seq > 0 && head !== request.head_seq))
|
|
265
|
+
throw new StateError('control Pull coverage is invalid');
|
|
266
|
+
if (!history && !volatileGroup && covered > after && !(typeof result.scan_proof === 'string' && result.scan_proof))
|
|
267
|
+
throw new StateError('control Pull scan proof is missing');
|
|
268
|
+
const decoded = [], volatileCursors = [], volatileIds = [];
|
|
269
|
+
let previous = history ? 0 : after;
|
|
270
|
+
for (const row of result.messages) {
|
|
271
|
+
if (!object(row))
|
|
272
|
+
throw new StateError('invalid control message row');
|
|
273
|
+
const volatile = volatileGroup || row.storage === 'volatile' || Boolean(row.volatile_cursor);
|
|
274
|
+
if (!volatile) {
|
|
275
|
+
if (!Number.isSafeInteger(row.seq) || !history && !(previous < row.seq && row.seq <= covered))
|
|
276
|
+
throw new StateError('control message outside verified coverage');
|
|
277
|
+
previous = row.seq;
|
|
278
|
+
}
|
|
279
|
+
decoded.push(await this.decode(row, messageClass, group, request));
|
|
280
|
+
this.check(identity);
|
|
281
|
+
if (volatile && typeof row.volatile_cursor === 'string')
|
|
282
|
+
volatileCursors.push(row.volatile_cursor);
|
|
283
|
+
if (volatile && typeof row.volatile_id === 'string')
|
|
284
|
+
volatileIds.push(row.volatile_id);
|
|
285
|
+
}
|
|
286
|
+
if (!history) {
|
|
287
|
+
if (messageClass !== 'sdk_control' && decoded.length && typeof c._dispatcher?._snapshotApplicationHandlers === 'function') {
|
|
288
|
+
const names = group ? ['group.message_created', 'group.message_batch'] : ['message.received', 'message.batch'];
|
|
289
|
+
if (![...c._dispatcher._snapshotApplicationHandlers(names).values()].some((handlers) => handlers.length)) {
|
|
290
|
+
throw new StateError('control delivery requires application subscription');
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
for (const message of decoded) {
|
|
294
|
+
if (messageClass === 'sdk_control')
|
|
295
|
+
await this.consume(message);
|
|
296
|
+
else
|
|
297
|
+
await c._publishAppEvent(group ? 'group.message_created' : 'message.received', message, 'control_pull');
|
|
298
|
+
this.check(identity);
|
|
299
|
+
}
|
|
300
|
+
const next = { after_seq: Math.max(Number(saved.after_seq ?? 0), covered), scan_proof: result.scan_proof ?? saved.scan_proof ?? '',
|
|
301
|
+
volatile_cursor: result.volatile_cursor ?? result.next_volatile_cursor ?? volatileCursors.at(-1) ?? saved.volatile_cursor ?? '' };
|
|
302
|
+
const ack = { message_class: messageClass, device_id: c._deviceId, slot_id: c._slotId };
|
|
303
|
+
if (group)
|
|
304
|
+
ack.group_id = request.group_id ?? request.group_aid;
|
|
305
|
+
else
|
|
306
|
+
Object.assign(ack, { cursor_scope: 'peer', sender_aid: request.sender_aid });
|
|
307
|
+
if (volatileGroup)
|
|
308
|
+
Object.assign(ack, { volatile: true, volatile_cursor: next.volatile_cursor });
|
|
309
|
+
else
|
|
310
|
+
Object.assign(ack, { up_to_seq: next.after_seq, scan_proof: next.scan_proof,
|
|
311
|
+
...(volatileCursors.length ? { volatile_cursors: volatileCursors } : {}), ...(volatileIds.length ? { volatile_ids: volatileIds } : {}) });
|
|
312
|
+
const ackRequired = !volatileGroup || Boolean(next.volatile_cursor);
|
|
313
|
+
this.save(key, { ...next, ...(ackRequired ? { pending_ack: ack, pending_ack_after_seq: after } : {}) });
|
|
314
|
+
if (ackRequired)
|
|
315
|
+
await c._rpcPipeline.rawCall(ackMethod, ack);
|
|
316
|
+
this.check(identity);
|
|
317
|
+
if (ackRequired)
|
|
318
|
+
this.save(key, next);
|
|
319
|
+
}
|
|
320
|
+
return { ...result, messages: messageClass === 'sdk_control' ? [] : decoded, ack_seq: covered };
|
|
321
|
+
}
|
|
322
|
+
finally {
|
|
323
|
+
unlock();
|
|
324
|
+
if (this.locks.get(key) === lock)
|
|
325
|
+
this.locks.delete(key);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
schedule(params) {
|
|
329
|
+
const group = Boolean(params.group_id ?? params.group_aid);
|
|
330
|
+
if (!this.supports(params.message_class, group))
|
|
331
|
+
return;
|
|
332
|
+
this.pending.set(this.key(params, group), { ...params });
|
|
333
|
+
const lane = params.message_class;
|
|
334
|
+
if (!this.workers.has(lane)) {
|
|
335
|
+
const identity = this.identity();
|
|
336
|
+
const worker = this.drain(identity, lane).finally(() => {
|
|
337
|
+
if (this.workers.get(lane) !== worker)
|
|
338
|
+
return;
|
|
339
|
+
this.workers.delete(lane);
|
|
340
|
+
const next = [...this.pending.values()].find((item) => item.message_class === lane);
|
|
341
|
+
if (next && !this.client._closing)
|
|
342
|
+
this.schedule(next);
|
|
343
|
+
});
|
|
344
|
+
this.workers.set(lane, worker);
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
async drain(identity, lane) {
|
|
348
|
+
while (this.pending.size && identity === this.identity()) {
|
|
349
|
+
for (const higher of MESSAGE_CLASSES.slice(0, MESSAGE_CLASSES.indexOf(lane))) {
|
|
350
|
+
if (this.workers.has(higher)) {
|
|
351
|
+
await this.workers.get(higher);
|
|
352
|
+
if (identity !== this.identity() || this.client._closing)
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
const selected = [...this.pending.entries()].find(([, params]) => params.message_class === lane);
|
|
357
|
+
if (!selected)
|
|
358
|
+
break;
|
|
359
|
+
const [key, request] = selected;
|
|
360
|
+
this.pending.delete(key);
|
|
361
|
+
try {
|
|
362
|
+
const result = await this.call(request.group_id || request.group_aid ? 'group.v2.pull' : 'message.v2.pull', request);
|
|
363
|
+
this.check(identity);
|
|
364
|
+
if (result.has_more === true || result.volatile_has_more === true) {
|
|
365
|
+
if (result.head_seq > 0)
|
|
366
|
+
request.head_seq = result.head_seq;
|
|
367
|
+
this.pending.set(key, request);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
catch (error) {
|
|
371
|
+
this.client._clientLog.debug(`control pull deferred: ${String(error)}`);
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
onPush(data, group = false) {
|
|
376
|
+
const messageClass = messageClassOf(data);
|
|
377
|
+
if (object(data) && data.delivery_class === 'normal' && messageClass !== 'sdk_control')
|
|
378
|
+
return false;
|
|
379
|
+
const volatile = group && object(data) && (data.storage === 'volatile' || data.volatile === true);
|
|
380
|
+
if (messageClass === 'normal' && !volatile)
|
|
381
|
+
return false;
|
|
382
|
+
if (!object(data) || !MESSAGE_CLASSES.includes(messageClass))
|
|
383
|
+
return true;
|
|
384
|
+
const params = { message_class: messageClass };
|
|
385
|
+
if (group) {
|
|
386
|
+
params.group_id = data.group_id ?? data.group_aid;
|
|
387
|
+
if (volatile)
|
|
388
|
+
params.volatile = true;
|
|
389
|
+
}
|
|
390
|
+
else
|
|
391
|
+
params.sender_aid = data.sender_aid ?? data.from_aid ?? data.from ?? data.inline_message?.from_aid;
|
|
392
|
+
if (params.group_id || params.sender_aid)
|
|
393
|
+
this.schedule(params);
|
|
394
|
+
return true;
|
|
395
|
+
}
|
|
396
|
+
async recover() {
|
|
397
|
+
if (!this.client._aid)
|
|
398
|
+
return;
|
|
399
|
+
const identity = this.identity();
|
|
400
|
+
try {
|
|
401
|
+
for (const messageClass of MESSAGE_CLASSES.slice(0, 2)) {
|
|
402
|
+
if (!this.supports(messageClass))
|
|
403
|
+
continue;
|
|
404
|
+
let cursor = '';
|
|
405
|
+
do {
|
|
406
|
+
const result = await this.call('message.peers', { message_class: messageClass, filter: 'pending', cursor });
|
|
407
|
+
this.check(identity);
|
|
408
|
+
for (const peer of result.peers) {
|
|
409
|
+
const sender = peer.sender_aid ?? peer.aid;
|
|
410
|
+
if (sender)
|
|
411
|
+
this.schedule({ message_class: messageClass, sender_aid: sender });
|
|
412
|
+
}
|
|
413
|
+
if (result.has_more !== true)
|
|
414
|
+
break;
|
|
415
|
+
if (typeof result.next_cursor !== 'string' || !result.next_cursor || result.next_cursor === cursor)
|
|
416
|
+
throw new StateError('control peer directory cursor did not advance');
|
|
417
|
+
cursor = result.next_cursor;
|
|
418
|
+
} while (cursor);
|
|
419
|
+
}
|
|
420
|
+
const classes = MESSAGE_CLASSES.filter((kind) => this.supports(kind, true));
|
|
421
|
+
if (classes.length) {
|
|
422
|
+
let cursor = '';
|
|
423
|
+
do {
|
|
424
|
+
const listing = await this.client._rpcPipeline.rawCall('group.list_my', { size: 200, cursor });
|
|
425
|
+
this.check(identity);
|
|
426
|
+
for (const entry of listing?.items ?? listing?.groups ?? []) {
|
|
427
|
+
const groupId = typeof entry === 'string' ? entry : entry.group_id ?? entry.group_aid;
|
|
428
|
+
if (!groupId)
|
|
429
|
+
continue;
|
|
430
|
+
for (const messageClass of classes) {
|
|
431
|
+
if (messageClass !== 'normal')
|
|
432
|
+
this.schedule({ message_class: messageClass, group_id: groupId });
|
|
433
|
+
this.schedule({ message_class: messageClass, group_id: groupId, volatile: true });
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
if (listing.has_more !== true)
|
|
437
|
+
break;
|
|
438
|
+
if (typeof listing.next_cursor !== 'string' || !listing.next_cursor || listing.next_cursor === cursor)
|
|
439
|
+
throw new StateError('control group directory cursor did not advance');
|
|
440
|
+
cursor = listing.next_cursor;
|
|
441
|
+
} while (cursor);
|
|
442
|
+
}
|
|
443
|
+
const c = this.client;
|
|
444
|
+
const saved = c._tokenStore.loadInstanceState?.(c._aid, c._deviceId, c._slotId)?.message_control_v1 ?? {};
|
|
445
|
+
for (const [key, value] of Object.entries(saved)) {
|
|
446
|
+
if (!object(value) || !value.pending_ack)
|
|
447
|
+
continue;
|
|
448
|
+
const [messageClass, kind, scope] = JSON.parse(key);
|
|
449
|
+
if (this.supports(messageClass, kind !== 'peer'))
|
|
450
|
+
this.schedule({ message_class: messageClass,
|
|
451
|
+
...(kind === 'peer' ? { sender_aid: scope } : { group_id: scope }), ...(kind === 'volatile_group' ? { volatile: true } : {}) });
|
|
452
|
+
}
|
|
453
|
+
}
|
|
454
|
+
finally {
|
|
455
|
+
if (identity === this.identity() && !this.client._closing && !this.timer && this.client._state === 'ready') {
|
|
456
|
+
this.timer = setTimeout(() => {
|
|
457
|
+
this.timer = null;
|
|
458
|
+
if (identity === this.identity() && this.client._state === 'ready')
|
|
459
|
+
void this.recover().catch((error) => this.client._clientLog.debug(String(error)));
|
|
460
|
+
}, 15_000);
|
|
461
|
+
this.timer.unref?.();
|
|
462
|
+
}
|
|
463
|
+
}
|
|
464
|
+
}
|
|
465
|
+
close() {
|
|
466
|
+
this.epoch += 1;
|
|
467
|
+
this.pending.clear();
|
|
468
|
+
this.workers.clear();
|
|
469
|
+
if (this.timer)
|
|
470
|
+
clearTimeout(this.timer);
|
|
471
|
+
this.timer = null;
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
//# sourceMappingURL=control-messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"control-messages.js","sourceRoot":"","sources":["../../src/client/control-messages.ts"],"names":[],"mappings":"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"}
|
package/dist/client/delivery.js
CHANGED
|
@@ -6,6 +6,7 @@ import { normalizeGroupAid } from '../group-id.js';
|
|
|
6
6
|
import { ConnectionState, isJsonObject } from '../types.js';
|
|
7
7
|
import { validateGroupAIDFormat } from '../validators.js';
|
|
8
8
|
import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
|
|
9
|
+
import { applicationResult, messageClassOf } from './control-messages.js';
|
|
9
10
|
const PUSHED_SEQS_LIMIT = 50_000;
|
|
10
11
|
const PENDING_ORDERED_LIMIT = 50_000;
|
|
11
12
|
const MESSAGE_RECALL_SEEN_LIMIT = 10_000;
|
|
@@ -311,7 +312,7 @@ export class MessageDeliveryEngine {
|
|
|
311
312
|
const completion = new Promise((done, fail) => { resolve = done; reject = fail; });
|
|
312
313
|
void completion.catch(() => { });
|
|
313
314
|
const handlers = snapshot ?? this.snapshotApplicationHandlers(), batchEvent = namespace.startsWith('group_event:') ? 'group.event_batch'
|
|
314
|
-
: namespace.startsWith('group:') ? 'group.message_batch' : 'message.batch';
|
|
315
|
+
: namespace.startsWith('group:') || namespace.startsWith('message_class/') && namespace.includes('/group/') ? 'group.message_batch' : 'message.batch';
|
|
315
316
|
const page = { namespace, source, context: this.ensurePeerContext(), generation: this.captureInlineAckGeneration(),
|
|
316
317
|
namespaceGeneration: this.captureSeqNamespaceGeneration(namespace),
|
|
317
318
|
collecting: true, batching: (handlers.get(batchEvent)?.length ?? 0) > 0, handlers, reservation,
|
|
@@ -359,6 +360,10 @@ export class MessageDeliveryEngine {
|
|
|
359
360
|
}
|
|
360
361
|
applicationNamespace(event, payload) {
|
|
361
362
|
const value = payload && typeof payload === 'object' ? payload : {};
|
|
363
|
+
const messageClass = value.message_class === 'sdk_control' ? 'sdk_control' : value.delivery_class ?? value.message_class;
|
|
364
|
+
if (messageClass === 'control' || messageClass === 'sdk_control') {
|
|
365
|
+
return `message_class/${messageClass}/${event.startsWith('group.') ? 'group' : 'peer'}/${String(value.group_id ?? value.group_aid ?? value.sender_aid ?? value.from_aid ?? value.from ?? '')}`;
|
|
366
|
+
}
|
|
362
367
|
if (event === 'group.changed')
|
|
363
368
|
return `group_event:${String(value.group_id ?? value.group_aid ?? '')}`;
|
|
364
369
|
if (event.startsWith('group.'))
|
|
@@ -368,11 +373,12 @@ export class MessageDeliveryEngine {
|
|
|
368
373
|
}
|
|
369
374
|
applicationClaimKey(event, payload, namespace, context) {
|
|
370
375
|
const value = payload && typeof payload === 'object' ? payload : {};
|
|
376
|
+
const messageClass = value.message_class === 'sdk_control' ? 'sdk_control' : value.delivery_class ?? value.message_class;
|
|
371
377
|
const seq = Number(event === 'group.changed' ? value.event_seq : value.seq);
|
|
372
378
|
const identity = event === 'message.recalled' ? this.messageRecallDedupKey(value)
|
|
373
379
|
: event === 'group.message_recalled' ? this.groupRecallDedupKey(String(value.group_id ?? ''), value)
|
|
374
380
|
: Number.isSafeInteger(seq) && seq > 0 ? seq : value.volatile_cursor ?? value.message_id;
|
|
375
|
-
return identity === undefined ? '' : JSON.stringify([context, event, event.startsWith('message.') ? 'p2p' : namespace,
|
|
381
|
+
return identity === undefined ? '' : JSON.stringify([context, event, messageClass && messageClass !== 'normal' ? namespace : event.startsWith('message.') ? 'p2p' : namespace,
|
|
376
382
|
value.storage === 'volatile' ? String(value.sender_aid ?? value.from_aid ?? value.from ?? '') : '', identity]);
|
|
377
383
|
}
|
|
378
384
|
async waitForApplicationOwner(owner) {
|
|
@@ -2188,6 +2194,8 @@ export class MessageDeliveryEngine {
|
|
|
2188
2194
|
return envelope;
|
|
2189
2195
|
}
|
|
2190
2196
|
attachSendResultEnvelope(method, params, result, encrypted, modeSource) {
|
|
2197
|
+
if (messageClassOf(params) === 'sdk_control')
|
|
2198
|
+
return applicationResult({ ...result, message_class: 'sdk_control' });
|
|
2191
2199
|
if (!APP_SEND_ENVELOPE_METHODS.has(method) || !isJsonObject(result))
|
|
2192
2200
|
return result;
|
|
2193
2201
|
let out = { ...result };
|