Replace deprectated prebuld

Author: gms1

.github/workflows/ci.yml

@@ -143,16 +143,17 @@ jobs:
           echo "CXXFLAGS=${CXXFLAGS:-} -include ../src/gcc-preinclude.h" >> $GITHUB_ENV
 
       - name: Build binaries
-        run: yarn prebuild -a ${{ env.TARGET }}
+        run: yarn prebuild
 
       - name: Print binary info
         if: contains(matrix.os, 'ubuntu')
         run: |
-          ldd build/**/node_sqlite3.node
+          BIN=$(find prebuilds -name "*.node" | head -1)
+          ldd "$BIN"
           echo "---"
-          nm build/**/node_sqlite3.node | grep "GLIBC_" | c++filt || true
+          nm "$BIN" | grep "GLIBC_" | c++filt || true
           echo "---"
-          file build/**/node_sqlite3.node
+          file "$BIN"
 
       - name: Run tests
         run: yarn test
@@ -166,8 +167,10 @@ jobs:
           retention-days: 7
 
       - name: Upload binaries to GitHub Release
-        run: yarn upload --upload-all ${{ github.token }}
+        run: gh release upload ${GITHUB_REF#refs/tags/} prebuilds/* --clobber
         if: matrix.node == 24 && startsWith(github.ref, 'refs/tags/')
+        env:
+          GH_TOKEN: ${{ github.token }}
 
   build-musl:
     permissions:
@@ -209,8 +212,54 @@ jobs:
           retention-days: 7
 
       - name: Upload binaries to GitHub Release
-        run: yarn install --frozen-lockfile --ignore-scripts && yarn upload --upload-all ${{ github.token }}
+        run: |
+          gh release upload ${GITHUB_REF#refs/tags/} prebuilds/* --clobber
         if: startsWith(github.ref, 'refs/tags/')
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+  package:
+    needs: [build, build-musl]
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request') || (github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/'))
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --ignore-scripts
+
+      - name: Download all prebuilt binary artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: prebuilds-artifacts
+          merge-multiple: true
+
+      - name: Merge prebuilds into package
+        run: |
+          mkdir -p prebuilds
+          # Each artifact may contain platform-specific subdirs
+          # Copy all prebuilds from artifacts into prebuilds/
+          cp -r prebuilds-artifacts/*/ prebuilds/ 2>/dev/null || true
+          # Also handle flat structure (files directly in artifact root)
+          cp -r prebuilds-artifacts/ prebuilds/ 2>/dev/null || true
+          # Verify the prebuilds are present
+          find prebuilds -name '*.node' -type f
+
+      - name: Create npm tarball
+        run: |
+          npm pack
+          echo "npm tarball created:"
+          ls -la *.tgz
+
+      - name: Upload npm tarball as commit artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: npm-package-tarball
+          path: '*.tgz'
+          retention-days: 7
 
   publish-npm:
     needs: [build, build-musl]
@@ -229,5 +278,18 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile --ignore-scripts
 
+      - name: Download all prebuilt binary artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: prebuilds-artifacts
+          merge-multiple: true
+
+      - name: Merge prebuilds into package
+        run: |
+          mkdir -p prebuilds
+          cp -r prebuilds-artifacts/*/ prebuilds/ 2>/dev/null || true
+          cp -r prebuilds-artifacts/ prebuilds/ 2>/dev/null || true
+          find prebuilds -name '*.node' -type f
+
       - name: Publish to npm
         run: npm publish

README.md

@@ -36,23 +36,25 @@ yarn add @homeofthings/sqlite3
 
 ### Prebuilt binaries
 
-`@homeofthings/sqlite3` uses [Node-API](https://nodejs.org/api/n-api.html) so prebuilt binaries do not need to be built for specific Node versions. Prebuilt binaries are available for Node-API v3 and v6. Check the [Node-API version matrix](https://nodejs.org/api/n-api.html#node-api-version-matrix) to ensure your Node version supports one of these. Requires Node.js v20.17.0 or later.
+`@homeofthings/sqlite3` uses [Node-API](https://nodejs.org/api/n-api.html) so prebuilt binaries do not need to be built for specific Node versions. Prebuilt binaries are built as NAPI-version-agnostic (`node.napi.*.node`) using the `--napi` flag, and work on any Node.js version that supports the NAPI version used at compile time. Requires Node.js v20.17.0 or later.
 
-The module uses [`prebuild-install`](https://github.com/prebuild/prebuild-install) to download the prebuilt binary for your platform, if it exists. These binaries are hosted on GitHub Releases. The following targets are currently provided:
+Prebuilt binaries are bundled inside the npm package using [`prebuildify`](https://github.com/prebuild/prebuildify) and loaded at runtime by [`node-gyp-build`](https://github.com/prebuild/node-gyp-build). No separate download step is needed — `npm install` just works. The following targets are currently provided:
 
 * `darwin-arm64`
 * `darwin-x64`
-* `linux-arm64`
-* `linux-x64`
-* `linuxmusl-arm64`
-* `linuxmusl-x64`
+* `linux-arm64` (glibc)
+* `linux-x64` (glibc)
+* `linux-arm64` (musl)
+* `linux-x64` (musl)
 * `win32-x64`
 
-Unfortunately, [prebuild](https://github.com/prebuild/prebuild/issues/174) cannot differentiate between `armv6` and `armv7`, and instead uses `arm` as the `{arch}`. Until that is fixed, you will still need to install `sqlite3` from [source](#source-install).
-
 Support for other platforms and architectures may be added in the future if CI supports building on them.
 
-If your environment isn't supported, it'll use `node-gyp` to build SQLite, but you will need to install a C++ compiler and linker.
+If your platform isn't supported, `node-gyp-build` automatically falls back to building from source using `node-gyp`. For custom builds (e.g., SQLCipher, external SQLite), use `--build-from-source`:
+
+```bash
+npm install @homeofthings/sqlite3 --build-from-source --sqlite_libname=sqlcipher --sqlite=/usr/
+```
 
 ### Other ways to install
 
@@ -135,23 +137,23 @@ db.close();
 To skip searching for pre-compiled binaries, and force a build from source, use
 
 ```bash
-npm install --build-from-source --sqlite=/usr/local
+npm install @homeofthings/sqlite3 --build-from-source --sqlite=/usr/local
 ```
 
 If building against an external sqlite3 make sure to have the development headers available. Mac OS X ships with these by default. If you don't have them installed, install the `-dev` package with your package manager, e.g. `apt-get install libsqlite3-dev` for Debian/Ubuntu. Make sure that you have at least `libsqlite3` >= 3.6.
 
 Note, if building against homebrew-installed sqlite on OS X you can do:
 
 ```bash
-npm install --build-from-source --sqlite=/usr/local/opt/sqlite/
+npm install @homeofthings/sqlite3 --build-from-source --sqlite=/usr/local/opt/sqlite/
 ```
 
 ## Custom file header (magic)
 
 The default sqlite file header is "SQLite format 3". You can specify a different magic, though this will make standard tools and libraries unable to work with your files.
 
 ```bash
-npm install --build-from-source --sqlite_magic="MyCustomMagic15"
+npm install @homeofthings/sqlite3 --build-from-source --sqlite_magic="MyCustomMagic15"
 ```
 
 Note that the magic *must* be exactly 15 characters long (16 bytes including null terminator).
@@ -174,7 +176,7 @@ npm install @homeofthings/sqlite3 --build-from-source --runtime=node-webkit --ta
 You can also run this command from within a `@homeofthings/sqlite3` checkout:
 
 ```bash
-npm install --build-from-source --runtime=node-webkit --target_arch=ia32 --target=$(NODE_WEBKIT_VERSION)
+npm install @homeofthings/sqlite3 --build-from-source --runtime=node-webkit --target_arch=ia32 --target=$(NODE_WEBKIT_VERSION)
 ```
 
 Remember the following:

docs/DEVELOP.md

@@ -22,9 +22,9 @@ This project uses [npm version](https://docs.npmjs.com/cli/v10/commands/npm-vers
    ```
 
    The CI workflow will automatically:
-   - Build binaries for all platforms
-   - Upload them as release assets
-   - Publish the package to npm
+   - Build prebuilt binaries for all platforms
+   - Upload them to GitHub Release
+   - Publish the package to npm (with bundled prebuilt binaries)
 
 3. ** Edit the generated Pre-release
   - select "Generate release notes" and adjust them to your needs
@@ -44,12 +44,15 @@ When you push a tag (e.g., `v6.0.2`), the CI workflow will:
 
 1. Build prebuilt binaries for:
    - macOS (x64, arm64)
-   - Linux (x64, arm64)
-   - Windows (x64, ia32)
+   - Linux glibc (x64, arm64)
+   - Linux musl (x64, arm64)
+   - Windows (x64)
 
 2. Upload binaries to GitHub Release
 
-3. Publish to npm using trusted publishing (no NPM_TOKEN required)
+3. Merge all prebuilt binaries into the npm package and publish to npm
+
+On PRs and pushes to main (non-tag), the CI also creates an npm tarball artifact (via `npm pack`) so the package contents can be inspected before publishing.
 
 ## Checking the release
 
@@ -75,4 +78,4 @@ This ensures:
 Before committing changes:
 1. Run `yarn lint --fix` to fix code style issues
 2. Run `yarn test` to ensure all tests pass
-3. Review changes before pushing
+3. Review changes before pushing

lib/sqlite3-binding.js

@@ -1 +1 @@
-module.exports = require('bindings')('node_sqlite3.node');
+module.exports = require('node-gyp-build')(require('path').join(__dirname, '..'));

memory-bank/build-system.md

@@ -57,7 +57,7 @@ SQLite library build configuration:
 ### Standard Build
 
 ```bash
-# Install with prebuild or compile
+# Install with prebuilt binaries or compile from source
 yarn install
 
 # Explicit rebuild
@@ -125,17 +125,11 @@ The `NAPI_VERSION` define is set via `napi_build_version` variable in binding.gy
 **How it works**:
 - The `napi_build_version` variable is automatically set by node-gyp based on the target Node.js version
 - For local builds, it's stored in `build/config.gypi` (e.g., `"napi_build_version": "9"`)
-- For prebuilds, the `prebuild` package passes it via `--napi_build_version=<version>` flag
+- For prebuilds, `prebuildify` passes it via the `--napi` flag which builds a single NAPI-version-agnostic binary (named `@homeofthings+sqlite3.<libc>.node`). The actual NAPI version used at compile time is determined by the Node.js version running the build (e.g., Node 24 supports NAPI v9). Since NAPI is backward compatible, a binary built with NAPI v9 runs on any Node.js supporting v9 or lower.
 
 ### NAPI Versions Configuration
 
-The `package.json` specifies which NAPI versions to build prebuilt binaries for:
-
-```json
-"binary": {
-  "napi_versions": [3, 6]
-}
-```
+With `prebuildify --napi`, the NAPI version is auto-detected from the build Node.js version — it is not explicitly configured. The CI builds prebuilds on Node 24 (which supports NAPI v9), producing a single `@homeofthings+sqlite3.glibc.node` binary per platform. The historical `[3, 6]` configuration from the old `binary.napi_versions` package.json field is no longer used.
 
 **Why multiple versions?**
 
@@ -183,40 +177,65 @@ The `ASSERT_STATUS` macro in src/macros.h is enabled when `DEBUG` is defined:
 The native addon is loaded via lib/sqlite3-binding.js:
 
 ```javascript
-module.exports = require('bindings')('node_sqlite3.node');
+module.exports = require('node-gyp-build')(require('path').join(__dirname, '..'));
 ```
 
-The `bindings` package searches:
-1. `build/Debug/node_sqlite3.node`
-2. `build/Release/node_sqlite3.node`
+The project root directory (`path.join(__dirname, "..")`) is passed instead of `__dirname` because `node-gyp-build` looks for `prebuilds/` and `build/` directories relative to the path it receives. Since `sqlite3-binding.js` is in `lib/`, passing `__dirname` would cause it to look in `lib/prebuilds/` and `lib/build/` — which do not exist.
 
-**Note**: Debug builds take precedence if both exist.
+The `node-gyp-build` package resolves the native binary in this order:
+1. `build/Release/node_sqlite3.node` — local release build
+2. `build/Debug/node_sqlite3.node` — local debug build
+3. `prebuilds/<platform>-<arch>/@homeofthings+sqlite3.<libc>.node` — bundled prebuilt binary
 
-## Prebuilt Binaries
+**Note**: Local builds take precedence over prebuilt binaries. To force a source build (which creates `build/Release/` and takes precedence), use `npm install --build-from-source`.
 
-### Downloading Prebuilts
+## Prebuilt Binaries
 
-```bash
-yarn install  # Automatically downloads prebuilt if available
-```
+Prebuilt binaries are bundled inside the npm package using `prebuildify` and loaded at runtime by `node-gyp-build`. This eliminates the need for a separate download step during `npm install`.
 
 ### Building Prebuilts
 
 ```bash
-yarn prebuild  # Build for all NAPI versions
+yarn prebuild  # Build prebuilt binaries using prebuildify
 ```
 
-### Uploading Prebuilts
+The `prebuild` script runs: `prebuildify --napi --strip --tag-libc`
+
+Flags:
+- `--napi`: Build a NAPI-version-agnostic binary (produces `@homeofthings+sqlite3.*.node`)
+- `--strip`: Strip debug symbols from binaries
+- `--tag-libc`: Tag binaries with libc variant (glibc vs musl)
+
+### Binary Naming Convention
+
+With `--tag-libc`, prebuildify produces binaries tagged with the libc variant:
+
+| Platform      | Binary Name            |
+|---------------|------------------------|
+| Linux (glibc) | `@homeofthings+sqlite3.glibc.node` |
+| Linux (musl)  | `@homeofthings+sqlite3.musl.node`  |
+| macOS         | `@homeofthings+sqlite3.node`       |
+| Windows       | `@homeofthings+sqlite3.node`       |
+
+At runtime, `node-gyp-build` determines the libc variant by checking for Alpine Linux (via `/etc/alpine-release`) — if present, it selects the `musl` binary; otherwise, it selects `glibc`. It does not depend on the `detect-libc` package.
+
+### Source Build Fallback
+
+The `install` script runs `node-gyp-build` which tests whether the prebuilt binary works. If it does, no compilation is needed. If it doesn't (unsupported platform), `node-gyp-build` automatically falls back to `node-gyp rebuild`.
+
+For custom builds (e.g., SQLCipher), use `--build-from-source` to skip the prebuilt test and force compilation:
 
 ```bash
-yarn upload  # Upload to GitHub releases
+npm install @homeofthings/sqlite3 --build-from-source
 ```
 
+The `--build-from-source` flag is handled by the `node-gyp-build` CLI (not `prebuild-install`). It checks `npm_config_build_from_source` and skips the prebuilt test, going straight to `node-gyp rebuild`.
+
 ## Platform Support
 
 - Node.js >= 20.17.0
-- NAPI versions: 3, 6
-- Platforms: Linux, macOS, Windows (see prebuild configuration)
+- NAPI: version-agnostic (`@homeofthings+sqlite3.*.node`), built with NAPI v9 on Node 24
+- Platforms: Linux (glibc + musl), macOS, Windows (see CI configuration)
 
 ## Security Hardening
 
@@ -305,9 +324,10 @@ Applied to all macOS builds (see `binding.gyp`):
 
 ### Native Module Not Found
 
-1. Verify build output exists: `ls build/Release/node_sqlite3.node`
-2. Check if bindings package is installed: `yarn install`
+1. Verify prebuilt binary exists: `ls prebuilds/`
+2. Verify build output exists: `ls build/Release/node_sqlite3.node`
 3. Try explicit rebuild: `yarn rebuild`
+4. Force source build: `npm install @homeofthings/sqlite3 --build-from-source`
 
 ### Debug Symbols Missing