msgpackr-extract 2.1.2 → 2.2.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 Kris Zyp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 Kris Zyp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,5 +1,5 @@
-## Summary
-This module is designed to do fast and efficient native/C-level extraction of strings from MessagePack binary data. This works by calling `extractStrings(buffer, start, end)`, and it will extract strings by doing partial MessagePack parsing, and scanning to find the string data in the range specified in the buffer. It will return an array of strings that it finds. When it finds strings that can be represented with latin-1/one-byte strings (and important V8 optimization), it will attempt return a continuous string of MessagePack data that contains multiple sub-strings, so the decoder can slice off strings by offset. When a string contains non-latin characters, and must be represented as a two-byte string, this will always be returned as the string alone without combination with any other strings. The extractor will return an array of a maximum of 256 strings. The decoder can call the extractStrings again, with a new offset to continue extracting more strings as necessary.
-
-## License
+## Summary
+This module is designed to do fast and efficient native/C-level extraction of strings from MessagePack binary data. This works by calling `extractStrings(buffer, start, end)`, and it will extract strings by doing partial MessagePack parsing, and scanning to find the string data in the range specified in the buffer. It will return an array of strings that it finds. When it finds strings that can be represented with latin-1/one-byte strings (and important V8 optimization), it will attempt return a continuous string of MessagePack data that contains multiple sub-strings, so the decoder can slice off strings by offset. When a string contains non-latin characters, and must be represented as a two-byte string, this will always be returned as the string alone without combination with any other strings. The extractor will return an array of a maximum of 256 strings. The decoder can call the extractStrings again, with a new offset to continue extracting more strings as necessary.
+
+## License
 MIT

package/binding.gyp

@@ -1,63 +1,63 @@
-{
-  "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": "extract",
-      "sources": [
-        "src/extract.cpp",
-      ],
-      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "conditions": [
-        ["OS=='linux'", {
-          "variables": {
-            "gcc_version" : "<!(<(os_linux_compiler) -dumpversion | cut -d '.' -f 1)",
-          },
-          "cflags_cc": [
-            "-fPIC",
-            "-fvisibility=hidden",
-            "-fvisibility-inlines-hidden",
-          ],
-          "conditions": [
-            ["gcc_version>=7", {
-              "cflags": [
-                "-Wimplicit-fallthrough=2",
-              ],
-            }],
-          ],
-          "ldflags": [
-            "-fPIC",
-            "-fvisibility=hidden"
-          ],
-          "cflags": [
-            "-fPIC",
-            "-fvisibility=hidden",
-            "-O3"
-          ],
-        }],
-        ["enable_v8!='false'", {
-          "defines": ["ENABLE_V8_API=1"]
-        }],
-        ["enable_pointer_compression=='true'", {
-          "defines": ["V8_COMPRESS_POINTERS", "V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE"],
-        }],
-      ],
-    }
-  ]
-}
+{
+  "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": "extract",
+      "sources": [
+        "src/extract.cpp",
+      ],
+      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
+      "conditions": [
+        ["OS=='linux'", {
+          "variables": {
+            "gcc_version" : "<!(<(os_linux_compiler) -dumpversion | cut -d '.' -f 1)",
+          },
+          "cflags_cc": [
+            "-fPIC",
+            "-fvisibility=hidden",
+            "-fvisibility-inlines-hidden",
+          ],
+          "conditions": [
+            ["gcc_version>=7", {
+              "cflags": [
+                "-Wimplicit-fallthrough=2",
+              ],
+            }],
+          ],
+          "ldflags": [
+            "-fPIC",
+            "-fvisibility=hidden"
+          ],
+          "cflags": [
+            "-fPIC",
+            "-fvisibility=hidden",
+            "-O3"
+          ],
+        }],
+        ["enable_v8!='false'", {
+          "defines": ["ENABLE_V8_API=1"]
+        }],
+        ["enable_pointer_compression=='true'", {
+          "defines": ["V8_COMPRESS_POINTERS", "V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE"],
+        }],
+      ],
+    }
+  ]
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr-extract",
   "author": "Kris Zyp",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Node addon for string extraction for msgpackr",
   "license": "MIT",
   "repository": {
@@ -12,10 +12,10 @@
     "install": "node-gyp-build-optional-packages",
     "recompile": "node-gyp rebuild",
     "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",
+    "prebuild": "prebuildify-platform-packages --target 18.12.0",
+    "prebuild-win32": "prebuildify-platform-packages --target 18.12.0 && set ENABLE_V8_FUNCTIONS=false&& prebuildify-platform-packages --platform-packages --napi --target 18.12.0",
+    "prebuild-libc": "prebuildify-platform-packages --tag-libc --target 18.12.0 && prebuildify-platform-packages --platform-packages --napi --tag-libc --target 16.14.2 && ENABLE_V8_FUNCTIONS=false prebuildify-platform-packages --platform-packages --napi --tag-libc --target 18.12.0",
+    "prebuild-libc-alpine": "prebuildify-cross --image alpine --tag-libc --target 18.12.0",
     "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"
   },
@@ -34,15 +34,15 @@
     "download-msgpackr-prebuilds": "./bin/download-prebuilds.js"
   },
   "optionalDependencies": {
-    "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.1.2",
-    "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.1.2",
-    "@msgpackr-extract/msgpackr-extract-linux-arm": "2.1.2",
-    "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.1.2",
-    "@msgpackr-extract/msgpackr-extract-linux-x64": "2.1.2",
-    "@msgpackr-extract/msgpackr-extract-win32-x64": "2.1.2"
+    "@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"
   },
   "devDependencies": {
-    "prebuildify-platform-packages": "5.0.0",
+    "prebuildify-platform-packages": "5.0.2",
     "prebuildify-ci": "^1.0.5",
     "prebuildify-cross": "5.0.0"
   }

package/src/extract.cpp

@@ -260,7 +260,8 @@ napi_value extractStrings(napi_env env, napi_callback_info info) {
 	napi_get_value_uint32(env, args[0], &position);
 	napi_get_value_uint32(env, args[1], &size);
 	uint8_t* source;
-	napi_get_typedarray_info(env, args[2], NULL, NULL, (void**) &source, NULL, NULL);
+	size_t buffer_size;
+	napi_get_buffer_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); }

package/src/.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": "No Configurations"
-}

package/src/.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\extract.cpp",
-  "PreviewInSolutionExplorer": false
-}