msgpackr-extract 1.0.16-napi.1 → 2.0.0-beta

package/.github/workflows/prebuild.yml

@@ -12,10 +12,12 @@ jobs:
           node-version: 12
       - run: npm install
       - run: npm test
-      - run: npm run prebuild
+      - run: npm run prebuild-libc
         if: startsWith(github.ref, 'refs/tags/')
-      - run: npm run prebuild-arm64
+      - run: npm run prebuild-libc
         if: startsWith(github.ref, 'refs/tags/')
+        env:
+          PREBUILD_ARCH: arm64
       - run: tar --create --format ustar --verbose --file=prebuild-darwin.tar -C prebuilds .
         if: startsWith(github.ref, 'refs/tags/')
       - name: Prebuild
@@ -35,7 +37,7 @@ jobs:
         with:
           node-version: 12
       - run: npm install
-      - run: npm run prebuild
+      - run: npm run prebuild-libc
       - run: npm test
       - run: tar --create --verbose --file=prebuild-linux.tar -C prebuilds .
       - name: Prebuild
@@ -51,7 +53,15 @@ jobs:
       - run: apk add python3 py3-pip build-base
       - uses: actions/checkout@v2
       - run: npm install
-      - run: npm run prebuild-musl
+      - run: npm run prebuild-libc
+        env:
+          PREBUILD_LIBC: musl
+          PREBUILD_ARCH: arm64
+          CC: ${PWD}/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
+          CXX: ${PWD}/aarch64-linux-musl-cross/bin/aarch64-linux-musl-g++
+      - run: npm run prebuild-libc
+        env:
+          PREBUILD_LIBC: musl
       - run: npm test
       - run: tar --create --verbose --file=prebuild-alpine.tar -C prebuilds .
       - name: Prebuild
@@ -74,9 +84,10 @@ jobs:
         with:
           node-version: 12
       - run: npm install
-      - run: npm run prebuild-arm64
+      - run: npm run prebuild-libc
         if: startsWith(github.ref, 'refs/tags/')
         env:
+          PREBUILD_ARCH: arm64
           CC: aarch64-linux-gnu-gcc
           CXX: aarch64-linux-gnu-g++
       - run: tar --create --verbose --file=prebuild-linux-arm64.tar -C prebuilds .

package/binding.gyp

@@ -11,8 +11,6 @@
         "src/extract.cpp",
       ],
       "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "include_dirs" : ["<!(node -p \"require('node-addon-api').include_dir\")"],
-      "dependencies": ["<!(node -p \"require('node-addon-api').gyp\")"],
       "conditions": [
         ["OS=='linux'", {
           "variables": {

package/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr-extract",
   "author": "Kris Zyp",
-  "version": "1.0.16-napi.1",
+  "version": "2.0.0-beta",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -11,20 +11,19 @@
   "scripts": {
     "install": "node-gyp-build",
     "recompile": "node-gyp build",
-    "before-publish": "prebuildify-ci download && prebuildify --napi --target 12.22.7",
-    "prebuild": "prebuildify --napi --target 12.22.7",
-    "prebuild-musl": "prebuildify --napi --libc musl --tag-libc --target 12.22.7",
-    "prebuild-arm64": "prebuildify --napi --arch=arm64 --tag-libc --target 12.22.7",
-    "test": ""
+    "before-publish": "prebuildify-ci download && prebuildify --optional-packages --napi --target 12.22.7",
+    "prebuild": "prebuildify --optional-packages --napi --target 12.22.7",
+    "prebuild-libc": "prebuildify --optional-packages --napi --tag-libc --target 12.22.7",
+    "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-addon-api": "^4.3.0",
-    "node-gyp-build": "^4.2.3"
+    "node-gyp-build": "kriszyp/node-gyp-build#optional-packages"
   },
   "devDependencies": {
-    "prebuildify": "^5.0.0",
+    "prebuildify": "kriszyp/prebuildify#optional-packages",
     "prebuildify-ci": "^1.0.5"
   }
 }

package/prebuilds/darwin-arm64/README.md

@@ -0,0 +1 @@
+Platform specific binary for msgpackr-extract on darwin OS with arm64 architecture

package/prebuilds/darwin-arm64/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "msgpackr-extract-darwin-arm64",
+  "version": "2.0.0-beta",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "description": "Platform specific binary for msgpackr-extract on darwin OS with arm64 architecture"
+}

package/prebuilds/darwin-x64/README.md

@@ -0,0 +1 @@
+Platform specific binary for msgpackr-extract on darwin OS with x64 architecture

package/prebuilds/darwin-x64/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "msgpackr-extract-darwin-x64",
+  "version": "2.0.0-beta",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "description": "Platform specific binary for msgpackr-extract on darwin OS with x64 architecture"
+}

package/prebuilds/linux-arm64/README.md

@@ -0,0 +1 @@
+Platform specific binary for msgpackr-extract on linux OS with arm64 architecture

package/prebuilds/linux-arm64/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "msgpackr-extract-linux-arm64",
+  "version": "2.0.0-beta",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "description": "Platform specific binary for msgpackr-extract on linux OS with arm64 architecture"
+}

package/prebuilds/linux-x64/README.md

@@ -0,0 +1 @@
+Platform specific binary for msgpackr-extract on linux OS with x64 architecture

package/prebuilds/linux-x64/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "msgpackr-extract-linux-x64",
+  "version": "2.0.0-beta",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "description": "Platform specific binary for msgpackr-extract on linux OS with x64 architecture"
+}

package/prebuilds/win32-x64/README.md

@@ -0,0 +1 @@
+Platform specific binary for msgpackr-extract on win32 OS with x64 architecture

package/prebuilds/win32-x64/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "msgpackr-extract-win32-x64",
+  "version": "2.0.0-beta",
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "description": "Platform specific binary for msgpackr-extract on win32 OS with x64 architecture"
+}

package/src/extract.cpp

@@ -5,12 +5,8 @@ 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 <v8.h>
-#include <napi.h>
 #include <node_api.h>
 
-using namespace Napi;
-
 #ifndef thread_local
 #ifdef __GNUC__
 # define thread_local __thread
@@ -24,20 +20,27 @@ using namespace Napi;
 #endif
 
 const int MAX_TARGET_SIZE = 255;
-typedef int (*token_handler)(Env env, uint8_t* source, int position, int size);
+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;
+	bool hasTargetArray = false;
 	uint8_t* source;
 	int position = 0;
 	int writePosition = 0;
 	int stringStart = 0;
 	int lastStringEnd = 0;
-	v8::Isolate *isolate = v8::Isolate::GetCurrent();
 
-	void readString(Env env, 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
@@ -52,18 +55,24 @@ public:
 		if (position < end) {
 			// non-latin character
 			if (lastStringEnd) {
-				target[writePosition++] = v8::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++] = v8::String::NewFromUtf8(isolate, (char*) source + start, v8::NewStringType::kNormal, 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++] = v8::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 {
@@ -72,7 +81,7 @@ public:
 		lastStringEnd = end;
 	}
 
-	napi_value extractStrings(Env env, int startingPosition, int size, uint8_t* inputSource) {
+	napi_value extractStrings(napi_env env, int startingPosition, int size, uint8_t* inputSource, napi_value array) {
 		writePosition = 0;
 		lastStringEnd = 0;
 		position = startingPosition;
@@ -85,8 +94,7 @@ public:
 				// fixstr, we want to convert this
 				token -= 0xa0;
 				if (token + position > size) {
-					TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-					return env.Null();
+					return unexpectedEnd(env);
 				}
 				readString(env,token, true);
 				if (writePosition >= MAX_TARGET_SIZE)
@@ -94,39 +102,33 @@ public:
 			} else if (token <= 0xdb && token >= 0xd9) {
 				if (token == 0xd9) { //str 8
 					if (position >= size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++];
 					if (length + position > size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					readString(env,length, true);
 				} else if (token == 0xda) { //str 16
 					if (2 + position > size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					readString(env,length, false);
 				} else { //str 32
 					if (4 + position > size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					int length = source[position++] << 24;
 					length += source[position++] << 16;
 					length += source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
-						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 					readString(env, length, false);
 				}
@@ -137,43 +139,52 @@ public:
 				if ((size_t ) handle < 20) {
 					position += (size_t ) handle;
 				} else {
-					position = tokenTable[token](env, source, position, size);
+					position = tokenTable[token](source, position, size);
 					if (position < 0) {
-						TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
-						return env.Null();
+						return unexpectedEnd(env);
 					}
 				}
 			}
 		}
-		v8::Local<v8::Value> v8ReturnValue;
+
 		if (lastStringEnd) {
+			napi_value value;
+			napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
 			if (writePosition == 0) {
-				v8ReturnValue = v8::String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
-				goto done;
+				if (!hasTargetArray) {
+					hasTargetArray = true;
+					napi_create_reference(env, array, 1, &targetArray);
+				}
+				return value;
 			}
-			target[writePosition++] = v8::String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+			target[writePosition++] = value;
 		} else if (writePosition == 1) {
-			v8ReturnValue = target[0];
-			goto done;
+			if (!hasTargetArray) {
+				hasTargetArray = true;
+				napi_create_reference(env, array, 1, &targetArray);
+			}
+			return target[0];
 		}
-//#if NODE_VERSION_AT_LEAST(12,0,0)
-		v8ReturnValue = v8::Array::New(isolate, target, writePosition);
-		done:
-		napi_value returnValue;
-		memcpy(&returnValue, &v8ReturnValue, sizeof(napi_value));
-		return returnValue;
-/*#else
-		v8::Local<v8::Array> array = v8::Array::New(isolate, writePosition);
-		v8::Local<v8::Context> context = v8::Isolate::GetCurrentContext();
-		for (int i = 0; i < writePosition; i++) {
-			array->Set(context, i, target[i]);
+		//napi_value array;
+		//napi_get_reference_value(env, targetArray, &array);
+		//napi_create_array_with_length(env, writePosition, &array);
+		if (hasTargetArray) {
+			napi_get_reference_value(env, targetArray, &array);
+			hasTargetArray = false;
 		}
+		int i = 0;
+		for (i = 0; i < writePosition; 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);
 		return array;*/
-//#endif
 	}
 };
 
-void setupTokenTable(Env env) {
+void setupTokenTable() {
 	for (int i = 0; i < 256; i++) {
 		tokenTable[i] = nullptr;
 	}
@@ -194,26 +205,24 @@ void setupTokenTable(Env env) {
 	// fixext 16
 	tokenTable[0xd8] = (token_handler) 17;
 	// bin 8
-	tokenTable[0xc4] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc4] = ([](uint8_t* source, int position, int size) -> int {
 		if (position >= size) {
-			TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
-			return size;
+			return -1;
 		}
 		int length = source[position++];
 		return position + length;
 	});
 	// bin 16
-	tokenTable[0xc5] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc5] = ([](uint8_t* source, int position, int size) -> int {
 		if (position + 2 > size) {
-			TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
-			return size;
+			return -1;
 		}
 		int length = source[position++] << 8;
 		length += source[position++];
 		return position + length;
 	});
 	// bin 32
-	tokenTable[0xc6] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc6] = ([](uint8_t* source, int position, int size) -> int {
 		if (position + 4 > size)
 			return -1;
 		int length = source[position++] << 24;
@@ -223,7 +232,7 @@ void setupTokenTable(Env env) {
 		return position + length;
 	});
 	// ext 8
-	tokenTable[0xc7] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc7] = ([](uint8_t* source, int position, int size) -> int {
 		if (position >= size)
 			return -1;
 		int length = source[position++];
@@ -231,7 +240,7 @@ void setupTokenTable(Env env) {
 		return position + length;
 	});
 	// ext 16
-	tokenTable[0xc8] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc8] = ([](uint8_t* source, int position, int size) -> int {
 		if (position + 2 > size)
 			return -1;
 		int length = source[position++] << 8;
@@ -240,7 +249,7 @@ void setupTokenTable(Env env) {
 		return position + length;
 	});
 	// ext 32
-	tokenTable[0xc9] = ([](Env env, uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc9] = ([](uint8_t* source, int position, int size) -> int {
 		if (position + 4 > size)
 			return -1;
 		int length = source[position++] << 24;
@@ -251,41 +260,25 @@ void setupTokenTable(Env env) {
 		return position + length;
 	});
 }
-
 static thread_local Extractor* extractor;
-
-napi_value extractStrings(const CallbackInfo& info) {
-  Env env = info.Env();
-	int position = info[0].As<Number>();
-	int size = info[1].As<Number>();
-	if (info[2].IsTypedArray()) {
-		TypedArray typedArray = info[2].As<TypedArray>();
-    	uint8_t* source = ((uint8_t*) typedArray.ArrayBuffer().Data()) + typedArray.ByteOffset();
-		return extractor->extractStrings(env, position, size, source);
-	}
-  return env.Undefined();
-}
-
-napi_value isOneByte(const CallbackInfo& info) {
-  	Env env = info.Env();
-	size_t length;
-	napi_get_value_string_latin1(env, info[0], nullptr, 0, &length);
-
-  	return Boolean::New(env, length == 1);
+napi_value extractStrings(napi_env env, napi_callback_info info) {
+	size_t argc = extractor->hasTargetArray ? 3 : 4;
+	napi_value args[4];
+	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, args[3]);
 }
-
-Object Init(Env env, 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(env);
-	exports.Set(
-    String::New(env, "extractStrings"),
-    Function::New(env, extractStrings)
-  );
-	exports.Set(
-    String::New(env, "isOneByte"),
-    Function::New(env, isOneByte)
-  );
+	setupTokenTable();
+	EXPORT_NAPI_FUNCTION("extractStrings", extractStrings);
 	return exports;
 }
 
-NODE_API_MODULE(extractor, Init)
+NAPI_MODULE(extractor, Init)