openmagic 0.17.0 → 0.17.1

package/dist/cli.js

@@ -1356,7 +1356,7 @@ async function handleLlmChat(params, onChunk, onDone, onError) {
 }
 
 // src/server.ts
-var VERSION = "0.17.0";
+var VERSION = "0.17.1";
 var __dirname = dirname2(fileURLToPath(import.meta.url));
 function attachOpenMagic(httpServer, roots) {
   function handleRequest(req, res) {
@@ -1376,10 +1376,7 @@ function attachOpenMagic(httpServer, roots) {
     }
     return false;
   }
-  const wss = new WebSocketServer({
-    server: httpServer,
-    path: "/__openmagic__/ws"
-  });
+  const wss = new WebSocketServer({ noServer: true });
   const clientStates = /* @__PURE__ */ new WeakMap();
   wss.on("connection", (ws, req) => {
     const origin = req.headers.origin || "";
@@ -1411,7 +1408,17 @@ function attachOpenMagic(httpServer, roots) {
       clientStates.delete(ws);
     });
   });
-  return { wss, handleRequest };
+  function handleUpgrade(req, socket, head) {
+    const urlPath = (req.url || "").split("?")[0];
+    if (urlPath === "/__openmagic__/ws") {
+      wss.handleUpgrade(req, socket, head, (ws) => {
+        wss.emit("connection", ws, req);
+      });
+      return true;
+    }
+    return false;
+  }
+  return { wss, handleRequest, handleUpgrade };
 }
 async function handleMessage(ws, msg, state, roots) {
   switch (msg.type) {
@@ -1670,17 +1677,24 @@ ${toolbarScript}
           ${toolbarScript}
         </body></html>`
       );
+    } else if (res && typeof res.destroy === "function") {
+      try {
+        res.destroy();
+      } catch {
+      }
     }
   });
   let omHandle = null;
+  let omUpgrade = null;
   const server = http.createServer((req, res) => {
     if (omHandle && omHandle(req, res)) return;
     proxy.web(req, res);
   });
   const om = attachOpenMagic(server, roots);
   omHandle = om.handleRequest;
+  omUpgrade = om.handleUpgrade;
   server.on("upgrade", (req, socket, head) => {
-    if (req.url?.startsWith("/__openmagic__")) return;
+    if (omUpgrade && omUpgrade(req, socket, head)) return;
     proxy.ws(req, socket, head);
   });
   return server;
@@ -1875,7 +1889,7 @@ process.on("uncaughtException", (err) => {
   process.exit(1);
 });
 var childProcesses = [];
-var VERSION2 = "0.17.0";
+var VERSION2 = "0.17.1";
 function ask(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve3) => {