@leofcoin/peernet 0.12.1 → 0.13.0

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "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,13 +22,14 @@
   "license": "MIT",
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.1.1",
-    "@leofcoin/generate-account": "^1.0.2",
+    "@leofcoin/codec-format-interface": "^1.2.5",
+    "@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",
@@ -41,10 +41,7 @@
     "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",
@@ -56,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/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 = await new PeernetMessage({
+    const node = await new globalThis.peernet.protos['peernet-message']({
       ...message,
       signature,
     })

package/src/messages/file.js

@@ -0,0 +1,21 @@
+import proto from './../proto/file.proto.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
+
+/**
+ * @extends {CodecFormat}
+ */
+export default class PeernetFile extends FormatInterface {
+  get keys() {
+    return ['path', 'content', 'links']
+  }
+
+  get messageName() {
+    return 'PeernetFile'
+  }
+  /**
+   * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
+   */
+  constructor(data) {
+    super(data, proto, {name: 'peernet-file'})
+  }
+}

package/src/messages.js

@@ -0,0 +1,13 @@
+export { default as PeernetMessage } from './messages/peernet.js'
+export { default as DHTMessage } from './messages/dht.js'
+export { default as DHTMessageResponse } from './messages/dht-response.js'
+export { default as DataMessage } from './messages/data.js'
+export { default as PsMessage } from './messages/ps.js'
+export { default as PeerMessage } from './messages/peer.js'
+export { default as RequestMessage } from './messages/request.js'
+export { default as ResponseMessage } from './messages/response.js'
+export { default as PeerMessageResponse } from './messages/peer-response.js'
+export { default as DataMessageResponse } from './messages/data-response.js'
+export { default as ChatMessage } from './messages/chat.js'
+export { default as PeernetFile } from './messages/file.js'
+// export { default as FolderMessageResponse } from './messages/folder-response.js'

package/src/peernet.js

@@ -1,28 +1,17 @@
 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 PubSub from '@vandeurenglenn/little-pubsub'
 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,
   nothingFoundError } from './errors/errors.js'
 
+import {parse} from 'path'
 globalThis.leofcoin = globalThis.leofcoin || {}
+globalThis.pubsub = globalThis.pubsub || new PubSub()
 globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true})
 
 /**
@@ -69,16 +58,12 @@ 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
+    if (!globalThis.peernet.protos[name]) globalThis.peernet.protos[name] = proto
   }
 
   addCodec(name, codec) {
@@ -86,6 +71,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
 
@@ -93,7 +82,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)
@@ -158,6 +147,22 @@ export default class Peernet {
     this.storePrefix = options.storePrefix
     this.root = options.root
 
+    const {
+      RequestMessage,
+      ResponseMessage,
+      PeerMessage,
+      PeerMessageResponse,
+      PeernetMessage,
+      DHTMessage,
+      DHTMessageResponse,
+      DataMessage,
+      DataMessageResponse,
+      PsMessage,
+      ChatMessage,
+      PeernetFile
+      // FolderMessageResponse
+    } = await import(/* webpackChunkName: "messages" */ './messages.js')
+
     /**
      * proto Object containing protos
      * @type {Object}
@@ -167,6 +172,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,
@@ -179,6 +185,7 @@ export default class Peernet {
       'peernet-data-response': DataMessageResponse,
       'peernet-ps': PsMessage,
       'chat-message': ChatMessage,
+      'peernet-file': PeernetFile
     }
 
     this._messageHandler = new MessageHandler(this.network)
@@ -205,6 +212,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))
@@ -238,11 +248,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());
     }
@@ -284,7 +296,7 @@ export default class Peernet {
           if (store.private) has = false
           else has = await store.has(hash)
         }
-        const data = await new DHTMessageResponse({hash, has})
+        const data = await new globalThis.peernet.protos['peernet-dht-response']({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
         this.sendMessage(peer, id, node.encoded)
@@ -300,7 +312,7 @@ export default class Peernet {
           data = await store.get(hash)
 
           if (data) {
-            data = await new DataMessageResponse({hash, data});
+            data = await new globalThis.peernet.protos['peernet-data-response']({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded)
             this.sendMessage(peer, id, node.encoded)
@@ -329,7 +341,7 @@ export default class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = await new DHTMessage({hash})
+    const data = await new globalThis.peernet.protos['peernet-dht']({hash})
     const clientId = this.client.id
     const walk = async peer => {
       const node = await this.prepareMessage(peer.peerId, data.encoded)
@@ -437,7 +449,7 @@ export default class Peernet {
         if (peer.peerId === id) return peer
       })
 
-      let data = await new DataMessage({hash, store: store?.name ? store?.name : store});
+      let data = await new globalThis.peernet.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)
@@ -515,6 +527,76 @@ export default class Peernet {
     }
   }
 
+  get folder() {
+    return {
+      /**
+       * Get content for given data hash
+       *
+       * @param {String} hash
+       */
+      get: async (hash) => {
+        debug(`get data ${hash}`)
+        const data = await dataStore.has(hash)
+        if (data) return await dataStore.get(hash)
+        return this.requestData(hash, 'data')
+      },
+      /**
+       * put data content
+       *
+       * @param {String} hash
+       * @param {Buffer} data
+       */
+      put: async (hash, data) => await dataStore.put(hash, data),
+      /**
+       * @param {String} hash
+       * @return {Boolean}
+       */
+      has: async (hash) => await dataStore.has(hash),
+    }
+  }
+
+  async addFolder(files) {
+    const links = []
+    for (const file of files) {
+      const fileNode = await new globalThis.peernet.protos['peernet-file'](file)
+      const hash = await fileNode.hash
+      await dataStore.put(hash, fileNode.encoded)
+      links.push({hash, path: file.path})
+    }
+    const node = await new globalThis.peernet.protos['peernet-file']({path: '/', links})
+    const hash = await node.hash
+    await dataStore.put(hash, node.encoded)
+
+    return hash
+  }
+
+  async ls(hash) {
+    let data
+    const has = await dataStore.has(hash)
+    if (has) data = await dataStore.get(hash)
+    else data = await this.requestData(hash, 'data')
+
+    const node = await new peernet.protos['peernet-file'](data)
+    const paths = []
+    if (node.decoded?.links.length === 0) throw new Error(`${hash} is a file`)
+    for (const {path, hash} of node.decoded.links) {
+      paths.push({path, hash})
+    }
+
+    return paths
+  }
+
+  async cat(hash) {
+    let data
+    const has = await dataStore.has(hash)
+    if (has) data = await dataStore.get(hash)
+    else data = await this.requestData(hash, 'data')
+    const node = await new peernet.protos['peernet-file'](data)
+    const paths = []
+    if (node.decoded?.links.length > 0) throw new Error(`${hash} is a directory`)
+    return node.decoded.content
+  }
+
   /**
    * goes trough given stores and tries to find data for given hash
    * @param {Array} stores
@@ -583,7 +665,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 = await new PsMessage({data, topic})
+    data = await new globalThis.peernet.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)
@@ -594,7 +676,7 @@ export default class Peernet {
   }
 
   createHash(data, name) {
-    return new Hash(data, {name})
+    return new CodeHash(data, {name})
   }
 
   /**

package/src/proto/file.proto.js

@@ -0,0 +1,14 @@
+export default `
+// PeernetFolder
+message PeernetFileLink {
+  required string hash = 1;
+  required string path = 2;
+  optional string size = 3;
+}
+
+message PeernetFile {
+  required string path = 1;
+  optional string content = 2;
+  repeated PeernetFileLink links = 3;
+}
+`

package/test.js

@@ -1,35 +1,47 @@
-const Client = require('./dist/commonjs/peernet.js')
+const Client = require('./dist/commonjs/peernet.js');
 
-const client = new Client({root: '.peernet/test'})
 
-pubsub.subscribe('peer:connected', async peer => {
-  chainStore.put('localBlock', '00000')
-  const request = new globalThis.peernet.protos['peernet-request']({
-          request:'lastBlock'
-        })
-  const to = peer.id
-  await peernet.data.put('hello', 'hi')
-  console.log(request);
-  const node = await peernet.prepareMessage(to, request.encoded)
-  console.log({node});
-  let response = await peer.request(node.encoded)
-  console.log({response});
-  const keys = Object.keys(response)
-  const uint8Array = new Uint8Array(keys.length)
-  for (const key of keys) {
-    uint8Array[Number(key)] = response[key]
-  }
-  const proto = new globalThis.peernet.protos['peernet-message'](uint8Array)
-  console.log(proto.decoded.data);
-  response = new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
-  console.log({response});
+(async () => {
+  const client = await new Client({root: '.peernet/test'})
 
-  const block = new TextDecoder().decode(response.decoded.response)
-  console.log(block);
-  const task = () => setTimeout(() => {
-    console.log(peernet.connections[0]?.connected);
-    console.log(pubsub.subscribers);
+  peernet.addFolder([{
+    path: 'assets/asset.png',
+    content: 'png'
+  }, {
+    path: 'index.html',
+    content: 'html'
+  }]).then(hash => peernet.ls(hash).then(paths => peernet.cat(paths[0].hash).then(content => console.log(content))))
+
+  pubsub.subscribe('peer:connected', async peer => {
+    chainStore.put('localBlock', '00000')
+    const request = await new globalThis.peernet.protos['peernet-request']({
+            request:'lastBlock'
+          })
+    const to = peer.id
+    await peernet.data.put('hello', 'hi')
+    console.log(request);
+    const node = await peernet.prepareMessage(to, request.encoded)
+    console.log({node});
+    let response = await peer.request(node.encoded)
+    console.log({response});
+    const keys = Object.keys(response)
+    const uint8Array = new Uint8Array(keys.length)
+    for (const key of keys) {
+      uint8Array[Number(key)] = response[key]
+    }
+    const proto = await new globalThis.peernet.protos['peernet-message'](uint8Array)
+    console.log(proto.decoded.data);
+    response = await new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
+    console.log({response});
+
+    const block = new TextDecoder().decode(response.decoded.response)
+    console.log(block);
+    const task = () => setTimeout(() => {
+      console.log(peernet.connections[0]?.connected);
+      console.log(pubsub.subscribers);
+      task()
+    }, 5000);
     task()
-  }, 5000);
-  task()
-})
+  })
+
+})()

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'),
   },