@swimlane/nodegit 1.1.10 → 2.0.4

package/.github/workflows/publish.yml

@@ -16,16 +16,14 @@ jobs:
     name: build
     strategy:
       matrix:
-        node: [22.x]
+        node: [24.x]
         os:
           # macos-14 is arm64 (m1)
           - name: darwin
             host: macos-14
 
-          # ubuntu-20.04 is x86. Still no arm linux runners yet
-          # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
           - name: linux-amd
-            host: ubuntu-20.04
+            host: ubuntu-24.04
     env:
       CC: clang
       CXX: clang++
@@ -112,7 +110,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
           check-latest: true
           registry-url: "https://registry.npmjs.org"
           scope: "swimlane"
@@ -162,7 +160,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
           check-latest: true
           registry-url: "https://npm.pkg.github.com"
           scope: "@swimlane"

package/.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
   release-prep:
     name: Release | Prep
     runs-on:
-      - large-amd
+      - ubuntu-latest
     outputs:
       release-outputs: ${{ toJSON(steps.release.outputs) }}
     steps:

package/.github/workflows/tests.yml

@@ -21,8 +21,8 @@ jobs:
       npm_config_clang: 1
       GYP_DEFINES: use_obsolete_asm=true
       DEBIAN_FRONTEND: "noninteractive"
-    runs-on: ubuntu-20.04
-    container: ubuntu:20.04
+    runs-on: ubuntu-24.04
+    container: ubuntu:24.04
     steps:
       - name: prerequisites
         run: |
@@ -33,7 +33,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.0.0
+          node-version: 24.0.0
           check-latest: true
       - name: Test
         run: |
@@ -61,14 +61,14 @@ jobs:
       CXX: clang++
       npm_config_clang: 1
       GYP_DEFINES: use_obsolete_asm=true
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.0.0
+          node-version: 24.0.0
           check-latest: true
       - name: Test
         run: |

package/README.md

@@ -1,6 +1,6 @@
 # NodeGit
 
-> Node bindings to the [libgit2](http://libgit2.github.com/) project.
+> Node bindings to the [libgit2](http://libgit2.github.com/) project. 
 
 [![Actions Status](https://github.com/nodegit/nodegit/workflows/Testing/badge.svg)](https://github.com/nodegit/nodegit/actions)
 

package/binding.gyp

@@ -17,38 +17,8 @@
   },
 
   "targets": [{
-    "target_name": "acquireOpenSSL",
-    "type": "none",
-    "conditions": [
-      ["<(is_electron) == 1 and <!(node -p \"process.env.npm_config_openssl_dir ? 0 : 1\")", {
-        "actions": [{
-          "action_name": "acquire",
-          "action": ["node", "utils/acquireOpenSSL.js", "<(macOS_deployment_target)"],
-          "inputs": [""],
-          "outputs": ["vendor/openssl"],
-          "message": "Acquiring OpenSSL binaries and headers"
-        }]
-      }]
-    ]
-  }, {
-    "target_name": "configureLibssh2",
-    "type": "none",
-    "actions": [{
-      "action_name": "configure",
-      "action": ["node", "utils/configureLibssh2.js"],
-      "inputs": [""],
-      "outputs": [""]
-    }],
-    "hard_dependencies": [
-      "acquireOpenSSL"
-    ]
-  }, {
     "target_name": "nodegit",
 
-    "hard_dependencies": [
-      "configureLibssh2"
-    ],
-
     "dependencies": [
       "vendor/libgit2.gyp:libgit2"
     ],
@@ -85,6 +55,7 @@
       "src/attr_options.cc",
       "src/blame.cc",
       "src/blame_hunk.cc",
+      "src/blame_line.cc",
       "src/blame_options.cc",
       "src/blob.cc",
       "src/blob_filter_options.cc",
@@ -103,9 +74,12 @@
       "src/clone.cc",
       "src/clone_options.cc",
       "src/commit.cc",
+      "src/commit_create_options.cc",
       "src/commit_graph.cc",
       "src/commit_graph_writer.cc",
+      "src/commitarray.cc",
       "src/config.cc",
+      "src/config_backend_memory_options.cc",
       "src/config_entry.cc",
       "src/config_entry.cc",
       "src/config_iterator.cc",
@@ -129,6 +103,8 @@
       "src/diff_patchid_options.cc",
       "src/diff_perfdata.cc",
       "src/diff_stats.cc",
+      "src/email.cc",
+      "src/email_create_options.cc",
       "src/error.cc",
       "src/fetch.cc",
       "src/fetch_options.cc",
@@ -224,6 +200,7 @@
       "src/treebuilder.cc",
       "src/worktree.cc",
       "src/worktree_add_options.cc",
+      "src/worktree_add_options.cc",
       "src/worktree_prune_options.cc",
       "src/worktree_prune_options.cc",
       "src/writestream.cc",
@@ -232,7 +209,7 @@
     "include_dirs": [
       "vendor/libv8-convert",
       "vendor/libssh2/include",
-      "<!(node -e \"require('@axosoft/nan')\")"
+      "<!(node -e \"require('nan')\")"
     ],
 
     "cflags": [
@@ -296,7 +273,8 @@
             }]
           ],
           "defines": [
-            "_HAS_EXCEPTIONS=1"
+            "_HAS_EXCEPTIONS=1",
+            "NOMINMAX=1"
           ],
           "msvs_settings": {
             "VCCLCompilerTool": {
@@ -312,9 +290,9 @@
             }
           },
           "libraries": [
-            "winhttp.lib",
             "crypt32.lib",
-            "rpcrt4.lib"
+            "rpcrt4.lib",
+            "secur32.lib"
           ]
         }
       ],
@@ -330,21 +308,28 @@
               "-std=c++<(cxx_version)"
             ],
           }],
-          ["<(is_electron) == 1 and <(electron_openssl_static) == 1", {
+          ["<(is_electron) == 1", {
+            "conditions": [
+              ["<(electron_openssl_static) == 1", {
+                "libraries": [
+                  "<(electron_openssl_root)/lib/libssl.a",
+                  "<(electron_openssl_root)/lib/libcrypto.a"
+                ]
+              }],
+              ["<(electron_openssl_static) != 1", {
+                "library_dirs": [
+                  "<(electron_openssl_root)/lib"
+                ],
+                "libraries": [
+                  "-lcrypto",
+                  "-lssl"
+                ]
+              }]
+            ],
             "include_dirs": [
               "<(electron_openssl_root)/include"
             ],
-            "libraries": [#this order is significant on centos7 apparently...
-              "<(electron_openssl_root)/lib/libssl.a",
-              "<(electron_openssl_root)/lib/libcrypto.a"
-            ]
           }],
-          ["<(is_electron) == 1 and <(electron_openssl_static) != 1", {
-            "libraries": [
-              "-lcrypto",
-              "-lssl"
-            ]
-          }]
         ],
       }],
       [

package/lib/credential.js

@@ -16,6 +16,7 @@ NodeGit.Cred = {
   defaultNew: deprecatedFn("defaultNew"),
   sshKeyFromAgent: deprecatedFn("sshKeyFromAgent"),
   sshKeyNew: deprecatedFn("sshKeyNew"),
+  sshKeyMemoryNew: deprecatedFn("sshKeyMemoryNew"),
   usernameNew: deprecatedFn("usernameNew"),
   userpassPlaintextNew: deprecatedFn("userpassPlaintextNew"),
   TYPE: Object.keys(Credential.TYPE).reduce(

package/lib/enums.js

@@ -69,8 +69,7 @@ NodeGit.Checkout.NOTIFY = {
   ALL: 65535,
 };
 NodeGit.Checkout.STRATEGY = {
-  NONE: 0,
-  SAFE: 1,
+  SAFE: 0,
   FORCE: 2,
   RECREATE_MISSING: 4,
   ALLOW_CONFLICTS: 16,
@@ -91,6 +90,7 @@ NodeGit.Checkout.STRATEGY = {
   DONT_WRITE_INDEX: 8388608,
   DRY_RUN: 16777216,
   CONFLICT_STYLE_ZDIFF3: 33554432,
+  NONE: 1073741824,
   UPDATE_SUBMODULES: 65536,
   UPDATE_SUBMODULES_IF_CHANGED: 131072,
 };
@@ -109,7 +109,8 @@ NodeGit.Config.LEVEL = {
   XDG: 3,
   GLOBAL: 4,
   LOCAL: 5,
-  APP: 6,
+  WORKTREE: 6,
+  APP: 7,
   HIGHEST_LEVEL: -1,
 };
 NodeGit.Config.MAP = {
@@ -237,11 +238,11 @@ NodeGit.Enums.DIRECTION = {
   FETCH: 0,
   PUSH: 1,
 };
-NodeGit.Enums.EMAIL_CREATE_FLAGS = {
-  EMAIL_CREATE_DEFAULT: 0,
-  EMAIL_CREATE_OMIT_NUMBERS: 1,
-  EMAIL_CREATE_ALWAYS_NUMBER: 2,
-  EMAIL_CREATE_NO_RENAMES: 4,
+NodeGit.Email.CREATE_FLAGS = {
+  CREATE_DEFAULT: 0,
+  CREATE_OMIT_NUMBERS: 1,
+  CREATE_ALWAYS_NUMBER: 2,
+  CREATE_NO_RENAMES: 4,
 };
 NodeGit.Error.ERROR = {
   NONE: 0,
@@ -315,12 +316,23 @@ NodeGit.Error.CODE = {
   EAPPLYFAIL: -35,
   EOWNER: -36,
   TIMEOUT: -37,
+  EUNCHANGED: -38,
+  ENOTSUPPORTED: -39,
+  EREADONLY: -40,
 };
 NodeGit.Enums.FEATURE = {
   THREADS: 1,
   HTTPS: 2,
   SSH: 4,
   NSEC: 8,
+  HTTP_PARSER: 16,
+  REGEX: 32,
+  I18N: 64,
+  AUTH_NTLM: 128,
+  AUTH_NEGOTIATE: 256,
+  COMPRESSION: 512,
+  SHA1: 1024,
+  SHA256: 2048,
 };
 NodeGit.Fetch.DEPTH = {
   FULL: 0,
@@ -431,6 +443,9 @@ NodeGit.Libgit2.OPT = {
   GET_SERVER_CONNECT_TIMEOUT: 40,
   SET_SERVER_TIMEOUT: 41,
   GET_SERVER_TIMEOUT: 42,
+  SET_USER_AGENT_PRODUCT: 43,
+  GET_USER_AGENT_PRODUCT: 44,
+  ADD_SSL_X509_CERT: 45,
 };
 NodeGit.Merge.ANALYSIS = {
   NONE: 0,
@@ -559,6 +574,10 @@ NodeGit.Remote.REDIRECT = {
   INITIAL: 2,
   ALL: 4,
 };
+NodeGit.Remote.UPDATE_FLAGS = {
+  UPDATE_FETCHHEAD: 1,
+  UPDATE_REPORT_UNCHANGED: 2,
+};
 NodeGit.Repository.INIT_FLAG = {
   BARE: 1,
   NO_REINIT: 2,
@@ -588,7 +607,8 @@ NodeGit.Repository.ITEM = {
   LOGS: 11,
   MODULES: 12,
   WORKTREES: 13,
-  _LAST: 14,
+  WORKTREE_CONFIG: 14,
+  _LAST: 15,
 };
 NodeGit.Repository.OPEN_FLAG = {
   OPEN_NO_SEARCH: 1,

package/lib/nodegit.js

@@ -233,6 +233,7 @@ _Commit.prototype.nthGenAncestor = promisify(_Commit_nthGenAncestor);
 var _Commit_parent = _Commit.prototype.parent;
 _Commit.prototype.parent = promisify(_Commit_parent);
 
+var _Commitarray = rawApi.Commitarray;
 var _Config = rawApi.Config;
 
 var _Config_findGlobal = _Config.findGlobal;
@@ -399,6 +400,20 @@ var _DiffStats = rawApi.DiffStats;
 var _DiffStats_toBuf = _DiffStats.prototype.toBuf;
 _DiffStats.prototype.toBuf = promisify(_DiffStats_toBuf);
 
+var _Email = rawApi.Email;
+
+var _Email_createFromCommit = _Email.createFromCommit;
+_Email.createFromCommit = promisify(_Email_createFromCommit);
+
+var _Email_createFromDiff = _Email.createFromDiff;
+_Email.createFromDiff = promisify(_Email_createFromDiff);
+
+rawApi.EmailCreateOptions = util.deprecate(function EmailCreateOptions() {
+  try {
+    require("./deprecated/structs/EmailCreateOptions").call(this, rawApi);
+  }
+  catch (error) { /* allow these to be undefined */ }
+}, "Instantiation of EmailCreateOptions is deprecated and will be removed in an upcoming version");
 var _Error = rawApi.Error;
 rawApi.FetchOptions = util.deprecate(function FetchOptions() {
   try {
@@ -516,6 +531,9 @@ _Index.prototype.find = promisify(_Index_find);
 var _Index_findPrefix = _Index.prototype.findPrefix;
 _Index.prototype.findPrefix = promisify(_Index_findPrefix);
 
+var _Index_open = _Index.open;
+_Index.open = promisify(_Index_open);
+
 var _Index_read = _Index.prototype.read;
 _Index.prototype.read = promisify(_Index_read);
 
@@ -706,12 +724,15 @@ _Odb.prototype.addDiskAlternate = promisify(_Odb_addDiskAlternate);
 var _Odb_existsPrefix = _Odb.prototype.existsPrefix;
 _Odb.prototype.existsPrefix = promisify(_Odb_existsPrefix);
 
+var _Odb_hashfile = _Odb.hashfile;
+_Odb.hashfile = promisify(_Odb_hashfile);
+
+var _Odb_open = _Odb.open;
+_Odb.open = promisify(_Odb_open);
+
 var _Odb_read = _Odb.prototype.read;
 _Odb.prototype.read = promisify(_Odb_read);
 
-var _Odb_readPrefix = _Odb.prototype.readPrefix;
-_Odb.prototype.readPrefix = promisify(_Odb_readPrefix);
-
 var _Odb_write = _Odb.prototype.write;
 _Odb.prototype.write = promisify(_Odb_write);
 
@@ -967,6 +988,9 @@ rawApi.RemoteCreateOptions = util.deprecate(function RemoteCreateOptions() {
 }, "Instantiation of RemoteCreateOptions is deprecated and will be removed in an upcoming version");
 var _Repository = rawApi.Repository;
 
+var _Repository_commitParents = _Repository.prototype.commitParents;
+_Repository.prototype.commitParents = promisify(_Repository_commitParents);
+
 var _Repository_config = _Repository.prototype.config;
 _Repository.prototype.config = promisify(_Repository_config);
 
@@ -1018,6 +1042,9 @@ _Repository.prototype.refdb = promisify(_Repository_refdb);
 var _Repository_setHead = _Repository.prototype.setHead;
 _Repository.prototype.setHead = promisify(_Repository_setHead);
 
+var _Repository_wrapOdb = _Repository.wrapOdb;
+_Repository.wrapOdb = promisify(_Repository_wrapOdb);
+
 var _Repository_cleanup = _Repository.prototype.cleanup;
 _Repository.prototype.cleanup = promisify(_Repository_cleanup);
 
@@ -1091,6 +1118,9 @@ var _Signature = rawApi.Signature;
 var _Signature_default = _Signature.default;
 _Signature.default = promisify(_Signature_default);
 
+var _Signature_defaultFromEnv = _Signature.defaultFromEnv;
+_Signature.defaultFromEnv = promisify(_Signature_defaultFromEnv);
+
 var _Signature_fromBuffer = _Signature.fromBuffer;
 _Signature.fromBuffer = promisify(_Signature_fromBuffer);
 
@@ -1325,6 +1355,12 @@ _Worktree.openFromRepository = promisify(_Worktree_openFromRepository);
 var _Worktree_prune = _Worktree.prototype.prune;
 _Worktree.prototype.prune = promisify(_Worktree_prune);
 
+rawApi.WorktreeAddOptions = util.deprecate(function WorktreeAddOptions() {
+  try {
+    require("./deprecated/structs/WorktreeAddOptions").call(this, rawApi);
+  }
+  catch (error) { /* allow these to be undefined */ }
+}, "Instantiation of WorktreeAddOptions is deprecated and will be removed in an upcoming version");
 rawApi.WorktreeAddOptions = util.deprecate(function WorktreeAddOptions() {
   try {
     require("./deprecated/structs/WorktreeAddOptions").call(this, rawApi);
@@ -1395,6 +1431,7 @@ importExtension("attr");
 importExtension("attr_options");
 importExtension("blame");
 importExtension("blame_hunk");
+importExtension("blame_line");
 importExtension("blame_options");
 importExtension("blob");
 importExtension("blob_filter_options");
@@ -1413,9 +1450,12 @@ importExtension("cherrypick_options");
 importExtension("clone");
 importExtension("clone_options");
 importExtension("commit");
+importExtension("commit_create_options");
 importExtension("commit_graph");
 importExtension("commit_graph_writer");
+importExtension("commitarray");
 importExtension("config");
+importExtension("config_backend_memory_options");
 importExtension("config_entry");
 importExtension("config_entry");
 importExtension("config_iterator");
@@ -1439,6 +1479,8 @@ importExtension("diff_parse_options");
 importExtension("diff_patchid_options");
 importExtension("diff_perfdata");
 importExtension("diff_stats");
+importExtension("email");
+importExtension("email_create_options");
 importExtension("error");
 importExtension("fetch");
 importExtension("fetch_options");
@@ -1534,6 +1576,7 @@ importExtension("tree_update");
 importExtension("treebuilder");
 importExtension("worktree");
 importExtension("worktree_add_options");
+importExtension("worktree_add_options");
 importExtension("worktree_prune_options");
 importExtension("worktree_prune_options");
 importExtension("writestream");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@swimlane/nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "1.1.10",
+  "version": "2.0.4",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
@@ -32,47 +32,57 @@
     "lib": "./lib"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 20"
   },
   "dependencies": {
-    "@axosoft/nan": "^2.20.0-gk.1",
     "fs-extra": "^7.0.0",
-    "got": "^11.8.6",
+    "got": "^14.4.7",
     "json5": "^2.1.0",
-    "lodash": "^4.17.14",
-    "node-gyp": "^10.0.1",
-    "node-gyp-build": "^4.8.1",
-    "ramda": "^0.25.0",
-    "tar-fs": "^2.1.1"
+    "lodash": "^4.18.1",
+    "nan": "axosoft/nan#v2.26.2-axosoft.0",
+    "node-gyp": "^11.2.0",
+    "node-gyp-build": "^4.8.4",
+    "tar-fs": "^3.0.9"
+  },
+  "overrides": {
+    "tar": "^7.5.11",
+    "picomatch": "^4.0.4",
+    "mocha": {
+      "diff": "^8.0.3",
+      "serialize-javascript": "^7.0.5"
+    },
+    "jshint": {
+      "minimatch": "3.1.5"
+    },
+    "brace-expansion@<1.1.12": "^1.1.13",
+    "brace-expansion@<2.0.3": "^2.0.3"
   },
   "devDependencies": {
-    "cheerio": "^1.0.0-rc.2",
+    "aws-sdk": "^2.1095.0",
     "clean-for-publish": "~1.0.2",
     "combyne": "~0.8.1",
-    "coveralls": "^3.0.2",
-    "istanbul": "^0.4.5",
     "js-beautify": "~1.5.10",
     "jshint": "^2.10.0",
     "lcov-result-merger": "^3.1.0",
-    "mocha": "^5.2.0",
+    "mocha": "^11.4.0",
+    "nyc": "^17.1.0",
     "walk": "^2.3.9"
   },
   "scripts": {
     "cov": "npm run cppcov && npm run filtercov && npm run mergecov",
-    "coveralls": "cat ./test/coverage/merged.lcov | coveralls",
     "cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info",
     "filtercov": "./lcov-1.10/bin/lcov --extract test/coverage/cpp/lcov_full.info $(pwd)/src/* $(pwd)/src/**/* $(pwd)/include/* $(pwd)/include/**/* --output-file test/coverage/cpp/lcov.info && rm test/coverage/cpp/lcov_full.info",
     "generateJson": "node generate/scripts/generateJson",
     "generateMissingTests": "node generate/scripts/generateMissingTests",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
-    "install": "node lifecycleScripts/preinstall.js && node-gyp-build",
+    "install": "node lifecycleScripts/preinstall && node-gyp-build",
     "installDebug": "BUILD_DEBUG=true npm install",
     "lint": "jshint lib test/tests test/utils lifecycleScripts",
     "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
     "mocha": "mocha --expose-gc test/runner test/tests --timeout 15000",
     "mochaDebug": "mocha --expose-gc --inspect-brk test/runner test/tests --timeout 15000",
-    "preinstall": "node lifecycleScripts/preinstall",
     "postinstall": "node lifecycleScripts/postinstall",
+    "preinstall": "node lifecycleScripts/preinstall",
     "rebuild": "node generate && node-gyp configure build",
     "rebuildDebug": "node generate && node-gyp configure --debug build",
     "recompile": "node-gyp configure build",

package/scripts/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM node:22.13.1-alpine3.21
+FROM node:24.15.0-alpine3.22
 
 RUN apk add build-base git krb5-dev libgit2-dev libssh-dev pkgconfig python3 tzdata
 

package/scripts/Dockerfile.debian

@@ -1,4 +1,4 @@
-FROM node:22.13.1-bullseye
+FROM node:24.15.0-bullseye
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL en_US.UTF-8

package/utils/{acquireOpenSSL.js → acquireOpenSSL.mjs}

@@ -1,27 +1,29 @@
-const crypto = require("crypto");
-const execPromise = require("./execPromise");
-// for fs.remove. replace with fs.rm after dropping v12 support
-const fse = require("fs-extra");
-const fsNonPromise = require("fs");
-const { promises: fs } = fsNonPromise;
-const path = require("path");
-const got = require("got");
-const { performance } = require("perf_hooks");
-const { promisify } = require("util");
-const stream = require("stream");
-const tar = require("tar-fs");
-const zlib = require("zlib");
+import crypto from "crypto";
+import { spawn } from "child_process";
+import execPromise from "./execPromise.js";
+import got from "got";
+import path from "path";
+import stream from "stream";
+import tar from "tar-fs";
+import zlib from "zlib";
+import { createWriteStream, promises as fs } from "fs";
+import { performance } from "perf_hooks";
+import { promisify } from "util";
+
+import { hostArch, targetArch } from "./buildFlags.js";
 
 const pipeline = promisify(stream.pipeline);
 
-const packageJson = require('../package.json')
+import packageJson from '../package.json' with { type: "json" };
 
-const OPENSSL_VERSION = "1.1.1t";
-const win32BatPath = path.join(__dirname, "build-openssl.bat");
-const vendorPath = path.resolve(__dirname, "..", "vendor");
+const OPENSSL_VERSION = "3.0.18";
+const win32BatPath = path.join(import.meta.dirname, "build-openssl.bat");
+const vendorPath = path.resolve(import.meta.dirname, "..", "vendor");
 const opensslPatchPath = path.join(vendorPath, "patches", "openssl");
 const extractPath = path.join(vendorPath, "openssl");
 
+const exists = (filePath) => fs.stat(filePath).then(() => true).catch(() => false);
+
 const pathsToIncludeForPackage = [
   "include", "lib"
 ];
@@ -58,7 +60,9 @@ const makeHashVerifyOnFinal = (expected) => (digest) => {
 // currently this only needs to be done on linux
 const applyOpenSSLPatches = async (buildCwd, operatingSystem) => {
   try {
-    for (const patchFilename of await fse.readdir(opensslPatchPath)) {
+    await fs.access(opensslPatchPath);
+
+    for (const patchFilename of await fs.readdir(opensslPatchPath)) {
       const patchTarget = patchFilename.split("-")[1];
       if (patchFilename.split(".").pop() === "patch" && (patchTarget === operatingSystem || patchTarget === "all")) {
         console.log(`applying ${patchFilename}`);
@@ -68,6 +72,11 @@ const applyOpenSSLPatches = async (buildCwd, operatingSystem) => {
       }
     }
   } catch(e) {
+    if (e.code === "ENOENT") {
+      // no patches to apply
+      return;
+    }
+
     console.log("Patch application failed: ", e);
     throw e;
   }
@@ -78,8 +87,10 @@ const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
     throw new Error("Expected macOsDeploymentTarget to be specified");
   }
 
-  const arguments = [
-    process.arch === "x64" ? "darwin64-x86_64-cc" : "darwin64-arm64-cc",
+  const buildConfig = targetArch === "x64" ? "darwin64-x86_64-cc" : "darwin64-arm64-cc";
+
+  const configureArgs = [
+    buildConfig,
     // speed up ecdh on little-endian platforms with 128bit int support
     "enable-ec_nistp_64_gcc_128",
     // compile static libraries
@@ -88,6 +99,8 @@ const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
     "no-ssl2",
     "no-ssl3",
     "no-comp",
+    // disable tty ui since it fails a bunch of tests on GHA runners and we're just gonna link anyways
+    "no-ui-console",
     // set install directory
     `--prefix="${extractPath}"`,
     `--openssldir="${extractPath}"`,
@@ -95,13 +108,13 @@ const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
     `-mmacosx-version-min=${macOsDeploymentTarget}`
   ];
 
-  await execPromise(`./Configure ${arguments.join(" ")}`, {
+  await execPromise(`./Configure ${configureArgs.join(" ")}`, {
     cwd: buildCwd
   }, { pipeOutput: true });
 
   await applyOpenSSLPatches(buildCwd, "darwin");
 
-  // only build the libraries, not the tests/fuzzer or apps
+  // only build the libraries, not the fuzzer or apps
   await execPromise("make build_libs", {
     cwd: buildCwd
   }, { pipeOutput: true });
@@ -117,37 +130,36 @@ const buildDarwin = async (buildCwd, macOsDeploymentTarget) => {
 };
 
 const buildLinux = async (buildCwd) => {
-  const arguments = [
-    "linux-x86_64",
-    // Electron(at least on centos7) imports the libcups library at runtime, which has a
-    // dependency on the system libssl/libcrypto which causes symbol conflicts and segfaults.
-    // To fix this we need to hide all the openssl symbols to prevent them from being overridden
-    // by the runtime linker.
-    "-fvisibility=hidden",
-    // compile static libraries
-    "no-shared",
-    // disable ssl2, ssl3, and compression
-    "no-ssl2",
+  const buildConfig = targetArch === "x64" ? "linux-x86_64" : "linux-aarch64";
+
+  const configureArgs = [
+    buildConfig,
+    // disable ssl3, and compression
     "no-ssl3",
     "no-comp",
     // set install directory
     `--prefix="${extractPath}"`,
-    `--openssldir="${extractPath}"`
+    `--openssldir="${extractPath}"`,
+    "--libdir=lib",
   ];
-  await execPromise(`./Configure ${arguments.join(" ")}`, {
+  await execPromise(`./Configure ${configureArgs.join(" ")}`, {
     cwd: buildCwd
   }, { pipeOutput: true });
 
   await applyOpenSSLPatches(buildCwd, "linux");
 
-  // only build the libraries, not the tests/fuzzer or apps
+  // only build the libraries, not the fuzzer or apps
   await execPromise("make build_libs", {
-    cwd: buildCwd
+    cwd: buildCwd,
+    maxBuffer: 10 * 1024 * 1024
   }, { pipeOutput: true });
 
-  await execPromise("make test", {
-    cwd: buildCwd
-  }, { pipeOutput: true });
+  if (hostArch === targetArch) {
+    await execPromise("make test", {
+      cwd: buildCwd,
+      maxBuffer: 10 * 1024 * 1024
+    }, { pipeOutput: true });
+  }
 
   // only install software, not the docs
   await execPromise("make install_sw", {
@@ -156,44 +168,108 @@ const buildLinux = async (buildCwd) => {
   }, { pipeOutput: true });
 };
 
-const buildWin32 = async (buildCwd, vsBuildArch) => {
-  if (!vsBuildArch) {
-    throw new Error("Expected vsBuildArch to be specified");
-  }
+const buildWin32 = async (buildCwd) => {
+  let vcvarsallPath = undefined;
 
-  const programFilesPath = (process.arch === "x64"
-    ? process.env["ProgramFiles(x86)"]
-    : process.env.ProgramFiles) || "C:\\Program Files";
-  const vcvarsallPath = process.env.npm_config_vcvarsall_path || `${
-    programFilesPath
-  }\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat`;
-  try {
-    await fs.stat(vcvarsallPath);
-  } catch {
-    throw new Error(`vcvarsall.bat not found at ${vcvarsallPath}`);
+  if (process.env.npm_config_vcvarsall_path && await exists(process.env.npm_config_vcvarsall_path)) {
+    vcvarsallPath = process.env.npm_config_vcvarsall_path;
+  } else {
+    const potentialMsvsPaths = [];
+
+    // GYP_MSVS_OVERRIDE_PATH is set by node-gyp so this should cover most cases
+    if (process.env.GYP_MSVS_OVERRIDE_PATH) {
+      potentialMsvsPaths.push(process.env.GYP_MSVS_OVERRIDE_PATH);
+    }
+
+    const packageTypes = ["BuildTools", "Community", "Professional", "Enterprise"];
+    const versions = ["2022", "2019"]
+
+    const computePossiblePaths = (parentPath) => {
+      let possiblePaths = []
+      for (const packageType of packageTypes) {
+        for (const version of versions) {
+          possiblePaths.push(path.join(parentPath, version, packageType));
+        }
+      }
+
+      return possiblePaths;
+    }
+    
+    if (process.env["ProgramFiles(x86)"]) {
+      const parentPath  = path.join(process.env["ProgramFiles(x86)"], 'Microsoft Visual Studio');
+      potentialMsvsPaths.push(...computePossiblePaths(parentPath));
+    }
+
+    if (process.env.ProgramFiles) {
+      const parentPath  = path.join(process.env.ProgramFiles, 'Microsoft Visual Studio');
+      potentialMsvsPaths.push(...computePossiblePaths(parentPath));
+    }
+
+    for (const potentialPath of potentialMsvsPaths) {
+      const wholePath = path.join(potentialPath, 'VC', 'Auxiliary', 'Build', 'vcvarsall.bat');
+      console.log("checking", wholePath);
+      if (await exists(wholePath)) {
+        vcvarsallPath = wholePath;
+        break;
+      }
+    }
+
+    if (!vcvarsallPath) {
+      throw new Error(`vcvarsall.bat not found`);
+    }
   }
 
   let vcTarget;
-  switch (vsBuildArch) {
-    case "x64": {
+  switch (targetArch) {
+    case "x64":
       vcTarget = "VC-WIN64A";
       break;
-    }
 
-    case "x86": {
+    case "x86":
       vcTarget = "VC-WIN32";
       break;
-    }
-      
-    default: {
-      throw new Error(`Unknown vsBuildArch: ${vsBuildArch}`);
-    }
+
+    case "arm64":
+      vcTarget = "VC-WIN64-ARM";
+      break;
   }
 
-  await execPromise(`"${win32BatPath}" "${vcvarsallPath}" ${vsBuildArch} ${vcTarget}`, {
-    cwd: buildCwd,
-    maxBuffer: 10 * 1024 * 1024 // we should really just use spawn
-  }, { pipeOutput: true });
+  let vsBuildArch = hostArch === targetArch
+    ? hostArch
+    : `${hostArch}_${targetArch}`;
+
+  console.log("Using vcvarsall.bat at: ", vcvarsallPath);
+  console.log("Using vsBuildArch: ", vsBuildArch);
+  console.log("Using vcTarget: ", vcTarget);
+
+  await new Promise((resolve, reject) => {
+    const buildProcess = spawn(`"${win32BatPath}" "${vcvarsallPath}" ${vsBuildArch} ${vcTarget}`, {
+      cwd: buildCwd,
+      shell: process.platform === "win32",
+      env: {
+        ...process.env,
+        NODEGIT_SKIP_TESTS: targetArch !== hostArch ? "1" : undefined
+      }
+    });
+
+    buildProcess.stdout.on("data", function(data) {
+      console.info(data.toString().trim());
+    });
+
+    buildProcess.stderr.on("data", function(data) {
+      console.error(data.toString().trim());
+    });
+
+    buildProcess.on("close", function(code) {
+      if (!code) {
+        resolve();
+      } else {
+        reject(code);
+      }
+    });
+  });
+
+  
 };
 
 const removeOpenSSLIfOudated = async (openSSLVersion) => {
@@ -217,7 +293,7 @@ const removeOpenSSLIfOudated = async (openSSLVersion) => {
     }
 
     console.log("Removing outdated OpenSSL at: ", extractPath);
-    await fse.remove(extractPath);
+    await fs.rm(extractPath, { recursive: true, force: true });
     console.log("Outdated OpenSSL removed.");
   } catch (err) {
     console.log("Remove outdated OpenSSL failed: ", err);
@@ -237,19 +313,13 @@ const makeOnStreamDownloadProgress = () => {
 
 const buildOpenSSLIfNecessary = async ({
   macOsDeploymentTarget,
-  openSSLVersion,
-  vsBuildArch
+  openSSLVersion
 }) => {
   if (process.platform !== "darwin" && process.platform !== "win32" && process.platform !== "linux") {
     console.log(`Skipping OpenSSL build, not required on ${process.platform}`);
     return;
   }
 
-  if (process.platform === "linux" && process.env.NODEGIT_OPENSSL_STATIC_LINK !== "1") {
-    console.log(`Skipping OpenSSL build, NODEGIT_OPENSSL_STATIC_LINK !== 1`);
-    return;
-  }
-
   await removeOpenSSLIfOudated(openSSLVersion);
 
   try {
@@ -261,7 +331,7 @@ const buildOpenSSLIfNecessary = async ({
   const openSSLUrl = getOpenSSLSourceUrl(openSSLVersion);
   const openSSLSha256Url = getOpenSSLSourceSha256Url(openSSLVersion);
 
-  const openSSLSha256 = (await got(openSSLSha256Url)).body.trim();
+  const openSSLSha256 = (await got(openSSLSha256Url)).body.trim().split(' ')[0];
 
   const downloadStream = got.stream(openSSLUrl);
   downloadStream.on("downloadProgress", makeOnStreamDownloadProgress());
@@ -282,7 +352,7 @@ const buildOpenSSLIfNecessary = async ({
   } else if (process.platform === "linux") {
     await buildLinux(buildCwd);
   } else if (process.platform === "win32") {
-    await buildWin32(buildCwd, vsBuildArch);
+    await buildWin32(buildCwd);
   } else {
     throw new Error(`Unknown platform: ${process.platform}`);
   }
@@ -300,11 +370,6 @@ const downloadOpenSSLIfNecessary = async ({
     return;
   }
 
-  if (process.platform === "linux" && process.env.NODEGIT_OPENSSL_STATIC_LINK !== "1") {
-    console.log(`Skipping OpenSSL download, NODEGIT_OPENSSL_STATIC_LINK !== 1`);
-    return;
-  }
-
   try {
     await fs.stat(extractPath);
     console.log("Skipping OpenSSL download, dir exists");
@@ -334,18 +399,17 @@ const downloadOpenSSLIfNecessary = async ({
   console.log("Download finished.");
 }
 
-const getOpenSSLPackageName = () => {
-  let arch = process.arch;
-  if (process.platform === "win32" && (
-    process.arch === "ia32" || process.env.NODEGIT_VS_BUILD_ARCH === "x86"
-  )) {
-    arch = "x86";
-  }
-
-  return `openssl-${OPENSSL_VERSION}-${process.platform}-${arch}.tar.gz`;
+export const getOpenSSLPackageName = () => {
+  return `openssl-${OPENSSL_VERSION}-${process.platform}-${targetArch}.tar.gz`;
 }
 
-const getOpenSSLPackageUrl = () => `${packageJson.binary.host}${getOpenSSLPackageName()}`;
+export const getOpenSSLPackagePath = () => path.join(import.meta.dirname, getOpenSSLPackageName());
+
+const getOpenSSLPackageUrl = () => {
+  const hostUrl = new URL(packageJson.binary.host);
+  hostUrl.pathname = getOpenSSLPackageName();
+  return hostUrl.toString();
+};
 
 const buildPackage = async () => {
   let resolve, reject;
@@ -361,17 +425,17 @@ const buildPackage = async () => {
         return path.extname(name) === ".pc"
           || path.basename(name) === "pkgconfig";
       },
-      dmode: 0755,
-      fmode: 0644
+      dmode: 0o0755,
+      fmode: 0o0644
     }),
     zlib.createGzip(),
     new HashVerify("sha256", (digest) => {
       resolve(digest);
     }),
-    fsNonPromise.createWriteStream(getOpenSSLPackageName())
+    createWriteStream(getOpenSSLPackagePath())
   );
   const digest = await promise;
-  await fs.writeFile(`${getOpenSSLPackageName()}.sha256`, digest);
+  await fs.writeFile(`${getOpenSSLPackagePath()}.sha256`, digest);
 };
 
 const acquireOpenSSL = async () => {
@@ -394,24 +458,15 @@ const acquireOpenSSL = async () => {
 
     let macOsDeploymentTarget;
     if (process.platform === "darwin") {
-      macOsDeploymentTarget = process.argv[2];
+      macOsDeploymentTarget = process.argv[2] ?? process.env.OPENSSL_MACOS_DEPLOYMENT_TARGET
       if (!macOsDeploymentTarget || !macOsDeploymentTarget.match(/\d+\.\d+/)) {
         throw new Error(`Invalid macOsDeploymentTarget: ${macOsDeploymentTarget}`);
       }
     }
 
-    let vsBuildArch;
-    if (process.platform === "win32") {
-      vsBuildArch = process.env.NODEGIT_VS_BUILD_ARCH || (process.arch === "x64" ? "x64" : "x86");
-      if (!["x64", "x86"].includes(vsBuildArch)) {
-        throw new Error(`Invalid vsBuildArch: ${vsBuildArch}`);
-      }
-    }
-
     await buildOpenSSLIfNecessary({
       openSSLVersion: OPENSSL_VERSION,
-      macOsDeploymentTarget,
-      vsBuildArch
+      macOsDeploymentTarget
     });
     if (process.env.NODEGIT_OPENSSL_BUILD_PACKAGE) {
       await buildPackage();
@@ -422,15 +477,12 @@ const acquireOpenSSL = async () => {
   }
 };
 
-module.exports = {
-  acquireOpenSSL,
-  getOpenSSLPackageName,
-  OPENSSL_VERSION
-};
-
-if (require.main === module) {
-  acquireOpenSSL().catch((error) => {
+if (process.argv[1] === import.meta.filename) {
+  try {
+    await acquireOpenSSL();
+  }
+  catch(error) {
     console.error("Acquire OpenSSL failed: ", error);
     process.exit(1);
-  });
+  }
 }

package/utils/build-openssl.bat

@@ -1,9 +1,18 @@
+rem Build OpenSSL for Windows
+rem %1 - path to vcvarsall.bat
+rem %2 - architecture argument for vcvarsall.bat
+rem %3 - OpenSSL Configure target
+
 @call %1 %2
 
 perl .\Configure %3 no-shared no-ssl2 no-ssl3 no-comp --prefix="%cd%\.." --openssldir="%cd%\.." || goto :error
 
 nmake || goto :error
-nmake test || goto :error
+
+if "%NODEGIT_SKIP_TESTS%" NEQ "1" (
+  nmake test || goto :error
+)
+
 nmake install || goto :error
 
 goto :EOF

package/utils/buildFlags.js

@@ -10,7 +10,29 @@ try {
   isGitRepo = false;
 }
 
+const convertArch = (archStr) => {
+  const convertedArch = {
+    'ia32': 'x86',
+    'x86': 'x86',
+    'x64': 'x64',
+    'arm64': 'arm64'
+  }[archStr];
+
+  if (!convertedArch) {
+    throw new Error('unsupported architecture');
+  }
+
+  return convertedArch;
+}
+
+const hostArch = convertArch(process.arch);
+const targetArch = process.env.npm_config_arch
+  ? convertArch(process.env.npm_config_arch)
+  : hostArch;
+
 module.exports = {
+  hostArch,
+  targetArch,
   debugBuild: !!process.env.BUILD_DEBUG,
   isElectron: process.env.npm_config_runtime === "electron",
   isGitRepo: isGitRepo,

package/utils/configureLibssh2.js

@@ -2,6 +2,8 @@ var cp = require("child_process");
 var fse = require("fs-extra");
 var path = require("path");
 
+const { hostArch, targetArch } = require("./buildFlags");
+
 const opensslVendorDirectory = path.resolve(__dirname, "..", "vendor", "openssl");
 const libssh2VendorDirectory = path.resolve(__dirname, "..", "vendor", "libssh2");
 const libssh2ConfigureScript = path.join(libssh2VendorDirectory, "configure");
@@ -19,20 +21,21 @@ module.exports = function retrieveExternalDependencies() {
   }
 
   // Run the `configure` script on Linux
+  let cpArgs = ` --with-libssl-prefix=${opensslVendorDirectory}`;
+
+  const archConfigMap = {
+    'x64': 'x86_64-linux-gnu',
+    'arm64': 'aarch64-linux-gnu'
+  };
+
+  cpArgs += ` --build=${archConfigMap[hostArch]}`;
+  cpArgs += ` --host=${archConfigMap[targetArch]}`;
+
   return new Promise(function(resolve, reject) {
-    var newEnv = {};
-    Object.keys(process.env).forEach(function(key) {
-      newEnv[key] = process.env[key];
-    });
-
-    let cpArgs = process.env.NODEGIT_OPENSSL_STATIC_LINK === '1'
-      ? ` --with-libssl-prefix=${opensslVendorDirectory}`
-      : '';
     cp.exec(
       `${libssh2ConfigureScript}${cpArgs}`,
       {
-        cwd: libssh2VendorDirectory,
-        env: newEnv
+        cwd: libssh2VendorDirectory
       },
       function(err, stdout, stderr) {
         if (err) {

package/utils/defaultCxxStandard.js

@@ -1,18 +1,29 @@
 const targetSpecified = process.argv[2] !== 'none';
 
-let isNode18OrElectron20AndUp = false;
+let cxxStandard = '14';
+
 if (targetSpecified) {
-  // Assume electron if target is specified.
+  // --target= is used by both prebuildify (Node version) and electron-rebuild
+  // (Electron version). Node 24+ ships V8 13.x which requires C++20 for the
+  // `requires` clauses in v8-persistent-handle.h; Electron 32+ similarly needs
+  // C++20. Anything older falls back to C++17.
   // If building node 18 / 19 via target, will need to specify C++ standard manually
   const majorVersion = process.argv[2].split('.')[0];
-  isNode18OrElectron20AndUp = majorVersion >= 20;
+  if (Number.parseInt(majorVersion) >= 32) {
+    cxxStandard = '20';
+  } else if (Number.parseInt(majorVersion) >= 24) {
+    cxxStandard = '20';
+  } else if (Number.parseInt(majorVersion) >= 21) {
+    cxxStandard = '17';
+  }
 } else {
+  const abiVersion = Number.parseInt(process.versions.modules) ?? 0;
   // Node 18 === 108
-  isNode18OrElectron20AndUp = Number.parseInt(process.versions.modules) >= 108;
+  if (abiVersion >= 131) {
+    cxxStandard = '20';
+  } else if (abiVersion >= 108) {
+    cxxStandard = '17';
+  }
 }
 
-const defaultCxxStandard = isNode18OrElectron20AndUp
-  ? '17'
-  : '14';
-
-process.stdout.write(defaultCxxStandard);
+process.stdout.write(cxxStandard);

package/utils/uploadOpenSSL.mjs

@@ -0,0 +1,32 @@
+import aws from 'aws-sdk';
+import fs from "fs";
+import path from "path";
+
+import pkgJson from '../package.json' with { type: "json" };
+import { getOpenSSLPackagePath, getOpenSSLPackageName } from './acquireOpenSSL.mjs';
+
+const s3 = new aws.S3();
+
+const uploadBinaryToS3 = (fileName, bucketName, pathToFile) =>
+  s3.upload({
+    Body: fs.createReadStream(pathToFile),
+    Bucket: bucketName,
+    Key: fileName,
+    ACL: "public-read"
+  }).promise();
+
+export const uploadOpenSSL = async () => {
+  const packageName = path.basename(getOpenSSLPackageName());
+  const packagePath = getOpenSSLPackagePath();
+  console.log(`Uploading ${packagePath} to s3://${pkgJson.binary.bucket_name}/${packageName}`);
+  await uploadBinaryToS3(packageName, pkgJson.binary.bucket_name, packagePath);
+  const sha256PackageName = `${packageName}.sha256`;
+  await uploadBinaryToS3(sha256PackageName, pkgJson.binary.bucket_name, `${packagePath}.sha256`);
+};
+
+if (process.argv[1] === import.meta.filename) {
+  uploadOpenSSL().catch((error) => {
+    console.error('Push to S3 failed: ', error);
+    process.exit(1);
+  });
+}

package/lifecycleScripts/install.js

@@ -1,32 +0,0 @@
-var buildFlags = require("../utils/buildFlags");
-
-module.exports = async function install() {
-  console.log("[nodegit] Running install script");
-
-  var args = ["install"];
-
-  if (buildFlags.mustBuild) {
-    console.info(
-      "[nodegit] Pre-built download disabled, building from source.",
-    );
-    args.push("--build-from-source");
-
-    if (buildFlags.debugBuild) {
-      console.info("[nodegit] Building debug version.");
-      args.push("--debug");
-    }
-  } else {
-    args.push("--fallback-to-build");
-  }
-
-  return;
-};
-
-// Called on the command line
-if (require.main === module) {
-  module.exports().catch(function (e) {
-    console.error("[nodegit] ERROR - Could not finish install");
-    console.error("[nodegit] ERROR - finished with error code: " + e);
-    process.exit(e);
-  });
-}