msgpackr-extract 2.0.0 → 2.1.0

package/bin/download-prebuilds.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+process.chdir(fileURLToPath(dirname(dirname(import.meta.url))));
+process.argv[2] = 'download';
+import('prebuildify-ci');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr-extract",
   "author": "Kris Zyp",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -11,32 +11,39 @@
   "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",
+    "before-publish": "prebuildify-ci download && node set-optional-deps.cjs",
+    "prebuild": "prebuildify-platform-packages --target 16.14.2",
+    "prebuild-win32": "prebuildify-platform-packages --target 16.14.2 && set ENABLE_V8_FUNCTIONS=false&& prebuildify-platform-packages --platform-packages --napi --target 16.14.2",
+    "prebuild-libc": "prebuildify-platform-packages --tag-libc --target 16.14.2 && ENABLE_V8_FUNCTIONS=false prebuildify-platform-packages --platform-packages --napi --tag-libc --target 16.14.2",
+    "prebuild-libc-alpine": "prebuildify-cross --image alpine --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.1"
+    "node-gyp-build-optional-packages": "5.0.3"
   },
   "files": [
     "index.js",
     "/src",
-    "/*.gyp"
+    "/*.gyp",
+    "/bin"
   ],
+  "bin": {
+    "download-msgpackr-prebuilds": "./bin/download-prebuilds.js"
+  },
   "optionalDependencies": {
-    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.0.0",
-    "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.0.0",
-    "@msgpackr-extract/msgpackr-extract-linux-arm": "2.0.0",
-    "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.0.0",
-    "@msgpackr-extract/msgpackr-extract-linux-x64": "2.0.0",
-    "@msgpackr-extract/msgpackr-extract-win32-x64": "2.0.0"
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.1.0",
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.1.0",
+    "@msgpackr-extract/msgpackr-extract-linux-arm": "2.1.0",
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.1.0",
+    "@msgpackr-extract/msgpackr-extract-linux-x64": "2.1.0",
+    "@msgpackr-extract/msgpackr-extract-win32-x64": "2.1.0"
   },
   "devDependencies": {
-    "prebuildify": "kriszyp/prebuildify#optional-packages",
-    "prebuildify-ci": "^1.0.5"
+    "prebuildify-platform-packages": "5.0.0",
+    "prebuildify-ci": "^1.0.5",
+    "prebuildify-cross": "5.0.0"
   }
-}
+}

package/src/extract.cpp

@@ -34,7 +34,6 @@ 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; // could consider reenabling this optimization for napi
 	bool hasTargetArray = false;
 	uint8_t* source;
@@ -43,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
@@ -85,6 +84,7 @@ public:
 	}
 
 	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;
@@ -99,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) {
@@ -111,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);
@@ -121,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);
@@ -133,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;
@@ -269,4 +269,4 @@ NAPI_MODULE_INIT() {
 	setupTokenTable();
 	EXPORT_NAPI_FUNCTION("extractStrings", extractStrings);
 	return exports;
-}
+}