cbor-extract 0.2.2 → 1.0.0

package/.github/workflows/prebuild.yml

@@ -0,0 +1,87 @@
+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
+        if: startsWith(github.ref, 'refs/tags/')
+      - run: npm run prebuild-arm64
+        if: startsWith(github.ref, 'refs/tags/')
+      - 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
+      - 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-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-arm64
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          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/binding.gyp

@@ -18,27 +18,17 @@
           "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",
               ],
             }],
-            ["node_module_version >= 93", {
-              "cflags_cc": [
-                "-fPIC",
-                "-fvisibility=hidden",
-                "-fvisibility-inlines-hidden",
-                "-std=c++14"
-              ]
-            }, {
-             "cflags_cc": [
-              "-fPIC",
-              "-fvisibility=hidden",
-              "-fvisibility-inlines-hidden",
-              "-std=c++11"
-              ],
-            }],
           ],
           "ldflags": [
             "-fPIC",
@@ -50,16 +40,6 @@
             "-O3"
           ],
         }],
-        ["OS=='mac'", {
-          "xcode_settings": {
-            "OTHER_CPLUSPLUSFLAGS" : ["-std=c++14"],
-            "MACOSX_DEPLOYMENT_TARGET": "10.7",
-            "OTHER_LDFLAGS": ["-std=c++14"],
-            "CLANG_CXX_LIBRARY": "libc++"
-          }
-        }],
-        ["OS=='win'", {
-        }],
       ],
     }
   ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-extract",
   "author": "Kris Zyp",
-  "version": "0.2.2",
+  "version": "1.0.0",
   "description": "Node addon for string extraction for cbor-x",
   "license": "MIT",
   "repository": {
@@ -11,12 +11,20 @@
   "scripts": {
     "install": "node-gyp-build",
     "recompile": "node-gyp build",
-    "test": "./node_modules/.bin/mocha tests/test*.js -u tdd"
+    "before-publish": "prebuildify-ci download && prebuildify --target 17.2.0 && prebuildify --target 16.13.0 && prebuildify --target 15.5.0 && prebuildify --target 14.17.6 && prebuildify --target 12.22.7 && prebuildify --target electron@15.2.0",
+    "prebuild": "prebuildify --target 17.2.0 && prebuildify --target 16.13.0 && prebuildify --target 15.5.0 && prebuildify --target 14.17.6 && prebuildify --target 12.22.7 && prebuildify --target electron@15.2.0",
+    "prebuild-musl": "prebuildify --target 17.2.0 --libc musl --tag-libc && prebuildify --target 16.13.0 --libc musl --tag-libc && prebuildify --target 14.17.6 --libc musl --tag-libc && prebuildify --target 12.22.7 --libc musl --tag-libc",
+    "prebuild-arm64": "prebuildify --arch=arm64 --target 17.2.0 --libc musl && prebuildify --arch=arm64 --target 16.13.0 && prebuildify --arch=arm64 --target 14.17.6 && prebuildify --arch=arm64 --target electron@15.2.0",
+    "test": ""
   },
   "main": "./index.js",
   "gypfile": true,
   "dependencies": {
     "nan": "^2.14.2",
     "node-gyp-build": "^4.2.3"
+  },
+  "devDependencies": {
+    "prebuildify": "^5.0.0",
+    "prebuildify-ci": "^1.0.5"
   }
 }

package/src/extract.cpp

@@ -11,6 +11,18 @@ find the string tokens and determine their position and length. All strings are
 #include <nan.h>
 using namespace v8;
 
+#ifndef thread_local
+#ifdef __GNUC__
+# define thread_local __thread
+#elif __STDC_VERSION__ >= 201112L
+# define thread_local _Thread_local
+#elif defined(_MSC_VER)
+# define thread_local __declspec(thread)
+#else
+# define thread_local
+#endif
+#endif
+
 const int MAX_TARGET_SIZE = 255;
 
 class Extractor {
@@ -48,7 +60,7 @@ public:
 		}
 
 		if (lastStringEnd) {
-			if (start - lastStringEnd > 40 || end - stringStart > 4000) {
+			if (start - lastStringEnd > 40 || end - stringStart > 6000) {
 				target[writePosition++] = String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
 				stringStart = start;
 			}
@@ -73,14 +85,14 @@ public:
 				switch (token) {
 					case 0x18:
 						if (position + 1 > size) {
-							Nan::ThrowError("Unexpected end of buffer");
+							Nan::ThrowError("Unexpected end of buffer reading string");
 							return Nan::Null();
 						}
 						length = source[position++];
 						break;
 					case 0x19:
 						if (position + 2 > size) {
-							Nan::ThrowError("Unexpected end of buffer");
+							Nan::ThrowError("Unexpected end of buffer reading string");
 							return Nan::Null();
 						}
 						length = source[position++] << 8;
@@ -88,17 +100,16 @@ public:
 						break;
 					case 0x1a:
 						if (position + 4 > size) {
-							Nan::ThrowError("Unexpected end of buffer");
+							Nan::ThrowError("Unexpected end of buffer reading string");
 							return Nan::Null();
 						}
 						length = source[position++] << 24;
 						length += source[position++] << 16;
 						length += source[position++] << 8;
 						length += source[position++];
-						position += 4;
 						break;
 					case 0x1b:
-						Nan::ThrowError("Too large of string/buffer");
+						Nan::ThrowError("Unexpected end of buffer reading string");
 						return Nan::Null();
 						break;
 					default:
@@ -134,8 +145,14 @@ public:
 				}
 			}
 		}
-		if (lastStringEnd)
+
+		if (lastStringEnd) {
+			if (writePosition == 0)
+				return String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
 			target[writePosition++] = String::NewFromOneByte(isolate, (uint8_t*) source + stringStart, v8::NewStringType::kNormal, lastStringEnd - stringStart).ToLocalChecked();
+		} else if (writePosition == 1) {
+			return target[0];
+		}
 #if NODE_VERSION_AT_LEAST(12,0,0)
 		return Array::New(isolate, target, writePosition);
 #else
@@ -149,11 +166,7 @@ public:
 	}
 };
 
-#ifdef thread_local
 static thread_local Extractor* extractor;
-#else
-static Extractor* extractor;
-#endif
 
 NAN_METHOD(extractStrings) {
 	Local<Context> context = Nan::GetCurrentContext();