msgpackr-extract 1.0.16 → 1.1.0-beta

package/binding.gyp

@@ -1,8 +1,21 @@
 {
   "variables": {
       "os_linux_compiler%": "gcc",
+      "enable_v8%": "true",
       "build_v8_with_gn": "false"
   },
+  "conditions": [
+    ['OS=="win"', {
+      "variables": {
+        "enable_v8%": "<!(echo %ENABLE_V8_FUNCTIONS%)",
+      }
+    }],
+    ['OS!="win"', {
+      "variables": {
+        "enable_v8%": "<!(echo $ENABLE_V8_FUNCTIONS%)",
+      }
+    }]
+  ],
   "targets": [
     {
       "target_name": "msgpackr-extract",
@@ -10,9 +23,7 @@
       "sources": [
         "src/extract.cpp",
       ],
-      "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-      ],
+      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
       "conditions": [
         ["OS=='linux'", {
           "variables": {
@@ -40,6 +51,9 @@
             "-O3"
           ],
         }],
+        ["enable_v8!='false'", {
+          "defines": ["ENABLE_V8_API=1"],
+        }],
       ],
     }
   ]

package/index.js

@@ -1 +1 @@
-module.exports = require('node-gyp-build')(__dirname)
+module.exports = require('node-gyp-build')(__dirname);

package/package.json

@@ -1,30 +1,42 @@
-{
-  "name": "msgpackr-extract",
-  "author": "Kris Zyp",
-  "version": "1.0.16",
-  "description": "Node addon for string extraction for msgpackr",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/kriszyp/msgpackr-extract"
-  },
-  "scripts": {
-    "install": "node-gyp-build",
-    "recompile": "node-gyp build",
-    "before-publish": "prebuildify-ci download && prebuildify --target 17.2.0 && prebuildify --target 16.13.0 && prebuildify --target 15.5.0 && prebuildify --target 14.17.6 && prebuildify --target 12.22.7 && prebuildify --target electron@15.2.0",
-    "prebuild": "prebuildify --target 17.2.0 && prebuildify --target 16.13.0 && prebuildify --target 15.5.0 && prebuildify --target 14.17.6 && prebuildify --target 12.22.7 && prebuildify --target electron@15.2.0",
-    "prebuild-musl": "prebuildify --target 17.2.0 --libc musl --tag-libc && prebuildify --target 16.13.0 --libc musl --tag-libc && prebuildify --target 14.17.6 --libc musl --tag-libc && prebuildify --target 12.22.7 --libc musl --tag-libc",
-    "prebuild-arm64": "prebuildify --arch=arm64 --target 17.2.0 --libc musl && prebuildify --arch=arm64 --target 16.13.0 && prebuildify --arch=arm64 --target 14.17.6 && prebuildify --arch=arm64 --target electron@15.2.0",
-    "test": ""
-  },
-  "main": "./index.js",
-  "gypfile": true,
-  "dependencies": {
-    "nan": "^2.14.2",
-    "node-gyp-build": "^4.2.3"
-  },
-  "devDependencies": {
-    "prebuildify": "^5.0.0",
-    "prebuildify-ci": "^1.0.5"
-  }
-}
+{
+  "name": "msgpackr-extract",
+  "author": "Kris Zyp",
+  "version": "1.1.0-beta",
+  "description": "Node addon for string extraction for msgpackr",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/kriszyp/msgpackr-extract"
+  },
+  "scripts": {
+    "install": "node-gyp-build",
+    "recompile": "node-gyp build",
+    "before-publish": "prebuildify-ci download && prebuildify --optional-packages --napi --target 12.22.7 && prebuildify --optional-packages --target 16.14.0",
+    "prebuild": "prebuildify --optional-packages --napi --target 16.14.0 && prebuildify --optional-packages --target 16.14.0",
+    "prebuild-libc": "prebuildify --optional-packages --napi --tag-libc --target 16.14.0 && prebuildify --optional-packages --tag-libc --target 16.14.0",
+    "prepublishOnly": "node set-optional-deps.cjs",
+    "publish-all": "cd prebuilds/win32-x64 && npm publish --otp %OTP% && cd ../darwin-x64 && npm publish --otp %OTP% && cd ../darwin-arm64 && npm publish --otp %OTP% && cd ../linux-x64 && npm publish --otp %OTP% && cd ../linux-arm64 && npm publish --otp %OTP% && cd ../.. && npm publish --otp %OTP%",
+    "test": "node ./index.js"
+  },
+  "main": "./index.js",
+  "gypfile": true,
+  "dependencies": {
+    "node-gyp-build": "kriszyp/node-gyp-build#optional-packages"
+  },
+  "files": [
+    "index.js",
+    "/src",
+    "/*.gyp"
+  ],
+  "optionalDependencies": {
+    "msgpackr-extract-darwin-arm64": "1.1.0-beta",
+    "msgpackr-extract-darwin-x64": "1.1.0-beta",
+    "msgpackr-extract-linux-arm64": "1.1.0-beta",
+    "msgpackr-extract-linux-x64": "1.1.0-beta",
+    "msgpackr-extract-win32-x64": "1.1.0-beta"
+  },
+  "devDependencies": {
+    "prebuildify": "kriszyp/prebuildify#optional-packages",
+    "prebuildify-ci": "^1.0.5"
+  }
+}

package/src/.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": "No Configurations"
+}

package/src/.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\extract.cpp",
+  "PreviewInSolutionExplorer": false
+}

package/src/extract.cpp

@@ -5,11 +5,10 @@ provides much better performance. This will parse and produce up to 256 strings
 times as necessary to get more strings. This must be partially capable of parsing MessagePack so it can know where to
 find the string tokens and determine their position and length. All strings are decoded as UTF-8.
 */
+#include <node_api.h>
+#if ENABLE_V8_API
 #include <v8.h>
-#include <node.h>
-#include <node_buffer.h>
-#include <nan.h>
-using namespace v8;
+#endif
 
 #ifndef thread_local
 #ifdef __GNUC__
@@ -26,17 +25,25 @@ using namespace v8;
 const int MAX_TARGET_SIZE = 255;
 typedef int (*token_handler)(uint8_t* source, int position, int size);
 token_handler tokenTable[256] = {};
+napi_value unexpectedEnd(napi_env env) {
+	napi_value returnValue;
+	napi_get_undefined(env, &returnValue);
+	napi_throw_type_error(env, NULL, "Unexpected end of buffer reading string");
+	return returnValue;
+}
+
 class Extractor {
 public:
-	v8::Local<v8::Value> target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
-
+	napi_value target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
+	// napi_ref targetArray; // could consider reenabling this optimization for napi
+	bool hasTargetArray = false;
 	uint8_t* source;
 	int position = 0;
 	int writePosition = 0;
 	int stringStart = 0;
 	int lastStringEnd = 0;
-	Isolate *isolate = Isolate::GetCurrent();
-	void readString(int length, bool allowStringBlocks) {
+
+	void readString(napi_env env, int length, bool allowStringBlocks) {
 		int start = position;
 		int end = position + length;
 		if (allowStringBlocks) { // for larger strings, we don't bother to check every character for being latin, and just go right to creating a new string
@@ -51,18 +58,24 @@ public:
 		if (position < end) {
 			// non-latin character
 			if (lastStringEnd) {
-				target[writePosition++] = String::NewFromOneByte(isolate,  (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+				napi_value value;
+				napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
+				target[writePosition++] = value;
 				lastStringEnd = 0;
 			}
 			// use standard utf-8 conversion
-			target[writePosition++] = Nan::New<v8::String>((char*) source + start, (int) length).ToLocalChecked();
+			napi_value value;
+			napi_create_string_utf8(env, (const char*) source + start, (int) length, &value);
+			target[writePosition++] = value;
 			position = end;
 			return;
 		}
 
 		if (lastStringEnd) {
 			if (start - lastStringEnd > 40 || end - stringStart > 6000) {
-				target[writePosition++] = String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+				napi_value value;
+				napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
+				target[writePosition++] = value;
 				stringStart = start;
 			}
 		} else {
@@ -71,7 +84,7 @@ public:
 		lastStringEnd = end;
 	}
 
-	Local<Value> extractStrings(int startingPosition, int size, uint8_t* inputSource) {
+	napi_value extractStrings(napi_env env, int startingPosition, int size, uint8_t* inputSource) {
 		writePosition = 0;
 		lastStringEnd = 0;
 		position = startingPosition;
@@ -84,50 +97,43 @@ public:
 				// fixstr, we want to convert this
 				token -= 0xa0;
 				if (token + position > size) {
-					Nan::ThrowError("Unexpected end of buffer reading string");
-					return Nan::Null();
+					return unexpectedEnd(env);
 				}
-				readString(token, true);
+				readString(env,token, true);
 				if (writePosition >= MAX_TARGET_SIZE)
 					break;
 			} else if (token <= 0xdb && token >= 0xd9) {
 				if (token == 0xd9) { //str 8
 					if (position >= size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++];
 					if (length + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
-					readString(length, true);
+					readString(env,length, true);
 				} else if (token == 0xda) { //str 16
 					if (2 + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
-					readString(length, false);
+					readString(env,length, false);
 				} else { //str 32
 					if (4 + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++] << 24;
 					length += source[position++] << 16;
 					length += source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						return unexpectedEnd(env);
 					}
-					readString(length, false);
+					readString(env, length, false);
 				}
 				if (writePosition >= MAX_TARGET_SIZE)
 					break;
@@ -138,32 +144,52 @@ public:
 				} else {
 					position = tokenTable[token](source, position, size);
 					if (position < 0) {
-						Nan::ThrowError("Unexpected end of buffer");
-						return Nan::Null();	
+						return unexpectedEnd(env);
 					}
 				}
 			}
 		}
 
 		if (lastStringEnd) {
-			if (writePosition == 0)
-				return String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
-			target[writePosition++] = String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+			napi_value value;
+			napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
+			if (writePosition == 0) {
+				/*if (!hasTargetArray) {
+					hasTargetArray = true;
+					napi_create_reference(env, array, 1, &targetArray);
+				}*/
+				return value;
+			}
+			target[writePosition++] = value;
 		} else if (writePosition == 1) {
+			/*if (!hasTargetArray) {
+				hasTargetArray = true;
+				napi_create_reference(env, array, 1, &targetArray);
+			}*/
 			return target[0];
 		}
-#if NODE_VERSION_AT_LEAST(12,0,0)
-		return Array::New(isolate, target, writePosition);
-#else
-		Local<Array> array = Array::New(isolate, writePosition);
-		Local<Context> context = Nan::GetCurrentContext();
+		napi_value array;
+		#if ENABLE_V8_API
+		v8::Local<v8::Array> v8Array = v8::Array::New(v8::Isolate::GetCurrent(), (v8::Local<v8::Value>*) target, writePosition);
+		memcpy(&array, &v8Array, sizeof(array));
+		#else
+		napi_create_array_with_length(env, writePosition, &array);
+		/*if (hasTargetArray) {
+			napi_get_reference_value(env, targetArray, &array);
+			hasTargetArray = false;
+		}*/
 		for (int i = 0; i < writePosition; i++) {
-			array->Set(context, i, target[i]);
-		}
+			napi_set_element(env, array, i, target[i]);
+		}/*
+		napi_value length;
+		napi_create_int32(env, i, &length);
+		return length;
+		napi_set_element(env, array, i, undefined); */
+		#endif
 		return array;
-#endif
 	}
 };
+
 void setupTokenTable() {
 	for (int i = 0; i < 256; i++) {
 		tokenTable[i] = nullptr;
@@ -187,8 +213,7 @@ void setupTokenTable() {
 	// bin 8
 	tokenTable[0xc4] = ([](uint8_t* source, int position, int size) -> int {
 		if (position >= size) {
-			Nan::ThrowError("Unexpected end of buffer");
-			return size;
+			return -1;
 		}
 		int length = source[position++];
 		return position + length;
@@ -196,8 +221,7 @@ void setupTokenTable() {
 	// bin 16
 	tokenTable[0xc5] = ([](uint8_t* source, int position, int size) -> int {
 		if (position + 2 > size) {
-			Nan::ThrowError("Unexpected end of buffer");
-			return size;
+			return -1;
 		}
 		int length = source[position++] << 8;
 		length += source[position++];
@@ -242,28 +266,25 @@ void setupTokenTable() {
 		return position + length;
 	});
 }
-
 static thread_local Extractor* extractor;
-
-NAN_METHOD(extractStrings) {
-	Local<Context> context = Nan::GetCurrentContext();
-	int position = Local<Number>::Cast(info[0])->IntegerValue(context).FromJust();
-	int size = Local<Number>::Cast(info[1])->IntegerValue(context).FromJust();
-	if (info[2]->IsArrayBufferView()) {
-		uint8_t* source = (uint8_t*) node::Buffer::Data(info[2]);
-		info.GetReturnValue().Set(extractor->extractStrings(position, size, source));
-	}
-}
-
-NAN_METHOD(isOneByte) {
-	info.GetReturnValue().Set(Nan::New<Boolean>(Local<String>::Cast(info[0])->IsOneByte()));
+napi_value extractStrings(napi_env env, napi_callback_info info) {
+	size_t argc = 3;
+	napi_value args[3];
+	napi_get_cb_info(env, info, &argc, args, NULL, NULL);
+	uint32_t position;
+	uint32_t size;
+	napi_get_value_uint32(env, args[0], &position);
+	napi_get_value_uint32(env, args[1], &size);
+	uint8_t* source;
+	napi_get_typedarray_info(env, args[2], NULL, NULL, (void**) &source, NULL, NULL);
+	return extractor->extractStrings(env, position, size, source);
 }
-
-void initializeModule(v8::Local<v8::Object> exports) {
+#define EXPORT_NAPI_FUNCTION(name, func) { napi_property_descriptor desc = { name, 0, func, 0, 0, 0, (napi_property_attributes) (napi_writable | napi_configurable), 0 }; napi_define_properties(env, exports, 1, &desc); }
+napi_value Init(napi_env env, napi_value exports) {
 	extractor = new Extractor(); // create our thread-local extractor
 	setupTokenTable();
-	Nan::SetMethod(exports, "extractStrings", extractStrings);
-	Nan::SetMethod(exports, "isOneByte", isOneByte);
+	EXPORT_NAPI_FUNCTION("extractStrings", extractStrings);
+	return exports;
 }
 
-NODE_MODULE_CONTEXT_AWARE(extractor, initializeModule);
+NAPI_MODULE(extractor, Init)

package/.circleci/config.yml

@@ -1,19 +0,0 @@
-name: Test and Prebuild
-jobs:
-  build:
-    executor: my-ubuntu-exec
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - run: npm install
-      - run: npm run prebuild
-      - run: zip -r prebuild-darwin.zip prebuilds
-      - run: hexdump "prebuilds/darwin-x64/node.abi93.node" | head -10
-      - name: Prebuild
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: prebuild-darwin.zip

package/.github/workflows/prebuild.yml

@@ -1,87 +0,0 @@
-name: Prebuild
-on: [push]
-jobs:
-  build-test-macos:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: macos-11
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - run: npm install
-      - run: npm test
-      - run: npm run prebuild
-        if: startsWith(github.ref, 'refs/tags/')
-      - run: npm run prebuild-arm64
-        if: startsWith(github.ref, 'refs/tags/')
-      - run: tar --create --format ustar --verbose --file=prebuild-darwin.tar -C prebuilds .
-        if: startsWith(github.ref, 'refs/tags/')
-      - name: Prebuild
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: prebuild-darwin.tar
-  build-centos-7:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-18.04
-    container: quay.io/pypa/manylinux2014_x86_64
-    steps:
-      - run: ldd --version ldd
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - run: npm install
-      - run: npm run prebuild
-      - run: npm test
-      - run: tar --create --verbose --file=prebuild-linux.tar -C prebuilds .
-      - name: Prebuild
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v1
-        with:
-          files: prebuild-linux.tar
-  build-alpine:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-18.04
-    container: node:12-alpine
-    steps:
-      - run: apk add python3 py3-pip build-base
-      - uses: actions/checkout@v2
-      - run: npm install
-      - run: npm run prebuild-musl
-      - run: npm test
-      - run: tar --create --verbose --file=prebuild-alpine.tar -C prebuilds .
-      - name: Prebuild
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v1
-        with:
-          files: prebuild-alpine.tar
-  build-linux-arm64:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-18.04
-    container: quay.io/pypa/manylinux_2_24_x86_64
-    steps:
-      - run: apt-get update
-      - run: apt-get install -y gcc-aarch64-linux-gnu
-      - run: apt-get install -y g++-aarch64-linux-gnu
-      - run: ldd --version ldd
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - run: npm install
-      - run: npm run prebuild-arm64
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          CC: aarch64-linux-gnu-gcc
-          CXX: aarch64-linux-gnu-g++
-      - run: tar --create --verbose --file=prebuild-linux-arm64.tar -C prebuilds .
-      - name: Prebuild
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v1
-        with:
-          files: prebuild-linux-arm64.tar

package/.travis.yml

@@ -1,30 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-- node
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-arch:
-- amd64
-- arm64
-os:
-- osx
-- linux
-osx_image: xcode12.5
-before_deploy:
-- ARCHIVE_NAME="${TRAVIS_TAG:-latest}-$TRAVIS_OS_NAME-`uname -m`.tar"
-- npm run prebuild
-- tar --create --verbose --file="$ARCHIVE_NAME" --directory "$TRAVIS_BUILD_DIR/prebuilds"
-  .
-deploy:
-  provider: releases
-  draft: false
-  prerelease: true
-  file: "$ARCHIVE_NAME"
-  skip_cleanup: true
-  on:
-    tags: true
-    node: node
-  api_key:  '$GITHUB_API_KEY'