@forklaunch/core 0.14.16 → 0.15.1-debug-hmac

package/lib/http/index.mjs

@@ -21,7 +21,9 @@ function cors(corsOptions) {
 
 // src/http/router/expressLikeRouter.ts
 import {
+  hashString,
   isRecord as isRecord2,
+  safeStringify as safeStringify2,
   sanitizePathSlashes,
   toPrettyCamelCase,
   toRecord
@@ -74,6 +76,11 @@ function isHttpContractDetails(maybeContractDetails) {
   ));
 }
 
+// src/http/guards/isSdkHandler.ts
+function isSdkHandler(handler) {
+  return typeof handler === "object" && handler !== null && "_path" in handler && "_method" in handler && "contractDetails" in handler;
+}
+
 // src/http/guards/isTypedHandler.ts
 function isTypedHandler(maybeTypedHandler) {
   return maybeTypedHandler != null && typeof maybeTypedHandler === "object" && "_typedHandler" in maybeTypedHandler && maybeTypedHandler._typedHandler === true;
@@ -319,6 +326,13 @@ async function checkAuthorizationToken(req, authorizationMethod, authorizationTo
       const parsedTimestamp = parseHmacTokenPart(timestamp, "ts");
       const parsedNonce = parseHmacTokenPart(nonce, "nonce");
       const parsedSignature = parseHmacTokenPart(signature, "signature");
+      console.log(
+        "parseditems",
+        parsedKeyId,
+        parsedTimestamp,
+        parsedNonce,
+        parsedSignature
+      );
       if (!parsedKeyId || !parsedTimestamp || !parsedNonce || !parsedSignature) {
         return invalidAuthorizationTokenFormat;
       }
@@ -1829,6 +1843,53 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
       ...middlewareOrMiddlewareWithTypedHandler
     );
   };
+  insertIntoRouterSdkPaths({
+    sdkPath,
+    path,
+    method,
+    name
+  }) {
+    const routePath = [method, path].join(".");
+    for (const route of this.routes) {
+      if (route.path === path && route.method === method && route.contractDetails.name === name) {
+        this.sdkPaths[routePath] = sdkPath;
+      }
+    }
+    for (const router of this.routers) {
+      router.insertIntoRouterSdkPaths?.({
+        sdkPath,
+        path,
+        method,
+        name
+      });
+    }
+  }
+  unpackSdks(sdks, path, routerUniquenessCache) {
+    Object.entries(sdks).forEach(([key, maybeHandler]) => {
+      if (isSdkHandler(maybeHandler)) {
+        const cacheKey = hashString(safeStringify2(maybeHandler));
+        if (routerUniquenessCache.has(cacheKey)) {
+          throw new Error(`SDK handler ${key} is already registered`);
+        }
+        routerUniquenessCache.add(cacheKey);
+        if (!maybeHandler._method || !maybeHandler._path) {
+          throw new Error(`SDK handler ${key} is missing method or path`);
+        }
+        this.insertIntoRouterSdkPaths({
+          sdkPath: [...path, key].join("."),
+          path: maybeHandler._path,
+          method: maybeHandler._method,
+          name: maybeHandler.contractDetails.name
+        });
+        routerUniquenessCache.add(cacheKey);
+      } else {
+        this.unpackSdks(maybeHandler, [...path, key], routerUniquenessCache);
+      }
+    });
+  }
+  registerSdks(sdks) {
+    this.unpackSdks(sdks, [], /* @__PURE__ */ new Set());
+  }
   cloneInternals(clone) {
     clone.routers = [...this.routers];
     clone.routes = [...this.routes];
@@ -2970,7 +3031,7 @@ var getCodeForStatus = (status) => {
 var httpStatusCodes_default = HTTPStatuses;
 
 // src/http/mcpGenerator/mcpGenerator.ts
-import { isNever as isNever3, isRecord as isRecord3, safeStringify as safeStringify2 } from "@forklaunch/common";
+import { isNever as isNever3, isRecord as isRecord3, safeStringify as safeStringify3 } from "@forklaunch/common";
 import { FastMCP } from "@forklaunch/fastmcp-fork";
 import { string, ZodSchemaValidator } from "@forklaunch/validator/zod";
 
@@ -3107,7 +3168,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
           if (discriminatedBody) {
             switch (discriminatedBody.parserType) {
               case "json": {
-                parsedBody = safeStringify2(body);
+                parsedBody = safeStringify3(body);
                 break;
               }
               case "text": {
@@ -3139,7 +3200,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
                   parsedBody = new URLSearchParams(
                     Object.entries(body).map(([key, value]) => [
                       key,
-                      safeStringify2(value)
+                      safeStringify3(value)
                     ])
                   );
                 } else {
@@ -3149,7 +3210,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
               }
               default: {
                 isNever3(discriminatedBody.parserType);
-                parsedBody = safeStringify2(body);
+                parsedBody = safeStringify3(body);
                 break;
               }
             }
@@ -3158,7 +3219,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
             const queryString = new URLSearchParams(
               Object.entries(query).map(([key, value]) => [
                 key,
-                safeStringify2(value)
+                safeStringify3(value)
               ])
             ).toString();
             url += queryString ? `?${queryString}` : "";
@@ -3191,7 +3252,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, appli
                 content: [
                   {
                     type: "text",
-                    text: safeStringify2(await response.json())
+                    text: safeStringify3(await response.json())
                   }
                 ]
               };
@@ -3353,7 +3414,7 @@ import {
   isNodeJsWriteableStream,
   isRecord as isRecord4,
   readableStreamToAsyncIterable,
-  safeStringify as safeStringify3
+  safeStringify as safeStringify4
 } from "@forklaunch/common";
 import { Readable, Transform } from "stream";
 
@@ -3457,7 +3518,7 @@ ${res.locals.errorMessage}`;
         if (!errorSent) {
           let data2 = "";
           for (const [key, value] of Object.entries(chunk)) {
-            data2 += `${key}: ${typeof value === "string" ? value : safeStringify3(value)}
+            data2 += `${key}: ${typeof value === "string" ? value : safeStringify4(value)}
 `;
           }
           data2 += "\n";
@@ -3860,109 +3921,6 @@ function generateOpenApiSpecs(schemaValidator, serverUrls, serverDescriptions, a
   );
 }
 
-// src/http/sdk/sdkClient.ts
-import { hashString, safeStringify as safeStringify4, toRecord as toRecord2 } from "@forklaunch/common";
-
-// src/http/guards/isSdkRouter.ts
-function isSdkRouter(value) {
-  return typeof value === "object" && value !== null && "sdk" in value && "_fetchMap" in value && "sdkPaths" in value;
-}
-
-// src/http/sdk/sdkClient.ts
-function mapToSdk(schemaValidator, routerMap, runningPath = void 0) {
-  const routerUniquenessCache = /* @__PURE__ */ new Set();
-  return Object.fromEntries(
-    Object.entries(routerMap).map(([key, value]) => {
-      if (routerUniquenessCache.has(hashString(safeStringify4(value)))) {
-        throw new Error(
-          `SdkClient: Cannot use the same router pointer twice. Please clone the duplicate router with .clone() or only use the router once.`
-        );
-      }
-      routerUniquenessCache.add(hashString(safeStringify4(value)));
-      const currentPath = runningPath ? [runningPath, key].join(".") : key;
-      if (isSdkRouter(value)) {
-        Object.entries(value.sdkPaths).forEach(([routePath, sdkKey]) => {
-          if ("controllerSdkPaths" in value && Array.isArray(value.controllerSdkPaths) && value.controllerSdkPaths.includes(routePath)) {
-            value.sdkPaths[routePath] = [currentPath, sdkKey].join(".");
-          }
-        });
-        return [key, value.sdk];
-      } else {
-        return [
-          key,
-          mapToSdk(
-            schemaValidator,
-            value,
-            runningPath ? [runningPath, key].join(".") : key
-          )
-        ];
-      }
-    })
-  );
-}
-function flattenFetchMap(schemaValidator, routerMap) {
-  const _fetchMap = Object.entries(routerMap).reduce(
-    (acc, [, value]) => {
-      if ("_fetchMap" in value) {
-        return {
-          ...acc,
-          ...value._fetchMap
-        };
-      } else {
-        return {
-          ...acc,
-          ...flattenFetchMap(schemaValidator, value)
-        };
-      }
-    },
-    {}
-  );
-  return _fetchMap;
-}
-function mapToFetch(schemaValidator, routerMap) {
-  const flattenedFetchMap = flattenFetchMap(
-    schemaValidator,
-    routerMap
-  );
-  return ((path, ...reqInit) => {
-    const method = reqInit[0]?.method;
-    const version = reqInit[0] != null && "version" in reqInit[0] ? reqInit[0].version : void 0;
-    return (version ? toRecord2(toRecord2(flattenedFetchMap[path])[method ?? "GET"])[version] : toRecord2(flattenedFetchMap[path])[method ?? "GET"])(path, reqInit[0]);
-  });
-}
-function sdkClient(schemaValidator, routerMap) {
-  return {
-    _finalizedSdk: true,
-    sdk: mapToSdk(schemaValidator, routerMap),
-    fetch: mapToFetch(schemaValidator, routerMap)
-  };
-}
-
-// src/http/sdk/sdkRouter.ts
-import { toPrettyCamelCase as toPrettyCamelCase2 } from "@forklaunch/common";
-function sdkRouter(schemaValidator, controller, router) {
-  const controllerSdkPaths = [];
-  const mappedSdk = Object.fromEntries(
-    Object.entries(controller).map(([key, value]) => {
-      const sdkPath = [value._method, value._path].join(".");
-      controllerSdkPaths.push(sdkPath);
-      router.sdkPaths[sdkPath] = key;
-      return [
-        key,
-        router.sdk[toPrettyCamelCase2(value.contractDetails.name)]
-      ];
-    })
-  );
-  const _fetchMap = router._fetchMap;
-  return {
-    sdk: mappedSdk,
-    fetch: router.fetch,
-    _fetchMap,
-    sdkPaths: router.sdkPaths,
-    controllerSdkPaths
-  };
-}
-
 // src/http/telemetry/evaluateTelemetryOptions.ts
 function evaluateTelemetryOptions(telemetryOptions) {
   return {
@@ -4028,8 +3986,6 @@ export {
   post,
   put,
   recordMetric,
-  sdkClient,
-  sdkRouter,
   trace3 as trace,
   typedAuthHandler,
   typedHandler