@enbox/dwn-server 0.0.2 → 0.0.3
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/README.md +13 -13
- package/dist/esm/src/config.d.ts +2 -6
- package/dist/esm/src/config.d.ts.map +1 -1
- package/dist/esm/src/config.js +4 -8
- package/dist/esm/src/config.js.map +1 -1
- package/dist/esm/src/connection/connection-manager.d.ts +9 -9
- package/dist/esm/src/connection/connection-manager.d.ts.map +1 -1
- package/dist/esm/src/connection/connection-manager.js +5 -3
- package/dist/esm/src/connection/connection-manager.js.map +1 -1
- package/dist/esm/src/connection/socket-connection.d.ts +18 -17
- package/dist/esm/src/connection/socket-connection.d.ts.map +1 -1
- package/dist/esm/src/connection/socket-connection.js +26 -35
- package/dist/esm/src/connection/socket-connection.js.map +1 -1
- package/dist/esm/src/dwn-error.js.map +1 -1
- package/dist/esm/src/dwn-server.d.ts +5 -6
- package/dist/esm/src/dwn-server.d.ts.map +1 -1
- package/dist/esm/src/dwn-server.js +3 -14
- package/dist/esm/src/dwn-server.js.map +1 -1
- package/dist/esm/src/http-api.d.ts +9 -11
- package/dist/esm/src/http-api.d.ts.map +1 -1
- package/dist/esm/src/http-api.js +450 -375
- package/dist/esm/src/http-api.js.map +1 -1
- package/dist/esm/src/json-rpc-handlers/dwn/process-message.d.ts.map +1 -1
- package/dist/esm/src/json-rpc-handlers/dwn/process-message.js +3 -3
- package/dist/esm/src/json-rpc-handlers/dwn/process-message.js.map +1 -1
- package/dist/esm/src/json-rpc-handlers/subscription/close.d.ts.map +1 -1
- package/dist/esm/src/json-rpc-handlers/subscription/close.js.map +1 -1
- package/dist/esm/src/json-rpc-socket.d.ts +1 -1
- package/dist/esm/src/json-rpc-socket.d.ts.map +1 -1
- package/dist/esm/src/json-rpc-socket.js +1 -1
- package/dist/esm/src/json-rpc-socket.js.map +1 -1
- package/dist/esm/src/lib/json-rpc-router.d.ts +3 -4
- package/dist/esm/src/lib/json-rpc-router.d.ts.map +1 -1
- package/dist/esm/src/lib/json-rpc-router.js.map +1 -1
- package/dist/esm/src/lib/json-rpc.d.ts.map +1 -1
- package/dist/esm/src/lib/json-rpc.js.map +1 -1
- package/dist/esm/src/main.js +0 -0
- package/dist/esm/src/metrics.d.ts +1 -1
- package/dist/esm/src/metrics.js.map +1 -1
- package/dist/esm/src/registration/proof-of-work-manager.d.ts +1 -1
- package/dist/esm/src/registration/proof-of-work-manager.d.ts.map +1 -1
- package/dist/esm/src/registration/proof-of-work-manager.js +3 -3
- package/dist/esm/src/registration/proof-of-work-manager.js.map +1 -1
- package/dist/esm/src/registration/registration-manager.d.ts +3 -3
- package/dist/esm/src/registration/registration-manager.d.ts.map +1 -1
- package/dist/esm/src/registration/registration-manager.js +6 -6
- package/dist/esm/src/registration/registration-manager.js.map +1 -1
- package/dist/esm/src/registration/registration-store.d.ts +1 -1
- package/dist/esm/src/registration/registration-store.d.ts.map +1 -1
- package/dist/esm/src/registration/registration-store.js.map +1 -1
- package/dist/esm/src/storage.d.ts +2 -2
- package/dist/esm/src/storage.d.ts.map +1 -1
- package/dist/esm/src/storage.js +5 -4
- package/dist/esm/src/storage.js.map +1 -1
- package/dist/esm/src/web5-connect/sql-ttl-cache.d.ts.map +1 -1
- package/dist/esm/src/web5-connect/sql-ttl-cache.js +3 -2
- package/dist/esm/src/web5-connect/sql-ttl-cache.js.map +1 -1
- package/dist/esm/src/web5-connect/web5-connect-server.d.ts.map +1 -1
- package/dist/esm/src/web5-connect/web5-connect-server.js +2 -2
- package/dist/esm/src/web5-connect/web5-connect-server.js.map +1 -1
- package/dist/esm/src/ws-api.d.ts +2 -4
- package/dist/esm/src/ws-api.d.ts.map +1 -1
- package/dist/esm/src/ws-api.js +6 -17
- package/dist/esm/src/ws-api.js.map +1 -1
- package/dist/esm/tests/common-scenario-validator.d.ts.map +1 -1
- package/dist/esm/tests/common-scenario-validator.js +2 -3
- package/dist/esm/tests/common-scenario-validator.js.map +1 -1
- package/dist/esm/tests/connection/connection-manager.spec.js +11 -9
- package/dist/esm/tests/connection/connection-manager.spec.js.map +1 -1
- package/dist/esm/tests/connection/socket-connection.spec.js +40 -18
- package/dist/esm/tests/connection/socket-connection.spec.js.map +1 -1
- package/dist/esm/tests/cors/http-api.browser.js +1 -1
- package/dist/esm/tests/cors/http-api.browser.js.map +1 -1
- package/dist/esm/tests/dwn-process-message.spec.js +4 -4
- package/dist/esm/tests/dwn-process-message.spec.js.map +1 -1
- package/dist/esm/tests/dwn-server.spec.js +8 -9
- package/dist/esm/tests/dwn-server.spec.js.map +1 -1
- package/dist/esm/tests/http-api.spec.js +92 -85
- package/dist/esm/tests/http-api.spec.js.map +1 -1
- package/dist/esm/tests/json-rpc-socket.spec.js +11 -9
- package/dist/esm/tests/json-rpc-socket.spec.js.map +1 -1
- package/dist/esm/tests/plugins/data-store-sqlite.d.ts +2 -2
- package/dist/esm/tests/plugins/data-store-sqlite.js +2 -2
- package/dist/esm/tests/plugins/event-log-sqlite.d.ts +2 -2
- package/dist/esm/tests/plugins/event-log-sqlite.js +2 -2
- package/dist/esm/tests/plugins/event-stream-in-memory.d.ts +2 -2
- package/dist/esm/tests/plugins/event-stream-in-memory.d.ts.map +1 -1
- package/dist/esm/tests/plugins/event-stream-in-memory.js +1 -1
- package/dist/esm/tests/plugins/event-stream-in-memory.js.map +1 -1
- package/dist/esm/tests/plugins/message-store-sqlite.d.ts +2 -2
- package/dist/esm/tests/plugins/message-store-sqlite.d.ts.map +1 -1
- package/dist/esm/tests/plugins/message-store-sqlite.js +2 -2
- package/dist/esm/tests/plugins/message-store-sqlite.js.map +1 -1
- package/dist/esm/tests/plugins/resumable-task-store-sqlite.d.ts +2 -2
- package/dist/esm/tests/plugins/resumable-task-store-sqlite.d.ts.map +1 -1
- package/dist/esm/tests/plugins/resumable-task-store-sqlite.js +2 -2
- package/dist/esm/tests/plugins/resumable-task-store-sqlite.js.map +1 -1
- package/dist/esm/tests/process-handler.spec.js +6 -6
- package/dist/esm/tests/process-handler.spec.js.map +1 -1
- package/dist/esm/tests/registration/proof-of-work-manager.spec.js +3 -4
- package/dist/esm/tests/registration/proof-of-work-manager.spec.js.map +1 -1
- package/dist/esm/tests/rpc-subscribe-close.spec.js +1 -1
- package/dist/esm/tests/rpc-subscribe-close.spec.js.map +1 -1
- package/dist/esm/tests/scenarios/dynamic-plugin-loading.spec.js +11 -10
- package/dist/esm/tests/scenarios/dynamic-plugin-loading.spec.js.map +1 -1
- package/dist/esm/tests/scenarios/registration.spec.js +16 -12
- package/dist/esm/tests/scenarios/registration.spec.js.map +1 -1
- package/dist/esm/tests/scenarios/web5-connect.spec.js +12 -8
- package/dist/esm/tests/scenarios/web5-connect.spec.js.map +1 -1
- package/dist/esm/tests/test-dwn.d.ts.map +1 -1
- package/dist/esm/tests/test-dwn.js +9 -15
- package/dist/esm/tests/test-dwn.js.map +1 -1
- package/dist/esm/tests/utils.d.ts +3 -6
- package/dist/esm/tests/utils.d.ts.map +1 -1
- package/dist/esm/tests/utils.js +9 -18
- package/dist/esm/tests/utils.js.map +1 -1
- package/dist/esm/tests/ws-api.spec.js +28 -23
- package/dist/esm/tests/ws-api.spec.js.map +1 -1
- package/package.json +25 -44
- package/src/config.ts +15 -19
- package/src/connection/connection-manager.ts +18 -12
- package/src/connection/socket-connection.ts +52 -57
- package/src/dwn-error.ts +2 -2
- package/src/dwn-server.ts +17 -30
- package/src/http-api.ts +499 -396
- package/src/json-rpc-handlers/dwn/process-message.ts +9 -10
- package/src/json-rpc-handlers/subscription/close.ts +4 -4
- package/src/json-rpc-socket.ts +3 -2
- package/src/lib/json-rpc-router.ts +5 -6
- package/src/lib/json-rpc.ts +6 -6
- package/src/metrics.ts +7 -7
- package/src/process-handlers.ts +5 -5
- package/src/registration/proof-of-work-manager.ts +11 -10
- package/src/registration/registration-manager.ts +23 -21
- package/src/registration/registration-store.ts +8 -7
- package/src/storage.ts +15 -13
- package/src/web5-connect/sql-ttl-cache.ts +5 -4
- package/src/web5-connect/web5-connect-server.ts +9 -8
- package/src/ws-api.ts +11 -26
- package/dist/cjs/index.js +0 -6811
- package/dist/cjs/package.json +0 -1
- package/dist/esm/src/lib/http-server-shutdown-handler.d.ts +0 -10
- package/dist/esm/src/lib/http-server-shutdown-handler.d.ts.map +0 -1
- package/dist/esm/src/lib/http-server-shutdown-handler.js +0 -65
- package/dist/esm/src/lib/http-server-shutdown-handler.js.map +0 -1
- package/src/lib/http-server-shutdown-handler.ts +0 -79
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { getDialectFromUrl } from "../storage.js";
|
|
2
1
|
import { CryptoUtils } from '@enbox/crypto';
|
|
3
|
-
import {
|
|
2
|
+
import { getDialectFromUrl } from '../storage.js';
|
|
3
|
+
import { SqlTtlCache } from './sql-ttl-cache.js';
|
|
4
4
|
/**
|
|
5
5
|
* The Web5 Connect Server is responsible for handling the Web5 Connect flow.
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web5-connect-server.js","sourceRoot":"","sources":["../../../../src/web5-connect/web5-connect-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"web5-connect-server.js","sourceRoot":"","sources":["../../../../src/web5-connect/web5-connect-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA2BjD;;GAEG;AACH,MAAM,OAAO,iBAAiB;IACrB,MAAM,CAAU,YAAY,GAAG,GAAG,CAAC;IAElC,OAAO,CAAS;IAChB,KAAK,CAAc;IAE3B;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,cAAc,EAGnD;QACC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE7D,wBAAwB;QACxB,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;QAC9D,iBAAiB,CAAC,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAE/D,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,YAAoB,EAAE,OAAO,EAE5B;QACC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,qBAAqB,CAAC,OAA2B;QAC5D,yBAAyB;QACzB,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,OAAO,sBAAsB,SAAS,MAAM,CAAC;QAEzE,4BAA4B;QAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,SAAS,EAAE,EAAE,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAEnF,OAAO;YACL,WAAW;YACX,UAAU,EAAE,iBAAiB,CAAC,YAAY;SAC3C,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,SAAS,EAAE,CAAC,CAAC;QAE7D,mEAAmE;QACnE,yFAAyF;QACzF,wFAAwF;QACxF,mEAAmE;QACnE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,SAAS,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,QAA6B;QAC9E,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,KAAK,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACnF,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,sBAAsB,CAAC,KAAa;QAC/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;QAE3D,wEAAwE;QACxE,yFAAyF;QACzF,wFAAwF;QACxF,mEAAmE;QACnE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC"}
|
package/dist/esm/src/ws-api.d.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import type { Dwn } from '@enbox/dwn-sdk-js';
|
|
2
|
-
import type { Server } from 'http';
|
|
3
|
-
import { WebSocketServer } from 'ws';
|
|
4
2
|
import type { ConnectionManager } from './connection/connection-manager.js';
|
|
3
|
+
import type { HttpApi } from './http-api.js';
|
|
5
4
|
export declare class WsApi {
|
|
6
5
|
#private;
|
|
7
6
|
dwn: Dwn;
|
|
8
|
-
constructor(
|
|
9
|
-
get server(): WebSocketServer;
|
|
7
|
+
constructor(httpApi: HttpApi, dwn: Dwn, connectionManager?: ConnectionManager);
|
|
10
8
|
start(): void;
|
|
11
9
|
close(): Promise<void>;
|
|
12
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-api.d.ts","sourceRoot":"","sources":["../../../src/ws-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws-api.d.ts","sourceRoot":"","sources":["../../../src/ws-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,eAAe,CAAC;AAIrD,qBAAa,KAAK;;IAChB,GAAG,EAAE,GAAG,CAAC;gBAGG,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,iBAAiB;IAU7E,KAAK,IAAI,IAAI;IAIP,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
|
package/dist/esm/src/ws-api.js
CHANGED
|
@@ -1,30 +1,19 @@
|
|
|
1
|
-
import { WebSocketServer } from 'ws';
|
|
2
1
|
import { InMemoryConnectionManager } from './connection/connection-manager.js';
|
|
3
2
|
export class WsApi {
|
|
4
|
-
#wsServer;
|
|
5
3
|
dwn;
|
|
6
4
|
#connectionManager;
|
|
7
|
-
constructor(
|
|
5
|
+
constructor(httpApi, dwn, connectionManager) {
|
|
8
6
|
this.dwn = dwn;
|
|
9
7
|
this.#connectionManager = connectionManager || new InMemoryConnectionManager(dwn);
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
/**
|
|
16
|
-
* Handler for starting a WebSocket.
|
|
17
|
-
* Sets listeners for `connection`, `close` events.
|
|
18
|
-
*/
|
|
19
|
-
#setupWebSocket() {
|
|
20
|
-
this.#wsServer.on('connection', (socket, request) => this.#connectionManager.connect(socket, request));
|
|
21
|
-
this.#wsServer.on('close', () => this.#connectionManager.closeAll());
|
|
8
|
+
// Wire up the WebSocket open event from Bun.serve() to the connection manager.
|
|
9
|
+
httpApi.onWebSocketConnection = (ws) => {
|
|
10
|
+
this.#connectionManager.connect(ws);
|
|
11
|
+
};
|
|
22
12
|
}
|
|
23
13
|
start() {
|
|
24
|
-
|
|
14
|
+
// No additional setup needed — Bun.serve() handles WebSocket lifecycle.
|
|
25
15
|
}
|
|
26
16
|
async close() {
|
|
27
|
-
this.#wsServer.close();
|
|
28
17
|
await this.#connectionManager.closeAll();
|
|
29
18
|
}
|
|
30
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../../src/ws-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../../src/ws-api.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,MAAM,OAAO,KAAK;IAChB,GAAG,CAAM;IACT,kBAAkB,CAAoB;IAEtC,YAAY,OAAgB,EAAE,GAAQ,EAAE,iBAAqC;QAC3E,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,IAAI,IAAI,yBAAyB,CAAC,GAAG,CAAC,CAAC;QAElF,+EAA+E;QAC/E,OAAO,CAAC,qBAAqB,GAAG,CAAC,EAA2B,EAAQ,EAAE;YACpE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK;QACH,wEAAwE;IAC1E,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-scenario-validator.d.ts","sourceRoot":"","sources":["../../../tests/common-scenario-validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"common-scenario-validator.d.ts","sourceRoot":"","sources":["../../../tests/common-scenario-validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAmBjD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C;;OAEG;WACiB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA+G7F"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import chaiAsPromised from 'chai-as-promised';
|
|
2
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
3
|
+
import { webcrypto } from 'node:crypto';
|
|
2
4
|
import chai, { expect } from 'chai';
|
|
3
|
-
import fetch from 'node-fetch';
|
|
4
5
|
import { createJsonRpcRequest } from '../src/lib/json-rpc.js';
|
|
5
6
|
import { getFileAsReadStream } from './utils.js';
|
|
6
|
-
import { v4 as uuidv4 } from 'uuid';
|
|
7
|
-
import { webcrypto } from 'node:crypto';
|
|
8
7
|
import { Cid, DwnConstant, Jws, ProtocolsConfigure, RecordsRead, RecordsWrite, TestDataGenerator } from '@enbox/dwn-sdk-js';
|
|
9
8
|
// node.js 18 and earlier needs globalThis.crypto polyfill
|
|
10
9
|
if (!globalThis.crypto) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-scenario-validator.js","sourceRoot":"","sources":["../../../tests/common-scenario-validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common-scenario-validator.js","sourceRoot":"","sources":["../../../tests/common-scenario-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,26 @@
|
|
|
1
1
|
import chaiAsPromised from 'chai-as-promised';
|
|
2
|
-
import chai, { expect } from 'chai';
|
|
3
2
|
import sinon from 'sinon';
|
|
4
|
-
import {
|
|
5
|
-
import { InMemoryConnectionManager } from '../../src/connection/connection-manager.js';
|
|
3
|
+
import chai, { expect } from 'chai';
|
|
6
4
|
import { config } from '../../src/config.js';
|
|
7
|
-
import {
|
|
5
|
+
import { getTestDwn } from '../test-dwn.js';
|
|
8
6
|
import { HttpApi } from '../../src/http-api.js';
|
|
7
|
+
import { InMemoryConnectionManager } from '../../src/connection/connection-manager.js';
|
|
9
8
|
import { JsonRpcSocket } from '../../src/json-rpc-socket.js';
|
|
9
|
+
import { WsApi } from '../../src/ws-api.js';
|
|
10
10
|
chai.use(chaiAsPromised);
|
|
11
11
|
describe('InMemoryConnectionManager', () => {
|
|
12
12
|
let dwn;
|
|
13
13
|
let connectionManager;
|
|
14
14
|
let httpApi;
|
|
15
15
|
let wsApi;
|
|
16
|
+
let wsUrl;
|
|
16
17
|
beforeEach(async () => {
|
|
17
18
|
dwn = await getTestDwn({ withEvents: true });
|
|
18
19
|
connectionManager = new InMemoryConnectionManager(dwn);
|
|
19
20
|
httpApi = await HttpApi.create(config, dwn);
|
|
20
|
-
await httpApi.start(
|
|
21
|
-
|
|
21
|
+
await httpApi.start(0);
|
|
22
|
+
wsUrl = `ws://127.0.0.1:${httpApi.server.port}`;
|
|
23
|
+
wsApi = new WsApi(httpApi, dwn, connectionManager);
|
|
22
24
|
wsApi.start();
|
|
23
25
|
});
|
|
24
26
|
afterEach(async () => {
|
|
@@ -29,16 +31,16 @@ describe('InMemoryConnectionManager', () => {
|
|
|
29
31
|
sinon.restore();
|
|
30
32
|
});
|
|
31
33
|
it('adds connection to the connections and removes it if that connection is closed', async () => {
|
|
32
|
-
const connection = await JsonRpcSocket.connect(
|
|
34
|
+
const connection = await JsonRpcSocket.connect(wsUrl);
|
|
33
35
|
expect(connectionManager.connections.size).to.equal(1);
|
|
34
36
|
connection.close();
|
|
35
37
|
await new Promise((resolve) => setTimeout(resolve, 5)); // wait for close event to be fired
|
|
36
38
|
expect(connectionManager.connections.size).to.equal(0);
|
|
37
39
|
});
|
|
38
40
|
it('closes all connections on `closeAll`', async () => {
|
|
39
|
-
await JsonRpcSocket.connect(
|
|
41
|
+
await JsonRpcSocket.connect(wsUrl);
|
|
40
42
|
expect(connectionManager.connections.size).to.equal(1);
|
|
41
|
-
await JsonRpcSocket.connect(
|
|
43
|
+
await JsonRpcSocket.connect(wsUrl);
|
|
42
44
|
expect(connectionManager.connections.size).to.equal(2);
|
|
43
45
|
await connectionManager.closeAll();
|
|
44
46
|
expect(connectionManager.connections.size).to.equal(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-manager.spec.js","sourceRoot":"","sources":["../../../../tests/connection/connection-manager.spec.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,
|
|
1
|
+
{"version":3,"file":"connection-manager.spec.js","sourceRoot":"","sources":["../../../../tests/connection/connection-manager.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,32 @@
|
|
|
1
1
|
import chaiAsPromised from 'chai-as-promised';
|
|
2
|
-
import
|
|
2
|
+
import log from 'loglevel';
|
|
3
3
|
import sinon from 'sinon';
|
|
4
|
-
import {
|
|
5
|
-
import { SocketConnection } from '../../src/connection/socket-connection.js';
|
|
4
|
+
import chai, { expect } from 'chai';
|
|
6
5
|
import { getTestDwn } from '../test-dwn.js';
|
|
7
|
-
import
|
|
6
|
+
import { SocketConnection } from '../../src/connection/socket-connection.js';
|
|
8
7
|
chai.use(chaiAsPromised);
|
|
8
|
+
/** Creates a minimal mock of Bun's ServerWebSocket for unit testing. */
|
|
9
|
+
function createMockSocket() {
|
|
10
|
+
return {
|
|
11
|
+
data: { connection: null },
|
|
12
|
+
send: sinon.stub(),
|
|
13
|
+
sendText: sinon.stub(),
|
|
14
|
+
sendBinary: sinon.stub(),
|
|
15
|
+
close: sinon.stub(),
|
|
16
|
+
ping: sinon.stub(),
|
|
17
|
+
pong: sinon.stub(),
|
|
18
|
+
publish: sinon.stub(),
|
|
19
|
+
publishText: sinon.stub(),
|
|
20
|
+
publishBinary: sinon.stub(),
|
|
21
|
+
subscribe: sinon.stub(),
|
|
22
|
+
unsubscribe: sinon.stub(),
|
|
23
|
+
isSubscribed: sinon.stub(),
|
|
24
|
+
cork: sinon.stub(),
|
|
25
|
+
remoteAddress: '127.0.0.1',
|
|
26
|
+
readyState: 1,
|
|
27
|
+
binaryType: 'arraybuffer',
|
|
28
|
+
};
|
|
29
|
+
}
|
|
9
30
|
describe('SocketConnection', () => {
|
|
10
31
|
let dwn;
|
|
11
32
|
before(async () => {
|
|
@@ -15,15 +36,16 @@ describe('SocketConnection', () => {
|
|
|
15
36
|
await dwn.close();
|
|
16
37
|
sinon.restore();
|
|
17
38
|
});
|
|
18
|
-
it('should
|
|
19
|
-
const socket =
|
|
39
|
+
it('should create a connection with heartbeat', async () => {
|
|
40
|
+
const socket = createMockSocket();
|
|
20
41
|
const connection = new SocketConnection(socket, dwn);
|
|
21
|
-
|
|
22
|
-
|
|
42
|
+
// With Bun, events are dispatched externally — no socket.on() calls.
|
|
43
|
+
// Just verify the connection was created successfully.
|
|
44
|
+
expect(connection).to.be.instanceOf(SocketConnection);
|
|
23
45
|
await connection.close();
|
|
24
46
|
});
|
|
25
47
|
it('should add a subscription to the subscription manager map', async () => {
|
|
26
|
-
const socket =
|
|
48
|
+
const socket = createMockSocket();
|
|
27
49
|
const connection = new SocketConnection(socket, dwn);
|
|
28
50
|
const subscriptionRequest = {
|
|
29
51
|
id: 'id',
|
|
@@ -37,7 +59,7 @@ describe('SocketConnection', () => {
|
|
|
37
59
|
expect(connection.subscriptions.size).to.equal(0);
|
|
38
60
|
});
|
|
39
61
|
it('should reject a subscription with an Id of an existing subscription', async () => {
|
|
40
|
-
const socket =
|
|
62
|
+
const socket = createMockSocket();
|
|
41
63
|
const connection = new SocketConnection(socket, dwn);
|
|
42
64
|
const id = 'some-id';
|
|
43
65
|
const subscriptionRequest = {
|
|
@@ -55,7 +77,7 @@ describe('SocketConnection', () => {
|
|
|
55
77
|
expect(connection.subscriptions.size).to.equal(0);
|
|
56
78
|
});
|
|
57
79
|
it('should close a subscription and remove it from the connection manager map', async () => {
|
|
58
|
-
const socket =
|
|
80
|
+
const socket = createMockSocket();
|
|
59
81
|
const connection = new SocketConnection(socket, dwn);
|
|
60
82
|
const id = 'some-id';
|
|
61
83
|
const subscriptionRequest = {
|
|
@@ -73,7 +95,7 @@ describe('SocketConnection', () => {
|
|
|
73
95
|
await connection.close();
|
|
74
96
|
});
|
|
75
97
|
it('hasSubscription returns whether a subscription with the id already exists', async () => {
|
|
76
|
-
const socket =
|
|
98
|
+
const socket = createMockSocket();
|
|
77
99
|
const connection = new SocketConnection(socket, dwn);
|
|
78
100
|
const subscriptionRequest = {
|
|
79
101
|
id: 'id',
|
|
@@ -90,7 +112,7 @@ describe('SocketConnection', () => {
|
|
|
90
112
|
await connection.close();
|
|
91
113
|
});
|
|
92
114
|
it('should close if pong is not triggered between heartbeat intervals', async () => {
|
|
93
|
-
const socket =
|
|
115
|
+
const socket = createMockSocket();
|
|
94
116
|
const clock = sinon.useFakeTimers();
|
|
95
117
|
const connection = new SocketConnection(socket, dwn);
|
|
96
118
|
const closeSpy = sinon.spy(connection, 'close');
|
|
@@ -99,12 +121,12 @@ describe('SocketConnection', () => {
|
|
|
99
121
|
expect(closeSpy.callCount).to.equal(1);
|
|
100
122
|
});
|
|
101
123
|
it('should not close if pong is called within the heartbeat interval', async () => {
|
|
102
|
-
const socket =
|
|
124
|
+
const socket = createMockSocket();
|
|
103
125
|
const clock = sinon.useFakeTimers();
|
|
104
126
|
const connection = new SocketConnection(socket, dwn);
|
|
105
127
|
const closeSpy = sinon.spy(connection, 'close');
|
|
106
|
-
connection.pong(); // trigger a pong
|
|
107
|
-
clock.tick(30_100); // first interval
|
|
128
|
+
connection.pong(); // trigger a pong (now public)
|
|
129
|
+
clock.tick(30_100); // first interval
|
|
108
130
|
connection.pong(); // trigger a pong
|
|
109
131
|
clock.tick(30_100); // second interval
|
|
110
132
|
expect(closeSpy.callCount).to.equal(0);
|
|
@@ -113,11 +135,11 @@ describe('SocketConnection', () => {
|
|
|
113
135
|
expect(closeSpy.callCount).to.equal(1);
|
|
114
136
|
});
|
|
115
137
|
it('logs an error and closes connection if error is triggered', async () => {
|
|
116
|
-
const socket =
|
|
138
|
+
const socket = createMockSocket();
|
|
117
139
|
const connection = new SocketConnection(socket, dwn);
|
|
118
140
|
const logSpy = sinon.stub(log, 'error');
|
|
119
141
|
const closeSpy = sinon.spy(connection, 'close');
|
|
120
|
-
connection.error(new Error('some error'));
|
|
142
|
+
connection.error(new Error('some error')); // now public
|
|
121
143
|
expect(logSpy.callCount).to.equal(1);
|
|
122
144
|
expect(closeSpy.callCount).to.equal(1);
|
|
123
145
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-connection.spec.js","sourceRoot":"","sources":["../../../../tests/connection/socket-connection.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socket-connection.spec.js","sourceRoot":"","sources":["../../../../tests/connection/socket-connection.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RecordsRead, RecordsWrite,
|
|
1
|
+
import { Jws, RecordsRead, RecordsWrite, TestDataGenerator, } from '@enbox/dwn-sdk-js';
|
|
2
2
|
import { expect } from 'chai';
|
|
3
3
|
describe('http-api', () => {
|
|
4
4
|
it('sends dwn-response header', async function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-api.browser.js","sourceRoot":"","sources":["../../../../tests/cors/http-api.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"http-api.browser.js","sourceRoot":"","sources":["../../../../tests/cors/http-api.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,WAAW,EACX,YAAY,EACZ,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,2BAA2B,EAAE,KAAK;QACnC,4DAA4D;QAC5D,kCAAkC;QAClC,2DAA2D;QAC3D,iBAAiB;QACjB,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,CACnB,MAAM,YAAY,CAAC,MAAM,CAAC;YACxB,IAAI;YACJ,UAAU,EAAG,aAAa;YAC1B,SAAS,EAAI,IAAI;YACjB,MAAM,EAAO,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;SACrC,CAAC,CACH,CAAC,MAAM,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,CAClB,MAAM,WAAW,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE;gBACN,QAAQ,EAAE,YAAY,CAAC,QAAQ;aAChC;YACD,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;SAChC,CAAC,CACH,CAAC,MAAM,EAAE,CAAC;QAEX,gBAAgB;QAChB,MAAM,oBAAoB,GAAG,MAAM,KAAK,CAAC,sBAAsB,EAAE;YAC/D,MAAM,EAAI,MAAM;YAChB,OAAO,EAAG;gBACR,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC;oBAC5B,MAAM,EAAG,oBAAoB;oBAC7B,MAAM,EAAG;wBACP,MAAM,EAAI,KAAK,CAAC,GAAG;wBACnB,OAAO,EAAG,YAAY;qBACvB;iBACF,CAAC;aACH;YACD,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,wBAAwB,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,CAAC;QACnE,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE3E,eAAe;QACf,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,sBAAsB,EAAE;YAC9D,MAAM,EAAI,MAAM;YAChB,OAAO,EAAG;gBACR,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC;oBAC5B,MAAM,EAAG,oBAAoB;oBAC7B,MAAM,EAAG;wBACP,MAAM,EAAI,KAAK,CAAC,GAAG;wBACnB,OAAO,EAAG,WAAW;qBACtB;iBACF,CAAC;aACH;SACF,CAAC,CAAC;QACH,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CACxC,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAChD,CAAC;QACF,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
2
|
import sinon from 'sinon';
|
|
3
3
|
import { v4 as uuidv4 } from 'uuid';
|
|
4
|
-
import { handleDwnProcessMessage } from '../src/json-rpc-handlers/dwn/process-message.js';
|
|
5
|
-
import { JsonRpcErrorCodes, createJsonRpcRequest } from '../src/lib/json-rpc.js';
|
|
6
|
-
import { getTestDwn } from './test-dwn.js';
|
|
7
|
-
import { createRecordsWriteMessage } from './utils.js';
|
|
8
4
|
import { DataStream, Jws, Message, MessagesRead, RecordsRead, TestDataGenerator } from '@enbox/dwn-sdk-js';
|
|
5
|
+
import { createRecordsWriteMessage } from './utils.js';
|
|
6
|
+
import { getTestDwn } from './test-dwn.js';
|
|
7
|
+
import { handleDwnProcessMessage } from '../src/json-rpc-handlers/dwn/process-message.js';
|
|
8
|
+
import { createJsonRpcRequest, JsonRpcErrorCodes } from '../src/lib/json-rpc.js';
|
|
9
9
|
describe('handleDwnProcessMessage', function () {
|
|
10
10
|
it('returns a JSON RPC Success Response when DWN returns a 2XX status code', async function () {
|
|
11
11
|
const alice = await TestDataGenerator.generateDidKeyPersona();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dwn-process-message.spec.js","sourceRoot":"","sources":["../../../tests/dwn-process-message.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dwn-process-message.spec.js","sourceRoot":"","sources":["../../../tests/dwn-process-message.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,17 +3,18 @@ import { config } from '../src/config.js';
|
|
|
3
3
|
import { DwnServer } from '../src/dwn-server.js';
|
|
4
4
|
import { getTestDwn } from './test-dwn.js';
|
|
5
5
|
describe('DwnServer', function () {
|
|
6
|
-
const dwnServerConfig = { ...config };
|
|
6
|
+
const dwnServerConfig = { ...config, port: 0 };
|
|
7
7
|
let dwn;
|
|
8
8
|
it('starts with injected dwn', async function () {
|
|
9
9
|
dwn = await getTestDwn();
|
|
10
10
|
const dwnServer = new DwnServer({ config: dwnServerConfig, dwn });
|
|
11
11
|
await dwnServer.start();
|
|
12
|
+
const port = dwnServer.httpServer.port;
|
|
13
|
+
expect(port).to.be.a('number');
|
|
12
14
|
await dwnServer.stop();
|
|
13
|
-
expect(dwnServer.httpServer.listening).to.be.false;
|
|
14
15
|
});
|
|
15
16
|
describe('webSocketSupport config', function () {
|
|
16
|
-
it('should
|
|
17
|
+
it('should start without websocket support if disabled', async function () {
|
|
17
18
|
dwn = await getTestDwn({ withEvents: true });
|
|
18
19
|
const withoutSocketServer = new DwnServer({
|
|
19
20
|
dwn,
|
|
@@ -23,13 +24,11 @@ describe('DwnServer', function () {
|
|
|
23
24
|
}
|
|
24
25
|
});
|
|
25
26
|
await withoutSocketServer.start();
|
|
26
|
-
expect(withoutSocketServer.httpServer.
|
|
27
|
-
expect(withoutSocketServer.wsServer).to.be.undefined;
|
|
27
|
+
expect(withoutSocketServer.httpServer.port).to.be.a('number');
|
|
28
28
|
await withoutSocketServer.stop();
|
|
29
29
|
console.log('server Stop');
|
|
30
|
-
expect(withoutSocketServer.httpServer.listening).to.be.false;
|
|
31
30
|
});
|
|
32
|
-
it('should
|
|
31
|
+
it('should start with websocket support if enabled', async function () {
|
|
33
32
|
dwn = await getTestDwn({ withEvents: true });
|
|
34
33
|
const withSocketServer = new DwnServer({
|
|
35
34
|
dwn,
|
|
@@ -39,10 +38,10 @@ describe('DwnServer', function () {
|
|
|
39
38
|
}
|
|
40
39
|
});
|
|
41
40
|
await withSocketServer.start();
|
|
42
|
-
|
|
41
|
+
// With Bun, WebSocket support is built into the same server — no separate wsServer object.
|
|
42
|
+
expect(withSocketServer.httpServer.port).to.be.a('number');
|
|
43
43
|
await withSocketServer.stop();
|
|
44
44
|
console.log('server Stop');
|
|
45
|
-
expect(withSocketServer.httpServer.listening).to.be.false;
|
|
46
45
|
});
|
|
47
46
|
});
|
|
48
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dwn-server.spec.js","sourceRoot":"","sources":["../../../tests/dwn-server.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,QAAQ,CAAC,WAAW,EAAE;IACpB,MAAM,eAAe,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"dwn-server.spec.js","sourceRoot":"","sources":["../../../tests/dwn-server.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,QAAQ,CAAC,WAAW,EAAE;IACpB,MAAM,eAAe,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAC/C,IAAI,GAAQ,CAAC;IAEb,EAAE,CAAC,0BAA0B,EAAE,KAAK;QAClC,GAAG,GAAG,MAAM,UAAU,EAAE,CAAC;QAEzB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;QAClE,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QAExB,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAE/B,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE;QAClC,EAAE,CAAC,oDAAoD,EAAE,KAAK;YAC5D,GAAG,GAAG,MAAM,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,MAAM,mBAAmB,GAAG,IAAI,SAAS,CAAC;gBACxC,GAAG;gBACH,MAAM,EAAE;oBACN,GAAG,eAAe;oBAClB,gBAAgB,EAAE,KAAK;iBACxB;aACF,CAAC,CAAC;YAEH,MAAM,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAE9D,MAAM,mBAAmB,CAAC,IAAI,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK;YACxD,GAAG,GAAG,MAAM,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC;gBACrC,GAAG;gBACH,MAAM,EAAE;oBACN,GAAG,eAAe;oBAClB,gBAAgB,EAAE,IAAI;iBACvB;aACF,CAAC,CAAC;YAEH,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAC/B,2FAA2F;YAC3F,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAE3D,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|