@seriousme/opifex 1.11.2 → 2.0.3

package/dev_utils/test-handlers.ts

@@ -0,0 +1,98 @@
+import { ReasonCode } from "../server/mod.ts";
+import { logger } from "../utils/mod.ts";
+import type {
+  AuthenticatedResult,
+  Context,
+  ShareName,
+  Topic,
+} from "../server/mod.ts";
+
+const utf8Decoder = new TextDecoder();
+const userTable = new Map();
+userTable.set("IoTester_1", "strong_password");
+userTable.set("IoTester_2", "strong_password");
+const strictUsername = new RegExp(/^[a-zA-Z0-9]{0,23}$/);
+
+function isAuthenticated(
+  _ctx: Context,
+  clientId: string,
+  username: string,
+  password: Uint8Array,
+): AuthenticatedResult {
+  const pwd = utf8Decoder.decode(password);
+  logger.debug(
+    `Verifying authentication of client '${clientId}' with username '${username}'`,
+  );
+
+  if (!userTable.has(username)) {
+    if (!strictUsername.test(username)) {
+      return { reasonCode: ReasonCode.success };
+    }
+  }
+
+  const pass = userTable.get(username);
+  if (pwd === pass) {
+    return { reasonCode: ReasonCode.success };
+  }
+  return {
+    reasonCode: ReasonCode.badUserNameOrPassword,
+    reasonString: "Bad username or password",
+  };
+}
+
+function processAuth(
+  _ctx: Context,
+  _clientId: string,
+  _authMethod: string,
+  _authData: Uint8Array,
+) {
+  return {
+    reasonCode: ReasonCode.badAuthenticationMethod,
+    reasonString: "Authentication method not supported",
+  };
+}
+
+function isAuthorizedToPublish(ctx: Context, topic: Topic): boolean {
+  logger.debug(
+    "Checking authorization of client",
+    ctx.clientId,
+    "to publish on topic",
+    topic,
+  );
+  if (topic === "topic/unauthorized") {
+    return false;
+  }
+  return true;
+}
+function isAuthorizedToSubscribe(
+  ctx: Context,
+  topic: Topic,
+  shareName: ShareName,
+): boolean {
+  logger.debug(
+    "Checking authorization of client",
+    ctx.clientId,
+    "to subscribe to topic",
+    topic,
+    "using shareName",
+    shareName,
+  );
+  if (topic === "topic/unauthorized") {
+    return false;
+  }
+  return true;
+}
+
+export const handlers = {
+  isAuthenticated,
+  processAuth,
+  isAuthorizedToPublish,
+  isAuthorizedToSubscribe,
+};
+
+export function isAuthenticatedBroker(
+  ctx: Context,
+): AuthenticatedResult {
+  ctx.isBroker = true;
+  return { reasonCode: ReasonCode.success };
+}

package/dev_utils/timers.ts

@@ -6,6 +6,9 @@
 // This will also work on Deno:
 // https://docs.deno.com/api/node/timers/#namespace_setimmediate
 import { setImmediate } from "node:timers";
+import { setTimeout as delay } from "node:timers/promises";
+import type { AnyPacket } from "../mqttPacket/mod.ts";
+export { delay };
 
 let taskCounter = 0;
 
@@ -49,3 +52,14 @@ export const resolveAsap = (): Promise<void> => {
 export const resolveNextTick = (): Promise<void> => {
   return new Promise((resolve) => setImmediate(resolve));
 };
+
+/**
+ * Races a promise to test timeouts
+ */
+export function withTimeout(
+  promise: Promise<IteratorResult<AnyPacket>>,
+  timeoutMs: number,
+): Promise<IteratorResult<AnyPacket> | null> {
+  const timeoutPromise = delay(timeoutMs, null);
+  return Promise.race([promise, timeoutPromise]);
+}

package/dev_utils/webStreamPair.test.ts

@@ -0,0 +1,171 @@
+import { test } from "node:test";
+import assert from "node:assert";
+import { createWebStreamPair } from "./webStreamPair.ts";
+
+test("Echo server shuts down cleanly when client closes input", async () => {
+  const { input, output } = createWebStreamPair();
+
+  const echoPromise = output.readable.pipeTo(output.writable);
+
+  const writer = input.writable.getWriter();
+  const reader = input.readable.getReader();
+
+  // Client closes their side
+  await writer.close();
+
+  // The echo server's pipeTo should resolve and finish successfully
+  await assert.doesNotReject(echoPromise);
+
+  // The client's reader should now receive the end-of-stream signal
+  const { done } = await reader.read();
+  assert.strictEqual(done, true);
+
+  writer.releaseLock();
+  reader.releaseLock();
+});
+
+test("Data written to input.writable arrives at output.readable", async () => {
+  const { input, output } = createWebStreamPair();
+
+  const echoPromise = output.readable.pipeTo(output.writable);
+
+  const writer = input.writable.getWriter();
+  const reader = input.readable.getReader();
+
+  const encoder = new TextEncoder();
+  const decoder = new TextDecoder();
+
+  // Write data to the input side
+  await writer.write(encoder.encode("Hello streaming world!"));
+  await writer.close(); // Close the stream after writing
+
+  // The echo server's pipeTo should resolve and finish successfully
+  await assert.doesNotReject(echoPromise);
+
+  // Read the data from the input side
+  const chunks: Uint8Array[] = [];
+
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) break;
+    if (value) chunks.push(value);
+  }
+
+  // Combine chunks and decode to string
+  const totalLength = chunks.reduce((acc, chunk) => acc + chunk.length, 0);
+  const resultUint8 = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const chunk of chunks) {
+    resultUint8.set(chunk, offset);
+    offset += chunk.length;
+  }
+
+  const readText = decoder.decode(resultUint8);
+
+  // Verify the text matches exactly
+  assert.strictEqual(readText, "Hello streaming world!");
+  reader.releaseLock();
+});
+
+test("Data can be written and read sequentially before closing", async () => {
+  const { input, output } = createWebStreamPair();
+  const echoPromise = output.readable.pipeTo(output.writable);
+
+  const writer = input.writable.getWriter();
+  const reader = input.readable.getReader();
+
+  const encoder = new TextEncoder();
+  const decoder = new TextDecoder();
+
+  // 1. First Write & Read chunk
+  await writer.write(encoder.encode("Chunk 1"));
+  const result1 = await reader.read();
+  assert.strictEqual(result1.done, false);
+  assert.strictEqual(decoder.decode(result1.value), "Chunk 1");
+
+  // 2. Second Write & Read chunk
+  await writer.write(encoder.encode("Chunk 2"));
+  const result2 = await reader.read();
+  assert.strictEqual(result2.done, false);
+  assert.strictEqual(decoder.decode(result2.value), "Chunk 2");
+
+  // 3. Now we close the writable side mid-stream
+  await writer.close();
+
+  // The echo server's pipeTo should resolve and finish successfully
+  await assert.doesNotReject(echoPromise);
+
+  // 4. Verify that the readable side now registers the close signal
+  const finalResult = await reader.read();
+  assert.strictEqual(finalResult.done, true);
+  assert.strictEqual(finalResult.value, undefined);
+
+  writer.releaseLock();
+  reader.releaseLock();
+});
+
+test("Client detects when the echo server abruptly closes its end", async () => {
+  const { input, output } = createWebStreamPair();
+  const encoder = new TextEncoder();
+
+  // Set up a manual echo server so we can manipulate its controls
+  const serverReader = output.readable.getReader();
+  const serverWriter = output.writable.getWriter();
+
+  // Start a basic manual loop in the background
+  const serverLoop = (async () => {
+    try {
+      while (true) {
+        const { value, done } = await serverReader.read();
+        if (done) break;
+        await serverWriter.write(value);
+      }
+    } finally {
+      serverReader.releaseLock();
+      serverWriter.releaseLock();
+    }
+  })();
+
+  const clientWriter = input.writable.getWriter();
+  const clientReader = input.readable.getReader();
+
+  // --- Simulate Server Shutdown ---
+  // The echo server decides to close its writing side out of nowhere
+  try {
+    await serverWriter.close();
+    await serverReader.cancel();
+    await serverLoop;
+
+    const first = await clientReader.read();
+    assert.strictEqual(first.done, true);
+
+    await assert.rejects(
+      () => clientWriter.write(encoder.encode("Is anyone there?")),
+      /close|invalid/i,
+    );
+  } finally {
+    clientWriter.releaseLock();
+    clientReader.releaseLock();
+  }
+});
+
+test("Repeated close and cancel calls are idempotent", async () => {
+  const { input, output } = createWebStreamPair();
+
+  const inputWriter = input.writable.getWriter();
+  const inputReader = input.readable.getReader();
+  const outputWriter = output.writable.getWriter();
+  const outputReader = output.readable.getReader();
+
+  await Promise.allSettled([
+    inputWriter.close(),
+    outputWriter.close(),
+    inputReader.cancel(),
+    outputReader.cancel(),
+  ]);
+
+  inputWriter.releaseLock();
+  inputReader.releaseLock();
+  outputWriter.releaseLock();
+  outputReader.releaseLock();
+});

package/dev_utils/webStreamPair.ts

@@ -0,0 +1,143 @@
+export interface WebStreamPairEndpoint {
+  readable: ReadableStream<Uint8Array>;
+  writable: WritableStream<Uint8Array>;
+  close: () => void;
+}
+
+export function createWebStreamPair(): {
+  input: WebStreamPairEndpoint;
+  output: WebStreamPairEndpoint;
+} {
+  let aController: ReadableStreamDefaultController | null = null;
+  let bController: ReadableStreamDefaultController | null = null;
+
+  let aClosed = false;
+  let bClosed = false;
+  let aControllerClosed = false;
+  let bControllerClosed = false;
+
+  const aReadable = new ReadableStream({
+    start(controller) {
+      aController = controller;
+    },
+    cancel(_reason) {
+      aClosed = true;
+      tryCloseBoth();
+    },
+  });
+
+  const bReadable = new ReadableStream({
+    start(controller) {
+      bController = controller;
+    },
+    cancel(_reason) {
+      bClosed = true;
+      tryCloseBoth();
+    },
+  });
+
+  const makeWritable = (
+    getPeerController: () => ReadableStreamDefaultController | null,
+    markClosed: () => void,
+  ) =>
+    new WritableStream({
+      write(chunk) {
+        const peer = getPeerController();
+        if (!peer) throw new Error("peer stream not initialized yet");
+        peer.enqueue(chunk);
+      },
+      close() {
+        markClosed();
+        tryCloseBoth();
+      },
+      abort(reason) {
+        markClosed();
+        tryErrorBoth(reason);
+      },
+    });
+
+  const aWritable = makeWritable(
+    () => bController,
+    () => {
+      aClosed = true;
+    },
+  );
+
+  const bWritable = makeWritable(
+    () => aController,
+    () => {
+      bClosed = true;
+    },
+  );
+
+  function closePeerOnce(
+    side: "a" | "b",
+    controller: ReadableStreamDefaultController | null,
+  ) {
+    if (!controller) return;
+    const isClosed = side === "a" ? aControllerClosed : bControllerClosed;
+    if (isClosed) return;
+    if (side === "a") {
+      aControllerClosed = true;
+    } else {
+      bControllerClosed = true;
+    }
+    try {
+      controller.close();
+    } catch {
+      // ignore duplicate shutdown attempts; Node throws if the controller is already closed
+    }
+  }
+
+  function errorPeerOnce(
+    side: "a" | "b",
+    controller: ReadableStreamDefaultController | null,
+    reason: unknown,
+  ) {
+    if (!controller) return;
+    const isClosed = side === "a" ? aControllerClosed : bControllerClosed;
+    if (isClosed) return;
+    if (side === "a") {
+      aControllerClosed = true;
+    } else {
+      bControllerClosed = true;
+    }
+    try {
+      controller.error(reason);
+    } catch {
+      // ignore duplicate shutdown attempts; Node throws if the controller is already closed
+    }
+  }
+
+  function tryCloseBoth() {
+    if (aClosed) {
+      closePeerOnce("b", bController);
+    }
+
+    if (bClosed) {
+      closePeerOnce("a", aController);
+    }
+  }
+
+  function tryErrorBoth(reason: unknown) {
+    errorPeerOnce("a", aController, reason);
+    errorPeerOnce("b", bController, reason);
+  }
+
+  return {
+    input: {
+      readable: aReadable,
+      writable: aWritable,
+      close: () => {
+        aReadable.cancel();
+      },
+    },
+    output: {
+      readable: bReadable,
+      writable: bWritable,
+      close: () => {
+        bReadable.cancel();
+      },
+    },
+  };
+}

package/dist/bin/conformanceServer.js

@@ -6,7 +6,7 @@
  */
 import { parseArgs } from "node:util";
 import { TcpServer } from "../node/tcpServer.js";
-import { AuthenticationResult } from "../server/mod.js";
+import { ReasonCode } from "../server/mod.js";
 import { logger, LogLevel } from "../utils/mod.js";
 /**
  * UTF-8 decoder for parsing passwords
@@ -35,27 +35,32 @@ const checkUsername = true;
  * @param {string} clientId - Client identifier
  * @param {string} username - Username to authenticate
  * @param {Uint8Array} password - Password as byte array
- * @returns {TAuthenticationResult} Authentication result
+ * @param {ConnectPacket} connectPacket - The raw connect packet
+ * @returns {IsAuthenticationResult} Authentication result
  */
-function isAuthenticated(_ctx, clientId, username, password) {
+function isAuthenticated(_ctx, clientId, username, password, connectPacket) {
     const pwd = utf8Decoder.decode(password);
-    logger.info(`Verifying authentication of client '${clientId}' with username '${username}' and password '${pwd}'`);
+    logger.info("Verifying authentication of client", clientId, "with username", username);
+    logger.debug("Client", clientId, "connecting with protocol level", connectPacket.protocolLevel);
     if (!checkUsername) {
         // allow all users access
-        return AuthenticationResult.ok;
+        return { reasonCode: ReasonCode.success };
     }
     // is the username valid according to MQTT specification
     if (!strictUsername.test(username)) {
-        return AuthenticationResult.badUsernameOrPassword;
+        return { reasonCode: ReasonCode.badUserNameOrPassword };
     }
     // Does user and password match an entry in userTable
     if (userTable.has(username)) {
         const pass = userTable.get(username);
         if (pwd === pass) {
-            return AuthenticationResult.ok;
+            return { reasonCode: ReasonCode.success };
         }
     }
-    return AuthenticationResult.notAuthorized;
+    return {
+        reasonCode: ReasonCode.notAuthorized,
+        reasonString: "Authentication failed",
+    };
 }
 /**
  * Checks if client is authorized to publish to a topic
@@ -64,7 +69,7 @@ function isAuthenticated(_ctx, clientId, username, password) {
  * @returns {boolean} True if authorized
  */
 function isAuthorizedToPublish(ctx, topic) {
-    logger.debug(`Checking authorization of client '${ctx.store?.clientId}' to publish on topic '${topic}'`);
+    logger.debug("Checking authorization of client", ctx.clientId, "to publish on topic", topic);
     return true;
 }
 /**
@@ -73,8 +78,8 @@ function isAuthorizedToPublish(ctx, topic) {
  * @param {Topic} topic - Topic to subscribe to
  * @returns {boolean} True if authorized
  */
-function isAuthorizedToSubscribe(ctx, topic) {
-    logger.debug(`Checking authorization of client '${ctx.store?.clientId}' to subscribe to topic '${topic}'`);
+function isAuthorizedToSubscribe(ctx, topic, shareName) {
+    logger.debug("Checking authorization of client", ctx.clientId, "to subscribe to topic", topic, "using shareName", shareName);
     return true;
 }
 /**
@@ -95,5 +100,5 @@ const tcpServer = new TcpServer({ port, hostname }, {
     },
 });
 tcpServer.start();
-logger.info(`Server started on port ${tcpServer.port}`);
+logger.info("Server started on port", tcpServer.port);
 //# sourceMappingURL=conformanceServer.js.map

package/dist/bin/conformanceServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"conformanceServer.js","sourceRoot":"","sources":["../../bin/conformanceServer.ts"],"names":[],"mappings":";AACA,iFAAiF;AAEjF;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB;IAEpB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,mBAAmB,GAAG,GAAG,CACrG,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,oBAAoB,CAAC,EAAE,CAAC;IACjC,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,qBAAqB,CAAC;IACpD,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,aAAa,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,0BAA0B,KAAK,GAAG,CAC3F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,GAAY,EAAE,KAAY;IACzD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,4BAA4B,KAAK,GAAG,CAC7F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"conformanceServer.js","sourceRoot":"","sources":["../../bin/conformanceServer.ts"],"names":[],"mappings":"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"}

package/dist/bin/demoServer.js

@@ -5,7 +5,7 @@
  */
 import { parseArgs } from "node:util";
 import { TcpServer } from "../node/tcpServer.js";
-import { AuthenticationResult } from "../server/mod.js";
+import { ReasonCode } from "../server/mod.js";
 import { logger, LogLevel } from "../utils/mod.js";
 /**
  * UTF-8 decoder for parsing passwords
@@ -34,27 +34,31 @@ const checkUsername = false;
  * @param {string} clientId - Client identifier
  * @param {string} username - Username to authenticate
  * @param {Uint8Array} password - Password as byte array
- * @returns {TAuthenticationResult} Authentication result
+ * @returns {IsAuthenticationResult} Authentication result
  */
-function isAuthenticated(_ctx, clientId, username, password) {
+function isAuthenticated(_ctx, clientId, username, password, connectPacket) {
     const pwd = utf8Decoder.decode(password);
-    logger.info(`Verifying authentication of client '${clientId}' with username '${username}' and password '${pwd}'`);
+    logger.info(`Verifying authentication of client '${clientId}' with username '${username}'`);
+    logger.debug(`Client '${clientId}' connecting with protocol level ${connectPacket.protocolLevel}`);
     if (!checkUsername) {
         // allow all users access
-        return AuthenticationResult.ok;
+        return { reasonCode: ReasonCode.success };
     }
     // is the username valid according to MQTT specification
     if (!strictUsername.test(username)) {
-        return AuthenticationResult.badUsernameOrPassword;
+        return { reasonCode: ReasonCode.badUserNameOrPassword };
     }
     // Does user and password match an entry in userTable
     if (userTable.has(username)) {
         const pass = userTable.get(username);
         if (pwd === pass) {
-            return AuthenticationResult.ok;
+            return { reasonCode: ReasonCode.success };
         }
     }
-    return AuthenticationResult.notAuthorized;
+    return {
+        reasonCode: ReasonCode.notAuthorized,
+        reasonString: "Authentication failed",
+    };
 }
 /**
  * Checks if client is authorized to publish to a topic
@@ -63,7 +67,7 @@ function isAuthenticated(_ctx, clientId, username, password) {
  * @returns {boolean} True if authorized
  */
 function isAuthorizedToPublish(ctx, topic) {
-    logger.debug(`Checking authorization of client '${ctx.store?.clientId}' to publish on topic '${topic}'`);
+    logger.debug("Checking authorization of client", ctx.clientId, "to publish on topic", topic);
     return true;
 }
 /**
@@ -72,8 +76,8 @@ function isAuthorizedToPublish(ctx, topic) {
  * @param {Topic} topic - Topic to subscribe to
  * @returns {boolean} True if authorized
  */
-function isAuthorizedToSubscribe(ctx, topic) {
-    logger.debug(`Checking authorization of client '${ctx.store?.clientId}' to subscribe to topic '${topic}'`);
+function isAuthorizedToSubscribe(ctx, topic, shareName) {
+    logger.debug("Checking authorization of client", ctx.clientId, "to subscribe to topic", topic, "using shareName", shareName);
     return true;
 }
 /**
@@ -94,5 +98,5 @@ const tcpServer = new TcpServer({ port, hostname }, {
     },
 });
 tcpServer.start();
-logger.info(`Server started on port ${tcpServer.port}`);
+logger.info("Server started on port", tcpServer.port);
 //# sourceMappingURL=demoServer.js.map

package/dist/bin/demoServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"demoServer.js","sourceRoot":"","sources":["../../bin/demoServer.ts"],"names":[],"mappings":";AAEA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB;IAEpB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,mBAAmB,GAAG,GAAG,CACrG,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,oBAAoB,CAAC,EAAE,CAAC;IACjC,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,qBAAqB,CAAC;IACpD,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,aAAa,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,0BAA0B,KAAK,GAAG,CAC3F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,GAAY,EAAE,KAAY;IACzD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,4BAA4B,KAAK,GAAG,CAC7F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"demoServer.js","sourceRoot":"","sources":["../../bin/demoServer.ts"],"names":[],"mappings":";AAEA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAQjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB,EACpB,aAA4B;IAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,GAAG,CAC/E,CAAC;IACF,MAAM,CAAC,KAAK,CACV,WAAW,QAAQ,oCAAoC,aAAa,CAAC,aAAa,EAAE,CACrF,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;IAC5C,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAC1D,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,aAAa;QACpC,YAAY,EAAE,uBAAuB;KACtC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,kCAAkC,EAClC,GAAG,CAAC,QAAQ,EACZ,qBAAqB,EACrB,KAAK,CACN,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAC9B,GAAY,EACZ,KAAY,EACZ,SAAoB;IAEpB,MAAM,CAAC,KAAK,CACV,kCAAkC,EAClC,GAAG,CAAC,QAAQ,EACZ,uBAAuB,EACvB,KAAK,EACL,iBAAiB,EACjB,SAAS,CACV,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC"}