@effectstream/npm-midnight-proof-server 0.3.99 → 0.100.9

package/binary.js

@@ -4,7 +4,8 @@ const axios = require("axios");
 const extract = require("extract-zip");
 const path = require("path");
 
-const CURRENT_BINARY_VERSION = "ledger-4.0.0";
+const CURRENT_BINARY_VERSION = "ledger-8.0.3";
+const FINAL_BINARY_NAME = "midnight-proof-server";
 
 /**
  * @returns {string} The platform and architecture of the current machine. Example: "linux-amd64"
@@ -35,8 +36,7 @@ function getBinaryUrl() {
     throw new Error(`Unsupported platform for binary execution: ${platform}`);
   }
 
-  // TODO: Replace placeholder link with real URL once available
-  return `https://paima-midnight.nyc3.cdn.digitaloceanspaces.com/binaries/midnight-proof-server-${platform}-${CURRENT_BINARY_VERSION}.zip`;
+  return `https://github.com/effectstream/binaries/releases/download/0.3.120/midnight-proof-server-${platform}-${CURRENT_BINARY_VERSION}.zip`;
 }
 
 async function downloadAndSaveBinary() {
@@ -62,14 +62,39 @@ async function unzipBinary() {
     fs.mkdirSync(destDir, { recursive: true });
   }
   await extract(zipPath, { dir: destDir });
+  
   const platform = getPlatform();
-  const parts = platform.split("-");
-  if (parts[0] === "linux") {
-    fs.chmodSync(
-      path.join(destDir, `midnight-proof-server-${platform}`),
-      0o755,
-    );
+  const extractedBinaryPath = path.join(
+    destDir,
+    `midnight-proof-server-${platform}-${CURRENT_BINARY_VERSION}`,
+  );
+  const finalBinaryPath = path.join(destDir, FINAL_BINARY_NAME);
+
+  // Rename the extracted file to midnight-proof-server
+  if (fs.existsSync(extractedBinaryPath)) {
+    if (fs.existsSync(finalBinaryPath)) {
+      fs.unlinkSync(finalBinaryPath);
+    }
+    fs.renameSync(extractedBinaryPath, finalBinaryPath);
+  } else {
+    throw new Error(`Extracted binary not found at: ${extractedBinaryPath}`);
   }
+
+  // Clean up any other extracted files (e.g., readme.md)
+  const files = fs.readdirSync(destDir);
+  for (const file of files) {
+    const filePath = path.join(destDir, file);
+    if (filePath !== finalBinaryPath && fs.statSync(filePath).isFile()) {
+      fs.unlinkSync(filePath);
+    }
+  }
+
+  if (!fs.existsSync(finalBinaryPath)) {
+    throw new Error(`Expected binary not found: ${finalBinaryPath}`);
+  }
+
+  fs.chmodSync(finalBinaryPath, 0o755);
+
   fs.unlinkSync(zipPath);
 }
 
@@ -78,4 +103,31 @@ async function binary() {
   await unzipBinary();
 }
 
-module.exports = { binary, getPlatform };
+async function cleanBinaries() {
+  const binaryDir = path.join(__dirname, "proof-server");
+  const zipPath = path.join(__dirname, "proof-server.zip");
+
+  let deletedFiles = [];
+
+  if (fs.existsSync(binaryDir)) {
+    try {
+      fs.rmSync(binaryDir, { recursive: true, force: true });
+      deletedFiles.push(binaryDir);
+    } catch (error) {
+      console.error(`Error removing directory ${binaryDir}:`, error.message);
+    }
+  }
+
+  if (fs.existsSync(zipPath)) {
+    try {
+      fs.unlinkSync(zipPath);
+      deletedFiles.push(zipPath);
+    } catch (error) {
+      console.error(`Error removing file ${zipPath}:`, error.message);
+    }
+  }
+
+  return deletedFiles;
+}
+
+module.exports = { binary, getPlatform, cleanBinaries };

package/index.js

@@ -3,16 +3,18 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 
-const { binary, getPlatform } = require("./binary.js");
+const { binary, getPlatform, cleanBinaries } = require("./binary.js");
 const { runMidnightProofServer } = require("./run_midnight_proof_server.js");
 const { checkIfDockerExists, pullDockerImage, runDockerContainer } = require(
   "./docker.js",
 );
 
+const FINAL_BINARY_NAME = "midnight-proof-server";
+
 function checkIfBinaryExists() {
-  const platform = getPlatform();
-  const binaryName = `midnight-proof-server-${platform}`;
-  return fs.existsSync(path.join(__dirname, "proof-server", binaryName));
+  return fs.existsSync(
+    path.join(__dirname, "proof-server", FINAL_BINARY_NAME),
+  );
 }
 
 function isBinarySupported() {
@@ -23,30 +25,40 @@ function isBinarySupported() {
 function showUsage() {
   console.log(`\nUsage: npm-midnight-proof-server [options] [args...]\n
 Options:
-  --docker    Force use of Docker container
-  --binary    Force binary execution (Linux only)
-  --help, -h  Show this help message\n`);
+  --docker         Force use of Docker container
+  --binary         Force binary execution (Linux only)
+  --clean-binaries Delete downloaded binaries and download them again
+  --only-clean     Only delete downloaded binaries without downloading them again
+  --help, -h       Show this help message\n`);
 }
 
 function parseFlags(argv) {
   const flags = {
     useDocker: false,
     useBinary: false,
+    cleanBinaries: false,
+    onlyClean: false,
     showHelp: false,
     remaining: [],
   };
   for (const arg of argv) {
     if (arg === "--docker") flags.useDocker = true;
     else if (arg === "--binary") flags.useBinary = true;
+    else if (arg === "--clean-binaries") flags.cleanBinaries = true;
+    else if (arg === "--only-clean") flags.onlyClean = true;
     else if (arg === "--help" || arg === "-h") flags.showHelp = true;
     else flags.remaining.push(arg);
   }
   return flags;
 }
 
-async function runWithBinary(env, args) {
-  if (!checkIfBinaryExists()) {
-    console.log("Binary not found, downloading...");
+async function runWithBinary(env, args, forceClean = false) {
+  if (forceClean || !checkIfBinaryExists()) {
+    if (forceClean) {
+      console.log("Cleaning downloaded binaries...");
+      await cleanBinaries();
+    }
+    console.log("Downloading binary...");
     await binary();
   } else {
     console.log("Using existing binary found in proof-server directory");
@@ -72,11 +84,31 @@ async function runWithDocker(env, args) {
     process.exit(0);
   }
 
+  // Handle --only-clean flag
+  if (flags.onlyClean) {
+    console.log("Cleaning downloaded binaries...");
+    const deletedFiles = await cleanBinaries();
+    if (deletedFiles.length > 0) {
+      console.log("Deleted:", deletedFiles.join(", "));
+    } else {
+      console.log("No downloaded binaries found to delete.");
+    }
+    process.exit(0);
+  }
+
   if (flags.useDocker && flags.useBinary) {
     console.error("Cannot use both --docker and --binary flags simultaneously");
     process.exit(1);
   }
 
+  // Validate clean flag usage
+  if (flags.cleanBinaries && flags.useDocker) {
+    console.error(
+      "Error: --clean-binaries flag cannot be used with --docker flag",
+    );
+    process.exit(1);
+  }
+
   if (flags.useDocker) {
     await runWithDocker(env, flags.remaining);
     return;
@@ -89,13 +121,13 @@ async function runWithDocker(env, args) {
       );
       process.exit(1);
     }
-    await runWithBinary(env, flags.remaining);
+    await runWithBinary(env, flags.remaining, flags.cleanBinaries);
     return;
   }
 
   // Automatic selection
   if (isBinarySupported()) {
-    await runWithBinary(env, flags.remaining);
+    await runWithBinary(env, flags.remaining, flags.cleanBinaries);
   } else {
     console.log(
       "Binary not supported on this platform, falling back to Docker...",
@@ -103,3 +135,7 @@ async function runWithDocker(env, args) {
     await runWithDocker(env, flags.remaining);
   }
 })();
+
+module.exports = {
+  cleanBinaries,
+};

package/package.json

@@ -1,24 +1,35 @@
 {
-    "name": "@effectstream/npm-midnight-proof-server",
-    "version": "0.3.99",
-    "description": "A wrapper for the Midnight proof server binary",
-    "main": "index.js",
-    "bin": {
-        "npm-midnight-proof-server": "index.js"
-    },
-    "scripts": {
-        "start": "node index.js"
-    },
-    "supportedPlatforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "macos-arm64"
-    ],
-    "dependencies": {
-        "axios": "^1.6.8",
-        "extract-zip": "^2.0.1"
-    },
-    "type": "commonjs",
-    "author": "Paima Studios",
-    "license": "ISC"
-}
+  "name": "@effectstream/npm-midnight-proof-server",
+  "version": "0.100.9",
+  "description": "A wrapper for the Midnight proof server binary",
+  "main": "index.js",
+  "bin": {
+    "npm-midnight-proof-server": "index.js"
+  },
+  "scripts": {
+    "start": "node index.js",
+    "clean": "node index.js --clean-binaries",
+    "clean-only": "node index.js --only-clean"
+  },
+  "supportedPlatforms": [
+    "linux-amd64",
+    "linux-arm64",
+    "macos-arm64"
+  ],
+  "dependencies": {
+    "axios": "^1.6.8",
+    "extract-zip": "^2.0.1"
+  },
+  "type": "commonjs",
+  "author": "Paima Studios",
+  "license": "ISC",
+  "homepage": "https://effectstream.github.io/docs/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/PaimaStudios/paima-engine",
+    "directory": "packages/binaries/midnight-proof-server"
+  },
+  "bugs": {
+    "url": "https://github.com/PaimaStudios/paima-engine/issues"
+  }
+}

package/run_midnight_proof_server.js

@@ -1,6 +1,7 @@
 const { spawn } = require("child_process");
 const path = require("path");
-const { getPlatform } = require("./binary.js");
+
+const BINARY_NAME = "midnight-proof-server";
 
 /**
  * Executes the midnight-proof-server binary as a child process.
@@ -9,9 +10,7 @@ const { getPlatform } = require("./binary.js");
  * @returns {import('child_process').ChildProcess}
  */
 function runMidnightProofServer(env = process.env, args = []) {
-  const platform = getPlatform();
-  const binaryName = `midnight-proof-server-${platform}`;
-  const binaryPath = path.join(__dirname, "proof-server", binaryName);
+  const binaryPath = path.join(__dirname, "proof-server", BINARY_NAME);
 
   console.log(`Starting midnight proof server binary at: ${binaryPath}`);