@leofcoin/peernet 0.11.31 → 0.12.2

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.31",
+  "version": "0.12.2",
   "description": "",
   "main": "dist/commonjs/peernet.js",
-  "module": "dist/module/peernet.js",
-  "browser": "dist/browser/peernet.js",
+  "module": "src/module/peernet.js",
   "scripts": {
     "build": "npm run c && webpack",
     "test": "node test/index.js",
@@ -23,29 +22,26 @@
   "license": "MIT",
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.0.1",
-    "@leofcoin/generate-account": "^1.0.2",
+    "@leofcoin/codec-format-interface": "^1.2.0",
+    "@leofcoin/generate-account": "^1.0.4",
     "@leofcoin/multi-wallet": "^2.1.2",
-    "@leofcoin/peernet-swarm": "^0.3.1",
+    "@leofcoin/peernet-swarm": "^0.3.3",
     "@leofcoin/storage": "^2.3.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
+    "@vandeurenglenn/debug": "^1.0.0",
     "@vandeurenglenn/is-hex": "^1.0.0",
     "@vandeurenglenn/little-pubsub": "^1.3.1",
     "keccak": "^3.0.1",
     "koa": "^2.13.1",
     "node-fetch": "^2.6.1",
-    "protons": "^2.0.1",
     "socket-request-client": "^1.5.0",
     "socket-request-server": "^1.5.0",
     "stream-browserify": "^3.0.0",
     "varint": "^6.0.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-methods": "^7.16.11",
-    "@rollup/plugin-eslint": "^8.0.1",
     "@rollup/plugin-json": "^4.1.0",
-    "@vandeurenglenn/debug": "^1.0.0",
     "coveralls": "^3.1.1",
     "eslint": "^7.31.0",
     "eslint-config-google": "^0.14.0",
@@ -57,7 +53,6 @@
     "tape": "^5.2.2",
     "vm-browserify": "^1.1.2",
     "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-node-externals": "^3.0.0"
+    "webpack-cli": "^4.9.2"
   }
 }

package/rollup.config.js

@@ -1,5 +1,4 @@
 import { execSync } from 'child_process';
-import lint from '@rollup/plugin-eslint'
 import json from '@rollup/plugin-json'
 import modify from 'rollup-plugin-modify'
 
@@ -10,7 +9,7 @@ try {
 }
 export default [{
 	input: ['src/peernet.js', 'src/messages/dht.js',
-'src/messages/peernet-message.js', 'src/messages/dht-response.js', 'src/messages/request.js',
+'src/messages/peernet.js', 'src/messages/dht-response.js', 'src/messages/request.js',
 'src/messages/response.js'],
 	output: {
 		dir: 'dist/commonjs',
@@ -26,25 +25,7 @@ export default [{
 }, {
 	input: 'src/peernet.js',
 	output: {
-		dir: 'dist/browser/',
-		format: 'cjs'
-	},
-	plugins: [
-		json(),
-		modify({
-			"import fetch from 'node-fetch'": '',
-			HTTP_IMPORT: ``,
-			SUBTLE_IMPORT: `const { subtle } = crypto`
-		}),
-		// lint({
-		//   fix: true,
-		// 	exclude: ['package.json', "package-lock.json"]
-		// })
-	]
-}, {
-	input: 'src/peernet.js',
-	output: {
-		file: 'dist/module/peernet.js',
+		dir: 'dist/module',
 		format: 'es'
 	},
 	plugins: [

package/src/discovery/peer-discovery.js

@@ -18,12 +18,12 @@ export default class PeerDiscovery {
   async discover(peer) {
     let id = this._getPeerId(peer.id)
     if (id) return id
-    const data = new peernet.protos['peernet-peer']({id: this.id})
+    const data = await new peernet.protos['peernet-peer']({id: this.id})
     const node = await peernet.prepareMessage(peer.id, data.encoded)
 
     let response = await peer.request(node.encoded)
-    response = protoFor(response)
-    response = new peernet.protos['peernet-peer-response'](response.decoded.data)
+    response = await protoFor(response)
+    response = await new peernet.protos['peernet-peer-response'](response.decoded.data)
 
     id = response.decoded.id
     if (id === this.id) return;
@@ -54,7 +54,7 @@ export default class PeerDiscovery {
           peernet.peerMap.set(from, connections)
         }
       }
-      const data = new peernet.protos['peernet-peer-response']({id: this.id})
+      const data = await new peernet.protos['peernet-peer-response']({id: this.id})
       const node = await peernet.prepareMessage(from, data.encoded)
 
       peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))

package/src/handlers/data.js

@@ -5,8 +5,8 @@ const dataHandler = async message => {
 
   const {data, id} = message
 
-  message = protoFor(data)
-  const proto = protoFor(message.decoded.data)
+  message = await protoFor(data)
+  const proto = await protoFor(message.decoded.data)
   const from = message.decoded.from
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from)

package/src/handlers/message.js

@@ -1,6 +1,5 @@
-import MultiWallet from './../../node_modules/@leofcoin/multi-wallet/src/index'
-import { CodecHash as Hash } from '@leofcoin/codec-format-interface'
-import PeernetMessage from './../messages/peernet-message.js'
+import MultiWallet from '@leofcoin/multi-wallet'
+import { CodecHash } from '@leofcoin/codec-format-interface'
 
 export default class MessageHandler {
   constructor(network) {
@@ -17,7 +16,7 @@ export default class MessageHandler {
    * @return signature
    */
   async hashAndSignMessage(message) {
-    const hasher = new Hash(message, {name: 'peernet-message'})
+    const hasher = new CodecHash(message, {name: 'peernet-message'})
     let identity = await walletStore.get('identity')
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(this.network)
@@ -40,7 +39,7 @@ export default class MessageHandler {
       data,
     }
     const signature = await this.hashAndSignMessage(message)
-    const node = new PeernetMessage({
+    const node = await new globalThis.peernet.protos['peernet-message']({
       ...message,
       signature,
     })

package/src/messages/{chat-message.js → chat.js}

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/chat-message.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class ChatMessage extends FormatInterface {
     return ['author', 'value', 'timestamp', 'files']
   }
 
+  get messageName() {
+    return 'ChatMessage'
+  }
+
   constructor(buffer) {
     const name = 'chat-message'
-    super(buffer, protons(proto).ChatMessage, {name})
+    super(buffer, proto, {name})
   }
 }

package/src/messages/data-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/data-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class DataMessageResponse extends FormatInterface {
     return ['hash', 'data']
   }
 
+  get messageName() {
+    return 'PeernetDataMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-data-response'
-    super(data, protons(proto).PeernetDataMessageResponse, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/data.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/data.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -9,10 +8,14 @@ export default class DataMessage extends FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
+
+  get messageName() {
+    return 'PeernetDataMessage'
+  }
   /**
    * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
    */
   constructor(data) {
-    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
+    super(data, proto, {name: 'peernet-data'})
   }
 }

package/src/messages/dht-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/dht-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class DHTMessageResponse extends FormatInterface {
     return ['hash', 'has']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-dht-response'
-    super(data, protons(proto).PeernetDHTMessageResponse, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/dht.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/dht.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -18,8 +17,12 @@ export default class DHTMessage extends FormatInterface {
     return ['hash', 'store']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-dht'
-    super(data, protons(proto).PeernetDHTMessage, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/peer-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/peer-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class PeerMessageResponse extends FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-peer-response'
-    super(data, protons(proto).PeernetPeerMessageResponse, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/peer.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/peer.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class PeerMessage extends FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-peer'
-    super(data, protons(proto).PeernetPeerMessage, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/{peernet-message.js → peernet.js}

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/peernet.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class PeernetMessage extends FormatInterface {
     return ['data', 'signature', 'from', 'to', 'id']
   }
 
+  get messageName() {
+    return 'PeernetMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-message'
-    super(buffer, protons(proto).PeernetMessage, {name})
+    super(buffer, proto, {name})
   }
 }

package/src/messages/ps.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/ps.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class PsMessage extends FormatInterface {
     return ['data', 'topic']
   }
 
+  get messageName() {
+    return 'PsMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-ps'
-    super(buffer, protons(proto).PsMessage, {name})
+    super(buffer, proto, {name})
   }
 }

package/src/messages/request.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/request.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class RequestMessage extends FormatInterface {
     return ['request']
   }
 
+  get messageName() {
+    return 'PeernetRequestMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-request'
-    super(data, protons(proto).PeernetRequestMessage, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class ResponseMessage extends FormatInterface {
     return ['response']
   }
 
+  get messageName() {
+    return 'PeernetResponseMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-response'
-    super(data, protons(proto).PeernetResponseMessage, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages.js

@@ -0,0 +1,11 @@
+export * as PeernetMessage from './messages/peernet.js'
+export * as DHTMessage from './messages/dht.js'
+export * as DHTMessageResponse from './messages/dht-response.js'
+export * as DataMessage from './messages/data.js'
+export * as PsMessage from './messages/ps.js'
+export * as PeerMessage from './messages/peer.js'
+export * as RequestMessage from './messages/request.js'
+export * as ResponseMessage from './messages/response.js'
+export * as PeerMessageResponse from './messages/peer-response.js'
+export * as DataMessageResponse from './messages/data-response.js'
+export * as ChatMessage from './messages/chat.js'

package/src/peernet.js

@@ -1,22 +1,8 @@
 import '@vandeurenglenn/debug'
-import Client from './../node_modules/@leofcoin/peernet-swarm/dist/es/client.js'
-import LeofcoinStorage from '@leofcoin/storage'
-import PeernetMessage from './messages/peernet-message.js'
-import DHTMessage from './messages/dht.js'
-import DHTMessageResponse from './messages/dht-response.js'
-import DataMessage from './messages/data.js'
-import PsMessage from './messages/ps.js'
-import PeerMessage from './messages/peer.js'
-import RequestMessage from './messages/request.js'
-import ResponseMessage from './messages/response.js'
-import PeerMessageResponse from './messages/peer-response.js'
-import DataMessageResponse from './messages/data-response.js'
-import ChatMessage from './messages/chat-message.js'
 import PeerDiscovery from './discovery/peer-discovery'
 import DHT from './dht/dht.js'
-import { CodecHash as Hash, codecs} from '@leofcoin/codec-format-interface'
+import { CodecHash, codecs} from '@leofcoin/codec-format-interface'
 import { protoFor, target } from './utils/utils.js'
-import generateAccount from './../node_modules/@leofcoin/generate-account/dist/module/generate-account'
 import MessageHandler from './handlers/message.js'
 import dataHandler from './handlers/data.js'
 import { encapsulatedError, dhtError,
@@ -69,6 +55,14 @@ export default class Peernet {
     return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
   }
 
+  get protos() {
+    return globalThis.peernet.protos
+  }
+
+  get codecs() {
+    return codecs
+  }
+
   addProto(name, proto) {
     if (!this.protos[name]) this.protos[name] = proto
   }
@@ -78,6 +72,10 @@ export default class Peernet {
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
+    if (!globalThis.LeofcoinStorage) {
+      const importee = await import(/* webpackChunkName: "storage" */ '@leofcoin/storage')
+      globalThis.LeofcoinStorage = importee.default
+    }
     if (name === 'block' || name === 'transaction' || name === 'chain' ||
         name === 'data' || name === 'message') isPrivate = false
 
@@ -85,7 +83,7 @@ export default class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient
     } else {
-      Storage = globalThis.LeofcoinStorage?.default ? globalThis.LeofcoinStorage.default : LeofcoinStorage
+      Storage = LeofcoinStorage
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(name, root)
@@ -150,6 +148,20 @@ export default class Peernet {
     this.storePrefix = options.storePrefix
     this.root = options.root
 
+    const {
+      RequestMessage,
+      ResponseMessage,
+      PeerMessage,
+      PeerMessageResponse,
+      PeernetMessage,
+      DHTMessage,
+      DHTMessageResponse,
+      DataMessage,
+      DataMessageResponse,
+      PsMessage,
+      ChatMessage
+    } = await import(/* webpackChunkName: "messages" */ './messages.js')
+
     /**
      * proto Object containing protos
      * @type {Object}
@@ -159,6 +171,7 @@ export default class Peernet {
      * @property {DataMessage} protos[peernet-data] messageNode
      * @property {DataMessageResponse} protos[peernet-data-response] messageNode
      */
+
     globalThis.peernet.protos = {
       'peernet-request': RequestMessage,
       'peernet-response': ResponseMessage,
@@ -173,16 +186,11 @@ export default class Peernet {
       'chat-message': ChatMessage,
     }
 
-    this.protos = globalThis.peernet.protos
-    this.codecs = codecs
-
     this._messageHandler = new MessageHandler(this.network)
 
     const {daemon, environment} = await target()
     this.hasDaemon = daemon
 
-    HTTP_IMPORT
-
     for (const store of this.defaultStores) {
       await this.addStore(store, options.storePrefix, options.root)
     }
@@ -202,6 +210,9 @@ export default class Peernet {
       }
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
+
+        const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
+        const generateAccount = importee.default
         const wallet = {}
         const {identity, accounts, config} = await generateAccount(this.network)
         walletStore.put('version', new TextEncoder().encode(1))
@@ -235,11 +246,13 @@ export default class Peernet {
      */
     pubsub.subscribe('peer:data', dataHandler)
 
+
+    const importee = await import(/* webpackChunkName: "peernet-swarm" */ '@leofcoin/peernet-swarm')
     /**
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new Client(this.id)
+    this.client = new importee.default(this.id)
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
     }
@@ -281,7 +294,7 @@ export default class Peernet {
           if (store.private) has = false
           else has = await store.has(hash)
         }
-        const data = new DHTMessageResponse({hash, has})
+        const data = await new this.protos['peernet-dht-response']({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
         this.sendMessage(peer, id, node.encoded)
@@ -297,7 +310,7 @@ export default class Peernet {
           data = await store.get(hash)
 
           if (data) {
-            data = new DataMessageResponse({hash, data});
+            data = await new this.protos['peernet-data-response']({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded)
             this.sendMessage(peer, id, node.encoded)
@@ -326,16 +339,16 @@ export default class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = new DHTMessage({hash})
+    const data = await new this.protos['peernet-dht']({hash})
     const clientId = this.client.id
     const walk = async peer => {
       const node = await this.prepareMessage(peer.peerId, data.encoded)
       let result = await peer.request(node.encoded)
       result = new Uint8Array(Object.values(result))
-      let proto = protoFor(result)
+      let proto = await protoFor(result)
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from
-      proto = protoFor(proto.decoded.data)
+      proto = await protoFor(proto.decoded.data)
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -434,7 +447,7 @@ export default class Peernet {
         if (peer.peerId === id) return peer
       })
 
-      let data = new DataMessage({hash, store: store?.name ? store?.name : store});
+      let data = await new this.protos['peernet-data']({hash, store: store?.name ? store?.name : store});
 
       const node = await this.prepareMessage(id, data.encoded)
       if (closest[0]) data = await closest[0].request(node.encoded)
@@ -445,8 +458,8 @@ export default class Peernet {
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
       data = new Uint8Array(Object.values(data))
-      let proto = protoFor(data)
-      proto = protoFor(proto.decoded.data)
+      let proto = await protoFor(data)
+      proto = await protoFor(proto.decoded.data)
       // TODO: store data automaticly or not
       return proto.decoded.data
 
@@ -580,7 +593,7 @@ export default class Peernet {
     if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic)
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data))
     const id = Math.random().toString(36).slice(-12)
-    data = new PsMessage({data, topic})
+    data = await new this.protos['peernet-ps']({data, topic})
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
         const node = await this.prepareMessage(peer.peerId, data.encoded)
@@ -591,7 +604,7 @@ export default class Peernet {
   }
 
   createHash(data, name) {
-    return new Hash(data, {name})
+    return new CodeHash(data, {name})
   }
 
   /**

package/webpack.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 module.exports = [{
-  entry: './dist/browser/peernet.js',
+  entry: './src/peernet.js',
   mode: 'production',
   plugins: [
     // Work around for Buffer is undefined:
@@ -26,6 +26,9 @@ module.exports = [{
 optimization: {
   minimize: false
 },
+experiments: {
+  outputModule: true
+},
 resolve: {
         extensions: [ '.ts', '.js' ],
         fallback: {
@@ -41,9 +44,9 @@ resolve: {
     },
   output: {
     library: {
-      name: 'Peernet',
-      type: 'global'
+      type: 'module'
     },
+    chunkFilename: '[name].js',
     filename: 'peernet.js',
     path: path.resolve(__dirname, 'dist', 'browser'),
   },