vmlive 1.0.18 → 1.0.20

package/package.json

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

package/src/cli.js

@@ -403,9 +403,15 @@ const runDev = async () => {
   const workspaceId = config.workspaceId || "ws_local";
   const projectId = config.projectId || "prj_local";
 
+  const configPath = path.join(os.homedir(), '.vm-config.json');
+  let jwtToken = process.env.VM_API_TOKEN;
+  if (!jwtToken && fs.existsSync(configPath)) {
+    jwtToken = JSON.parse(fs.readFileSync(configPath, 'utf-8')).token;
+  }
+
   config.functions.forEach(fn => {
     const relativeTarget = `./${fn.name}-out.mjs`;
-    fs.writeFileSync(path.join(WORK_DIR, `${fn.name}-shim.mjs`), generateShim(relativeTarget, workspaceId, projectId, fn.name));
+    fs.writeFileSync(path.join(WORK_DIR, `${fn.name}-shim.mjs`), generateShim(relativeTarget, workspaceId, projectId, fn.name, jwtToken));
   });
 
   const builder = await esbuild.context({

package/src/shadow-dos.js

@@ -7,13 +7,13 @@ export class LocalTaskManagerDO extends DurableObject {
 
     async fetch(request) {
         const url = new URL(request.url);
-        
+
         if (request.method === "POST" && url.pathname === "/.internal/tasks/schedule") {
             const body = await request.json();
             const { functionSlug, executeAt, name, payload, workspaceId, projectId, interval } = body;
-            
+
             const taskId = interval ? `cron:${functionSlug}:${name}` : crypto.randomUUID();
-            
+
             const taskRecord = {
                 id: taskId,
                 function_slug: functionSlug,
@@ -30,7 +30,7 @@ export class LocalTaskManagerDO extends DurableObject {
             await this.ctx.storage.put(taskId, taskRecord);
             // We set the native Miniflare alarm
             await this.ctx.storage.setAlarm(executeAt);
-            
+
             return Response.json({ success: true, id: taskId });
         }
         return new Response("Not Found", { status: 404 });
@@ -39,13 +39,13 @@ export class LocalTaskManagerDO extends DurableObject {
     async alarm() {
         const now = Date.now();
         const MapTasks = await this.ctx.storage.list();
-        
+
         for (const [id, task] of MapTasks) {
             if (task.execute_at <= now && task.status !== 'completed') {
                 try {
                     // Structurally bypass network by resolving back through Miniflare host headers natively 
                     const invokeUrl = `http://127.0.0.1:${this.env.PORT || 8787}/.internal/tasks/dispatch`;
-                    
+
                     const res = await fetch(invokeUrl, {
                         method: 'POST',
                         headers: {
@@ -72,7 +72,7 @@ export class LocalTaskManagerDO extends DurableObject {
                                 if (unit === 's') addMs = val * 1000;
                                 else if (unit === 'm') addMs = val * 60000;
                                 else if (unit === 'h') addMs = val * 3600000;
-                                
+
                                 task.execute_at = now + addMs;
                                 await this.ctx.storage.put(id, task);
                                 await this.ctx.storage.setAlarm(task.execute_at);
@@ -94,10 +94,10 @@ export class LocalChannelRoomDO extends DurableObject {
     constructor(ctx, env) {
         super(ctx, env);
     }
-    
+
     async fetch(request) {
         const url = new URL(request.url);
-        
+
         if (request.method === "POST" && url.pathname === "/broadcast") {
             const body = await request.json();
             const websockets = this.ctx.getWebSockets();
@@ -106,25 +106,25 @@ export class LocalChannelRoomDO extends DurableObject {
             }
             return new Response("OK");
         }
-        
+
         if (request.headers.get("Upgrade") === "websocket") {
             const pair = new WebSocketPair();
             const [client, server] = Object.values(pair);
             this.ctx.acceptWebSocket(server);
             return new Response(null, { status: 101, webSocket: client });
         }
-        
+
         return new Response("Not Found", { status: 404 });
     }
-    
+
     webSocketMessage(ws, message) {
         this.ctx.getWebSockets().forEach((sock) => {
-             if (sock !== ws) {
-                 sock.send(message);
-             }
+            if (sock !== ws) {
+                sock.send(message);
+            }
         });
     }
-    
+
     webSocketClose(ws, code, reason, wasClean) {
         ws.close(code, reason);
     }

package/src/string-shim.js

@@ -1,4 +1,4 @@
-export const generateShim = (outFileUrl, workspaceId, projectId, functionSlug) => `
+export const generateShim = (outFileUrl, workspaceId, projectId, functionSlug, jwtToken) => `
 import * as UserCode from '${outFileUrl}';
 
 export default {
@@ -123,11 +123,13 @@ export default {
                 body = JSON.stringify({ args });
             }
 
-            const req = new Request(\`https://vm.live/.internal/rpc/\${serviceName.toLowerCase()}/\${method}\`, {
+            const req = new Request(\`https://rpc.vm.codes/.internal/rpc/\${serviceName.toLowerCase()}/\${method}\`, {
                 method: "POST",
                 headers: {
-                   "Authorization": \`Bearer \${safeEnv.BILLING_TOKEN || 'local'}\`,
-                   "Content-Type": contentType
+                   "Authorization": "Bearer ${jwtToken || 'local'}",
+                   "Content-Type": contentType,
+                   "x-workspace-id": "${workspaceId}",
+                   "x-project-id": "${projectId}"
                 },
                 body
             });