better-sqlite3-multiple-ciphers 11.8.0 → 11.8.1

package/deps/sqlite3.gyp

@@ -1,5 +1,5 @@
 # ===
-# This configuration defines options specific to compiling SQLite3 itself.
+# This configuration defines options specific to compiling SQLite itself.
 # Compile-time options are loaded by the auto-generated file "defines.gypi".
 # The --sqlite3 option can be provided to use a custom amalgamation instead.
 # ===

package/deps/test_extension.c

@@ -2,7 +2,7 @@
 SQLITE_EXTENSION_INIT1
 
 /*
-	This SQLite3 extension is used only for testing purposes (npm test).
+	This SQLite extension is used only for testing purposes (npm test).
  */
 
 static void TestExtensionFunction(sqlite3_context* pCtx, int nVal, sqlite3_value** _) {

package/deps/{download.sh → update-sqlite3mc.sh}

@@ -1,113 +1,140 @@
-#!/usr/bin/env bash
-
-# ===
-# This script defines and generates the bundled SQLite3 unit (sqlite3.c).
-#
-# The following steps are taken:
-# 1. populate the shell environment with the defined compile-time options.
-# 2. download and extract the SQLite3 source code into a temporary directory.
-# 3. run "sh configure" and "make sqlite3.c" within the source directory.
-# 4. copy the generated amalgamation into the output directory (./sqlite3).
-# 5. export the defined compile-time options to a gyp file (./defines.gypi).
-# 6. update the docs (../docs/compilation.md) with details of this distribution.
-#
-# When a user builds better-sqlite3, the following steps are taken:
-# 1. node-gyp loads the previously exported compile-time options (defines.gypi).
-# 2. the copy.js script copies the bundled amalgamation into the build folder.
-# 3. node-gyp compiles the copied sqlite3.c along with better_sqlite3.cpp.
-# 4. node-gyp links the two resulting binaries to generate better_sqlite3.node.
-# ===
-
-YEAR="2022"
-VERSION="3380200"
-
-# Defines below are sorted alphabetically
-DEFINES="
-HAVE_INT16_T=1
-HAVE_INT32_T=1
-HAVE_INT8_T=1
-HAVE_STDINT_H=1
-HAVE_UINT16_T=1
-HAVE_UINT32_T=1
-HAVE_UINT8_T=1
-SQLITE_DEFAULT_CACHE_SIZE=-16000
-SQLITE_DEFAULT_FOREIGN_KEYS=1
-SQLITE_DEFAULT_MEMSTATUS=0
-SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
-SQLITE_DQS=0
-SQLITE_ENABLE_COLUMN_METADATA
-SQLITE_ENABLE_DBSTAT_VTAB
-SQLITE_ENABLE_DESERIALIZE
-SQLITE_ENABLE_FTS3
-SQLITE_ENABLE_FTS3_PARENTHESIS
-SQLITE_ENABLE_FTS4
-SQLITE_ENABLE_FTS5
-SQLITE_ENABLE_GEOPOLY
-SQLITE_ENABLE_JSON1
-SQLITE_ENABLE_MATH_FUNCTIONS
-SQLITE_ENABLE_RTREE
-SQLITE_ENABLE_STAT4
-SQLITE_ENABLE_UPDATE_DELETE_LIMIT
-SQLITE_LIKE_DOESNT_MATCH_BLOBS
-SQLITE_OMIT_DEPRECATED
-SQLITE_OMIT_PROGRESS_CALLBACK
-SQLITE_OMIT_SHARED_CACHE
-SQLITE_OMIT_TCL_VARIABLE
-SQLITE_SOUNDEX
-SQLITE_THREADSAFE=2
-SQLITE_TRACE_SIZE_LIMIT=32
-SQLITE_USER_AUTHENTICATION=0
-SQLITE_USE_URI=0
-"
-
-# ========== START SCRIPT ========== #
-
-echo "setting up environment..."
-DEPS="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
-TEMP="$DEPS/temp"
-OUTPUT="$DEPS/sqlite3"
-rm -rf "$TEMP"
-rm -rf "$OUTPUT"
-mkdir -p "$TEMP"
-mkdir -p "$OUTPUT"
-export CFLAGS=`echo $(echo "$DEFINES" | sed -e "/^\s*$/d" -e "s/^/-D/")`
-
-echo "downloading source..."
-curl -#f "https://www.sqlite.org/$YEAR/sqlite-src-$VERSION.zip" > "$TEMP/source.zip" || exit 1
-
-echo "extracting source..."
-unzip "$TEMP/source.zip" -d "$TEMP" > /dev/null || exit 1
-cd "$TEMP/sqlite-src-$VERSION" || exit 1
-
-echo "configuring amalgamation..."
-sh configure > /dev/null || exit 1
-
-echo "building amalgamation..."
-make sqlite3.c > /dev/null || exit 1
-
-echo "copying amalgamation..."
-cp sqlite3.c sqlite3.h sqlite3ext.h "$OUTPUT/" || exit 1
-
-echo "updating gyp configs..."
-GYP="$DEPS/defines.gypi"
-printf "# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)\n\n{\n  'defines': [\n" > "$GYP"
-printf "$DEFINES" | sed -e "/^\s*$/d" -e "s/\(.*\)/    '\1',/" >> "$GYP"
-printf "  ],\n}\n" >> "$GYP"
-
-echo "updating docs..."
-DOCS="$DEPS/../docs/compilation.md"
-MAJOR=`expr "${VERSION:0:1}" + 0`
-MINOR=`expr "${VERSION:1:2}" + 0`
-PATCH=`expr "${VERSION:3:2}" + 0`
-sed -Ei.bak -e "s/version [0-9]+\.[0-9]+\.[0-9]+/version $MAJOR.$MINOR.$PATCH/g" "$DOCS"
-sed -i.bak -e "/^SQLITE_/,\$d" "$DOCS"
-sed -i.bak -e "/^HAVE_/,\$d" "$DOCS"
-rm "$DOCS".bak
-printf "$DEFINES" | sed -e "/^\s*$/d" >> "$DOCS"
-printf "\`\`\`\n" >> "$DOCS"
-
-echo "cleaning up..."
-cd - > /dev/null || exit 1
-rm -rf "$TEMP"
-
-echo "done!"
+#!/usr/bin/env bash
+
+# ===
+# This script defines and generates the bundled SQLite unit (sqlite3.c).
+#
+# The following steps are taken:
+# 1. populate the shell environment with the defined compile-time options.
+# 2. download and extract the SQLite source code into a temporary directory.
+# 3. run "sh configure" and "make sqlite3.c" within the source directory.
+# 4. clone the SQLite3MultipleCiphers repo, replace SQLite amalgamation and patch it.
+# 5. build the SQLite3MultipleCiphers amalgamation
+# 6. copy the generated amalgamation into the output directory (./sqlite3).
+# 7. export the defined compile-time options to a gyp file (./defines.gypi).
+# 8. update the docs (../docs/compilation.md) with details of this distribution.
+#
+# When a user builds better-sqlite3-multiple-ciphers, the following steps are taken:
+# 1. node-gyp loads the previously exported compile-time options (defines.gypi).
+# 2. the copy.js script copies the bundled amalgamation into the build folder.
+# 3. node-gyp compiles the copied sqlite3.c along with better_sqlite3.cpp.
+# 4. node-gyp links the two resulting binaries to generate better_sqlite3.node.
+# ===
+
+YEAR="2025"
+VERSION="3480000"
+SQLITE3MC_VERSION="v2.0.2"
+
+# Defines below are sorted alphabetically
+DEFINES="
+HAVE_INT16_T=1
+HAVE_INT32_T=1
+HAVE_INT8_T=1
+HAVE_STDINT_H=1
+HAVE_UINT16_T=1
+HAVE_UINT32_T=1
+HAVE_UINT8_T=1
+HAVE_USLEEP=1
+SQLITE_DEFAULT_CACHE_SIZE=-16000
+SQLITE_DEFAULT_FOREIGN_KEYS=1
+SQLITE_DEFAULT_MEMSTATUS=0
+SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
+SQLITE_DQS=0
+SQLITE_ENABLE_COLUMN_METADATA
+SQLITE_ENABLE_DBSTAT_VTAB
+SQLITE_ENABLE_DESERIALIZE
+SQLITE_ENABLE_FTS3
+SQLITE_ENABLE_FTS3_PARENTHESIS
+SQLITE_ENABLE_FTS4
+SQLITE_ENABLE_FTS5
+SQLITE_ENABLE_GEOPOLY
+SQLITE_ENABLE_JSON1
+SQLITE_ENABLE_MATH_FUNCTIONS
+SQLITE_ENABLE_RTREE
+SQLITE_ENABLE_STAT4
+SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+SQLITE_LIKE_DOESNT_MATCH_BLOBS
+SQLITE_OMIT_DEPRECATED
+SQLITE_OMIT_PROGRESS_CALLBACK
+SQLITE_OMIT_SHARED_CACHE
+SQLITE_OMIT_TCL_VARIABLE
+SQLITE_SOUNDEX
+SQLITE_THREADSAFE=2
+SQLITE_TRACE_SIZE_LIMIT=32
+SQLITE_USER_AUTHENTICATION=0
+SQLITE_USE_URI=0
+"
+
+# ========== START SCRIPT ========== #
+
+echo -e "Setting up environment..."
+DEPS="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
+TEMP="$DEPS/temp"
+OUTPUT="$DEPS/sqlite3"
+rm -rf "$TEMP"
+rm -rf "$OUTPUT"
+mkdir -p "$TEMP"
+mkdir -p "$OUTPUT"
+export CFLAGS=`echo $(echo "$DEFINES" | sed -e "/^\s*$/d" -e "s/^/-D/")`
+
+echo -e "\nDownloading SQLite source..."
+curl -#f "https://www.sqlite.org/$YEAR/sqlite-src-$VERSION.zip" > "$TEMP/source.zip" || exit 1
+
+echo -e "\nExtracting SQLite source..."
+unzip "$TEMP/source.zip" -d "$TEMP" > /dev/null || exit 1
+cd "$TEMP/sqlite-src-$VERSION" || exit 1
+
+echo -e "\nConfiguring SQLite amalgamation..."
+sh configure > /dev/null || exit 1
+
+echo -e "\nBuilding SQLite amalgamation..."
+make OPTIONS="$CFLAGS" sqlite3.c > /dev/null || exit 1
+
+echo -e "\nCloning SQLite3MultipleCiphers repo..."
+cd "$TEMP" || exit 1
+git clone --quiet https://github.com/utelle/SQLite3MultipleCiphers.git > /dev/null || exit 1
+cd "$TEMP/SQLite3MultipleCiphers" || exit 1
+git checkout --quiet "tags/$SQLITE3MC_VERSION" > /dev/null || exit 1
+
+echo -e "\nReplacing SQLite amalgamation in SQLite3MultipleCiphers..."
+cd "$TEMP/sqlite-src-$VERSION" || exit 1
+(yes | cp -rf sqlite3.c sqlite3.h sqlite3ext.h "$TEMP/SQLite3MultipleCiphers/src") || exit 1
+
+echo -e "\nPatching SQLite amalgamation in SQLite3MultipleCiphers..."
+cd "$TEMP/SQLite3MultipleCiphers" || exit 1
+chmod +x ./scripts/patchsqlite3.sh || exit 1
+chmod +x ./scripts/rekeyvacuum.sh || exit 1
+./scripts/patchsqlite3.sh ./src/sqlite3.c >./src/sqlite3patched.c || exit 1
+./scripts/rekeyvacuum.sh ./src/sqlite3.c >./src/rekeyvacuum.c || exit 1
+
+echo -e "\nBuilding SQLite3MultipleCiphers amalgamation..."
+python3 ./scripts/amalgamate.py --config ./scripts/sqlite3mc.c.json --source ./src/ || exit 1
+mv sqlite3mc_amalgamation.c sqlite3.c || exit 1
+python3 ./scripts/amalgamate.py --config ./scripts/sqlite3mc.h.json --source ./src/ || exit 1
+mv sqlite3mc_amalgamation.h sqlite3.h || exit 1
+
+echo -e "\nCopying SQLite3MultipleCiphers amalgamation..."
+cp sqlite3.c sqlite3.h ./src/sqlite3ext.h "$OUTPUT/" || exit 1
+
+echo -e "\nUpdating gyp configs..."
+GYP="$DEPS/defines.gypi"
+printf "# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)\n\n{\n  'defines': [\n" > "$GYP"
+printf "$DEFINES" | sed -e "/^\s*$/d" -e "s/\(.*\)/    '\1',/" >> "$GYP"
+printf "  ],\n}\n" >> "$GYP"
+
+echo -e "\nUpdating docs..."
+DOCS="$DEPS/../docs/compilation.md"
+MAJOR=`expr "${VERSION:0:1}" + 0`
+MINOR=`expr "${VERSION:1:2}" + 0`
+PATCH=`expr "${VERSION:3:2}" + 0`
+sed -Ei.bak -e "s/version [0-9]+\.[0-9]+\.[0-9]+/version $MAJOR.$MINOR.$PATCH/g" "$DOCS"
+sed -i.bak -e "/^SQLITE_/,\$d" "$DOCS"
+sed -i.bak -e "/^HAVE_/,\$d" "$DOCS"
+rm "$DOCS".bak
+printf "$DEFINES" | sed -e "/^\s*$/d" >> "$DOCS"
+printf "\`\`\`\n" >> "$DOCS"
+
+echo -e "\nCleaning up..."
+cd - > /dev/null || exit 1
+rm -rf "$TEMP"
+
+echo -e "\nSQLite3MultipleCiphers update process completed!"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-sqlite3-multiple-ciphers",
-  "version": "11.8.0",
+  "version": "11.8.1",
   "description": "better-sqlite3 with multiple-cipher encryption support",
   "homepage": "https://github.com/m4heshd/better-sqlite3-multiple-ciphers",
   "author": "Mahesh Bandara Wijerathna (m4heshd) <m4heshd@gmail.com>",
@@ -41,8 +41,7 @@
     "test": "mocha --exit --slow=75 --timeout=30000",
     "test:container": "docker-compose up --detach --build",
     "benchmark": "node benchmark",
-    "download": "bash ./deps/download.sh",
-    "setup": "powershell ./deps/setup.ps1",
+    "update-sqlite3mc": "bash ./deps/update-sqlite3mc.sh",
     "lzz": "lzz -hx hpp -sx cpp -k BETTER_SQLITE3 -d -hl -sl -e ./src/better_sqlite3.lzz",
     "bump:patch": "npm --no-git-tag-version version patch",
     "bump:minor": "npm --no-git-tag-version version minor",

package/deps/setup.ps1

@@ -1,38 +0,0 @@
-# ENV
-$ErrorActionPreference = "Stop"
-
-# SQLite Info
-$SQLITEMC_VER = "v2.0.2"
-$API_URL = "https://api.github.com/repos/utelle/SQLite3MultipleCiphers/releases/tags/" + $SQLITEMC_VER
-
-# Paths
-$TEMP_PATH = Join-Path $PSScriptRoot "temp"
-$SOURCE_PATH = Join-Path $TEMP_PATH "source.zip"
-$EXTRACT_PATH = Join-Path $TEMP_PATH "extracted"
-$DEST_PATH = Join-Path $PSScriptRoot "sqlite3"
-
-Write-Host "Preparing.."
-Remove-Item -Path $TEMP_PATH -Recurse -Force -ErrorAction Ignore
-
-Write-Host "`r`nDiscovering the asset.."
-$RESULT = Invoke-WebRequest $API_URL -Method Get | ConvertFrom-Json
-$FILE = @($RESULT.assets.name) -match '-amalgamation.zip' | Select-Object -First 1
-$DL_URL = @($RESULT.assets.browser_download_url) -match '-amalgamation.zip' | Select-Object -First 1
-
-Write-Host "`r`nDownloading.. ($( $FILE ))"
-Invoke-WebRequest -Uri $DL_URL -OutFile (New-Item -Path $SOURCE_PATH -Force)
-
-Write-Host "`r`nExtracting archive.."
-Expand-Archive -Path $SOURCE_PATH -DestinationPath $EXTRACT_PATH
-
-Write-Host "`r`nCopying SQLite3MC source files.."
-Remove-Item -Path $DEST_PATH -Recurse -Force -ErrorAction Ignore
-New-Item $DEST_PATH -Type Directory
-Copy-Item -Path (Join-Path $EXTRACT_PATH "sqlite3mc_amalgamation.h") -Destination (Join-Path $DEST_PATH "sqlite3.h")
-Copy-Item -Path (Join-Path $EXTRACT_PATH "sqlite3mc_amalgamation.c") -Destination (Join-Path $DEST_PATH "sqlite3.c")
-Copy-Item -Path (Join-Path $EXTRACT_PATH "sqlite3ext.h") -Destination (Join-Path $DEST_PATH "sqlite3ext.h")
-
-Write-Host "`r`nCleaning up.."
-Remove-Item -Path $TEMP_PATH -Recurse -Force
-
-Write-Host "`r`nProcess completed" -ForegroundColor green