@leofcoin/peernet 0.17.1 → 0.18.1

package/exports/proto/chat-message.proto.d.ts

@@ -0,0 +1,7 @@
+declare namespace _default {
+    const value: string;
+    const author: string;
+    const timestamp: number;
+    const files: string[];
+}
+export default _default;

package/exports/proto/data-response.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const hash: string;
+    const data: Uint8Array;
+}
+export default _default;

package/exports/proto/data.proto.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    hash: string;
+    'store?': string;
+};
+export default _default;

package/exports/proto/dht-response.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const hash: string;
+    const has: boolean;
+}
+export default _default;

package/exports/proto/dht.proto.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    hash: string;
+    'store?': string;
+};
+export default _default;

package/exports/proto/file-link.proto.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    hash: string;
+    path: string;
+    'size?': number;
+};
+export default _default;

package/exports/proto/file.proto.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    path: string;
+    'content?': string;
+    'links?': any[];
+};
+export default _default;

package/exports/proto/peer-response.proto.d.ts

@@ -0,0 +1,4 @@
+declare namespace _default {
+    const id: string;
+}
+export default _default;

package/exports/proto/peer.proto.d.ts

@@ -0,0 +1,4 @@
+declare namespace _default {
+    const id: string;
+}
+export default _default;

package/exports/proto/peernet.proto.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    data: Uint8Array;
+    signature: Uint8Array;
+    'from?': string;
+    'to?': string;
+    'id?': string;
+};
+export default _default;

package/exports/proto/ps.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const data: Uint8Array;
+    const topic: Uint8Array;
+}
+export default _default;

package/exports/proto/request.proto.d.ts

@@ -0,0 +1,4 @@
+declare namespace _default {
+    const request: string;
+}
+export default _default;

package/exports/proto/response.proto.d.ts

@@ -0,0 +1,4 @@
+declare namespace _default {
+    const response: Uint8Array;
+}
+export default _default;

package/exports/utils/utils.d.ts

@@ -0,0 +1,7 @@
+export function BufferToUint8Array(data: any): any;
+export function expected(expected: any, actual: any): string;
+export function protoFor(message: any): any;
+export function hasDaemon(): boolean;
+export function https(): boolean;
+export function environment(): string;
+export function target(): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.17.1",
+  "version": "0.18.1",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -24,7 +24,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.4.0",
+    "@leofcoin/codec-format-interface": "^1.6.0",
+    "@leofcoin/codecs": "^1.0.0",
     "@leofcoin/generate-account": "^1.2.0",
     "@leofcoin/multi-wallet": "^3.0.1",
     "@leofcoin/peernet-swarm": "^0.5.0",
@@ -48,6 +49,6 @@
     "@types/varint": "^6.0.1",
     "eslint": "^8.29.0",
     "eslint-plugin-unicorn": "^45.0.1",
-    "rollup": "^3.9.0"
+    "rollup": "^3.10.0"
   }
 }

package/rollup.config.js

@@ -2,7 +2,9 @@ import resolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import wasm from '@rollup/plugin-wasm'
-import rimraf from 'rimraf'
+import rimraf from 'rimraf';
+import typescript from '@rollup/plugin-typescript';
+import tsconfig from './tsconfig.json' assert { type: 'json'}
 
 rimraf.sync('./exports/**')
 
@@ -19,12 +21,16 @@ export default [{
     commonjs(),
     resolve({
       mainFields: ["browser", "module", "main"]
-    })
+    }),
+    typescript({...tsconfig, outDir: './exports/browser'})
   ]
 }, {
   input: ['./src/peernet.ts', './node_modules/@leofcoin/storage/exports/store.js'],
   output: {
     format: 'es',
     dir: './exports'
-  }
+  },
+  plugins: [
+    typescript({...tsconfig, outDir: './exports'})
+  ]
 }]

package/src/messages/chat.js

@@ -2,9 +2,6 @@ import proto from './../proto/chat-message.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class ChatMessage extends FormatInterface {
-  get keys() {
-    return ['author', 'value', 'timestamp', 'files']
-  }
 
   get messageName() {
     return 'ChatMessage'

package/src/messages/data-response.js

@@ -2,9 +2,6 @@ import proto from './../proto/data-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class DataMessageResponse extends FormatInterface {
-  get keys() {
-    return ['hash', 'data']
-  }
 
   get messageName() {
     return 'PeernetDataMessageResponse'

package/src/messages/data.js

@@ -5,9 +5,6 @@ import { FormatInterface } from '@leofcoin/codec-format-interface'
  * @extends {CodecFormat}
  */
 export default class DataMessage extends FormatInterface {
-  get keys() {
-    return ['hash', 'store']
-  }
 
   get messageName() {
     return 'PeernetDataMessage'

package/src/messages/dht-response.js

@@ -2,9 +2,6 @@ import proto from './../proto/dht-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class DHTMessageResponse extends FormatInterface {
-  get keys() {
-    return ['hash', 'has']
-  }
 
   get messageName() {
     return 'PeernetDHTMessageResponse'

package/src/messages/dht.js

@@ -10,12 +10,6 @@ import { FormatInterface } from '@leofcoin/codec-format-interface'
  `
  */
 export default class DHTMessage extends FormatInterface {
-  /**
-   *
-   */
-  get keys() {
-    return ['hash', 'store']
-  }
 
   get messageName() {
     return 'PeernetDHTMessage'

package/src/messages/file-link.js

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

package/src/messages/file.js

@@ -5,9 +5,6 @@ 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'

package/src/messages/peer-response.js

@@ -2,9 +2,6 @@ import proto from './../proto/peer-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class PeerMessageResponse extends FormatInterface {
-  get keys() {
-    return ['id']
-  }
 
   get messageName() {
     return 'PeernetPeerMessageResponse'

package/src/messages/peer.js

@@ -2,10 +2,6 @@ import proto from './../proto/peer.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class PeerMessage extends FormatInterface {
-  get keys() {
-    return ['id']
-  }
-
   get messageName() {
     return 'PeernetPeerMessage'
   }

package/src/messages/peernet.js

@@ -2,9 +2,6 @@ import proto from './../proto/peernet.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class PeernetMessage extends FormatInterface {
-  get keys() {
-    return ['data', 'signature', 'from', 'to', 'id']
-  }
 
   get messageName() {
     return 'PeernetMessage'

package/src/messages/ps.js

@@ -2,10 +2,6 @@ import proto from './../proto/ps.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class PsMessage extends FormatInterface {
-  get keys() {
-    return ['data', 'topic']
-  }
-
   get messageName() {
     return 'PsMessage'
   }

package/src/messages/request.js

@@ -2,9 +2,6 @@ import proto from './../proto/request.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class RequestMessage extends FormatInterface {
-  get keys() {
-    return ['request']
-  }
 
   get messageName() {
     return 'PeernetRequestMessage'

package/src/messages/response.js

@@ -2,9 +2,6 @@ import proto from './../proto/response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class ResponseMessage extends FormatInterface {
-  get keys() {
-    return ['response']
-  }
 
   get messageName() {
     return 'PeernetResponseMessage'

package/src/peernet.ts

@@ -2,7 +2,6 @@ import '@vandeurenglenn/debug'
 import PubSub from '@vandeurenglenn/little-pubsub'
 import PeerDiscovery from './discovery/peer-discovery.js'
 import DHT from './dht/dht.js'
-import { codecs } from '@leofcoin/codec-format-interface'
 import { BufferToUint8Array, protoFor, target } from './utils/utils.js'
 import MessageHandler from './handlers/message.js'
 import dataHandler from './handlers/data.js'
@@ -10,18 +9,38 @@ import { encapsulatedError, dhtError,
   nothingFoundError } from './errors/errors.js'
 
 import LeofcoinStorage from '@leofcoin/storage'
+import { utils as codecUtils } from '@leofcoin/codecs'
 globalThis.LeofcoinStorage = LeofcoinStorage
   
 globalThis.leofcoin = globalThis.leofcoin || {}
 globalThis.pubsub = globalThis.pubsub || new PubSub()
-globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true})
-
+globalThis.globalSub = globalThis.globalSub || new PubSub(true)
 /**
  * @access public
  * @example
  * const peernet = new Peernet();
  */
 export default class Peernet {
+  stores: [] = []
+  /**
+   * @type {Object}
+   * @property {Object} peer Instance of Peer
+   */
+  dht: DHT = new DHT()
+  /** @leofcoin/peernet-swarm/client */
+  client: {
+    connections: [],
+    id: string,
+    removePeer: (peer: string) => {},
+    close: () => {}
+  }
+  network: string
+  stars: string[]
+  networkVersion: string
+  bw: {
+    up: number
+    down: number
+  }
   /**
    * @access public
    * @param {Object} options
@@ -35,8 +54,7 @@ export default class Peernet {
    * @example
    * const peernet = new Peernet({network: 'leofcoin', root: '.leofcoin'});
    */
-  constructor(options = {}) {
-    this._discovered = []
+  constructor(options: options) {
     /**
      * @property {String} network - current network
      */
@@ -67,8 +85,8 @@ export default class Peernet {
     if (!globalThis.peernet.protos[name]) globalThis.peernet.protos[name] = proto
   }
 
-  addCodec(name, codec) {
-    if (!this.codecs[name]) this.codecs[name] = codec
+  addCodec(codec: codec) {
+    return codecUtils.addCodec(codec)
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
@@ -129,18 +147,6 @@ export default class Peernet {
    * @return {Promise} instance of Peernet
    */
   async _init(options) {
-    // peernetDHT aka closesPeer by coordinates
-    /**
-     * @type {Object}
-     * @property {Object} peer Instance of Peer
-     */
-    this.dht = new DHT()
-    /**
-     * @type {Map}
-     * @property {Object} peer Instance of Peer
-     */
-    this.stores = []
-    this.codecs = {...codecs}
     this.requestProtos = {}
     this.storePrefix = options.storePrefix
     this.root = options.root
@@ -247,7 +253,7 @@ export default class Peernet {
     pubsub.subscribe('peer:data', dataHandler)
 
 
-    const importee = await import(/* webpackChunkName: "peernet-swarm" */ '@leofcoin/peernet-swarm/client')
+    const importee = await import('@leofcoin/peernet-swarm/client')
     /**
      * @access public
      * @type {PeernetClient}

package/src/proto/chat-message.proto.js

@@ -1,7 +1,6 @@
-export default `
-message ChatMessage {
-  required string value = 1;
-  required string author = 2;
-  required uint64 timestamp = 3;
-  repeated string files = 4;
-}`
+export default {
+  value: String(),
+  author: String(),
+  timestamp: Number(),
+  files: [String()],
+}

package/src/proto/data-response.proto.js

@@ -1,7 +1,4 @@
-export default `
-// PeernetDataMessageResponse
-message PeernetDataMessageResponse {
-  required string hash = 1;
-  required bytes data = 2;
+export default {
+  hash: String(),
+  data: new Uint8Array(),
 }
-`

package/src/proto/data.proto.js

@@ -1,7 +1,4 @@
-export default `
-// PeernetDataMessage
-message PeernetDataMessage {
-  required string hash = 1;
-  optional string store = 2;
+export default {
+  hash: String(),
+  'store?': String()
 }
-`

package/src/proto/dht-response.proto.js

@@ -1,7 +1,4 @@
-export default `
-// PeernetDHTMessageResponse
-message PeernetDHTMessageResponse {
-  required string hash = 1;
-  required bool has = 2;
+export default {
+  hash: String(),
+  has: Boolean()
 }
-`

package/src/proto/dht.proto.js

@@ -1,7 +1,4 @@
-export default `
-// PeernetDHTMessage
-message PeernetDHTMessage {
-  required string hash = 1;
-  optional string store = 2;
+export default {
+  hash: String(),
+  'store?': String()
 }
-`

package/src/proto/file-link.proto.js

@@ -0,0 +1,5 @@
+export default {
+  hash: String(),
+  path: String(),
+  'size?': Number()
+}

package/src/proto/file.proto.js

@@ -1,14 +1,5 @@
-export default `
-// PeernetFolder
-message PeernetFileLink {
-  required string hash = 1;
-  required string path = 2;
-  optional string size = 3;
+export default {
+  path: String(),
+  'content?': '',
+  'links?': []
 }
-
-message PeernetFile {
-  required string path = 1;
-  optional string content = 2;
-  repeated PeernetFileLink links = 3;
-}
-`

package/src/proto/peer-response.proto.js

@@ -1,6 +1,3 @@
-export default `
-// PeernetPeerMessageResponse
-message PeernetPeerMessageResponse {
-  required string id = 1;
+export default {
+  id: String()
 }
-`

package/src/proto/peer.proto.js

@@ -1,6 +1,3 @@
-export default `
-// PeernetPeerMessage
-message PeernetPeerMessage {
-  required string id = 1;
+export default {
+  id: String()
 }
-`

package/src/proto/peernet.proto.js

@@ -1,9 +1,7 @@
-export default `
-// PeernetMessage
-message PeernetMessage {
-  required bytes data = 1;
-  required bytes signature = 2;
-  optional string from = 3;
-  optional string to = 4;
-  optional string id = 5;
-}`
+export default {
+  data: new Uint8Array(),
+  signature: new Uint8Array(),
+  'from?': String(),
+  'to?': String(),
+  'id?': String()
+}

package/src/proto/ps.proto.js

@@ -1,6 +1,4 @@
-export default `
-// PsMessage
-message PsMessage {
-  required bytes data = 1;
-  required bytes topic = 2;
-}`
+export default {
+  data: new Uint8Array(),
+  topic: new Uint8Array()
+}

package/src/proto/request.proto.js

@@ -1,6 +1,3 @@
-export default `
-// PeernetRequestMessage
-message PeernetRequestMessage {
-  required string request = 1;
+export default {
+  request: String()
 }
-`

package/src/proto/response.proto.js

@@ -1,6 +1,3 @@
-export default `
-// PeernetResponseMessage
-message PeernetResponseMessage {
-  required bytes response = 1;
+export default {
+  response: new Uint8Array()
 }
-`

package/test.js

@@ -1,8 +1,8 @@
-import Client from './src/peernet.js'
+import Client from './exports/peernet.js'
 
 
 
-  const client = await new Client({root: '.peernet/test'})
+  const client = await new Client({root: '.peernet/test', network: 'leofcoin:peach', networkVersion: 'peach', stars: ['wss://peach.leofcoin.org']})
 
   // peernet.addFolder([{
   //   path: 'assets/asset.png',

package/test2.js

@@ -1,7 +1,7 @@
 const Client = require('./dist/commonjs/peernet.js');
 
 (async () => {
-  const client = await new Client({root: '.peernet/test2', network: 'leofcoin'})
+  const client = await new Client({root: '.peernet/test2', network: 'leofcoin:peach', networkVersion: 'peach'})
   const job = () => client.publish('socket-data', 'hello')
   setTimeout(async () => {
     job()

package/tsconfig.json

@@ -2,18 +2,12 @@
   "compilerOptions": {
     "module": "ES2022",
     "target": "es2022",
-    // "noImplicitAny": true,
-    "removeComments": true,
-    "preserveConstEnums": true,
-    "outDir": ".build/",
+    "declaration": true,
     "moduleResolution":"NodeNext",
-    "sourceMap": true,
     "allowJs": true
   },
   "include": [
-    "./src/**/*",
-    "@vandeurenglenn/little-pubsub",
-    "@leofcoin/storage"
+    "./src/**/*"
   ],
-  "exclude": ["node_modules", "**/*.spec.ts"]
+  "exclude": ["node_modules"]
 }