msgpackr-extract 2.0.0-beta → 2.0.2

package/binding.gyp

@@ -1,12 +1,25 @@
 {
   "variables": {
       "os_linux_compiler%": "gcc",
+      "enable_v8%": "true",
+      "enable_pointer_compression%": "false",
       "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",
-      "win_delay_load_hook": "false",
+      "target_name": "extract",
       "sources": [
         "src/extract.cpp",
       ],
@@ -38,6 +51,12 @@
             "-O3"
           ],
         }],
+        ["enable_v8!='false'", {
+          "defines": ["ENABLE_V8_API=1"]
+        }],
+        ["enable_pointer_compression=='true'", {
+          "defines": ["V8_COMPRESS_POINTERS", "V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE"],
+        }],
       ],
     }
   ]

package/index.js

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

package/package.json

@@ -1,29 +1,42 @@
-{
-  "name": "msgpackr-extract",
-  "author": "Kris Zyp",
-  "version": "2.0.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",
-    "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-gyp-build": "kriszyp/node-gyp-build#optional-packages"
-  },
-  "devDependencies": {
-    "prebuildify": "kriszyp/prebuildify#optional-packages",
-    "prebuildify-ci": "^1.0.5"
-  }
-}
+{
+  "name": "msgpackr-extract",
+  "author": "Kris Zyp",
+  "version": "2.0.2",
+  "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-optional-packages",
+    "recompile": "node-gyp rebuild",
+    "before-publish": "prebuildify-ci download && prebuildify --target 16.14.2 && set ENABLE_V8_FUNCTIONS=false&& prebuildify --platform-packages --napi --target 16.14.2 && node set-optional-deps.cjs",
+    "prebuild": "prebuildify --target 16.14.2",
+    "prebuild-libc": "prebuildify --tag-libc --target 16.14.2 && ENABLE_V8_FUNCTIONS=false prebuildify --platform-packages --napi --tag-libc --target 16.14.2",
+    "publish-all": "cd prebuilds/win32-x64 && npm publish --access public && cd ../darwin-x64 && npm publish --access public && cd ../darwin-arm64 && npm publish --access public && cd ../linux-x64 && npm publish --access public && cd ../linux-arm64 && npm publish --access public  && cd ../linux-arm && npm publish --access public && cd ../.. && npm publish --access public",
+    "test": "node ./index.js"
+  },
+  "main": "./index.js",
+  "gypfile": true,
+  "dependencies": {
+    "node-gyp-build-optional-packages": "5.0.2"
+  },
+  "files": [
+    "index.js",
+    "/src",
+    "/*.gyp"
+  ],
+  "optionalDependencies": {
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.0.2",
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.0.2",
+    "@msgpackr-extract/msgpackr-extract-linux-arm": "2.0.2",
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.0.2",
+    "@msgpackr-extract/msgpackr-extract-linux-x64": "2.0.2",
+    "@msgpackr-extract/msgpackr-extract-win32-x64": "2.0.2"
+  },
+  "devDependencies": {
+    "prebuildify": "kriszyp/prebuildify#optional-packages",
+    "prebuildify-ci": "^1.0.5"
+  }
+}

package/src/extract.cpp

@@ -6,6 +6,9 @@ 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 <node_api.h>
+#if ENABLE_V8_API
+#include <v8.h>
+#endif
 
 #ifndef thread_local
 #ifdef __GNUC__
@@ -31,8 +34,7 @@ napi_value unexpectedEnd(napi_env env) {
 
 class Extractor {
 public:
-	napi_value target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
-	napi_ref targetArray;
+	// napi_ref targetArray; // could consider reenabling this optimization for napi
 	bool hasTargetArray = false;
 	uint8_t* source;
 	int position = 0;
@@ -40,7 +42,7 @@ public:
 	int stringStart = 0;
 	int lastStringEnd = 0;
 
-	void readString(napi_env env, int length, bool allowStringBlocks) {
+	void readString(napi_env env, int length, bool allowStringBlocks, napi_value* target) {
 		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
@@ -81,7 +83,8 @@ public:
 		lastStringEnd = end;
 	}
 
-	napi_value extractStrings(napi_env env, int startingPosition, int size, uint8_t* inputSource, napi_value array) {
+	napi_value extractStrings(napi_env env, int startingPosition, int size, uint8_t* inputSource) {
+		napi_value target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
 		writePosition = 0;
 		lastStringEnd = 0;
 		position = startingPosition;
@@ -96,7 +99,7 @@ public:
 				if (token + position > size) {
 					return unexpectedEnd(env);
 				}
-				readString(env,token, true);
+				readString(env, token, true, target);
 				if (writePosition >= MAX_TARGET_SIZE)
 					break;
 			} else if (token <= 0xdb && token >= 0xd9) {
@@ -108,7 +111,7 @@ public:
 					if (length + position > size) {
 						return unexpectedEnd(env);
 					}
-					readString(env,length, true);
+					readString(env,length, true, target);
 				} else if (token == 0xda) { //str 16
 					if (2 + position > size) {
 						return unexpectedEnd(env);
@@ -118,7 +121,7 @@ public:
 					if (length + position > size) {
 						return unexpectedEnd(env);
 					}
-					readString(env,length, false);
+					readString(env,length, false, target);
 				} else { //str 32
 					if (4 + position > size) {
 						return unexpectedEnd(env);
@@ -130,7 +133,7 @@ public:
 					if (length + position > size) {
 						return unexpectedEnd(env);
 					}
-					readString(env, length, false);
+					readString(env, length, false, target);
 				}
 				if (writePosition >= MAX_TARGET_SIZE)
 					break;
@@ -151,36 +154,23 @@ public:
 			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];
 		}
-		//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_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);
+		for (int 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
+		return array;
 	}
 };
 
@@ -262,8 +252,8 @@ void setupTokenTable() {
 }
 static thread_local Extractor* extractor;
 napi_value extractStrings(napi_env env, napi_callback_info info) {
-	size_t argc = extractor->hasTargetArray ? 3 : 4;
-	napi_value args[4];
+	size_t argc = 3;
+	napi_value args[3];
 	napi_get_cb_info(env, info, &argc, args, NULL, NULL);
 	uint32_t position;
 	uint32_t size;
@@ -271,14 +261,12 @@ napi_value extractStrings(napi_env env, napi_callback_info info) {
 	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]);
+	return extractor->extractStrings(env, position, size, source);
 }
 #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) {
+NAPI_MODULE_INIT() {
 	extractor = new Extractor(); // create our thread-local extractor
 	setupTokenTable();
 	EXPORT_NAPI_FUNCTION("extractStrings", extractStrings);
 	return exports;
 }
-
-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,98 +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-libc
-        if: startsWith(github.ref, 'refs/tags/')
-      - 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
-        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-libc
-      - 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-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
-        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-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 .
-      - 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'

package/.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-	// 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/prebuilds/darwin-arm64/README.md

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

package/prebuilds/darwin-arm64/package.json

@@ -1,11 +0,0 @@
-{
-  "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

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

package/prebuilds/darwin-x64/package.json

@@ -1,11 +0,0 @@
-{
-  "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

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

package/prebuilds/linux-arm64/package.json

@@ -1,11 +0,0 @@
-{
-  "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

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

package/prebuilds/linux-x64/package.json

@@ -1,11 +0,0 @@
-{
-  "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

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

package/prebuilds/win32-x64/package.json

@@ -1,11 +0,0 @@
-{
-  "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"
-}