sst 2.26.4 → 2.26.6

package/cli/commands/dev.js

@@ -3,35 +3,20 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     type: "boolean",
     description: "Increase function timeout",
 }), async (args) => {
+    const { Logger } = await import("../../logger.js");
     const { Colors } = await import("../colors.js");
     const { printHeader } = await import("../ui/header.js");
     const { mapValues } = await import("remeda");
     const path = await import("path");
-    const { useRuntimeWorkers } = await import("../../runtime/workers.js");
-    const { useIOTBridge } = await import("../../runtime/iot.js");
-    const { useRuntimeServer } = await import("../../runtime/server.js");
     const { useBus } = await import("../../bus.js");
     const { useWatcher } = await import("../../watcher.js");
-    const { useAppMetadata, saveAppMetadata, Stacks } = await import("../../stacks/index.js");
     const { exit, exitWithError, trackDevError, trackDevRunning } = await import("../program.js");
-    const { Logger } = await import("../../logger.js");
     const { createSpinner } = await import("../spinner.js");
     const { bold, dim, yellow } = await import("colorette");
-    const { render } = await import("ink");
-    const React = await import("react");
-    const { Context } = await import("../../context/context.js");
-    const { printDeploymentResults, DeploymentUI } = await import("../ui/deploy.js");
     const { useLocalServer } = await import("../local/server.js");
     const fs = await import("fs/promises");
     const crypto = await import("crypto");
-    const { useFunctions } = await import("../../constructs/Function.js");
-    const { useSites } = await import("../../constructs/SsrSite.js");
-    const { usePothosBuilder } = await import("./plugins/pothos.js");
-    const { useKyselyTypeGenerator } = await import("./plugins/kysely.js");
-    const { useRDSWarmer } = await import("./plugins/warmer.js");
     const { useProject } = await import("../../project.js");
-    const { useMetadataCache } = await import("../../stacks/metadata.js");
-    const { useIOT } = await import("../../iot.js");
     const { clear } = await import("../terminal.js");
     const { getCiInfo } = await import("../ci-info.js");
     try {
@@ -40,6 +25,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         }
         const project = useProject();
         const useFunctionLogger = lazy(async () => {
+            const { useFunctions } = await import("../../constructs/Function.js");
             const bus = useBus();
             const colors = ["#01cdfe", "#ff71ce", "#05ffa1", "#b967ff"];
             let index = 0;
@@ -141,11 +127,15 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         const useStackBuilder = lazy(async () => {
             const watcher = useWatcher();
+            const { printDeploymentResults, DeploymentUI } = await import("../ui/deploy.js");
+            const { render } = await import("ink");
+            const React = await import("react");
             const scriptVersion = Date.now().toString();
             let lastDeployed;
             let isWorking = false;
             let isDirty = false;
             async function build() {
+                const { Stacks } = await import("../../stacks/index.js");
                 if (isWorking) {
                     isDirty = true;
                     return;
@@ -205,15 +195,40 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 }
             }
             async function deploy(assembly) {
+                const metadata = await appMetadata();
+                if (!project.config.advanced?.disableAppModeCheck &&
+                    !getCiInfo().isCI &&
+                    metadata &&
+                    metadata.mode !== "dev") {
+                    async function promptChangeMode() {
+                        const readline = await import("readline");
+                        const rl = readline.createInterface({
+                            input: process.stdin,
+                            output: process.stdout,
+                        });
+                        return new Promise((resolve) => {
+                            console.log("");
+                            rl.question(`You have previously deployed the stage "${project.config.stage}" in production. It is recommended that you use a different stage for development. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to run this stage in dev mode? [y/N] `, async (input) => {
+                                rl.close();
+                                resolve(input.trim() === "y");
+                            });
+                        });
+                    }
+                    if (!(await promptChangeMode())) {
+                        await exit();
+                    }
+                }
                 const nextChecksum = await checksum(assembly.directory);
+                const { useSites } = await import("../../constructs/SsrSite.js");
                 const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
+                const { Stacks } = await import("../../stacks/index.js");
                 const results = await Stacks.deployMany(assembly.stacks);
                 component.clear();
                 component.unmount();
                 printDeploymentResults(assembly, results);
                 // Run after initial deploy
                 if (!lastDeployed) {
-                    await saveAppMetadata({ mode: "dev" });
+                    await import("../../stacks/app-metadata.js").then((mod) => mod.saveAppMetadata({ mode: "dev" }));
                     // Check failed stacks
                     const failed = Object.values(results).find((result) => Stacks.isFailed(result.status));
                     failed
@@ -280,7 +295,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         const useDisconnector = lazy(async () => {
             const bus = useBus();
-            const iot = await useIOT();
+            const iot = await import("../../iot.js").then((mod) => mod.useIOT());
             bus.subscribe("cli.dev", async (evt) => {
                 const topic = `${iot.prefix}/events`;
                 iot.publish(topic, "cli.dev", evt.properties);
@@ -299,49 +314,25 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 await exit();
             });
         });
-        const [appMetadata] = await Promise.all([
-            useAppMetadata(),
+        console.log("wtf");
+        Logger.debug("dev is ready");
+        const appMetadata = lazy(() => import("../../stacks/app-metadata.js").then((mod) => mod.useAppMetadata()));
+        clear();
+        await printHeader({ console: true, hint: "ready!" });
+        await Promise.all([
+            useStackBuilder(),
+            useDisconnector(),
+            import("../../runtime/workers.js").then((mod) => mod.useRuntimeWorkers()),
+            import("../../runtime/iot.js").then((mod) => mod.useIOTBridge()),
+            import("../../runtime/server.js").then((mod) => mod.useRuntimeServer()),
             useLocalServer({
                 key: "",
                 cert: "",
                 live: true,
             }),
-        ]);
-        async function promptChangeMode() {
-            const readline = await import("readline");
-            const rl = readline.createInterface({
-                input: process.stdin,
-                output: process.stdout,
-            });
-            return new Promise((resolve) => {
-                console.log("");
-                rl.question(`You have previously deployed the stage "${project.config.stage}" in production. It is recommended that you use a different stage for development. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to run this stage in dev mode? [y/N] `, async (input) => {
-                    rl.close();
-                    resolve(input.trim() === "y");
-                });
-            });
-        }
-        // Check app mode changed
-        if (!project.config.advanced?.disableAppModeCheck &&
-            !getCiInfo().isCI &&
-            appMetadata &&
-            appMetadata.mode !== "dev") {
-            if (!(await promptChangeMode())) {
-                await exit();
-            }
-        }
-        clear();
-        await printHeader({ console: true, hint: "ready!" });
-        await useStackBuilder();
-        await Promise.all([
-            useDisconnector(),
-            useRuntimeWorkers(),
-            useIOTBridge(),
-            useRuntimeServer(),
-            usePothosBuilder(),
-            useMetadataCache(),
-            useKyselyTypeGenerator(),
-            useRDSWarmer(),
+            import("./plugins/pothos.js").then((mod) => mod.usePothosBuilder()),
+            import("./plugins/kysely.js").then((mod) => mod.useKyselyTypeGenerator()),
+            import("./plugins/warmer.js").then((mod) => mod.useRDSWarmer()),
             useFunctionLogger(),
         ]);
     }

package/cli/commands/secrets/load.d.ts

@@ -14,4 +14,6 @@ export declare const load: (program: Program) => import("yargs").Argv<{
     future: boolean | undefined;
 } & {
     filename: string;
+} & {
+    fallback: boolean | undefined;
 }>;

package/cli/commands/secrets/load.js

@@ -1,6 +1,11 @@
-export const load = (program) => program.command("load <filename>", "Loads secrets from an .env file", (yargs) => yargs.positional("filename", {
+export const load = (program) => program.command("load <filename>", "Loads secrets from an .env file", (yargs) => yargs
+    .positional("filename", {
     type: "string",
     demandOption: true,
+})
+    .option("fallback", {
+    type: "boolean",
+    describe: "Load the fallback values",
 }), async (args) => {
     const { exit, exitWithError } = await import("../../program.js");
     const { Config } = await import("../../../config.js");
@@ -16,7 +21,11 @@ export const load = (program) => program.command("load <filename>", "Loads secre
         // Set secrets
         const setting = createSpinner(` Setting secrets from "${args.filename}"`).start();
         for (const [key, value] of Object.entries(envVars)) {
-            await Config.setSecret({ key, value });
+            await Config.setSecret({
+                key: key,
+                value: value,
+                fallback: args.fallback === true,
+            });
         }
         setting.succeed();
         // Restart functions & sites

package/cli/local/server.js

@@ -105,7 +105,11 @@ export async function useLocalServer(opts) {
     const sockets = new Set();
     let invocations = [];
     function publish(invocation) {
-        invocations.push(invocation);
+        const index = invocations.findLastIndex((i) => i.id === invocation.id);
+        if (index < 0)
+            invocations.push(invocation);
+        else
+            invocations[index] = invocation;
         const json = JSON.stringify({
             type: "invocation",
             properties: [invocation],
@@ -234,7 +238,7 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("worker.stdout", (evt) => {
-        const invocation = invocations.findLast((i) => i.source === evt.properties.functionID);
+        const invocation = invocations.findLast((i) => i.id === evt.properties.requestID);
         if (invocation) {
             invocation.logs.push({
                 id: Math.random().toString(),
@@ -254,7 +258,7 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("function.success", (evt) => {
-        const invocation = invocations.findLast((i) => i.source === evt.properties.functionID);
+        const invocation = invocations.findLast((i) => i.id === evt.properties.requestID);
         if (invocation) {
             invocation.end = Date.now();
             invocation.report = {
@@ -278,7 +282,7 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("function.error", (evt) => {
-        const invocation = invocations.findLast((i) => i.source === evt.properties.functionID);
+        const invocation = invocations.findLast((i) => i.id === evt.properties.requestID);
         if (invocation) {
             invocation.errors.push({
                 id: invocation.id,

package/node/api/index.js

@@ -75,6 +75,7 @@ export const usePath = /* @__PURE__ */ memo(() => {
     return evt.rawPath.split("/").filter(Boolean);
 });
 export const useResponse = /* @__PURE__ */ memo(() => {
+    useEvent("api");
     const response = {
         headers: {},
         cookies: [],

package/node/future/auth/handler.js

@@ -195,7 +195,6 @@ export function AuthHandler(input) {
                     };
                 },
             });
-            console.log("onSuccess", onSuccess);
             if (onSuccess.type === "session") {
                 const { type, properties, ...rest } = onSuccess.properties;
                 // @ts-expect-error

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.26.4",
+  "version": "2.26.6",
   "bin": {
     "sst": "cli/sst.js"
   },