trpc-uwebsockets 10.38.3 → 10.40.0-beta.0

package/README.md

@@ -4,16 +4,20 @@
 
 # Installation
 
+Latest stable version
 
-Yarn
 ```bash
-yarn add trpc-uwebsockets
+yarn add trpc-uwebsockets@latest
 ```
-Npm
+
+Or install beta version with subscription support
+
 ```bash
-npm i trpc-uwebsockets
+yarn add trpc-uwebsockets@beta
 ```
 
+##
+
 # Usage
 
 Import needed packages
@@ -64,7 +68,7 @@ const router = t.router({
 });
 ```
 
-Initialize uWebsockets server and attach tRPC router
+Initialize uWebsockets server and attach tRPC
 
 ```typescript
 const app = App();
@@ -95,30 +99,70 @@ type CreateContextOptions = {
   req: {
     headers: Record<string, string>;
     method: 'POST' | 'GET';
-    query: string;
+    query: URLSearchParams;
     path: string;
   };
-  /* minimal response interface, useful for setting cookies */
+  /* see https://unetworking.github.io/uWebSockets.js/generated/interfaces/HttpResponse.html */
   res: {
-    setStatus(status: number): void;
-    setHeader(name: string, value: string): void;
+    writeStatus(status: RecognizedString): HttpResponse;
+    writeHeader(key: RecognizedString, value: RecognizedString): HttpResponse;
   };
 };
 ```
 
-# Testing
+# Enabling subscrptions
 
-```bash
-yarn t
+Simple method: enable subscriptions when creating the main handler.
+
+```typescript
+createUWebSocketsHandler(app, '/trpc', {
+  router,
+  createContext,
+  enableSubscriptions: true,
+});
 ```
 
-or
+Recommended method: enable subscriptions after registering main request handler. 
+<!-- For example, cookies are not accessible inside WSHandler createContext, so in order to implement auth query string param with jwt needs to be implemented. -->
+```typescript
+const app = App();
 
-```bash
-yarn test:watch
+createUWebSocketsHandler(app, '/trpc', {
+  router,
+  createContext: ({ req, res }) => {},
+});
+
+applyWSHandler(app, '/trpc', {
+  router,
+  createContext: ({ req, res }) => {},
+});
 ```
 
-# Todo
+## example of subscrption client
 
-- [ ] Various improvements (res.tryEnd + reading multiple headers /w same key)
-- [ ] Subscription support with websockets
+```typescript
+import {
+  createTRPCProxyClient,
+  createWSClient,
+  httpBatchLink,
+  splitLink,
+  wsLink,
+} from '@trpc/client';
+
+const host = `localhost:8080/trpc`;
+const wsClient = createWSClient({ url: `ws://${host}` });
+const client = createTRPCProxyClient<AppRouter>({
+  links: [
+    splitLink({
+      condition(op) {
+        return op.type === 'subscription';
+      },
+      true: wsLink({ client: wsClient }),
+      false: httpBatchLink({
+        url: `http://${host}`,
+        headers: headers,
+      }),
+    }),
+  ],
+});
+```

package/dist/applyWsHandler.js

@@ -0,0 +1,347 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyWSHandler = void 0;
+const server_1 = require("@trpc/server");
+const observable_1 = require("@trpc/server/observable");
+// import { transformTRPCResponse } from '../shared/transformTRPCResponse';
+const shared_1 = require("@trpc/server/shared");
+const utils_1 = require("./utils");
+/* istanbul ignore next -- @preserve */
+function assertIsObject(obj) {
+    if (typeof obj !== 'object' || Array.isArray(obj) || !obj) {
+        throw new Error('Not an object');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsProcedureType(obj) {
+    if (obj !== 'query' && obj !== 'subscription' && obj !== 'mutation') {
+        throw new Error('Invalid procedure type');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsRequestId(obj) {
+    if (obj !== null &&
+        typeof obj === 'number' &&
+        isNaN(obj) &&
+        typeof obj !== 'string') {
+        throw new Error('Invalid request id');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsString(obj) {
+    if (typeof obj !== 'string') {
+        throw new Error('Invalid string');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsJSONRPC2OrUndefined(obj) {
+    if (typeof obj !== 'undefined' && obj !== '2.0') {
+        throw new Error('Must be JSONRPC 2.0');
+    }
+}
+function parseMessage(obj, transformer) {
+    assertIsObject(obj);
+    const { method, params, id, jsonrpc } = obj;
+    assertIsRequestId(id);
+    assertIsJSONRPC2OrUndefined(jsonrpc);
+    if (method === 'subscription.stop') {
+        return {
+            id,
+            jsonrpc,
+            method,
+        };
+    }
+    assertIsProcedureType(method);
+    assertIsObject(params);
+    const { input: rawInput, path } = params;
+    assertIsString(path);
+    const input = transformer.input.deserialize(rawInput);
+    return {
+        id,
+        jsonrpc,
+        method,
+        params: {
+            input,
+            path,
+        },
+    };
+}
+function applyWSHandler(app, prefix, opts) {
+    const { createContext, router } = opts;
+    const { transformer } = router._def._config;
+    // instead of putting data on the client, can put it here in a global map
+    // const globals = new Map<WebSocket<any>, Decoration>();
+    // doing above can eliminate allClients for reconnection notification
+    const allClients = new Set();
+    function respond(client, untransformedJSON) {
+        client.send(JSON.stringify((0, shared_1.transformTRPCResponse)(router._def._config, untransformedJSON)));
+    }
+    function stopSubscription(client, subscription, { id, jsonrpc }) {
+        subscription.unsubscribe();
+        respond(client, {
+            id,
+            jsonrpc,
+            result: {
+                type: 'stopped',
+            },
+        });
+    }
+    async function handleRequest(client, msg) {
+        const data = client.getUserData();
+        const clientSubscriptions = data.clientSubscriptions;
+        const { id, jsonrpc } = msg;
+        /* istanbul ignore next -- @preserve */
+        if (id === null) {
+            throw new server_1.TRPCError({
+                code: 'BAD_REQUEST',
+                message: '`id` is required',
+            });
+        }
+        if (msg.method === 'subscription.stop') {
+            const sub = clientSubscriptions.get(id);
+            if (sub) {
+                stopSubscription(client, sub, { id, jsonrpc });
+            }
+            clientSubscriptions.delete(id);
+            return;
+        }
+        const { path, input } = msg.params;
+        const type = msg.method;
+        try {
+            await data.ctxPromise; // asserts context has been set
+            const result = await (0, server_1.callProcedure)({
+                procedures: router._def.procedures,
+                path,
+                rawInput: input,
+                ctx: data.ctx,
+                type,
+            });
+            if (type === 'subscription') {
+                if (!(0, observable_1.isObservable)(result)) {
+                    throw new server_1.TRPCError({
+                        message: `Subscription ${path} did not return an observable`,
+                        code: 'INTERNAL_SERVER_ERROR',
+                    });
+                }
+            }
+            else {
+                // send the value as data if the method is not a subscription
+                respond(client, {
+                    id,
+                    jsonrpc,
+                    result: {
+                        type: 'data',
+                        data: result,
+                    },
+                });
+                return;
+            }
+            const observable = result;
+            const sub = observable.subscribe({
+                next(data) {
+                    respond(client, {
+                        id,
+                        jsonrpc,
+                        result: {
+                            type: 'data',
+                            data,
+                        },
+                    });
+                },
+                error(err) {
+                    const error = (0, server_1.getTRPCErrorFromUnknown)(err);
+                    opts.onError?.({
+                        error,
+                        path,
+                        type,
+                        ctx: data.ctx,
+                        req: data.req,
+                        input,
+                    });
+                    respond(client, {
+                        id,
+                        jsonrpc,
+                        error: (0, shared_1.getErrorShape)({
+                            config: router._def._config,
+                            error,
+                            type,
+                            path,
+                            input,
+                            ctx: data.ctx,
+                        }),
+                    });
+                },
+                complete() {
+                    respond(client, {
+                        id,
+                        jsonrpc,
+                        result: {
+                            type: 'stopped',
+                        },
+                    });
+                },
+            });
+            /* istanbul ignore next -- @preserve */
+            // FIXME handle these edge cases
+            //   if (client.readyState !== client.OPEN) {
+            //     // if the client got disconnected whilst initializing the subscription
+            //     // no need to send stopped message if the client is disconnected
+            //     sub.unsubscribe();
+            //     return;
+            //   }
+            /* istanbul ignore next -- @preserve */
+            if (clientSubscriptions.has(id)) {
+                // duplicate request ids for client
+                stopSubscription(client, sub, { id, jsonrpc });
+                throw new server_1.TRPCError({
+                    message: `Duplicate id ${id}`,
+                    code: 'BAD_REQUEST',
+                });
+            }
+            clientSubscriptions.set(id, sub);
+            respond(client, {
+                id,
+                jsonrpc,
+                result: {
+                    type: 'started',
+                },
+            });
+        }
+        catch (cause) /* istanbul ignore next -- @preserve */ {
+            // procedure threw an error
+            const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
+            opts.onError?.({
+                error,
+                path,
+                type,
+                ctx: data.ctx,
+                req: data.req,
+                input,
+            });
+            respond(client, {
+                id,
+                jsonrpc,
+                error: (0, shared_1.getErrorShape)({
+                    config: router._def._config,
+                    error,
+                    type,
+                    path,
+                    input,
+                    ctx: data.ctx,
+                }),
+            });
+        }
+    }
+    app.ws(prefix, {
+        sendPingsAutomatically: opts.sendPingsAutomatically,
+        closeOnBackpressureLimit: opts.closeOnBackpressureLimit,
+        compression: opts.compression,
+        maxBackpressure: opts.maxBackpressure,
+        maxPayloadLength: opts.maxPayloadLength,
+        maxLifetime: opts.maxLifetime,
+        idleTimeout: opts.idleTimeout,
+        upgrade: (res, req, context) => {
+            const wrappedReq = (0, utils_1.extractAndWrapHttpRequest)(prefix, req);
+            const secWebSocketKey = wrappedReq.headers['sec-websocket-key'];
+            const secWebSocketProtocol = wrappedReq.headers['sec-websocket-protocol'];
+            const secWebSocketExtensions = wrappedReq.headers['sec-websocket-extensions'];
+            const data = {
+                clientSubscriptions: new Map(),
+                req: wrappedReq,
+                ctx: undefined,
+                ctxPromise: createContext?.({ req: wrappedReq, res }), // this cannot use RES!
+            };
+            res.upgrade(data, 
+            /* Spell these correctly */
+            secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, context);
+        },
+        async open(client) {
+            async function createContextAsync() {
+                const data = client.getUserData();
+                try {
+                    data.ctx = await data.ctxPromise;
+                }
+                catch (cause) {
+                    const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
+                    opts.onError?.({
+                        error,
+                        path: undefined,
+                        type: 'unknown',
+                        ctx: data.ctx,
+                        req: data.req,
+                        input: undefined,
+                    });
+                    respond(client, {
+                        id: null,
+                        error: (0, shared_1.getErrorShape)({
+                            config: router._def._config,
+                            error,
+                            type: 'unknown',
+                            path: undefined,
+                            input: undefined,
+                            ctx: data.ctx,
+                        }),
+                    });
+                    // close in next tick
+                    // FIXME check if this is okay?
+                    (global.setImmediate ?? global.setTimeout)(() => {
+                        client.close();
+                    });
+                }
+            }
+            await createContextAsync();
+            allClients.add(client);
+        },
+        async message(client, rawMsg) {
+            try {
+                const stringMsg = Buffer.from(rawMsg).toString();
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string
+                const msgJSON = JSON.parse(stringMsg);
+                const msgs = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
+                const promises = msgs
+                    .map((raw) => parseMessage(raw, transformer))
+                    .map((value) => handleRequest(client, value));
+                await Promise.all(promises);
+            }
+            catch (cause) {
+                const error = new server_1.TRPCError({
+                    code: 'PARSE_ERROR',
+                    cause,
+                });
+                respond(client, {
+                    id: null,
+                    error: (0, shared_1.getErrorShape)({
+                        config: router._def._config,
+                        error,
+                        type: 'unknown',
+                        path: undefined,
+                        input: undefined,
+                        ctx: undefined,
+                    }),
+                });
+            }
+        },
+        close(client) {
+            const data = client.getUserData();
+            for (const sub of data.clientSubscriptions.values()) {
+                sub.unsubscribe();
+            }
+            data.clientSubscriptions.clear();
+            allClients.delete(client);
+        },
+    });
+    return {
+        broadcastReconnectNotification: () => {
+            const response = {
+                id: null,
+                method: 'reconnect',
+            };
+            const data = JSON.stringify(response);
+            allClients.forEach((v) => {
+                v.send(data);
+            });
+        },
+    };
+}
+exports.applyWSHandler = applyWSHandler;
+//# sourceMappingURL=applyWsHandler.js.map

package/dist/applyWsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyWsHandler.js","sourceRoot":"","sources":["../src/applyWsHandler.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -16,42 +16,31 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUWebSocketsHandler = void 0;
 const requestHandler_1 = require("./requestHandler");
+const utils_1 = require("./utils");
+const applyWsHandler_1 = require("./applyWsHandler");
 __exportStar(require("./types"), exports);
+__exportStar(require("./applyWsHandler"), exports);
 /**
  * @param uWsApp uWebsockets server instance
  * @param prefix The path to trpc without trailing slash (ex: "/trpc")
  * @param opts handler options
  */
-function createUWebSocketsHandler(uWsApp, prefix, opts
-// opts: uHTTPHandlerOptions<TRouter, TRequest, TResponse>
-) {
-    const prefixTrimLength = prefix.length + 1; // remove /* from url
+function createUWebSocketsHandler(uWsApp, prefix, opts) {
     const handler = (res, req) => {
-        const method = req.getMethod().toUpperCase();
-        const url = req.getUrl().substring(prefixTrimLength);
-        const query = req.getQuery();
-        const headers = {};
-        req.forEach((key, value) => {
-            // TODO handle headers with the same key, potential issue
-            headers[key] = value;
-        });
-        // new request object needs to be created, because socket
-        // can only be accessed synchronously, after await it cannot be accessed
-        const wrappedReq = {
-            headers,
-            method,
-            query,
-            url,
-        };
+        const wrappedReq = (0, utils_1.extractAndWrapHttpRequest)(prefix, req);
         (0, requestHandler_1.uWsHTTPRequestHandler)({
             req: wrappedReq,
             res: res,
-            path: url,
+            path: wrappedReq.url,
             ...opts,
         });
     };
     uWsApp.get(prefix + '/*', handler);
     uWsApp.post(prefix + '/*', handler);
+    if (opts.enableSubscriptions) {
+        opts.router;
+        (0, applyWsHandler_1.applyWSHandler)(uWsApp, prefix, opts);
+    }
 }
 exports.createUWebSocketsHandler = createUWebSocketsHandler;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAGA,qDAAyD;AAIzD,0CAAwB;AAKxB;;;;GAIG;AACH,SAAgB,wBAAwB,CACtC,MAAoB,EACpB,MAAc,EACd,IAAuC;AACvC,0DAA0D;;IAE1D,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,qBAAqB;IAEjE,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,GAAgB,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,EAAoB,CAAC;QAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAE7B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACzB,yDAAyD;YACzD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,yDAAyD;QACzD,wEAAwE;QACxE,MAAM,UAAU,GAAuB;YACrC,OAAO;YACP,MAAM;YACN,KAAK;YACL,GAAG;SACJ,CAAC;QAEF,IAAA,sCAAqB,EAAC;YACpB,GAAG,EAAE,UAAU;YACf,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,GAAG;YACT,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AArCD,4DAqCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,qDAAyD;AACzD,mCAAoD;AACpD,qDAAqE;AAIrE,0CAAwB;AACxB,mDAAiC;AAEjC;;;;GAIG;AACH,SAAgB,wBAAwB,CACtC,MAAoB,EACpB,MAAc,EACd,IAAoE;IAEpE,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,GAAgB,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,IAAA,iCAAyB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE1D,IAAA,sCAAqB,EAAC;YACpB,GAAG,EAAE,UAAU;YACf,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,UAAU,CAAC,GAAG;YACpB,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAEpC,IAAI,IAAI,CAAC,mBAAmB,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC;QACZ,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,EAAE,IAAkC,CAAC,CAAC;KACpE;AACH,CAAC;AAtBD,4DAsBC"}

package/dist/requestHandler.js

@@ -43,10 +43,10 @@ async function uWsHTTPRequestHandler(opts) {
             },
         });
         if (aborted) {
-            // TODO check this behavior
             return;
         }
         res.cork(() => {
+            res.writeStatus(result.status.toString()); // is this okay?
             // oldschool way of writing headers
             for (const [key, value] of Object.entries(result.headers ?? {})) {
                 if (typeof value === 'undefined') {
@@ -59,7 +59,7 @@ async function uWsHTTPRequestHandler(opts) {
                 else
                     res.writeHeader(key, value);
             }
-            (0, utils_1.sendResponse)(res, result.body);
+            res.end(result.body);
         });
     });
 }

package/dist/requestHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../src/requestHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../src/requestHandler.ts"],"names":[],"mappings":"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"}

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendResponse = exports.getPostBody = void 0;
+exports.extractAndWrapHttpRequest = exports.getPostBody = void 0;
 const server_1 = require("@trpc/server");
 function getPostBody(method, res, maxBodySize) {
     return new Promise((resolve) => {
@@ -52,10 +52,20 @@ function getPostBody(method, res, maxBodySize) {
     });
 }
 exports.getPostBody = getPostBody;
-// FIXME buffer the output with tryEnd instead
-// https://github.com/uNetworking/uWebSockets.js/blob/master/examples/VideoStreamer.js
-function sendResponse(res, payload) {
-    res.end(payload);
+function extractAndWrapHttpRequest(prefix, req) {
+    const method = req.getMethod().toUpperCase();
+    const url = req.getUrl().substring(prefix.length + 1);
+    const query = new URLSearchParams(req.getQuery());
+    const headers = {};
+    req.forEach((key, value) => {
+        headers[key] = value;
+    });
+    return {
+        headers,
+        method,
+        query,
+        url,
+    };
 }
-exports.sendResponse = sendResponse;
+exports.extractAndWrapHttpRequest = extractAndWrapHttpRequest;
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AAEzC,SAAgB,WAAW,CAAC,MAAM,EAAE,GAAiB,EAAE,WAAoB;IACzE,OAAO,IAAI,OAAO,CAGhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,KAAK;aACpB,CAAC,CAAC;SACJ;QAED,IAAI,MAAc,CAAC;QAEnB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;YACxB,+CAA+C;YAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,EAAE;gBAClC,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;oBAChC,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;gBAC/C,OAAO,CAAC;oBACN,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;iBACpD,CAAC,CAAC;aACJ;YACD,IAAI,MAAM;gBACR,iBAAiB;gBACjB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;;gBACrC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAErC,IAAI,MAAM,EAAE;gBACV,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACvB,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC;gBACN,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;aACxD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAxDD,kCAwDC;AAED,8CAA8C;AAC9C,sFAAsF;AACtF,SAAgB,YAAY,CAAC,GAAiB,EAAE,OAAgB;IAC9D,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC;AAFD,oCAEC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AAGzC,SAAgB,WAAW,CAAC,MAAM,EAAE,GAAiB,EAAE,WAAoB;IACzE,OAAO,IAAI,OAAO,CAGhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,KAAK;aACpB,CAAC,CAAC;SACJ;QAED,IAAI,MAAc,CAAC;QAEnB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;YACxB,+CAA+C;YAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,EAAE;gBAClC,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;oBAChC,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;gBAC/C,OAAO,CAAC;oBACN,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;iBACpD,CAAC,CAAC;aACJ;YACD,IAAI,MAAM;gBACR,iBAAiB;gBACjB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;;gBACrC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAErC,IAAI,MAAM,EAAE;gBACV,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACvB,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC;gBACN,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;aACxD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAxDD,kCAwDC;AAED,SAAgB,yBAAyB,CACvC,MAAc,EACd,GAAgB;IAEhB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,EAAoB,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAElD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,MAAM;QACN,KAAK;QACL,GAAG;KACJ,CAAC;AACJ,CAAC;AAnBD,8DAmBC"}