@leofcoin/peernet 0.13.4 → 0.14.0

package/dist/commonjs/peernet.js

@@ -5,7 +5,6 @@ var PubSub = require('@vandeurenglenn/little-pubsub');
 var fetch = require('node-fetch');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 var MultiWallet = require('@leofcoin/multi-wallet');
-require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -282,6 +281,94 @@ class DhtEarth {
   }
 }
 
+var codecs = {
+  // just a hash
+  'disco-hash': {
+    codec: parseInt('30', 16),
+    hashAlg: 'dbl-keccak-256', // ,
+    // testnet: 'olivia'
+  },
+  'peernet-peer-response': {
+    codec: parseInt('707072', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-peer': {
+    codec: parseInt('7070', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht': {
+    codec: parseInt('706468', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht-response': {
+    codec: parseInt('706472', 16),
+    hashAlg: 'keccak-256',
+  },
+  // data
+  'peernet-data': {
+    codec: parseInt('706461', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-data-response': {
+    codec: parseInt('70646172', 16),
+    hashAlg: 'keccak-256',
+  },
+  // message
+  'peernet-message': {
+    codec: parseInt('706d65', 16),
+    hashAlg: 'keccak-256',
+  },
+  // pubsub
+  'peernet-ps': {
+    codec: parseInt('707073', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-response': {
+    codec: parseInt('7072', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-request': {
+    codec: parseInt('707271', 16),
+    hashAlg: 'keccak-256',
+  },
+  // normal block
+  'leofcoin-block': {
+    codec: parseInt('6c62', 16),
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  'leofcoin-tx': {
+    codec: parseInt('6c74', 16),
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // itx
+  'leofcoin-itx': {
+    codec: parseInt('6c69', 16),
+    hashAlg: 'keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // peer reputation
+  'leofcoin-pr': {
+    codec: parseInt('6c70', 16),
+    hashAlg: 'keccak-256', // ,
+    // testnet: 'olivia'
+  },
+  // chat message
+  'chat-message': {
+    codec: parseInt('636d', 16),
+    hashAlg: 'dbl-keccak-256',
+  },
+  'peernet-file' : {
+    codec: parseInt('7066', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-file-response' : {
+    codec: parseInt('706672', 16),
+    hashAlg: 'keccak-256',
+  }
+};
+
 class MessageHandler {
   constructor(network) {
     this.network = network;
@@ -403,7 +490,7 @@ class Peernet {
   }
 
   get codecs() {
-    return codecFormatInterface.codecs
+    return codecs
   }
 
   addProto(name, proto) {
@@ -541,35 +628,33 @@ class Peernet {
       await this.addStore(store, options.storePrefix, options.root);
     }
 
-    try {
+    const accountExists = await accountStore.has('public');
+    if (accountExists) {
       const pub = await accountStore.get('public');
-      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
+      this.id = JSON.parse(pub).walletId;
       let accounts = await walletStore.get('accounts');
-      accounts = new TextDecoder().decode(accounts);
+      
+      
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
       try {
-        this.accounts = JSON.parse(account);
+        this.accounts = JSON.parse(accounts);
       } catch (e) {
         this.accounts = [accounts.split(',')];
       }
-    } catch (e) {
-      if (e.code === 'ERR_NOT_FOUND') {
-
-        const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')); });
-        const generateAccount = importee.default;
-        const {identity, accounts, config} = await generateAccount(this.network);
-        walletStore.put('version', new TextEncoder().encode(1));
-        walletStore.put('accounts', new TextEncoder().encode(JSON.stringify(accounts)));
-        walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
-        await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
-        await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));
-
-        this.id = identity.walletId;
-      } else {
-        throw e
-      }
+    } else {
+      const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')); });
+      const generateAccount = importee.default;
+      const {identity, accounts, config} = await generateAccount(this.network);
+      // await accountStore.put('config', JSON.stringify(config));
+      await accountStore.put('public', JSON.stringify({walletId: identity.walletId}));
+      
+      await walletStore.put('version', String(1));
+      await walletStore.put('accounts', JSON.stringify(accounts));
+      await walletStore.put('identity', JSON.stringify(identity));
+
+      this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
     this.peerId = this.id;
@@ -1043,6 +1128,7 @@ class Peernet {
   //   }
   //
   // }
-}
+}
+globalThis.Peernet = Peernet;
 
 module.exports = Peernet;

package/dist/module/{messages-bce1b91d.js → messages-1b12e93b.js}

@@ -1,4 +1,6 @@
-import { FormatInterface } from '@leofcoin/codec-format-interface';
+'use strict';
+
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 var proto$b = `
 // PeernetMessage
@@ -10,7 +12,7 @@ message PeernetMessage {
   optional string id = 5;
 }`;
 
-class PeernetMessage extends FormatInterface {
+class PeernetMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['data', 'signature', 'from', 'to', 'id']
   }
@@ -41,7 +43,7 @@ message PeernetDHTMessage {
    message = new DHTMessage('hashmvbs124xcfd...', 'block')
  `
  */
-class DHTMessage extends FormatInterface {
+class DHTMessage extends codecFormatInterface.FormatInterface {
   /**
    *
    */
@@ -67,7 +69,7 @@ message PeernetDHTMessageResponse {
 }
 `;
 
-class DHTMessageResponse extends FormatInterface {
+class DHTMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'has']
   }
@@ -93,7 +95,7 @@ message PeernetDataMessage {
 /**
  * @extends {CodecFormat}
  */
-class DataMessage extends FormatInterface {
+class DataMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
@@ -116,7 +118,7 @@ message PsMessage {
   required bytes topic = 2;
 }`;
 
-class PsMessage extends FormatInterface {
+class PsMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['data', 'topic']
   }
@@ -138,7 +140,7 @@ message PeernetPeerMessage {
 }
 `;
 
-class PeerMessage extends FormatInterface {
+class PeerMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['id']
   }
@@ -160,7 +162,7 @@ message PeernetRequestMessage {
 }
 `;
 
-class RequestMessage extends FormatInterface {
+class RequestMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['request']
   }
@@ -182,7 +184,7 @@ message PeernetResponseMessage {
 }
 `;
 
-class ResponseMessage extends FormatInterface {
+class ResponseMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['response']
   }
@@ -204,7 +206,7 @@ message PeernetPeerMessageResponse {
 }
 `;
 
-class PeerMessageResponse extends FormatInterface {
+class PeerMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['id']
   }
@@ -227,7 +229,7 @@ message PeernetDataMessageResponse {
 }
 `;
 
-class DataMessageResponse extends FormatInterface {
+class DataMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'data']
   }
@@ -250,7 +252,7 @@ message ChatMessage {
   repeated string files = 4;
 }`;
 
-class ChatMessage extends FormatInterface {
+class ChatMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['author', 'value', 'timestamp', 'files']
   }
@@ -283,7 +285,7 @@ message PeernetFile {
 /**
  * @extends {CodecFormat}
  */
-class PeernetFile extends FormatInterface {
+class PeernetFile extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['path', 'content', 'links']
   }
@@ -299,4 +301,15 @@ class PeernetFile extends FormatInterface {
   }
 }
 
-export { ChatMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PeerMessage, PeerMessageResponse, PeernetFile, PeernetMessage, PsMessage, RequestMessage, ResponseMessage };
+exports.ChatMessage = ChatMessage;
+exports.DHTMessage = DHTMessage;
+exports.DHTMessageResponse = DHTMessageResponse;
+exports.DataMessage = DataMessage;
+exports.DataMessageResponse = DataMessageResponse;
+exports.PeerMessage = PeerMessage;
+exports.PeerMessageResponse = PeerMessageResponse;
+exports.PeernetFile = PeernetFile;
+exports.PeernetMessage = PeernetMessage;
+exports.PsMessage = PsMessage;
+exports.RequestMessage = RequestMessage;
+exports.ResponseMessage = ResponseMessage;

package/dist/module/peernet.js

@@ -1,12 +1,36 @@
-import '@vandeurenglenn/debug';
-import PubSub from '@vandeurenglenn/little-pubsub';
-import { Codec, CodecHash, codecs } from '@leofcoin/codec-format-interface';
-import MultiWallet from '@leofcoin/multi-wallet';
-import 'path';
+'use strict';
+
+require('@vandeurenglenn/debug');
+var PubSub = require('@vandeurenglenn/little-pubsub');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
+var MultiWallet = require('@leofcoin/multi-wallet');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
+var MultiWallet__default = /*#__PURE__*/_interopDefaultLegacy(MultiWallet);
 
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
-  const codec = new Codec(data);
+  const codec = new codecFormatInterface.Codec(data);
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
@@ -255,6 +279,94 @@ class DhtEarth {
   }
 }
 
+var codecs = {
+  // just a hash
+  'disco-hash': {
+    codec: parseInt('30', 16),
+    hashAlg: 'dbl-keccak-256', // ,
+    // testnet: 'olivia'
+  },
+  'peernet-peer-response': {
+    codec: parseInt('707072', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-peer': {
+    codec: parseInt('7070', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht': {
+    codec: parseInt('706468', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-dht-response': {
+    codec: parseInt('706472', 16),
+    hashAlg: 'keccak-256',
+  },
+  // data
+  'peernet-data': {
+    codec: parseInt('706461', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-data-response': {
+    codec: parseInt('70646172', 16),
+    hashAlg: 'keccak-256',
+  },
+  // message
+  'peernet-message': {
+    codec: parseInt('706d65', 16),
+    hashAlg: 'keccak-256',
+  },
+  // pubsub
+  'peernet-ps': {
+    codec: parseInt('707073', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-response': {
+    codec: parseInt('7072', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-request': {
+    codec: parseInt('707271', 16),
+    hashAlg: 'keccak-256',
+  },
+  // normal block
+  'leofcoin-block': {
+    codec: parseInt('6c62', 16),
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  'leofcoin-tx': {
+    codec: parseInt('6c74', 16),
+    hashAlg: 'dbl-keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // itx
+  'leofcoin-itx': {
+    codec: parseInt('6c69', 16),
+    hashAlg: 'keccak-512', // ,
+    // testnet: 'olivia'
+  },
+  // peer reputation
+  'leofcoin-pr': {
+    codec: parseInt('6c70', 16),
+    hashAlg: 'keccak-256', // ,
+    // testnet: 'olivia'
+  },
+  // chat message
+  'chat-message': {
+    codec: parseInt('636d', 16),
+    hashAlg: 'dbl-keccak-256',
+  },
+  'peernet-file' : {
+    codec: parseInt('7066', 16),
+    hashAlg: 'keccak-256',
+  },
+  'peernet-file-response' : {
+    codec: parseInt('706672', 16),
+    hashAlg: 'keccak-256',
+  }
+};
+
 class MessageHandler {
   constructor(network) {
     this.network = network;
@@ -270,10 +382,10 @@ class MessageHandler {
    * @return signature
    */
   async hashAndSignMessage(message) {
-    const hasher = new CodecHash(message, {name: 'peernet-message'});
+    const hasher = new codecFormatInterface.CodecHash(message, {name: 'peernet-message'});
     let identity = await walletStore.get('identity');
     identity = JSON.parse(new TextDecoder().decode(identity));
-    const wallet = new MultiWallet(this.network);
+    const wallet = new MultiWallet__default["default"](this.network);
     wallet.recover(identity.mnemonic);
     return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
@@ -328,8 +440,8 @@ const nothingFoundError = (hash) => {
 };
 
 globalThis.leofcoin = globalThis.leofcoin || {};
-globalThis.pubsub = globalThis.pubsub || new PubSub();
-globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true});
+globalThis.pubsub = globalThis.pubsub || new PubSub__default["default"]();
+globalThis.globalSub = globalThis.globalSub || new PubSub__default["default"]({verbose: true});
 
 /**
  * @access public
@@ -389,7 +501,7 @@ class Peernet {
 
   async addStore(name, prefix, root, isPrivate = true) {
     if (!globalThis.LeofcoinStorage) {
-      const importee = await import(/* webpackChunkName: "storage" */ '@leofcoin/storage');
+      const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "storage" */ '@leofcoin/storage')); });
       globalThis.LeofcoinStorage = importee.default;
     }
     if (name === 'block' || name === 'transaction' || name === 'chain' ||
@@ -478,7 +590,7 @@ class Peernet {
       ChatMessage,
       PeernetFile
       // FolderMessageResponse
-    } = await import(/* webpackChunkName: "messages" */ './messages-bce1b91d.js');
+    } = await Promise.resolve().then(function () { return require(/* webpackChunkName: "messages" */ './messages-1b12e93b.js'); });
 
     /**
      * proto Object containing protos
@@ -514,35 +626,33 @@ class Peernet {
       await this.addStore(store, options.storePrefix, options.root);
     }
 
-    try {
+    const accountExists = await accountStore.has('public');
+    if (accountExists) {
       const pub = await accountStore.get('public');
-      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
+      this.id = JSON.parse(pub).walletId;
       let accounts = await walletStore.get('accounts');
-      accounts = new TextDecoder().decode(accounts);
+      
+      
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
       try {
-        this.accounts = JSON.parse(account);
+        this.accounts = JSON.parse(accounts);
       } catch (e) {
         this.accounts = [accounts.split(',')];
       }
-    } catch (e) {
-      if (e.code === 'ERR_NOT_FOUND') {
-
-        const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account');
-        const generateAccount = importee.default;
-        const {identity, accounts, config} = await generateAccount(this.network);
-        walletStore.put('version', new TextEncoder().encode(1));
-        walletStore.put('accounts', new TextEncoder().encode(JSON.stringify(accounts)));
-        walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
-        await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
-        await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));
-
-        this.id = identity.walletId;
-      } else {
-        throw e
-      }
+    } else {
+      const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')); });
+      const generateAccount = importee.default;
+      const {identity, accounts, config} = await generateAccount(this.network);
+      // await accountStore.put('config', JSON.stringify(config));
+      await accountStore.put('public', JSON.stringify({walletId: identity.walletId}));
+      
+      await walletStore.put('version', String(1));
+      await walletStore.put('accounts', JSON.stringify(accounts));
+      await walletStore.put('identity', JSON.stringify(identity));
+
+      this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
     this.peerId = this.id;
@@ -565,7 +675,7 @@ class Peernet {
     pubsub.subscribe('peer:data', dataHandler);
 
 
-    const importee = await import(/* webpackChunkName: "peernet-swarm" */ '@leofcoin/peernet-swarm');
+    const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "peernet-swarm" */ '@leofcoin/peernet-swarm')); });
     /**
      * @access public
      * @type {PeernetClient}
@@ -1016,6 +1126,7 @@ class Peernet {
   //   }
   //
   // }
-}
+}
+globalThis.Peernet = Peernet;
 
-export { Peernet as default };
+module.exports = Peernet;

package/index.html

@@ -8,8 +8,8 @@
     <script src="./dist/browser/peernet.js">
     </script>
 
-    <script>
-
+    <script type="module">
+      // import Peernet from './dist/browser/peernet.js';
       (async () => {
         const peernet = await new Peernet()
         peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: new TextEncoder().encode(100)}))

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.13.4",
+  "version": "0.14.0",
   "description": "",
+  "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",
-  "module": "src/module/peernet.js",
+  "module": "dist/module/peernet.js",
+  "targets": [
+    "browser"
+  ],
   "scripts": {
     "build": "npm run c && webpack",
     "test": "node test/index.js",
@@ -15,18 +19,20 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "c": "rollup -c",
     "w": "rollup -c -w",
-    "b": "browserify dist/browser/peernet.js -o dist/browser/peernet.js --standalone Peernet && rm browser.js"
+    "watch": "parcel watch",
+    "parcel-build": "parcel build",
+    "b": "browserify dist/module/peernet.js -o dist/module/peernet.js --standalone Peernet && rm browser.js"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "browserslist": "> 0.5%, last 2 versions, not dead",
+  "browserslist": "> 5%, last 2 versions, not dead",
   "dependencies": {
     "@leofcoin/codec-format-interface": "^1.2.5",
     "@leofcoin/generate-account": "^1.0.4",
     "@leofcoin/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.3.3",
-    "@leofcoin/storage": "^2.3.0",
+    "@leofcoin/storage": "^3.0.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
     "@vandeurenglenn/debug": "^1.0.0",

package/rollup.config.js

@@ -1,6 +1,7 @@
 import { execSync } from 'child_process';
 import json from '@rollup/plugin-json'
 import modify from 'rollup-plugin-modify'
+import resolve from 'rollup-plugin-node-resolve'
 
 try {
 	execSync('rm dist -r')
@@ -26,7 +27,7 @@ export default [{
 	input: 'src/peernet.js',
 	output: {
 		dir: 'dist/module',
-		format: 'es'
+		format: 'cjs'
 	},
 	plugins: [
 		json(),

package/src/peer-info.js

@@ -1,9 +1,9 @@
-import CodecFormat from './codec/codec-format-interface'
-
-export default class PeerInfo extends CodecFormat {
-  constructor(data, options) {
-    super(data, options)
-
-    this.keys = ['id', 'address', 'family']
-  }
-}
+import CodecFormat from './codec/codec-format-interface'
+
+export default class PeerInfo extends CodecFormat {
+  constructor(data, options) {
+    super(data, options)
+
+    this.keys = ['id', 'address', 'family']
+  }
+}