@crvouga/mockingbird-service-fcm 1.1.0 → 1.2.0

package/dist/admin.js

@@ -1,6 +1,6 @@
 import {
   fcmCredential
-} from "./chunk-5ZBL7JON.js";
+} from "./chunk-TX5DICAS.js";
 
 // src/admin.ts
 import { Agent, createServer } from "node:https";

package/dist/{chunk-EE7F2ZC6.js → chunk-BBU3KFCD.js}

@@ -3,7 +3,7 @@ import {
   createRuntime,
   parseDuration,
   resolveAdminPrefix
-} from "./chunk-5ZBL7JON.js";
+} from "./chunk-TX5DICAS.js";
 
 // ../../adapters/node/dist/cli.js
 import { readFile as readFile2 } from "node:fs/promises";
@@ -831,4 +831,4 @@ export {
   createServer2 as createServer,
   serveTarget
 };
-//# sourceMappingURL=chunk-EE7F2ZC6.js.map
+//# sourceMappingURL=chunk-BBU3KFCD.js.map

package/dist/{chunk-5ZBL7JON.js → chunk-TX5DICAS.js}

@@ -1018,7 +1018,40 @@ var decodeBody = (contentType, bytes) => {
   return { kind: "bytes", value: bytes };
 };
 var readBody = async (message) => {
-  const bytes = new Uint8Array(await message.arrayBuffer());
+  if (!(message instanceof Request) || !message.body) {
+    if (message instanceof Request)
+      message.signal.throwIfAborted();
+    return decodeBody(message.headers.get("content-type"), new Uint8Array(await message.arrayBuffer()));
+  }
+  message.signal.throwIfAborted();
+  const reader = message.body.getReader();
+  const cancel = () => {
+    void reader.cancel(message.signal.reason).catch(() => {
+    });
+  };
+  message.signal.addEventListener("abort", cancel, { once: true });
+  const chunks = [];
+  let size = 0;
+  try {
+    for (; ; ) {
+      message.signal.throwIfAborted();
+      const { done, value } = await reader.read();
+      message.signal.throwIfAborted();
+      if (done)
+        break;
+      chunks.push(value);
+      size += value.byteLength;
+    }
+  } finally {
+    message.signal.removeEventListener("abort", cancel);
+    reader.releaseLock();
+  }
+  const bytes = new Uint8Array(size);
+  let offset = 0;
+  for (const chunk of chunks) {
+    bytes.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
   return decodeBody(message.headers.get("content-type"), bytes);
 };
 
@@ -1734,7 +1767,42 @@ var verifyOperations = (document2, handlers) => {
   }
   return problems;
 };
-var honoPath = (template) => template.replace(/\{([^}]+)\}/g, ":$1");
+var escapePattern = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+var serviceRoute = (template) => {
+  const names = [];
+  let pattern = "", end = 0;
+  for (const match of template.matchAll(/\{([^}]+)\}/g)) {
+    pattern += `${escapePattern(template.slice(end, match.index))}([^/]+?)`;
+    const name = match[1];
+    if (!name)
+      throw new Error(`Invalid OpenAPI route template: ${template}`);
+    names.push(name);
+    end = match.index + match[0].length;
+  }
+  pattern += escapePattern(template.slice(end));
+  const matcher = new RegExp(`^${pattern}$`);
+  const path = template.split("/").map((segment, index) => {
+    if (!segment.includes("{"))
+      return segment;
+    const literal = /^\{([^}]+)\}$/.exec(segment);
+    if (literal)
+      return `:${literal[1]}`;
+    let expression = "", offset = 0;
+    for (const match of segment.matchAll(/\{[^}]+\}/g)) {
+      expression += `${escapePattern(segment.slice(offset, match.index))}[^/]+?`;
+      offset = match.index + match[0].length;
+    }
+    expression += escapePattern(segment.slice(offset));
+    return `:mockingbirdSegment${index}{${expression}}`;
+  }).join("/");
+  return {
+    path,
+    params: (pathname) => {
+      const values = matcher.exec(pathname);
+      return Object.fromEntries(names.map((name, index) => [name, decodeURIComponent(values?.[index + 1] ?? "")]));
+    }
+  };
+};
 var routeOrder = (a, b) => {
   const sa = a.path.split("/");
   const sb = b.path.split("/");
@@ -1769,6 +1837,7 @@ var createService = (options) => {
   for (const operation of operations) {
     const metadata = operationMetadata(operation.operation);
     const handler = options.handlers[operation.operationId];
+    const registeredRoute = serviceRoute(operation.path);
     const route = async (c) => {
       const request = c.req.raw;
       if (!metadata.supported || !handler) {
@@ -1778,7 +1847,7 @@ var createService = (options) => {
       const context = {
         request,
         url,
-        params: c.req.param(),
+        params: registeredRoute.params(url.pathname),
         query: queryOf(url),
         body: await readBody(request),
         sqlite: options.sqlite,
@@ -1790,7 +1859,7 @@ var createService = (options) => {
       const short = await options.before?.(context);
       return withIssues(request, short ?? await handler(context));
     };
-    app.on(operation.method.toUpperCase(), honoPath(operation.path), route);
+    app.on(operation.method.toUpperCase(), registeredRoute.path, route);
   }
   return {
     app,
@@ -2259,7 +2328,7 @@ var stateAdminRoutes = (routes) => {
 };
 
 // ../core/dist/version.js
-var PACKAGE_VERSION = true ? "1.1.0" : UNRELEASED_VERSION;
+var PACKAGE_VERSION = true ? "1.2.0" : UNRELEASED_VERSION;
 
 // ../core/dist/webhooks.js
 var json4 = (status, body) => new Response(JSON.stringify(body), {
@@ -3915,4 +3984,4 @@ export {
   fcmCredential,
   FcmAPI
 };
-//# sourceMappingURL=chunk-5ZBL7JON.js.map
+//# sourceMappingURL=chunk-TX5DICAS.js.map