@eosrio/node-abieos 2.1.1 → 2.2.0

package/README.md

@@ -39,5 +39,8 @@ env setup instructions soon
 ```shell script
 git clone https://github.com/eosrio/node-abieos.git
 cd node-abieos
-npm run build
+# linux
+npm run build:linux
+# windows
+npm run build:win
 ```

package/lib/abieos.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="node" />
+declare let abieos: any | null;
+export declare class Abieos {
+    private static instance;
+    static native: typeof abieos;
+    private constructor();
+    static getInstance(): Abieos;
+    stringToName(nameString: string): BigInteger;
+    jsonToHex(contractName: string, type: string, json: string | object): string;
+    hexToJson(contractName: string, type: string, hex: string): string;
+    binToJson(contractName: string, type: string, buffer: Buffer): string;
+    loadAbi(contractName: string, abi: string | object): boolean;
+    loadAbiHex(contractName: string, abihex: string): boolean;
+    getTypeForAction(contractName: string, actionName: string): string;
+    getTypeForTable(contractName: string, table_name: string): string;
+    deleteContract(contractName: string): boolean;
+}
+export {};
+//# sourceMappingURL=abieos.d.ts.map

package/lib/abieos.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abieos.d.ts","sourceRoot":"","sources":["abieos.ts"],"names":[],"mappings":";AAMA,QAAA,IAAI,MAAM,EAAE,GAAG,GAAG,IAAW,CAAC;AAQ9B,qBAAa,MAAM;IACf,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAc,MAAM,EAAE,OAAO,MAAM,CAAC;IAEpC,OAAO;WAIO,WAAW,IAAI,MAAM;IAO5B,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;IAI5C,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAU5E,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAalE,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAarE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAY5D,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAIzD,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IASlE,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IASjE,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;CAGvD"}

package/lib/abieos.js

@@ -0,0 +1,100 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+let modulePath = "../dist/abieos.node";
+let abieos = null;
+if (process.platform === 'linux') {
+    abieos = require(modulePath);
+}
+else if (process.platform === 'win32') {
+    throw new Error(`${process.platform} is not supported by node-abieos`);
+    abieos = null;
+}
+export class Abieos {
+    constructor() {
+        Abieos.native = abieos;
+    }
+    static getInstance() {
+        if (!Abieos.instance) {
+            Abieos.instance = new Abieos();
+        }
+        return Abieos.instance;
+    }
+    stringToName(nameString) {
+        return Abieos.native.string_to_name(nameString);
+    }
+    jsonToHex(contractName, type, json) {
+        const jsonData = typeof json === 'object' ? JSON.stringify(json) : json;
+        const data = Abieos.native.json_to_hex(contractName, type, jsonData);
+        if (data === 'PARSING_ERROR') {
+            throw new Error('failed to parse data');
+        }
+        else {
+            return data;
+        }
+    }
+    hexToJson(contractName, type, hex) {
+        const data = Abieos.native.hex_to_json(contractName, type, hex);
+        if (data) {
+            try {
+                return JSON.parse(data);
+            }
+            catch (e) {
+                throw new Error('failed to parse json string: ' + data);
+            }
+        }
+        else {
+            throw new Error('failed to parse hex data');
+        }
+    }
+    binToJson(contractName, type, buffer) {
+        const data = Abieos.native.bin_to_json(contractName, type, buffer);
+        if (data[0] === '{' || data[0] === '[') {
+            try {
+                return JSON.parse(data);
+            }
+            catch (e) {
+                throw new Error('json parse error');
+            }
+        }
+        else {
+            throw new Error(data);
+        }
+    }
+    loadAbi(contractName, abi) {
+        if (typeof abi === 'string') {
+            return Abieos.native.load_abi(contractName, abi);
+        }
+        else {
+            if (typeof abi === 'object') {
+                return Abieos.native.load_abi(contractName, JSON.stringify(abi));
+            }
+            else {
+                throw new Error('ABI must be a String or Object');
+            }
+        }
+    }
+    loadAbiHex(contractName, abihex) {
+        return Abieos.native.load_abi_hex(contractName, abihex);
+    }
+    getTypeForAction(contractName, actionName) {
+        const result = Abieos.native.get_type_for_action(contractName, actionName);
+        if (result === 'NOT_FOUND') {
+            throw new Error('action ' + actionName + ' not found on contract ' + contractName);
+        }
+        else {
+            return result;
+        }
+    }
+    getTypeForTable(contractName, table_name) {
+        const result = Abieos.native.get_type_for_table(contractName, table_name);
+        if (result === 'NOT_FOUND') {
+            throw new Error('table ' + table_name + ' not found on contract ' + contractName);
+        }
+        else {
+            return result;
+        }
+    }
+    deleteContract(contractName) {
+        return Abieos.native.delete_contract(contractName);
+    }
+}

package/lib/abieos.ts

@@ -0,0 +1,107 @@
+import {createRequire} from 'module';
+import {type} from "os";
+
+const require = createRequire(import.meta.url);
+
+let modulePath = "../dist/abieos.node";
+let abieos: any | null = null;
+if (process.platform === 'linux') {
+    abieos = require(modulePath);
+} else if (process.platform === 'win32') {
+    throw new Error(`${process.platform} is not supported by node-abieos`);
+    abieos = null;
+}
+
+export class Abieos {
+    private static instance: Abieos;
+    public static native: typeof abieos;
+
+    private constructor() {
+        Abieos.native = abieos;
+    }
+
+    public static getInstance(): Abieos {
+        if (!Abieos.instance) {
+            Abieos.instance = new Abieos();
+        }
+        return Abieos.instance;
+    }
+
+    public stringToName(nameString: string): BigInteger {
+        return Abieos.native.string_to_name(nameString) as BigInteger;
+    }
+
+    public jsonToHex(contractName: string, type: string, json: string | object): string {
+        const jsonData = typeof json === 'object' ? JSON.stringify(json) : json
+        const data: string = Abieos.native.json_to_hex(contractName, type, jsonData);
+        if (data === 'PARSING_ERROR') {
+            throw new Error('failed to parse data');
+        } else {
+            return data;
+        }
+    }
+
+    public hexToJson(contractName: string, type: string, hex: string): string {
+        const data = Abieos.native.hex_to_json(contractName, type, hex);
+        if (data) {
+            try {
+                return JSON.parse(data);
+            } catch (e) {
+                throw new Error('failed to parse json string: ' + data);
+            }
+        } else {
+            throw new Error('failed to parse hex data');
+        }
+    }
+
+    public binToJson(contractName: string, type: string, buffer: Buffer): string {
+        const data = Abieos.native.bin_to_json(contractName, type, buffer);
+        if (data[0] === '{' || data[0] === '[') {
+            try {
+                return JSON.parse(data);
+            } catch (e) {
+                throw new Error('json parse error');
+            }
+        } else {
+            throw new Error(data);
+        }
+    }
+
+    public loadAbi(contractName: string, abi: string | object): boolean {
+        if (typeof abi === 'string') {
+            return Abieos.native.load_abi(contractName, abi) as boolean;
+        } else {
+            if (typeof abi === 'object') {
+                return Abieos.native.load_abi(contractName, JSON.stringify(abi)) as boolean;
+            } else {
+                throw new Error('ABI must be a String or Object');
+            }
+        }
+    }
+
+    public loadAbiHex(contractName: string, abihex: string): boolean {
+        return Abieos.native.load_abi_hex(contractName, abihex) as boolean;
+    }
+
+    public getTypeForAction(contractName: string, actionName: string): string {
+        const result = Abieos.native.get_type_for_action(contractName, actionName);
+        if (result === 'NOT_FOUND') {
+            throw new Error('action ' + actionName + ' not found on contract ' + contractName);
+        } else {
+            return result;
+        }
+    }
+
+    public getTypeForTable(contractName: string, table_name: string): string {
+        const result = Abieos.native.get_type_for_table(contractName, table_name);
+        if (result === 'NOT_FOUND') {
+            throw new Error('table ' + table_name + ' not found on contract ' + contractName);
+        } else {
+            return result;
+        }
+    }
+
+    public deleteContract(contractName: string): boolean {
+        return Abieos.native.delete_contract(contractName) as boolean;
+    }
+}

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@eosrio/node-abieos",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Node Bindings for abieos: Binary <> JSON conversion using ABIs.",
-  "main": "abieos.js",
-  "typings": "abieos.d.ts",
+  "main": "./lib/abieos.js",
+  "typings": "./lib/abieos.d.ts",
   "scripts": {
     "install": "node -e 'process.exit(0)'",
-    "build": "cmake-js compile --cc /usr/bin/clang --cxx /usr/bin/clang++ && cp build/Release/node_abieos.node dist/abieos.node"
+    "test": "cd examples && node basic.js",
+    "tsc:watch": "tsc --watch",
+    "build:linux": "cmake-js compile --cc /usr/bin/clang --cxx /usr/bin/clang++ && cp build/Release/node_abieos.node dist/abieos.node",
+    "build:win": "cmake-js"
   },
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/eosrio/node-abieos.git"
@@ -19,13 +23,14 @@
   },
   "homepage": "https://github.com/eosrio/node-abieos#readme",
   "devDependencies": {
-    "node-addon-api": "^3.2.1",
-    "cmake-js": "^6.1.0",
-    "@types/node": "^15.12.2"
+    "node-addon-api": "^5.0.0",
+    "cmake-js": "^7.0.0",
+    "@types/node": "^18.11.0",
+    "typescript": "^4.8.4"
   },
   "cmake-js": {
     "runtime": "node",
-    "runtimeVersion": "16.0.0",
+    "runtimeVersion": "18.0.0",
     "arch": "x64"
   }
 }

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/node-abieos.iml" filepath="$PROJECT_DIR$/.idea/node-abieos.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/node-abieos.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/vcs.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/external/date" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/external/rapidjson" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/external/rapidjson/thirdparty/gtest" vcs="Git" />
-  </component>
-</project>

package/.idea/workspace.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="24cd1727-69ec-448f-8093-325f7373674c" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="ROOT_SYNC" value="DONT_SYNC" />
-  </component>
-  <component name="MacroExpansionManager">
-    <option name="directoryName" value="p126c0rw" />
-  </component>
-  <component name="ProjectId" id="1tcablyCLJIu0scVOq9ZAxLEPB7" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/external/rapid_json" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\GitHub\node-abieos\external\rapid_json" />
-      <recent name="C:\GitHub\node-abieos\src" />
-      <recent name="C:\GitHub\node-abieos" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\GitHub\node-abieos\include" />
-      <recent name="C:\GitHub\node-abieos\external_includes" />
-    </key>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="24cd1727-69ec-448f-8093-325f7373674c" name="Changes" comment="" />
-      <created>1623070905388</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1623070905388</updated>
-      <workItem from="1623070906565" duration="179000" />
-      <workItem from="1623071181018" duration="5026000" />
-      <workItem from="1623138029252" duration="11000" />
-      <workItem from="1623321973087" duration="130000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>

package/CMakeLists.txt

@@ -1,35 +0,0 @@
-cmake_minimum_required (VERSION 3.11)
-project(node_abieos VERSION 2.1 LANGUAGES CXX C)
-
-add_definitions(-DNAPI_VERSION=6)
-add_definitions(-DNAPI_EXPERIMENTAL)
-
-include_directories(${CMAKE_JS_INC})
-
-set(default_build_type "Release")
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
-
-option(ABIEOS_NO_INT128 "disable use of __int128" OFF)
-
-find_package(Threads)
-
-add_library(abieos STATIC src/abi.cpp src/crypto.cpp include/eosio/fpconv.c)
-target_include_directories(abieos PUBLIC include)
-
-if(ABIEOS_NO_INT128)
-target_compile_definitions(abieos PUBLIC ABIEOS_NO_INT128)
-endif()
-
-set_target_properties(abieos PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(${PROJECT_NAME} SHARED src/main.cpp src/abieos.cpp)
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
-target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB};abieos;${CMAKE_THREAD_LIBS_INIT})
-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wno-unused-parameter -fcolor-diagnostics)
-
-execute_process(COMMAND node -p "require('node-addon-api').include" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE NODE_ADDON_API_DIR)
-string(REPLACE "\n" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
-string(REPLACE "\"" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE ${NODE_ADDON_API_DIR})

package/abieos.d.ts

@@ -1,21 +0,0 @@
-declare namespace abieos {
-    function string_to_name(name_string: string): BigInteger;
-
-    function json_to_hex(contract_name: string, type: string, json: string | object): string;
-
-    function hex_to_json(contract_name: string, type: string, hex: string): string;
-
-    function bin_to_json(contract_name: string, type: string, buffer: Buffer): string;
-
-    function load_abi(contract_name: string, abi: string): boolean;
-
-    function load_abi_hex(contract_name: string, abihex: string): boolean;
-
-    function get_type_for_action(contract_name: string, action_name: string): string;
-
-    function get_type_for_table(contract_name: string, table_name: string): string;
-
-    function delete_contract(contract_name: string): boolean;
-}
-
-export = abieos;

package/abieos.js

@@ -1,59 +0,0 @@
-if (process.platform === 'linux') {
-    const abieos = require('./dist/abieos.node');
-    module.exports = {
-        json_to_hex: (contract_name, type, json) => {
-            const data = abieos.json_to_hex(contract_name, type, typeof json === 'object' ? JSON.stringify(json) : json);
-            if (data === 'PARSING_ERROR') {
-                throw new Error('failed to parse data');
-            } else {
-                return data;
-            }
-        },
-        string_to_name: abieos.string_to_name,
-        hex_to_json: (contract_name, type, hex) => {
-            const data = abieos.hex_to_json(contract_name, type, hex);
-            if (data) {
-                try {
-                    return JSON.parse(data);
-                } catch (e) {
-                    throw new Error('failed to parse json string: ' + data);
-                }
-            } else {
-                throw new Error('failed to parse hex data');
-            }
-        },
-        bin_to_json: (contract_name, type, buffer) => {
-            const data = abieos.bin_to_json(contract_name, type, buffer);
-            if (data[0] === '{' || data[0] === '[') {
-                try {
-                    return JSON.parse(data);
-                } catch (e) {
-                    throw new Error('json parse error');
-                }
-            } else {
-                throw new Error(data);
-            }
-        },
-        load_abi: abieos.load_abi,
-        load_abi_hex: abieos.load_abi_hex,
-        get_type_for_action: (contract_name, action_name) => {
-            const result = abieos.get_type_for_action(contract_name, action_name);
-            if (result === 'NOT_FOUND') {
-                throw new Error('action ' + action_name + ' not found on contract ' + contract_name);
-            } else {
-                return result;
-            }
-        },
-        get_type_for_table: (contract_name, table_name) => {
-            const result = abieos.get_type_for_table(contract_name, table_name);
-            if (result === 'NOT_FOUND') {
-                throw new Error('table ' + table_name + ' not found on contract ' + contract_name);
-            } else {
-                return result;
-            }
-        },
-        delete_contract: abieos.delete_contract,
-    };
-} else {
-    module.exports = null;
-}