sst 2.1.5 → 2.1.7

package/cli/commands/update.js

@@ -64,7 +64,9 @@ export const update = (program) => program.command("update [version]", "Update y
                 deps[pkg] = desired;
             }
         }
-        await fs.writeFile(file, JSON.stringify(data, null, 2));
+        if (results.has(file)) {
+            await fs.writeFile(file, JSON.stringify(data, null, 2));
+        }
     });
     await Promise.all(tasks);
     if (results.size === 0) {

package/iot.d.ts

@@ -2,5 +2,5 @@ export declare const useIOTEndpoint: () => Promise<string>;
 import { Events } from "./bus.js";
 export declare const useIOT: () => Promise<{
     prefix: string;
-    publish<Type extends keyof Events>(topic: string, type: Type, properties: Events[Type]): void;
+    publish<Type extends keyof Events>(topic: string, type: Type, properties: Events[Type]): Promise<void>;
 }>;

package/iot.js

@@ -22,6 +22,35 @@ export const useIOT = Context.memo(async () => {
     const endpoint = await useIOTEndpoint();
     const creds = await useAWSCredentials();
     const project = useProject();
+    /*
+    console.log(endpoint, creds);
+    const config =
+      iotsdk.iot.AwsIotMqttConnectionConfigBuilder.new_with_websockets({
+        region: project.config.region!,
+        credentials_provider: iotsdk.auth.AwsCredentialsProvider.newStatic(
+          creds.accessKeyId,
+          creds.secretAccessKey,
+          creds.sessionToken
+        ),
+      })
+        .with_client_id(randomUUID())
+        .with_endpoint(endpoint)
+        .build();
+    console.log(config);
+  
+    const device2 = new iotsdk.mqtt.MqttClient();
+    const conn = device2.new_connection(config);
+    conn.on("connect", () => {
+      console.log("CONNECTED");
+    });
+    conn.on("error", console.log);
+    conn.on("connect", console.log);
+    conn.on("resume", console.log);
+    conn.on("message", console.log);
+    conn.on("disconnect", console.log);
+    conn.connect();
+    console.log(device2);
+    */
     const device = new iot.device({
         protocol: "wss",
         host: endpoint,
@@ -29,9 +58,10 @@ export const useIOT = Context.memo(async () => {
         accessKeyId: creds.accessKeyId,
         secretKey: creds.secretAccessKey,
         sessionToken: creds.sessionToken,
+        reconnectPeriod: 1,
     });
     const PREFIX = `/sst/${project.config.name}/${project.config.stage}`;
-    device.subscribe(`${PREFIX}/events`);
+    device.subscribe(`${PREFIX}/events`, { qos: 1 });
     const fragments = new Map();
     device.on("connect", () => {
         Logger.debug("IoT connected");
@@ -39,6 +69,12 @@ export const useIOT = Context.memo(async () => {
     device.on("error", (err) => {
         Logger.debug("IoT error", err);
     });
+    device.on("close", () => {
+        Logger.debug("IoT closed");
+    });
+    device.on("reconnect", () => {
+        Logger.debug("IoT reconnected");
+    });
     device.on("message", (_topic, buffer) => {
         const fragment = JSON.parse(buffer.toString());
         if (!fragment.id) {
@@ -65,17 +101,22 @@ export const useIOT = Context.memo(async () => {
     });
     return {
         prefix: PREFIX,
-        publish(topic, type, properties) {
+        async publish(topic, type, properties) {
             const payload = {
                 type,
                 properties,
                 sourceID: bus.sourceID,
             };
             for (const fragment of encode(payload)) {
-                device.publish(topic, JSON.stringify(fragment), {
-                    qos: 1,
+                await new Promise((r) => {
+                    device.publish(topic, JSON.stringify(fragment), {
+                        qos: 1,
+                    }, () => {
+                        r();
+                    });
                 });
             }
+            Logger.debug("IOT Published", topic, type);
         },
     };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -53,7 +53,9 @@
     "archiver": "^5.3.1",
     "aws-cdk": "2.62.2",
     "aws-cdk-lib": "2.62.2",
+    "aws-crt": "1.0.0",
     "aws-iot-device-sdk": "^2.2.12",
+    "aws-iot-device-sdk-v2": "^1.9.5",
     "aws-sdk": "^2.1326.0",
     "builtin-modules": "3.2.0",
     "cdk-assets": "2.62.2",

package/runtime/handlers/node.js

@@ -22,7 +22,10 @@ export const useNodeHandler = Context.memo(async () => {
             const result = cache[input.functionID];
             if (!result)
                 return false;
-            const relative = path.relative(project.paths.root, input.file.split(path.sep).join(path.posix.sep));
+            const relative = path
+                .relative(project.paths.root, input.file)
+                .split(path.sep)
+                .join(path.posix.sep);
             return Boolean(result.metafile?.inputs[relative]);
         },
         canHandle: (input) => input.startsWith("nodejs"),

package/sst.mjs

@@ -2652,10 +2652,11 @@ var init_iot = __esm({
         region: project.config.region,
         accessKeyId: creds.accessKeyId,
         secretKey: creds.secretAccessKey,
-        sessionToken: creds.sessionToken
+        sessionToken: creds.sessionToken,
+        reconnectPeriod: 1
       });
       const PREFIX2 = `/sst/${project.config.name}/${project.config.stage}`;
-      device.subscribe(`${PREFIX2}/events`);
+      device.subscribe(`${PREFIX2}/events`, { qos: 1 });
       const fragments = /* @__PURE__ */ new Map();
       device.on("connect", () => {
         Logger.debug("IoT connected");
@@ -2663,6 +2664,12 @@ var init_iot = __esm({
       device.on("error", (err) => {
         Logger.debug("IoT error", err);
       });
+      device.on("close", () => {
+        Logger.debug("IoT closed");
+      });
+      device.on("reconnect", () => {
+        Logger.debug("IoT reconnected");
+      });
       device.on("message", (_topic, buffer) => {
         const fragment = JSON.parse(buffer.toString());
         if (!fragment.id) {
@@ -2686,17 +2693,27 @@ var init_iot = __esm({
       });
       return {
         prefix: PREFIX2,
-        publish(topic, type, properties) {
+        async publish(topic, type, properties) {
           const payload = {
             type,
             properties,
             sourceID: bus.sourceID
           };
           for (const fragment of encode(payload)) {
-            device.publish(topic, JSON.stringify(fragment), {
-              qos: 1
+            await new Promise((r) => {
+              device.publish(
+                topic,
+                JSON.stringify(fragment),
+                {
+                  qos: 1
+                },
+                () => {
+                  r();
+                }
+              );
             });
           }
+          Logger.debug("IOT Published", topic, type);
         }
       };
     });
@@ -4870,10 +4887,7 @@ var init_node = __esm({
           const result = cache[input.functionID];
           if (!result)
             return false;
-          const relative = path10.relative(
-            project.paths.root,
-            input.file.split(path10.sep).join(path10.posix.sep)
-          );
+          const relative = path10.relative(project.paths.root, input.file).split(path10.sep).join(path10.posix.sep);
           return Boolean(result.metafile?.inputs[relative]);
         },
         canHandle: (input) => input.startsWith("nodejs"),
@@ -7475,7 +7489,9 @@ var update = (program2) => program2.command(
           deps[pkg] = desired;
         }
       }
-      await fs19.writeFile(file, JSON.stringify(data2, null, 2));
+      if (results.has(file)) {
+        await fs19.writeFile(file, JSON.stringify(data2, null, 2));
+      }
     });
     await Promise.all(tasks);
     if (results.size === 0) {