vmlive 1.0.0 → 1.0.1

package/README.md

@@ -20,12 +20,15 @@ Authenticates the CLI with your vm.live account via PKCE OAuth. Saves the access
 ### `npx vmlive init`
 Scaffolds a new project in the current directory.
 - Prompts for Workspace and Project selection.
-- Generates `vm.json` (configuration manifest) and `index.ts`.
+- Generates `vm.json` (configuration manifest) and dynamically scopes your first endpoint to `src/`.
 - Installs `@vmlive/types` and configures TypeScript.
 
+### `npx vmlive add`
+Interactively scaffolds additional serverless endpoints natively into your `src/` directory, immediately mapping them into your `vm.json` so the local proxy and production Gatekeeper seamlessly route to your independent microservices.
+
 ### `npx vmlive dev`
 Starts the local emulation environment.
-- Runs functions locally via `http://<function-name>.localhost:8787`.
+- Iteratively hosts your entire multi-function footprint locally via predictable slugs: `http://<workspace_id>-<project_id>-<function_name>.localhost:8787`.
 - Provides local proxy bindings for your SQL Database (`env.DB`), Global KV (`env.KV`), and Object Storage (`env.BUCKET`) using the `.vmlive/` directory for persistent storage.
 - Supports hot-reloading for `.js` and `.ts` files.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vmlive",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Local development VM for custom Serverless PaaS",
   "type": "module",
   "bin": {
@@ -18,4 +18,4 @@
   "devDependencies": {
     "vitest": "^3.2.4"
   }
-}
+}

package/src/cli.js

@@ -9,7 +9,7 @@ import os from 'os';
 import crypto from 'crypto';
 import { exec } from 'child_process';
 import { Miniflare } from 'miniflare';
-import { select, input } from '@inquirer/prompts';
+import { select, input, confirm } from '@inquirer/prompts';
 import { generateShim } from './string-shim.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -19,7 +19,6 @@ const __dirname = path.dirname(__filename);
 const WORK_DIR = path.resolve('node_modules', '.cache', 'vmlive');
 const DATA_DIR = path.resolve('.vmlive');
 const CONFIG_PATH = path.resolve('vm.json');
-const API_FILE = path.resolve('index.ts');
 
 const buildResourcesConfig = () => {
   return {
@@ -29,7 +28,7 @@ const buildResourcesConfig = () => {
   };
 };
 
-const buildProxyDispatcher = (functions) => ({
+const buildProxyDispatcher = (functions, workspaceId, projectId) => ({
   name: "vm-gateway-proxy",
   modules: true,
   script: `
@@ -39,23 +38,19 @@ const buildProxyDispatcher = (functions) => ({
         const hostHeader = request.headers.get("Host") || url.hostname;
         let targetName = hostHeader.split('.')[0]; 
         
-        if (targetName === '127' || targetName === 'localhost') {
-            targetName = 'api';
-        }
-        
         if (targetName && env[targetName]) {
           return env[targetName].fetch(request);
         }
         
         return new Response(
-          \`Function Not Found: \${targetName}.\\n\\nUse format: http://<function-name>.localhost:8787\`, 
+          \`Function Not Found: \${targetName}.\\n\\nExpected format: http://${workspaceId}-${projectId}-<function_name>.localhost\`, 
           { status: 404 }
         );
       }
     }
   `,
   serviceBindings: functions.reduce((acc, fn) => {
-    acc[fn.name] = fn.name;
+    acc[`${workspaceId}-${projectId}-${fn.name}`] = fn.name;
     return acc;
   }, {})
 });
@@ -81,7 +76,7 @@ const runInit = async () => {
   const GATEKEEPER_URL = process.env.GATEKEEPER_URL || 'http://localhost:8787';
 
   // 2. Extract Workspace Architecture
-  console.log('\x1b[36m⏳ Orchestrating live Platform boundaries...\x1b[0m');
+  console.log('\x1b[36mFetching workspaces...\x1b[0m');
   const wsRes = await fetch(`${GATEKEEPER_URL}/api/workspaces`, {
       headers: { 'Authorization': `Bearer ${jwtToken}` }
   });
@@ -95,18 +90,64 @@ const runInit = async () => {
      process.exit(1);
   }
 
-  const workspaces = await wsRes.json();
-  if (!Array.isArray(workspaces) || workspaces.length === 0) {
-     console.error('\x1b[31m❌ Sandbox Error:\x1b[0m You do not possess any authorized Workspaces. Please map one on the dashboard first!');
+  let workspaces = await wsRes.json();
+  if (!Array.isArray(workspaces)) {
+     console.error('\x1b[31m❌ Sandbox Error:\x1b[0m Failed to retrieve workspaces.');
      process.exit(1);
   }
 
   // 3. Interactive Target Lock
-  const workspaceSlug = await select({
-     message: 'Select exactly which Platform Workspace you want this Sandbox to dynamically bind to:',
-     choices: workspaces.map(w => ({ name: w.name, value: w.slug }))
+  const workspaceChoices = workspaces.map(w => ({ name: w.name, value: w.slug }));
+  workspaceChoices.push({ name: '+ Create New Workspace', value: '__CREATE_WORKSPACE__' });
+
+  let workspaceSlug = await select({
+     message: 'Which workspace would you like to use?',
+     choices: workspaceChoices
   });
 
+  if (workspaceSlug === '__CREATE_WORKSPACE__') {
+     const wsName = await input({ message: 'What do you want to name your new workspace?' });
+     console.log('\x1b[36mCreating workspace...\x1b[0m');
+     
+     const wsCreateRes = await fetch(`${GATEKEEPER_URL}/api/workspaces`, {
+         method: 'POST',
+         headers: { 'Authorization': `Bearer ${jwtToken}`, 'Content-Type': 'application/json' },
+         body: JSON.stringify({ name: wsName })
+     });
+     
+     if (!wsCreateRes.ok) {
+         console.error('\x1b[31m❌ Creation Failed:\x1b[0m', await wsCreateRes.text());
+         process.exit(1);
+     }
+     const wsData = await wsCreateRes.json();
+     workspaceSlug = wsData.workspace.slug;
+     console.log(`\x1b[32m✔ Workspace created.\x1b[0m\n`);
+     
+     const wantsVerify = await confirm({
+         message: 'Anti-abuse: Would you like to securely verify your identity with Stripe? (You will not be charged)',
+         default: true
+     });
+     
+     if (wantsVerify) {
+         console.log('\x1b[36mGenerating verification link...\x1b[0m');
+         const stripeRes = await fetch(`${GATEKEEPER_URL}/api/${workspaceSlug}/stripe/setup`, {
+             method: 'POST',
+             headers: { 'Authorization': `Bearer ${jwtToken}`, 'Content-Type': 'application/json' },
+             body: JSON.stringify({ return_url: 'https://vm.live/dashboard' })
+         });
+         
+         if (stripeRes.ok) {
+             const stripeData = await stripeRes.json();
+             console.log(`\n\x1b[34m${stripeData.url}\x1b[0m\n`);
+             const openCmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+             exec(`${openCmd} "${stripeData.url}"`);
+             await input({ message: 'Press Enter once verified to continue:' });
+         } else {
+             console.error('\x1b[31m❌ Failed to generate Stripe link:\x1b[0m', await stripeRes.text());
+         }
+     }
+  }
+
   // 4. Extract Project Containers
   const projRes = await fetch(`${GATEKEEPER_URL}/api/${workspaceSlug}/projects`, {
      headers: { 'Authorization': `Bearer ${jwtToken}` }
@@ -117,25 +158,52 @@ const runInit = async () => {
      process.exit(1);
   }
 
-  const projects = await projRes.json();
-  if (!Array.isArray(projects) || projects.length === 0) {
-     console.error('\x1b[31m❌ Sandbox Error:\x1b[0m No projects mathematically exist in this Workspace constraint.');
+  let projects = await projRes.json();
+  if (!Array.isArray(projects)) {
+     console.error('\x1b[31m❌ Sandbox Error:\x1b[0m Failed to retrieve projects.');
      process.exit(1);
   }
 
-  const projectSlug = await select({
-     message: 'Select exactly which Edge Project you want to natively emulate offline:',
-     choices: projects.map(p => ({ name: p.name, value: p.slug }))
+  const projectChoices = projects.map(p => ({ name: p.name, value: p.slug }));
+  projectChoices.push({ name: '+ Create New Project', value: '__CREATE_PROJECT__' });
+
+  let projectSlug = await select({
+     message: 'Which project would you like to use?',
+     choices: projectChoices
   });
 
+  if (projectSlug === '__CREATE_PROJECT__') {
+     const projName = await input({ message: 'What do you want to name your new project?' });
+     console.log('\x1b[36mCreating project...\x1b[0m');
+     
+     const projCreateRes = await fetch(`${GATEKEEPER_URL}/api/${workspaceSlug}/projects`, {
+         method: 'POST',
+         headers: { 'Authorization': `Bearer ${jwtToken}`, 'Content-Type': 'application/json' },
+         body: JSON.stringify({ name: projName })
+     });
+     
+     if (!projCreateRes.ok) {
+         console.error('\x1b[31m❌ Creation Failed:\x1b[0m', await projCreateRes.text());
+         process.exit(1);
+     }
+     const projData = await projCreateRes.json();
+     projectSlug = projData.project.slug;
+     console.log(`\x1b[32m✔ Project created.\x1b[0m\n`);
+  }
+
   const functionNameRaw = await input({
-     message: 'What do you want to conceptually name this initial serverless function?',
+     message: 'What do you want to name this function?',
      default: 'api'
   });
   const functionName = functionNameRaw.trim().toLowerCase().replace(/[^a-z0-9-]/g, '') || 'api';
 
+  if (!fs.existsSync(path.resolve('src'))) {
+     fs.mkdirSync(path.resolve('src'), { recursive: true });
+  }
+  const funcFile = path.resolve('src', `${functionName}.ts`);
+
   // 5. Instantiation
-  if (!fs.existsSync(API_FILE)) {
+  if (!fs.existsSync(funcFile)) {
     const defaultApiTs = `import type { Env, Context } from '@vmlive/types';
 export default {
   async fetch(request: Request, env: Env, ctx: Context) {
@@ -143,7 +211,7 @@ export default {
   }
 };
 `;
-    fs.writeFileSync(API_FILE, defaultApiTs);
+    fs.writeFileSync(funcFile, defaultApiTs);
   }
 
   if (!fs.existsSync(CONFIG_PATH)) {
@@ -151,7 +219,7 @@ export default {
   "workspaceId": "${workspaceSlug}",
   "projectId": "${projectSlug}",
   "functions": [
-    { "name": "${functionName}", "entry": "index.ts" }
+    { "name": "${functionName}", "entry": "src/${functionName}.ts" }
   ]
 }
 `;
@@ -228,7 +296,7 @@ export default {
     } catch(e) {}
   }
 
-  console.log('\x1b[36m📦 Installing platform types and dependencies...\x1b[0m');
+  console.log('\x1b[36mInstalling dependencies...\x1b[0m');
   await new Promise((resolve) => {
      exec('npm install', (err) => {
         if (err) console.error('\x1b[33m⚠️ Warning: npm install failed. You may need to run it manually to resolve TS errors.\x1b[0m');
@@ -236,8 +304,53 @@ export default {
      });
   });
 
-  console.log('\x1b[32m✨ Extensible Project Scaffolded Successfully!\x1b[0m');
-  console.log('You can now natively run \x1b[36mnpx vmlive dev\x1b[0m to initiate the offline sandbox proxy.');
+  console.log('\x1b[32mProject created successfully.\x1b[0m');
+  console.log('Run \x1b[36mnpx vmlive dev\x1b[0m to start the local environment.');
+};
+
+const runAdd = async () => {
+  if (!fs.existsSync(CONFIG_PATH)) {
+     console.error('\x1b[31m❌ Error:\x1b[0m Cannot add function. No vm.json found in this directory. Run `npx vmlive init` first.');
+     process.exit(1);
+  }
+  
+  const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
+  
+  const functionNameRaw = await input({
+     message: 'What do you want to name this new function?',
+     default: 'webhooks'
+  });
+  const functionName = functionNameRaw.trim().toLowerCase().replace(/[^a-z0-9-]/g, '');
+  if (!functionName) process.exit(1);
+  
+  if (config.functions.some(f => f.name === functionName)) {
+     console.error(`\x1b[31m❌ Error:\x1b[0m Function '${functionName}' already exists in this project.`);
+     process.exit(1);
+  }
+  
+  if (!fs.existsSync(path.resolve('src'))) {
+     fs.mkdirSync(path.resolve('src'), { recursive: true });
+  }
+  
+  const targetFile = path.resolve('src', `${functionName}.ts`);
+  if (!fs.existsSync(targetFile)) {
+     const defaultApiTs = `import type { Env, Context } from '@vmlive/types';
+export default {
+  async fetch(request: Request, env: Env, ctx: Context) {
+    return new Response("Hello from ${functionName}!", { status: 200 });
+  }
+};
+`;
+     fs.writeFileSync(targetFile, defaultApiTs);
+  }
+  
+  config.functions.push({
+     name: functionName,
+     entry: `src/${functionName}.ts`
+  });
+  
+  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + '\n');
+  console.log(`\x1b[32m✔ Function '${functionName}' securely scaffolded successfully!\x1b[0m`);
 };
 
 const runDev = async () => {
@@ -282,7 +395,7 @@ const runDev = async () => {
   });
 
   await builder.rebuild();
-  console.log('\x1b[32m✨ Platform Engine Initialized.\x1b[0m');
+  console.log('\x1b[32mPlatform initialized.\x1b[0m');
 
   // Copy Shadow Worker to ephemeral .vm directory for Miniflare Sandbox Bounds
   const shadowSource = fs.readFileSync(path.join(__dirname, 'shadow-dos.js'), 'utf-8');
@@ -291,7 +404,7 @@ const runDev = async () => {
   const mfPort = process.env.PORT ? parseInt(process.env.PORT) : (config.port || 8787);
 
   const miniflareWorkers = [
-    buildProxyDispatcher(config.functions),
+    buildProxyDispatcher(config.functions, workspaceId, projectId),
     {
       name: "vm-shadow-worker",
       modules: true,
@@ -323,7 +436,10 @@ const runDev = async () => {
     r2Persist: path.join(DATA_DIR, 'bucket')
   });
   await mf.ready;
-  console.log(`🚀 Extensible Serverless VM running natively on http://*.localhost:${mfPort}`);
+  console.log('\\nLocal endpoints available:');
+  config.functions.forEach(fn => {
+    console.log(`  http://${workspaceId}-${projectId}-${fn.name}.localhost:${mfPort}`);
+  });
 
   setInterval(() => {
      const memoryData = process.memoryUsage();
@@ -340,7 +456,7 @@ const runDev = async () => {
       if (debounceTimeout) clearTimeout(debounceTimeout);
       debounceTimeout = setTimeout(async () => {
         try {
-          console.log(`\n🔄 ${filename} mutated. Syncing Engine...`);
+          console.log(`\nReloading ${filename}...`);
           await builder.rebuild();
           
           config.functions.forEach(fn => {
@@ -357,7 +473,7 @@ const runDev = async () => {
             r2Persist: path.join(DATA_DIR, 'bucket')
           });
           await mf.ready;
-          console.log('\x1b[32m✨ Engine Hot-Reloaded.\x1b[0m');
+          console.log('\x1b[32mReloaded.\x1b[0m');
         } catch (err) {
           console.error('\x1b[31m❌ Engine Sync Crash:\x1b[0m', err.message);
         }
@@ -366,7 +482,7 @@ const runDev = async () => {
   });
 
   process.on('SIGINT', async () => {
-    console.log('\n🛑 Suspending Platform VM...');
+    console.log('\nStopping...');
     await builder.dispose();
     await mf.dispose();
     process.exit(0);
@@ -374,7 +490,7 @@ const runDev = async () => {
 };
 
 const runDeploy = async () => {
-  console.log('\x1b[36m🚀 Initiating Deployment pipeline...\x1b[0m');
+  console.log('\x1b[36mDeploying...\x1b[0m');
   
   const configPath = path.join(os.homedir(), '.vm-config.json');
   let token = process.env.VM_API_TOKEN;
@@ -425,7 +541,7 @@ const runDeploy = async () => {
      const GATEKEEPER_URL = process.env.GATEKEEPER_URL || 'http://localhost:8787';
      const target = `${GATEKEEPER_URL}/api/${workspaceId}/projects/${projectId}/functions/${fn.name}/deploy`;
      
-     console.log(`\x1b[36m[POST]\x1b[0m Uploading to Gatekeeper Dispatch Edge...`);
+     console.log(`\x1b[36m[POST]\x1b[0m Uploading...`);
      
      const res = await fetch(target, {
          method: 'POST',
@@ -443,12 +559,12 @@ const runDeploy = async () => {
      }
 
      const jsonRes = await res.json();
-     console.log(`\x1b[32m✨ Extracted Function Deployed to: ${jsonRes.public_url || 'Success!'}\x1b[0m`);
+     console.log(`\x1b[32mDeployed to: ${jsonRes.public_url || 'Success!'}\x1b[0m`);
   }
 };
 
 const runLogin = async () => {
-  console.log('\x1b[36m✨ Initiating vm.live PKCE Authentication...\x1b[0m');
+  console.log('\x1b[36mAuthenticating...\x1b[0m');
 
   const codeVerifier = crypto.randomBytes(32).toString('base64url');
   const codeChallenge = crypto.createHash('sha256').update(codeVerifier).digest('base64url');
@@ -467,7 +583,7 @@ const runLogin = async () => {
 
     try {
       // Exchange
-      console.log('⏳ Exchanging PKCE Authorization Code...');
+      console.log('Exchanging authorization code...');
       const tokenRes = await fetch(`${GATEKEEPER_URL}/api/auth/cli/exchange`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -493,7 +609,7 @@ const runLogin = async () => {
           </div>
         </body></html>
       `);
-      console.log('\x1b[32m✅ Successfully authenticated! Saved strictly to ~/.vm-config.json\x1b[0m');
+      console.log('\x1b[32m✔ Successfully authenticated.\x1b[0m');
       
       setTimeout(() => {
         server.close();
@@ -527,6 +643,8 @@ const main = async () => {
   const command = process.argv[2];
   if (command === 'init') {
     runInit();
+  } else if (command === 'add') {
+    await runAdd();
   } else if (command === 'dev' || !command) {
     await runDev();
   } else if (command === 'login') {
@@ -535,7 +653,7 @@ const main = async () => {
     await runDeploy();
   } else {
     console.error(`\x1b[31m❌ Unknown command: ${command}\x1b[0m`);
-    console.log('Usage: vm init | vm dev | vm login | vm deploy');
+    console.log('Usage: vm init | vm add | vm dev | vm login | vm deploy');
     process.exit(1);
   }
 };