sst 2.21.2 → 2.21.4

package/cli/local/server.js

@@ -101,7 +101,15 @@ export async function useLocalServer(opts) {
         return http.createServer({}, rest);
     })();
     // Wire up websocket
-    const wss = new WebSocketServer({ server });
+    const wss = new WebSocketServer({ noServer: true });
+    const wss2 = new WebSocketServer({ noServer: true });
+    const sockets = new Set();
+    wss2.on("connection", (socket, req) => {
+        sockets.add(socket);
+        socket.on("close", () => {
+            sockets.delete(socket);
+        });
+    });
     wss.on("connection", (socket, req) => {
         if (req.headers.origin?.endsWith("localhost:3000"))
             return;
@@ -116,6 +124,21 @@ export async function useLocalServer(opts) {
         console.log("Rejecting unauthorized connection from " + req.headers.origin);
         socket.terminate();
     });
+    server.on("upgrade", (req, socket, head) => {
+        if (req.url === "/socket") {
+            wss2.handleUpgrade(req, socket, head, (socket) => {
+                wss2.emit("connection", socket, req);
+            });
+            return;
+        }
+        if (req.url === "/") {
+            wss.handleUpgrade(req, socket, head, (socket) => {
+                wss.emit("connection", socket, req);
+            });
+            return;
+        }
+        socket.destroy();
+    });
     server.listen(cfg.port);
     const handler = applyWSSHandler({
         wss,
@@ -156,7 +179,24 @@ export async function useLocalServer(opts) {
             cb(func);
         });
     }
-    bus.subscribe("function.invoked", (evt) => {
+    function publish(type, properties) {
+        const msg = JSON.stringify({
+            type,
+            properties,
+        });
+        [...sockets.values()].map((s) => s.send(msg));
+    }
+    bus.subscribe("function.invoked", async (evt) => {
+        publish("log", [
+            [
+                "s",
+                Date.now(),
+                evt.properties.functionID,
+                evt.properties.requestID,
+                false,
+            ],
+        ]);
+        publish("function.invoked", evt.properties);
         updateFunction(evt.properties.functionID, (draft) => {
             if (draft.invocations.length >= 25)
                 draft.invocations.pop();
@@ -171,6 +211,17 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("worker.stdout", (evt) => {
+        publish("log", [
+            [
+                "m",
+                Date.now(),
+                evt.properties.functionID,
+                evt.properties.requestID,
+                "info",
+                evt.properties.message,
+                Math.random().toString(),
+            ],
+        ]);
         updateFunction(evt.properties.functionID, (draft) => {
             const entry = draft.invocations.find((i) => i.id === evt.properties.requestID);
             if (!entry)
@@ -182,6 +233,10 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("function.success", (evt) => {
+        publish("log", [
+            ["e", Date.now(), evt.properties.functionID, evt.properties.requestID],
+        ]);
+        publish("function.success", evt.properties);
         updateFunction(evt.properties.functionID, (draft) => {
             const invocation = draft.invocations.find((x) => x.id === evt.properties.requestID);
             if (!invocation)
@@ -194,6 +249,10 @@ export async function useLocalServer(opts) {
         });
     });
     bus.subscribe("function.error", (evt) => {
+        publish("log", [
+            ["e", Date.now(), evt.properties.functionID, evt.properties.requestID],
+        ]);
+        publish("function.error", evt.properties);
         updateFunction(evt.properties.functionID, (draft) => {
             const invocation = draft.invocations.find((x) => x.id === evt.properties.requestID);
             if (!invocation)

package/package.json

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

package/sst.mjs

@@ -7081,7 +7081,15 @@ async function useLocalServer(opts) {
     }
     return http2.createServer({}, rest);
   })();
-  const wss = new WebSocketServer({ server });
+  const wss = new WebSocketServer({ noServer: true });
+  const wss2 = new WebSocketServer({ noServer: true });
+  const sockets = /* @__PURE__ */ new Set();
+  wss2.on("connection", (socket, req) => {
+    sockets.add(socket);
+    socket.on("close", () => {
+      sockets.delete(socket);
+    });
+  });
   wss.on("connection", (socket, req) => {
     if (req.headers.origin?.endsWith("localhost:3000"))
       return;
@@ -7096,6 +7104,21 @@ async function useLocalServer(opts) {
     console.log("Rejecting unauthorized connection from " + req.headers.origin);
     socket.terminate();
   });
+  server.on("upgrade", (req, socket, head) => {
+    if (req.url === "/socket") {
+      wss2.handleUpgrade(req, socket, head, (socket2) => {
+        wss2.emit("connection", socket2, req);
+      });
+      return;
+    }
+    if (req.url === "/") {
+      wss.handleUpgrade(req, socket, head, (socket2) => {
+        wss.emit("connection", socket2, req);
+      });
+      return;
+    }
+    socket.destroy();
+  });
   server.listen(cfg.port);
   const handler = applyWSSHandler({
     wss,
@@ -7136,7 +7159,24 @@ async function useLocalServer(opts) {
       cb(func);
     });
   }
-  bus.subscribe("function.invoked", (evt) => {
+  function publish(type, properties) {
+    const msg = JSON.stringify({
+      type,
+      properties
+    });
+    [...sockets.values()].map((s) => s.send(msg));
+  }
+  bus.subscribe("function.invoked", async (evt) => {
+    publish("log", [
+      [
+        "s",
+        Date.now(),
+        evt.properties.functionID,
+        evt.properties.requestID,
+        false
+      ]
+    ]);
+    publish("function.invoked", evt.properties);
     updateFunction(evt.properties.functionID, (draft) => {
       if (draft.invocations.length >= 25)
         draft.invocations.pop();
@@ -7151,6 +7191,17 @@ async function useLocalServer(opts) {
     });
   });
   bus.subscribe("worker.stdout", (evt) => {
+    publish("log", [
+      [
+        "m",
+        Date.now(),
+        evt.properties.functionID,
+        evt.properties.requestID,
+        "info",
+        evt.properties.message,
+        Math.random().toString()
+      ]
+    ]);
     updateFunction(evt.properties.functionID, (draft) => {
       const entry = draft.invocations.find(
         (i) => i.id === evt.properties.requestID
@@ -7164,6 +7215,10 @@ async function useLocalServer(opts) {
     });
   });
   bus.subscribe("function.success", (evt) => {
+    publish("log", [
+      ["e", Date.now(), evt.properties.functionID, evt.properties.requestID]
+    ]);
+    publish("function.success", evt.properties);
     updateFunction(evt.properties.functionID, (draft) => {
       const invocation = draft.invocations.find(
         (x) => x.id === evt.properties.requestID
@@ -7178,6 +7233,10 @@ async function useLocalServer(opts) {
     });
   });
   bus.subscribe("function.error", (evt) => {
+    publish("log", [
+      ["e", Date.now(), evt.properties.functionID, evt.properties.requestID]
+    ]);
+    publish("function.error", evt.properties);
     updateFunction(evt.properties.functionID, (draft) => {
       const invocation = draft.invocations.find(
         (x) => x.id === evt.properties.requestID