@cloudops-tools/cli 0.1.1 → 0.1.3

package/bin/cloudops-tools.js

@@ -1,24 +1,42 @@
 #!/usr/bin/env node
 
 import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import process from "node:process";
-import { fileURLToPath } from "node:url";
 
-const here = dirname(fileURLToPath(import.meta.url));
-const binaryName = process.platform === "win32" ? "cloudops-tools.exe" : "cloudops-tools";
-const binaryPath = resolve(here, "..", "dist-native", binaryName);
+const PLATFORMS = {
+  "darwin-arm64": { pkg: "@cloudops-tools/cli-darwin-arm64", bin: "cloudops-tools" },
+  "linux-x64": { pkg: "@cloudops-tools/cli-linux-x64", bin: "cloudops-tools" },
+  "win32-x64": { pkg: "@cloudops-tools/cli-win32-x64", bin: "cloudops-tools.exe" },
+};
 
-if (!existsSync(binaryPath)) {
-  console.error("cloudops-tools native binary not found.");
-  console.error("Reinstall the package or set CLOUDOPS_TOOLS_SKIP_NATIVE_INSTALL=0 and retry.");
+const platformKey = `${process.platform}-${process.arch}`;
+
+if (!(platformKey in PLATFORMS)) {
+  console.error(
+    `cloudops-tools: unsupported platform ${process.platform}/${process.arch}.\n` +
+      `Supported: ${Object.keys(PLATFORMS).join(", ")}`,
+  );
+  process.exit(1);
+}
+
+const platform = PLATFORMS[/** @type {keyof typeof PLATFORMS} */ (platformKey)];
+
+let binaryPath;
+try {
+  const require = createRequire(import.meta.url);
+  const pkgDir = dirname(require.resolve(`${platform.pkg}/package.json`));
+  binaryPath = resolve(pkgDir, platform.bin);
+} catch {
+  console.error(
+    `cloudops-tools: could not find package "${platform.pkg}".\n` +
+      "Make sure optional dependencies are installed (do not use --no-optional).",
+  );
   process.exit(1);
 }
 
-const result = spawnSync(binaryPath, process.argv.slice(2), {
-  stdio: "inherit",
-});
+const result = spawnSync(binaryPath, process.argv.slice(2), { stdio: "inherit" });
 
 if (result.error) {
   console.error(result.error.message);

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "@cloudops-tools/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jfalava/cloudops-tools.git",
+    "directory": "cli"
+  },
   "bin": {
     "cloudops-tools": "./bin/cloudops-tools.js"
   },
   "files": [
-    "bin",
-    "scripts"
+    "bin"
   ],
   "type": "module",
   "module": "./src/app.ts",
   "scripts": {
     "build:all": "bun run check && bun run build:windows-x64 && bun run build:linux-x64 && bun run build:macOS-arm",
     "build:linux-x64": "bun build --compile --minify --sourcemap --bytecode --target=bun-linux-x64-modern --define BUILD_VERSION='\"'${BUILD_VERSION:-0.5}'\"' ./src/app.ts --outfile dist/cloudops-tools && cd dist && zip cloudops-tools-linux-x64.zip cloudops-tools",
-    "build:macOS-arm": "bun build --compile --minify --sourcemap --bytecode --target=bun-darwin-arm64 --define BUILD_VERSION='\"'${BUILD_VERSION:-0.5}'\"' ./src/app.ts --outfile dist/cloudops-tools.app && cd dist && zip cloudops-tools-macos-arm.zip cloudops-tools.app",
+    "build:macOS-arm": "bun build --compile --minify --sourcemap --bytecode --target=bun-darwin-arm64 --define BUILD_VERSION='\"'${BUILD_VERSION:-0.5}'\"' ./src/app.ts --outfile dist/cloudops-tools && cd dist && zip cloudops-tools-macos-arm.zip cloudops-tools",
     "build:windows-x64": "bun build --compile --minify --sourcemap --bytecode --target=bun-windows-x64-modern --define BUILD_VERSION='\"'${BUILD_VERSION:-0.5}'\"' ./src/app.ts --outfile dist/cloudops-tools.exe && cd dist && zip cloudops-tools-windows-x64.zip cloudops-tools.exe",
     "check": "tsgo --noEmit && oxlint --fix --type-aware",
     "format": "oxfmt",
     "lint": "oxlint --type-aware",
-    "postinstall": "node ./scripts/install-native.js",
     "typecheck": "tsgo --noEmit"
   },
-  "dependencies": {},
   "devDependencies": {
     "@cloudops-tools/sdk": "workspace:*",
     "@effect/cli": "catalog:effect",
@@ -41,5 +43,10 @@
     "oxlint-tsgolint": "catalog:build",
     "picocolors": "1.1.1",
     "typescript": "catalog:build"
+  },
+  "optionalDependencies": {
+    "@cloudops-tools/cli-darwin-arm64": "0.1.3",
+    "@cloudops-tools/cli-linux-x64": "0.1.3",
+    "@cloudops-tools/cli-win32-x64": "0.1.3"
   }
 }

package/scripts/install-native.js

@@ -1,151 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-console */
-
-import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync, chmodSync } from "node:fs";
-import { get } from "node:https";
-import { dirname, resolve } from "node:path";
-import process from "node:process";
-import { pipeline } from "node:stream/promises";
-import { fileURLToPath } from "node:url";
-
-const here = dirname(fileURLToPath(import.meta.url));
-const cliDir = resolve(here, "..");
-const repoRoot = resolve(cliDir, "..");
-const pkgJsonPath = resolve(cliDir, "package.json");
-const distDir = resolve(cliDir, "dist-native");
-
-const shouldSkipInstall = () => {
-  if (process.env.CLOUDOPS_TOOLS_SKIP_NATIVE_INSTALL === "1") {
-    return true;
-  }
-
-  // Do not auto-download when working from the monorepo checkout.
-  if (
-    existsSync(resolve(repoRoot, ".git")) &&
-    process.env.CLOUDOPS_TOOLS_FORCE_NATIVE_INSTALL !== "1"
-  ) {
-    return true;
-  }
-
-  return false;
-};
-
-const platformAssetName = () => {
-  if (process.platform === "linux" && process.arch === "x64") {
-    return "cloudops-tools-linux-x64";
-  }
-  if (process.platform === "win32" && process.arch === "x64") {
-    return "cloudops-tools-windows-x64.exe";
-  }
-  if (process.platform === "darwin" && process.arch === "arm64") {
-    return "cloudops-tools-macos-arm64";
-  }
-
-  throw new Error(
-    `Unsupported platform for prebuilt binary: ${process.platform}/${process.arch}. ` +
-      "Build from source or use a supported platform.",
-  );
-};
-
-const readVersion = () => {
-  const packageJsonText = readFileSync(pkgJsonPath, "utf8");
-  const versionMatch = packageJsonText.match(/"version"\s*:\s*"([^"]+)"/);
-  const version = versionMatch?.[1];
-  if (!version) {
-    throw new Error("Failed to read package version from package.json");
-  }
-  return version;
-};
-
-const downloadToFile = (url, outputPath) =>
-  new Promise((resolvePromise, rejectPromise) => {
-    const request = get(
-      url,
-      {
-        headers: {
-          "User-Agent": "cloudops-tools-cli-installer",
-          Accept: "application/octet-stream",
-        },
-      },
-      async (response) => {
-        const statusCode = response.statusCode ?? 0;
-
-        if ([301, 302, 303, 307, 308].includes(statusCode)) {
-          const location = response.headers.location;
-          response.resume();
-          if (!location) {
-            rejectPromise(new Error(`Redirect without location for ${url}`));
-            return;
-          }
-          try {
-            await downloadToFile(location, outputPath);
-            resolvePromise();
-          } catch (error) {
-            rejectPromise(error);
-          }
-          return;
-        }
-
-        if (statusCode < 200 || statusCode >= 300) {
-          response.resume();
-          rejectPromise(new Error(`HTTP ${statusCode} while downloading ${url}`));
-          return;
-        }
-
-        const file = createWriteStream(outputPath);
-        try {
-          await pipeline(response, file);
-          resolvePromise();
-        } catch (error) {
-          rejectPromise(error);
-        }
-      },
-    );
-
-    request.on("error", rejectPromise);
-  });
-
-const install = async () => {
-  if (shouldSkipInstall()) {
-    console.log("[cloudops-tools] Skipping native binary install in local workspace.");
-    return;
-  }
-
-  mkdirSync(distDir, { recursive: true });
-
-  const version = readVersion();
-  const repo = process.env.CLOUDOPS_TOOLS_GITHUB_REPO ?? "jfalava/cloudops-tools-draft";
-  const assetName = platformAssetName();
-  const targetName = process.platform === "win32" ? "cloudops-tools.exe" : "cloudops-tools";
-  const targetPath = resolve(distDir, targetName);
-
-  const candidateTags = [`v${version}`, version];
-  let lastError;
-
-  for (const tag of candidateTags) {
-    const assetUrl = `https://github.com/${repo}/releases/download/${tag}/${assetName}`;
-    try {
-      rmSync(targetPath, { force: true });
-      await downloadToFile(assetUrl, targetPath);
-
-      if (process.platform !== "win32") {
-        chmodSync(targetPath, 0o755);
-      }
-
-      console.log(`[cloudops-tools] Installed native binary from ${assetUrl}`);
-      return;
-    } catch (error) {
-      lastError = error;
-    }
-  }
-
-  throw new Error(
-    `[cloudops-tools] Failed to download native binary for version ${version}. ` +
-      `Last error: ${String(lastError)}`,
-  );
-};
-
-install().catch((error) => {
-  console.error(String(error));
-  process.exit(1);
-});