@leofcoin/peernet 1.1.28 → 1.1.30

package/exports/browser/{client-345f1d43.js → client-a56e0aac.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-54d061e3.js';
+import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-8aded868.js';
 import './value-157ab062.js';
 
 function commonjsRequire(path) {
@@ -41036,31 +41036,37 @@ class P2PTClient extends P2PT {
     this.peerId = peerId;
 
     this.on('trackerconnect', async (tracker, stats) => {
-      // const peers = await this.requestMorePeers()
-      // let promises = Object.entries(peers).map(async ([id, peer]) => {
-			// 	const hasPeer = this.#discovered[peer.id];
-			// 	if (!hasPeer) this.#discovered[peer.id] = await new P2PTPeer(peer, this);
-      //   pubsub.publish('peer:discovered', this.#discovered[id]);
-      // })
-      // promises = await Promise.allSettled(promises)
+      const peers = await this.requestMorePeers();
+      let promises = Object.entries(peers).map(async ([id, peer]) => {
+				const hasPeer = this.#discovered[id];
+				if (!hasPeer) this.#discovered[id] = await new P2PTPeer(peer, this);
+        if (this.#discovered[id].connected) pubsub.publish('peer:discovered', this.#discovered[id]);
+      });
+      promises = await Promise.allSettled(promises);
       pubsub.publish('star:connected', tracker);
     });
 
     this.on('peerconnect', async (peer) => {
       this.#discovered[peer.id] = await new P2PTPeer(peer, this);
-      pubsub.publish('peer:discovered', this.#discovered[peer.id]);
+      if (this.#discovered[peer.id].connected) pubsub.publish('peer:discovered', this.#discovered[peer.id]);
     });
 
     this.on('peerclose', async (peer) => {
-      pubsub.publish('peer:left', this.#discovered[peer.id]);
+      if (this.#discovered[peer.id]) {
+        pubsub.publish('peer:left', this.#discovered[peer.id]);
+        delete this.#discovered[peer.id];
+      }
     });
 
     this.on('msg', async (peer, data, id, from) => {
       const hasPeer = this.#discovered[peer.id];
       if (!hasPeer) this.#discovered[peer.id] = await new P2PTPeer(peer, this);
 
-      this.#discovered[peer.id]?._handleMessage(new Uint8Array(Object.values(data)), id, from);
-      this.bw.down += data.length || data.byteLength;
+      if (this.#discovered[peer.id].connected) {
+        this.#discovered[peer.id]?._handleMessage(new Uint8Array(Object.values(data)), id, from);
+        this.bw.down += data.length || data.byteLength;
+      }
+      
     });
 
     this.on('data', async (peer, data) => {

package/exports/browser/{index-5ed49438.js → index-437bf7cd.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-54d061e3.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-8aded868.js';
 import './value-157ab062.js';
 
 /**

package/exports/browser/{messages-c26f8e97.js → messages-ccc03e41.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-54d061e3.js';
+import { F as FormatInterface } from './peernet-8aded868.js';
 import './value-157ab062.js';
 
 var proto$b = {

package/exports/browser/{peernet-54d061e3.js → peernet-8aded868.js}

@@ -5417,188 +5417,195 @@ new Mutex();
 
 new Mutex();
 
-const blockchainCodecs = [
-    {
-        name: 'leofcoin-block',
-        codec: '0x6c62',
-        hashAlg: 'dbl-keccak-512',
-    },
-    {
-        name: 'leofcoin-tx',
-        codec: '0x6c74',
-        hashAlg: 'dbl-keccak-512',
-    },
-    {
-        name: 'leofcoin-itx',
-        codec: '0x6c69',
-        hashAlg: 'keccak-512',
-    },
-    {
-        name: 'leofcoin-pr',
-        codec: '0x6c70',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'contract-message',
-        codec: '0x63636d',
-        hashAlg: 'keccak-256'
-    },
-    {
-        name: 'transaction-message',
-        codec: '0x746d',
-        hashAlg: 'keccak-256'
-    },
-    {
-        name: 'block-message',
-        codec: '0x626d',
-        hashAlg: 'keccak-256'
-    },
-    {
-        name: 'bw-message',
-        codec: '0x62776d',
-        hashAlg: 'keccak-256'
-    },
-    {
-        name: 'bw-request-message',
-        codec: '0x6277726d',
-        hashAlg: 'keccak-256'
-    },
-    {
-        name: 'validator-message',
-        codec: '0x766d',
-        hashAlg: 'keccak-256'
-    }
+const blockchainCodecs = [
+    {
+        name: 'leofcoin-block',
+        codec: '0x6c62',
+        hashAlg: 'dbl-keccak-512',
+    },
+    {
+        name: 'leofcoin-tx',
+        codec: '0x6c74',
+        hashAlg: 'dbl-keccak-512',
+    },
+    {
+        name: 'leofcoin-itx',
+        codec: '0x6c69',
+        hashAlg: 'keccak-512',
+    },
+    {
+        name: 'leofcoin-pr',
+        codec: '0x6c70',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'contract-message',
+        codec: '0x63636d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'transaction-message',
+        codec: '0x746d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'raw-transaction-message',
+        codec: '0x772746d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'block-message',
+        codec: '0x626d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'bw-message',
+        codec: '0x62776d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'bw-request-message',
+        codec: '0x6277726d',
+        hashAlg: 'keccak-256'
+    },
+    {
+        name: 'validator-message',
+        codec: '0x766d',
+        hashAlg: 'keccak-256'
+    }
 ];
 
-const internalCodecs = [
-    {
-        name: 'disco-hash',
-        codec: '0x30',
-        hashAlg: 'dbl-keccak-256',
-    },
-    {
-        name: 'peernet-peer-response',
-        codec: '0x707072',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-peer',
-        codec: '0x7070',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-dht',
-        codec: '0x706468',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-dht-response',
-        codec: '0x706472',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-data',
-        codec: '0x706461',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-data-response',
-        codec: '0x70646172',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-message',
-        codec: '0x706d65',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-ps',
-        codec: '707073',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-response',
-        codec: '0x7072',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-request',
-        codec: '0x707271',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-file',
-        codec: '0x7066',
-        hashAlg: 'keccak-256',
-    },
-    {
-        name: 'peernet-file-response',
-        codec: '0x706672',
-        hashAlg: 'keccak-256',
-    }
+const internalCodecs = [
+    {
+        name: 'disco-hash',
+        codec: '0x30',
+        hashAlg: 'dbl-keccak-256',
+    },
+    {
+        name: 'peernet-peer-response',
+        codec: '0x707072',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-peer',
+        codec: '0x7070',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-dht',
+        codec: '0x706468',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-dht-response',
+        codec: '0x706472',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-data',
+        codec: '0x706461',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-data-response',
+        codec: '0x70646172',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-message',
+        codec: '0x706d65',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-ps',
+        codec: '707073',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-response',
+        codec: '0x7072',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-request',
+        codec: '0x707271',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-file',
+        codec: '0x7066',
+        hashAlg: 'keccak-256',
+    },
+    {
+        name: 'peernet-file-response',
+        codec: '0x706672',
+        hashAlg: 'keccak-256',
+    }
 ];
 
-const codecs = [
-    ...internalCodecs,
-    ...blockchainCodecs,
-    {
-        name: 'chat-message',
-        codec: '0x70636d',
-        hashAlg: 'dbl-keccak-256',
-    }
+var social = [{
+        name: 'chat-message',
+        codec: '0x70636d',
+        hashAlg: 'dbl-keccak-256',
+    }];
+
+const codecs = [
+    ...internalCodecs,
+    ...blockchainCodecs,
+    ...social
 ];
 
-globalThis.peernetCodecs = globalThis.peernetCodecs || {};
-const addCodec = (codecInput) => {
-    let { hashAlg, codec, name } = codecInput;
-    if (!globalThis.peernetCodecs[name])
-        globalThis.peernetCodecs[name] = {
-            hashAlg,
-            codec: typeof codec === 'string' ? parseInt(codec, 16) : codec
-        };
-};
-const getCodec = (name) => {
-    if (typeof name === 'number')
-        return name;
-    return getCodecByName(name).codec;
-};
-const getCodecName = (codec) => {
-    return Object.keys(globalThis.peernetCodecs).reduce((p, c) => {
-        const item = globalThis.peernetCodecs[c];
-        if (item.codec === codec)
-            return c;
-        else
-            return p;
-    }, undefined);
-};
-const getCodecByName = (name) => globalThis.peernetCodecs[name];
-const getHashAlg = (name) => {
-    if (typeof name === 'number')
-        return getCodecByName(getCodecName(name)).hashAlg;
-    return getCodecByName(name).hashAlg;
-};
-const isCodec = (codec) => {
-    if (codec.codec !== undefined && codec.hashAlg)
-        return true;
-    return false;
-};
-const validateCodec = (codec) => {
-    if (codec.codec === undefined ||
-        codec.hashAlg === undefined ||
-        codec.name === undefined)
-        throw new Error(`invalid codecInput: ${codec}`);
-};
-for (const codec of codecs) {
-    addCodec(codec);
-}
-var utils$p = {
-    isCodec,
-    addCodec,
-    getCodec,
-    getHashAlg,
-    getCodecName,
-    validateCodec,
-    codecs: globalThis.peernetCodecs
+globalThis.peernetCodecs = globalThis.peernetCodecs || {};
+const addCodec = (codecInput) => {
+    let { hashAlg, codec, name } = codecInput;
+    if (!globalThis.peernetCodecs[name])
+        globalThis.peernetCodecs[name] = {
+            hashAlg,
+            codec: typeof codec === 'string' ? parseInt(codec, 16) : codec
+        };
+};
+const getCodec = (name) => {
+    if (typeof name === 'number')
+        return name;
+    return getCodecByName(name).codec;
+};
+const getCodecName = (codec) => {
+    return Object.keys(globalThis.peernetCodecs).reduce((p, c) => {
+        const item = globalThis.peernetCodecs[c];
+        if (item.codec === codec)
+            return c;
+        else
+            return p;
+    }, undefined);
+};
+const getCodecByName = (name) => globalThis.peernetCodecs[name];
+const getHashAlg = (name) => {
+    if (typeof name === 'number')
+        return getCodecByName(getCodecName(name)).hashAlg;
+    return getCodecByName(name).hashAlg;
+};
+const isCodec = (codec) => {
+    if (codec.codec !== undefined && codec.hashAlg)
+        return true;
+    return false;
+};
+const validateCodec = (codec) => {
+    if (codec.codec === undefined ||
+        codec.hashAlg === undefined ||
+        codec.name === undefined)
+        throw new Error(`invalid codecInput: ${codec}`);
+};
+for (const codec of codecs) {
+    addCodec(codec);
+}
+var utils$p = {
+    isCodec,
+    addCodec,
+    getCodec,
+    getHashAlg,
+    getCodecName,
+    validateCodec,
+    codecs: globalThis.peernetCodecs
 };
 
 /**
@@ -5630,11 +5637,11 @@ let BasicInterface$1 = class BasicInterface {
     // get Codec(): Codec {}
     protoEncode(data) {
         // check schema
-        return index$1.encode(this.proto, data);
+        return index$1.encode(this.proto, data, false);
     }
     protoDecode(data) {
         // check schema
-        return index$1.decode(this.proto, data);
+        return index$1.decode(this.proto, data, false);
     }
     isHex(string) {
         return isHex(string);
@@ -6031,14 +6038,7 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface$1 {
         const decoded = {};
         if (this.keys?.length > 0) {
             for (const key of this.keys) {
-                Object.defineProperties(decoded, {
-                    [key]: {
-                        enumerable: true,
-                        configurable: true,
-                        set: (value) => data[key],
-                        get: () => data[key]
-                    }
-                });
+                decoded[key] = data[key];
             }
             this.decoded = decoded;
             return this.encode(decoded);
@@ -20184,7 +20184,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-5ed49438.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-437bf7cd.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20355,7 +20355,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-c26f8e97.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-ccc03e41.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20434,7 +20434,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-345f1d43.js');
+        const importee = await import('./client-a56e0aac.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -20445,7 +20445,7 @@ class Peernet {
     }
     #peerLeft(peer) {
         for (const [id, _peer] of Object.entries(this.#connections)) {
-            if (_peer.id === peer.id) {
+            if (_peer.id === peer.id && this.#connections[id] && !this.#connections[id].connected) {
                 delete this.#connections[id];
                 this.removePeer(_peer);
             }

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-54d061e3.js';
+export { P as default } from './peernet-8aded868.js';
 import './value-157ab062.js';

package/exports/peernet.js

@@ -603,7 +603,7 @@ class Peernet {
     }
     #peerLeft(peer) {
         for (const [id, _peer] of Object.entries(this.#connections)) {
-            if (_peer.id === peer.id) {
+            if (_peer.id === peer.id && this.#connections[id] && !this.#connections[id].connected) {
                 delete this.#connections[id];
                 this.removePeer(_peer);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.28",
+  "version": "1.1.30",
   "description": "",
   "main": "src/peernet.js",
   "exports": {

package/src/peernet.ts

@@ -288,7 +288,7 @@ export default class Peernet {
 
   #peerLeft(peer) {
     for (const [id, _peer] of Object.entries(this.#connections)) {
-      if (_peer.id === peer.id) {
+      if (_peer.id === peer.id && this.#connections[id] && !this.#connections[id].connected) {
         delete this.#connections[id]
         this.removePeer(_peer)
       }

package/test.js

@@ -6,12 +6,21 @@ import Client from './exports/peernet.js'
     network: 'leofcoin:peach', networkVersion: 'peach', stars: ['wss://peach.leofcoin.org']
   })
   console.log(pubsub.subscribers);
+  pubsub.subscribe('peer:discovered', (data) => {
+    // console.log(data);
+    console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`);
+    console.log(Object.keys(peernet.client.discovered));
+  })
   pubsub.subscribe('peer:connected', (data) => {
-    console.log(data);
+    // console.log(data);
+    console.log(`connections: ${peernet.connections.length}`);
   })
-  pubsub.subscribe('peer:data', (data) => {
-    console.log(data);
+  pubsub.subscribe('peer:left', (data) => {
+    console.log(`connections: ${peernet.connections.length}`);
+    console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`);
+    // console.log(data);
   })
+
   // peernet.addFolder([{
   //   path: 'assets/asset.png',
   //   content: Buffer.from('png')