@themoltnet/cli 1.26.0 → 1.28.0

package/bin/moltnet.js

@@ -6,13 +6,35 @@ const fs = require('fs');
 const { execFileSync } = require('child_process');
 
 const binaryName = process.platform === 'win32' ? 'moltnet.exe' : 'moltnet';
-const binaryPath = path.join(__dirname, binaryName);
 
-if (!fs.existsSync(binaryPath)) {
+function findBinary() {
+  const pkgName = `@themoltnet/cli-${process.platform}-${process.arch}`;
+  try {
+    const pkgDir = path.dirname(require.resolve(`${pkgName}/package.json`));
+    const pkgPath = path.join(pkgDir, 'bin', binaryName);
+    if (fs.existsSync(pkgPath)) {
+      return pkgPath;
+    }
+  } catch {
+    // Platform package not installed
+  }
+
+  const localPath = path.join(__dirname, binaryName);
+  if (fs.existsSync(localPath)) {
+    return localPath;
+  }
+
+  return null;
+}
+
+const binaryPath = findBinary();
+
+if (!binaryPath) {
   console.error(
-    `moltnet binary not found at ${binaryPath}\n` +
-      'Run "node install.js" in the package directory, or download manually from:\n' +
-      '  https://github.com/getlarge/themoltnet/releases'
+    `moltnet binary not found for ${process.platform}-${process.arch}\n` +
+      `Install the platform package manually:\n` +
+      `  npm install @themoltnet/cli-${process.platform}-${process.arch}\n` +
+      `Or reinstall @themoltnet/cli to trigger the postinstall fallback.`
   );
   process.exit(1);
 }

package/install.js

@@ -4,44 +4,34 @@
 const https = require('https');
 const fs = require('fs');
 const path = require('path');
-const crypto = require('crypto');
 const zlib = require('zlib');
 const { execFileSync } = require('child_process');
 
 const VERSION = require('./package.json').version;
-const REPO = 'getlarge/themoltnet';
-const TAG = `cli-v${VERSION}`;
-const BASE_URL = `https://github.com/${REPO}/releases/download/${TAG}`;
-
-const PLATFORM_MAP = {
-  darwin: 'darwin',
-  linux: 'linux',
-  win32: 'windows',
-};
-
-const ARCH_MAP = {
-  x64: 'amd64',
-  arm64: 'arm64',
-};
 
 function getBinaryName() {
   return process.platform === 'win32' ? 'moltnet.exe' : 'moltnet';
 }
 
-function getBinaryPath() {
-  return path.join(__dirname, 'bin', getBinaryName());
+function getPlatformPackageName() {
+  return `@themoltnet/cli-${process.platform}-${process.arch}`;
 }
 
-function getArchiveName() {
-  const os = PLATFORM_MAP[process.platform];
-  const arch = ARCH_MAP[process.arch];
-  if (!os || !arch) {
-    throw new Error(
-      `Unsupported platform: ${process.platform}-${process.arch}`
-    );
+// Case 1 (happy path): the platform package was installed via
+// optionalDependencies. bin/moltnet.js resolves the binary in place at
+// runtime, so install.js has nothing to do.
+function tryPlatformPackage() {
+  const pkgName = getPlatformPackageName();
+  try {
+    const pkgDir = path.dirname(require.resolve(`${pkgName}/package.json`));
+    const binaryPath = path.join(pkgDir, 'bin', getBinaryName());
+    if (fs.existsSync(binaryPath)) {
+      return binaryPath;
+    }
+  } catch {
+    // Platform package not installed (e.g. --no-optional, yarn v1 optional bug)
   }
-  const ext = process.platform === 'win32' ? 'zip' : 'tar.gz';
-  return `moltnet_${VERSION}_${os}_${arch}.${ext}`;
+  return null;
 }
 
 function fetch(url, maxRedirects = 5) {
@@ -51,13 +41,15 @@ function fetch(url, maxRedirects = 5) {
     }
     https
       .get(url, { headers: { 'User-Agent': 'themoltnet-cli' } }, (res) => {
-        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        if (
+          res.statusCode >= 300 &&
+          res.statusCode < 400 &&
+          res.headers.location
+        ) {
           return resolve(fetch(res.headers.location, maxRedirects - 1));
         }
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(`HTTP ${res.statusCode} fetching ${url}`)
-          );
+          return reject(new Error(`HTTP ${res.statusCode} fetching ${url}`));
         }
         const chunks = [];
         res.on('data', (chunk) => chunks.push(chunk));
@@ -68,106 +60,61 @@ function fetch(url, maxRedirects = 5) {
   });
 }
 
-async function verifyChecksum(archiveBuffer, archiveName) {
-  const checksumsUrl = `${BASE_URL}/checksums.txt`;
-  const checksumsBuffer = await fetch(checksumsUrl);
-  const checksums = checksumsBuffer.toString('utf8');
+// Case 2 (fallback): fetch the platform package tarball directly from the npm
+// registry and extract the binary into local bin/. The registry is reachable
+// in most sandboxed environments where github.com is not.
+async function downloadFromNpm() {
+  const pkgName = getPlatformPackageName();
+  const bareName = pkgName.split('/')[1];
+  const tarballUrl = `https://registry.npmjs.org/${pkgName}/-/${bareName}-${VERSION}.tgz`;
 
-  const line = checksums.split('\n').find((l) => l.includes(archiveName));
-  if (!line) {
-    throw new Error(
-      `Checksum not found for ${archiveName} in checksums.txt`
-    );
-  }
+  console.log(`Downloading moltnet binary from ${tarballUrl}`);
+  const tarball = await fetch(tarballUrl);
+  const gunzipped = zlib.gunzipSync(tarball);
 
-  const expectedHash = line.split(/\s+/)[0];
-  const actualHash = crypto
-    .createHash('sha256')
-    .update(archiveBuffer)
-    .digest('hex');
-
-  if (actualHash !== expectedHash) {
-    throw new Error(
-      `Checksum mismatch for ${archiveName}:\n  expected: ${expectedHash}\n  actual:   ${actualHash}`
-    );
-  }
-}
-
-function extractTarGz(buffer, destDir) {
-  const tmpDir = path.join(__dirname, '.tmp');
-  const tmpFile = path.join(tmpDir, 'archive.tar.gz');
+  const tmpDir = path.join(__dirname, '.install-tmp');
+  fs.rmSync(tmpDir, { recursive: true, force: true });
   fs.mkdirSync(tmpDir, { recursive: true });
-  fs.writeFileSync(tmpFile, buffer);
-  try {
-    execFileSync('tar', ['xzf', tmpFile, '-C', destDir], {
-      stdio: 'pipe',
-    });
-  } finally {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  }
-}
+  const tmpTar = path.join(tmpDir, 'archive.tar');
+  fs.writeFileSync(tmpTar, gunzipped);
 
-function extractZip(buffer, destDir) {
-  const tmpDir = path.join(__dirname, '.tmp');
-  const tmpFile = path.join(tmpDir, 'archive.zip');
-  fs.mkdirSync(tmpDir, { recursive: true });
-  fs.writeFileSync(tmpFile, buffer);
   try {
-    execFileSync(
-      'powershell',
-      [
-        '-NoProfile',
-        '-Command',
-        `Expand-Archive -Path '${tmpFile}' -DestinationPath '${destDir}' -Force`,
-      ],
-      { stdio: 'pipe' }
-    );
+    execFileSync('tar', ['xf', tmpTar, '-C', tmpDir], { stdio: 'pipe' });
+
+    const extractedBinary = path.join(tmpDir, 'package', 'bin', getBinaryName());
+    if (!fs.existsSync(extractedBinary)) {
+      throw new Error(`Binary not found in tarball: ${extractedBinary}`);
+    }
+
+    const targetBinDir = path.join(__dirname, 'bin');
+    fs.mkdirSync(targetBinDir, { recursive: true });
+    const targetPath = path.join(targetBinDir, getBinaryName());
+    fs.copyFileSync(extractedBinary, targetPath);
+    if (process.platform !== 'win32') {
+      fs.chmodSync(targetPath, 0o755);
+    }
+    return targetPath;
   } finally {
     fs.rmSync(tmpDir, { recursive: true, force: true });
   }
 }
 
 async function main() {
-  const binaryPath = getBinaryPath();
-
-  if (fs.existsSync(binaryPath)) {
-    console.log(`moltnet binary already exists at ${binaryPath}, skipping download.`);
+  if (tryPlatformPackage()) {
     return;
   }
 
-  const archiveName = getArchiveName();
-  const archiveUrl = `${BASE_URL}/${archiveName}`;
-
-  console.log(`Downloading moltnet ${VERSION} for ${process.platform}-${process.arch}...`);
-  console.log(`  ${archiveUrl}`);
-
-  const archiveBuffer = await fetch(archiveUrl);
-
-  console.log('Verifying checksum...');
-  await verifyChecksum(archiveBuffer, archiveName);
-
-  const binDir = path.join(__dirname, 'bin');
-  fs.mkdirSync(binDir, { recursive: true });
-
-  console.log('Extracting...');
-  if (process.platform === 'win32') {
-    extractZip(archiveBuffer, binDir);
-  } else {
-    extractTarGz(archiveBuffer, binDir);
-  }
-
-  if (process.platform !== 'win32') {
-    fs.chmodSync(binaryPath, 0o755);
+  try {
+    const binaryPath = await downloadFromNpm();
+    console.log(`Installed moltnet ${VERSION} to ${binaryPath}`);
+  } catch (err) {
+    console.warn(`Warning: Failed to install moltnet binary: ${err.message}`);
+    console.warn(
+      `You can install the platform package manually:\n` +
+        `  npm install ${getPlatformPackageName()}@${VERSION}`
+    );
+    // Exit 0 so postinstall doesn't break install for the whole project
   }
-
-  console.log(`Installed moltnet ${VERSION} to ${binaryPath}`);
 }
 
-main().catch((err) => {
-  console.warn(`Warning: Failed to install moltnet binary: ${err.message}`);
-  console.warn(
-    `\nYou can download it manually from:\n  ${BASE_URL}/`
-  );
-  // Exit 0 so postinstall doesn't break `pnpm install` for the whole monorepo
-  process.exit(0);
-});
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/cli",
-  "version": "1.26.0",
+  "version": "1.28.0",
   "description": "CLI for MoltNet — AI agent identity and autonomy network",
   "license": "MIT",
   "repository": {
@@ -12,14 +12,22 @@
   "bin": {
     "moltnet": "bin/moltnet.js"
   },
-  "scripts": {
-    "postinstall": "node install.js"
-  },
   "files": [
     "bin/moltnet.js",
     "install.js"
   ],
   "engines": {
     "node": ">=18"
+  },
+  "optionalDependencies": {
+    "@themoltnet/cli-darwin-arm64": "1.28.0",
+    "@themoltnet/cli-linux-arm64": "1.28.0",
+    "@themoltnet/cli-darwin-x64": "1.28.0",
+    "@themoltnet/cli-win32-arm64": "1.28.0",
+    "@themoltnet/cli-linux-x64": "1.28.0",
+    "@themoltnet/cli-win32-x64": "1.28.0"
+  },
+  "scripts": {
+    "postinstall": "node install.js"
   }
-}
+}