@leofcoin/peernet 0.12.2 → 0.13.1

package/dist/module/{messages-421f88db.js → messages-bce1b91d.js}

@@ -1,6 +1,6 @@
 import { FormatInterface } from '@leofcoin/codec-format-interface';
 
-var proto$a = `
+var proto$b = `
 // PeernetMessage
 message PeernetMessage {
   required bytes data = 1;
@@ -21,16 +21,11 @@ class PeernetMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-message';
-    super(buffer, proto$a, {name});
+    super(buffer, proto$b, {name});
   }
 }
 
-var peernet = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': PeernetMessage
-});
-
-var proto$9 = `
+var proto$a = `
 // PeernetDHTMessage
 message PeernetDHTMessage {
   required string hash = 1;
@@ -60,16 +55,11 @@ class DHTMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht';
-    super(data, proto$9, {name});
+    super(data, proto$a, {name});
   }
 }
 
-var dht = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': DHTMessage
-});
-
-var proto$8 = `
+var proto$9 = `
 // PeernetDHTMessageResponse
 message PeernetDHTMessageResponse {
   required string hash = 1;
@@ -88,16 +78,11 @@ class DHTMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-dht-response';
-    super(data, proto$8, {name});
+    super(data, proto$9, {name});
   }
 }
 
-var dhtResponse = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': DHTMessageResponse
-});
-
-var proto$7 = `
+var proto$8 = `
 // PeernetDataMessage
 message PeernetDataMessage {
   required string hash = 1;
@@ -120,16 +105,11 @@ class DataMessage extends FormatInterface {
    * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
    */
   constructor(data) {
-    super(data, proto$7, {name: 'peernet-data'});
+    super(data, proto$8, {name: 'peernet-data'});
   }
 }
 
-var data = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': DataMessage
-});
-
-var proto$6 = `
+var proto$7 = `
 // PsMessage
 message PsMessage {
   required bytes data = 1;
@@ -147,16 +127,11 @@ class PsMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, proto$6, {name});
+    super(buffer, proto$7, {name});
   }
 }
 
-var ps = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': PsMessage
-});
-
-var proto$5 = `
+var proto$6 = `
 // PeernetPeerMessage
 message PeernetPeerMessage {
   required string id = 1;
@@ -174,16 +149,11 @@ class PeerMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, proto$5, {name});
+    super(data, proto$6, {name});
   }
 }
 
-var peer = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': PeerMessage
-});
-
-var proto$4 = `
+var proto$5 = `
 // PeernetRequestMessage
 message PeernetRequestMessage {
   required string request = 1;
@@ -201,16 +171,11 @@ class RequestMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-request';
-    super(data, proto$4, {name});
+    super(data, proto$5, {name});
   }
 }
 
-var request = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': RequestMessage
-});
-
-var proto$3 = `
+var proto$4 = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
   required bytes response = 1;
@@ -228,16 +193,11 @@ class ResponseMessage extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-response';
-    super(data, proto$3, {name});
+    super(data, proto$4, {name});
   }
 }
 
-var response = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': ResponseMessage
-});
-
-var proto$2 = `
+var proto$3 = `
 // PeernetPeerMessageResponse
 message PeernetPeerMessageResponse {
   required string id = 1;
@@ -255,16 +215,11 @@ class PeerMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, proto$2, {name});
+    super(data, proto$3, {name});
   }
 }
 
-var peerResponse = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': PeerMessageResponse
-});
-
-var proto$1 = `
+var proto$2 = `
 // PeernetDataMessageResponse
 message PeernetDataMessageResponse {
   required string hash = 1;
@@ -283,16 +238,11 @@ class DataMessageResponse extends FormatInterface {
 
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, proto$1, {name});
+    super(data, proto$2, {name});
   }
 }
 
-var dataResponse = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': DataMessageResponse
-});
-
-var proto = `
+var proto$1 = `
 message ChatMessage {
   required string value = 1;
   required string author = 2;
@@ -311,13 +261,42 @@ class ChatMessage extends FormatInterface {
 
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, proto, {name});
+    super(buffer, proto$1, {name});
   }
 }
 
-var chat = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': ChatMessage
-});
+var proto = `
+// 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;
+}
+`;
+
+/**
+ * @extends {CodecFormat}
+ */
+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'});
+  }
+}
 
-export { chat as ChatMessage, dht as DHTMessage, dhtResponse as DHTMessageResponse, data as DataMessage, dataResponse as DataMessageResponse, peer as PeerMessage, peerResponse as PeerMessageResponse, peernet as PeernetMessage, ps as PsMessage, request as RequestMessage, response as ResponseMessage };
+export { ChatMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PeerMessage, PeerMessageResponse, PeernetFile, PeernetMessage, PsMessage, RequestMessage, ResponseMessage };

package/dist/module/peernet.js

@@ -1,6 +1,8 @@
 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';
 
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
@@ -326,6 +328,7 @@ const nothingFoundError = (hash) => {
 };
 
 globalThis.leofcoin = globalThis.leofcoin || {};
+globalThis.pubsub = globalThis.pubsub || new PubSub();
 globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true});
 
 /**
@@ -372,16 +375,12 @@ 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) {
@@ -476,8 +475,10 @@ class Peernet {
       DataMessage,
       DataMessageResponse,
       PsMessage,
-      ChatMessage
-    } = await import(/* webpackChunkName: "messages" */ './messages-421f88db.js');
+      ChatMessage,
+      PeernetFile
+      // FolderMessageResponse
+    } = await import(/* webpackChunkName: "messages" */ './messages-bce1b91d.js');
 
     /**
      * proto Object containing protos
@@ -501,6 +502,7 @@ class Peernet {
       'peernet-data-response': DataMessageResponse,
       'peernet-ps': PsMessage,
       'chat-message': ChatMessage,
+      'peernet-file': PeernetFile
     };
 
     this._messageHandler = new MessageHandler(this.network);
@@ -608,7 +610,7 @@ class Peernet {
           if (store.private) has = false;
           else has = await store.has(hash);
         }
-        const data = await new this.protos['peernet-dht-response']({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);
@@ -624,7 +626,7 @@ class Peernet {
           data = await store.get(hash);
 
           if (data) {
-            data = await new this.protos['peernet-data-response']({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);
@@ -651,7 +653,7 @@ class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = await new this.protos['peernet-dht']({hash});
+    const data = await new globalThis.peernet.protos['peernet-dht']({hash});
     this.client.id;
     const walk = async peer => {
       const node = await this.prepareMessage(peer.peerId, data.encoded);
@@ -759,7 +761,7 @@ class Peernet {
         if (peer.peerId === id) return peer
       });
 
-      let data = await new this.protos['peernet-data']({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);
@@ -837,6 +839,75 @@ 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);
+    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
@@ -904,7 +975,7 @@ 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 this.protos['peernet-ps']({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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.12.2",
+  "version": "0.13.1",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "src/module/peernet.js",
@@ -22,7 +22,7 @@
   "license": "MIT",
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.2.0",
+    "@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",

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

@@ -1,11 +1,13 @@
-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'
+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,4 +1,5 @@
 import '@vandeurenglenn/debug'
+import PubSub from '@vandeurenglenn/little-pubsub'
 import PeerDiscovery from './discovery/peer-discovery'
 import DHT from './dht/dht.js'
 import { CodecHash, codecs} from '@leofcoin/codec-format-interface'
@@ -8,7 +9,9 @@ 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})
 
 /**
@@ -55,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) {
@@ -159,7 +158,9 @@ export default class Peernet {
       DataMessage,
       DataMessageResponse,
       PsMessage,
-      ChatMessage
+      ChatMessage,
+      PeernetFile
+      // FolderMessageResponse
     } = await import(/* webpackChunkName: "messages" */ './messages.js')
 
     /**
@@ -184,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)
@@ -294,7 +296,7 @@ export default class Peernet {
           if (store.private) has = false
           else has = await store.has(hash)
         }
-        const data = await new this.protos['peernet-dht-response']({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)
@@ -310,7 +312,7 @@ export default class Peernet {
           data = await store.get(hash)
 
           if (data) {
-            data = await new this.protos['peernet-data-response']({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)
@@ -339,7 +341,7 @@ export default class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = await new this.protos['peernet-dht']({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)
@@ -447,7 +449,7 @@ export default class Peernet {
         if (peer.peerId === id) return peer
       })
 
-      let data = await new this.protos['peernet-data']({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)
@@ -525,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
@@ -593,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 this.protos['peernet-ps']({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)

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;
+}
+`