From bbfd7b2cb40c83023f084e1f17cc5af6ac3314f4 Mon Sep 17 00:00:00 2001
From: Ron Ilan <github@ronilan.com>
Date: Wed, 4 May 2022 12:18:54 -0700
Subject: [PATCH] Fixing issue 647 - Updated abi_crosswalk.json to include node
 18 (current). - Added test coverage for cases of unsupported/unknown targets.

---
 lib/util/abi_crosswalk.json | 116 ++++++++++++++++++++++++++++++++++++
 test/versioning.test.js     |  20 +++++++
 2 files changed, 136 insertions(+)

diff --git a/lib/util/abi_crosswalk.json b/lib/util/abi_crosswalk.json
index 7f5297276..503e9d23a 100644
--- a/lib/util/abi_crosswalk.json
+++ b/lib/util/abi_crosswalk.json
@@ -2231,6 +2231,26 @@
     "node_abi": 72,
     "v8": "7.8"
   },
+  "12.22.8": {
+    "node_abi": 72,
+    "v8": "7.8"
+  },
+  "12.22.9": {
+    "node_abi": 72,
+    "v8": "7.8"
+  },
+  "12.22.10": {
+    "node_abi": 72,
+    "v8": "7.8"
+  },
+  "12.22.11": {
+    "node_abi": 72,
+    "v8": "7.8"
+  },
+  "12.22.12": {
+    "node_abi": 72,
+    "v8": "7.8"
+  },
   "13.0.0": {
     "node_abi": 79,
     "v8": "7.8"
@@ -2435,6 +2455,26 @@
     "node_abi": 83,
     "v8": "8.4"
   },
+  "14.18.2": {
+    "node_abi": 83,
+    "v8": "8.4"
+  },
+  "14.18.3": {
+    "node_abi": 83,
+    "v8": "8.4"
+  },
+  "14.19.0": {
+    "node_abi": 83,
+    "v8": "8.4"
+  },
+  "14.19.1": {
+    "node_abi": 83,
+    "v8": "8.4"
+  },
+  "14.19.2": {
+    "node_abi": 83,
+    "v8": "8.4"
+  },
   "15.0.0": {
     "node_abi": 88,
     "v8": "8.6"
@@ -2587,6 +2627,30 @@
     "node_abi": 93,
     "v8": "9.4"
   },
+  "16.13.1": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
+  "16.13.2": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
+  "16.14.0": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
+  "16.14.1": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
+  "16.14.2": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
+  "16.15.0": {
+    "node_abi": 93,
+    "v8": "9.4"
+  },
   "17.0.0": {
     "node_abi": 102,
     "v8": "9.5"
@@ -2598,5 +2662,57 @@
   "17.1.0": {
     "node_abi": 102,
     "v8": "9.5"
+  },
+  "17.2.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.3.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.3.1": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.4.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.5.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.6.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.7.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.7.1": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.7.2": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.8.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "17.9.0": {
+    "node_abi": 102,
+    "v8": "9.6"
+  },
+  "18.0.0": {
+    "node_abi": 108,
+    "v8": "10.1"
+  },
+  "18.1.0": {
+    "node_abi": 108,
+    "v8": "10.1"
   }
 }
\ No newline at end of file
diff --git a/test/versioning.test.js b/test/versioning.test.js
index 5dcb78a69..3de9ac9ca 100644
--- a/test/versioning.test.js
+++ b/test/versioning.test.js
@@ -90,6 +90,26 @@ test('should detect abi for node-webkit runtime', (t) => {
   t.end();
 });
 
+test('should throw when custom node target is not found in abi_crosswalk file', (t) => {
+  try {
+    versioning.get_runtime_abi('node', '123456789.0.0');
+  } catch (e) {
+    const expectedMessage = 'Unsupported target version: 123456789.0.0';
+    t.equal(e.message, expectedMessage);
+    t.end();
+  }
+});
+
+test('should throw when custom node target is not semver', (t) => {
+  try {
+    versioning.get_runtime_abi('node', '1.2.3.4');
+  } catch (e) {
+    const expectedMessage = 'Unknown target version: 1.2.3.4';
+    t.equal(e.message, expectedMessage);
+    t.end();
+  }
+});
+
 test('should detect custom binary host from env', (t) => {
   const mock_package_json = {
     'name': 'test',