eliminate custom build and test steps

Author: paulfitz

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - master
+      - grist-main
+      - grist-main-dev
     tags:
       - '*'
 env:
@@ -41,6 +43,7 @@ jobs:
             node: 16
             host: x86
             target: x86
+          # This is a self-hosted runner, github doesn't have this architecture yet.
           - os: macos-m1
             node: 16
             host: arm64

package.json

@@ -2,15 +2,15 @@
   "name": "@gristlabs/sqlite3",
   "description": "Asynchronous, non-blocking SQLite3 bindings",
   "version": "4.1.1-grist.6",
-  "homepage": "https://github.com/TryGhost/node-sqlite3",
+  "homepage": "https://github.com/gristlabs/node-sqlite3",
   "author": {
     "name": "Mapbox",
     "url": "https://mapbox.com/"
   },
   "binary": {
     "module_name": "node_sqlite3",
     "module_path": "./lib/binding/napi-v{napi_build_version}-{platform}-{libc}-{arch}",
-    "host": "https://github.com/TryGhost/node-sqlite3/releases/download/",
+    "host": "https://github.com/gristlabs/node-sqlite3/releases/download/",
     "remote_path": "v{version}",
     "package_name": "napi-v{napi_build_version}-{platform}-{libc}-{arch}.tar.gz",
     "napi_versions": [
@@ -45,7 +45,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/TryGhost/node-sqlite3.git"
+    "url": "https://github.com/gristlabs/node-sqlite3.git"
   },
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.0",
@@ -73,7 +73,7 @@
     "build:debug": "node-pre-gyp build --debug",
     "install": "node-pre-gyp install --fallback-to-build",
     "pretest": "node test/support/createdb.js",
-    "test": "./scripts/prepare_for_test.sh; mocha -R spec --timeout 480000",
+    "test": "mocha -R spec --timeout 480000",
     "rebuild-tests": "node-gyp rebuild --directory test/cpp",
     "pack": "node-pre-gyp package"
   },

scripts/prepare_for_test.sh

@@ -125,4 +125,68 @@ const char* sqlite_authorizer_string(int type) {
     }
 }
 
-NODE_API_MODULE(node_sqlite3, RegisterModule)
+
+/*************************************/
+/* Some hooks for Grist testing.     */
+/*************************************/
+
+Napi::Value Serialize(const Napi::CallbackInfo& info) {
+    Napi::Env env = info.Env();
+    if (info.Length() > 0) {
+        Marshaller m;
+        m.marshalValue(info[0]);
+        const std::vector<char> &buffer = m.getBuffer();
+        Napi::Env env = info.Env();
+        return Napi::Buffer<char>::Copy(env, &buffer[0], buffer.size());
+    }
+    return env.Null();
+}
+
+Napi::Value Parse(const Napi::CallbackInfo& info) {
+    Napi::Env env = info.Env();
+    if (info.Length() > 0) {
+        if (!info[0].IsBuffer()) {
+            Napi::Error::New(env, "Argument must be a buffer").ThrowAsJavaScriptException();
+        return env.Null();
+        } else {
+            Napi::Buffer<char> buffer = info[0].As<Napi::Buffer<char>>();
+            Napi::Value result = Unmarshaller::parse(info, buffer.Data(), buffer.Length());
+            if (!result.IsEmpty()) {
+                return result;
+            }
+        }
+    }
+    return env.Null();
+}
+
+Napi::Value TestOppositeEndianness(const Napi::CallbackInfo& info) {
+    Napi::Env env = info.Env();
+    if (info.Length() > 0) {
+        marshalTestOppositeEndianness(info[0].As<Napi::Boolean>().Value());
+    }
+    return env.Null();
+}
+
+Napi::Object RegisterTestHooks(Napi::Env env, Napi::Object exports) {
+    exports.Set(Napi::String::New(env, "serialize"),
+                Napi::Function::New(env, Serialize));
+    exports.Set(Napi::String::New(env, "parse"),
+                Napi::Function::New(env, Parse));
+    exports.Set(Napi::String::New(env, "testOppositeEndianness"),
+                Napi::Function::New(env, TestOppositeEndianness));
+    return exports;
+}
+
+Napi::Object RegisterModuleAndTestHooks(Napi::Env env, Napi::Object exports) {
+    RegisterModule(env, exports);
+    return RegisterTestHooks(env, exports);
+}
+
+
+/*************************************/
+/* End of hooks for Grist testing.   */
+/*************************************/
+
+
+
+NODE_API_MODULE(node_sqlite3, RegisterModuleAndTestHooks)

src/node_sqlite3.cc

@@ -1,6 +1,8 @@
 var assert = require('assert');
 
-describe('electron', function() {
+// I can't find definitive documentation, but the napi-based binaries seem to run
+// fine with Electron these days, no need for a special song and dance.
+describe.skip('electron', function() {
   it('respects ELECTRON_VERSION', function() {
     process.env.ELECTRON_VERSION = '1.2.3';
     let name = require.resolve('..');

test/cpp/binding.gyp

@@ -3,12 +3,7 @@
 const path = require('path');
 const assert = require('assert');
 const util = require('util');
-const bindings = require('bindings');
-
-const testRoot = path.resolve(__dirname, 'cpp');
-const mainRoot = path.resolve(__dirname, '..');
-bindings({ module_root: mainRoot, bindings: 'node_sqlite3' });
-const marshal = bindings({ module_root: testRoot, bindings: 'marshal' });
+const marshal = require('..');  // Marshaling test hooks are now in library.
 
 describe('marshal', function() {
   function stringToArray(str) {