@homeofthings/sqlite3 6.4.0 → 7.0.0

package/src/backup.cc

@@ -173,6 +173,14 @@ Backup::Backup(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Backup>(info)
     baton->filenameIsDest = filenameIsDest.Value();
 
     this->db->Schedule(Work_BeginInitialize, baton);
+
+    // Initialize retryErrors with default values so GetRetryErrors() never
+    // crashes on an empty Napi::Reference, even if the JS wrapper that sets
+    // backup.retryErrors is bypassed (i.e. direct new sqlite3.Backup(...)).
+    Napi::Array defaultRetryErrors = Napi::Array::New(env, 2);
+    defaultRetryErrors.Set(static_cast<uint32_t>(0), Napi::Number::New(env, SQLITE_BUSY));
+    defaultRetryErrors.Set(static_cast<uint32_t>(1), Napi::Number::New(env, SQLITE_LOCKED));
+    retryErrors.Reset(defaultRetryErrors, 1);
 }
 
 void Backup::Work_BeginInitialize(Database::Baton* baton) {

package/src/macros.h

@@ -4,14 +4,10 @@
 const char* sqlite_code_string(int code);
 const char* sqlite_authorizer_string(int type);
 #include <vector>
-#include <atomic>
 
 // TODO: better way to work around StringConcat?
 #include <napi.h>
 
-// Forward declaration of shutdown flag from node_sqlite3.cc
-extern std::atomic<bool> g_env_shutting_down;
-
 inline Napi::String StringConcat(Napi::Value str1, Napi::Value str2) {
   return Napi::String::New(str1.Env(), str1.As<Napi::String>().Utf8Value() +
                     str2.As<Napi::String>().Utf8Value() );
@@ -133,21 +129,8 @@ inline bool OtherIsInt(Napi::Number source) {
     if ((argc != 0) && (passed_argv != NULL)) {\
       args.assign(passed_argv, passed_argv + argc);\
     }\
-    try {\
-        Napi::Value res = (callback).Call(Napi::Value(context), args);\
-        if (res.IsEmpty()) return __VA_ARGS__;\
-    } catch (const Napi::Error&) {\
-        /* During Node.js/Electron shutdown, when using NAPI_CPP_EXCEPTIONS,*/\
-				/* we must take care to not throw any exceptions. */\
-        /* But when napi_call_function returns napi_cannot_run_js */\
-        /* this throws a C++ exception, when NAPI_CPP_EXCEPTIONS is enabled. */\
-        if (g_env_shutting_down.load()) {\
-             /* We need to silently ignore exceptions during shutdown. */\
-            return __VA_ARGS__;\
-        }\
-        /* Real rror - re-throw to propagate it */\
-        throw;\
-    }
+    Napi::Value res = (callback).Call(Napi::Value(context), args);\
+    if (res.IsEmpty()) return __VA_ARGS__;
 
 #define WORK_DEFINITION(name)                                                  \
     Napi::Value name(const Napi::CallbackInfo& info);                          \

package/src/node_sqlite3.cc

@@ -2,7 +2,6 @@
 #include <sstream>
 #include <cstring>
 #include <string>
-#include <atomic>
 #include <sqlite3.h>
 
 #include "macros.h"
@@ -12,21 +11,11 @@
 
 using namespace node_sqlite3;
 
-// Global flag set when the environment is shutting down.
-std::atomic<bool> g_env_shutting_down{false};
-
-static void EnvCleanupHook(void* /*data*/) {
-    g_env_shutting_down.store(true);
-}
-
 namespace {
 
 Napi::Object RegisterModule(Napi::Env env, Napi::Object exports) {
     Napi::HandleScope scope(env);
 
-    // Register cleanup hook to detect shutdown
-    napi_add_env_cleanup_hook(env, EnvCleanupHook, nullptr);
-
     Database::Init(env, exports);
     Statement::Init(env, exports);
     Backup::Init(env, exports);

package/deps/extract.js

@@ -1,19 +0,0 @@
-const tar = require("tar");
-const fs = require("fs");
-const path = require("path");
-const tarball = path.resolve(process.argv[2]);
-const dirname = path.resolve(process.argv[3]);
-
-tar.extract({
-    sync: true,
-    file: tarball,
-    cwd: dirname,
-});
-
-// SQLite >= 3.49 ships a VERSION file that conflicts with the C++20 <version>
-// header on case-insensitive filesystems (macOS/Windows).
-const base = path.basename(tarball, ".tar.gz");
-const versionFile = path.join(dirname, base, "VERSION");
-if (fs.existsSync(versionFile)) {
-    fs.unlinkSync(versionFile);
-}