@magneticjs/cli 0.1.3 → 0.1.5

package/dist/cli.js

@@ -151,21 +151,24 @@ import { build } from "esbuild";
 import { join as join2, dirname as dirname2 } from "node:path";
 import { mkdirSync, existsSync as existsSync2, statSync as statSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, copyFileSync } from "node:fs";
 import { createRequire } from "node:module";
-function copyTransportWasm(appDir, monorepoRoot) {
+function copyFrameworkAsset(filename, appDir, monorepoRoot) {
   const publicDir = join2(appDir, "public");
-  const dest = join2(publicDir, "transport.wasm");
+  const dest = join2(publicDir, filename);
   if (existsSync2(dest)) return true;
   const candidates = [];
   if (monorepoRoot) {
-    candidates.push(join2(monorepoRoot, "js/packages/magnetic-server/wasm/transport.wasm"));
+    candidates.push(join2(monorepoRoot, "js/packages/magnetic-server/wasm", filename));
+    if (filename === "magnetic.js") {
+      candidates.push(join2(monorepoRoot, "js/packages/sdk-web-runtime/dist/magnetic.min.js"));
+    }
   }
   try {
     const require2 = createRequire(join2(appDir, "package.json"));
     const serverPkg = require2.resolve("@magneticjs/server");
-    candidates.push(join2(dirname2(serverPkg), "..", "wasm", "transport.wasm"));
+    candidates.push(join2(dirname2(serverPkg), "..", "wasm", filename));
   } catch {
   }
-  candidates.push(join2(import.meta.dirname || __dirname, "..", "wasm", "transport.wasm"));
+  candidates.push(join2(import.meta.dirname || __dirname, "..", "wasm", filename));
   for (const src of candidates) {
     if (existsSync2(src)) {
       mkdirSync(publicDir, { recursive: true });
@@ -175,6 +178,12 @@ function copyTransportWasm(appDir, monorepoRoot) {
   }
   return false;
 }
+function copyTransportWasm(appDir, monorepoRoot) {
+  return copyFrameworkAsset("transport.wasm", appDir, monorepoRoot);
+}
+function copyClientRuntime(appDir, monorepoRoot) {
+  return copyFrameworkAsset("magnetic.js", appDir, monorepoRoot);
+}
 async function bundleApp(opts) {
   const outDir = opts.outDir || join2(opts.appDir, "dist");
   const outFile = opts.outFile || "app.js";
@@ -182,6 +191,7 @@ async function bundleApp(opts) {
   if (!existsSync2(outDir)) {
     mkdirSync(outDir, { recursive: true });
   }
+  copyClientRuntime(opts.appDir, opts.monorepoRoot);
   copyTransportWasm(opts.appDir, opts.monorepoRoot);
   const alias = {};
   if (opts.monorepoRoot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magneticjs/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Magnetic CLI — build, dev, and deploy server-driven UI apps",
   "type": "module",
   "bin": {

package/scripts/install-server.js

@@ -4,8 +4,8 @@
  * for the current platform during `npm install @magneticjs/cli`.
  *
  * Update strategy:
- *   - Version is read from ../package.json (matches @magneticjs/cli version)
- *   - When user runs `npm update @magneticjs/cli`, this script re-runs
+ *   - SERVER_VERSION is hardcoded (decoupled from npm package version)
+ *   - Only bump SERVER_VERSION when a new binary is uploaded to GitHub Releases
  *   - Binary version is tracked in bin/.version
  *   - If version mismatch → re-download; if match → skip
  *
@@ -26,18 +26,18 @@ const binDir = join(pkgDir, 'bin');
 const binPath = join(binDir, 'magnetic-v8-server');
 const versionFile = join(binDir, '.version');
 
-// Read version from package.json (stays in sync with npm version)
-const pkg = JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf-8'));
-const version = pkg.version;
+// Server binary version — decoupled from npm package version.
+// Only bump this when a new binary is uploaded to GitHub Releases.
+const SERVER_VERSION = '0.1.0';
 
-// Check if installed binary matches current CLI version
+// Check if installed binary matches current server version
 if (existsSync(binPath) && existsSync(versionFile)) {
   const installed = readFileSync(versionFile, 'utf-8').trim();
-  if (installed === version) {
-    console.log(`[magnetic] Server binary v${version} already installed, skipping`);
+  if (installed === SERVER_VERSION) {
+    console.log(`[magnetic] Server binary v${SERVER_VERSION} already installed, skipping`);
     process.exit(0);
   }
-  console.log(`[magnetic] Server binary outdated (${installed} → ${version}), updating...`);
+  console.log(`[magnetic] Server binary outdated (${installed} → ${SERVER_VERSION}), updating...`);
 }
 
 // Determine platform target
@@ -60,7 +60,7 @@ if (!target) {
 }
 
 const baseUrl = process.env.MAGNETIC_BINARY_URL ||
-  `https://github.com/inventhq/magnetic/releases/download/v${version}`;
+  `https://github.com/inventhq/magnetic/releases/download/v${SERVER_VERSION}`;
 const filename = `magnetic-v8-server-${target}.tar.gz`;
 const url = `${baseUrl}/${filename}`;
 
@@ -91,8 +91,8 @@ try {
 
   if (downloaded && existsSync(binPath)) {
     chmodSync(binPath, 0o755);
-    writeFileSync(versionFile, version);
-    console.log(`[magnetic] ✓ Server binary v${version} installed: ${binPath}`);
+    writeFileSync(versionFile, SERVER_VERSION);
+    console.log(`[magnetic] ✓ Server binary v${SERVER_VERSION} installed: ${binPath}`);
   } else {
     throw new Error(`Download failed or binary not found after extraction`);
   }

package/src/bundler.ts

@@ -27,33 +27,35 @@ export interface BundleResult {
 }
 
 /**
- * Copy transport.wasm into the app's public/ directory.
- * Looks in @magneticjs/server/wasm/ (npm) or monorepo path.
+ * Copy a framework asset into the app's public/ directory.
+ * Searches monorepo, npm-installed @magneticjs/server, and CLI's own wasm/ dir.
  */
-export function copyTransportWasm(appDir: string, monorepoRoot?: string): boolean {
+function copyFrameworkAsset(filename: string, appDir: string, monorepoRoot?: string): boolean {
   const publicDir = join(appDir, 'public');
-  const dest = join(publicDir, 'transport.wasm');
+  const dest = join(publicDir, filename);
 
   // Already there — skip
   if (existsSync(dest)) return true;
 
-  // Candidate locations for the WASM file
   const candidates: string[] = [];
 
-  // Monorepo path
+  // Monorepo paths
   if (monorepoRoot) {
-    candidates.push(join(monorepoRoot, 'js/packages/magnetic-server/wasm/transport.wasm'));
+    candidates.push(join(monorepoRoot, 'js/packages/magnetic-server/wasm', filename));
+    if (filename === 'magnetic.js') {
+      candidates.push(join(monorepoRoot, 'js/packages/sdk-web-runtime/dist/magnetic.min.js'));
+    }
   }
 
   // npm-installed @magneticjs/server
   try {
     const require = createRequire(join(appDir, 'package.json'));
     const serverPkg = require.resolve('@magneticjs/server');
-    candidates.push(join(dirname(serverPkg), '..', 'wasm', 'transport.wasm'));
+    candidates.push(join(dirname(serverPkg), '..', 'wasm', filename));
   } catch {}
 
   // CLI's own bundled copy (sibling to dist/)
-  candidates.push(join(import.meta.dirname || __dirname, '..', 'wasm', 'transport.wasm'));
+  candidates.push(join(import.meta.dirname || __dirname, '..', 'wasm', filename));
 
   for (const src of candidates) {
     if (existsSync(src)) {
@@ -66,6 +68,20 @@ export function copyTransportWasm(appDir: string, monorepoRoot?: string): boolea
   return false;
 }
 
+/**
+ * Copy transport.wasm into the app's public/ directory.
+ */
+export function copyTransportWasm(appDir: string, monorepoRoot?: string): boolean {
+  return copyFrameworkAsset('transport.wasm', appDir, monorepoRoot);
+}
+
+/**
+ * Copy magnetic.js client runtime into the app's public/ directory.
+ */
+export function copyClientRuntime(appDir: string, monorepoRoot?: string): boolean {
+  return copyFrameworkAsset('magnetic.js', appDir, monorepoRoot);
+}
+
 /**
  * Bundle the generated bridge code into an IIFE for V8 consumption.
  * Uses esbuild with stdin so no temp file is needed.
@@ -79,7 +95,8 @@ export async function bundleApp(opts: BundleOptions): Promise<BundleResult> {
     mkdirSync(outDir, { recursive: true });
   }
 
-  // Ensure transport.wasm is in public/
+  // Ensure framework assets are in public/
+  copyClientRuntime(opts.appDir, opts.monorepoRoot);
   copyTransportWasm(opts.appDir, opts.monorepoRoot);
 
   // Resolve @magneticjs/server — in monorepo use actual path, otherwise npm package

package/wasm/magnetic.js

@@ -0,0 +1 @@
+(function(d) {var M = self.Magnetic = {};var root = null;var es = null;var wasm = null;var status = "disconnected";var queue = [];var keys = {};var deb = {};var lastHash = "";var enc = new TextEncoder();M.status = function() { return status; };M.connect = function(url, mount) {root = typeof mount == "string" ? d.querySelector(mount) : mount;es = new EventSource(url);es.onmessage = function(ev) {try {var raw = ev.data;if (wasm && wasm.store) {var bytes = enc.encode(raw);if (bytes.length <= 16384) {new Uint8Array(wasm.memory.buffer).set(bytes, wasm.input_ptr());if (wasm.store(bytes.length) === 0) return;}} else {var h = fnv(raw);if (h === lastHash) return;lastHash = h;}apply(JSON.parse(raw));} catch(e) { console.error("[magnetic] SSE error:", e); }};es.onerror = function() {if (wasm) status = "offline";};status = "connected";bind();};M.disconnect = function() {if (es) { es.close(); es = null; }status = "disconnected";};function apply(snap) {if (!root || !snap || !snap.root) return;var n = snap.root;if (n.key && keys[n.key] && keys[n.key].parentNode === root) {patch(keys[n.key], n);return;}root.textContent = "";root.appendChild(create(n));}M._apply = apply;function create(n) {var el = d.createElement(n.tag);if (n.key) { el.dataset.key = n.key; keys[n.key] = el; }setAttrs(el, n);if (n.events) for (var v in n.events) el.dataset["a_" + v] = n.events[v];if (n.text != null) el.textContent = n.text;if (n.children) for (var i = 0; i < n.children.length; i++) el.appendChild(create(n.children[i]));return el;}function patch(el, n) {setAttrs(el, n);if (n.events) {for (var v in n.events) el.dataset["a_" + v] = n.events[v];}var da = el.dataset;for (var dk in da) {if (dk.indexOf("a_") === 0) {var ev = dk.slice(2);if (!n.events || !(ev in n.events)) delete da[dk];}}if (n.children) {reconcile(el, n.children);} else if (n.text != null && n.tag != "input" && n.tag != "textarea") {el.textContent = n.text;} else if (!n.children && n.text == null && n.tag != "input" && n.tag != "textarea") {while (el.firstChild) {purgeKeys(el.firstChild);el.removeChild(el.firstChild);}}}function purgeKeys(el) {var k = el.dataset ? el.dataset.key : null;if (k) delete keys[k];var ch = el.firstChild;while (ch) { purgeKeys(ch); ch = ch.nextSibling; }}function reconcile(parent, descs) {var i, c, el, k;var newEls = [];var wantKeys = {};for (i = 0; i < descs.length; i++) {c = descs[i];if (c.key && keys[c.key]) {el = keys[c.key];patch(el, c);wantKeys[c.key] = true;} else {el = create(c);if (c.key) wantKeys[c.key] = true;}newEls.push(el);}var ch = parent.firstChild;while (ch) {var nx = ch.nextSibling;k = ch.dataset ? ch.dataset.key : null;if (!k || !wantKeys[k]) {purgeKeys(ch);parent.removeChild(ch);}ch = nx;}for (i = 0; i < newEls.length; i++) {if (parent.childNodes[i] !== newEls[i]) {parent.insertBefore(newEls[i], parent.childNodes[i] || null);}}}function setAttrs(el, n) {if (n.attrs) for (var k in n.attrs) el.setAttribute(k, n.attrs[k]);}function bind() {d.addEventListener("click", function(e) {var t = e.target.closest("[data-a_click]");if (t) { e.preventDefault(); send(t.dataset.a_click, {}); }});d.addEventListener("submit", function(e) {var t = e.target.closest("[data-a_submit]");if (t) {e.preventDefault();var p = {}, f = new FormData(t);f.forEach(function(v, k) { p[k] = v; });send(t.dataset.a_submit, p);t.querySelectorAll("input").forEach(function(i) { i.value = ""; });}});d.addEventListener("input", function(e) {var t = e.target.closest("[data-a_input]");if (t) {var a = t.dataset.a_input;clearTimeout(deb[a]);deb[a] = setTimeout(function() { send(a, { value: t.value }); }, 300);}});}M.send = send;function send(action, payload) {if (action.indexOf("navigate:") === 0) {var path = action.slice(9);history.pushState({}, "", path);action = "navigate";payload = { path: path };}var body = JSON.stringify({ action: action, payload: payload });fetch("/actions/" + encodeURIComponent(action), {method: "POST",headers: { "Content-Type": "application/json" },body: body}).then(function(r) { return r.text(); }).then(function(raw) {if (!raw || raw[0] !== "{") return;if (wasm && wasm.store) {var bytes = enc.encode(raw);if (bytes.length <= 16384) {new Uint8Array(wasm.memory.buffer).set(bytes, wasm.input_ptr());wasm.store(bytes.length);}} else {lastHash = fnv(raw);}try { apply(JSON.parse(raw)); } catch(e) {}}).catch(function() {});if (status != "connected") queue.push(body);}self.addEventListener("popstate", function() {send("navigate", { path: location.pathname + location.search });});M.loadWasm = function(url) {if (wasm !== null) return;wasm = 0;fetch(url).then(function(r) { return r.arrayBuffer(); }).then(function(b) { return WebAssembly.instantiate(b, {}); }).then(function(result) {wasm = result.instance.exports;while (queue.length) {var q = JSON.parse(queue.shift());send(q.action, q.payload);}}).catch(function() { wasm = null; });};function fnv(s) {var h = 0x811c9dc5;for (var i = 0; i < s.length; i++) {h ^= s.charCodeAt(i);h = Math.imul(h, 0x01000193);}return h;}})(document);