vmlive 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vmlive",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Local development VM for custom Serverless PaaS",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -28,7 +28,7 @@ const buildResourcesConfig = () => {
   };
 };
 
-const buildProxyDispatcher = (functions, workspaceId, projectId) => ({
+const buildProxyDispatcher = (functions, workspaceId, projectId, includeDashboard = true) => ({
   name: "vm-gateway-proxy",
   modules: true,
   script: `
@@ -43,18 +43,26 @@ const buildProxyDispatcher = (functions, workspaceId, projectId) => ({
         const hostHeader = request.headers.get("Host") || url.hostname;
         let targetName = hostHeader.split('.')[0]; 
         
+        let res;
+
         if (targetName === 'dashboard' && env.DASHBOARD) {
-            return env.DASHBOARD.fetch(request);
+            res = await env.DASHBOARD.fetch(request);
+        } else if (targetName && env[targetName]) {
+            res = await env[targetName].fetch(request);
+        } else {
+            res = new Response(
+              \`Function Not Found: \${targetName}.\\n\\nExpected format: http://${workspaceId}-${projectId}-<function_name>.localhost\`, 
+              { status: 404 }
+            );
         }
 
-        if (targetName && env[targetName]) {
-          return env[targetName].fetch(request);
-        }
+        const method = request.method;
+        const path = url.pathname;
+        const status = res.status;
+        const color = status >= 500 ? "\\x1b[31m" : status >= 400 ? "\\x1b[33m" : "\\x1b[32m";
         
-        return new Response(
-          \`Function Not Found: \${targetName}.\\n\\nExpected format: http://${workspaceId}-${projectId}-<function_name>.localhost\`, 
-          { status: 404 }
-        );
+        console.log(\`\\x1b[90m[\${targetName}]\\x1b[0m \${method} \${path} \${color}\${status}\\x1b[0m\`);
+        return res;
       }
     }
   `,
@@ -63,7 +71,7 @@ const buildProxyDispatcher = (functions, workspaceId, projectId) => ({
       acc[`${workspaceId}-${projectId}-${fn.name}`] = fn.name;
       return acc;
     }, {}),
-    DASHBOARD: "vm-dashboard-worker"
+    ...(includeDashboard ? { DASHBOARD: "vm-dashboard-worker" } : {})
   }
 });
 
@@ -462,11 +470,12 @@ const runDev = async () => {
   console.log('\nLocal endpoints available:');
   
   const dashboardUrl = `http://dashboard.localhost:${mfPort}`;
-  console.log(`  \x1b]8;;${dashboardUrl}\x1b\\${dashboardUrl}\x1b]8;;\x1b\\  \x1b[32m[Dashboard]\x1b[0m`);
+  console.log(`  \x1b]8;;${dashboardUrl}\x1b\\\x1b[32m[dashboard]\x1b[0m\x1b]8;;\x1b\\   ${dashboardUrl}`);
   
   config.functions.forEach(fn => {
     const endpointUrl = `http://${workspaceId}-${projectId}-${fn.name}.localhost:${mfPort}`;
-    console.log(`  \x1b]8;;${endpointUrl}\x1b\\${endpointUrl}\x1b]8;;\x1b\\`);
+    const padName = `[${fn.name}]`.padEnd(13, ' ');
+    console.log(`  \x1b]8;;${endpointUrl}\x1b\\\x1b[36m${padName}\x1b[0m\x1b]8;;\x1b\\ ${endpointUrl}`);
   });
 
   setInterval(() => {
@@ -566,7 +575,7 @@ const runTest = async () => {
 
   // Exact parity workers but omitting the Dashboard intentionally
   const miniflareWorkers = [
-    buildProxyDispatcher(config.functions, workspaceId, projectId),
+    buildProxyDispatcher(config.functions, workspaceId, projectId, false),
     {
       name: "vm-shadow-worker",
       modules: true,

package/src/dashboard-worker.js

@@ -146,4 +146,4 @@ export default {
     // Default to the Editor UI Payload
     return new Response(UI_HTML, { headers: { 'Content-Type': 'text/html; charset=utf-8' }});
   }
-};`
+};

package/src/string-shim.js

@@ -3,8 +3,8 @@ import * as UserCode from '${outFileUrl}';
 
 export default {
   async fetch(req, env, ctx) {
-    // Isolate the global KV 
-    const { __RAW_KV, ...safeEnv } = env;
+    // Isolate the global KV and Storage
+    const { __RAW_KV, R2, ...safeEnv } = env;
     const KV_PREFIX = \`${workspaceId}:${projectId}:\`;
 
     // 1. Air-Gapped Virtual KV Multiplexer
@@ -80,9 +80,12 @@ export default {
     const Channels = {
       accept: async (roomName, metadata) => {
         console.log(\`\\x1b[36m[\${env.PROJECT_ID || '${projectId}'}]\\x1b[0m 🔌 Channels.accept: [\${roomName}]\`, metadata);
-        const req = new Request("http://platform/.internal", { headers: { Upgrade: "websocket" }});
+        if (req.headers.get("Upgrade") !== "websocket") {
+            return new Response("Upgrade Required: Endpoint expects a WebSocket connection.", { status: 426 });
+        }
+        const doReq = new Request("http://platform/.internal", { headers: req.headers });
         const stub = env.CHANNEL_DO.idFromName(roomName);
-        return await env.CHANNEL_DO.get(stub).fetch(req);
+        return await env.CHANNEL_DO.get(stub).fetch(doReq);
       },
       broadcast: async (roomName, payload) => {
         console.log(\`\\x1b[36m[\${env.PROJECT_ID || '${projectId}'}]\\x1b[0m 📡 Channels.broadcast: [\${roomName}]\`, payload);
@@ -110,6 +113,7 @@ export default {
     const customEnv = { 
       ...safeEnv, 
       KV: virtualKV, 
+      BUCKET: R2,
       Tasks, 
       Channels, 
       Discord,