msgpackr-extract 1.0.15 → 1.0.16-napi.1

package/.circleci/config.yml

@@ -0,0 +1,19 @@
+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,7 +1,7 @@
-name: Test and Prebuild
+name: Prebuild
 on: [push]
 jobs:
-  build:
+  build-test-macos:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: macos-11
     steps:
@@ -11,11 +11,77 @@ jobs:
         with:
           node-version: 12
       - run: npm install
+      - run: npm test
       - run: npm run prebuild
-      - run: zip -r prebuild-darwin.zip prebuilds
-      - run: hexdump "prebuilds/darwin-x64/node.abi93.node" | head -10
+        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-darwin.zip
+          files: prebuild-linux-arm64.tar

package/.travis.yml

@@ -1,30 +1,30 @@
-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'
+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'

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.15",
+  "version": "1.0.16-napi.1",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -11,22 +11,20 @@
   "scripts": {
     "install": "node-gyp-build",
     "recompile": "node-gyp build",
-    "prebuild": "run-script-os",
-    "prebuild:darwin": "prebuildify --arch=arm64 --target 17.0.1 && prebuildify --arch=arm64 --target 16.9.0 && prebuildify --arch=arm64 --target 14.17.6 && prebuildify --target 17.0.1 && prebuildify --target 16.9.0 && prebuildify --target 14.17.6 && prebuildify --target 12.18.0",
-    "prebuild:default": "prebuildify --target 17.0.1 && prebuildify --target 16.9.0 && prebuildify --target 14.17.6 && prebuildify --target 12.18.0",
-    "before-publish": "prebuildify-ci download && prebuildify --target 17.0.1 && prebuildify --target 16.9.0 && prebuildify --target 14.17.6 && prebuildify --target 12.18.0 && prebuildify --target electron@13.1.4",
-    "test-prebuild": "prebuildify --target 16.9.0",
+    "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": {
-    "prebuildify": "kriszyp/prebuildify#b78c5a9",
-    "prebuildify-ci": "^1.0.5",
-    "run-script-os": "^1.1.6"
+    "prebuildify": "^5.0.0",
+    "prebuildify-ci": "^1.0.5"
   }
 }

package/src/extract.cpp

@@ -6,10 +6,10 @@ times as necessary to get more strings. This must be partially capable of parsin
 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__
@@ -24,7 +24,7 @@ using namespace v8;
 #endif
 
 const int MAX_TARGET_SIZE = 255;
-typedef int (*token_handler)(uint8_t* source, int position, int size);
+typedef int (*token_handler)(Env env, uint8_t* source, int position, int size);
 token_handler tokenTable[256] = {};
 class Extractor {
 public:
@@ -35,8 +35,9 @@ public:
 	int writePosition = 0;
 	int stringStart = 0;
 	int lastStringEnd = 0;
-	Isolate *isolate = Isolate::GetCurrent();
-	void readString(int length, bool allowStringBlocks) {
+	v8::Isolate *isolate = v8::Isolate::GetCurrent();
+
+	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 +52,18 @@ public:
 		if (position < end) {
 			// non-latin character
 			if (lastStringEnd) {
-				target[writePosition++] = String::NewFromOneByte(isolate,  (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+				target[writePosition++] = v8::String::NewFromOneByte(isolate,  (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
 				lastStringEnd = 0;
 			}
 			// use standard utf-8 conversion
-			target[writePosition++] = Nan::New<v8::String>((char*) source + start, (int) length).ToLocalChecked();
+			target[writePosition++] = v8::String::NewFromUtf8(isolate, (char*) source + start, v8::NewStringType::kNormal, length).ToLocalChecked();
 			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();
+				target[writePosition++] = v8::String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
 				stringStart = start;
 			}
 		} else {
@@ -71,7 +72,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 +85,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;
@@ -136,35 +137,43 @@ public:
 				if ((size_t ) handle < 20) {
 					position += (size_t ) handle;
 				} else {
-					position = tokenTable[token](source, position, size);
+					position = tokenTable[token](env, 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();
 					}
 				}
 			}
 		}
-
+		v8::Local<v8::Value> v8ReturnValue;
 		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();
+			if (writePosition == 0) {
+				v8ReturnValue = v8::String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+				goto done;
+			}
+			target[writePosition++] = v8::String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
 		} else if (writePosition == 1) {
-			return target[0];
+			v8ReturnValue = target[0];
+			goto done;
 		}
-#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();
+//#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]);
 		}
-		return array;
-#endif
+		return array;*/
+//#endif
 	}
 };
-void setupTokenTable() {
+
+void setupTokenTable(Env env) {
 	for (int i = 0; i < 256; i++) {
 		tokenTable[i] = nullptr;
 	}
@@ -185,18 +194,18 @@ void setupTokenTable() {
 	// fixext 16
 	tokenTable[0xd8] = (token_handler) 17;
 	// bin 8
-	tokenTable[0xc4] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc4] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position >= size) {
-			Nan::ThrowError("Unexpected end of buffer");
+			TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
 			return size;
 		}
 		int length = source[position++];
 		return position + length;
 	});
 	// bin 16
-	tokenTable[0xc5] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc5] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position + 2 > size) {
-			Nan::ThrowError("Unexpected end of buffer");
+			TypeError::New(env, "Unexpected end of buffer").ThrowAsJavaScriptException();
 			return size;
 		}
 		int length = source[position++] << 8;
@@ -204,7 +213,7 @@ void setupTokenTable() {
 		return position + length;
 	});
 	// bin 32
-	tokenTable[0xc6] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc6] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position + 4 > size)
 			return -1;
 		int length = source[position++] << 24;
@@ -214,7 +223,7 @@ void setupTokenTable() {
 		return position + length;
 	});
 	// ext 8
-	tokenTable[0xc7] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc7] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position >= size)
 			return -1;
 		int length = source[position++];
@@ -222,7 +231,7 @@ void setupTokenTable() {
 		return position + length;
 	});
 	// ext 16
-	tokenTable[0xc8] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc8] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position + 2 > size)
 			return -1;
 		int length = source[position++] << 8;
@@ -231,7 +240,7 @@ void setupTokenTable() {
 		return position + length;
 	});
 	// ext 32
-	tokenTable[0xc9] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc9] = ([](Env env, uint8_t* source, int position, int size) -> int {
 		if (position + 4 > size)
 			return -1;
 		int length = source[position++] << 24;
@@ -245,25 +254,38 @@ 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()));
+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);
 }
 
-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);
+	setupTokenTable(env);
+	exports.Set(
+    String::New(env, "extractStrings"),
+    Function::New(env, extractStrings)
+  );
+	exports.Set(
+    String::New(env, "isOneByte"),
+    Function::New(env, isOneByte)
+  );
+	return exports;
 }
 
-NODE_MODULE_CONTEXT_AWARE(extractor, initializeModule);
+NODE_API_MODULE(extractor, Init)