fix: add windows target

Signed-off-by: quexeky <git@quexeky.dev>

.github/workflows/CI.yml

@@ -46,15 +46,6 @@ jobs:
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
             build: yarn build --target aarch64-unknown-linux-gnu
-          - host: ubuntu-latest
-            target: armv7-unknown-linux-gnueabihf
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-arm-linux-gnueabihf -y
-            build: yarn build --target armv7-unknown-linux-gnueabihf
-          - host: ubuntu-latest
-            target: armv7-unknown-linux-musleabihf
-            build: yarn build --target armv7-unknown-linux-musleabihf
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -358,6 +349,8 @@ jobs:
         with:
           name: bindings-aarch64-apple-darwin
           path: artifacts
+      - name: Move artifacts
+        run: mv artifacts/* .
       - name: Combine binaries
         run: yarn universal
       - name: Upload artifact

.gitignore

@@ -9,7 +9,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
-.test
+.test*
 .tsimp
 
 # Diagnostic reports (https://nodejs.org/api/report.html)

Cargo.toml

@@ -9,11 +9,12 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.2", default-features = false, features = [
+napi = { version = "3.0.0-alpha.33", default-features = false, features = [
     "napi4",
     "async",
+    "web_stream",
 ] }
-napi-derive = "2.12.2"
+napi-derive = "3.0.0-alpha.33"
 hex = "0.4.3"
 serde_json = "1.0.128"
 md5 = "0.7.0"
@@ -21,6 +22,8 @@ time-macros = "0.2.22"
 time = "0.3.41"
 webpki = "0.22.4"
 ring = "0.17.14"
+tokio = { version = "1.45.1", features = ["fs"] }
+tokio-util = { version = "0.7.15", features = ["codec"] }
 
 [dependencies.x509-parser]
 version = "0.17.0"

__test__/manifest.spec.mjs

@@ -2,7 +2,7 @@ import test from "ava";
 import fs from "node:fs";
 import path from "path";
 
-import { generateManifest } from "../index.js";
+import { generateManifest, listFiles } from "../index.js";
 
 test("numerous small file", async (t) => {
   // Setup test dir

__test__/utils.spec.mjs

@@ -0,0 +1,46 @@
+import test from "ava";
+import fs from "node:fs";
+import path from "path";
+
+import droplet from "../index.js";
+
+test("check alt thread util", async (t) => {
+  let endtime1, endtime2;
+
+  droplet.callAltThreadFunc(async () => {
+    await new Promise((r) => setTimeout(r, 100));
+    endtime1 = Date.now();
+  });
+
+  await new Promise((r) => setTimeout(r, 500));
+  endtime2 = Date.now();
+
+  const difference = endtime2 - endtime1;
+  if (difference >= 600) {
+    t.fail("likely isn't multithreaded, difference: " + difference);
+  }
+
+  t.pass();
+});
+
+test("read file", async (t) => {
+  const dirName = "./.test2";
+  if (fs.existsSync(dirName)) fs.rmSync(dirName, { recursive: true });
+  fs.mkdirSync(dirName, { recursive: true });
+
+  const testString = "g'day what's up my koala bros\n".repeat(10000);
+
+  fs.writeFileSync("./.test2/TESTFILE", testString);
+
+  const stream = droplet.readFile("./.test2", "TESTFILE");
+
+  let finalString = "";
+
+  for await (const chunk of stream) {
+    // Do something with each 'chunk'
+    finalString += String.fromCharCode.apply(null, chunk);
+  }
+
+  t.assert(finalString == testString, "file strings don't match");
+  fs.rmSync(dirName, { recursive: true });
+});

index.d.ts

@@ -1,14 +1,21 @@
-/* tslint:disable */
-/* eslint-disable */
-
 /* auto-generated by NAPI-RS */
+/* eslint-disable */
+export declare function callAltThreadFunc(tsfn: ((err: Error | null, ) => any)): void
+
+export declare function generateClientCertificate(clientId: string, clientName: string, rootCa: string, rootCaPrivate: string): Array<string>
+
+export declare function generateManifest(dir: string, progressSfn: ((err: Error | null, arg: number) => any), logSfn: ((err: Error | null, arg: string) => any), callbackSfn: ((err: Error | null, arg: string) => any)): void
+
+export declare function generateRootCa(): Array<string>
 
 export declare function hasBackendForPath(path: string): boolean
+
 export declare function listFiles(path: string): Array<string>
-export declare function callAltThreadFunc(callback: (...args: any[]) => any): void
-export declare function generateManifest(dir: string, progress: (...args: any[]) => any, log: (...args: any[]) => any, callback: (...args: any[]) => any): void
-export declare function generateRootCa(): Array<string>
-export declare function generateClientCertificate(clientId: string, clientName: string, rootCa: string, rootCaPrivate: string): Array<string>
-export declare function verifyClientCertificate(clientCert: string, rootCa: string): boolean
+
+export declare function readFile(path: string, subPath: string): ReadableStream<Buffer> | null
+
 export declare function signNonce(privateKey: string, nonce: string): string
+
+export declare function verifyClientCertificate(clientCert: string, rootCa: string): boolean
+
 export declare function verifyNonce(publicCert: string, nonce: string, signature: string): boolean

index.js

@@ -1,323 +1,387 @@
-/* tslint:disable */
+// prettier-ignore
 /* eslint-disable */
-/* prettier-ignore */
-
+// @ts-nocheck
 /* auto-generated by NAPI-RS */
 
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
-
-const { platform, arch } = process
+const { createRequire } = require('node:module')
+require = createRequire(__filename)
 
+const { readFileSync } = require('node:fs')
 let nativeBinding = null
-let localFileExisted = false
-let loadError = null
+const loadErrors = []
 
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim()
-      return readFileSync(lddPath, 'utf8').includes('musl')
-    } catch (e) {
-      return true
+const isMusl = () => {
+  let musl = false
+  if (process.platform === 'linux') {
+    musl = isMuslFromFilesystem()
+    if (musl === null) {
+      musl = isMuslFromReport()
     }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
+    if (musl === null) {
+      musl = isMuslFromChildProcess()
+    }
+  }
+  return musl
+}
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
+
+const isMuslFromFilesystem = () => {
+  try {
+    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
+  } catch {
+    return null
   }
 }
 
-switch (platform) {
-  case 'android':
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'droplet.android-arm64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.android-arm64.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-android-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'droplet.android-arm-eabi.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-android-arm-eabi')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
+const isMuslFromReport = () => {
+  let report = null
+  if (typeof process.report?.getReport === 'function') {
+    process.report.excludeNetwork = true
+    report = process.report.getReport()
+  }
+  if (!report) {
+    return null
+  }
+  if (report.header && report.header.glibcVersionRuntime) {
+    return false
+  }
+  if (Array.isArray(report.sharedObjects)) {
+    if (report.sharedObjects.some(isFileMusl)) {
+      return true
     }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.win32-x64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-win32-x64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.win32-ia32-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-win32-ia32-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.win32-arm64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-win32-arm64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    break
-  case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'droplet.darwin-universal.node'))
+  }
+  return false
+}
+
+const isMuslFromChildProcess = () => {
+  try {
+    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
+  } catch (e) {
+    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
+    return false
+  }
+}
+
+function requireNative() {
+  if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
     try {
-      if (localFileExisted) {
-        nativeBinding = require('./droplet.darwin-universal.node')
-      } else {
-        nativeBinding = require('@drop-oss/droplet-darwin-universal')
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+    } catch (err) {
+      loadErrors.push(err)
+    }
+  } else if (process.platform === 'android') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./droplet.android-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
       }
-      break
-    } catch {}
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'droplet.darwin-x64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.darwin-x64.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-darwin-x64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.darwin-arm64.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-darwin-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+      try {
+        return require('@drop-oss/droplet-android-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm') {
+      try {
+        return require('./droplet.android-arm-eabi.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-android-arm-eabi')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
     }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./droplet.win32-x64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-win32-x64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'ia32') {
+      try {
+        return require('./droplet.win32-ia32-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-win32-ia32-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./droplet.win32-arm64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-win32-arm64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
     }
-    localFileExisted = existsSync(join(__dirname, 'droplet.freebsd-x64.node'))
+  } else if (process.platform === 'darwin') {
     try {
-      if (localFileExisted) {
-        nativeBinding = require('./droplet.freebsd-x64.node')
-      } else {
-        nativeBinding = require('@drop-oss/droplet-freebsd-x64')
+        return require('./droplet.darwin-universal.node')
+      } catch (e) {
+        loadErrors.push(e)
       }
-    } catch (e) {
-      loadError = e
+      try {
+        return require('@drop-oss/droplet-darwin-universal')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    if (process.arch === 'x64') {
+      try {
+        return require('./droplet.darwin-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-darwin-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./droplet.darwin-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-darwin-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
     }
-    break
-  case 'linux':
-    switch (arch) {
-      case 'x64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-x64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-x64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-x64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-x64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm-musleabihf.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-arm-musleabihf.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm-musleabihf')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm-gnueabihf.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-arm-gnueabihf.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm-gnueabihf')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'riscv64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-riscv64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-riscv64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-riscv64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-riscv64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./droplet.linux-riscv64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-riscv64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 's390x':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.linux-s390x-gnu.node')
-        )
+  } else if (process.platform === 'freebsd') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./droplet.freebsd-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-freebsd-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./droplet.freebsd-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-freebsd-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
+    }
+  } else if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      if (isMusl()) {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./droplet.linux-s390x-gnu.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-linux-s390x-gnu')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+        return require('./droplet.linux-x64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-x64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./droplet.linux-x64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-x64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm64') {
+      if (isMusl()) {
+        try {
+        return require('./droplet.linux-arm64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-arm64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./droplet.linux-arm64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-arm64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm') {
+      if (isMusl()) {
+        try {
+        return require('./droplet.linux-arm-musleabihf.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-arm-musleabihf')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./droplet.linux-arm-gnueabihf.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-arm-gnueabihf')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'riscv64') {
+      if (isMusl()) {
+        try {
+        return require('./droplet.linux-riscv64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-riscv64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./droplet.linux-riscv64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-riscv64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'ppc64') {
+      try {
+        return require('./droplet.linux-ppc64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-ppc64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 's390x') {
+      try {
+        return require('./droplet.linux-s390x-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@drop-oss/droplet-linux-s390x-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
     }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+  } else {
+    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+  }
+}
+
+nativeBinding = requireNative()
+
+if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+  try {
+    nativeBinding = require('./droplet.wasi.cjs')
+  } catch (err) {
+    if (process.env.NAPI_RS_FORCE_WASI) {
+      loadErrors.push(err)
+    }
+  }
+  if (!nativeBinding) {
+    try {
+      nativeBinding = require('@drop-oss/droplet-wasm32-wasi')
+    } catch (err) {
+      if (process.env.NAPI_RS_FORCE_WASI) {
+        loadErrors.push(err)
+      }
+    }
+  }
 }
 
 if (!nativeBinding) {
-  if (loadError) {
-    throw loadError
+  if (loadErrors.length > 0) {
+    // TODO Link to documentation with potential fixes
+    //  - The package owner could build/publish bindings for this arch
+    //  - The user may need to bundle the correct files
+    //  - The user may need to re-install node_modules to get new packages
+    throw new Error('Failed to load native binding', { cause: loadErrors })
   }
   throw new Error(`Failed to load native binding`)
 }
 
-const { hasBackendForPath, listFiles, callAltThreadFunc, generateManifest, generateRootCa, generateClientCertificate, verifyClientCertificate, signNonce, verifyNonce } = nativeBinding
-
-module.exports.hasBackendForPath = hasBackendForPath
-module.exports.listFiles = listFiles
-module.exports.callAltThreadFunc = callAltThreadFunc
-module.exports.generateManifest = generateManifest
-module.exports.generateRootCa = generateRootCa
-module.exports.generateClientCertificate = generateClientCertificate
-module.exports.verifyClientCertificate = verifyClientCertificate
-module.exports.signNonce = signNonce
-module.exports.verifyNonce = verifyNonce
+module.exports = nativeBinding
+module.exports.callAltThreadFunc = nativeBinding.callAltThreadFunc
+module.exports.generateClientCertificate = nativeBinding.generateClientCertificate
+module.exports.generateManifest = nativeBinding.generateManifest
+module.exports.generateRootCa = nativeBinding.generateRootCa
+module.exports.hasBackendForPath = nativeBinding.hasBackendForPath
+module.exports.listFiles = nativeBinding.listFiles
+module.exports.readFile = nativeBinding.readFile
+module.exports.signNonce = nativeBinding.signNonce
+module.exports.verifyClientCertificate = nativeBinding.verifyClientCertificate
+module.exports.verifyNonce = nativeBinding.verifyNonce

npm/linux-arm-gnueabihf/README.md

@@ -1,3 +0,0 @@
-# `@drop-oss/droplet-linux-arm-gnueabihf`
-
-This is the **armv7-unknown-linux-gnueabihf** binary for `@drop-oss/droplet`

npm/linux-arm-gnueabihf/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@drop-oss/droplet-linux-arm-gnueabihf",
-  "version": "0.0.0",
-  "os": [
-    "linux"
-  ],
-  "cpu": [
-    "arm"
-  ],
-  "main": "droplet.linux-arm-gnueabihf.node",
-  "files": [
-    "droplet.linux-arm-gnueabihf.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  },
-  "repository": {
-    "url": "https://github.com/Drop-OSS/droplet"
-  }
-}

npm/linux-arm-musleabihf/README.md

@@ -1,3 +0,0 @@
-# `@drop-oss/droplet-linux-arm-musleabihf`
-
-This is the **armv7-unknown-linux-musleabihf** binary for `@drop-oss/droplet`

npm/linux-arm-musleabihf/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@drop-oss/droplet-linux-arm-musleabihf",
-  "version": "0.0.0",
-  "os": [
-    "linux"
-  ],
-  "cpu": [
-    "arm"
-  ],
-  "main": "droplet.linux-arm-musleabihf.node",
-  "files": [
-    "droplet.linux-arm-musleabihf.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  },
-  "repository": {
-    "url": "https://github.com/Drop-OSS/droplet"
-  }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drop-oss/droplet",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -8,20 +8,21 @@
     "triples": {
       "additional": [
         "aarch64-apple-darwin",
+        "x86_64-apple-darwin",
+        "universal-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "aarch64-unknown-linux-musl",
-        "aarch64-pc-windows-msvc",
-        "armv7-unknown-linux-gnueabihf",
-        "armv7-unknown-linux-musleabihf",
+        "x86_64-unknown-linux-gnu",
         "x86_64-unknown-linux-musl",
-        "universal-apple-darwin",
-        "riscv64gc-unknown-linux-gnu"
+        "riscv64gc-unknown-linux-gnu",
+        "aarch64-pc-windows-msvc",
+        "x86_64-pc-windows-msvc"
       ]
     }
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.4",
+    "@napi-rs/cli": "3.0.0-alpha.80",
     "@types/node": "^22.13.10",
     "ava": "^6.2.0"
   },
@@ -37,7 +38,7 @@
     "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "ava",
-    "universal": "napi universal",
+    "universal": "napi universalize",
     "version": "napi version"
   },
   "packageManager": "yarn@4.7.0",

src/file_utils.rs

@@ -2,8 +2,18 @@
 use std::os::unix::fs::PermissionsExt;
 use std::{
   fs::{self, metadata, File},
-  io::BufReader,
+  io::{self, BufReader, ErrorKind, Read},
   path::{Path, PathBuf},
+  task::Poll,
+};
+
+use napi::{
+  bindgen_prelude::*,
+  tokio_stream::{Stream, StreamExt},
+};
+use tokio_util::{
+  bytes::BytesMut,
+  codec::{BytesCodec, FramedRead},
 };
 
 fn _list_files(vec: &mut Vec<PathBuf>, path: &Path) {
@@ -27,7 +37,7 @@ pub struct VersionFile {
 
 pub trait VersionBackend: 'static {
   fn list_files(&self, path: &Path) -> Vec<VersionFile>;
-  fn reader(&self, file: &VersionFile) -> BufReader<File>;
+  fn reader(&self, file: &VersionFile) -> Option<File>;
 }
 
 pub struct PathVersionBackend {
@@ -67,10 +77,10 @@ impl VersionBackend for PathVersionBackend {
     results
   }
 
-  fn reader(&self, file: &VersionFile) -> BufReader<File> {
-    let file = File::open(self.base_dir.join(file.relative_filename.clone())).unwrap();
-    let reader = BufReader::with_capacity(4096, file);
-    return reader;
+  fn reader(&self, file: &VersionFile) -> Option<File> {
+    let file = File::open(self.base_dir.join(file.relative_filename.clone())).ok()?;
+
+    return Some(file);
   }
 }
 
@@ -82,7 +92,7 @@ impl VersionBackend for ArchiveVersionBackend {
     todo!()
   }
 
-  fn reader(&self, file: &VersionFile) -> BufReader<File> {
+  fn reader(&self, file: &VersionFile) -> Option<File> {
     todo!()
   }
 }
@@ -117,4 +127,39 @@ pub fn list_files(path: String) -> Vec<String> {
   let backend = create_backend_for_path(path).unwrap();
   let files = backend.list_files(path);
   files.into_iter().map(|e| e.relative_filename).collect()
-}
+}
+
+#[napi]
+pub fn read_file(
+  path: String,
+  sub_path: String,
+  env: &Env,
+) -> Option<ReadableStream<'static, BufferSlice<'static>>> {
+  let path = Path::new(&path);
+  let backend = create_backend_for_path(path).unwrap();
+  let version_file = VersionFile {
+    relative_filename: sub_path,
+    permission: 0, // Shouldn't matter
+  };
+  // Use `?` operator for cleaner error propagation from `Option`
+  let reader = backend.reader(&version_file)?;
+
+  // Convert std::fs::File to tokio::fs::File for async operations
+  let reader = tokio::fs::File::from_std(reader);
+
+  // Create a FramedRead stream with BytesCodec for chunking
+
+  let stream = FramedRead::new(reader, BytesCodec::new())
+    // Use StreamExt::map to transform each Result item
+    .map(|result_item| {
+      result_item
+        // Apply Result::map to transform Ok(BytesMut) to Ok(Vec<u8>)
+        .map(|bytes| bytes.to_vec())
+        // Apply Result::map_err to transform Err(std::io::Error) to Err(napi::Error)
+        .map_err(|e| napi::Error::from(e)) // napi::Error implements From<tokio::io::Error>
+    });
+  // Create the napi-rs ReadableStream from the tokio_stream::Stream
+  // The unwrap() here means if stream creation fails, it will panic.
+  // For a production system, consider returning Result<Option<...>> and handling this.
+  Some(ReadableStream::create_with_stream_bytes(env, stream).unwrap())
+}

src/manifest.rs

@@ -1,17 +1,14 @@
 use std::{
-  collections::HashMap,
-  fs::File,
-  io::{BufRead, BufReader},
-  path::Path,
-  thread,
+  collections::HashMap, fs::File, io::{BufRead, BufReader}, path::Path, rc::Rc, sync::Arc, thread
 };
 
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 
 use napi::{
-  threadsafe_function::{ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode},
-  Error, JsFunction,
+  bindgen_prelude::Function,
+  threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode},
+  Env, Error, Result,
 };
 use serde_json::json;
 use uuid::Uuid;
@@ -29,14 +26,10 @@ struct ChunkData {
 }
 
 #[napi]
-pub fn call_alt_thread_func(callback: JsFunction) -> Result<(), Error> {
-  let tsfn: ThreadsafeFunction<u32, ErrorStrategy::CalleeHandled> = callback
-    .create_threadsafe_function(0, |ctx| {
-      ctx.env.create_uint32(ctx.value + 1).map(|v| vec![v])
-    })?;
-  let tsfn = tsfn.clone();
+pub fn call_alt_thread_func(tsfn: Arc<ThreadsafeFunction<()>>) -> Result<(), String> {
+  let tsfn_cloned = tsfn.clone();
   thread::spawn(move || {
-    tsfn.call(Ok(0), ThreadsafeFunctionCallMode::NonBlocking);
+    tsfn_cloned.call(Ok(()), ThreadsafeFunctionCallMode::Blocking);
   });
   Ok(())
 }
@@ -44,24 +37,10 @@ pub fn call_alt_thread_func(callback: JsFunction) -> Result<(), Error> {
 #[napi]
 pub fn generate_manifest(
   dir: String,
-  progress: JsFunction,
-  log: JsFunction,
-  callback: JsFunction,
-) -> Result<(), Error> {
-  let progress_sfn: ThreadsafeFunction<i32, ErrorStrategy::CalleeHandled> = progress
-    .create_threadsafe_function(0, |ctx| ctx.env.create_int32(ctx.value).map(|v| vec![v]))
-    .unwrap();
-  let log_sfn: ThreadsafeFunction<String, ErrorStrategy::CalleeHandled> = log
-    .create_threadsafe_function(0, |ctx| {
-      ctx.env.create_string_from_std(ctx.value).map(|v| vec![v])
-    })
-    .unwrap();
-  let callback_sfn: ThreadsafeFunction<String, ErrorStrategy::CalleeHandled> = callback
-    .create_threadsafe_function(0, |ctx| {
-      ctx.env.create_string_from_std(ctx.value).map(|v| vec![v])
-    })
-    .unwrap();
-
+  progress_sfn: ThreadsafeFunction<i32>,
+  log_sfn: ThreadsafeFunction<String>,
+  callback_sfn: ThreadsafeFunction<String>,
+) -> Result<(), String> {
   thread::spawn(move || {
     let base_dir = Path::new(&dir);
     let backend = create_backend_for_path(base_dir).unwrap();
@@ -74,7 +53,8 @@ pub fn generate_manifest(
     let mut i: i32 = 0;
 
     for version_file in files {
-      let mut reader = backend.reader(&version_file);
+      let mut raw_reader= backend.reader(&version_file).unwrap();
+      let mut reader = BufReader::with_capacity(CHUNK_SIZE, raw_reader);
 
       let mut chunk_data = ChunkData {
         permissions: version_file.permission,
@@ -103,8 +83,7 @@ pub fn generate_manifest(
 
         let log_str = format!(
           "Processed chunk {} for {}",
-          chunk_index,
-          &version_file.relative_filename
+          chunk_index, &version_file.relative_filename
         );
         log_sfn.call(Ok(log_str), ThreadsafeFunctionCallMode::Blocking);