msgpackr-extract 2.2.0 → 3.0.1

package/bin/download-prebuilds.js

@@ -8,4 +8,6 @@ process.chdir(dirname(__dirname));
 exec('prebuildify-ci download', (error, stdout, stderr) => {
 	console.error(stderr);
 	console.log(stdout);
+	if (error?.code)
+		process.exit(error.code);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr-extract",
   "author": "Kris Zyp",
-  "version": "2.2.0",
+  "version": "3.0.1",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -22,7 +22,7 @@
   "main": "./index.js",
   "gypfile": true,
   "dependencies": {
-    "node-gyp-build-optional-packages": "5.0.3"
+    "node-gyp-build-optional-packages": "5.0.7"
   },
   "files": [
     "index.js",
@@ -34,12 +34,12 @@
     "download-msgpackr-prebuilds": "./bin/download-prebuilds.js"
   },
   "optionalDependencies": {
-    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.2.0",
-    "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.2.0",
-    "@msgpackr-extract/msgpackr-extract-linux-arm": "2.2.0",
-    "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.2.0",
-    "@msgpackr-extract/msgpackr-extract-linux-x64": "2.2.0",
-    "@msgpackr-extract/msgpackr-extract-win32-x64": "2.2.0"
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.1",
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.1",
+    "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.1",
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.1",
+    "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.1",
+    "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.1"
   },
   "devDependencies": {
     "prebuildify-platform-packages": "5.0.2",

package/src/extract.cpp

@@ -23,7 +23,8 @@ find the string tokens and determine their position and length. All strings are
 #endif
 
 const int MAX_TARGET_SIZE = 255;
-typedef int (*token_handler)(uint8_t* source, int position, int size);
+const uint UNEXPECTED_END = 0xffffffff;
+typedef uint32_t (*token_handler)(uint8_t* source, uint32_t position, uint32_t size);
 token_handler tokenTable[256] = {};
 napi_value unexpectedEnd(napi_env env) {
 	napi_value returnValue;
@@ -37,14 +38,14 @@ public:
 	// napi_ref targetArray; // could consider reenabling this optimization for napi
 	bool hasTargetArray = false;
 	uint8_t* source;
-	int position = 0;
-	int writePosition = 0;
-	int stringStart = 0;
-	int lastStringEnd = 0;
+	uint32_t position = 0;
+	uint32_t writePosition = 0;
+	uint32_t stringStart = 0;
+	uint32_t lastStringEnd = 0;
 
-	void readString(napi_env env, int length, bool allowStringBlocks, napi_value* target) {
-		int start = position;
-		int end = position + length;
+	void readString(napi_env env, uint32_t length, bool allowStringBlocks, napi_value* target) {
+		uint32_t start = position;
+		uint32_t 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
 			while(position < end) {
 				if (source[position] < 0x80) // ensure we character is latin and can be decoded as one byte
@@ -83,7 +84,7 @@ public:
 		lastStringEnd = end;
 	}
 
-	napi_value extractStrings(napi_env env, int startingPosition, int size, uint8_t* inputSource) {
+	napi_value extractStrings(napi_env env, uint32_t startingPosition, uint32_t size, uint8_t* inputSource) {
 		napi_value target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
 		writePosition = 0;
 		lastStringEnd = 0;
@@ -107,7 +108,7 @@ public:
 					if (position >= size) {
 						return unexpectedEnd(env);
 					}
-					int length = source[position++];
+					uint32_t length = source[position++];
 					if (length + position > size) {
 						return unexpectedEnd(env);
 					}
@@ -116,7 +117,7 @@ public:
 					if (2 + position > size) {
 						return unexpectedEnd(env);
 					}
-					int length = source[position++] << 8;
+					uint32_t length = source[position++] << 8;
 					length += source[position++];
 					if (length + position > size) {
 						return unexpectedEnd(env);
@@ -126,7 +127,7 @@ public:
 					if (4 + position > size) {
 						return unexpectedEnd(env);
 					}
-					int length = source[position++] << 24;
+					uint32_t length = source[position++] << 24;
 					length += source[position++] << 16;
 					length += source[position++] << 8;
 					length += source[position++];
@@ -143,7 +144,7 @@ public:
 					position += (size_t ) handle;
 				} else {
 					position = tokenTable[token](source, position, size);
-					if (position < 0) {
+					if (position == UNEXPECTED_END) {
 						return unexpectedEnd(env);
 					}
 				}
@@ -166,7 +167,7 @@ public:
 		memcpy(&array, &v8Array, sizeof(array));
 		#else
 		napi_create_array_with_length(env, writePosition, &array);
-		for (int i = 0; i < writePosition; i++) {
+		for (uint32_t i = 0; i < writePosition; i++) {
 			napi_set_element(env, array, i, target[i]);
 		}
 		#endif
@@ -195,54 +196,54 @@ void setupTokenTable() {
 	// fixext 16
 	tokenTable[0xd8] = (token_handler) 17;
 	// bin 8
-	tokenTable[0xc4] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc4] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position >= size) {
-			return -1;
+			return UNEXPECTED_END;
 		}
-		int length = source[position++];
+		uint32_t length = source[position++];
 		return position + length;
 	});
 	// bin 16
-	tokenTable[0xc5] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc5] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position + 2 > size) {
-			return -1;
+			return UNEXPECTED_END;
 		}
-		int length = source[position++] << 8;
+		uint32_t length = source[position++] << 8;
 		length += source[position++];
 		return position + length;
 	});
 	// bin 32
-	tokenTable[0xc6] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc6] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position + 4 > size)
-			return -1;
-		int length = source[position++] << 24;
+			return UNEXPECTED_END;
+		uint32_t length = source[position++] << 24;
 		length += source[position++] << 16;
 		length += source[position++] << 8;
 		length += source[position++];
 		return position + length;
 	});
 	// ext 8
-	tokenTable[0xc7] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc7] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position >= size)
-			return -1;
-		int length = source[position++];
+			return UNEXPECTED_END;
+		uint32_t length = source[position++];
 		position++;
 		return position + length;
 	});
 	// ext 16
-	tokenTable[0xc8] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc8] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position + 2 > size)
-			return -1;
-		int length = source[position++] << 8;
+			return UNEXPECTED_END;
+		uint32_t length = source[position++] << 8;
 		length += source[position++];
 		position++;
 		return position + length;
 	});
 	// ext 32
-	tokenTable[0xc9] = ([](uint8_t* source, int position, int size) -> int {
+	tokenTable[0xc9] = ([](uint8_t* source, uint32_t position, uint32_t size) -> uint32_t {
 		if (position + 4 > size)
-			return -1;
-		int length = source[position++] << 24;
+			return UNEXPECTED_END;
+		uint32_t length = source[position++] << 24;
 		length += source[position++] << 16;
 		length += source[position++] << 8;
 		length += source[position++];
@@ -261,7 +262,7 @@ napi_value extractStrings(napi_env env, napi_callback_info info) {
 	napi_get_value_uint32(env, args[1], &size);
 	uint8_t* source;
 	size_t buffer_size;
-	napi_get_buffer_info(env, args[2], (void**) &source, &buffer_size);
+	napi_get_arraybuffer_info(env, args[2], (void**) &source, &buffer_size);
 	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); }