@intelligems/sst 2.49.6-ig.6 → 2.49.6-ig.8

package/iot.d.ts

@@ -4,4 +4,35 @@ export declare const useIOT: () => Promise<{
     prefix: string;
     publish<Type extends keyof Events>(topic: string, type: Type, properties: Events[Type]): Promise<void>;
 }>;
+/**
+ * A second connection, carrying only small control messages.
+ *
+ * `useIOT` also carries response bodies. Those are fragmented into 50KB chunks
+ * and published at QoS 1, so every chunk waits on a broker round trip, and they
+ * queue on the same socket as everything else.
+ *
+ * `function.ack` cannot afford to wait behind them. The Lambda re-invokes if the
+ * ack does not arrive within two seconds, and each re-invocation re-runs the
+ * handler and puts another response body on the socket that is already busy —
+ * so a late ack makes the next ack later still. Measured on one machine before
+ * this change: ack publish went from 105ms to 10.2s inside a minute, publishes
+ * in flight from 15 to 439, and a single request executed fifteen times before
+ * the gateway returned 504 at 29s.
+ *
+ * Round-trip latency decides who sees it. A chunk costs a round trip to the
+ * region — roughly 90ms from Europe against 15ms from the US — so the same
+ * payload lands either side of the two second budget depending on where the
+ * developer sits.
+ *
+ * **The client id must differ from `useIOT`'s.** AWS IoT drops an existing
+ * connection when a new one presents the same id, so a shared id would make the
+ * two sockets disconnect each other in a loop.
+ *
+ * This connection deliberately does not subscribe. Inbound traffic still arrives
+ * on `useIOT`; this one only publishes.
+ */
+export declare const useIOTControl: () => Promise<{
+    prefix: string;
+    publish<Type extends keyof Events>(topic: string, type: Type, properties: Events[Type]): Promise<void>;
+}>;
 export declare const isSupported: () => boolean;

package/iot.js

@@ -189,6 +189,85 @@ export const useIOT = lazy(async () => {
         },
     };
 });
+/**
+ * A second connection, carrying only small control messages.
+ *
+ * `useIOT` also carries response bodies. Those are fragmented into 50KB chunks
+ * and published at QoS 1, so every chunk waits on a broker round trip, and they
+ * queue on the same socket as everything else.
+ *
+ * `function.ack` cannot afford to wait behind them. The Lambda re-invokes if the
+ * ack does not arrive within two seconds, and each re-invocation re-runs the
+ * handler and puts another response body on the socket that is already busy —
+ * so a late ack makes the next ack later still. Measured on one machine before
+ * this change: ack publish went from 105ms to 10.2s inside a minute, publishes
+ * in flight from 15 to 439, and a single request executed fifteen times before
+ * the gateway returned 504 at 29s.
+ *
+ * Round-trip latency decides who sees it. A chunk costs a round trip to the
+ * region — roughly 90ms from Europe against 15ms from the US — so the same
+ * payload lands either side of the two second budget depending on where the
+ * developer sits.
+ *
+ * **The client id must differ from `useIOT`'s.** AWS IoT drops an existing
+ * connection when a new one presents the same id, so a shared id would make the
+ * two sockets disconnect each other in a loop.
+ *
+ * This connection deliberately does not subscribe. Inbound traffic still arrives
+ * on `useIOT`; this one only publishes.
+ */
+export const useIOTControl = lazy(async () => {
+    const bus = useBus();
+    const endpoint = await useIOTEndpoint();
+    const creds = await useAWSCredentials();
+    const project = useProject();
+    const device = new iot.device({
+        protocol: "wss",
+        host: endpoint,
+        region: project.config.region,
+        accessKeyId: creds.accessKeyId,
+        secretKey: creds.secretAccessKey,
+        sessionToken: creds.sessionToken,
+        reconnectPeriod: 1,
+        keepalive: 60,
+        clientId: `sst-control-${Math.random().toString(16).slice(2)}`,
+    });
+    const PREFIX = `/sst/${project.config.name}/${project.config.stage}`;
+    device.on("connect", () => {
+        Logger.debug("IoT control connected");
+    });
+    device.on("error", (err) => {
+        Logger.debug("IoT control error", err);
+    });
+    device.on("close", () => {
+        Logger.debug("IoT control closed");
+    });
+    device.on("reconnect", () => {
+        Logger.debug("IoT control reconnecting...");
+    });
+    return {
+        prefix: PREFIX,
+        async publish(topic, type, properties) {
+            const payload = {
+                type,
+                properties,
+                sourceID: bus.sourceID,
+            };
+            // Control messages sit far below the fragment size, but the envelope has
+            // to match what the Lambda reassembles, so it is built the same way
+            // rather than assumed to be a single part.
+            const json = JSON.stringify(payload);
+            const parts = json.match(/.{1,50000}/g) ?? [];
+            const id = Math.random().toString();
+            await Promise.all(parts.map((data, index) => new Promise((r) => {
+                device.publish(topic, JSON.stringify({ id, index, count: parts.length, data }), { qos: 1 }, () => {
+                    r();
+                });
+            })));
+            Logger.debug("IOT Control Published", topic, type);
+        },
+    };
+});
 export const isSupported = () => [
     "eu-central-1",
     "eu-west-1",

package/package.json

@@ -1,13 +1,19 @@
 {
   "sideEffects": false,
   "name": "@intelligems/sst",
-  "version": "2.49.6-ig.6",
+  "version": "2.49.6-ig.8",
   "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",
@@ -142,10 +148,5 @@
     "test": "test"
   },
   "keywords": [],
-  "author": "",
-  "scripts": {
-    "build": "node build.mjs && tsc",
-    "test": "vitest run",
-    "dev": "source .env && tsc-watch --onSuccess \"rsync -av dist/* ${TO} --checksum\""
-  }
-}
+  "author": ""
+}

package/runtime/iot.js

@@ -1,5 +1,5 @@
 import { useBus } from "../bus.js";
-import { useIOT } from "../iot.js";
+import { useIOT, useIOTControl } from "../iot.js";
 import { lazy } from "../util/lazy.js";
 import { logInvokeTrace } from "./worker-pool-logging.js";
 import { logIot } from "./debug-bridge-logging.js";
@@ -7,6 +7,9 @@ import { logEventTrace } from "./event-trace-logging.js";
 export const useIOTBridge = lazy(async () => {
     const bus = useBus();
     const iot = await useIOT();
+    // The ack goes out on its own socket so it can never queue behind a response
+    // body. See `useIOTControl`.
+    const control = await useIOTControl();
     const topic = `${iot.prefix}/events`;
     bus.subscribe("function.success", async (evt) => {
         const { workerID, requestID } = evt.properties;
@@ -27,7 +30,7 @@ export const useIOTBridge = lazy(async () => {
         logIot(`reqId=${requestID?.slice(0, 8)} Publishing function.ack to worker ${workerID.slice(0, 8)}`);
         logInvokeTrace("IOT_ACK_START", workerID, `worker=${workerID.slice(0, 8)}`);
         const startTime = Date.now();
-        await iot.publish(topic + "/" + workerID, "function.ack", evt.properties);
+        await control.publish(topic + "/" + workerID, "function.ack", evt.properties);
         const elapsed = Date.now() - startTime;
         logIot(`reqId=${requestID?.slice(0, 8)} function.ack published in ${elapsed}ms`);
         logInvokeTrace("IOT_ACK_DONE", workerID, `worker=${workerID.slice(0, 8)}`);

package/package.json.bak

@@ -1,156 +0,0 @@
-{
-  "publishConfig": {
-    "directory": "dist",
-    "access": "public"
-  },
-  "sideEffects": false,
-  "name": "@intelligems/sst",
-  "version": "2.49.6-ig.6",
-  "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": ""
-}