chore: bump version and add test

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

.github/workflows/CI.yml

@@ -46,21 +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-linux-android
-            build: yarn build --target aarch64-linux-android
-          - host: ubuntu-latest
-            target: armv7-linux-androideabi
-            build: yarn build --target armv7-linux-androideabi
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -166,180 +151,180 @@ jobs:
         shell: bash
       - name: Test bindings
         run: yarn test
-  test-linux-x64-gnu-binding:
+  # test-linux-x64-gnu-binding:
-    name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
+  #   name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
-    needs:
+  #   needs:
-      - build
+  #     - build
-    strategy:
+  #   strategy:
-      fail-fast: false
+  #     fail-fast: false
-      matrix:
+  #     matrix:
-        node:
+  #       node:
-          - "18"
+  #         - "18"
-          - "20"
+  #         - "20"
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: Setup node
+  #     - name: Setup node
-        uses: actions/setup-node@v4
+  #       uses: actions/setup-node@v4
-        with:
+  #       with:
-          node-version: ${{ matrix.node }}
+  #         node-version: ${{ matrix.node }}
-          cache: yarn
+  #         cache: yarn
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: yarn install
+  #       run: yarn install
-      - name: Download artifacts
+  #     - name: Download artifacts
-        uses: actions/download-artifact@v4
+  #       uses: actions/download-artifact@v4
-        with:
+  #       with:
-          name: bindings-x86_64-unknown-linux-gnu
+  #         name: bindings-x86_64-unknown-linux-gnu
-          path: .
+  #         path: .
-      - name: List packages
+  #     - name: List packages
-        run: ls -R .
+  #       run: ls -R .
-        shell: bash
+  #       shell: bash
-      - name: Test bindings
+  #     - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test
+  #       run: docker run --rm -v $(pwd):/build -w /build public.ecr.aws/docker/library/node:${{ matrix.node }}-slim yarn test
-  test-linux-x64-musl-binding:
+  # test-linux-x64-musl-binding:
-    name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
+  #   name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
-    needs:
+  #   needs:
-      - build
+  #     - build
-    strategy:
+  #   strategy:
-      fail-fast: false
+  #     fail-fast: false
-      matrix:
+  #     matrix:
-        node:
+  #       node:
-          - "18"
+  #         - "18"
-          - "20"
+  #         - "20"
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: Setup node
+  #     - name: Setup node
-        uses: actions/setup-node@v4
+  #       uses: actions/setup-node@v4
-        with:
+  #       with:
-          node-version: ${{ matrix.node }}
+  #         node-version: ${{ matrix.node }}
-          cache: yarn
+  #         cache: yarn
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: |
+  #       run: |
-          yarn config set supportedArchitectures.libc "musl"
+  #         yarn config set supportedArchitectures.libc "musl"
-          yarn install
+  #         yarn install
-      - name: Download artifacts
+  #     - name: Download artifacts
-        uses: actions/download-artifact@v4
+  #       uses: actions/download-artifact@v4
-        with:
+  #       with:
-          name: bindings-x86_64-unknown-linux-musl
+  #         name: bindings-x86_64-unknown-linux-musl
-          path: .
+  #         path: .
-      - name: List packages
+  #     - name: List packages
-        run: ls -R .
+  #       run: ls -R .
-        shell: bash
+  #       shell: bash
-      - name: Test bindings
+  #     - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test
+  #       run: docker run --rm -v $(pwd):/build -w /build public.ecr.aws/docker/library/node:${{ matrix.node }}-alpine yarn test
-  test-linux-aarch64-gnu-binding:
+  # test-linux-aarch64-gnu-binding:
-    name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
+  #   name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
-    needs:
+  #   needs:
-      - build
+  #     - build
-    strategy:
+  #   strategy:
-      fail-fast: false
+  #     fail-fast: false
-      matrix:
+  #     matrix:
-        node:
+  #       node:
-          - "18"
+  #         - "18"
-          - "20"
+  #         - "20"
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: Download artifacts
+  #     - name: Download artifacts
-        uses: actions/download-artifact@v4
+  #       uses: actions/download-artifact@v4
-        with:
+  #       with:
-          name: bindings-aarch64-unknown-linux-gnu
+  #         name: bindings-aarch64-unknown-linux-gnu
-          path: .
+  #         path: .
-      - name: List packages
+  #     - name: List packages
-        run: ls -R .
+  #       run: ls -R .
-        shell: bash
+  #       shell: bash
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: |
+  #       run: |
-          yarn config set supportedArchitectures.cpu "arm64"
+  #         yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "glibc"
+  #         yarn config set supportedArchitectures.libc "glibc"
-          yarn install
+  #         yarn install
-      - name: Set up QEMU
+  #     - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+  #       uses: docker/setup-qemu-action@v3
-        with:
+  #       with:
-          platforms: arm64
+  #         platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+  #     - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
+  #     - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
+  #       uses: addnab/docker-run-action@v3
-        with:
+  #       with:
-          image: node:${{ matrix.node }}-slim
+  #         image: public.ecr.aws/docker/library/node:${{ matrix.node }}-slim
-          options: "--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build"
+  #         options: "--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build"
-          run: |
+  #         run: |
-            set -e
+  #           set -e
-            yarn test
+  #           yarn test
-            ls -la
+  #           ls -la
-  test-linux-aarch64-musl-binding:
+  # test-linux-aarch64-musl-binding:
-    name: Test bindings on aarch64-unknown-linux-musl - node@${{ matrix.node }}
+  #   name: Test bindings on aarch64-unknown-linux-musl - node@${{ matrix.node }}
-    needs:
+  #   needs:
-      - build
+  #     - build
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: Download artifacts
+  #     - name: Download artifacts
-        uses: actions/download-artifact@v4
+  #       uses: actions/download-artifact@v4
-        with:
+  #       with:
-          name: bindings-aarch64-unknown-linux-musl
+  #         name: bindings-aarch64-unknown-linux-musl
-          path: .
+  #         path: .
-      - name: List packages
+  #     - name: List packages
-        run: ls -R .
+  #       run: ls -R .
-        shell: bash
+  #       shell: bash
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: |
+  #       run: |
-          yarn config set supportedArchitectures.cpu "arm64"
+  #         yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "musl"
+  #         yarn config set supportedArchitectures.libc "musl"
-          yarn install
+  #         yarn install
-      - name: Set up QEMU
+  #     - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+  #       uses: docker/setup-qemu-action@v3
-        with:
+  #       with:
-          platforms: arm64
+  #         platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+  #     - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
+  #     - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
+  #       uses: addnab/docker-run-action@v3
-        with:
+  #       with:
-          image: node:lts-alpine
+  #         image: node:lts-alpine
-          options: "--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build"
+  #         options: "--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build"
-          run: |
+  #         run: |
-            set -e
+  #           set -e
-            yarn test
+  #           yarn test
-  test-linux-arm-gnueabihf-binding:
+  # test-linux-arm-gnueabihf-binding:
-    name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }}
+  #   name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }}
-    needs:
+  #   needs:
-      - build
+  #     - build
-    strategy:
+  #   strategy:
-      fail-fast: false
+  #     fail-fast: false
-      matrix:
+  #     matrix:
-        node:
+  #       node:
-          - "18"
+  #         - "18"
-          - "20"
+  #         - "20"
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v4
-      - name: Download artifacts
+  #     - name: Download artifacts
-        uses: actions/download-artifact@v4
+  #       uses: actions/download-artifact@v4
-        with:
+  #       with:
-          name: bindings-armv7-unknown-linux-gnueabihf
+  #         name: bindings-armv7-unknown-linux-gnueabihf
-          path: .
+  #         path: .
-      - name: List packages
+  #     - name: List packages
-        run: ls -R .
+  #       run: ls -R .
-        shell: bash
+  #       shell: bash
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: |
+  #       run: |
-          yarn config set supportedArchitectures.cpu "arm"
+  #         yarn config set supportedArchitectures.cpu "arm"
-          yarn install
+  #         yarn install
-      - name: Set up QEMU
+  #     - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+  #       uses: docker/setup-qemu-action@v3
-        with:
+  #       with:
-          platforms: arm
+  #         platforms: arm
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+  #     - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
+  #     - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
+  #       uses: addnab/docker-run-action@v3
-        with:
+  #       with:
-          image: node:${{ matrix.node }}-bullseye-slim
+  #         image: public.ecr.aws/docker/library/node:${{ matrix.node }}-bullseye-slim
-          options: "--platform linux/arm/v7 -v ${{ github.workspace }}:/build -w /build"
+  #         options: "--platform linux/arm/v7 -v ${{ github.workspace }}:/build -w /build"
-          run: |
+  #         run: |
-            set -e
+  #           set -e
-            yarn test
+  #           yarn test
-            ls -la
+  #           ls -la
   universal-macOS:
     name: Build universal macOS binary
     needs:
@@ -364,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
@@ -377,11 +364,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test-macOS-windows-binding
-      - test-linux-x64-gnu-binding
+      # - test-linux-x64-gnu-binding
-      - test-linux-x64-musl-binding
+      # - test-linux-x64-musl-binding
-      - test-linux-aarch64-gnu-binding
+      # - test-linux-aarch64-gnu-binding
-      - test-linux-aarch64-musl-binding
+      # - test-linux-aarch64-musl-binding
-      - test-linux-arm-gnueabihf-binding
+      # - test-linux-arm-gnueabihf-binding
       - universal-macOS
     steps:
       - uses: actions/checkout@v4

.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", "io-util"] }
+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,71 @@
+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(1000);
+
+  fs.writeFileSync(dirName + "/TESTFILE", testString);
+
+  const stream = droplet.readFile(dirName, "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 });
+});
+
+
+test("read file offset", async (t) => {
+  const dirName = "./.test3";
+  if (fs.existsSync(dirName)) fs.rmSync(dirName, { recursive: true });
+  fs.mkdirSync(dirName, { recursive: true });
+
+  const testString = "0123456789";
+
+  fs.writeFileSync(dirName + "/TESTFILE", testString);
+
+  const stream = droplet.readFile(dirName, "TESTFILE", 1, 4);
+
+  let finalString = "";
+
+  for await (const chunk of stream) {
+    // Do something with each 'chunk'
+    finalString += String.fromCharCode.apply(null, chunk);
+  }
+
+  const expectedString = testString.slice(1, 5);
+
+  t.assert(finalString == expectedString, "file strings don't match");
+  fs.rmSync(dirName, { recursive: true });
+});

index.d.ts

@@ -1,12 +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 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 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 readFile(path: string, subPath: string, start?: number | undefined | null, end?: number | undefined | null): 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,321 +1,387 @@
-/* tslint:disable */
+// prettier-ignore
 /* eslint-disable */
-/* prettier-ignore */
+// @ts-nocheck
-
 /* auto-generated by NAPI-RS */
 
-const { existsSync, readFileSync } = require('fs')
+const { createRequire } = require('node:module')
-const { join } = require('path')
+require = createRequire(__filename)
-
-const { platform, arch } = process
 
+const { readFileSync } = require('node:fs')
 let nativeBinding = null
-let localFileExisted = false
+const loadErrors = []
-let loadError = null
 
-function isMusl() {
+const isMusl = () => {
-  // For Node 10
+  let musl = false
-  if (!process.report || typeof process.report.getReport !== 'function') {
+  if (process.platform === 'linux') {
+    musl = isMuslFromFilesystem()
+    if (musl === null) {
+      musl = isMuslFromReport()
+    }
+    if (musl === null) {
+      musl = isMuslFromChildProcess()
+    }
+  }
+  return musl
+}
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
+
+const isMuslFromFilesystem = () => {
   try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
-      return readFileSync(lddPath, 'utf8').includes('musl')
+  } catch {
-    } catch (e) {
+    return null
+  }
+}
+
+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
     }
-  } else {
+  }
-    const { glibcVersionRuntime } = process.report.getReport().header
+  return false
-    return !glibcVersionRuntime
+}
+
+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
   }
 }
 
-switch (platform) {
+function requireNative() {
-  case 'android':
+  if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'droplet.android-arm64.node'))
     try {
-          if (localFileExisted) {
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
-            nativeBinding = require('./droplet.android-arm64.node')
+    } catch (err) {
-          } else {
+      loadErrors.push(err)
-            nativeBinding = require('@drop-oss/droplet-android-arm64')
     }
+  } else if (process.platform === 'android') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./droplet.android-arm64.node')
       } catch (e) {
-          loadError = e
+        loadErrors.push(e)
       }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'droplet.android-arm-eabi.node'))
       try {
-          if (localFileExisted) {
+        return require('@drop-oss/droplet-android-arm64')
-            nativeBinding = require('./droplet.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-android-arm-eabi')
-          }
       } catch (e) {
-          loadError = e
+        loadErrors.push(e)
       }
-        break
+
-      default:
+    } else if (process.arch === 'arm') {
-        throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.win32-x64-msvc.node')
-        )
       try {
-          if (localFileExisted) {
+        return require('./droplet.android-arm-eabi.node')
-            nativeBinding = require('./droplet.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-win32-x64-msvc')
-          }
       } catch (e) {
-          loadError = e
+        loadErrors.push(e)
       }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.win32-ia32-msvc.node')
-        )
       try {
-          if (localFileExisted) {
+        return require('@drop-oss/droplet-android-arm-eabi')
-            nativeBinding = require('./droplet.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-win32-ia32-msvc')
-          }
       } catch (e) {
-          loadError = e
+        loadErrors.push(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')
+      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
     }
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./droplet.win32-x64-msvc.node')
       } catch (e) {
-          loadError = e
+        loadErrors.push(e)
       }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    break
-  case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'droplet.darwin-universal.node'))
       try {
-      if (localFileExisted) {
+        return require('@drop-oss/droplet-win32-x64-msvc')
-        nativeBinding = require('./droplet.darwin-universal.node')
-      } else {
-        nativeBinding = require('@drop-oss/droplet-darwin-universal')
-      }
-      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
+        loadErrors.push(e)
       }
-        break
+
-      case 'arm64':
+    } else if (process.arch === 'ia32') {
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.darwin-arm64.node')
-        )
       try {
-          if (localFileExisted) {
+        return require('./droplet.win32-ia32-msvc.node')
-            nativeBinding = require('./droplet.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-darwin-arm64')
-          }
       } catch (e) {
-          loadError = e
+        loadErrors.push(e)
       }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
-    }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
-    }
-    localFileExisted = existsSync(join(__dirname, 'droplet.freebsd-x64.node'))
       try {
-      if (localFileExisted) {
+        return require('@drop-oss/droplet-win32-ia32-msvc')
-        nativeBinding = require('./droplet.freebsd-x64.node')
-      } else {
-        nativeBinding = require('@drop-oss/droplet-freebsd-x64')
-      }
       } catch (e) {
-      loadError = e
+        loadErrors.push(e)
       }
-    break
+
-  case 'linux':
+    } else if (process.arch === 'arm64') {
-    switch (arch) {
+      try {
-      case 'x64':
+        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}`))
+    }
+  } else if (process.platform === 'darwin') {
+    try {
+        return require('./droplet.darwin-universal.node')
+      } catch (e) {
+        loadErrors.push(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}`))
+    }
+  } 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()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-x64-musl.node')
-          )
         try {
-            if (localFileExisted) {
+        return require('./droplet.linux-x64-musl.node')
-              nativeBinding = require('./droplet.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-x64-musl')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-x64-gnu.node')
-          )
       try {
-            if (localFileExisted) {
+        return require('@drop-oss/droplet-linux-x64-musl')
-              nativeBinding = require('./droplet.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-x64-gnu')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
+
+      } else {
+        try {
+        return require('./droplet.linux-x64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
       }
-        break
+      try {
-      case 'arm64':
+        return require('@drop-oss/droplet-linux-x64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm64') {
       if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm64-musl.node')
-          )
         try {
-            if (localFileExisted) {
+        return require('./droplet.linux-arm64-musl.node')
-              nativeBinding = require('./droplet.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm64-musl')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm64-gnu.node')
-          )
       try {
-            if (localFileExisted) {
+        return require('@drop-oss/droplet-linux-arm64-musl')
-              nativeBinding = require('./droplet.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm64-gnu')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
+
+      } else {
+        try {
+        return require('./droplet.linux-arm64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
       }
-        break
+      try {
-      case 'arm':
+        return require('@drop-oss/droplet-linux-arm64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm') {
       if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm-musleabihf.node')
-          )
         try {
-            if (localFileExisted) {
+        return require('./droplet.linux-arm-musleabihf.node')
-              nativeBinding = require('./droplet.linux-arm-musleabihf.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm-musleabihf')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-arm-gnueabihf.node')
-          )
       try {
-            if (localFileExisted) {
+        return require('@drop-oss/droplet-linux-arm-musleabihf')
-              nativeBinding = require('./droplet.linux-arm-gnueabihf.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-arm-gnueabihf')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
+
+      } else {
+        try {
+        return require('./droplet.linux-arm-gnueabihf.node')
+      } catch (e) {
+        loadErrors.push(e)
       }
-        break
+      try {
-      case 'riscv64':
+        return require('@drop-oss/droplet-linux-arm-gnueabihf')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'riscv64') {
       if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-riscv64-musl.node')
-          )
         try {
-            if (localFileExisted) {
+        return require('./droplet.linux-riscv64-musl.node')
-              nativeBinding = require('./droplet.linux-riscv64-musl.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-riscv64-musl')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'droplet.linux-riscv64-gnu.node')
-          )
       try {
-            if (localFileExisted) {
+        return require('@drop-oss/droplet-linux-riscv64-musl')
-              nativeBinding = require('./droplet.linux-riscv64-gnu.node')
-            } else {
-              nativeBinding = require('@drop-oss/droplet-linux-riscv64-gnu')
-            }
       } catch (e) {
-            loadError = e
+        loadErrors.push(e)
       }
-        }
+
-        break
+      } else {
-      case 's390x':
-        localFileExisted = existsSync(
-          join(__dirname, 'droplet.linux-s390x-gnu.node')
-        )
         try {
-          if (localFileExisted) {
+        return require('./droplet.linux-riscv64-gnu.node')
-            nativeBinding = require('./droplet.linux-s390x-gnu.node')
-          } else {
-            nativeBinding = require('@drop-oss/droplet-linux-s390x-gnu')
-          }
       } catch (e) {
-          loadError = 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}`))
+    }
+  } 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)
+      }
     }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
   }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
 }
 
 if (!nativeBinding) {
-  if (loadError) {
+  if (loadErrors.length > 0) {
-    throw loadError
+    // 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 { callAltThreadFunc, generateManifest, generateRootCa, generateClientCertificate, verifyClientCertificate, signNonce, verifyNonce } = nativeBinding
+module.exports = nativeBinding
-
+module.exports.callAltThreadFunc = nativeBinding.callAltThreadFunc
-module.exports.callAltThreadFunc = callAltThreadFunc
+module.exports.generateClientCertificate = nativeBinding.generateClientCertificate
-module.exports.generateManifest = generateManifest
+module.exports.generateManifest = nativeBinding.generateManifest
-module.exports.generateRootCa = generateRootCa
+module.exports.generateRootCa = nativeBinding.generateRootCa
-module.exports.generateClientCertificate = generateClientCertificate
+module.exports.hasBackendForPath = nativeBinding.hasBackendForPath
-module.exports.verifyClientCertificate = verifyClientCertificate
+module.exports.listFiles = nativeBinding.listFiles
-module.exports.signNonce = signNonce
+module.exports.readFile = nativeBinding.readFile
-module.exports.verifyNonce = verifyNonce
+module.exports.signNonce = nativeBinding.signNonce
+module.exports.verifyClientCertificate = nativeBinding.verifyClientCertificate
+module.exports.verifyNonce = nativeBinding.verifyNonce

npm/android-arm-eabi/README.md

@@ -1,3 +0,0 @@
-# `@drop/droplet-android-arm-eabi`
-
-This is the **armv7-linux-androideabi** binary for `@drop/droplet`

npm/android-arm-eabi/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/droplet-android-arm-eabi",
-  "version": "0.0.0",
-  "os": [
-    "android"
-  ],
-  "cpu": [
-    "arm"
-  ],
-  "main": "droplet.android-arm-eabi.node",
-  "files": [
-    "droplet.android-arm-eabi.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  }
-}

npm/android-arm64/README.md

@@ -1,3 +0,0 @@
-# `@drop/droplet-android-arm64`
-
-This is the **aarch64-linux-android** binary for `@drop/droplet`

npm/android-arm64/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/droplet-android-arm64",
-  "version": "0.0.0",
-  "os": [
-    "android"
-  ],
-  "cpu": [
-    "arm64"
-  ],
-  "main": "droplet.android-arm64.node",
-  "files": [
-    "droplet.android-arm64.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  }
-}

npm/darwin-arm64/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-darwin-arm64`
+# `@drop-oss/droplet-darwin-arm64`
 
-This is the **aarch64-apple-darwin** binary for `@drop/droplet`
+This is the **aarch64-apple-darwin** binary for `@drop-oss/droplet`

npm/darwin-arm64/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-darwin-arm64",
+  "name": "@drop-oss/droplet-darwin-arm64",
   "version": "0.0.0",
   "os": [
     "darwin"
@@ -14,5 +14,8 @@
   "license": "MIT",
   "engines": {
     "node": ">= 10"
+  },
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
   }
 }

npm/darwin-universal/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-darwin-universal`
+# `@drop-oss/droplet-darwin-universal`
 
-This is the **universal-apple-darwin** binary for `@drop/droplet`
+This is the **universal-apple-darwin** binary for `@drop-oss/droplet`

npm/darwin-universal/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-darwin-universal",
+  "name": "@drop-oss/droplet-darwin-universal",
   "version": "0.0.0",
   "os": [
     "darwin"
@@ -11,5 +11,8 @@
   "license": "MIT",
   "engines": {
     "node": ">= 10"
+  },
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
   }
 }

npm/darwin-x64/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-darwin-x64`
+# `@drop-oss/droplet-darwin-x64`
 
-This is the **x86_64-apple-darwin** binary for `@drop/droplet`
+This is the **x86_64-apple-darwin** binary for `@drop-oss/droplet`

npm/darwin-x64/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-darwin-x64",
+  "name": "@drop-oss/droplet-darwin-x64",
   "version": "0.0.0",
   "os": [
     "darwin"
@@ -14,5 +14,8 @@
   "license": "MIT",
   "engines": {
     "node": ">= 10"
+  },
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
   }
 }

npm/freebsd-x64/README.md

@@ -1,3 +0,0 @@
-# `@drop/droplet-freebsd-x64`
-
-This is the **x86_64-unknown-freebsd** binary for `@drop/droplet`

npm/freebsd-x64/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/droplet-freebsd-x64",
-  "version": "0.0.0",
-  "os": [
-    "freebsd"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "main": "droplet.freebsd-x64.node",
-  "files": [
-    "droplet.freebsd-x64.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  }
-}

npm/linux-arm-gnueabihf/README.md

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

npm/linux-arm-gnueabihf/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/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"
-  }
-}

npm/linux-arm-musleabihf/README.md

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

npm/linux-arm-musleabihf/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/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"
-  }
-}

npm/linux-arm64-gnu/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-linux-arm64-gnu`
+# `@drop-oss/droplet-linux-arm64-gnu`
 
-This is the **aarch64-unknown-linux-gnu** binary for `@drop/droplet`
+This is the **aarch64-unknown-linux-gnu** binary for `@drop-oss/droplet`

npm/linux-arm64-gnu/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-linux-arm64-gnu",
+  "name": "@drop-oss/droplet-linux-arm64-gnu",
   "version": "0.0.0",
   "os": [
     "linux"
@@ -17,5 +17,8 @@
   },
   "libc": [
     "glibc"
-  ]
+  ],
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
+  }
 }

npm/linux-arm64-musl/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-linux-arm64-musl`
+# `@drop-oss/droplet-linux-arm64-musl`
 
-This is the **aarch64-unknown-linux-musl** binary for `@drop/droplet`
+This is the **aarch64-unknown-linux-musl** binary for `@drop-oss/droplet`

npm/linux-arm64-musl/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-linux-arm64-musl",
+  "name": "@drop-oss/droplet-linux-arm64-musl",
   "version": "0.0.0",
   "os": [
     "linux"
@@ -17,5 +17,8 @@
   },
   "libc": [
     "musl"
-  ]
+  ],
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
+  }
 }

npm/linux-riscv64-gnu/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-linux-riscv64-gnu`
+# `@drop-oss/droplet-linux-riscv64-gnu`
 
-This is the **riscv64gc-unknown-linux-gnu** binary for `@drop/droplet`
+This is the **riscv64gc-unknown-linux-gnu** binary for `@drop-oss/droplet`

npm/linux-riscv64-gnu/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-linux-riscv64-gnu",
+  "name": "@drop-oss/droplet-linux-riscv64-gnu",
   "version": "0.0.0",
   "os": [
     "linux"
@@ -17,5 +17,8 @@
   },
   "libc": [
     "glibc"
-  ]
+  ],
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
+  }
 }

npm/linux-x64-gnu/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-linux-x64-gnu`
+# `@drop-oss/droplet-linux-x64-gnu`
 
-This is the **x86_64-unknown-linux-gnu** binary for `@drop/droplet`
+This is the **x86_64-unknown-linux-gnu** binary for `@drop-oss/droplet`

npm/linux-x64-gnu/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-linux-x64-gnu",
+  "name": "@drop-oss/droplet-linux-x64-gnu",
   "version": "0.0.0",
   "os": [
     "linux"
@@ -17,5 +17,8 @@
   },
   "libc": [
     "glibc"
-  ]
+  ],
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
+  }
 }

npm/linux-x64-musl/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-linux-x64-musl`
+# `@drop-oss/droplet-linux-x64-musl`
 
-This is the **x86_64-unknown-linux-musl** binary for `@drop/droplet`
+This is the **x86_64-unknown-linux-musl** binary for `@drop-oss/droplet`

npm/linux-x64-musl/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-linux-x64-musl",
+  "name": "@drop-oss/droplet-linux-x64-musl",
   "version": "0.0.0",
   "os": [
     "linux"
@@ -17,5 +17,8 @@
   },
   "libc": [
     "musl"
-  ]
+  ],
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
+  }
 }

npm/win32-arm64-msvc/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-win32-arm64-msvc`
+# `@drop-oss/droplet-win32-arm64-msvc`
 
-This is the **aarch64-pc-windows-msvc** binary for `@drop/droplet`
+This is the **aarch64-pc-windows-msvc** binary for `@drop-oss/droplet`

npm/win32-arm64-msvc/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-win32-arm64-msvc",
+  "name": "@drop-oss/droplet-win32-arm64-msvc",
   "version": "0.0.0",
   "os": [
     "win32"
@@ -14,5 +14,8 @@
   "license": "MIT",
   "engines": {
     "node": ">= 10"
+  },
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
   }
 }

npm/win32-ia32-msvc/README.md

@@ -1,3 +0,0 @@
-# `@drop/droplet-win32-ia32-msvc`
-
-This is the **i686-pc-windows-msvc** binary for `@drop/droplet`

npm/win32-ia32-msvc/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "@drop/droplet-win32-ia32-msvc",
-  "version": "0.0.0",
-  "os": [
-    "win32"
-  ],
-  "cpu": [
-    "ia32"
-  ],
-  "main": "droplet.win32-ia32-msvc.node",
-  "files": [
-    "droplet.win32-ia32-msvc.node"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 10"
-  }
-}

npm/win32-x64-msvc/README.md

@@ -1,3 +1,3 @@
-# `@drop/droplet-win32-x64-msvc`
+# `@drop-oss/droplet-win32-x64-msvc`
 
-This is the **x86_64-pc-windows-msvc** binary for `@drop/droplet`
+This is the **x86_64-pc-windows-msvc** binary for `@drop-oss/droplet`

npm/win32-x64-msvc/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@drop/droplet-win32-x64-msvc",
+  "name": "@drop-oss/droplet-win32-x64-msvc",
   "version": "0.0.0",
   "os": [
     "win32"
@@ -14,5 +14,8 @@
   "license": "MIT",
   "engines": {
     "node": ">= 10"
+  },
+  "repository": {
+    "url": "https://github.com/Drop-OSS/droplet"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drop-oss/droplet",
-  "version": "0.7.0",
+  "version": "1.3.1",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -8,24 +8,21 @@
     "triples": {
       "additional": [
         "aarch64-apple-darwin",
-        "aarch64-linux-android",
+        "x86_64-apple-darwin",
+        "universal-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "aarch64-unknown-linux-musl",
-        "aarch64-pc-windows-msvc",
+        "x86_64-unknown-linux-gnu",
-        "armv7-unknown-linux-gnueabihf",
-        "armv7-unknown-linux-musleabihf",
         "x86_64-unknown-linux-musl",
-        "x86_64-unknown-freebsd",
+        "riscv64gc-unknown-linux-gnu",
-        "i686-pc-windows-msvc",
+        "aarch64-pc-windows-msvc",
-        "armv7-linux-androideabi",
+        "x86_64-pc-windows-msvc"
-        "universal-apple-darwin",
-        "riscv64gc-unknown-linux-gnu"
       ]
     }
   },
   "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"
   },
@@ -41,8 +38,11 @@
     "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"
+  "packageManager": "yarn@4.7.0",
+  "repository": {
+    "url": "git+https://github.com/Drop-OSS/droplet.git"
+  }
 }

src/file_utils.rs

@@ -1,6 +1,20 @@
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
 use std::{
-  fs::{self, metadata},
+  fs::{self, metadata, File},
+  io::{self, BufReader, ErrorKind, Read, Seek},
   path::{Path, PathBuf},
+  task::Poll,
+};
+
+use napi::{
+  bindgen_prelude::*,
+  tokio_stream::{Stream, StreamExt},
+};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt, Take};
+use tokio_util::{
+  bytes::BytesMut,
+  codec::{BytesCodec, FramedRead},
 };
 
 fn _list_files(vec: &mut Vec<PathBuf>, path: &Path) {
@@ -17,8 +31,151 @@ fn _list_files(vec: &mut Vec<PathBuf>, path: &Path) {
   }
 }
 
-pub fn list_files(path: &Path) -> Vec<PathBuf> {
+pub struct VersionFile {
+  pub relative_filename: String,
+  pub permission: u32,
+}
+
+pub trait VersionBackend: 'static {
+  fn list_files(&self, path: &Path) -> Vec<VersionFile>;
+  fn reader(&self, file: &VersionFile) -> Option<File>;
+}
+
+pub struct PathVersionBackend {
+  pub base_dir: PathBuf,
+}
+impl VersionBackend for PathVersionBackend {
+  fn list_files(&self, path: &Path) -> Vec<VersionFile> {
     let mut vec = Vec::new();
     _list_files(&mut vec, path);
-  vec
+
+    let mut results = Vec::new();
+
+    for pathbuf in vec.iter() {
+      let file = File::open(pathbuf.clone()).unwrap();
+      let relative = pathbuf.strip_prefix(path).unwrap();
+      let metadata = file.try_clone().unwrap().metadata().unwrap();
+      let permission_object = metadata.permissions();
+      let permissions = {
+        let perm: u32;
+        #[cfg(target_family = "unix")]
+        {
+          perm = permission_object.mode();
+        }
+        #[cfg(not(target_family = "unix"))]
+        {
+          perm = 0
+        }
+        perm
+      };
+
+      results.push(VersionFile {
+        relative_filename: relative.to_string_lossy().to_string(),
+        permission: permissions,
+      });
+    }
+
+    results
+  }
+
+  fn reader(&self, file: &VersionFile) -> Option<File> {
+    let file = File::open(self.base_dir.join(file.relative_filename.clone())).ok()?;
+
+    return Some(file);
+  }
+}
+
+// Todo implementation for archives
+// Split into a separate impl for each type of archive
+pub struct ArchiveVersionBackend {}
+impl VersionBackend for ArchiveVersionBackend {
+  fn list_files(&self, path: &Path) -> Vec<VersionFile> {
+    todo!()
+  }
+
+  fn reader(&self, file: &VersionFile) -> Option<File> {
+    todo!()
+  }
+}
+
+pub fn create_backend_for_path(path: &Path) -> Option<Box<(dyn VersionBackend)>> {
+  let is_directory = path.is_dir();
+  if is_directory {
+    return Some(Box::new(PathVersionBackend {
+      base_dir: path.to_path_buf(),
+    }));
+  };
+
+  /*
+    Insert checks for whatever backend you like
+  */
+
+  None
+}
+
+#[napi]
+pub fn has_backend_for_path(path: String) -> bool {
+  let path = Path::new(&path);
+
+  let has_backend = create_backend_for_path(path).is_some();
+
+  has_backend
+}
+
+#[napi]
+pub fn list_files(path: String) -> Vec<String> {
+  let path = Path::new(&path);
+  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,
+  start: Option<u32>,
+  end: Option<u32>
+) -> 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 mut reader = backend.reader(&version_file)?;
+
+  // Can't do this in tokio because it requires a .await, which we can't do here
+  if let Some(start) = start {
+    reader.seek(io::SeekFrom::Start(start as u64)).unwrap();
+  }
+  
+  // Convert std::fs::File to tokio::fs::File for async operations
+  let reader = tokio::fs::File::from_std(reader);
+
+  
+  let boxed_reader: Box<dyn AsyncRead + Send + Unpin> = match end {
+    Some(end_val) => Box::new(reader.take(end_val as u64)),
+    None => Box::new(reader),
+  };
+
+  
+
+  // Create a FramedRead stream with BytesCodec for chunking
+
+  let stream = FramedRead::new(boxed_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,22 +1,19 @@
 use std::{
-  collections::HashMap,
+  collections::HashMap, fs::File, io::{BufRead, BufReader}, path::Path, rc::Rc, sync::Arc, thread
-  fs::File,
-  io::{BufRead, BufReader},
-  path::Path,
-  thread,
 };
 
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 
 use napi::{
-  threadsafe_function::{ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode},
+  bindgen_prelude::Function,
-  Error, JsFunction,
+  threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode},
+  Env, Error, Result,
 };
 use serde_json::json;
 use uuid::Uuid;
 
-use crate::file_utils::list_files;
+use crate::file_utils::create_backend_for_path;
 
 const CHUNK_SIZE: usize = 1024 * 1024 * 64;
 
@@ -29,14 +26,10 @@ struct ChunkData {
 }
 
 #[napi]
-pub fn call_alt_thread_func(callback: JsFunction) -> Result<(), Error> {
+pub fn call_alt_thread_func(tsfn: Arc<ThreadsafeFunction<()>>) -> Result<(), String> {
-  let tsfn: ThreadsafeFunction<u32, ErrorStrategy::CalleeHandled> = callback
+  let tsfn_cloned = tsfn.clone();
-    .create_threadsafe_function(0, |ctx| {
-      ctx.env.create_uint32(ctx.value + 1).map(|v| vec![v])
-    })?;
-  let tsfn = tsfn.clone();
   thread::spawn(move || {
-    tsfn.call(Ok(0), ThreadsafeFunctionCallMode::NonBlocking);
+    tsfn_cloned.call(Ok(()), ThreadsafeFunctionCallMode::Blocking);
   });
   Ok(())
 }
@@ -44,27 +37,14 @@ pub fn call_alt_thread_func(callback: JsFunction) -> Result<(), Error> {
 #[napi]
 pub fn generate_manifest(
   dir: String,
-  progress: JsFunction,
+  progress_sfn: ThreadsafeFunction<i32>,
-  log: JsFunction,
+  log_sfn: ThreadsafeFunction<String>,
-  callback: JsFunction,
+  callback_sfn: ThreadsafeFunction<String>,
-) -> Result<(), Error> {
+) -> Result<(), String> {
-  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();
-
   thread::spawn(move || {
     let base_dir = Path::new(&dir);
-    let files = list_files(base_dir);
+    let backend = create_backend_for_path(base_dir).unwrap();
+    let files = backend.list_files(base_dir);
 
     // Filepath to chunk data
     let mut chunks: HashMap<String, ChunkData> = HashMap::new();
@@ -72,27 +52,12 @@ pub fn generate_manifest(
     let total: i32 = files.len() as i32;
     let mut i: i32 = 0;
 
-    for file_path in files {
+    for version_file in files {
-      let file = File::open(file_path.clone()).unwrap();
+      let mut raw_reader= backend.reader(&version_file).unwrap();
-      let relative = file_path.strip_prefix(base_dir).unwrap();
+      let mut reader = BufReader::with_capacity(CHUNK_SIZE, raw_reader);
-      let permission_object = file.try_clone().unwrap().metadata().unwrap().permissions();
-      let permissions = {
-        let perm: u32;
-        #[cfg(target_family = "unix")]
-        {
-          perm = permission_object.mode();
-        }
-        #[cfg(not(target_family = "unix"))]
-        {
-          perm = 0
-        }
-        perm
-      };
-
-      let mut reader = BufReader::with_capacity(CHUNK_SIZE, file);
 
       let mut chunk_data = ChunkData {
-        permissions,
+        permissions: version_file.permission,
         ids: Vec::new(),
         checksums: Vec::new(),
         lengths: Vec::new(),
@@ -118,8 +83,7 @@ pub fn generate_manifest(
 
         let log_str = format!(
           "Processed chunk {} for {}",
-          chunk_index,
+          chunk_index, &version_file.relative_filename
-          relative.to_str().unwrap()
         );
         log_sfn.call(Ok(log_str), ThreadsafeFunctionCallMode::Blocking);
 
@@ -127,7 +91,7 @@ pub fn generate_manifest(
         chunk_index += 1;
       }
 
-      chunks.insert(relative.to_str().unwrap().to_string(), chunk_data);
+      chunks.insert(version_file.relative_filename, chunk_data);
 
       i += 1;
       let progress = i * 100 / total;