sst-http 0.1.6 → 0.2.0

package/README.md

@@ -97,7 +97,7 @@ Mark a route with `@FirebaseAuth()` and the manifest records it as protected. Th
 
 ## Wire API Gateway
 
-`sst-http/infra` ships with a manifest-driven wiring utility plus adapters for HTTP API (ApiGatewayV2) and REST API (ApiGateway). The example below uses the HTTP API adapter inside `sst.config.ts`.
+`sst-http/infra` ships with a manifest-driven wiring utility plus adapters for HTTP API (ApiGatewayV2) and REST API (ApiGateway). The example below wires all routes to a single Lambda function inside `sst.config.ts`.
 
 ```ts
 // sst.config.ts
@@ -113,23 +113,18 @@ export default $config({
     } = await import("sst-http/infra");
 
     const manifest = loadRoutesManifest("routes.manifest.json");
-    const { api, registerRoute, ensureJwtAuthorizer } = httpApiAdapter({
-      apiName: "Api",
-      apiArgs: {
-        transform: {
-          route: {
-            handler: {
-              runtime: "nodejs20.x",
-              timeout: "10 seconds",
-              memory: "512 MB",
-            },
-          },
-        },
-      },
+    const { api, registerRoute, ensureJwtAuthorizer } = httpApiAdapter({ apiName: "Api" });
+
+    // Single Lambda for all routes
+    const handler = new sst.aws.Function("Handler", {
+      handler: "src/server.handler",
+      runtime: "nodejs20.x",
+      timeout: "10 seconds",
+      memory: "512 MB",
     });
 
     wireApiFromManifest(manifest, {
-      handlerFile: "src/server.handler",
+      handler,
       firebaseProjectId: process.env.FIREBASE_PROJECT_ID!,
       registerRoute,
       ensureJwtAuthorizer,
@@ -142,6 +137,9 @@ export default $config({
 
 Swap in `restApiAdapter` if you prefer API Gateway REST APIs—the wiring contract is identical.
 
+> Tip
+> Set `FIREBASE_PROJECT_ID` in your environment when using `@FirebaseAuth()` so the JWT authorizer is configured correctly.
+
 ## Publishing
 
 ```bash

package/dist/infra.cjs

@@ -66,7 +66,7 @@ function wireApiFromManifest(manifest, opts) {
       ref: firebaseAuthorizerRef
     } : void 0;
     opts.registerRoute(route.method, path, {
-      handler: opts.handlerFile,
+      handler: opts.handler,
       protected: isProtected,
       authorizer: authConfig
     });
@@ -90,25 +90,34 @@ function httpApiAdapter(args) {
       return authorizers.get(name);
     }
     const apiAny = api;
-    let ref = name;
-    const payload = {
-      type: "jwt",
-      jwt: {
-        issuer: cfg.issuer,
-        audience: cfg.audiences
-      }
-    };
-    if (typeof apiAny.addAuthorizers === "function") {
+    let ref = void 0;
+    if (typeof apiAny["addAuthorizer"] === "function") {
+      const created = apiAny.addAuthorizer({
+        name,
+        jwt: { issuer: cfg.issuer, audiences: cfg.audiences }
+      });
+      ref = created.id;
+    } else if (typeof apiAny.addAuthorizers === "function") {
       apiAny.addAuthorizers({
-        [name]: payload
+        [name]: {
+          type: "jwt",
+          jwt: {
+            issuer: cfg.issuer,
+            audience: cfg.audiences
+          }
+        }
       });
+      ref = name;
     } else if (typeof apiAny.authorizer === "function") {
-      ref = apiAny.authorizer(name, payload);
+      ref = apiAny.authorizer(name, {
+        type: "jwt",
+        jwt: {
+          issuer: cfg.issuer,
+          audience: cfg.audiences
+        }
+      });
     } else {
-      apiAny.authorizers = {
-        ...apiAny.authorizers ?? {},
-        [name]: payload
-      };
+      throw new Error("ApiGatewayV2 instance does not support authorizers");
     }
     authorizers.set(name, ref);
     return ref;
@@ -116,31 +125,34 @@ function httpApiAdapter(args) {
   const registerRoute = (method, path, config) => {
     const apiAny = api;
     const routeKey = `${method} ${path}`;
-    const routeConfig = {
-      handler: config.handler
-    };
+    const asAny = config.handler;
+    const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
+      throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
+    })();
+    const args2 = {};
     if (config.protected && config.authorizer) {
-      routeConfig.authorizer = config.authorizer.ref ?? config.authorizer.name;
-      routeConfig.authorizationType = "JWT";
-      if (config.authorizer.roles && config.authorizer.roles.length > 0) {
-        routeConfig.authorizationScopes = config.authorizer.roles;
-      }
-      if (config.authorizer.optional) {
-        routeConfig.authorizerOptional = true;
-      }
+      args2.auth = {
+        jwt: {
+          authorizer: config.authorizer.ref ?? config.authorizer.name,
+          scopes: config.authorizer.roles
+        }
+      };
     }
     if (typeof apiAny.route === "function") {
-      apiAny.route(routeKey, routeConfig);
+      apiAny.route(routeKey, handlerInput, args2);
       return;
     }
     if (typeof apiAny.addRoutes === "function") {
       apiAny.addRoutes({
-        [routeKey]: routeConfig
+        [routeKey]: {
+          handler: handlerInput,
+          ...args2
+        }
       });
       return;
     }
     if (typeof apiAny.addRoute === "function") {
-      apiAny.addRoute(routeKey, routeConfig);
+      apiAny.addRoute(routeKey, { handler: handlerInput, ...args2 });
       return;
     }
     throw new Error("Unsupported ApiGatewayV2 instance: expected route() or addRoutes() method.");
@@ -186,31 +198,34 @@ function restApiAdapter(args) {
   const registerRoute = (method, path, config) => {
     const apiAny = api;
     const routeKey = `${method} ${path}`;
-    const routeConfig = {
-      handler: config.handler
-    };
+    const asAny = config.handler;
+    const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
+      throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
+    })();
+    const args2 = {};
     if (config.protected && config.authorizer) {
-      routeConfig.authorizer = config.authorizer.ref ?? config.authorizer.name;
-      routeConfig.authorizationType = "JWT";
-      if (config.authorizer.roles && config.authorizer.roles.length > 0) {
-        routeConfig.authorizationScopes = config.authorizer.roles;
-      }
-      if (config.authorizer.optional) {
-        routeConfig.authorizerOptional = true;
-      }
+      args2.auth = {
+        jwt: {
+          authorizer: config.authorizer.ref ?? config.authorizer.name,
+          scopes: config.authorizer.roles
+        }
+      };
     }
     if (typeof apiAny.route === "function") {
-      apiAny.route(routeKey, routeConfig);
+      apiAny.route(routeKey, handlerInput, args2);
       return;
     }
     if (typeof apiAny.addRoutes === "function") {
       apiAny.addRoutes({
-        [routeKey]: routeConfig
+        [routeKey]: {
+          handler: handlerInput,
+          ...args2
+        }
       });
       return;
     }
     if (typeof apiAny.addRoute === "function") {
-      apiAny.addRoute(routeKey, routeConfig);
+      apiAny.addRoute(routeKey, { handler: handlerInput, ...args2 });
       return;
     }
     throw new Error("Unsupported ApiGateway instance: expected route() or addRoutes() method.");

package/dist/infra.d.cts

@@ -3,7 +3,7 @@ export { b as RoutesManifestAuth, a as RoutesManifestRoute } from './types-D69iu
 import 'aws-lambda';
 
 type SstApiGateway = {
-    route?: (routeKey: string, config: Record<string, unknown>) => unknown;
+    route?: (routeKey: string, handlerOrConfig: unknown, args?: Record<string, unknown>) => unknown;
     addRoutes?: (routes: Record<string, Record<string, unknown>>) => unknown;
     addRoute?: (routeKey: string, config: Record<string, unknown>) => unknown;
     addAuthorizers?: (authorizers: Record<string, unknown>) => unknown;
@@ -21,7 +21,7 @@ type AwsSource = {
     };
 };
 type RegisterRouteConfig = {
-    handler: string;
+    handler: unknown;
     protected: boolean;
     authorizer?: {
         name: string;
@@ -36,7 +36,7 @@ type EnsureJwtAuthorizer = (name: string, cfg: {
     audiences: string[];
 }) => unknown;
 declare function wireApiFromManifest(manifest: RoutesManifest, opts: {
-    handlerFile: string;
+    handler: unknown;
     firebaseProjectId: string;
     registerRoute: RegisterRoute;
     ensureJwtAuthorizer: EnsureJwtAuthorizer;

package/dist/infra.d.ts

@@ -3,7 +3,7 @@ export { b as RoutesManifestAuth, a as RoutesManifestRoute } from './types-D69iu
 import 'aws-lambda';
 
 type SstApiGateway = {
-    route?: (routeKey: string, config: Record<string, unknown>) => unknown;
+    route?: (routeKey: string, handlerOrConfig: unknown, args?: Record<string, unknown>) => unknown;
     addRoutes?: (routes: Record<string, Record<string, unknown>>) => unknown;
     addRoute?: (routeKey: string, config: Record<string, unknown>) => unknown;
     addAuthorizers?: (authorizers: Record<string, unknown>) => unknown;
@@ -21,7 +21,7 @@ type AwsSource = {
     };
 };
 type RegisterRouteConfig = {
-    handler: string;
+    handler: unknown;
     protected: boolean;
     authorizer?: {
         name: string;
@@ -36,7 +36,7 @@ type EnsureJwtAuthorizer = (name: string, cfg: {
     audiences: string[];
 }) => unknown;
 declare function wireApiFromManifest(manifest: RoutesManifest, opts: {
-    handlerFile: string;
+    handler: unknown;
     firebaseProjectId: string;
     registerRoute: RegisterRoute;
     ensureJwtAuthorizer: EnsureJwtAuthorizer;

package/dist/infra.js

@@ -39,7 +39,7 @@ function wireApiFromManifest(manifest, opts) {
       ref: firebaseAuthorizerRef
     } : void 0;
     opts.registerRoute(route.method, path, {
-      handler: opts.handlerFile,
+      handler: opts.handler,
       protected: isProtected,
       authorizer: authConfig
     });
@@ -63,25 +63,34 @@ function httpApiAdapter(args) {
       return authorizers.get(name);
     }
     const apiAny = api;
-    let ref = name;
-    const payload = {
-      type: "jwt",
-      jwt: {
-        issuer: cfg.issuer,
-        audience: cfg.audiences
-      }
-    };
-    if (typeof apiAny.addAuthorizers === "function") {
+    let ref = void 0;
+    if (typeof apiAny["addAuthorizer"] === "function") {
+      const created = apiAny.addAuthorizer({
+        name,
+        jwt: { issuer: cfg.issuer, audiences: cfg.audiences }
+      });
+      ref = created.id;
+    } else if (typeof apiAny.addAuthorizers === "function") {
       apiAny.addAuthorizers({
-        [name]: payload
+        [name]: {
+          type: "jwt",
+          jwt: {
+            issuer: cfg.issuer,
+            audience: cfg.audiences
+          }
+        }
       });
+      ref = name;
     } else if (typeof apiAny.authorizer === "function") {
-      ref = apiAny.authorizer(name, payload);
+      ref = apiAny.authorizer(name, {
+        type: "jwt",
+        jwt: {
+          issuer: cfg.issuer,
+          audience: cfg.audiences
+        }
+      });
     } else {
-      apiAny.authorizers = {
-        ...apiAny.authorizers ?? {},
-        [name]: payload
-      };
+      throw new Error("ApiGatewayV2 instance does not support authorizers");
     }
     authorizers.set(name, ref);
     return ref;
@@ -89,31 +98,34 @@ function httpApiAdapter(args) {
   const registerRoute = (method, path, config) => {
     const apiAny = api;
     const routeKey = `${method} ${path}`;
-    const routeConfig = {
-      handler: config.handler
-    };
+    const asAny = config.handler;
+    const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
+      throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
+    })();
+    const args2 = {};
     if (config.protected && config.authorizer) {
-      routeConfig.authorizer = config.authorizer.ref ?? config.authorizer.name;
-      routeConfig.authorizationType = "JWT";
-      if (config.authorizer.roles && config.authorizer.roles.length > 0) {
-        routeConfig.authorizationScopes = config.authorizer.roles;
-      }
-      if (config.authorizer.optional) {
-        routeConfig.authorizerOptional = true;
-      }
+      args2.auth = {
+        jwt: {
+          authorizer: config.authorizer.ref ?? config.authorizer.name,
+          scopes: config.authorizer.roles
+        }
+      };
     }
     if (typeof apiAny.route === "function") {
-      apiAny.route(routeKey, routeConfig);
+      apiAny.route(routeKey, handlerInput, args2);
       return;
     }
     if (typeof apiAny.addRoutes === "function") {
       apiAny.addRoutes({
-        [routeKey]: routeConfig
+        [routeKey]: {
+          handler: handlerInput,
+          ...args2
+        }
       });
       return;
     }
     if (typeof apiAny.addRoute === "function") {
-      apiAny.addRoute(routeKey, routeConfig);
+      apiAny.addRoute(routeKey, { handler: handlerInput, ...args2 });
       return;
     }
     throw new Error("Unsupported ApiGatewayV2 instance: expected route() or addRoutes() method.");
@@ -159,31 +171,34 @@ function restApiAdapter(args) {
   const registerRoute = (method, path, config) => {
     const apiAny = api;
     const routeKey = `${method} ${path}`;
-    const routeConfig = {
-      handler: config.handler
-    };
+    const asAny = config.handler;
+    const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
+      throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
+    })();
+    const args2 = {};
     if (config.protected && config.authorizer) {
-      routeConfig.authorizer = config.authorizer.ref ?? config.authorizer.name;
-      routeConfig.authorizationType = "JWT";
-      if (config.authorizer.roles && config.authorizer.roles.length > 0) {
-        routeConfig.authorizationScopes = config.authorizer.roles;
-      }
-      if (config.authorizer.optional) {
-        routeConfig.authorizerOptional = true;
-      }
+      args2.auth = {
+        jwt: {
+          authorizer: config.authorizer.ref ?? config.authorizer.name,
+          scopes: config.authorizer.roles
+        }
+      };
     }
     if (typeof apiAny.route === "function") {
-      apiAny.route(routeKey, routeConfig);
+      apiAny.route(routeKey, handlerInput, args2);
       return;
     }
     if (typeof apiAny.addRoutes === "function") {
       apiAny.addRoutes({
-        [routeKey]: routeConfig
+        [routeKey]: {
+          handler: handlerInput,
+          ...args2
+        }
       });
       return;
     }
     if (typeof apiAny.addRoute === "function") {
-      apiAny.addRoute(routeKey, routeConfig);
+      apiAny.addRoute(routeKey, { handler: handlerInput, ...args2 });
       return;
     }
     throw new Error("Unsupported ApiGateway instance: expected route() or addRoutes() method.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst-http",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Decorator-based routing for SST v3 with a single Lambda and Firebase JWT authorizer.",
   "license": "MIT",
   "author": "",