sst 2.43.0 → 2.43.2

package/cli/commands/secrets/list.js

@@ -30,7 +30,7 @@ export const list = (program) => program.command("list [format]", "Fetch all the
                 break;
             case "env":
                 for (const [key, value] of Object.entries(secrets)) {
-                    console.log(`${key}=${value.value || `${value.fallback} #fallback`}`);
+                    console.log(`${key}=${`'${value.value}'` || `'${value.fallback}' #fallback`}`);
                 }
                 break;
             case "table":

package/node/auth/session.d.ts

@@ -28,6 +28,18 @@ declare function create<T extends keyof SessionTypes>(input: {
     properties: SessionTypes[T];
     options?: Partial<SignerOptions>;
 }): string;
+/**
+ * Verifies a session token and returns the session data
+ *
+ * @example
+ * ```js
+ * Session.verify()
+ * ```
+ */
+declare function verify<T = SessionValue>(token: string): T | {
+    type: string;
+    properties: {};
+};
 /**
  * Returns a 302 redirect with an auth-token cookie set with the provided session information
  *
@@ -70,6 +82,7 @@ export declare function parameter<T extends keyof SessionTypes>(input: {
 }): APIGatewayProxyStructuredResultV2;
 export declare const Session: {
     create: typeof create;
+    verify: typeof verify;
     cookie: typeof cookie;
     parameter: typeof parameter;
 };

package/node/auth/session.js

@@ -23,11 +23,7 @@ const SessionMemo = /* @__PURE__ */ Context.memo(() => {
     if (wsProtocol)
         token = wsProtocol.split(",")[0].trim();
     if (token) {
-        const jwt = createVerifier({
-            algorithms: ["RS512"],
-            key: getPublicKey(),
-        })(token);
-        return jwt;
+        return Session.verify(token);
     }
     return {
         type: "public",
@@ -64,6 +60,30 @@ function create(input) {
     });
     return token;
 }
+/**
+ * Verifies a session token and returns the session data
+ *
+ * @example
+ * ```js
+ * Session.verify()
+ * ```
+ */
+function verify(token) {
+    if (token) {
+        try {
+            const jwt = createVerifier({
+                algorithms: ["RS512"],
+                key: getPublicKey(),
+            })(token);
+            return jwt;
+        }
+        catch (e) { }
+    }
+    return {
+        type: "public",
+        properties: {},
+    };
+}
 /**
  * Returns a 302 redirect with an auth-token cookie set with the provided session information
  *
@@ -116,6 +136,7 @@ export function parameter(input) {
 }
 export const Session = {
     create,
+    verify,
     cookie,
     parameter,
 };

package/node/future/auth/adapter/apple.d.ts

@@ -1,6 +1,9 @@
-import { BaseClient } from "openid-client";
-import { OauthConfig } from "./oauth.js";
-export declare const AppleAdapter: (config: OauthConfig) => () => Promise<{
+import { BaseClient, Issuer } from "openid-client";
+import { OauthBasicConfig } from "./oauth.js";
+type AppleConfig = OauthBasicConfig & {
+    issuer?: Issuer;
+};
+export declare const AppleAdapter: (config: AppleConfig) => () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
@@ -15,3 +18,4 @@ export declare const AppleAdapter: (config: OauthConfig) => () => Promise<{
         };
     };
 } | undefined>;
+export {};

package/node/future/auth/adapter/apple.js

@@ -8,19 +8,15 @@ import { useBody, useCookie, useDomainName, usePathParam, useResponse, } from ".
 // Also note that Apple's discover uri does not work for the OAuth flow, as the
 // userinfo_endpoint are not included in the response.
 // await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration/");
-let realIssuer;
-const issuer = new Proxy({}, {
-    get: async function (target, prop) {
-        if (!realIssuer) {
-            realIssuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
-        }
-        return realIssuer[prop];
-    },
-});
+let issuer;
 export const AppleAdapter = 
 /* @__PURE__ */
 (config) => {
     return async function () {
+        const doesConfigHasIssuer = config.issuer !== undefined;
+        if (!doesConfigHasIssuer && !issuer) {
+            issuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
+        }
         const step = usePathParam("step");
         const callback = "https://" + useDomainName() + "/callback";
         console.log("callback", callback);

package/node/future/auth/adapter/google.d.ts

@@ -11,7 +11,7 @@ type GoogleConfig = (OauthBasicConfig & {
     mode: "oidc";
     prompt?: GooglePrompt;
 });
-export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
+export declare function GoogleAdapter(config: GoogleConfig): () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
@@ -25,24 +25,9 @@ export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
             location: string;
         };
     };
-}>) | (() => Promise<{
-    type: "success";
-    properties: {
-        tokenset: import("openid-client").TokenSet;
-        client: BaseClient;
-    };
-} | {
-    type: "step";
-    properties: {
-        statusCode: number;
-        headers: {
-            location: string;
-        };
-    };
-    error?: undefined;
 } | {
     type: "error";
     error: import("./oauth.js").OauthError;
     properties?: undefined;
-} | undefined>);
+} | undefined>;
 export {};

package/node/future/auth/adapter/google.js

@@ -1,30 +1,27 @@
 import { Issuer } from "openid-client";
 import { OidcAdapter } from "./oidc.js";
 import { OauthAdapter } from "./oauth.js";
-let realIssuer;
-const issuer = new Proxy({}, {
-    get: async function (target, prop) {
-        if (!realIssuer) {
-            realIssuer = await Issuer.discover("https://accounts.google.com");
-        }
-        return realIssuer[prop];
-    },
-});
+let issuer;
 export function GoogleAdapter(config) {
     /* @__PURE__ */
-    if (config.mode === "oauth") {
-        return OauthAdapter({
+    return async function () {
+        if (!issuer) {
+            issuer = await Issuer.discover("https://accounts.google.com");
+        }
+        if (config.mode === "oauth") {
+            return OauthAdapter({
+                issuer: issuer,
+                ...config,
+                params: {
+                    ...(config.accessType && { access_type: config.accessType }),
+                    ...config.params,
+                },
+            })();
+        }
+        return OidcAdapter({
             issuer: issuer,
+            scope: "openid email profile",
             ...config,
-            params: {
-                ...(config.accessType && { access_type: config.accessType }),
-                ...config.params,
-            },
-        });
-    }
-    return OidcAdapter({
-        issuer: issuer,
-        scope: "openid email profile",
-        ...config,
-    });
+        })();
+    };
 }

package/node/future/auth/index.d.ts

@@ -1,6 +1,4 @@
-export interface AuthResources {
-}
-export declare const Auth: AuthResources;
+export * from "./proxy.js";
 export * from "./adapter/oidc.js";
 export * from "./adapter/google.js";
 export * from "./adapter/link.js";

package/node/future/auth/index.js

@@ -1,5 +1,4 @@
-import { createProxy } from "../../util/index.js";
-export const Auth = /* @__PURE__ */ createProxy("Auth");
+export * from "./proxy.js";
 export * from "./adapter/oidc.js";
 export * from "./adapter/google.js";
 export * from "./adapter/link.js";

package/node/future/auth/proxy.d.ts

@@ -0,0 +1,3 @@
+export interface AuthResources {
+}
+export declare const Auth: AuthResources;

package/node/future/auth/proxy.js

@@ -0,0 +1,2 @@
+import { createProxy } from "../../util/index.js";
+export const Auth = /* @__PURE__ */ createProxy("Auth");

package/node/future/auth/session.js

@@ -1,7 +1,7 @@
 import { createSigner, createVerifier } from "fast-jwt";
 import { Context } from "../../../context/context2.js";
 import { useCookie, useHeader } from "../../api/index.js";
-import { Auth } from "../../auth/index.js";
+import { Auth } from "./proxy.js";
 import { Config } from "../../config/index.js";
 import { useContextType } from "../../../context/handler.js";
 const SessionMemo = /* @__PURE__ */ Context.memo(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.43.0",
+  "version": "2.43.2",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -118,7 +118,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.43.0",
+    "astro-sst": "2.43.2",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/runtime/handlers/node.js

@@ -211,6 +211,7 @@ export const useNodeHandler = () => {
                         "--platform=linux",
                         "--omit=dev",
                         "--no-optional",
+                        "--force",
                         input.props.architecture === "arm_64"
                             ? "--arch=arm64"
                             : "--arch=x64",

package/support/dotnet8-bootstrap/Program.cs

@@ -0,0 +1,17 @@
+using System.Reflection;
+using System.Threading.Tasks;
+using Amazon.Lambda.RuntimeSupport;
+
+namespace dotnet_bootstrap
+{
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            Assembly asm = Assembly.LoadFrom(args[0]);
+            var r = new RuntimeSupportInitializer(args[1]);
+            await r.RunLambdaBootstrap();
+        }
+    }
+}
+

package/support/dotnet8-bootstrap/dotnet-bootstrap.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <RootNamespace>dotnet_bootstrap</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
+  </ItemGroup>
+
+</Project>

package/support/dotnet8-bootstrap/release/dotnet-bootstrap.deps.json

@@ -0,0 +1,59 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v8.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v8.0": {
+      "dotnet-bootstrap/1.0.0": {
+        "dependencies": {
+          "Amazon.Lambda.RuntimeSupport": "1.10.0"
+        },
+        "runtime": {
+          "dotnet-bootstrap.dll": {}
+        }
+      },
+      "Amazon.Lambda.Core/2.2.0": {
+        "runtime": {
+          "lib/net8.0/Amazon.Lambda.Core.dll": {
+            "assemblyVersion": "1.0.0.0",
+            "fileVersion": "1.0.0.0"
+          }
+        }
+      },
+      "Amazon.Lambda.RuntimeSupport/1.10.0": {
+        "dependencies": {
+          "Amazon.Lambda.Core": "2.2.0"
+        },
+        "runtime": {
+          "lib/net8.0/Amazon.Lambda.RuntimeSupport.dll": {
+            "assemblyVersion": "1.10.0.0",
+            "fileVersion": "1.10.0.0"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "dotnet-bootstrap/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Amazon.Lambda.Core/2.2.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-DHqKeD1CYocP0t1dJC/NaXfu+5k6AoqnQ1Hlu/J2mXpLpCyeJfY+tIqT5fpruDarUlU0NtdIH8zSkCjeinyb1A==",
+      "path": "amazon.lambda.core/2.2.0",
+      "hashPath": "amazon.lambda.core.2.2.0.nupkg.sha512"
+    },
+    "Amazon.Lambda.RuntimeSupport/1.10.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-J1NdaUV24sWALmCjzJJ6vezskeeH2NxJU7ao86rgdzW+AcgnhYjIULuKQNAx6fTl8AP/8acFsq7Jp7k156hh4A==",
+      "path": "amazon.lambda.runtimesupport/1.10.0",
+      "hashPath": "amazon.lambda.runtimesupport.1.10.0.nupkg.sha512"
+    }
+  }
+}

package/support/dotnet8-bootstrap/release/dotnet-bootstrap.runtimeconfig.json

@@ -0,0 +1,13 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
+    }
+  }
+}