cbor-extract 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +16 -14
  2. package/src/extract.cpp +9 -9
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cbor-extract",
3
3
  "author": "Kris Zyp",
4
- "version": "2.1.1",
4
+ "version": "2.2.0",
5
5
  "description": "Node addon for string extraction for cbor-x",
6
6
  "license": "MIT",
7
7
  "repository": {
@@ -12,17 +12,18 @@
12
12
  "install": "node-gyp-build-optional-packages",
13
13
  "recompile": "node-gyp rebuild",
14
14
  "before-publish": "prebuildify-ci download && node set-optional-deps.cjs",
15
- "prebuild": "prebuildify-platform-packages --target 18.12.0",
16
- "prebuild-win32": "prebuildify-platform-packages --target 18.12.0 && set ENABLE_V8_FUNCTIONS=false&& prebuildify-platform-packages --platform-packages --napi --target 18.12.0",
17
- "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",
18
- "prebuild-libc-alpine": "prebuildify-cross --image alpine --tag-libc --target 18.12.0",
15
+ "prebuild": "prebuildify-platform-packages --target 20.10.0",
16
+ "prebuild-win32": "prebuildify-platform-packages --target 20.10.0 && set ENABLE_V8_FUNCTIONS=false&& prebuildify-platform-packages --platform-packages --napi --target 20.10.0",
17
+ "prebuild-macos": "prebuildify-platform-packages --target 20.0.0 && ENABLE_V8_FUNCTIONS=false prebuildify-platform-packages --napi --platform-packages --target 20.10.0",
18
+ "prebuild-libc": "prebuildify-platform-packages --tag-libc --target 20.10.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 20.10.0",
19
+ "prebuild-libc-alpine": "prebuildify-cross --image alpine --tag-libc --target 20.10.0",
19
20
  "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",
20
21
  "test": "node ./index.js"
21
22
  },
22
23
  "main": "./index.js",
23
24
  "gypfile": true,
24
25
  "dependencies": {
25
- "node-gyp-build-optional-packages": "5.0.3"
26
+ "node-gyp-build-optional-packages": "5.1.1"
26
27
  },
27
28
  "files": [
28
29
  "index.js",
@@ -34,15 +35,16 @@
34
35
  "download-cbor-prebuilds": "./bin/download-prebuilds.js"
35
36
  },
36
37
  "devDependencies": {
37
- "prebuildify-platform-packages": "5.0.2",
38
- "prebuildify-ci": "^1.0.5"
38
+ "prebuildify-platform-packages": "5.0.4",
39
+ "prebuildify-ci": "^1.0.5",
40
+ "prebuildify-cross": "5.0.0"
39
41
  },
40
42
  "optionalDependencies": {
41
- "@cbor-extract/cbor-extract-darwin-arm64": "2.1.1",
42
- "@cbor-extract/cbor-extract-darwin-x64": "2.1.1",
43
- "@cbor-extract/cbor-extract-linux-arm": "2.1.1",
44
- "@cbor-extract/cbor-extract-linux-arm64": "2.1.1",
45
- "@cbor-extract/cbor-extract-linux-x64": "2.1.1",
46
- "@cbor-extract/cbor-extract-win32-x64": "2.1.1"
43
+ "@cbor-extract/cbor-extract-darwin-arm64": "2.2.0",
44
+ "@cbor-extract/cbor-extract-darwin-x64": "2.2.0",
45
+ "@cbor-extract/cbor-extract-linux-arm": "2.2.0",
46
+ "@cbor-extract/cbor-extract-linux-arm64": "2.2.0",
47
+ "@cbor-extract/cbor-extract-linux-x64": "2.2.0",
48
+ "@cbor-extract/cbor-extract-win32-x64": "2.2.0"
47
49
  }
48
50
  }
package/src/extract.cpp CHANGED
@@ -34,14 +34,14 @@ public:
34
34
  napi_value target[MAX_TARGET_SIZE + 1]; // leave one for the queued string
35
35
 
36
36
  uint8_t* source;
37
- int position = 0;
38
- int writePosition = 0;
39
- int stringStart = 0;
40
- int lastStringEnd = 0;
37
+ uint32_t position = 0;
38
+ uint32_t writePosition = 0;
39
+ uint32_t stringStart = 0;
40
+ uint32_t lastStringEnd = 0;
41
41
 
42
- void readString(napi_env env, int length, bool allowStringBlocks) {
43
- int start = position;
44
- int end = position + length;
42
+ void readString(napi_env env, uint32_t length, bool allowStringBlocks) {
43
+ uint32_t start = position;
44
+ uint32_t end = position + length;
45
45
  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
46
46
  while(position < end) {
47
47
  if (source[position] < 0x80) // ensure we character is latin and can be decoded as one byte
@@ -79,7 +79,7 @@ public:
79
79
  }
80
80
  lastStringEnd = end;
81
81
  }
82
- napi_value extractStrings(napi_env env, int startingPosition, int size, int firstStringSize, uint8_t* inputSource) {
82
+ napi_value extractStrings(napi_env env, uint32_t startingPosition, uint32_t size, uint32_t firstStringSize, uint8_t* inputSource) {
83
83
  writePosition = 0;
84
84
  lastStringEnd = 0;
85
85
  position = startingPosition;
@@ -90,7 +90,7 @@ public:
90
90
  uint8_t majorType = token >> 5;
91
91
  token = token & 0x1f;
92
92
  if (majorType == 2 || majorType == 3) {
93
- int length;
93
+ uint32_t length;
94
94
  switch (token) {
95
95
  case 0x18:
96
96
  if (position + 1 > size) {