update to v0.1.3 (#4)

* feat: custom error support. * refactor: example nodejs * test: update example webpage Co-authored-by: k-matsuzawa <[email protected]>
p2pderivatives · Jul 30, 2020 · 09475b9 · 09475b9
1 parent 95d7fa2
commit 09475b9
Show file tree

Hide file tree

Showing 63 changed files with 4,107 additions and 1,480 deletions.
diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -16,6 +16,10 @@ jobs:
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: check package.json version
+      env:
+        version: ${{ steps.get_version.outputs.VERSION }}
+      run: node ./tools/checker.js version ${version}
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1

diff --git a/cfdjs_wasm_json.js b/cfdjs_wasm_json.js
@@ -7,15 +7,16 @@ cfdjsWasm['onRuntimeInitialized'] = async () => {
   const funcNameResult = await cfdjsWasmJsonApi.ccallCfd(cfdjsWasm,
       cfdjsWasm._cfdjsGetJsonApiNames, 'string', [], []);
   if (funcNameResult.indexOf('Error:') >= 0) {
-    throw new Error(`cfdjsGetJsonApiNames internal error. ${funcNameResult}`);
+    throw new cfdjsWasmJsonApi.CfdError(
+        `cfdjsGetJsonApiNames internal error. ${funcNameResult}`);
   }
   const funcList = funcNameResult.split(',');
 
   // register function list
   funcList.forEach((requestName) => {
     const hook = async function(...args) {
       if (args.length > 1) {
-        throw Error('ERROR: Invalid argument passed:' +
+        throw new cfdjsWasmJsonApi.CfdError('ERROR: Invalid argument passed:' +
           `func=[${requestName}], args=[${args}]`);
       }
       let arg = '';
@@ -41,3 +42,4 @@ cfdjsWasm['onRuntimeInitialized'] = async () => {
 };
 
 module.exports = wrappedModule;
+module.exports.CfdError = cfdjsWasmJsonApi.CfdError;
diff --git a/cfdjs_wasm_json_wrap.js b/cfdjs_wasm_json_wrap.js
@@ -1,18 +1,30 @@
 const cfdjsWasmJson = require('./cfdjs_wasm_json.js');
 
 const wrappedModule = {};
+let hasLoaded = false;
 cfdjsWasmJson['onRuntimeInitialized'] = async () => {
   if ('onRuntimeInitialized' in wrappedModule) {
     wrappedModule.onRuntimeInitialized();
   }
+  hasLoaded = true;
 };
 
 wrappedModule['addInitializedListener'] = function(func) {
-  wrappedModule['onRuntimeInitialized'] = func;
+  if (hasLoaded) {
+    if (func) func();
+  } else {
+    wrappedModule['onRuntimeInitialized'] = func;
+  }
 };
 
 wrappedModule['getCfd'] = function() {
   return cfdjsWasmJson;
 };
 
+wrappedModule['hasLoadedWasm'] = function() {
+  return hasLoaded;
+};
+
+wrappedModule['CfdError'] = cfdjsWasmJson.CfdError;
+
 module.exports = wrappedModule;
diff --git a/cfdjs_wasm_jsonapi.js b/cfdjs_wasm_jsonapi.js
@@ -1,3 +1,46 @@
+/**
+ * cfd error class.
+ */
+class CfdError extends Error {
+  /**
+   * constructor.
+   * @param {string} message error message.
+   * @param {*} errorInformation error information object.
+   * @param {Error} cause cause error.
+   */
+  constructor(message, errorInformation = undefined, cause = undefined) {
+    super((!errorInformation) ?
+      message : message + JSON.stringify(errorInformation));
+    this.name = 'CfdError';
+    this.errorInformation = errorInformation;
+    this.cause = cause;
+  }
+  // eslint-disable-next-line valid-jsdoc
+  /**
+   * error object string.
+   * @return message string.
+   */
+  toString() {
+    return `${this.name}: ${this.message}`;
+  }
+  // eslint-disable-next-line valid-jsdoc
+  /**
+   * get error information.
+   * @return InnerErrorResponse object.
+   */
+  getErrorInformation() {
+    return this.errorInformation;
+  }
+  // eslint-disable-next-line valid-jsdoc
+  /**
+   * get error cause.
+   * @return Error or undefined.
+   */
+  getCause() {
+    return this.cause;
+  }
+}
+
 const ccallCfd = async function(module, func, returnType, argTypes, args) {
   const UTF8Decoder = typeof TextDecoder !== 'undefined' ? new TextDecoder('utf8') : undefined;
   const stringToUTF8Array = function(str, heap, outIdx, maxBytesToWrite) {
@@ -149,12 +192,12 @@ const callJsonApi = async function(wasmModule, reqName, arg) {
     retObj = JSON.parse(retJson);
   } catch (err) {
     console.log(err);
-    throw new Error('ERROR: Invalid function call:' +
-      ` func=[${reqName}], args=[${args}]`);
+    throw new CfdError('ERROR: Invalid function call:' +
+      ` func=[${reqName}], arg=[${arg}]`, undefined, err);
   }
 
   if (retObj.hasOwnProperty('error')) {
-    throw new Error(JSON.stringify(retObj.error));
+    throw new CfdError('', retObj.error);
   }
   return retObj;
 };
@@ -167,6 +210,7 @@ if (PLATFORM_IS_NODE) {
     module['exports'] = {
       callJsonApi: callJsonApi,
       ccallCfd: ccallCfd,
+      CfdError: CfdError,
     };
   }
 }
diff --git a/dist/cfdjs_wasm.js b/dist/cfdjs_wasm.js
diff --git a/dist/cfdjs_wasm.wasm b/dist/cfdjs_wasm.wasm
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       target: cfdWasmBuilder
     environment:
       WASM_SRC: /private/cfd-js-wasm
-      WASM_WORK: /private/work
+      WASM_WORK: /private/work/cfd-js-wasm
     working_dir: /private/cfd-js-wasm
     volumes:
       - /private/work

diff --git a/example/createaddress.js b/example/createaddress.js
@@ -54,14 +54,25 @@ const updateField = async function(event) {
   }
 }
 
+const decodeBtnField = document.getElementById("execDecode");
+decodeBtnField.addEventListener('click', updateField);
+
 Module['onRuntimeInitialized'] = async function(){
+  const decoded = document.getElementById("decoded");
   if (Module['_cfdjsJsonApi']) {
-    const decodeBtn = document.getElementById("execDecode");
-    decodeBtn.addEventListener('click', updateField);
     console.log("exist cfdjsJsonApi.");
+    decoded.value = "";
   } else {
     console.log("cfdjsJsonApi not found!");
-    const decoded = document.getElementById("decoded");
     decoded.value = "WebAssembly load fail.";
   }
 }
+
+window.onload = function() {
+  const decoded = document.getElementById("decoded");
+  if (Module['_cfdjsJsonApi']) {
+    decoded.value = "";
+  } else {
+    decoded.value = "WebAssembly loading...";
+  }
+}
diff --git a/example/decodeaddress.js b/example/decodeaddress.js
@@ -33,21 +33,33 @@ const updateField = async function(event) {
     const resp = await callJsonApi(Module, 'GetAddressInfo', req);
     if (confidentialKey.length > 0) {
       resp['confidentialKey'] = confidentialKey;
+      resp['address'] = address;
     }
     decoded.value = JSON.stringify(resp, null, '  ');
   } catch (e) {
     decoded.value = 'Invalid address format';
   }
 }
 
+const decodeBtnField = document.getElementById("execDecode");
+decodeBtnField.addEventListener('click', updateField);
+
 Module['onRuntimeInitialized'] = async function(){
+  const decoded = document.getElementById("decoded");
   if (Module['_cfdjsJsonApi']) {
-    const decodeBtn = document.getElementById("execDecode");
-    decodeBtn.addEventListener('click', updateField);
     console.log("exist cfdjsJsonApi.");
+    decoded.value = "";
   } else {
     console.log("cfdjsJsonApi not found!");
-    const decoded = document.getElementById("decoded");
     decoded.value = "WebAssembly load fail.";
   }
 }
+
+window.onload = function() {
+  const decoded = document.getElementById("decoded");
+  if (Module['_cfdjsJsonApi']) {
+    decoded.value = "";
+  } else {
+    decoded.value = "WebAssembly loading...";
+  }
+}
diff --git a/example/decoderawtransaction.js b/example/decoderawtransaction.js
@@ -44,14 +44,25 @@ const updateField = async function(event) {
   }
 }
 
+const decodeBtnField = document.getElementById("execDecode");
+decodeBtnField.addEventListener('click', updateField);
+
 Module['onRuntimeInitialized'] = async function(){
+  const decoded = document.getElementById("decodedtx");
   if (Module['_cfdjsJsonApi']) {
-    const decodeBtn = document.getElementById("execDecode");
-    decodeBtn.addEventListener('click', updateField);
     console.log("exist cfdjsJsonApi.");
+    decoded.value = "";
   } else {
     console.log("cfdjsJsonApi not found!");
-    const decodedtx = document.getElementById("decodedtx");
-    decodedtx.value = "WebAssembly load fail.";
+    decoded.value = "WebAssembly load fail.";
+  }
+}
+
+window.onload = function() {
+  const decoded = document.getElementById("decodedtx");
+  if (Module['_cfdjsJsonApi']) {
+    decoded.value = "";
+  } else {
+    decoded.value = "WebAssembly loading...";
   }
 }
diff --git a/example/decodescript.js b/example/decodescript.js
@@ -13,14 +13,25 @@ const updateField = async function(event) {
   }
 }
 
+const decodeBtnField = document.getElementById("execDecode");
+decodeBtnField.addEventListener('click', updateField);
+
 Module['onRuntimeInitialized'] = async function(){
+  const decoded = document.getElementById("decoded");
   if (Module['_cfdjsJsonApi']) {
-    const decodeBtn = document.getElementById("execDecode");
-    decodeBtn.addEventListener('click', updateField);
     console.log("exist cfdjsJsonApi.");
+    decoded.value = "";
   } else {
     console.log("cfdjsJsonApi not found!");
-    const decoded = document.getElementById("decoded");
     decoded.value = "WebAssembly load fail.";
   }
 }
+
+window.onload = function() {
+  const decoded = document.getElementById("decoded");
+  if (Module['_cfdjsJsonApi']) {
+    decoded.value = "";
+  } else {
+    decoded.value = "WebAssembly loading...";
+  }
+}
diff --git a/example/dumpprivkey.html b/example/dumpprivkey.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Dump Privkey</title>
+    <style>
+      #main {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 120vh;
+        font-family: sans-serif;
+      }
+      .decodeInput {
+        width: 99%;
+      }
+      .decodeOutput {
+        width: 99%;
+      }
+      .decodetx-output {
+        vertical-align: top;
+        margin-top: 13px;
+      }
+      h1 {
+        font-size: 32px;
+      }
+      h2 {
+        font-size: 20px;
+        font-weight: bold;
+      }
+      h3 {
+        font-size: 16px;
+        margin-bottom: 0px;
+        padding-bottom: 0px;
+      }
+      .xpubkey-label {
+        font-size: 12px;
+        display: inline-block;
+        width: 8em;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="decode">
+      <h3 class="decode-title">Dump Privkey</h3>
+      <div class="decode-input">
+        <div>
+          <div class="decode-label">Input privkey:</div>
+          <textarea rows="3" id="inputData" class="decodeInput"></textarea><br>
+          <input type="button" name="decode" id="execDecode" value="Parse" />
+        </div>
+        <div class="decode-output">
+          <div class="decode-label">Key Info:</div>
+          <textarea rows="11" id="decoded" class="decodeOutput" readonly></textarea>
+        </div>
+      </div>
+    </div>
+
+    <script src="/cfd-js-wasm/dist/cfdjs_wasm.js"></script>
+    <script src="/cfd-js-wasm/cfdjs_wasm_jsonapi.js"></script>
+    <script src="dumpprivkey.js"></script>
+    <p><a href="index.html">back</a></p>
+  </body>
+</html>