@leofcoin/peernet 0.11.24 → 0.11.25

package/dist/module/peernet.js

@@ -2,18 +2,16 @@ import '@vandeurenglenn/debug';
 import pako from 'pako';
 import LeofcoinStorage from '@leofcoin/storage';
 import protons from 'protons';
-import bs32 from '@vandeurenglenn/base32';
-import bs58 from '@vandeurenglenn/base58';
-import isHex from '@vandeurenglenn/is-hex';
-import varint from 'varint';
-import createKeccakHash from 'keccak';
+import { FormatInterface, Codec, CodecHash, codecs } from '@leofcoin/codec-format-interface';
 import MultiWallet$1 from '@leofcoin/multi-wallet';
 import * as bs58check from 'bs58check';
 import bs58check__default from 'bs58check';
 import * as bip32 from 'bip32';
+import createKeccakHash from 'keccak';
 import ecc from 'tiny-secp256k1';
 import Mnemonic from '@leofcoin/mnemonic';
 import MultiSignature from 'multi-signature';
+import varint from 'varint';
 import randombytes from 'randombytes';
 
 /* socket-request-client version 1.6.3 */
@@ -724,540 +722,6 @@ message PeernetMessage {
   optional string id = 5;
 }`;
 
-var codecs = {
-  // just a hash
-  'disco-hash': {
-    codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-256', // ,
-    // testnet: 'olivia'
-  },
-  'peernet-peer-response': {
-    codec: parseInt('707072', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-peer': {
-    codec: parseInt('7070', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-dht': {
-    codec: parseInt('706468', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-dht-response': {
-    codec: parseInt('706472', 16),
-    hashAlg: 'keccak-256',
-  },
-  // data
-  'peernet-data': {
-    codec: parseInt('706461', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-data-response': {
-    codec: parseInt('70646172', 16),
-    hashAlg: 'keccak-256',
-  },
-  // message
-  'peernet-message': {
-    codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-256',
-  },
-  // pubsub
-  'peernet-ps': {
-    codec: parseInt('707073', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-response': {
-    codec: parseInt('7072', 16),
-    hashAlg: 'keccak-256',
-  },
-  'peernet-request': {
-    codec: parseInt('707271', 16),
-    hashAlg: 'keccak-256',
-  },
-  // normal block
-  'leofcoin-block': {
-    codec: parseInt('6c62', 16),
-    hashAlg: 'dbl-keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  'leofcoin-tx': {
-    codec: parseInt('6c74', 16),
-    hashAlg: 'dbl-keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  // itx
-  'leofcoin-itx': {
-    codec: parseInt('6c69', 16),
-    hashAlg: 'keccak-512', // ,
-    // testnet: 'olivia'
-  },
-  // peer reputation
-  'leofcoin-pr': {
-    codec: parseInt('6c70', 16),
-    hashAlg: 'keccak-256', // ,
-    // testnet: 'olivia'
-  },
-  // chat message
-  'chat-message': {
-    codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-256',
-  },
-};
-
-class PeernetCodec {
-  get codecs() {
-    return {...globalThis.peernet.codecs, ...codecs}
-  }
-  constructor(buffer) {
-    if (buffer) {
-      if (buffer instanceof Uint8Array) {
-        const codec = varint.decode(buffer);
-        const name = this.getCodecName(codec);
-        if (name) {
-          this.name = name;
-          this.encoded = buffer;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      } else if (buffer instanceof ArrayBuffer) {
-        const encoded = new Uint8Array(buffer.byteLength);
-
-        for (let i = 0; i < buffer.byteLength; i++) {
-          encoded[i] = buffer[i];
-        }
-        this.encoded = encoded;
-        // this.encoded = new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength)
-        this.decode(buffer);
-        return
-      }
-      if (typeof buffer === 'string') {
-        if (this.codecs[buffer]) this.fromName(buffer);
-        else 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}`)
-      }
-      if (!isNaN(buffer)) if (this.codecs[this.getCodecName(buffer)]) this.fromCodec(buffer);
-    }
-  }
-
-  fromEncoded(encoded) {
-    const codec = varint.decode(encoded);
-    const name = this.getCodecName(codec);
-    this.name = name;
-    this.encoded = encoded;
-    this.decode(encoded);
-  }
-
-  fromHex(hex) {
-    this.encoded = Buffer.from(hex, 'hex');
-    this.decode();
-  }
-
-  fromBs32(input) {
-    this.encoded = bs32.decode(input);
-    this.decode();
-  }
-
-  fromBs58(input) {
-    this.encoded = bs58.decode(input);
-    this.decode();
-  }
-
-  getCodec(name) {
-    return this.codecs[name].codec
-  }
-
-  getCodecName(codec) {
-    return Object.keys(this.codecs).reduce((p, c) => {
-      const item = this.codecs[c];
-      if (item.codec === codec) return c;
-      else return p;
-    }, undefined)
-  }
-
-  getHashAlg(name) {
-    return this.codecs[name].hashAlg
-  }
-
-  fromCodec(codec) {
-    this.name = this.getCodecName(codec);
-    this.hashAlg = this.getHashAlg(this.name);
-
-    this.codec = this.getCodec(this.name);
-    this.codecBuffer = varint.encode(codec);
-  }
-
-  fromName(name) {
-    const codec = this.getCodec(name);
-    this.name = name;
-    this.codec = codec;
-    this.hashAlg = this.getHashAlg(name);
-    this.codecBuffer = varint.encode(codec);
-  }
-
-  toBs32() {
-    this.encode();
-    return bs32.encode(this.encoded)
-  }
-
-  toBs58() {
-    this.encode();
-    return bs58.encode(this.encoded)
-  }
-
-  toHex() {
-    return this.encoded.toString('hex')
-  }
-
-  decode() {
-    const codec = varint.decode(this.encoded);
-    this.fromCodec(codec);
-  }
-
-  encode() {
-    const codec = varint.encode(this.decoded);
-    this.encoded = codec;
-    return this.encoded
-  }
-}
-
-class PeernetHash {
-  constructor(buffer, options = {}) {
-    if (options.name) this.name = options.name;
-    else this.name = 'disco-hash';
-    if (options.codecs) this.codecs = options.codecs;
-    if (buffer) {
-      if (buffer instanceof Uint8Array) {
-        this.discoCodec = new PeernetCodec(buffer, this.codecs);
-        const name = this.discoCodec.name;
-
-        if (name) {
-          this.name = name;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      }
-
-      if (typeof buffer === 'string') {
-        if (isHex(buffer)) this.fromHex(buffer);
-        if (bs32.isBase32(buffer)) this.fromBs32(buffer);
-        else if (bs58.isBase58(buffer)) this.fromBs58(buffer);
-        else throw new Error(`unsupported string ${buffer}`)
-      } else if (typeof buffer === 'object') this.fromJSON(buffer);
-    }
-  }
-
-  get prefix() {
-    const length = this.length;
-    const uint8Array = new Uint8Array(length.length + this.discoCodec.codecBuffer.length);
-    uint8Array.set(length);
-    uint8Array.set(this.discoCodec.codecBuffer, length.length);
-
-    return uint8Array
-  }
-
-  get length() {
-    return varint.encode(this.size)
-  }
-
-  get buffer() {
-    return this.hash
-  }
-
-  toHex() {
-    return this.hash.toString('hex')
-  }
-
-  fromHex(hex) {
-    return this.decode(Buffer.from(hex, 'hex'))
-  }
-
-  fromJSON(json) {
-    return this.encode(Buffer.from(JSON.stringify(json)))
-  }
-
-  toBs32() {
-    return bs32.encode(this.hash)
-  }
-
-  fromBs32(bs) {
-    return this.decode(bs32.decode(bs))
-  }
-
-  toBs58() {
-    return bs58.encode(this.hash)
-  }
-
-  fromBs58(bs) {
-    return this.decode(bs58.decode(bs))
-  }
-
-  toString(encoding = 'utf8') {
-    return this.hash.toString(encoding)
-  }
-
-  encode(buffer, name) {
-    if (!this.name && name) this.name = name;
-    if (!buffer) buffer = this.buffer;
-    this.discoCodec = new PeernetCodec(this.name, this.codecs);
-    this.discoCodec.fromName(this.name);
-    let hashAlg = this.discoCodec.hashAlg;
-    if (hashAlg.includes('dbl')) {
-      hashAlg = hashAlg.replace('dbl-', '');
-      buffer = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
-    }
-    this.digest = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest();
-    this.size = this.digest.length;
-
-    this.codec = this.discoCodec.encode();
-    this.codec = this.discoCodec.codecBuffer;
-    const uint8Array = new Uint8Array(this.digest.length + this.prefix.length);
-    uint8Array.set(this.prefix);
-    uint8Array.set(this.digest, this.prefix.length);
-
-    this.hash = uint8Array;
-
-    return this.hash
-  }
-
-  validate(buffer) {
-    if (Buffer.isBuffer(buffer)) {
-      const codec = varint.decode(buffer);
-      if (this.codecs[codec]) {
-        this.decode(buffer);
-      } else {
-        this.encode(buffer);
-      }
-    }
-    if (typeof buffer === 'string') {
-      if (isHex(buffer)) this.fromHex(buffer);
-      if (bs32.test(buffer)) this.fromBs32(buffer);
-    }
-    if (typeof buffer === 'object') this.fromJSON(buffer);
-  }
-
-  decode(buffer) {
-    this.hash = buffer;
-    const codec = varint.decode(buffer);
-
-    this.discoCodec = new PeernetCodec(codec, this.codecs);
-    // TODO: validate codec
-    buffer = buffer.slice(varint.decode.bytes);
-    this.size = varint.decode(buffer);
-    this.digest = buffer.slice(varint.decode.bytes);
-    if (this.digest.length !== this.size) {
-      throw new Error(`hash length inconsistent: 0x${this.hash.toString('hex')}`)
-    }
-
-    // const discoCodec = new Codec(codec, this.codecs)
-
-    this.name = this.discoCodec.name;
-
-
-    this.size = this.digest.length;
-
-    return {
-      codec: this.codec,
-      name: this.name,
-      size: this.size,
-      length: this.length,
-      digest: this.digest,
-    }
-  }
-}
-
-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) this.fromUint8Array(buffer);
-    else if (buffer instanceof ArrayBuffer) this.fromArrayBuffer(buffer);
-    else if (buffer.name === options.name) return buffer
-    else if (buffer instanceof 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 PeernetHash(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 PeernetCodec(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 PeernetCodec(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 PeernetCodec(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();
-  }
-
-  toString() {
-    return this.encoded.toString()
-  }
-
-  async toArray() {
-    const array = [];
-    for await (const value of this.encoded.values()) {
-      array.push(value);
-    }
-    return array
-  }
-
-  fromString(string) {
-    this.encoded = new Uint8Array(string.split(','));
-    this.decode();
-  }
-
-  fromArray(array) {
-    this.encoded = new Uint8Array([...array]);
-    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();
-    }
-  }
-}
-
 class PeernetMessage extends FormatInterface {
   get keys() {
     return ['data', 'signature', 'from', 'to', 'id']
@@ -1471,7 +935,7 @@ class ChatMessage extends FormatInterface {
 
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
-  const codec = new PeernetCodec(data);
+  const codec = new Codec(data);
   if (!codec.name) throw new Error('proto not found')
   const Proto = globalThis.peernet.protos[codec.name];
   if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
@@ -2256,7 +1720,7 @@ class MessageHandler {
    * @return signature
    */
   async hashAndSignMessage(message) {
-    const hasher = new PeernetHash(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);
@@ -2866,7 +2330,7 @@ class Peernet {
   }
 
   createHash(data, name) {
-    return new PeernetHash(data, {name})
+    return new CodecHash(data, {name})
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.24",
+  "version": "0.11.25",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -23,6 +23,7 @@
   "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/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.3.0",

package/rollup.config.js

@@ -9,9 +9,9 @@ try {
 
 }
 export default [{
-	input: ['src/peernet.js', 'src/codec/codec.js', 'src/hash/hash.js', 'src/messages/dht.js',
+	input: ['src/peernet.js', 'src/messages/dht.js',
 'src/messages/peernet-message.js', 'src/messages/dht-response.js', 'src/messages/request.js',
-'src/messages/response.js', 'src/codec/codec-format-interface.js'],
+'src/messages/response.js'],
 	output: {
 		dir: 'dist/commonjs',
 		format: 'cjs'

package/src/handlers/message.js

@@ -1,5 +1,5 @@
 import MultiWallet from './../../node_modules/@leofcoin/multi-wallet/src/index'
-import Hash from './../hash/hash.js'
+import { CodecHash as Hash } from '@leofcoin/codec-format-interface'
 import PeernetMessage from './../messages/peernet-message.js'
 
 export default class MessageHandler {

package/src/messages/chat-message.js

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

package/src/messages/data-response.js

@@ -1,8 +1,8 @@
 import protons from 'protons'
 import proto from './../proto/data-response.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
 
-export default class DataMessageResponse extends CodecFormat {
+export default class DataMessageResponse extends FormatInterface {
   get keys() {
     return ['hash', 'data']
   }

package/src/messages/data.js

@@ -1,11 +1,11 @@
 import protons from 'protons'
 import proto from './../proto/data.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 /**
  * @extends {CodecFormat}
  */
-export default class DataMessage extends CodecFormat {
+export default class DataMessage extends FormatInterface {
   get keys() {
     return ['hash', 'store']
   }

package/src/messages/dht-response.js

@@ -1,8 +1,8 @@
 import protons from 'protons'
 import proto from './../proto/dht-response.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
 
-export default class DHTMessageResponse extends CodecFormat {
+export default class DHTMessageResponse extends FormatInterface {
   get keys() {
     return ['hash', 'has']
   }

package/src/messages/dht.js

@@ -1,6 +1,6 @@
 import protons from 'protons'
 import proto from './../proto/dht.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 /**
  * @example `
@@ -10,7 +10,7 @@ import CodecFormat from './../codec/codec-format-interface.js'
    message = new DHTMessage('hashmvbs124xcfd...', 'block')
  `
  */
-export default class DHTMessage extends CodecFormat {
+export default class DHTMessage extends FormatInterface {
   /**
    *
    */

package/src/messages/peer-response.js

@@ -1,8 +1,8 @@
 import protons from 'protons'
 import proto from './../proto/peer-response.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
 
-export default class PeerMessageResponse extends CodecFormat {
+export default class PeerMessageResponse extends FormatInterface {
   get keys() {
     return ['id']
   }