@webority/ensemble 0.5.2 → 0.5.4

package/bin/ensemble.js

@@ -39,8 +39,8 @@ async function login(args) {
   core.openBrowser(grant.verificationUriComplete);
   core.log('• waiting for your approval …');
   const token = await waitForApproval(api, grant);
-  core.log('\n✓ Approved. Connecting this machine …');
-  const { runnerPath } = core.requireRuntime();
+  core.log('\n✓ Approved. Setting up this machine …');
+  const { runnerPath } = await core.ensureRuntime();
   reportSetup(core.finishSetup(api, token, runnerPath));
 }
 
@@ -73,7 +73,7 @@ async function enroll(args) {
   core.log('Ensemble — enrolling "' + name + '" with ' + api);
   core.log('• exchanging the enrollment token for a per-machine token');
   const machineToken = await core.enrollMachine(api, token, name);
-  const { runnerPath } = core.requireRuntime();
+  const { runnerPath } = await core.ensureRuntime();
   reportSetup(core.finishSetup(api, machineToken, runnerPath));
 }
 
@@ -97,7 +97,7 @@ function usage() {
 `ensemble — connect this machine to your Ensemble control plane
 
   ensemble login [--api <url>] [--name <machine>]
-        sign in via your browser + connect this machine (runtime is installed at npm install)
+        sign in via your browser + set up this machine (downloads the runtime on first run)
   ensemble enroll --token <enrollment-token> [--api <url>] [--name <machine>]
         headless / CI: enrol with an enrollment token from the portal
   ensemble install        (re)download the runner + bus for this platform

package/lib/core.js

@@ -101,20 +101,58 @@ function requireRuntime() {
   return runtimePaths();
 }
 
+// Ensure the runner + bus are present, downloading them if this is the first run. Called by
+// `login`/`enroll` AFTER authentication, so the whole thing is: `npm i` then `ensemble login`.
+async function ensureRuntime() {
+  if (runtimeInstalled()) {
+    return runtimePaths();
+  }
+  return ensureBinaries();
+}
+
+// The per-platform npm optionalDependency (esbuild model): npm installs only the one matching this
+// OS/arch, with the binaries inside. Returns its directory, or null if it isn't installed (then we
+// fall back to the CDN). require.resolve finds it whether hoisted or nested in node_modules.
+function platformPackageDir() {
+  const map = {
+    'win-x64': '@webority/ensemble-win-x64',
+    'osx-arm64': '@webority/ensemble-darwin-arm64',
+    'osx-x64': '@webority/ensemble-darwin-x64',
+    'linux-x64': '@webority/ensemble-linux-x64',
+    'linux-arm64': '@webority/ensemble-linux-arm64',
+  };
+  const pkg = map[platform().key];
+  if (!pkg) return null;
+  try {
+    return path.dirname(require.resolve(pkg + '/package.json'));
+  } catch (e) {
+    return null;
+  }
+}
+
+// Put the runner + bus in ~/.ensemble (the stable location the daemon, hooks, and autostart use).
+// Source them from the npm-installed platform package (instant copy, no download); only if that
+// package isn't present do we download from the CDN. So `npm i` delivers the binary and `login`
+// just copies + wires it.
 async function ensureBinaries() {
   ensureDirs();
   const pf = platform();
   assertSupported();
   const busPath = path.join(BIN_DIR, 'ensemble-bus' + pf.exe);
   const runnerPath = path.join(RUNNER_DIR, 'Ensemble.Runner' + pf.exe);
+  const pkgDir = platformPackageDir();
   const targets = [
-    { name: 'ensemble-bus-' + pf.key + pf.exe, dest: busPath },
-    { name: 'ensemble-runner-' + pf.key + pf.exe, dest: runnerPath },
+    { src: pkgDir && path.join(pkgDir, 'ensemble-bus' + pf.exe), cdn: 'ensemble-bus-' + pf.key + pf.exe, dest: busPath },
+    { src: pkgDir && path.join(pkgDir, 'Ensemble.Runner' + pf.exe), cdn: 'ensemble-runner-' + pf.key + pf.exe, dest: runnerPath },
   ];
   for (const t of targets) {
     if (fs.existsSync(t.dest) && fs.statSync(t.dest).size > 0) continue;
-    log('  downloading ' + t.name + ' …');
-    await downloadTo(DL_BASE + '/' + t.name, t.dest);
+    if (t.src && fs.existsSync(t.src) && fs.statSync(t.src).size > 0) {
+      fs.copyFileSync(t.src, t.dest); // from the npm platform package — no download
+    } else {
+      log('  downloading ' + t.cdn + ' …');
+      await downloadTo(DL_BASE + '/' + t.cdn, t.dest);
+    }
     if (pf.os !== 'windows') {
       fs.chmodSync(t.dest, 0o755);
       // macOS requires at least an ad-hoc signature to run an unsigned binary.
@@ -315,5 +353,5 @@ module.exports = {
   log, warn, die, platform, DEFAULT_API, ENSEMBLE_DIR, RUNNER_DIR, BIN_DIR,
   ensureBinaries, enrollMachine, writeRunnerConfig, wireHooks, installAutostart, startRunner, request,
   sleep, openBrowser, startDevice, pollDevice, finishSetup, assertSupported,
-  runtimePaths, runtimeInstalled, requireRuntime,
+  runtimePaths, runtimeInstalled, requireRuntime, ensureRuntime,
 };

package/package.json

@@ -1,16 +1,20 @@
 {
   "name": "@webority/ensemble",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Connect this machine to your Ensemble control plane — runs the local agent runner and wires the ensemble-bus session bus so your coding sessions talk (per-org, isolated).",
   "bin": {
     "ensemble": "bin/ensemble.js"
   },
-  "scripts": {
-    "postinstall": "node lib/postinstall.js"
-  },
   "engines": {
     "node": ">=18"
   },
+  "optionalDependencies": {
+    "@webority/ensemble-darwin-arm64": "0.5.4",
+    "@webority/ensemble-darwin-x64": "0.5.4",
+    "@webority/ensemble-linux-arm64": "0.5.4",
+    "@webority/ensemble-linux-x64": "0.5.4",
+    "@webority/ensemble-win-x64": "0.5.4"
+  },
   "files": [
     "bin",
     "lib",

package/lib/postinstall.js

@@ -1,22 +0,0 @@
-'use strict';
-// Runs at `npm install` (postinstall). Downloads the runner + bus for this platform so that
-// `ensemble login` is auth-only. Resilient by design: any failure (offline, unsupported OS,
-// --ignore-scripts) warns and exits 0 so it never breaks `npm install` — `ensemble install`
-// (or the next install) can retry.
-const core = require('./core');
-
-(async () => {
-  try {
-    if (core.runtimeInstalled()) {
-      return; // already present (e.g. reinstall of the same version)
-    }
-    core.assertSupported();
-    core.log('Ensemble: installing the runner + bus for this machine …');
-    await core.ensureBinaries();
-    core.log('Ensemble: runtime installed. Next:  ensemble login');
-  } catch (e) {
-    core.warn('Ensemble: could not install the runtime now (' + (e && e.message ? e.message : e) + ').');
-    core.warn('          Run  ensemble install  when ready, then  ensemble login.');
-    // exit 0 — never fail `npm install`.
-  }
-})();