@nativescript/cloudflare-cli 0.1.0-beta.3 → 0.1.0-beta.5

package/README.md

@@ -3,9 +3,10 @@
 ```sh
 npx @nativescript/cloudflare-cli live          # a phone app: opens the IDE and prints a QR code for NativeScript Preview
 npx @nativescript/cloudflare-cli live --mac    # a Mac app: opens the IDE and runs the app on this Mac, streamed into the IDE
+npx @nativescript/cloudflare-cli live --electron   # an Electron app with native views, run the same way
 ```
 
-`live` creates a project on preview.nativescript.org (`--server` or `NS_EDGE_SERVER` for another edge), saves it to `.ns-edge.json` and opens its IDE. Run it again in the same folder to reopen that project, or add `--new` for another. Without a create token the project is free: a few hosted agent turns a day, no backend, deleted after 30 days unused. `--no-open` skips the browser; with `--mac`, `--allow-eval` lets the agent run code on this Mac.
+`live` creates a project on preview.nativescript.org (`--server` or `NS_EDGE_SERVER` for another edge), saves it to `.ns-edge.json` and opens its IDE. Run it again in the same folder to reopen that project (no platform flag needed), or add `--new` for another. While `live` runs a Mac app it restarts the app if it crashes, unless it crashes three times in a minute. Without a create token the project is free: a few hosted agent turns a day, no backend, deleted after 30 days unused. `--no-open` skips the browser; with `--mac` or `--electron`, `--allow-eval` lets the agent run code on this Mac.
 
 ## Mirror a local project
 

package/dist/bin.js

@@ -9,9 +9,15 @@ import { applyChanges, collect, createProject, projectUrl, report, SYNCED } from
 const CONFIG = '.ns-edge.json';
 const DEBOUNCE_MS = 120;
 const LIVE_SERVER = process.env.NS_EDGE_SERVER ?? 'https://preview.nativescript.org';
-/** The desktop host `live --mac` runs; bump it with each host release this CLI is tested against. */
-const DESKTOP_HOST = '@nativescript/cloudflare-desktop@0.1.0-alpha.2';
+/** The hosts `live --mac` and `live --electron` run; bump them with each host release this CLI is tested against. */
+const DESKTOP_HOSTS = {
+    macos: '@nativescript/cloudflare-desktop@0.1.0-alpha.4',
+    electron: '@nativescript/cloudflare-electron@0.1.0-alpha.1',
+};
 const DESKTOP_TEMPLATES = new Set(['macos', 'electron']);
+const MAX_CRASHES = 3;
+const CRASH_WINDOW_MS = 60_000;
+const RESTART_DELAY_MS = 1000;
 const [cmd = 'help', ...args] = process.argv.slice(2);
 /**
  * Editors and tools write temp, swap and backup files next to the real one
@@ -72,20 +78,46 @@ function openInBrowser(url) {
     const [command, ...rest] = process.platform === 'darwin' ? ['open', url] : process.platform === 'win32' ? ['cmd', '/c', 'start', '""', url.replace(/&/g, '^&')] : ['xdg-open', url];
     spawn(command, rest, { stdio: 'ignore', detached: true }).on('error', () => { }).unref();
 }
-/** Runs the Mac host for a desktop project until it exits; the host prints what joining allows. */
-function runDesktopHost(ref) {
+/**
+ * Runs the Mac host for a desktop project until it quits or Ctrl+C. A host that
+ * crashes is started again, since nothing in the browser can reach this Mac to
+ * do it, unless it keeps crashing. The host says what joining allows.
+ */
+async function runDesktopHost(ref) {
     if (process.platform !== 'darwin' || process.arch !== 'arm64') {
         throw new Error('Mac projects run on an Apple Silicon Mac (macOS 14.4 or later). Run the same command there.');
     }
     const device = `${projectUrl(ref)}#${ref.deviceKey}`;
     const extra = has('allow-eval') ? ['--allow-eval'] : [];
-    const child = spawn('npx', ['-y', DESKTOP_HOST, device, '--yes', ...extra], { stdio: 'inherit' });
-    for (const signal of ['SIGINT', 'SIGTERM'])
-        process.on(signal, () => child.kill(signal));
-    return new Promise((resolve, reject) => {
-        child.on('error', reject);
-        child.on('exit', (code) => (code ? reject(new Error(`The Mac host exited with code ${code}.`)) : resolve()));
-    });
+    const host = DESKTOP_HOSTS[ref.template ?? 'macos'] ?? DESKTOP_HOSTS.macos;
+    let child;
+    let stopping = false;
+    for (const signal of ['SIGINT', 'SIGTERM']) {
+        process.on(signal, () => {
+            stopping = true;
+            child?.kill(signal);
+        });
+    }
+    const crashes = [];
+    for (;;) {
+        child = spawn('npx', ['-y', host, device, '--yes', ...extra], { stdio: 'inherit' });
+        const exit = await new Promise((resolve, reject) => {
+            child.on('error', reject);
+            child.on('exit', (code, signal) => resolve({ code, signal }));
+        });
+        if (stopping || exit.code === 0)
+            return;
+        const now = Date.now();
+        crashes.push(now);
+        while (crashes[0] < now - CRASH_WINDOW_MS)
+            crashes.shift();
+        const why = exit.signal ?? `code ${exit.code}`;
+        if (crashes.length > MAX_CRASHES) {
+            throw new Error(`The Mac host crashed ${crashes.length} times in a minute (last: ${why}), so it wasn't restarted. Fix the error above, then run this command again.`);
+        }
+        console.log(`\nThe Mac host stopped (${why}). Starting it again…\n`);
+        await new Promise((r) => setTimeout(r, RESTART_DELAY_MS));
+    }
 }
 const commands = {
     async live() {
@@ -93,19 +125,23 @@ const commands = {
             if (has(later))
                 throw new Error(`--${later} isn't available yet. Run \`live\` for a phone app or \`live --mac\` for a Mac app.`);
         }
-        const template = flag('template') ?? (has('mac') ? 'macos' : 'core');
-        const desktop = DESKTOP_TEMPLATES.has(template);
         let ref = has('new') ? null : await savedProject();
+        // Without a platform flag, this folder's project runs as whatever it was made as.
+        const template = flag('template') ?? (has('electron') ? 'electron' : has('mac') ? 'macos' : (ref?.template ?? 'core'));
+        const desktop = DESKTOP_TEMPLATES.has(template);
         if (ref && DESKTOP_TEMPLATES.has(ref.template ?? 'core') !== desktop) {
             throw new Error(`This folder's project (${CONFIG}) is a ${desktop ? 'phone' : 'Mac'} project. Add --new to replace it, or run this in another folder.`);
         }
+        if (ref && desktop && ref.template !== template) {
+            throw new Error(`This folder's project (${CONFIG}) is a ${ref.template} project. Add --new to replace it, or run this in another folder.`);
+        }
         if (ref) {
             console.log(`Opening this folder's project ${ref.id} (${CONFIG})`);
         }
         else {
             ref = await createProject(flag('server') ?? LIVE_SERVER, flag('token') ?? process.env.NS_EDGE_CREATE_TOKEN, template);
             await writeFile(join(root, CONFIG), JSON.stringify(ref, null, 2) + '\n');
-            console.log(`Created a ${desktop ? 'Mac' : 'phone'} project, saved to ${CONFIG} (it holds the project's keys: keep it private and out of git).`);
+            console.log(`Created ${template === 'electron' ? 'an Electron' : desktop ? 'a Mac' : 'a phone'} project, saved to ${CONFIG} (it holds the project's keys: keep it private and out of git).`);
             if (ref.free) {
                 console.log(`It's a free project: ${ref.free.agentTurnsPerDay} hosted agent turn${ref.free.agentTurnsPerDay === 1 ? '' : 's'} a day, deleted after ${ref.free.idleDays} days unused. ` +
                     'For an unlimited agent, add your own API key in the agent panel or connect Claude Code from Connect agent.');
@@ -116,7 +152,7 @@ const commands = {
         if (!has('no-open'))
             openInBrowser(ide);
         if (desktop) {
-            console.log('Starting the app on this Mac. Its window streams to the IDE\'s Device pane. Press Ctrl+C to stop.\n');
+            console.log(`Starting the app on this Mac${template === 'electron' ? ' (the first run downloads Electron)' : ''}. Its window streams to the IDE's Device pane. Press Ctrl+C to stop.\n`);
             return runDesktopHost(ref);
         }
         const device = `${projectUrl(ref)}#${ref.deviceKey}`;
@@ -196,9 +232,9 @@ const commands = {
     async help() {
         console.log(`ns-edge <command>
 
-  live [--mac] [--new] [--no-open] [--allow-eval]
+  live [--mac|--electron] [--new] [--no-open] [--allow-eval]
                             create a project (or reopen this folder's), open its IDE, and print a QR code
-                            for your phone; --mac runs it on this Mac instead
+                            for your phone; --mac or --electron runs it on this Mac instead
   create [--server <url>] [--token <t>] [--template core|vue|react|solid|svelte|angular]
                             create an edge project and save .ns-edge.json
   push                      upload app/ and server/ in one transaction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/cloudflare-cli",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.5",
   "description": "Mirror a NativeScript project into an ns-edge project from a terminal or a Vite dev server",
   "license": "Apache-2.0",
   "type": "module",