@paimaexample/npm-midnight-node 0.3.121 → 0.3.123

package/binary.js

@@ -4,7 +4,8 @@ const axios = require("axios");
 const extract = require("extract-zip");
 const path = require("path");
 
-const CURRENT_BINARY_VERSION = "0.12.0";
+const CURRENT_BINARY_VERSION = "0.12.1";
+const FINAL_BINARY_NAME = "midnight-node";
 
 /*
 @returns {string} The platform and architecture of the current machine.
@@ -29,10 +30,8 @@ function getBinaryUrl() {
   if (!supportedPlatforms.includes(platform)) {
     throw new Error(`Unsupported platform: ${platform}`);
   }
-  if (platform === "macos-arm64" && CURRENT_BINARY_VERSION === "0.12.0") {
-    return `https://github.com/effectstream/binaries/releases/download/0.3.120/${FILE_NAME}`;
-  }
-  return `https://paima-midnight.nyc3.cdn.digitaloceanspaces.com/binaries/${FILE_NAME}`;
+
+  return `https://github.com/effectstream/binaries/releases/download/0.3.120/${FILE_NAME}`;
 }
 
 /*
@@ -66,25 +65,66 @@ async function downloadAndSaveBinary() {
 /*
 @returns {Promise<void>} Unzips the binary for the current platform.
 */
+function findExtractedBinary(binaryDir, platform) {
+  const candidateNames = new Set([
+    FINAL_BINARY_NAME,
+    `midnight-node-${platform}`,
+    `midnight-node-${platform}-${CURRENT_BINARY_VERSION}`,
+  ]);
+
+  const explore = (dir) => {
+    for (const entry of fs.readdirSync(dir)) {
+      const entryPath = path.join(dir, entry);
+      const entryStats = fs.statSync(entryPath);
+
+      if (entryStats.isFile() && candidateNames.has(entry)) {
+        return entryPath;
+      }
+
+      if (entryStats.isDirectory()) {
+        for (const candidate of candidateNames) {
+          const nestedPath = path.join(entryPath, candidate);
+          if (fs.existsSync(nestedPath) && fs.statSync(nestedPath).isFile()) {
+            return nestedPath;
+          }
+        }
+        const nestedResult = explore(entryPath);
+        if (nestedResult) return nestedResult;
+      }
+    }
+    return null;
+  };
+
+  return explore(binaryDir);
+}
+
 async function unzipBinary() {
-  await extract(path.join(__dirname, FILE_NAME), {
-    dir: path.join(__dirname, "midnight-node"),
-  });
+  const binaryDir = path.join(__dirname, "midnight-node");
+  await extract(path.join(__dirname, FILE_NAME), { dir: binaryDir });
   const platform = getPlatform();
-  const parts = platform.split("-");
-  const binaryName = `midnight-node-${platform}`;
-  if (parts[0] === "linux") {
-    fs.chmodSync(
-      path.join(__dirname, "midnight-node", binaryName),
-      0o755,
+  const finalBinaryPath = path.join(binaryDir, FINAL_BINARY_NAME);
+  const extractedBinaryPath = findExtractedBinary(binaryDir, platform);
+
+  if (!extractedBinaryPath) {
+    throw new Error(
+      `Expected binary not found after extraction in ${binaryDir}`,
     );
   }
-  fs.unlinkSync(
-    path.join(
-      __dirname,
-      FILE_NAME,
-    ),
-  );
+
+  if (extractedBinaryPath !== finalBinaryPath) {
+    if (fs.existsSync(finalBinaryPath)) {
+      fs.unlinkSync(finalBinaryPath);
+    }
+    fs.renameSync(extractedBinaryPath, finalBinaryPath);
+  }
+
+  if (!fs.existsSync(finalBinaryPath)) {
+    throw new Error(`Expected binary not found: ${finalBinaryPath}`);
+  }
+
+  fs.chmodSync(finalBinaryPath, 0o755);
+
+  fs.unlinkSync(path.join(__dirname, FILE_NAME));
 }
 
 async function binary() {

package/index.js

@@ -1,14 +1,14 @@
 const { binary } = require("./binary");
 const { runMidnightNode } = require("./run_midnight_node");
-const { getPlatform } = require("./binary");
 const fs = require("fs");
 const path = require("path");
 
+const FINAL_BINARY_NAME = "midnight-node";
+
 function checkIfBinaryExists() {
-  const platform = getPlatform();
-  const parts = platform.split("-");
-  const binaryName = `midnight-node-${platform}`;
-  return fs.existsSync(path.join(__dirname, "midnight-node", binaryName));
+  return fs.existsSync(
+    path.join(__dirname, "midnight-node", FINAL_BINARY_NAME),
+  );
 }
 
 async function main(args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paimaexample/npm-midnight-node",
-  "version": "0.3.121",
+  "version": "0.3.123",
   "description": "Downloads and starts the binary for Midnight Node",
   "main": "index.js",
   "scripts": {

package/run_midnight_node.js

@@ -1,6 +1,7 @@
 const { spawn } = require("child_process");
 const path = require("path");
-const { getPlatform } = require("./binary");
+
+const BINARY_NAME = "midnight-node";
 /**
  * Executes the midnight-node binary as a child process
  * @param {Object} env - Environment variables to pass to the child process
@@ -8,10 +9,7 @@ const { getPlatform } = require("./binary");
  * @returns {ChildProcess} The spawned child process
  */
 function runMidnightNode(env = process.env, args = []) {
-  const platform = getPlatform();
-  const parts = platform.split("-");
-  const binaryName = `midnight-node-${platform}`;
-  const binaryPath = path.join(__dirname, "midnight-node", binaryName);
+  const binaryPath = path.join(__dirname, "midnight-node", BINARY_NAME);
 
   console.log(
     `Starting midnight-node binary at: ${binaryPath} ${args.join(" ")}`,