@minip2p/node 0.8.2 → 0.9.1
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/adapter.d.ts.map +1 -1
- package/dist/adapter.js +78 -23
- package/dist/adapter.js.map +1 -1
- package/dist/addon.d.ts +7 -5
- package/package.json +9 -9
- package/src/adapter.ts +84 -42
- package/src/addon.d.ts +7 -5
package/dist/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAC/D,OAAO,KAAK,EACV,KAAK,EAIL,aAAa,EAGd,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAC/D,OAAO,KAAK,EACV,KAAK,EAIL,aAAa,EAGd,MAAM,eAAe,CAAC;AAkSvB,gEAAgE;AAChE,qBAAa,OAAQ,SAAQ,WAAW;IACtC,OAAO,eAEN;IAED,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAE5C;CACF;AAED,kDAAkD;AAClD,wBAAgB,iBAAiB,IAAI,UAAU,CAE9C;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAI5D;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAI3E"}
|
package/dist/adapter.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* oxlint-disable class-methods-use-this, func-style, max-classes-per-file, no-use-before-define -- The adapter keeps the contract-complete native endpoint, value conversion, and handle maps together at the binding boundary. */
|
|
2
2
|
import { Minip2pBase, StreamClosedError } from "@minip2p/core";
|
|
3
|
-
import { ConnectionIdMap, EventDrain, P2pEvent_Tags, resolveEndpointConfig, typedFfiError, u64ToNumber, } from "@minip2p/core/backend";
|
|
3
|
+
import { ConnectionIdMap, EventDrain, P2pEvent_Tags, SettleHandles, eventStream, resolveEndpointConfig, typedFfiError, u64ToNumber, } from "@minip2p/core/backend";
|
|
4
4
|
import { nativeBinding } from "./native.js";
|
|
5
5
|
/** Native drain batch size. */
|
|
6
6
|
const DRAIN_LIMIT = 256;
|
|
@@ -9,12 +9,20 @@ class NodeBackend {
|
|
|
9
9
|
#endpoint;
|
|
10
10
|
#events;
|
|
11
11
|
#streamIds = new StreamIdMap();
|
|
12
|
+
/** Native stream identities while their events are in flight (ADR 0012). */
|
|
13
|
+
#settleHandles = new SettleHandles();
|
|
12
14
|
constructor(config) {
|
|
13
15
|
this.#endpoint = translateErrors(() => new nativeBinding.NodeEndpoint(toUint8Array(config.secretKey), resolveEndpointConfig(config)));
|
|
14
16
|
}
|
|
15
17
|
start(listener) {
|
|
16
18
|
const events = new EventDrain((limit) => this.#endpoint.drainEvents(limit), (event) => {
|
|
17
|
-
|
|
19
|
+
const normalized = normalizeEvent(event, this.#connectionIds, this.#streamIds);
|
|
20
|
+
const stream = eventStream(normalized);
|
|
21
|
+
const native = nativeStreamOf(event);
|
|
22
|
+
if (stream !== undefined && native !== undefined) {
|
|
23
|
+
this.#settleHandles.hold(stream.connId, stream.streamId, native);
|
|
24
|
+
}
|
|
25
|
+
listener(normalized);
|
|
18
26
|
}, DRAIN_LIMIT,
|
|
19
27
|
// One check-phase turn keeps native callbacks out of the caller's stack
|
|
20
28
|
// without paying the timer granularity for every bounded batch.
|
|
@@ -30,6 +38,10 @@ class NodeBackend {
|
|
|
30
38
|
}
|
|
31
39
|
eventHandled(event) {
|
|
32
40
|
releaseTerminalIds(event, this.#streamIds);
|
|
41
|
+
const stream = eventStream(event);
|
|
42
|
+
if (stream !== undefined) {
|
|
43
|
+
this.#settleHandles.release(stream.connId, stream.streamId);
|
|
44
|
+
}
|
|
33
45
|
}
|
|
34
46
|
close() {
|
|
35
47
|
this.#endpoint.close();
|
|
@@ -117,26 +129,26 @@ class NodeBackend {
|
|
|
117
129
|
streamId: this.#streamIds.toPublic(connId, BigInt(stream.streamId)),
|
|
118
130
|
};
|
|
119
131
|
}
|
|
120
|
-
sendStream(
|
|
121
|
-
return translateErrors(() => this.#endpoint.sendStream(
|
|
132
|
+
sendStream(connId, streamId, data) {
|
|
133
|
+
return translateErrors(() => this.#endpoint.sendStream(...this.#nativeStream(connId, streamId), data));
|
|
122
134
|
}
|
|
123
|
-
closeStreamWrite(
|
|
135
|
+
closeStreamWrite(connId, streamId) {
|
|
124
136
|
translateErrors(() => {
|
|
125
|
-
this.#endpoint.closeStreamWrite(
|
|
137
|
+
this.#endpoint.closeStreamWrite(...this.#nativeStream(connId, streamId));
|
|
126
138
|
});
|
|
127
139
|
}
|
|
128
|
-
resetStream(
|
|
140
|
+
resetStream(connId, streamId) {
|
|
129
141
|
translateErrors(() => {
|
|
130
|
-
this.#endpoint.resetStream(
|
|
142
|
+
this.#endpoint.resetStream(...this.#nativeStream(connId, streamId));
|
|
131
143
|
});
|
|
132
144
|
}
|
|
133
|
-
abandonStream(
|
|
145
|
+
abandonStream(connId, streamId) {
|
|
134
146
|
translateErrors(() => {
|
|
135
|
-
this.#endpoint.abandonStream(
|
|
147
|
+
this.#endpoint.abandonStream(...this.#settleStream(connId, streamId));
|
|
136
148
|
});
|
|
137
149
|
}
|
|
138
150
|
streamConsumer(connId, streamId) {
|
|
139
|
-
const [nativeConn, nativeStream] = this.#
|
|
151
|
+
const [nativeConn, nativeStream] = this.#settleStream(connId, streamId);
|
|
140
152
|
return (bytes) => {
|
|
141
153
|
translateErrors(() => {
|
|
142
154
|
this.#endpoint.streamConsumed(nativeConn, nativeStream, bytes);
|
|
@@ -156,6 +168,24 @@ class NodeBackend {
|
|
|
156
168
|
this.#streamIds.toNative(streamId),
|
|
157
169
|
];
|
|
158
170
|
}
|
|
171
|
+
/**
|
|
172
|
+
* Native IDs for settling a stream: acknowledging or abandoning its bytes.
|
|
173
|
+
* Those still hold the native slot of a connection whose end this adapter
|
|
174
|
+
* already drained, so a stream with events in flight resolves through its
|
|
175
|
+
* settle handle once the live mapping is gone.
|
|
176
|
+
*/
|
|
177
|
+
#settleStream(connId, streamId) {
|
|
178
|
+
try {
|
|
179
|
+
return this.#nativeStream(connId, streamId);
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
const handle = this.#settleHandles.get(connId, streamId);
|
|
183
|
+
if (handle === undefined) {
|
|
184
|
+
throw error;
|
|
185
|
+
}
|
|
186
|
+
return handle;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
159
189
|
// Connect IDs are not mapped because they round-trip into native calls,
|
|
160
190
|
// and native allocates them well inside the safe integer range.
|
|
161
191
|
connect(target) {
|
|
@@ -196,15 +226,20 @@ export function circuitAddress(relayAddress, peerId) {
|
|
|
196
226
|
}
|
|
197
227
|
/**
|
|
198
228
|
* Rethrows a native `FfiError` as its typed SDK error. The addon tags each
|
|
199
|
-
* error with the variant name as `code
|
|
200
|
-
*
|
|
229
|
+
* error with the variant name as `code`, its detail field as `detail`, and
|
|
230
|
+
* an `InvalidConfig`'s capability name as `capability`; untyped variants are
|
|
231
|
+
* rethrown unchanged with those properties intact.
|
|
201
232
|
*/
|
|
202
233
|
function translateErrors(operation) {
|
|
203
234
|
try {
|
|
204
235
|
return operation();
|
|
205
236
|
}
|
|
206
237
|
catch (error) {
|
|
207
|
-
throw (typedFfiError(
|
|
238
|
+
throw (typedFfiError({
|
|
239
|
+
capability: stringProperty(error, "capability"),
|
|
240
|
+
detail: stringProperty(error, "detail"),
|
|
241
|
+
tag: stringProperty(error, "code"),
|
|
242
|
+
}) ?? error);
|
|
208
243
|
}
|
|
209
244
|
}
|
|
210
245
|
function stringProperty(value, key) {
|
|
@@ -251,14 +286,14 @@ const CONNECTION_ID_KEYS = new Set([
|
|
|
251
286
|
"newConnId",
|
|
252
287
|
]);
|
|
253
288
|
/**
|
|
254
|
-
* Converts one value of a native event: integers to numbers, connection
|
|
255
|
-
* through the connection map, and bytes to `ArrayBuffer`s. A stream ID is
|
|
289
|
+
* Converts one value of a native `tag` event: integers to numbers, connection
|
|
290
|
+
* IDs through the connection map, and bytes to `ArrayBuffer`s. A stream ID is
|
|
256
291
|
* mapped together with the connection of the record that carries it.
|
|
257
292
|
*/
|
|
258
|
-
function normalizeNativeValue(value, maps, key) {
|
|
293
|
+
function normalizeNativeValue(value, maps, tag, key) {
|
|
259
294
|
if (typeof value === "bigint" || typeof value === "number") {
|
|
260
295
|
if (key !== undefined && CONNECTION_ID_KEYS.has(key)) {
|
|
261
|
-
return maps.connectionIds.
|
|
296
|
+
return maps.connectionIds.toPublicInEvent(tag, key, BigInt(value));
|
|
262
297
|
}
|
|
263
298
|
// A QUIC stop code is a 62-bit varint the remote picks: keep it whole.
|
|
264
299
|
if (key === "errorCode") {
|
|
@@ -270,14 +305,14 @@ function normalizeNativeValue(value, maps, key) {
|
|
|
270
305
|
return toArrayBuffer(value);
|
|
271
306
|
}
|
|
272
307
|
if (Array.isArray(value)) {
|
|
273
|
-
return value.map((item) => normalizeNativeValue(item, maps));
|
|
308
|
+
return value.map((item) => normalizeNativeValue(item, maps, tag));
|
|
274
309
|
}
|
|
275
310
|
if (value === null || typeof value !== "object") {
|
|
276
311
|
return value;
|
|
277
312
|
}
|
|
278
313
|
const record = Object.fromEntries(Object.entries(value).map(([itemKey, item]) => [
|
|
279
314
|
itemKey,
|
|
280
|
-
normalizeNativeValue(item, maps, itemKey),
|
|
315
|
+
normalizeNativeValue(item, maps, tag, itemKey),
|
|
281
316
|
]));
|
|
282
317
|
const { connId, streamId } = record;
|
|
283
318
|
if (typeof streamId === "bigint" || typeof streamId === "number") {
|
|
@@ -303,8 +338,8 @@ function normalizeEvent(event, connectionIds, streamIds) {
|
|
|
303
338
|
}
|
|
304
339
|
/**
|
|
305
340
|
* Per-chunk and per-write events, and pubsub messages, convert field by
|
|
306
|
-
* field. Identify snapshots go through the typed {@link identifyInfo}
|
|
307
|
-
* rest share the generic walk: the addon's serde shape is the SDK shape with
|
|
341
|
+
* field. Identify snapshots go through the typed {@link identifyInfo}, and a
|
|
342
|
+
* field-less event passes through by tag. The rest share the generic walk: the addon's serde shape is the SDK shape with
|
|
308
343
|
* napi-rs integers and buffers (see `native-shape.ts`).
|
|
309
344
|
*/
|
|
310
345
|
function convertEvent(event, maps) {
|
|
@@ -339,20 +374,40 @@ function convertEvent(event, maps) {
|
|
|
339
374
|
case P2pEvent_Tags.IdentifyReceived: {
|
|
340
375
|
return {
|
|
341
376
|
inner: {
|
|
377
|
+
connId: maps.connectionIds.toPublic(BigInt(event.inner.connId)),
|
|
342
378
|
info: identifyInfo(event.inner.info),
|
|
343
379
|
peerId: event.inner.peerId,
|
|
344
380
|
},
|
|
345
381
|
tag: event.tag,
|
|
346
382
|
};
|
|
347
383
|
}
|
|
384
|
+
case P2pEvent_Tags.MdnsRecovered: {
|
|
385
|
+
return { tag: event.tag };
|
|
386
|
+
}
|
|
348
387
|
default: {
|
|
349
388
|
return {
|
|
350
|
-
inner: normalizeNativeValue(event.inner, maps),
|
|
389
|
+
inner: normalizeNativeValue(event.inner, maps, event.tag),
|
|
351
390
|
tag: event.tag,
|
|
352
391
|
};
|
|
353
392
|
}
|
|
354
393
|
}
|
|
355
394
|
}
|
|
395
|
+
/** The native identity of the stream a native stream event names. */
|
|
396
|
+
function nativeStreamOf(event) {
|
|
397
|
+
switch (event.tag) {
|
|
398
|
+
case P2pEvent_Tags.StreamReady:
|
|
399
|
+
case P2pEvent_Tags.StreamData:
|
|
400
|
+
case P2pEvent_Tags.StreamWriteAccepted:
|
|
401
|
+
case P2pEvent_Tags.StreamWriteStopped:
|
|
402
|
+
case P2pEvent_Tags.StreamRemoteWriteClosed:
|
|
403
|
+
case P2pEvent_Tags.StreamClosed: {
|
|
404
|
+
return [BigInt(event.inner.connId), BigInt(event.inner.streamId)];
|
|
405
|
+
}
|
|
406
|
+
default: {
|
|
407
|
+
return undefined;
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
}
|
|
356
411
|
/** The public identity of the stream a native stream event names. */
|
|
357
412
|
function streamRef(inner, maps) {
|
|
358
413
|
const connId = maps.connectionIds.toPublic(BigInt(inner.connId));
|
package/dist/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,mOAAmO;AAEnO,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAU/D,OAAO,EACL,eAAe,EACf,UAAU,EACV,aAAa,EACb,aAAa,EACb,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAe/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,+BAA+B;AAC/B,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,MAAM,WAAW;IACN,cAAc,GAAG,IAAI,eAAe,EAAE,CAAC;IACvC,SAAS,CAAiB;IACnC,OAAO,CAAsC;IACpC,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC;IACxC,4EAA4E;IACnE,cAAc,GAAG,IAAI,aAAa,EAAoB,CAAC;IAEhE,YAAY,MAAqB;QAC/B,IAAI,CAAC,SAAS,GAAG,eAAe,CAC9B,GAAG,EAAE,CACH,IAAI,aAAa,CAAC,YAAY,CAC5B,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAC9B,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CACJ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAmC;QACvC,MAAM,MAAM,GAAG,IAAI,UAAU,CAC3B,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,EAC5C,CAAC,KAAkB,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,cAAc,CAC/B,KAAK,EACL,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,UAAU,CAChB,CAAC;YACF,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACjD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACnE,CAAC;YACD,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvB,CAAC,EACD,WAAW;QACX,wEAAwE;QACxE,gEAAgE;QAChE,CAAC,IAAI,EAAE,EAAE;YACP,YAAY,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC,CACF,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;gBACxB,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,KAAe;QAC1B,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACtC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,cAAc;QACZ,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,UAAU;QACR,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,cAAc;QACZ,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;QACrE,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,iBAAiB;QACf,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,EAAE,CACvC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,CACnC,CAAC;QACF,OAAO,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,SAAS,CAAC;IACzE,CAAC;IAED,cAAc,CAAC,MAAc;QAC3B,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,OAAO;YACL,GAAG,IAAI;YACP,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACrD,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,YAAoB,EAAE,MAAc;QACjD,OAAO,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY;QACV,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,IAAgB;QACrC,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,UAAkB;QAC5B,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,MAAc,EAAE,UAAkB;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,CAClC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAC9C,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO;YACL,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACpE,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,MAAc,EAAE,QAAgB,EAAE,IAAgB;QAC3D,OAAO,eAAe,CAAC,GAAG,EAAE,CAC1B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CACzE,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,MAAc,EAAE,QAAgB;QAC/C,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAc,EAAE,QAAgB;QAC1C,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,QAAgB;QAC5C,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,MAAc,EAAE,QAAgB;QAC7C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxE,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,eAAe,CAAC,GAAG,EAAE;gBACnB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,MAAc,EAAE,QAAgB;QAC5C,OAAO;YACL,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACnC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,MAAc,EAAE,QAAgB;QAC5C,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,KAAK,CAAC;YACd,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,gEAAgE;IAChE,OAAO,CAAC,MAA4B;QAClC,OAAO,WAAW,CAChB,eAAe,CAAC,GAAG,EAAE,CACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CACpB,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAC/D,CACF,EACD,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,EAAU;QACtB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,gEAAgE;AAChE,MAAM,OAAO,OAAQ,SAAQ,WAAW;IACtC,YAAoB,OAAuB,EAAE,MAAyB;QACpE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAqB;QACjC,OAAO,IAAI,OAAO,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;CACF;AAED,kDAAkD;AAClD,MAAM,UAAU,iBAAiB;IAC/B,OAAO,aAAa,CAAC,iBAAiB,EAAE,CAAC;AAC3C,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,mBAAmB,CAAC,SAAgB;IAClD,OAAO,eAAe,CAAC,GAAG,EAAE,CAC1B,aAAa,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,cAAc,CAAC,YAAoB,EAAE,MAAc;IACjE,OAAO,eAAe,CAAC,GAAG,EAAE,CAC1B,aAAa,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CACnD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAI,SAAkB;IAC5C,IAAI,CAAC;QACH,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CACJ,aAAa,CAAC;YACZ,UAAU,EAAE,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC;YAC/C,MAAM,EAAE,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC;YACvC,GAAG,EAAE,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC;SACnC,CAAC,IAAI,KAAK,CACZ,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAc,EAAE,GAAW;IACjD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAY,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClD,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,4EAA4E;AAC5E,SAAS,YAAY,CAAC,KAAY;IAChC,OAAO,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;AACrE,CAAC;AAED,mFAAmF;AACnF,SAAS,YAAY,CAAC,EACpB,SAAS,EACT,GAAG,IAAI,EACY;IACnB,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;KACxE,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,GAAG,IAAI,EACa;IACpB,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,mBAAmB,KAAK,SAAS,IAAI;YACvC,mBAAmB,EAAE,WAAW,CAC9B,mBAAmB,EACnB,qBAAqB,CACtB;SACF,CAAC;QACF,GAAG,CAAC,iBAAiB,KAAK,SAAS,IAAI;YACrC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;SACvE,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,EACxB,eAAe,EACf,WAAW,GACgB;IAC3B,OAAO;QACL,WAAW;QACX,GAAG,CAAC,eAAe,KAAK,SAAS,IAAI;YACnC,eAAe,EAAE,WAAW,CAAC,eAAe,EAAE,iBAAiB,CAAC;SACjE,CAAC;KACH,CAAC;AACJ,CAAC;AAED,oDAAoD;AACpD,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CAAC;IACtD,QAAQ;IACR,WAAW;IACX,WAAW;CACZ,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAS,oBAAoB,CAC3B,KAAc,EACd,IAAkB,EAClB,GAAW,EACX,GAAY;IAEZ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC3D,IAAI,GAAG,KAAK,SAAS,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,uEAAuE;QACvE,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,IAAI,YAAY,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAA4B,MAAM,CAAC,WAAW,CACxD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC7C,OAAO;QACP,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC;KAC/C,CAAC,CACH,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACpC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjE,qEAAqE;QACrE,mEAAmE;QACnE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CACrB,KAAkB,EAClB,aAA8B,EAC9B,SAAsB;IAEtB,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,iBAAiB,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACxD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,KAAkB,EAAE,IAAkB;IAC1D,QAAQ,KAAK,CAAC,GAAG,EAAE,CAAC;QAClB,KAAK,aAAa,CAAC,UAAU,EAAE,CAAC;YAC9B,OAAO;gBACL,KAAK,EAAE;oBACL,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC;oBAC/B,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;iBACtC;gBACD,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC;QACD,KAAK,aAAa,CAAC,mBAAmB,CAAC;QACvC,KAAK,aAAa,CAAC,uBAAuB,CAAC;QAC3C,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;YAChC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;QACjE,CAAC;QACD,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;YAChE,OAAO;gBACL,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC;oBACzB,UAAU;oBACV,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;oBAC3B,MAAM;oBACN,MAAM;iBACP;gBACD,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC;QACD,KAAK,aAAa,CAAC,gBAAgB,EAAE,CAAC;YACpC,OAAO;gBACL,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC/D,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;oBACpC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM;iBAC3B;gBACD,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC;QACD,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,SAAS,CAAC;YACR,OAAO;gBACL,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;gBACzD,GAAG,EAAE,KAAK,CAAC,GAAG;aACH,CAAC;QAChB,CAAC;IACH,CAAC;AACH,CAAC;AAED,qEAAqE;AACrE,SAAS,cAAc,CAAC,KAAkB;IACxC,QAAQ,KAAK,CAAC,GAAG,EAAE,CAAC;QAClB,KAAK,aAAa,CAAC,WAAW,CAAC;QAC/B,KAAK,aAAa,CAAC,UAAU,CAAC;QAC9B,KAAK,aAAa,CAAC,mBAAmB,CAAC;QACvC,KAAK,aAAa,CAAC,kBAAkB,CAAC;QACtC,KAAK,aAAa,CAAC,uBAAuB,CAAC;QAC3C,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,SAAS,CAAC;YACR,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;AACH,CAAC;AAED,qEAAqE;AACrE,SAAS,SAAS,CAChB,KAIC,EACD,IAAkB;IAElB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,OAAO;QACL,MAAM;QACN,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;KAClE,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CACxB,KAAe,EACf,aAA8B,EAC9B,SAAsB;IAEtB,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC7C,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,SAAS,kBAAkB,CAAC,KAAe,EAAE,SAAsB;IACjE,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC7C,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,KAAe;IACtC,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,gBAAgB,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,kBAAkB,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;IAC/B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,6EAA6E;AAC7E,SAAS,aAAa,CAAC,KAAiB;IACtC,IACE,KAAK,CAAC,MAAM,YAAY,WAAW;QACnC,KAAK,CAAC,UAAU,KAAK,CAAC;QACtB,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,UAAU,EAC5C,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;AACvC,CAAC;AAOD;;;;GAIG;AACH,MAAM,WAAW;IACf,mEAAmE;IAC1D,eAAe,GAAG,IAAI,GAAG,EAA+B,CAAC;IACzD,QAAQ,GAAG,IAAI,GAAG,EAGxB,CAAC;IACJ,KAAK,GAAG,CAAC,CAAC;IAEV,QAAQ,CAAC,MAAc,EAAE,MAAc;QACrC,IAAI,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAChD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC9C,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;aACtB,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC;aAChD,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CACF"}
|
package/dist/addon.d.ts
CHANGED
|
@@ -55,16 +55,18 @@ export declare class NodeEndpoint {
|
|
|
55
55
|
* `StreamClosed`, a reset, or the connection closing or being replaced),
|
|
56
56
|
* which drops the tail.
|
|
57
57
|
*/
|
|
58
|
-
sendStream(
|
|
58
|
+
sendStream(connId: bigint, streamId: bigint, data: Uint8Array): boolean
|
|
59
59
|
/** Half-closes the local stream write side. */
|
|
60
|
-
closeStreamWrite(
|
|
60
|
+
closeStreamWrite(connId: bigint, streamId: bigint): void
|
|
61
61
|
/** Resets an application stream. */
|
|
62
|
-
resetStream(
|
|
62
|
+
resetStream(connId: bigint, streamId: bigint): void
|
|
63
63
|
/** Resets and relinquishes an application stream. */
|
|
64
|
-
abandonStream(
|
|
64
|
+
abandonStream(connId: bigint, streamId: bigint): void
|
|
65
65
|
/**
|
|
66
66
|
* Acknowledges `bytes` of a stream's received data as consumed,
|
|
67
|
-
* letting its sender continue. Every registered protocol needs this
|
|
67
|
+
* letting its sender continue. Every registered protocol needs this,
|
|
68
|
+
* also after the stream's connection closed: unacknowledged bytes keep
|
|
69
|
+
* the ended connection's slot until they are acknowledged or abandoned.
|
|
68
70
|
*/
|
|
69
71
|
streamConsumed(connId: bigint, streamId: bigint, bytes: number): void
|
|
70
72
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@minip2p/node",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.1",
|
|
4
4
|
"description": "Node.js bindings for minip2p",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"libp2p",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"registry": "https://registry.npmjs.org/"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@minip2p/core": "0.
|
|
41
|
+
"@minip2p/core": "0.9.1"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@minip2p/test-fixtures": "0.0.0",
|
|
@@ -48,13 +48,13 @@
|
|
|
48
48
|
"typescript": "7.0.2"
|
|
49
49
|
},
|
|
50
50
|
"optionalDependencies": {
|
|
51
|
-
"@minip2p/node-darwin-arm64": "0.
|
|
52
|
-
"@minip2p/node-darwin-x64": "0.
|
|
53
|
-
"@minip2p/node-linux-arm64-gnu": "0.
|
|
54
|
-
"@minip2p/node-linux-arm64-musl": "0.
|
|
55
|
-
"@minip2p/node-linux-x64-gnu": "0.
|
|
56
|
-
"@minip2p/node-linux-x64-musl": "0.
|
|
57
|
-
"@minip2p/node-win32-x64-msvc": "0.
|
|
51
|
+
"@minip2p/node-darwin-arm64": "0.9.1",
|
|
52
|
+
"@minip2p/node-darwin-x64": "0.9.1",
|
|
53
|
+
"@minip2p/node-linux-arm64-gnu": "0.9.1",
|
|
54
|
+
"@minip2p/node-linux-arm64-musl": "0.9.1",
|
|
55
|
+
"@minip2p/node-linux-x64-gnu": "0.9.1",
|
|
56
|
+
"@minip2p/node-linux-x64-musl": "0.9.1",
|
|
57
|
+
"@minip2p/node-win32-x64-msvc": "0.9.1"
|
|
58
58
|
},
|
|
59
59
|
"napi": {
|
|
60
60
|
"binaryName": "minip2p",
|
package/src/adapter.ts
CHANGED
|
@@ -14,6 +14,8 @@ import {
|
|
|
14
14
|
ConnectionIdMap,
|
|
15
15
|
EventDrain,
|
|
16
16
|
P2pEvent_Tags,
|
|
17
|
+
SettleHandles,
|
|
18
|
+
eventStream,
|
|
17
19
|
resolveEndpointConfig,
|
|
18
20
|
typedFfiError,
|
|
19
21
|
u64ToNumber,
|
|
@@ -43,6 +45,8 @@ class NodeBackend implements Minip2pBackend {
|
|
|
43
45
|
readonly #endpoint: NativeEndpoint;
|
|
44
46
|
#events: EventDrain<NativeEvent> | undefined;
|
|
45
47
|
readonly #streamIds = new StreamIdMap();
|
|
48
|
+
/** Native stream identities while their events are in flight (ADR 0012). */
|
|
49
|
+
readonly #settleHandles = new SettleHandles<[bigint, bigint]>();
|
|
46
50
|
|
|
47
51
|
constructor(config: Minip2pConfig) {
|
|
48
52
|
this.#endpoint = translateErrors(
|
|
@@ -58,7 +62,17 @@ class NodeBackend implements Minip2pBackend {
|
|
|
58
62
|
const events = new EventDrain(
|
|
59
63
|
(limit) => this.#endpoint.drainEvents(limit),
|
|
60
64
|
(event: NativeEvent) => {
|
|
61
|
-
|
|
65
|
+
const normalized = normalizeEvent(
|
|
66
|
+
event,
|
|
67
|
+
this.#connectionIds,
|
|
68
|
+
this.#streamIds
|
|
69
|
+
);
|
|
70
|
+
const stream = eventStream(normalized);
|
|
71
|
+
const native = nativeStreamOf(event);
|
|
72
|
+
if (stream !== undefined && native !== undefined) {
|
|
73
|
+
this.#settleHandles.hold(stream.connId, stream.streamId, native);
|
|
74
|
+
}
|
|
75
|
+
listener(normalized);
|
|
62
76
|
},
|
|
63
77
|
DRAIN_LIMIT,
|
|
64
78
|
// One check-phase turn keeps native callbacks out of the caller's stack
|
|
@@ -77,6 +91,10 @@ class NodeBackend implements Minip2pBackend {
|
|
|
77
91
|
|
|
78
92
|
eventHandled(event: P2pEvent): void {
|
|
79
93
|
releaseTerminalIds(event, this.#streamIds);
|
|
94
|
+
const stream = eventStream(event);
|
|
95
|
+
if (stream !== undefined) {
|
|
96
|
+
this.#settleHandles.release(stream.connId, stream.streamId);
|
|
97
|
+
}
|
|
80
98
|
}
|
|
81
99
|
|
|
82
100
|
close(): void {
|
|
@@ -190,50 +208,32 @@ class NodeBackend implements Minip2pBackend {
|
|
|
190
208
|
};
|
|
191
209
|
}
|
|
192
210
|
|
|
193
|
-
sendStream(
|
|
194
|
-
peerId: string,
|
|
195
|
-
connId: number,
|
|
196
|
-
streamId: number,
|
|
197
|
-
data: Uint8Array
|
|
198
|
-
): boolean {
|
|
211
|
+
sendStream(connId: number, streamId: number, data: Uint8Array): boolean {
|
|
199
212
|
return translateErrors(() =>
|
|
200
|
-
this.#endpoint.sendStream(
|
|
201
|
-
peerId,
|
|
202
|
-
...this.#nativeStream(connId, streamId),
|
|
203
|
-
data
|
|
204
|
-
)
|
|
213
|
+
this.#endpoint.sendStream(...this.#nativeStream(connId, streamId), data)
|
|
205
214
|
);
|
|
206
215
|
}
|
|
207
216
|
|
|
208
|
-
closeStreamWrite(
|
|
217
|
+
closeStreamWrite(connId: number, streamId: number): void {
|
|
209
218
|
translateErrors(() => {
|
|
210
|
-
this.#endpoint.closeStreamWrite(
|
|
211
|
-
peerId,
|
|
212
|
-
...this.#nativeStream(connId, streamId)
|
|
213
|
-
);
|
|
219
|
+
this.#endpoint.closeStreamWrite(...this.#nativeStream(connId, streamId));
|
|
214
220
|
});
|
|
215
221
|
}
|
|
216
222
|
|
|
217
|
-
resetStream(
|
|
223
|
+
resetStream(connId: number, streamId: number): void {
|
|
218
224
|
translateErrors(() => {
|
|
219
|
-
this.#endpoint.resetStream(
|
|
220
|
-
peerId,
|
|
221
|
-
...this.#nativeStream(connId, streamId)
|
|
222
|
-
);
|
|
225
|
+
this.#endpoint.resetStream(...this.#nativeStream(connId, streamId));
|
|
223
226
|
});
|
|
224
227
|
}
|
|
225
228
|
|
|
226
|
-
abandonStream(
|
|
229
|
+
abandonStream(connId: number, streamId: number): void {
|
|
227
230
|
translateErrors(() => {
|
|
228
|
-
this.#endpoint.abandonStream(
|
|
229
|
-
peerId,
|
|
230
|
-
...this.#nativeStream(connId, streamId)
|
|
231
|
-
);
|
|
231
|
+
this.#endpoint.abandonStream(...this.#settleStream(connId, streamId));
|
|
232
232
|
});
|
|
233
233
|
}
|
|
234
234
|
|
|
235
235
|
streamConsumer(connId: number, streamId: number): (bytes: number) => void {
|
|
236
|
-
const [nativeConn, nativeStream] = this.#
|
|
236
|
+
const [nativeConn, nativeStream] = this.#settleStream(connId, streamId);
|
|
237
237
|
return (bytes) => {
|
|
238
238
|
translateErrors(() => {
|
|
239
239
|
this.#endpoint.streamConsumed(nativeConn, nativeStream, bytes);
|
|
@@ -255,6 +255,24 @@ class NodeBackend implements Minip2pBackend {
|
|
|
255
255
|
];
|
|
256
256
|
}
|
|
257
257
|
|
|
258
|
+
/**
|
|
259
|
+
* Native IDs for settling a stream: acknowledging or abandoning its bytes.
|
|
260
|
+
* Those still hold the native slot of a connection whose end this adapter
|
|
261
|
+
* already drained, so a stream with events in flight resolves through its
|
|
262
|
+
* settle handle once the live mapping is gone.
|
|
263
|
+
*/
|
|
264
|
+
#settleStream(connId: number, streamId: number): [bigint, bigint] {
|
|
265
|
+
try {
|
|
266
|
+
return this.#nativeStream(connId, streamId);
|
|
267
|
+
} catch (error) {
|
|
268
|
+
const handle = this.#settleHandles.get(connId, streamId);
|
|
269
|
+
if (handle === undefined) {
|
|
270
|
+
throw error;
|
|
271
|
+
}
|
|
272
|
+
return handle;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
|
|
258
276
|
// Connect IDs are not mapped because they round-trip into native calls,
|
|
259
277
|
// and native allocates them well inside the safe integer range.
|
|
260
278
|
connect(target: BackendConnectTarget): number {
|
|
@@ -314,18 +332,20 @@ export function circuitAddress(relayAddress: string, peerId: string): string {
|
|
|
314
332
|
|
|
315
333
|
/**
|
|
316
334
|
* Rethrows a native `FfiError` as its typed SDK error. The addon tags each
|
|
317
|
-
* error with the variant name as `code
|
|
318
|
-
*
|
|
335
|
+
* error with the variant name as `code`, its detail field as `detail`, and
|
|
336
|
+
* an `InvalidConfig`'s capability name as `capability`; untyped variants are
|
|
337
|
+
* rethrown unchanged with those properties intact.
|
|
319
338
|
*/
|
|
320
339
|
function translateErrors<T>(operation: () => T): T {
|
|
321
340
|
try {
|
|
322
341
|
return operation();
|
|
323
342
|
} catch (error) {
|
|
324
343
|
throw (
|
|
325
|
-
typedFfiError(
|
|
326
|
-
stringProperty(error, "
|
|
327
|
-
stringProperty(error, "detail")
|
|
328
|
-
|
|
344
|
+
typedFfiError({
|
|
345
|
+
capability: stringProperty(error, "capability"),
|
|
346
|
+
detail: stringProperty(error, "detail"),
|
|
347
|
+
tag: stringProperty(error, "code"),
|
|
348
|
+
}) ?? error
|
|
329
349
|
);
|
|
330
350
|
}
|
|
331
351
|
}
|
|
@@ -393,18 +413,19 @@ const CONNECTION_ID_KEYS: ReadonlySet<string> = new Set([
|
|
|
393
413
|
]);
|
|
394
414
|
|
|
395
415
|
/**
|
|
396
|
-
* Converts one value of a native event: integers to numbers, connection
|
|
397
|
-
* through the connection map, and bytes to `ArrayBuffer`s. A stream ID is
|
|
416
|
+
* Converts one value of a native `tag` event: integers to numbers, connection
|
|
417
|
+
* IDs through the connection map, and bytes to `ArrayBuffer`s. A stream ID is
|
|
398
418
|
* mapped together with the connection of the record that carries it.
|
|
399
419
|
*/
|
|
400
420
|
function normalizeNativeValue(
|
|
401
421
|
value: unknown,
|
|
402
422
|
maps: NativeIdMaps,
|
|
423
|
+
tag: string,
|
|
403
424
|
key?: string
|
|
404
425
|
): unknown {
|
|
405
426
|
if (typeof value === "bigint" || typeof value === "number") {
|
|
406
427
|
if (key !== undefined && CONNECTION_ID_KEYS.has(key)) {
|
|
407
|
-
return maps.connectionIds.
|
|
428
|
+
return maps.connectionIds.toPublicInEvent(tag, key, BigInt(value));
|
|
408
429
|
}
|
|
409
430
|
// A QUIC stop code is a 62-bit varint the remote picks: keep it whole.
|
|
410
431
|
if (key === "errorCode") {
|
|
@@ -416,7 +437,7 @@ function normalizeNativeValue(
|
|
|
416
437
|
return toArrayBuffer(value);
|
|
417
438
|
}
|
|
418
439
|
if (Array.isArray(value)) {
|
|
419
|
-
return value.map((item) => normalizeNativeValue(item, maps));
|
|
440
|
+
return value.map((item) => normalizeNativeValue(item, maps, tag));
|
|
420
441
|
}
|
|
421
442
|
if (value === null || typeof value !== "object") {
|
|
422
443
|
return value;
|
|
@@ -424,7 +445,7 @@ function normalizeNativeValue(
|
|
|
424
445
|
const record: Record<string, unknown> = Object.fromEntries(
|
|
425
446
|
Object.entries(value).map(([itemKey, item]) => [
|
|
426
447
|
itemKey,
|
|
427
|
-
normalizeNativeValue(item, maps, itemKey),
|
|
448
|
+
normalizeNativeValue(item, maps, tag, itemKey),
|
|
428
449
|
])
|
|
429
450
|
);
|
|
430
451
|
const { connId, streamId } = record;
|
|
@@ -456,8 +477,8 @@ function normalizeEvent(
|
|
|
456
477
|
|
|
457
478
|
/**
|
|
458
479
|
* Per-chunk and per-write events, and pubsub messages, convert field by
|
|
459
|
-
* field. Identify snapshots go through the typed {@link identifyInfo}
|
|
460
|
-
* rest share the generic walk: the addon's serde shape is the SDK shape with
|
|
480
|
+
* field. Identify snapshots go through the typed {@link identifyInfo}, and a
|
|
481
|
+
* field-less event passes through by tag. The rest share the generic walk: the addon's serde shape is the SDK shape with
|
|
461
482
|
* napi-rs integers and buffers (see `native-shape.ts`).
|
|
462
483
|
*/
|
|
463
484
|
function convertEvent(event: NativeEvent, maps: NativeIdMaps): P2pEvent {
|
|
@@ -492,21 +513,42 @@ function convertEvent(event: NativeEvent, maps: NativeIdMaps): P2pEvent {
|
|
|
492
513
|
case P2pEvent_Tags.IdentifyReceived: {
|
|
493
514
|
return {
|
|
494
515
|
inner: {
|
|
516
|
+
connId: maps.connectionIds.toPublic(BigInt(event.inner.connId)),
|
|
495
517
|
info: identifyInfo(event.inner.info),
|
|
496
518
|
peerId: event.inner.peerId,
|
|
497
519
|
},
|
|
498
520
|
tag: event.tag,
|
|
499
521
|
};
|
|
500
522
|
}
|
|
523
|
+
case P2pEvent_Tags.MdnsRecovered: {
|
|
524
|
+
return { tag: event.tag };
|
|
525
|
+
}
|
|
501
526
|
default: {
|
|
502
527
|
return {
|
|
503
|
-
inner: normalizeNativeValue(event.inner, maps),
|
|
528
|
+
inner: normalizeNativeValue(event.inner, maps, event.tag),
|
|
504
529
|
tag: event.tag,
|
|
505
530
|
} as P2pEvent;
|
|
506
531
|
}
|
|
507
532
|
}
|
|
508
533
|
}
|
|
509
534
|
|
|
535
|
+
/** The native identity of the stream a native stream event names. */
|
|
536
|
+
function nativeStreamOf(event: NativeEvent): [bigint, bigint] | undefined {
|
|
537
|
+
switch (event.tag) {
|
|
538
|
+
case P2pEvent_Tags.StreamReady:
|
|
539
|
+
case P2pEvent_Tags.StreamData:
|
|
540
|
+
case P2pEvent_Tags.StreamWriteAccepted:
|
|
541
|
+
case P2pEvent_Tags.StreamWriteStopped:
|
|
542
|
+
case P2pEvent_Tags.StreamRemoteWriteClosed:
|
|
543
|
+
case P2pEvent_Tags.StreamClosed: {
|
|
544
|
+
return [BigInt(event.inner.connId), BigInt(event.inner.streamId)];
|
|
545
|
+
}
|
|
546
|
+
default: {
|
|
547
|
+
return undefined;
|
|
548
|
+
}
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
|
|
510
552
|
/** The public identity of the stream a native stream event names. */
|
|
511
553
|
function streamRef(
|
|
512
554
|
inner: {
|
package/src/addon.d.ts
CHANGED
|
@@ -55,16 +55,18 @@ export declare class NodeEndpoint {
|
|
|
55
55
|
* `StreamClosed`, a reset, or the connection closing or being replaced),
|
|
56
56
|
* which drops the tail.
|
|
57
57
|
*/
|
|
58
|
-
sendStream(
|
|
58
|
+
sendStream(connId: bigint, streamId: bigint, data: Uint8Array): boolean
|
|
59
59
|
/** Half-closes the local stream write side. */
|
|
60
|
-
closeStreamWrite(
|
|
60
|
+
closeStreamWrite(connId: bigint, streamId: bigint): void
|
|
61
61
|
/** Resets an application stream. */
|
|
62
|
-
resetStream(
|
|
62
|
+
resetStream(connId: bigint, streamId: bigint): void
|
|
63
63
|
/** Resets and relinquishes an application stream. */
|
|
64
|
-
abandonStream(
|
|
64
|
+
abandonStream(connId: bigint, streamId: bigint): void
|
|
65
65
|
/**
|
|
66
66
|
* Acknowledges `bytes` of a stream's received data as consumed,
|
|
67
|
-
* letting its sender continue. Every registered protocol needs this
|
|
67
|
+
* letting its sender continue. Every registered protocol needs this,
|
|
68
|
+
* also after the stream's connection closed: unacknowledged bytes keep
|
|
69
|
+
* the ended connection's slot until they are acknowledged or abandoned.
|
|
68
70
|
*/
|
|
69
71
|
streamConsumed(connId: bigint, streamId: bigint, bytes: number): void
|
|
70
72
|
/**
|