trac-peer 0.0.85 → 0.0.86

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "type": "module",
   "dependencies": {
+    "trac-wallet": "^0.0.33",
     "autobase": "7.0.45",
     "b4a": "1.6.7",
     "bip39": "^3.1.0",
@@ -23,12 +24,11 @@
     "ready-resource": "^1.0.0",
     "safety-catch": "1.0.2",
     "sodium-native": "^4.3.3",
-    "trac-wallet": "^0.0.32",
     "xache": "1.2.0",
     "bare-assert": "^1.0.2",
     "bare-buffer": "^3.1.2",
     "bare-console": "^6.0.1",
-    "bare-crypto": "^1.4.1",
+    "bare-crypto": "^1.4.2",
     "bare-events": "^2.5.4",
     "bare-fs": "^4.0.2",
     "bare-http1": "^4.0.2",
@@ -44,22 +44,23 @@
     "bare-subprocess": "^5.0.3",
     "bare-timers": "^3.0.1",
     "bare-tls": "^2.0.2",
-    "bare-tty": "^5.0.2",
+    "bare-tty": "^3.2.0",
     "bare-url": "^2.1.4",
     "bare-utils": "^1.2.0",
     "bare-worker": "^3.0.0",
     "bare-zlib": "^1.2.5",
+    "worker_threads": "npm:bare-node-worker-threads",
+    "crypto": "npm:bare-node-crypto",
     "assert": "npm:bare-node-assert",
     "buffer": "npm:bare-node-buffer",
     "child_process": "npm:bare-node-child-process",
     "console": "npm:bare-node-console",
-    "crypto": "npm:bare-node-crypto",
     "events": "npm:bare-node-events",
     "fs": "npm:bare-node-fs",
     "http": "npm:bare-node-http",
     "https": "npm:bare-node-https",
-    "inspector": "npm:bare-node-inspector",
     "module": "npm:bare-node-module",
+    "inspector": "npm:bare-node-inspector",
     "os": "npm:bare-node-os",
     "path": "npm:bare-node-path",
     "process": "npm:bare-node-process",
@@ -71,7 +72,6 @@
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",
-    "worker_threads": "npm:bare-node-worker-threads",
     "zlib": "npm:bare-node-zlib"
   },
   "publishConfig": {

package/src/check.js

@@ -1,5 +1,6 @@
 import Validator from 'fastest-validator';
 import WAValidator from 'multicoin-address-validator';
+import b4a from "b4a";
 
 class Check {
 
@@ -20,6 +21,15 @@ class Check {
                     if (false === result)
                         return false;
                     return true;
+                },
+                hexCheck : (value, errors) => {
+                    let buf = null
+                    let result = false
+                    try{
+                        buf = b4a.from(value, 'hex')
+                        result = value === b4a.toString(buf, 'hex')
+                    } catch (e) {}
+                    return result;
                 }
             }
         });
@@ -41,15 +51,9 @@ class Check {
         this.validator.add("is_hex", function({ schema, messages }, path, context) {
             return {
                 source: `
-                    let buf = null
-                    let result = false
-                    try{ 
-                        buf = Buffer.from(value, 'hex')
-                        result = value === buf.toString('hex')
-                     } catch (e) {}
-                    if (false === result)
-                        ${this.makeError({ type: "bufferedHex",  actual: "value", messages })}
-                    return value
+                    const result = context.customFunctions.hexCheck(value, errors);
+                    if(false === result) ${this.makeError({ type: "bufferedHex",  actual: "value", messages })}
+                    return value;
                 `
             };
         });

package/src/functions.js

@@ -1,3 +1,5 @@
+import b4a from "b4a";
+
 export function resolveNumberString(number, decimals){
     number = number + '';
     decimals = isNaN(decimals) ? 18 : parseInt(decimals);
@@ -76,8 +78,8 @@ export function restoreManifest(parsedManifest) {
             if(signer.namespace && signer.namespace.data &&signer.publicKey && signer.publicKey.data){
                 return {
                     ...signer,
-                    namespace: Buffer.from(signer.namespace.data),
-                    publicKey: Buffer.from(signer.publicKey.data),
+                    namespace: b4a.from(signer.namespace.data),
+                    publicKey: b4a.from(signer.publicKey.data),
                 }
             } else {
                 return signer;

package/src/index.js

@@ -3,6 +3,7 @@ import Autobase from 'autobase';
 import Hyperswarm from 'hyperswarm';
 import ReadyResource from 'ready-resource';
 import b4a from 'b4a';
+import sodium from 'sodium-native'
 import Hyperbee from 'hyperbee';
 import readline from 'readline';
 import tty from 'tty'
@@ -18,6 +19,9 @@ export {default as Contract} from "./contract.js";
 export {default as Feature} from "./feature.js";
 export {default as Wallet} from "./wallet.js";
 
+// removed until PEAR desktop bare-crypto package is fixed
+//import crypto from 'crypto'
+
 export class Peer extends ReadyResource {
 
     constructor(options = {}) {
@@ -41,8 +45,8 @@ export class Peer extends ReadyResource {
         this.features = options.features || [];
         this.protocol_instance = null;
         this.contract_instance = null;
-        this.channel = Buffer.alloc(32).fill(options.channel) || null;
-        this.tx_channel = Buffer.alloc(32).fill(options.tx_channel) || null;
+        this.channel = b4a.alloc(32).fill(options.channel) || null;
+        this.tx_channel = b4a.alloc(32).fill(options.tx_channel) || null;
         this.bee = null;
         this.replicate = options.replicate !== false;
         this.connectedNodes = 1;
@@ -130,7 +134,7 @@ export class Peer extends ReadyResource {
                             null !== str_value &&
                             null !== chat_status &&
                             null === await batch.get('sh/'+op.hash) &&
-                            Buffer.byteLength(str_value) <= 10_2400 &&
+                            b4a.byteLength(str_value) <= 10_2400 &&
                             chat_status.value === 'on' &&
                             false !== await _this.contract_instance.execute(op, node, batch)){
                             let len = await batch.get('msgl');
@@ -238,7 +242,7 @@ export class Peer extends ReadyResource {
                         console.log(`Writer auto added: ${op.key}`);
                     } else if (op.type === 'addAdmin') {
                         if(false === this.check.key(op)) continue;
-                        const bootstrap = Buffer(node.from.key).toString('hex')
+                        const bootstrap = b4a.toString(node.from.key, 'hex')
                         if(null === await batch.get('admin') && bootstrap === _this.bootstrap){
                             await batch.put('admin', op.key);
                             console.log(`Admin added: ${op.key}`);
@@ -281,7 +285,7 @@ export class Peer extends ReadyResource {
                             null !== chat_status &&
                             chat_status.value === 'on' &&
                             null === await batch.get('sh/'+op.hash) &&
-                            Buffer.byteLength(str_value) <= 256 &&
+                            b4a.byteLength(str_value) <= 256 &&
                             visibleLength(op.value.dispatch.nick) <= 32){
                             const old = await batch.get('nick/'+op.value.dispatch.address);
                             if(old !== null){
@@ -508,12 +512,16 @@ export class Peer extends ReadyResource {
     }
 
     async createHash(type, message){
+        if(type === 'sha256'){
+            const out = b4a.alloc(sodium.crypto_hash_sha256_BYTES);
+            sodium.crypto_hash_sha256(out, b4a.from(message));
+            return b4a.toString(out, 'hex');
+        }
         let createHash = null;
-        if(typeof crypto.subtle !== 'undefined'){
+        if(global.Pear !== undefined){
             let _type = '';
             switch(type.toLowerCase()){
                 case 'sha1': _type = 'SHA-1'; break;
-                case 'sha256': _type = 'SHA-256'; break;
                 case 'sha384': _type = 'SHA-384'; break;
                 case 'sha512': _type = 'SHA-512'; break;
                 default: throw new Error('Unsupported algorithm.');
@@ -526,7 +534,7 @@ export class Peer extends ReadyResource {
                 .map((b) => b.toString(16).padStart(2, "0"))
                 .join("");
         } else {
-            return createHash(type).update(message).digest('hex')
+            return crypto.createHash(type).update(message).digest('hex')
         }
     }