sst 2.25.6 → 2.26.1

package/iot.js

@@ -1,8 +1,7 @@
 import { IoTClient, DescribeEndpointCommand } from "@aws-sdk/client-iot";
-import { Context } from "./context/context.js";
 import { useAWSClient, useAWSCredentials } from "./credentials.js";
 import { VisibleError } from "./error.js";
-export const useIOTEndpoint = Context.memo(async () => {
+export const useIOTEndpoint = lazy(async () => {
     const iot = useAWSClient(IoTClient);
     Logger.debug("Getting IoT endpoint");
     const response = await iot.send(new DescribeEndpointCommand({
@@ -19,7 +18,8 @@ import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
 import { useBootstrap } from "./bootstrap.js";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-export const useIOT = Context.memo(async () => {
+import { lazy } from "./util/lazy.js";
+export const useIOT = lazy(async () => {
     const bus = useBus();
     const endpoint = await useIOTEndpoint();
     const creds = await useAWSCredentials();

package/logger.js

@@ -1,9 +1,9 @@
 import fs from "fs";
 import path from "path";
-import { Context } from "./context/context.js";
 import { useProject } from "./project.js";
+import { lazy } from "./util/lazy.js";
 let previous = new Date();
-const useFile = Context.memo(() => {
+const useFile = lazy(() => {
     const project = useProject();
     const filePath = path.join(project.paths.out, "debug.log");
     const file = fs.createWriteStream(filePath);

package/node/actor/index.d.ts

@@ -10,10 +10,10 @@ export declare function createActors<T extends Definition>(): {
         type: "public";
         properties: {};
     };
-    provideActor: (value: T | {
+    withActor: <R>(value: T | {
         type: "public";
         properties: {};
-    }) => void;
+    }, cb: () => R) => R;
     assertActor<T_1 extends (T | {
         type: "public";
         properties: {};

package/node/actor/index.js

@@ -1,12 +1,12 @@
-import { Context } from "../../context/context.js";
+import { create } from "../../context/context2.js";
 import { SSTError } from "../../util/error.js";
 export class WrongActorError extends SSTError {
 }
 export function createActors() {
-    const ctx = Context.create();
+    const ctx = create("Actors");
     return {
         useActor: ctx.use,
-        provideActor: ctx.provide,
+        withActor: ctx.with,
         assertActor(type) {
             const actor = ctx.use();
             if (actor.type === type)

package/node/api/index.js

@@ -1,6 +1,6 @@
 import { createProxy } from "../util/index.js";
-import { Context } from "../../context/context.js";
 import { useEvent, Handler, useContextType, } from "../../context/handler.js";
+import { memo } from "../../context/context2.js";
 export const Api = /* @__PURE__ */ createProxy("Api");
 export const AppSyncApi = 
 /* @__PURE__ */ createProxy("AppSyncApi");
@@ -38,7 +38,7 @@ export function ApiHandler(cb) {
         return serialized;
     });
 }
-export const useCookies = /* @__PURE__ */ Context.memo(() => {
+export const useCookies = /* @__PURE__ */ memo(() => {
     const evt = useEvent("api");
     const cookies = evt.cookies || [];
     return Object.fromEntries(cookies.map((c) => c.split("=")).map(([k, v]) => [k, decodeURIComponent(v)]));
@@ -47,7 +47,7 @@ export function useCookie(name) {
     const cookies = useCookies();
     return cookies[name];
 }
-export const useBody = /* @__PURE__ */ Context.memo(() => {
+export const useBody = /* @__PURE__ */ memo(() => {
     const type = useContextType();
     const evt = useEvent(type);
     if (!evt.body)
@@ -57,24 +57,24 @@ export const useBody = /* @__PURE__ */ Context.memo(() => {
         : evt.body;
     return body;
 });
-export const useJsonBody = /* @__PURE__ */ Context.memo(() => {
+export const useJsonBody = /* @__PURE__ */ memo(() => {
     const body = useBody();
     if (!body)
         return;
     return JSON.parse(body);
 });
-export const useFormData = /* @__PURE__ */ Context.memo(() => {
+export const useFormData = /* @__PURE__ */ memo(() => {
     const body = useBody();
     if (!body)
         return;
     const params = new URLSearchParams(body);
     return params;
 });
-export const usePath = /* @__PURE__ */ Context.memo(() => {
+export const usePath = /* @__PURE__ */ memo(() => {
     const evt = useEvent("api");
     return evt.rawPath.split("/").filter(Boolean);
 });
-export const useResponse = /* @__PURE__ */ Context.memo(() => {
+export const useResponse = /* @__PURE__ */ memo(() => {
     const response = {
         headers: {},
         cookies: [],

package/node/auth/session.js

@@ -1,5 +1,5 @@
 import { createSigner, createVerifier } from "fast-jwt";
-import { Context } from "../../context/context.js";
+import { Context } from "../../context/context2.js";
 import { useCookie, useHeader } from "../api/index.js";
 import { getPrivateKey, getPublicKey } from "./auth.js";
 import { useContextType } from "../../context/handler.js";

package/node/event-bus/index.js

@@ -13,7 +13,6 @@ export function createEventBuilder(props) {
             ? z.object(props.metadata)
             : undefined;
         const publish = async (properties, metadata) => {
-            console.log("publishing", type, properties);
             const result = await useLoader("sst.bus.publish", async (input) => {
                 const size = 10;
                 const promises = [];

package/node/future/auth/session.js

@@ -1,5 +1,5 @@
 import { createSigner, createVerifier } from "fast-jwt";
-import { Context } from "../../../context/context.js";
+import { Context } from "../../../context/context2.js";
 import { useCookie, useHeader } from "../../api/index.js";
 import { Auth } from "../../auth/index.js";
 import { Config } from "../../config/index.js";

package/node/util/loader.js

@@ -1,8 +1,8 @@
-import { Context } from "../../context/context.js";
-const LoaderContext = Context.create(() => {
+import { Context } from "../../context/context2.js";
+const LoaderContext = Context.memo(() => {
     const loaders = new Map();
     return loaders;
-}, "loader-context");
+});
 export function createLoader(batchFn) {
     let current;
     async function run() {
@@ -41,7 +41,7 @@ export function createLoader(batchFn) {
     };
 }
 export function useLoader(key, batchFn) {
-    const loaders = LoaderContext.use();
+    const loaders = LoaderContext();
     if (loaders.has(key)) {
         return loaders.get(key);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.25.6",
+  "version": "2.26.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -32,23 +32,23 @@
     "@aws-cdk/cloudformation-diff": "2.95.1",
     "@aws-cdk/cx-api": "2.95.1",
     "@aws-crypto/sha256-js": "^5.0.0",
-    "@aws-sdk/client-cloudformation": "^3.279.0",
-    "@aws-sdk/client-ecs": "^3.279.0",
-    "@aws-sdk/client-eventbridge": "^3.342.0",
-    "@aws-sdk/client-iam": "^3.279.0",
-    "@aws-sdk/client-iot": "^3.279.0",
-    "@aws-sdk/client-iot-data-plane": "^3.279.0",
-    "@aws-sdk/client-lambda": "^3.279.0",
-    "@aws-sdk/client-rds-data": "^3.279.0",
-    "@aws-sdk/client-s3": "^3.279.0",
-    "@aws-sdk/client-ssm": "^3.279.0",
-    "@aws-sdk/client-sts": "^3.279.0",
-    "@aws-sdk/config-resolver": "^3.272.0",
-    "@aws-sdk/credential-providers": "^3.279.0",
-    "@aws-sdk/middleware-retry": "^3.272.0",
-    "@aws-sdk/middleware-signing": "^3.272.0",
-    "@aws-sdk/signature-v4-crt": "^3.272.0",
-    "@aws-sdk/smithy-client": "^3.279.0",
+    "@aws-sdk/client-cloudformation": "^3.405.0",
+    "@aws-sdk/client-ecs": "^3.405.0",
+    "@aws-sdk/client-eventbridge": "^3.405.0",
+    "@aws-sdk/client-iam": "^3.405.0",
+    "@aws-sdk/client-iot": "^3.405.0",
+    "@aws-sdk/client-iot-data-plane": "^3.405.0",
+    "@aws-sdk/client-lambda": "^3.405.0",
+    "@aws-sdk/client-rds-data": "^3.405.0",
+    "@aws-sdk/client-s3": "^3.405.0",
+    "@aws-sdk/client-ssm": "^3.405.0",
+    "@aws-sdk/client-sts": "^3.405.0",
+    "@aws-sdk/config-resolver": "^3.374.0",
+    "@aws-sdk/credential-providers": "^3.405.0",
+    "@aws-sdk/middleware-retry": "^3.374.0",
+    "@aws-sdk/middleware-signing": "^3.398.0",
+    "@aws-sdk/signature-v4-crt": "^3.398.0",
+    "@aws-sdk/smithy-client": "^3.374.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@babel/plugin-syntax-typescript": "^7.21.4",
@@ -103,6 +103,7 @@
     "@aws-sdk/types": "^3.272.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
+    "@smithy/types": "^2.2.2",
     "@tsconfig/node16": "^1.0.3",
     "@types/adm-zip": "^0.5.0",
     "@types/aws-iot-device-sdk": "^2.2.4",
@@ -119,7 +120,7 @@
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
     "tsx": "^3.12.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.2.2",
     "vitest": "^0.33.0"
   },
   "peerDependencies": {

package/project.d.ts

@@ -57,11 +57,6 @@ interface Project {
     metafile: Metafile;
     stacks: SSTConfig["stacks"];
 }
-export declare const ProjectContext: {
-    use(): Project;
-    reset(): void;
-    provide(value: Project): void;
-};
 export declare function useProject(): Project;
 interface GlobalOptions {
     profile?: string;

package/project.js

@@ -4,7 +4,6 @@ import path from "path";
 import url from "url";
 import os from "os";
 import { Logger } from "./logger.js";
-import { Context } from "./context/context.js";
 import { VisibleError } from "./error.js";
 import { blue } from "colorette";
 import dotenv from "dotenv";
@@ -13,9 +12,11 @@ const DEFAULTS = {
     stage: undefined,
     ssmPrefix: undefined,
 };
-export const ProjectContext = Context.create("Project");
+let project;
 export function useProject() {
-    return ProjectContext.use();
+    if (!project)
+        throw new Error("Project not initialized");
+    return project;
 }
 const CONFIG_EXTENSIONS = [
     ".config.ts",
@@ -73,7 +74,7 @@ export async function initProject(globals) {
             return ["unknown", "unknown"];
         }
     })();
-    const project = {
+    project = {
         version,
         cdkVersion,
         constructsVersion,
@@ -98,7 +99,6 @@ export async function initProject(globals) {
             artifacts: path.join(out, "artifacts"),
         },
     };
-    ProjectContext.provide(project);
     // Cleanup old config files
     (async function () {
         const files = await fs.readdir(project.paths.root);

package/runtime/handlers/python.js

@@ -1,12 +1,10 @@
 import path from "path";
 import { useRuntimeWorkers } from "../workers.js";
-import { exec, spawn } from "child_process";
-import { promisify } from "util";
+import { spawn } from "child_process";
 import { useRuntimeServerConfig } from "../server.js";
 import { findAbove, isChild } from "../../util/fs.js";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
 import { bundle } from "./pythonBundling.js";
-const execAsync = promisify(exec);
 import os from "os";
 import url from "url";
 const RUNTIME_MAP = {

package/runtime/handlers.js

@@ -1,4 +1,3 @@
-import { Context } from "../context/context.js";
 import { Logger } from "../logger.js";
 import path from "path";
 import fs from "fs/promises";
@@ -13,7 +12,8 @@ import { useGoHandler } from "./handlers/go.js";
 import { useJavaHandler } from "./handlers/java.js";
 import { usePythonHandler } from "./handlers/python.js";
 import { useRustHandler } from "./handlers/rust.js";
-export const useRuntimeHandlers = Context.memo(() => {
+import { lazy } from "../util/lazy.js";
+export const useRuntimeHandlers = lazy(() => {
     const handlers = [
         useNodeHandler(),
         useGoHandler(),
@@ -111,7 +111,7 @@ export const useRuntimeHandlers = Context.memo(() => {
     };
     return result;
 });
-export const useFunctionBuilder = Context.memo(() => {
+export const useFunctionBuilder = lazy(() => {
     const artifacts = new Map();
     const handlers = useRuntimeHandlers();
     const result = {

package/runtime/iot.js

@@ -1,7 +1,7 @@
-import { Context } from "../context/context.js";
 import { useBus } from "../bus.js";
 import { useIOT } from "../iot.js";
-export const useIOTBridge = Context.memo(async () => {
+import { lazy } from "../util/lazy.js";
+export const useIOTBridge = lazy(async () => {
     const bus = useBus();
     const iot = await useIOT();
     const topic = `${iot.prefix}/events`;

package/runtime/server.js

@@ -1,11 +1,11 @@
-import { Context } from "../context/context.js";
 import express from "express";
 import { useBus } from "../bus.js";
 import { Logger } from "../logger.js";
 import { useRuntimeWorkers } from "./workers.js";
 import https from "https";
 import getPort from "get-port";
-export const useRuntimeServerConfig = Context.memo(async () => {
+import { lazy } from "../util/lazy.js";
+export const useRuntimeServerConfig = lazy(async () => {
     const port = await getPort({
         port: 12557,
     });
@@ -15,7 +15,7 @@ export const useRuntimeServerConfig = Context.memo(async () => {
         url: `http://localhost:${port}`,
     };
 });
-export const useRuntimeServer = Context.memo(async () => {
+export const useRuntimeServer = lazy(async () => {
     const bus = useBus();
     const app = express();
     const workers = await useRuntimeWorkers();

package/runtime/workers.js

@@ -1,9 +1,9 @@
-import { Context } from "../context/context.js";
 import { useBus } from "../bus.js";
 import { useFunctionBuilder, useRuntimeHandlers } from "./handlers.js";
 import { useRuntimeServerConfig } from "./server.js";
 import { useFunctions } from "../constructs/Function.js";
-export const useRuntimeWorkers = Context.memo(async () => {
+import { lazy } from "../util/lazy.js";
+export const useRuntimeWorkers = lazy(async () => {
     const workers = new Map();
     const bus = useBus();
     const handlers = useRuntimeHandlers();

package/stacks/app-metadata.js

@@ -1,9 +1,9 @@
 import { useBootstrap } from "../bootstrap.js";
 import { useAWSCredentials } from "../credentials.js";
 import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, } from "@aws-sdk/client-s3";
-import { Context } from "../context/context.js";
 import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
+import { lazy } from "../util/lazy.js";
 async function metadata() {
     Logger.debug("Fetching app metadata");
     const [project, credentials, bootstrap] = await Promise.all([
@@ -69,8 +69,7 @@ function useS3Key() {
     const project = useProject();
     return `appMetadata/app.${project.config.name}/stage.${project.config.stage}.json`;
 }
-const MetadataContext = Context.create(async () => {
+export const useAppMetadata = lazy(async () => {
     const data = await metadata();
     return data;
 });
-export const useAppMetadata = MetadataContext.use;

package/stacks/metadata.d.ts

@@ -8,4 +8,4 @@ declare module "../bus.js" {
 }
 export declare function metadataForStack(stack: String): Promise<Metadata[] | undefined>;
 export declare function metadata(): Promise<Record<string, Metadata[]>>;
-export declare const useMetadata: () => Promise<Record<string, Metadata[]>>;
+export declare const useMetadataCache: () => Promise<Record<string, Metadata[]>>;

package/stacks/metadata.js

@@ -2,10 +2,10 @@ import { useBootstrap } from "../bootstrap.js";
 import { useAWSCredentials, } from "../credentials.js";
 import { S3Client, GetObjectCommand, ListObjectsV2Command, } from "@aws-sdk/client-s3";
 import { useCache } from "../cache.js";
-import { Context } from "../context/context.js";
 import { useBus } from "../bus.js";
 import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
+import { lazy } from "../util/lazy.js";
 export async function metadataForStack(stack) {
     const project = useProject();
     const [credentials, bootstrap] = await Promise.all([
@@ -57,20 +57,18 @@ export async function metadata() {
     Logger.debug("Fetched metadata from", list.KeyCount, "stacks");
     return result;
 }
-const MetadataContext = Context.create(async () => {
+export const useMetadataCache = lazy(async () => {
     const bus = useBus();
     const cache = await useCache();
     bus.subscribe("stacks.metadata.updated", async () => {
         const data = await metadata();
         await cache.write(`metadata.json`, JSON.stringify(data));
         bus.publish("stacks.metadata", data);
-        MetadataContext.provide(Promise.resolve(data));
     });
     bus.subscribe("stacks.metadata.deleted", async () => {
         const data = await metadata();
         await cache.write(`metadata.json`, JSON.stringify(data));
         bus.publish("stacks.metadata", data);
-        MetadataContext.provide(Promise.resolve(data));
     });
     while (true) {
         try {
@@ -83,4 +81,3 @@ const MetadataContext = Context.create(async () => {
         }
     }
 });
-export const useMetadata = MetadataContext.use;