npm - @leofcoin/peernet - Versions diffs - 0.10.7 → 0.11.1 - Mend

@leofcoin/peernet 0.10.7 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (76) hide show

package/LICENSE +1 -1
package/README.md +49 -49
package/coverage/lcov-report/block-navigation.js +8 -0
package/coverage/lcov-report/codec-format-interface.js.html +224 -120
package/coverage/lcov-report/dht-response.js.html +44 -39
package/coverage/lcov-report/index.html +39 -64
package/coverage/lcov-report/sorter.js +26 -0
package/coverage/lcov.info +164 -424
package/dist/browser/peernet.js +101788 -93018
package/dist/commonjs/client-1a1f75e6.js +324 -0
package/dist/commonjs/{codec-6367213c.js → codec-8c8c652f.js} +198 -188
package/dist/commonjs/codec-format-interface.js +169 -152
package/dist/commonjs/codec.js +4 -4
package/dist/commonjs/dht-response.js +13 -13
package/dist/commonjs/dht.js +24 -24
package/dist/commonjs/hash.js +151 -141
package/dist/commonjs/{http-a94c5a81.js → http-7bbac90a.js} +19 -15
package/dist/commonjs/peernet-message.js +13 -13
package/dist/commonjs/peernet.js +1901 -1794
package/dist/commonjs/request.js +13 -13
package/dist/commonjs/response.js +13 -13
package/dist/module/peernet.js +2460 -2346
package/index.html +4 -6
package/package.json +22 -14
package/rollup.config.js +33 -5
package/rollup0.config.js +7 -0
package/src/client.js +75 -75
package/src/codec/codec-format-interface.js +172 -155
package/src/codec/codec.js +124 -114
package/src/codec/codecs.js +79 -79
package/src/dht/dht.js +121 -121
package/src/discovery/peer-discovery.js +75 -75
package/src/handlers/message.js +52 -52
package/src/hash/hash.js +155 -145
package/src/http/client/http-client.js +44 -44
package/src/messages/chat-message.js +14 -14
package/src/messages/data-response.js +14 -14
package/src/messages/data.js +18 -18
package/src/messages/dht-response.js +14 -15
package/src/messages/dht.js +25 -25
package/src/messages/peer-response.js +14 -14
package/src/messages/peer.js +14 -14
package/src/messages/peernet-message.js +14 -14
package/src/messages/ps.js +14 -14
package/src/messages/request.js +14 -14
package/src/messages/response.js +14 -14
package/src/peer.js +67 -67
package/src/peernet.js +612 -697
package/src/proto/chat-message.proto.js +7 -7
package/src/utils/utils.js +78 -78
package/test/codec.js +3 -2
package/test/messages.js +7 -4
package/test.js +11 -4
package/webpack.config.js +35 -0
package/coverage/lcov-report/codec.js.html +0 -677
package/coverage/lcov-report/hash.js.html +0 -551
package/debug.log +0 -3
package/dist/browser/peernet.js.tmp-browserify-14074318104595318069 +0 -0
package/dist/browser/peernet.js.tmp-browserify-45407634493269122267 +0 -0
package/dist/browser/peernet.js.tmp-browserify-53722389064799025427 +0 -0
package/dist/browser/peernet.js.tmp-browserify-96323030449218949300 +0 -0
package/dist/codec/codec-format-interface.js +0 -433
package/dist/codec/codec.js +0 -199
package/dist/commonjs/codec-73adfc0f.js +0 -205
package/dist/commonjs/http-2c603501.js +0 -324
package/dist/commonjs/http-42a6e555.js +0 -324
package/dist/commonjs/http-43f4fafe.js +0 -324
package/dist/commonjs/peernet-message-b6925673.js +0 -32
package/dist/hash/hash.js +0 -340
package/dist/messages/dht-response.js +0 -454
package/dist/messages/dht.js +0 -453
package/dist/messages/peernet.js +0 -456
package/dist/module/http-273664bd.js +0 -317
package/dist/module/http-8fe3c0d7.js +0 -317
package/dist/module/http-c780c991.js +0 -317
package/dist/module/http-f13e0d77.js +0 -317

package/index.html CHANGED Viewed

@@ -7,15 +7,13 @@
   <body>
     <script src="./dist/browser/peernet.js">
     </script>
     <script>
       (async () => {
         const peernet = await new Peernet()
-        peernet.subscribe('socket-data', data => {
-          console.log(data)
-        })
+        peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: 100}))
       })()
     </script>
   </body>
-</html>
+</html>

package/package.json CHANGED Viewed

@@ -1,9 +1,12 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.10.7",
+  "version": "0.11.1",
   "description": "",
   "main": "dist/commonjs/peernet.js",
+  "module": "dist/module/peernet.js",
+  "browser": "dist/browser/peernet.js",
   "scripts": {
+    "build": "webpack",
     "test": "node test/index.js",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868",
@@ -13,37 +16,36 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "c": "rollup -c",
     "w": "rollup -c -w",
-    "b": "browserify browser.js -o dist/browser/peernet.js --standalone Peernet && rm browser.js"
+    "b": "browserify dist/browser/peernet.js -o dist/browser/peernet.js --standalone Peernet && rm browser.js"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
+  "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
     "@leofcoin/generate-account": "^1.0.2",
-    "@leofcoin/multi-wallet": "^2.0.6",
-    "@leofcoin/storage": "^2.1.1",
+    "@leofcoin/multi-wallet": "^2.1.1",
+    "@leofcoin/peernet-swarm": "^0.1.9",
+    "@leofcoin/storage": "^2.1.2",
+    "@vandeurenglenn/base32": "^1.1.0",
+    "@vandeurenglenn/base58": "^1.1.0",
+    "@vandeurenglenn/is-hex": "^1.0.0",
     "@vandeurenglenn/little-pubsub": "^1.3.1",
-    "async_hooks": "^1.0.0",
-    "bs32": "^0.1.6",
-    "bs58": "^4.0.1",
-    "bs58check": "^2.1.2",
-    "is-hex": "^1.1.3",
     "keccak": "^3.0.1",
     "koa": "^2.13.1",
     "node-fetch": "^2.6.1",
-    "on-finished": "^2.4.1",
-    "p2pt": "^1.5.0",
     "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-commonjs": "^19.0.1",
     "@rollup/plugin-eslint": "^8.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
-    "browserify": "^16.5.0",
     "coveralls": "^3.1.1",
     "esdoc": "^1.1.0",
     "esdoc-ecmascript-proposal-plugin": "^1.0.0",
@@ -51,9 +53,15 @@
     "eslint": "^7.31.0",
     "eslint-config-google": "^0.14.0",
     "nyc": "^15.1.0",
-    "rollup": "^2.54.0",
+    "os-browserify": "^0.3.0",
+    "path-browserify": "^1.0.1",
+    "rollup": "^2.70.2",
     "rollup-plugin-modify": "^3.0.0",
+    "rollup-plugin-natives": "^0.7.5",
     "rollup-plugin-node-globals": "^1.4.0",
-    "tape": "^5.2.2"
+    "rollup-plugin-node-polyfills": "^0.2.1",
+    "tape": "^5.2.2",
+    "webpack": "^5.72.0",
+    "webpack-cli": "^4.9.2"
   }
 }

package/rollup.config.js CHANGED Viewed

@@ -4,7 +4,14 @@ import resolve from '@rollup/plugin-node-resolve'
 import cjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import modify from 'rollup-plugin-modify'
+import nativePlugin from 'rollup-plugin-natives';
+import polyfills from 'rollup-plugin-node-polyfills'
+try {
+	execSync('rm dist -r')
+} catch (e) {
+}
 export default [{
 	input: ['src/peernet.js', 'src/codec/codec.js', 'src/hash/hash.js', 'src/messages/dht.js',
 'src/messages/peernet-message.js', 'src/messages/dht-response.js', 'src/messages/request.js',
@@ -14,21 +21,42 @@ export default [{
 		format: 'cjs'
 	},
 	plugins: [
-		json()
+		json(),
+		modify({
+			HTTP_IMPORT: `if (this.hasDaemon) {
+				const httpClient = await import('./http/client/client.js')
+				globalThis.peernet.client = await httpClient.default({
+					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
+				})
+			} else {
+				const http = await import('./http/http.js')
+	      if (environment !== 'browser') http.default(options)
+	    }`
+		})
 	]
 }, {
 	input: 'src/peernet.js',
 	output: {
-		file: 'browser.js',
+		dir: 'dist/browser/',
 		format: 'cjs'
 	},
 	plugins: [
 		json(),
 		modify({
-			"import fetch from 'node-fetch'": ''
+			"import fetch from 'node-fetch'": '',
+			HTTP_IMPORT: ``
 		}),
-		cjs(),
-		// resolve(),
+		// nativePlugin(),
+		// polyfills(),
+		// resolve({
+		// 	preferBuiltins: true,
+		// 	mainFields: ["browser", "module", "main"],
+		// 	extensions: ['.mjs', '.js', '.json']
+		// }),
+		// cjs({
+		// 	exclude: ['*.node'],
+		// 	extensions: ['.js']
+		// }),
 		// lint({
 		//   fix: true,
 		// 	exclude: ['package.json', "package-lock.json"]

package/rollup0.config.js ADDED Viewed

@@ -0,0 +1,7 @@
+export default [{
+  input: ['./src/base-x.js'],
+  output: [{
+    dir: './dist',
+    format: 'cjs'
+  }]
+}]

package/src/client.js CHANGED Viewed

@@ -1,75 +1,75 @@
-import Pubsub from '@vandeurenglenn/little-pubsub'
-import PeernetPeer from './peer.js'
-import sha256 from 'crypto-js/sha256'
-import P2P from 'p2pt'
-/**
- * Array of peers
- * @type {Array}
- * @property {PeernetPeer} peer Instance of Peer
- */
-globalThis.connections = new Map()
-globalThis.recentConnections = new Map()
-globalThis.pubsub = globalThis.pubsub || new Pubsub({verbose: false})
-export default class PeernetClient {
-  constructor(options = {}) {
-    if (!options.id) options.id = Buffer.from('00000000000000000000000000000000')
-    if (!options.networkVersion) options.networkVersion = 'v0.1.0'
-    if (!options.networkName) options.networkName = 'peernet'
-    this.id = options.id
-    this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString())
-    const trackers = [
-      'wss://star.leofcoin.org',
-      'wss://tracker.openwebtorrent.com',
-      // 'wss://tracker.sloppyta.co:443/announce',
-    ]
-    this.p2p = new P2P(trackers, this.topic.slice(0, 20))
-    this.p2p.on('peerconnect', (peer) => {
-      peer = new PeernetPeer(peer.id, peer)
-      connections.set(peer.id, peer)
-      pubsub.publish('peer:discovered', peer)
-    })
-    this.p2p.on('peerclose', (peer) => {
-      // TODO: close peernetPeer
-      const peernetPeer = connections.get(peer.id)
-      if (peernetPeer) {
-        peernetPeer.close()
-      }
-      connections.delete(peer.id)
-      pubsub.publish('peer:disconnected', peer)
-    })
-    this.p2p.start()
-    if (globalThis.process) {
-      process.on('SIGINT', async () => {
-        console.log('Caught interrupt signal')
-        this.close()
-        setTimeout(async () => {
-          process.exit();
-        }, 100);
-      })
-    } else {
-      globalThis.onbeforeunload = () => {
-        this.close()
-      }
-    }
-    //
-    // this.sw.on('close', () => {
-    // })
-  }
-  close() {
-    return this.p2p.destroy()
-  }
-  _peers() {
-    return this.p2p.getPeers()
-  }
-}
+import Pubsub from '@vandeurenglenn/little-pubsub'
+import PeernetPeer from './peer.js'
+import sha256 from 'crypto-js/sha256'
+import P2P from 'p2pt'
+/**
+ * Array of peers
+ * @type {Array}
+ * @property {PeernetPeer} peer Instance of Peer
+ */
+globalThis.connections = new Map()
+globalThis.recentConnections = new Map()
+globalThis.pubsub = globalThis.pubsub || new Pubsub({verbose: false})
+export default class PeernetClient {
+  constructor(options = {}) {
+    if (!options.id) options.id = Buffer.from('00000000000000000000000000000000')
+    if (!options.networkVersion) options.networkVersion = 'v0.1.0'
+    if (!options.networkName) options.networkName = 'peernet'
+    this.id = options.id
+    this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString())
+    const trackers = [
+      'wss://star.leofcoin.org',
+      'wss://tracker.openwebtorrent.com',
+      // 'wss://tracker.sloppyta.co:443/announce',
+    ]
+    this.p2p = new P2P(trackers, this.topic.slice(0, 20))
+    this.p2p.on('peerconnect', (peer) => {
+      peer = new PeernetPeer(peer.id, peer)
+      connections.set(peer.id, peer)
+      pubsub.publish('peer:discovered', peer)
+    })
+    this.p2p.on('peerclose', (peer) => {
+      // TODO: close peernetPeer
+      const peernetPeer = connections.get(peer.id)
+      if (peernetPeer) {
+        peernetPeer.close()
+      }
+      connections.delete(peer.id)
+      pubsub.publish('peer:disconnected', peer)
+    })
+    this.p2p.start()
+    if (globalThis.process) {
+      process.on('SIGINT', async () => {
+        console.log('Caught interrupt signal')
+        this.close()
+        setTimeout(async () => {
+          process.exit();
+        }, 100);
+      })
+    } else {
+      globalThis.onbeforeunload = () => {
+        this.close()
+      }
+    }
+    //
+    // this.sw.on('close', () => {
+    // })
+  }
+  close() {
+    return this.p2p.destroy()
+  }
+  _peers() {
+    return this.p2p.getPeers()
+  }
+}

package/src/codec/codec-format-interface.js CHANGED Viewed

@@ -1,155 +1,172 @@
-import bs32 from 'bs32';
-import bs58 from 'bs58';
-import isHex from 'is-hex';
-import Codec from './codec';
-import Hash from './../hash/hash'
-export default class FormatInterface {
-  /**
-   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
-   * @param {Object} proto - {encode, decode}
-   * @param {Object} options - {hashFormat, name}
-   */
-  constructor(buffer, proto, options = {}) {
-    this.protoEncode = proto.encode
-    this.protoDecode = proto.decode
-    if (options.name) this.name = options.name
-    this.hashFormat = options.hashFormat || 'bs32'
-    if (buffer.name === options.name) {
-      return buffer
-    } else if (Buffer.isBuffer(buffer)) {
-      const codec = new Codec(buffer)
-      if (codec.name) {
-        this.fromEncoded(buffer)
-      } else {
-        this.create(buffer)
-      }
-    } else {
-      if (typeof buffer === 'string') {
-        if (isHex(buffer)) this.fromHex(buffer)
-        else if (bs32.test(buffer)) this.fromBs32(buffer)
-        else this.fromBs58(buffer)
-      } else if (typeof buffer === 'object' && !Array.isArray(buffer)) {
-        this.create(buffer)
-      }
-    }
-  }
-  /**
-   * @return {PeernetHash}
-   */
-  get peernetHash() {
-    return new Hash(this.decoded, {name: this.name})
-  }
-  /**
-   * @return {peernetHash}
-   */
-  get hash() {
-    const upper = this.hashFormat.charAt(0).toUpperCase()
-    const format = `${upper}${this.hashFormat.substring(1, this.hashFormat.length)}`
-    return this.peernetHash[`to${format}`]()
-  }
-  /**
-   * @return {Object}
-   */
-  decode() {
-    let encoded = this.encoded;
-    const discoCodec = new Codec(this.encoded.toString('hex'))
-    encoded = encoded.slice(discoCodec.codecBuffer.length)
-    this.name = discoCodec.name
-    this.decoded = this.protoDecode(encoded)
-    return this.decoded
-  }
-  /**
-   * @return {Buffer}
-   */
-  encode(decoded) {
-    if (!decoded) decoded = this.decoded;
-    const codec = new Codec(this.name)
-    this.encoded = Buffer.concat([codec.codecBuffer, this.protoEncode(decoded)])
-    return this.encoded
-  }
-  /**
-   * @param {Buffer} encoded
-   */
-  fromEncoded(encoded) {
-    const codec = new Codec(encoded)
-    this.name = codec.name
-    this.encoded = encoded
-    this.decode()
-  }
-  /**
-   * @param {String} encoded
-   */
-  fromHex(encoded) {
-    this.encoded = Buffer.from(encoded, 'hex')
-    this.decode()
-  }
-  /**
-   * @param {String} encoded
-   */
-  fromBs32(encoded) {
-    this.encoded = bs32.decode(encoded)
-    this.decode()
-  }
-  /**
-   * @param {String} encoded
-   */
-  fromBs58(encoded) {
-    this.encoded = bs58.decode(encoded)
-    this.decode()
-  }
-  /**
-   * @return {String} encoded
-   */
-  toHex() {
-    if (!this.encoded) this.encode()
-    return this.encoded.toString('hex')
-  }
-  /**
-   * @return {String} encoded
-   */
-  toBs32() {
-    if (!this.encoded) this.encode()
-    return bs32.encode(this.encoded)
-  }
-  /**
-   * @return {String} encoded
-   */
-  toBs58() {
-    if (!this.encoded) this.encode()
-    return bs58.encode(this.encoded)
-  }
-  /**
-   * @param {Object} data
-   */
-  create(data) {
-    const decoded = {}
-    if (this.keys?.length > 0) {
-      for (const key of this.keys) {
-        Object.defineProperties(decoded, {
-          [key]: {
-            enumerable: true,
-            configurable: true,
-            set: (val) => value = data[key],
-            get: () => data[key]
-          }
-        })
-      }
-      this.decoded = decoded
-      this.encode()
-    }
-  }
-}
+import bs32 from '@vandeurenglenn/base32';
+import bs58 from '@vandeurenglenn/base58';
+import isHex from '@vandeurenglenn/is-hex';
+import Codec from './codec';
+import Hash from './../hash/hash'
+export default class FormatInterface {
+  /**
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
+   * @param {Object} proto - {encode, decode}
+   * @param {Object} options - {hashFormat, name}
+   */
+  constructor(buffer, proto, options = {}) {
+    this.protoEncode = proto.encode
+    this.protoDecode = proto.decode
+    this.hashFormat = options.hashFormat || 'bs32'
+    if (options.name) this.name = options.name
+    if (buffer instanceof Uint8Array) return this.fromUint8Array(buffer)
+    else if (buffer instanceof ArrayBuffer) return this.fromArrayBuffer(buffer)
+    else if (buffer.name === options.name) return buffer
+    else if (typeof buffer === 'string') {
+        if (isHex(buffer)) this.fromHex(buffer)
+        else if (bs32.isBase32(buffer)) this.fromBs32(buffer)
+        else if (bs58.isBase58(buffer)) this.fromBs58(buffer)
+        else throw new Error(`unsupported string ${buffer}`)
+    } else {
+      this.create(buffer)
+    }
+  }
+  /**
+   * @return {PeernetHash}
+   */
+  get peernetHash() {
+    return new Hash(this.decoded, {name: this.name})
+  }
+  /**
+   * @return {peernetHash}
+   */
+  get hash() {
+    const upper = this.hashFormat.charAt(0).toUpperCase()
+    const format = `${upper}${this.hashFormat.substring(1, this.hashFormat.length)}`
+    return this.peernetHash[`to${format}`]()
+  }
+  /**
+   * @return {Object}
+   */
+  decode() {
+    let encoded = this.encoded;
+    const discoCodec = new Codec(this.encoded)
+    encoded = encoded.slice(discoCodec.codecBuffer.length)
+    this.name = discoCodec.name
+    this.decoded = this.protoDecode(encoded)
+    return this.decoded
+  }
+  /**
+   * @return {Buffer}
+   */
+  encode(decoded) {
+    if (!decoded) decoded = this.decoded;
+    const codec = new Codec(this.name)
+    const encoded = this.protoEncode(decoded)
+    const uint8Array = new Uint8Array(encoded.length + codec.codecBuffer.length)
+    uint8Array.set(codec.codecBuffer)
+    uint8Array.set(encoded, codec.codecBuffer.length)
+    this.encoded = uint8Array
+    return this.encoded
+  }
+  hasCodec() {
+    if (!this.encoded) return false
+    const codec = new Codec(this.encoded)
+    if (codec.name) return true
+  }
+  fromUint8Array(buffer) {
+    this.encoded = buffer
+    if (!this.hasCodec()) this.create(
+      JSON.parse(new TextDecoder().decode(this.encoded))
+    )
+    else this.decode()
+  }
+  fromArrayBuffer(buffer) {
+    this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength)
+    if (!this.hasCodec()) this.create(
+      JSON.parse(new TextDecoder().decode(this.encoded))
+    )
+    else this.decode()
+  }
+  /**
+   * @param {Buffer} encoded
+   */
+  fromEncoded(encoded) {
+    this.encoded = encoded
+    this.decode()
+  }
+  /**
+   * @param {String} encoded
+   */
+  fromHex(encoded) {
+    this.encoded = Buffer.from(encoded, 'hex')
+    this.decode()
+  }
+  /**
+   * @param {String} encoded
+   */
+  fromBs32(encoded) {
+    this.encoded = bs32.decode(encoded)
+    this.decode()
+  }
+  /**
+   * @param {String} encoded
+   */
+  fromBs58(encoded) {
+    this.encoded = bs58.decode(encoded)
+    this.decode()
+  }
+  /**
+   * @return {String} encoded
+   */
+  toHex() {
+    if (!this.encoded) this.encode()
+    return this.encoded.toString('hex')
+  }
+  /**
+   * @return {String} encoded
+   */
+  toBs32() {
+    if (!this.encoded) this.encode()
+    return bs32.encode(this.encoded)
+  }
+  /**
+   * @return {String} encoded
+   */
+  toBs58() {
+    if (!this.encoded) this.encode()
+    return bs58.encode(this.encoded)
+  }
+  /**
+   * @param {Object} data
+   */
+  create(data) {
+    const decoded = {}
+    if (this.keys?.length > 0) {
+      for (const key of this.keys) {
+        Object.defineProperties(decoded, {
+          [key]: {
+            enumerable: true,
+            configurable: true,
+            set: (val) => value = data[key],
+            get: () => data[key]
+          }
+        })
+      }
+      this.decoded = decoded
+      this.encode()
+    }
+  }
+}