driggsby 0.1.21 → 0.1.23

package/bin/driggsby

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+import { readPackageJson, resolvePlatform, unsupportedPlatformMessage, } from "../lib/artifacts.js";
+const packageJson = readPackageJson();
+const resolution = resolvePlatform(packageJson);
+if (!resolution.platform) {
+    console.error(unsupportedPlatformMessage(resolution));
+    process.exit(1);
+}
+console.error("Driggsby native binary is not active. Reinstall with npm scripts enabled, or rerun with npm_config_foreground_scripts=true to see installer output.");
+process.exit(1);

package/install.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { createHash } from "node:crypto";
-import { chmodSync, createWriteStream, existsSync, lstatSync, mkdtempSync, mkdirSync, rmSync, } from "node:fs";
+import { createHash, randomUUID } from "node:crypto";
+import { chmodSync, createWriteStream, existsSync, lstatSync, mkdtempSync, mkdirSync, renameSync, rmSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
 import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import { installDirectory, installedBinaryPath, readPackageJson, resolvePlatform, unsupportedPlatformMessage, } from "./lib/artifacts.js";
+import { packageBinDirectory, packageBinPath, readPackageJson, resolvePlatform, unsupportedPlatformMessage, } from "./lib/artifacts.js";
 import { readCommandOutput, writeCommandOutputToFile } from "./lib/process.js";
 const maxArtifactBytes = 64 * 1024 * 1024;
 const packageJson = readPackageJson();
@@ -13,14 +13,15 @@ try {
     await install();
 }
 catch (error) {
-    if (error instanceof Error) {
-        console.error(error.message);
-    }
-    else {
-        console.error(error);
-    }
+    console.error(publicInstallErrorMessage(error));
     process.exit(1);
 }
+function publicInstallErrorMessage(error) {
+    if (error instanceof Error && error.message.startsWith("Driggsby ")) {
+        return error.message;
+    }
+    return "Driggsby native binary could not be installed. Check your network connection and reinstall with npm scripts enabled.";
+}
 async function install() {
     const resolution = resolvePlatform(packageJson);
     const platform = resolution.platform;
@@ -28,12 +29,10 @@ async function install() {
         console.warn(unsupportedPlatformMessage(resolution));
         return;
     }
-    const binaryPath = installedBinaryPath(platform.binaryPath);
-    if (existsSync(binaryPath)) {
-        return;
-    }
-    rmSync(installDirectory, { force: true, recursive: true });
-    mkdirSync(installDirectory, { recursive: true });
+    validatePlatformConfig(platform);
+    ensurePackageBinDirectory();
+    const binaryPath = packageBinPath;
+    const tempBinaryPath = join(packageBinDirectory, `.${platform.binaryPath}.${randomUUID()}.tmp`);
     const artifactUrl = `${packageJson.driggsbyArtifacts.baseUrl}/${platform.artifactName}`;
     const tempDirectory = mkdtempSync(join(tmpdir(), "driggsby-install-"));
     chmodSync(tempDirectory, 0o700);
@@ -44,17 +43,35 @@ async function install() {
             throw new Error(`Driggsby package is missing a checksum for ${platform.artifactName}.`);
         }
         await downloadAndVerifyFile(artifactUrl, tempArtifact, expectedChecksum);
-        extractTarball(tempArtifact, installDirectory, platform.binaryPath);
-        chmodSync(binaryPath, 0o755);
+        extractTarball(tempArtifact, tempBinaryPath, platform.binaryPath);
+        chmodSync(tempBinaryPath, 0o755);
+        renameSync(tempBinaryPath, binaryPath);
     }
     catch (error) {
-        rmSync(installDirectory, { force: true, recursive: true });
+        rmSync(tempBinaryPath, { force: true });
         throw error;
     }
     finally {
         rmSync(tempDirectory, { force: true, recursive: true });
     }
 }
+function validatePlatformConfig(platform) {
+    if (platform.binaryPath !== "driggsby") {
+        throw new Error("Driggsby package contains unsupported binary metadata.");
+    }
+    if (!/^driggsby-[A-Za-z0-9_-]+\.tar\.xz$/.test(platform.artifactName)) {
+        throw new Error("Driggsby package contains unsupported artifact metadata.");
+    }
+}
+function ensurePackageBinDirectory() {
+    if (!existsSync(packageBinDirectory)) {
+        mkdirSync(packageBinDirectory, { recursive: true });
+    }
+    const stats = lstatSync(packageBinDirectory);
+    if (!stats.isDirectory() || stats.isSymbolicLink()) {
+        throw new Error("Driggsby package bin directory is not a regular directory.");
+    }
+}
 async function downloadAndVerifyFile(url, destination, expectedChecksum) {
     const response = await fetch(url);
     if (!response.ok || response.body === null) {
@@ -86,16 +103,24 @@ async function downloadAndVerifyFile(url, destination, expectedChecksum) {
 function extractTarball(artifactPath, destination, binaryPath) {
     const tarPath = trustedTarPath();
     const entry = findBinaryTarEntry(tarPath, artifactPath, binaryPath);
-    const installedBinary = join(destination, binaryPath);
-    writeCommandOutputToFile(tarPath, ["-xOf", artifactPath, "--", entry], installedBinary, maxArtifactBytes);
-    if (!existsSync(installedBinary)) {
+    assertRegularTarEntry(tarPath, artifactPath, entry, binaryPath);
+    writeCommandOutputToFile(tarPath, ["-xOf", artifactPath, "--", entry], destination, maxArtifactBytes);
+    if (!existsSync(destination)) {
         throw new Error(`Driggsby archive did not contain expected binary ${binaryPath}.`);
     }
-    const installedBinaryStats = lstatSync(installedBinary);
+    const installedBinaryStats = lstatSync(destination);
     if (!installedBinaryStats.isFile() || installedBinaryStats.isSymbolicLink()) {
         throw new Error(`Driggsby archive entry ${binaryPath} was not a regular file.`);
     }
 }
+function assertRegularTarEntry(tarPath, artifactPath, entry, binaryPath) {
+    const listings = readCommandOutput(tarPath, ["-tvf", artifactPath, "--", entry])
+        .split("\n")
+        .filter((line) => line.trim().length > 0);
+    if (listings.length !== 1 || !listings[0]?.startsWith("-")) {
+        throw new Error(`Driggsby archive entry ${binaryPath} was not a regular file.`);
+    }
+}
 function trustedTarPath() {
     for (const candidate of ["/usr/bin/tar", "/bin/tar"]) {
         if (existsSync(candidate)) {

package/lib/artifacts.js

@@ -2,13 +2,11 @@ import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 export const packageDirectory = dirname(dirname(fileURLToPath(import.meta.url)));
-export const installDirectory = join(packageDirectory, "node_modules", ".bin_real");
+export const packageBinDirectory = join(packageDirectory, "bin");
+export const packageBinPath = join(packageBinDirectory, "driggsby");
 export function readPackageJson() {
     return JSON.parse(readFileSync(join(packageDirectory, "package.json"), "utf8"));
 }
-export function installedBinaryPath(binaryPath) {
-    return join(installDirectory, binaryPath);
-}
 export function resolvePlatform(packageJson) {
     const triple = targetTriple();
     return {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "driggsby",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Local MCP broker and CLI for connecting AI clients to Driggsby",
   "license": "Apache-2.0",
   "repository": "https://github.com/thegoodsoftwareco/driggsby-cli",
   "type": "module",
   "bin": {
-    "driggsby": "run-driggsby.js"
+    "driggsby": "bin/driggsby"
   },
   "scripts": {
     "postinstall": "node ./install.js"
@@ -16,20 +16,20 @@
     "npm": ">=9"
   },
   "files": [
+    "bin",
     "LICENSE",
     "README.md",
     "install.js",
     "lib",
-    "package.json",
-    "run-driggsby.js"
+    "package.json"
   ],
   "driggsbyArtifacts": {
-    "baseUrl": "https://github.com/thegoodsoftwareco/driggsby-cli/releases/download/driggsby-v0.1.21",
+    "baseUrl": "https://github.com/thegoodsoftwareco/driggsby-cli/releases/download/driggsby-v0.1.23",
     "checksums": {
-      "driggsby-aarch64-apple-darwin.tar.xz": "1bdd63ea017a771ed5ed6e7fa1ab8fe8469949509b6763d8a71b989251611e11",
-      "driggsby-x86_64-apple-darwin.tar.xz": "cef45b06f66cd68aeb82ca288a4a52e79e1abd4d105acebb05d62ed7f04cf3a1",
-      "driggsby-aarch64-unknown-linux-gnu.tar.xz": "93b2433dede66d40c2320a7fda9eb46f31406842b63c3d436ea11f2c78fab5eb",
-      "driggsby-x86_64-unknown-linux-gnu.tar.xz": "9f41aac3cb140f59fe0cb62882f5571916b5f6fda873e30529f3732f48d80f70"
+      "driggsby-aarch64-apple-darwin.tar.xz": "cd778960741ab9c20393e1f2e47b8174e625c45f8ed74e0d111c5f19e7abc8e4",
+      "driggsby-x86_64-apple-darwin.tar.xz": "61e422da8748ef7049b7753004c83461ddc37994f35de1576d2c4e8ac5d03612",
+      "driggsby-aarch64-unknown-linux-gnu.tar.xz": "c8d53da5f0e9a4259fd5f1867ca6f624d8ebaec67890f32258611a8e5dfaac37",
+      "driggsby-x86_64-unknown-linux-gnu.tar.xz": "a6b1928f4a2302a6744a69b59fd42f924c0ef0e6592b7fc98204ae82f9616335"
     },
     "supportedPlatforms": {
       "aarch64-apple-darwin": {

package/run-driggsby.js

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-import { existsSync } from "node:fs";
-import { installedBinaryPath, readPackageJson, resolvePlatform, unsupportedPlatformMessage, } from "./lib/artifacts.js";
-import { spawnFileAndExit } from "./lib/process.js";
-const packageJson = readPackageJson();
-const resolution = resolvePlatform(packageJson);
-if (!resolution.platform) {
-    console.error(unsupportedPlatformMessage(resolution));
-    process.exit(1);
-}
-const binaryPath = installedBinaryPath(resolution.platform.binaryPath);
-if (!existsSync(binaryPath)) {
-    console.error("Driggsby native binary is not installed. Reinstall with npm scripts enabled, or rerun with npm_config_foreground_scripts=true to see installer output.");
-    process.exit(1);
-}
-spawnFileAndExit(binaryPath, process.argv.slice(2));