asherah 1.1.1 → 1.2.0

package/.asherah-version

@@ -1 +1 @@
-ASHERAH_VERSION=v0.4.7
+ASHERAH_VERSION=v0.4.14

package/dist/asherah.js

@@ -1,21 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encrypt_string = exports.decrypt_string = exports.encrypt = exports.decrypt = exports.shutdown = exports.setup = void 0;
 const cobhan_1 = require("cobhan");
-const fs_1 = __importDefault(require("fs"));
-const ref_napi_1 = __importDefault(require("ref-napi"));
-const binaries_path = find_binaries();
-const libasherah = (0, cobhan_1.load_platform_library)(binaries_path, 'libasherah', {
-    'SetupJson': [ref_napi_1.default.types.int32, [ref_napi_1.default.refType(ref_napi_1.default.types.void)]],
-    'EncryptToJson': [ref_napi_1.default.types.int32, [ref_napi_1.default.refType(ref_napi_1.default.types.void), ref_napi_1.default.refType(ref_napi_1.default.types.void), ref_napi_1.default.refType(ref_napi_1.default.types.void)]],
-    'DecryptFromJson': [ref_napi_1.default.types.int32, [ref_napi_1.default.refType(ref_napi_1.default.types.void), ref_napi_1.default.refType(ref_napi_1.default.types.void), ref_napi_1.default.refType(ref_napi_1.default.types.void)]],
-    'Shutdown': [ref_napi_1.default.types.void, []]
-});
-const DecryptFromJson = libasherah["DecryptFromJson"];
-const EncryptToJson = libasherah["EncryptToJson"];
+const napi_asherah = require('../build/Release/napiasherah.node');
 const EstimatedEncryptionOverhead = 48;
 const EstimatedEnvelopeOverhead = 185;
 const Base64Overhead = 1.34;
@@ -24,33 +11,24 @@ function estimate_buffer(dataLen, partitionLen) {
     const estimatedDataLen = (dataLen + EstimatedEncryptionOverhead) * Base64Overhead;
     return EstimatedEnvelopeOverhead + EstimatedIntermediateKeyOverhead + partitionLen + estimatedDataLen;
 }
-function find_binaries() {
-    if (fs_1.default.existsSync('node_modules/asherah/binaries')) {
-        return 'node_modules/asherah/binaries';
-    }
-    if (fs_1.default.existsSync('binaries')) {
-        return 'binaries';
-    }
-    throw new Error("Could not locate Asherah binaries!");
-}
 function setup(config) {
     const configJsonBuffer = (0, cobhan_1.json_to_cbuffer)(config);
     EstimatedIntermediateKeyOverhead = config.ProductID.length + config.ServiceName.length;
-    const result = libasherah.SetupJson(configJsonBuffer);
+    const result = napi_asherah.Napi_SetupJson(configJsonBuffer);
     if (result < 0) {
         throw new Error('setupJson failed: ' + result);
     }
 }
 exports.setup = setup;
 function shutdown() {
-    libasherah.Shutdown();
+    napi_asherah.Napi_Shutdown();
 }
 exports.shutdown = shutdown;
 function decrypt(partitionId, dataRowRecord) {
     const partitionIdBuffer = (0, cobhan_1.string_to_cbuffer)(partitionId);
     const jsonBuffer = (0, cobhan_1.string_to_cbuffer)(dataRowRecord);
     const outputDataBuffer = (0, cobhan_1.allocate_cbuffer)(jsonBuffer.byteLength);
-    const result = DecryptFromJson(partitionIdBuffer, jsonBuffer, outputDataBuffer);
+    const result = napi_asherah.Napi_DecryptFromJson(partitionIdBuffer, jsonBuffer, outputDataBuffer);
     if (result < 0) {
         throw new Error('decrypt failed: ' + result);
     }
@@ -61,7 +39,7 @@ function encrypt(partitionId, data) {
     const partitionIdBuffer = (0, cobhan_1.string_to_cbuffer)(partitionId);
     const dataBuffer = (0, cobhan_1.buffer_to_cbuffer)(data);
     const outputJsonBuffer = (0, cobhan_1.allocate_cbuffer)(estimate_buffer(data.byteLength, partitionId.length));
-    const result = EncryptToJson(partitionIdBuffer, dataBuffer, outputJsonBuffer);
+    const result = napi_asherah.Napi_EncryptToJson(partitionIdBuffer, dataBuffer, outputJsonBuffer);
     if (result < 0) {
         throw new Error('encrypt failed: ' + result);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asherah",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Asherah envelope encryption and key rotation library",
   "main": "dist/asherah.js",
   "repository": {
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "build": "npx tsc",
-    "postinstall": "scripts/download-binaries.sh",
+    "preinstall": "scripts/download-libraries.sh && node-gyp configure && node-gyp build",
     "test:mocha": "mocha",
     "test": "nyc npm run test:mocha",
     "posttest": "npm run lint",
@@ -21,6 +21,7 @@
   "files": [
     "dist/asherah.d.ts",
     "scripts/download-binaries.sh",
+    "build/Release/napi-asherah.node",
     "SHA256SUMS",
     "SHA256SUMS-darwin",
     ".asherah-version"
@@ -53,6 +54,6 @@
   "types": "dist/asherah.d.ts",
   "dependencies": {
     "cobhan": "^1.0.35",
-    "ref-napi": "^3.0.3"
+    "node-addon-api": "*"
   }
 }

package/scripts/download-binaries.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-echo "Downloading Asherah binaries"
-
-source .asherah-version
-
-rm -rf binaries
-mkdir binaries
-cd binaries || exit 1
-
-OS=$(uname)
-MACHINE=$(uname -m)
-
-if [[ "${OS}" == 'Linux' ]]; then
-  if [[ ${MACHINE} == 'x86_64' ]]; then
-    echo "Linux x64"
-    FILENAME=libasherah-x64.so
-    SUMS=../SHA256SUMS
-  elif [[ ${MACHINE} == 'aarch64' ]]; then
-    echo "Linux arm64"
-    FILENAME=libasherah-arm64.so
-    SUMS=../SHA256SUMS
-  else
-    echo "Unsupported CPU architecture"
-    exit 1
-  fi
-elif [[ ${OS} == 'Darwin' ]]; then
-  if [[ ${MACHINE} == 'x86_64' ]]; then
-    echo "MacOS x64"
-    FILENAME=libasherah-x64.dylib
-    SUMS=../SHA256SUMS-darwin
-  elif [[ ${MACHINE} == 'arm64' ]]; then
-    echo "MacOS arm64"
-    FILENAME=libasherah-arm64.dylib
-    SUMS=../SHA256SUMS-darwin
-  else
-    echo "Unsupported CPU architecture"
-    exit 1
-  fi
-else
-  echo "Unsupported operating system"
-  exit 1
-fi
-
-curl -s -L --fail -O --retry 999 --retry-max-time 0 "https://github.com/godaddy/asherah-cobhan/releases/download/${ASHERAH_VERSION}/${FILENAME}"
-grep "${FILENAME}" "${SUMS}" > ./SHA256SUM
-shasum -a 256 -c ./SHA256SUM || (echo 'SHA256 mismatch!' ; rm -f ./*.so ./*.dylib ; exit 1)