@intelligems/sst 2.49.6-ig.9 → 2.49.8-ig.2

package/support/nodejs-runtime/index.mjs

@@ -1,12 +1,21 @@
 import { createRequire as topLevelCreateRequire } from 'module';const require = topLevelCreateRequire(import.meta.url);
 
 // support/nodejs-runtime/index.ts
-import { workerData } from "node:worker_threads";
+import { workerData, parentPort } from "node:worker_threads";
+import { AsyncLocalStorage } from "node:async_hooks";
 import path from "path";
 import fs from "fs";
 import http from "http";
 import url from "url";
 import os from "os";
+
+// src/runtime/stdout-attribution.ts
+var MARK = "";
+function tagLine(requestID, line) {
+  return `${MARK}${requestID}${MARK}${line}`;
+}
+
+// support/nodejs-runtime/index.ts
 try {
   const mod = await import("node:module");
   if (typeof mod.enableCompileCache === "function") {
@@ -16,6 +25,97 @@ try {
 } catch {
 }
 var input = workerData;
+var concurrency = Math.max(1, input.concurrency ?? 1);
+var invocation = new AsyncLocalStorage();
+var baseEnv = { ...process.env };
+function currentEnv() {
+  return invocation.getStore()?.env ?? baseEnv;
+}
+process.env = new Proxy(baseEnv, {
+  get(_, key) {
+    if (typeof key !== "string")
+      return void 0;
+    const store = invocation.getStore();
+    if (store && key in store.env)
+      return store.env[key];
+    return baseEnv[key];
+  },
+  set(_, key, value) {
+    if (typeof key !== "string")
+      return false;
+    currentEnv()[key] = value === void 0 ? void 0 : String(value);
+    return true;
+  },
+  has(_, key) {
+    if (typeof key !== "string")
+      return false;
+    const store = invocation.getStore();
+    return store !== void 0 && key in store.env || key in baseEnv;
+  },
+  deleteProperty(_, key) {
+    if (typeof key !== "string")
+      return false;
+    delete currentEnv()[key];
+    return true;
+  },
+  ownKeys() {
+    const store = invocation.getStore();
+    return [.../* @__PURE__ */ new Set([...Object.keys(baseEnv), ...store ? Object.keys(store.env) : []])];
+  },
+  getOwnPropertyDescriptor(_, key) {
+    if (typeof key !== "string")
+      return void 0;
+    const store = invocation.getStore();
+    const value = store && key in store.env ? store.env[key] : baseEnv[key];
+    if (value === void 0 && !(store && key in store.env) && !(key in baseEnv))
+      return void 0;
+    return { value, writable: true, enumerable: true, configurable: true };
+  }
+});
+for (const method of ["log", "info", "warn", "error", "debug", "trace"]) {
+  const original = console[method].bind(console);
+  console[method] = (...args) => {
+    const store = invocation.getStore();
+    if (!store)
+      return original(...args);
+    const text = args.map((a) => typeof a === "string" ? a : safeFormat(a)).join(" ");
+    const tagged = text.split("\n").map((line) => tagLine(store.requestID, line)).join("\n");
+    return original(tagged);
+  };
+}
+function safeFormat(value) {
+  if (value instanceof Error)
+    return value.stack ?? value.message;
+  if (typeof value === "object" && value !== null) {
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return String(value);
+    }
+  }
+  return String(value);
+}
+var lastMemoryReport = 0;
+function reportMemory(phase, loadMs) {
+  if (!input.debugMemory || !parentPort)
+    return;
+  const now = Date.now();
+  if (phase === "response" && now - lastMemoryReport < 5e3)
+    return;
+  lastMemoryReport = now;
+  const usage = process.memoryUsage();
+  parentPort.postMessage({
+    type: "sst.memory",
+    report: {
+      rss: usage.rss,
+      heapUsed: usage.heapUsed,
+      heapTotal: usage.heapTotal,
+      external: usage.external,
+      phase,
+      loadMs
+    }
+  });
+}
 var monoBundlePath = path.join(input.out, "index.mjs");
 var useMonoBundle = input.isMonoBuild ?? (input.handler === "index.handler" && fs.existsSync(monoBundlePath));
 var file;
@@ -35,7 +135,7 @@ if (useMonoBundle) {
 var fn;
 function fetch(req) {
   return new Promise((resolve, reject) => {
-    const request2 = http.request(
+    const request = http.request(
       input.url + req.path,
       {
         headers: req.headers,
@@ -56,12 +156,13 @@ function fetch(req) {
         });
       }
     );
-    request2.on("error", reject);
+    request.on("error", reject);
     if (req.body)
-      request2.write(req.body);
-    request2.end();
+      request.write(req.body);
+    request.end();
   });
 }
+var loadStart = Date.now();
 try {
   const { href } = url.pathToFileURL(file);
   const mod = await import(href);
@@ -71,9 +172,6 @@ try {
       useMonoBundle ? `Mono-bundle handler "${handlerName}" not found in "${file}". Found: ${Object.keys(mod).join(", ")}` : `Function "${handlerName}" not found in "${input.handler}". Found: ${Object.keys(mod).join(", ")}`
     );
   }
-  if (useMonoBundle && mod.warmUp) {
-    await mod.warmUp();
-  }
 } catch (ex) {
   await fetch({
     path: `/runtime/init/error`,
@@ -89,11 +187,19 @@ try {
   });
   process.exit(1);
 }
-var timeout;
-var request;
-var response;
-var context;
-async function error(ex) {
+reportMemory("loaded", Date.now() - loadStart);
+var idleTimer;
+function armIdleExit() {
+  if (idleTimer)
+    clearTimeout(idleTimer);
+  idleTimer = setTimeout(() => {
+    process.exit(0);
+  }, 1e3 * 60 * 15);
+}
+var lastContext;
+async function postError(context, ex) {
+  if (!context)
+    return;
   await fetch({
     path: `/runtime/invocation/${context.awsRequestId}/error`,
     method: "POST",
@@ -101,102 +207,110 @@ async function error(ex) {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({
-      errorType: ex.name ?? "Error",
-      errorMessage: ex.message,
-      trace: ex.stack?.split("\n")
+      errorType: ex?.name ?? "Error",
+      errorMessage: ex?.message ?? String(ex),
+      trace: ex?.stack?.split("\n")
     })
   });
 }
-process.on("unhandledRejection", error);
-while (true) {
-  if (timeout)
-    clearTimeout(timeout);
-  timeout = setTimeout(() => {
-    process.exit(0);
-  }, 1e3 * 60 * 15);
-  try {
-    const result = await fetch({
-      path: `/runtime/invocation/next`,
-      method: "GET",
-      headers: {}
-    });
-    const sstFunctionId = result.headers["lambda-runtime-sst-function-id"];
-    if (sstFunctionId) {
-      process.env.SST_FUNCTION_ID = sstFunctionId;
-    }
-    const parsed = JSON.parse(result.body);
-    const invocationEnv = parsed.env;
-    if (invocationEnv && typeof invocationEnv === "object") {
-      Object.assign(process.env, invocationEnv);
-    }
-    context = {
-      awsRequestId: result.headers["lambda-runtime-aws-request-id"],
-      invokedFunctionArn: result.headers["lambda-runtime-invoked-function-arn"],
-      getRemainingTimeInMillis: () => Math.max(
-        Number(result.headers["lambda-runtime-deadline-ms"]) - Date.now(),
-        0
-      ),
-      // If identity is null, we want to mimick AWS behavior and return undefined
-      identity: JSON.parse(result.headers["lambda-runtime-cognito-identity"]) ?? void 0,
-      // If clientContext is null, we want to mimick AWS behavior and return undefined
-      clientContext: JSON.parse(result.headers["lambda-runtime-client-context"]) ?? void 0,
-      // Per-invocation function context from headers (essential for mono-build shared workers)
-      functionName: result.headers["lambda-runtime-function-name"] || process.env.AWS_LAMBDA_FUNCTION_NAME,
-      functionVersion: result.headers["lambda-runtime-function-version"] || process.env.AWS_LAMBDA_FUNCTION_VERSION,
-      memoryLimitInMB: result.headers["lambda-runtime-function-memory-size"] || process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE,
-      logGroupName: result.headers["lambda-runtime-log-group-name"],
-      logStreamName: result.headers["lambda-runtime-log-stream-name"],
-      callbackWaitsForEmptyEventLoop: {
-        set value(_value) {
+process.on("unhandledRejection", (ex) => {
+  void postError(lastContext, ex);
+});
+async function runLoop() {
+  while (true) {
+    armIdleExit();
+    let context;
+    let event;
+    let env = {};
+    try {
+      const result = await fetch({
+        path: `/runtime/invocation/next`,
+        method: "GET",
+        headers: {}
+      });
+      const parsed = JSON.parse(result.body);
+      if (parsed.env && typeof parsed.env === "object") {
+        env = { ...parsed.env };
+      }
+      const sstFunctionId = result.headers["lambda-runtime-sst-function-id"];
+      if (sstFunctionId) {
+        env.SST_FUNCTION_ID = sstFunctionId;
+      }
+      context = {
+        awsRequestId: result.headers["lambda-runtime-aws-request-id"],
+        invokedFunctionArn: result.headers["lambda-runtime-invoked-function-arn"],
+        getRemainingTimeInMillis: () => Math.max(
+          Number(result.headers["lambda-runtime-deadline-ms"]) - Date.now(),
+          0
+        ),
+        // If identity is null, we want to mimick AWS behavior and return undefined
+        identity: JSON.parse(result.headers["lambda-runtime-cognito-identity"]) ?? void 0,
+        // If clientContext is null, we want to mimick AWS behavior and return undefined
+        clientContext: JSON.parse(result.headers["lambda-runtime-client-context"]) ?? void 0,
+        // Per-invocation function context from headers (essential for mono-build shared workers)
+        functionName: result.headers["lambda-runtime-function-name"] || env.AWS_LAMBDA_FUNCTION_NAME,
+        functionVersion: result.headers["lambda-runtime-function-version"] || env.AWS_LAMBDA_FUNCTION_VERSION,
+        memoryLimitInMB: result.headers["lambda-runtime-function-memory-size"] || env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE,
+        logGroupName: result.headers["lambda-runtime-log-group-name"],
+        logStreamName: result.headers["lambda-runtime-log-stream-name"],
+        callbackWaitsForEmptyEventLoop: {
+          set value(_value) {
+            throw new Error(
+              "`callbackWaitsForEmptyEventLoop` on lambda Context is not implemented by SST Live Lambda Development."
+            );
+          },
+          get value() {
+            return true;
+          }
+        }.value,
+        done() {
           throw new Error(
-            "`callbackWaitsForEmptyEventLoop` on lambda Context is not implemented by SST Live Lambda Development."
+            "`done` on lambda Context is not implemented by SST Live Lambda Development."
           );
         },
-        get value() {
-          return true;
+        fail() {
+          throw new Error(
+            "`fail` on lambda Context is not implemented by SST Live Lambda Development."
+          );
+        },
+        succeed() {
+          throw new Error(
+            "`succeed` on lambda Context is not implemented by SST Live Lambda Development."
+          );
         }
-      }.value,
-      done() {
-        throw new Error(
-          "`done` on lambda Context is not implemented by SST Live Lambda Development."
-        );
-      },
-      fail() {
-        throw new Error(
-          "`fail` on lambda Context is not implemented by SST Live Lambda Development."
-        );
-      },
-      succeed() {
-        throw new Error(
-          "`succeed` on lambda Context is not implemented by SST Live Lambda Development."
-        );
-      }
-    };
-    request = parsed.event;
-  } catch {
-    continue;
-  }
-  global[Symbol.for("aws.lambda.runtime.requestId")] = context.awsRequestId;
-  try {
-    response = await fn(request, context);
-  } catch (ex) {
-    error(ex);
-    continue;
-  }
-  while (true) {
+      };
+      event = parsed.event;
+    } catch {
+      continue;
+    }
+    Object.assign(baseEnv, env);
+    lastContext = context;
+    global[Symbol.for("aws.lambda.runtime.requestId")] = context.awsRequestId;
+    const store = { requestID: context.awsRequestId, env };
+    let response;
     try {
-      await fetch({
-        path: `/runtime/invocation/${context.awsRequestId}/response`,
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(response)
-      });
-      break;
+      response = await invocation.run(store, () => fn(event, context));
     } catch (ex) {
-      console.error(ex);
-      await new Promise((resolve) => setTimeout(resolve, 500));
+      await postError(context, ex);
+      continue;
+    }
+    while (true) {
+      try {
+        await fetch({
+          path: `/runtime/invocation/${context.awsRequestId}/response`,
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(response)
+        });
+        break;
+      } catch (ex) {
+        console.error(ex);
+        await new Promise((resolve) => setTimeout(resolve, 500));
+      }
     }
+    reportMemory("response");
   }
 }
+await Promise.all(Array.from({ length: concurrency }, () => runLoop()));

package/watcher.js

@@ -15,6 +15,8 @@ export const useWatcher = lazy(() => {
             "**/node_modules/**",
             "**/.build/**",
             "**/.sst/**",
+            "**/.mono-build/**",
+            "**/cdk.out/**",
             "**/.git/**",
             "**/debug.log",
         ],

package/README.md

@@ -1,43 +0,0 @@
-# sst
-
-[SST](https://sst.dev) makes it easy to build modern full-stack applications on AWS.
-
-The `sst` package is made up of the following.
-
-- [`sst`](https://docs.sst.dev/packages/sst) CLI
-- [`sst/node`](https://docs.sst.dev/clients) Node.js client
-- [`sst/constructs`](https://docs.sst.dev/constructs) CDK constructs
-
-## Installation
-
-Install the `sst` package in your project root.
-
-```bash
-npm install sst --save-exact
-```
-
-## Usage
-
-Once installed, you can run the CLI commands using.
-
-```bash
-npx sst <command>
-```
-
-Import the Node.js client in your functions. For example, you can import the `Bucket` client.
-
-```ts
-import { Bucket } from "sst/node/bucket";
-```
-
-And import the constructs you need in your stacks code. For example, you can add an API.
-
-```ts
-import { Api } from "sst/constructs";
-```
-
-For more details, [head over to our docs](https://docs.sst.dev).
-
----
-
-**Join our community** [Discord](https://sst.dev/discord) | [YouTube](https://www.youtube.com/c/sst-dev) | [Twitter](https://twitter.com/SST_dev)

package/package.json.bak

@@ -1,156 +0,0 @@
-{
-  "publishConfig": {
-    "directory": "dist",
-    "access": "public"
-  },
-  "sideEffects": false,
-  "name": "@intelligems/sst",
-  "version": "2.49.6-ig.9",
-  "bin": {
-    "sst": "cli/sst.js"
-  },
-  "description": "A CLI to help deploy SST apps.",
-  "type": "module",
-  "license": "MIT",
-  "scripts": {
-    "prepare": "",
-    "build": "node build.mjs && tsc",
-    "test": "vitest run",
-    "dev": "source .env && tsc-watch --onSuccess \"rsync -av dist/* ${TO} --checksum\""
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sst/v2.git",
-    "directory": "packages/cli"
-  },
-  "exports": {
-    "./constructs/deprecated": "./constructs/deprecated/index.js",
-    "./constructs/future": "./constructs/future/index.js",
-    "./constructs": "./constructs/index.js",
-    "./context": "./context/index.js",
-    "./node/future/*": "./node/future/*/index.js",
-    "./node/*": "./node/*/index.js",
-    ".": "./index.js",
-    "./*": "./*"
-  },
-  "homepage": "https://sst.dev",
-  "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "2.201.0-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "44.5.0",
-    "@aws-cdk/cloudformation-diff": "2.182.0",
-    "@aws-cdk/cx-api": "2.201.0",
-    "@aws-cdk/toolkit-lib": "1.1.1",
-    "@aws-crypto/sha256-js": "^5.2.0",
-    "@aws-sdk/client-cloudformation": "3.699.0",
-    "@aws-sdk/client-ecs": "3.699.0",
-    "@aws-sdk/client-eventbridge": "3.699.0",
-    "@aws-sdk/client-iam": "3.699.0",
-    "@aws-sdk/client-iot": "3.699.0",
-    "@aws-sdk/client-iot-data-plane": "3.699.0",
-    "@aws-sdk/client-lambda": "3.699.0",
-    "@aws-sdk/client-rds-data": "3.699.0",
-    "@aws-sdk/client-s3": "3.699.0",
-    "@aws-sdk/client-ssm": "3.699.0",
-    "@aws-sdk/client-sts": "3.699.0",
-    "@aws-sdk/config-resolver": "3.374.0",
-    "@aws-sdk/credential-providers": "3.699.0",
-    "@aws-sdk/middleware-retry": "3.374.0",
-    "@aws-sdk/middleware-signing": "3.451.0",
-    "@aws-sdk/signature-v4-crt": "3.451.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",
-    "@smithy/signature-v4": "2.0.16",
-    "@trpc/server": "9.18.0",
-    "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.201.0",
-    "aws-iot-device-sdk": "^2.2.13",
-    "aws-sdk": "^2.1501.0",
-    "builtin-modules": "3.2.0",
-    "cdk-assets": "3.3.1",
-    "chalk": "^5.2.0",
-    "chokidar": "^3.5.3",
-    "ci-info": "^3.7.0",
-    "colorette": "^2.0.19",
-    "conf": "^10.2.0",
-    "constructs": "10.3.0",
-    "cross-spawn": "^7.0.3",
-    "dendriform-immer-patch-optimiser": "^2.1.0",
-    "dotenv": "^16.0.3",
-    "esbuild": "0.18.13",
-    "express": "^4.18.2",
-    "fast-jwt": "^5.0.5",
-    "get-port": "^6.1.2",
-    "glob": "^10.0.0",
-    "graphql": "*",
-    "graphql-yoga": "^3.9.0",
-    "immer": "9",
-    "ink": "^4.0.0",
-    "ink-spinner": "^5.0.0",
-    "kysely": "^0.25.0",
-    "kysely-codegen": "^0.10.1",
-    "kysely-data-api": "^0.2.1",
-    "minimatch": "^6.1.6",
-    "openid-client": "^5.1.8",
-    "ora": "^6.1.2",
-    "react": "^18.0.0",
-    "remeda": "^1.3.0",
-    "tree-kill": "^1.2.2",
-    "undici": "^5.12.0",
-    "uuid": "^9.0.0",
-    "ws": "^8.11.0",
-    "yargs": "^17.6.2",
-    "zod": "^3.21.4"
-  },
-  "devDependencies": {
-    "dotenv-cli": "^8.0.0",
-    "@aws-sdk/client-api-gateway": "3.699.0",
-    "@aws-sdk/client-cloudfront": "3.699.0",
-    "@aws-sdk/client-codebuild": "3.699.0",
-    "@aws-sdk/client-sqs": "3.699.0",
-    "@aws-sdk/types": "3.451.0",
-    "@graphql-tools/merge": "^8.3.16",
-    "@sls-next/lambda-at-edge": "^3.7.0",
-    "@smithy/types": "4.1.0",
-    "@tsconfig/node16": "^1.0.3",
-    "@tsconfig/node18": "^18.2.2",
-    "@types/adm-zip": "^0.5.0",
-    "@types/async": "^3.2.24",
-    "@types/aws-iot-device-sdk": "^2.2.8",
-    "@types/aws-lambda": "^8.10.128",
-    "@types/babel__core": "^7.1.20",
-    "@types/babel__generator": "^7.6.4",
-    "@types/cross-spawn": "^6.0.2",
-    "@types/express": "^4.17.14",
-    "@types/node": "22.13.14",
-    "@types/react": "^18.0.28",
-    "@types/uuid": "^8.3.4",
-    "@types/ws": "8.5.3",
-    "@types/yargs": "^17.0.13",
-    "archiver": "^5.3.1",
-    "astro-sst": "2.45.1",
-    "async": "^3.2.4",
-    "tsx": "^3.12.1",
-    "typescript": "5.2.2",
-    "vitest": "^0.33.0",
-    "tsc-watch": "^6.2.1"
-  },
-  "peerDependencies": {
-    "@sls-next/lambda-at-edge": "^3.7.0"
-  },
-  "peerDependenciesMeta": {
-    "@sls-next/lambda-at-edge": {
-      "optional": true
-    }
-  },
-  "bugs": {
-    "url": "https://github.com/sst/v2/issues"
-  },
-  "main": "index.js",
-  "directories": {
-    "test": "test"
-  },
-  "keywords": [],
-  "author": ""
-}