msgpackr-extract 1.0.16 → 1.1.0-napi

package/.github/workflows/prebuild.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           files: prebuild-darwin.tar
   build-centos-7:
-    if: startsWith(github.ref, 'refs/tags/')
+    #if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-18.04
     container: quay.io/pypa/manylinux2014_x86_64
     steps:

package/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+    {
+        "name": "(Windows) Attach",
+        "type": "cppvsdbg",
+        "request": "attach",
+        "processId": "${command:pickProcess}",
+        "internalConsoleOptions": "neverOpen"
+    },
+	]
+}

package/binding.gyp

@@ -10,9 +10,9 @@
       "sources": [
         "src/extract.cpp",
       ],
-      "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-      ],
+      "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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr-extract",
   "author": "Kris Zyp",
-  "version": "1.0.16",
+  "version": "1.1.0-napi",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -11,16 +11,15 @@
   "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": ""
+    "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": ""
   },
   "main": "./index.js",
   "gypfile": true,
   "dependencies": {
-    "nan": "^2.14.2",
+    "node-addon-api": "^4.3.0",
     "node-gyp-build": "^4.2.3"
   },
   "devDependencies": {

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 <v8.h>
-#include <node.h>
-#include <node_buffer.h>
-#include <nan.h>
-using namespace v8;
+#include <napi.h>
+#include <node_api.h>
+
+using namespace Napi;
 
 #ifndef thread_local
 #ifdef __GNUC__
@@ -28,15 +27,15 @@ typedef int (*token_handler)(uint8_t* source, int position, int size);
 token_handler tokenTable[256] = {};
 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
 
 	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(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 +50,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 +76,7 @@ public:
 		lastStringEnd = end;
 	}
 
-	Local<Value> extractStrings(int startingPosition, int size, uint8_t* inputSource) {
+	napi_value extractStrings(Env env, int startingPosition, int size, uint8_t* inputSource) {
 		writePosition = 0;
 		lastStringEnd = 0;
 		position = startingPosition;
@@ -84,50 +89,50 @@ public:
 				// fixstr, we want to convert this
 				token -= 0xa0;
 				if (token + position > size) {
-					Nan::ThrowError("Unexpected end of buffer reading string");
-					return Nan::Null();
+					TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+					return env.Null();
 				}
-				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();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
 					int length = source[position++];
 					if (length + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
-					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();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
 					int length = source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
-						Nan::ThrowError("Unexpected end of buffer reading string");
-						return Nan::Null();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
-					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();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
 					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();
+						TypeError::New(env, "Unexpected end of buffer reading string").ThrowAsJavaScriptException();
+						return env.Null();
 					}
-					readString(length, false);
+					readString(env, length, false);
 				}
 				if (writePosition >= MAX_TARGET_SIZE)
 					break;
@@ -138,32 +143,34 @@ public:
 				} else {
 					position = tokenTable[token](source, position, size);
 					if (position < 0) {
-						Nan::ThrowError("Unexpected end of buffer");
-						return Nan::Null();	
+						TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
+						return env.Null();
 					}
 				}
 			}
 		}
 
 		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) {
+				return value;
+			}
+			target[writePosition++] = value;
 		} else if (writePosition == 1) {
 			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;
+		napi_create_array_with_length(env, writePosition, &array);
+		//Array array = Array::New(env, writePosition);
 		for (int i = 0; i < writePosition; i++) {
-			array->Set(context, i, target[i]);
+			napi_set_element(env, array, i, target[i]);
+			//array.Set(i, target[i]);
 		}
 		return array;
-#endif
 	}
 };
+
 void setupTokenTable() {
 	for (int i = 0; i < 256; i++) {
 		tokenTable[i] = nullptr;
@@ -187,8 +194,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 +202,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++];
@@ -245,25 +250,26 @@ void setupTokenTable() {
 
 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));
+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();
 }
 
-NAN_METHOD(isOneByte) {
-	info.GetReturnValue().Set(Nan::New<Boolean>(Local<String>::Cast(info[0])->IsOneByte()));
-}
-
-void initializeModule(v8::Local<v8::Object> exports) {
+Object Init(Env env, Object exports) {
 	extractor = new Extractor(); // create our thread-local extractor
 	setupTokenTable();
-	Nan::SetMethod(exports, "extractStrings", extractStrings);
-	Nan::SetMethod(exports, "isOneByte", isOneByte);
+	exports.Set(
+    String::New(env, "extractStrings"),
+    Function::New(env, extractStrings)
+  );
+	return exports;
 }
 
-NODE_MODULE_CONTEXT_AWARE(extractor, initializeModule);
+NODE_API_MODULE(extractor, Init)