shogun-core 3.2.0 → 3.2.2

package/dist/ship/implementation/SHIP_01.js

@@ -259,7 +259,7 @@ class SHIP_01 {
                 messageId: messageId
             };
             // Salva sul nodo globale 'messages' per permettere il listener
-            await this.shogun.db.gun.get('messages').get(messageId).put(messageData).then();
+            await this.shogun.db.gun.get(SHIP_01.NODES.MESSAGES).get(messageId).put(messageData).then();
             console.log(`✅ Messaggio salvato: ${messageId}`);
             return {
                 success: true,
@@ -323,7 +323,7 @@ class SHIP_01 {
         const receivedMessages = new Set();
         // Ascolta messaggi in tempo reale su GunDB
         this.shogun.db.gun
-            .get(`messages`)
+            .get(SHIP_01.NODES.MESSAGES)
             .map()
             .on(async (data, key) => {
             // Filtra solo i messaggi destinati a questo utente (per username)
@@ -408,43 +408,62 @@ class SHIP_01 {
         const userPub = currentUser.is.pub;
         const username = currentUser.is.alias;
         const allMessages = [];
+        console.log(`[SHIP-01] Getting history between ${username} (${userPub.substring(0, 20)}...) and ${withUsername}`);
         // Ottieni il userPub dell'altro utente
         const otherUserData = await this.shogun.db.getUserByAlias(withUsername);
         const otherUserPub = otherUserData?.userPub;
-        // Recupera tutti i messaggi dal nodo 'messages' e filtra
-        const allMessagesNode = await this.shogun.db.gun.get('messages').then();
-        if (allMessagesNode) {
-            for (const [messageId, data] of Object.entries(allMessagesNode)) {
-                if (typeof data === 'object' && data !== null) {
-                    const msgData = data;
-                    // Filtra messaggi tra questo utente e withUsername
-                    // Messaggi inviati da me a loro
-                    const isSentToTarget = msgData.from === userPub && msgData.to === withUsername;
-                    // Messaggi ricevuti da loro
-                    const isReceivedFromTarget = msgData.to === username &&
-                        (msgData.from === otherUserPub ||
-                            msgData.from);
-                    if ((isSentToTarget || isReceivedFromTarget) && msgData.content && msgData.messageId) {
-                        try {
-                            // Decripta ogni messaggio
-                            const decryptedContent = await this.decryptMessage(msgData.content, msgData.from);
-                            allMessages.push({
-                                from: msgData.from,
-                                to: msgData.to,
-                                content: decryptedContent,
-                                timestamp: parseInt(msgData.timestamp)
-                            });
-                        }
-                        catch (error) {
-                            console.error(`❌ Errore decrittazione messaggio ${messageId}:`, error);
-                            // Salta messaggi che non possono essere decriptati
-                        }
+        console.log(`[SHIP-01] Other user pub: ${otherUserPub?.substring(0, 20) || 'not found'}...`);
+        // Use .map() instead of .then() to iterate all messages
+        return new Promise((resolve) => {
+            const messages = [];
+            let messageCount = 0;
+            this.shogun.db.gun.get(SHIP_01.NODES.MESSAGES).map().once(async (msgData, messageId) => {
+                // Skip metadata fields
+                if (!msgData || typeof msgData !== 'object' || messageId === '_') {
+                    return;
+                }
+                messageCount++;
+                console.log(`[SHIP-01] Checking message ${messageId}:`, {
+                    from: msgData.from?.substring(0, 20),
+                    to: msgData.to,
+                    hasContent: !!msgData.content
+                });
+                try {
+                    // Check if message is part of this conversation
+                    // Fixed: Handle both username and userPub in matching
+                    const isSentToTarget = msgData.from === userPub && (msgData.to === withUsername || msgData.to === otherUserPub);
+                    const isReceivedFromTarget = (msgData.to === username || msgData.to === userPub) && msgData.from === otherUserPub;
+                    console.log(`[SHIP-01] Message ${messageId} match:`, {
+                        isSentToTarget,
+                        isReceivedFromTarget,
+                        fromMatch: msgData.from === userPub,
+                        toMatch: msgData.to === withUsername,
+                        receivedToMatch: msgData.to === username,
+                        receivedFromMatch: msgData.from === otherUserPub
+                    });
+                    if (isSentToTarget || isReceivedFromTarget) {
+                        // Decrypt message
+                        const decryptedContent = await this.decryptMessage(msgData.content, msgData.from);
+                        messages.push({
+                            from: msgData.from,
+                            to: msgData.to,
+                            content: decryptedContent,
+                            timestamp: parseInt(msgData.timestamp)
+                        });
+                        console.log(`[SHIP-01] ✅ Decrypted message from ${msgData.from.substring(0, 20)}...`);
                     }
                 }
-            }
-        }
-        // Ordina per timestamp
-        return allMessages.sort((a, b) => a.timestamp - b.timestamp);
+                catch (error) {
+                    console.error(`[SHIP-01] ❌ Error processing message ${messageId}:`, error);
+                }
+            });
+            // Wait a bit for GunDB to return all messages, then resolve
+            setTimeout(() => {
+                console.log(`[SHIP-01] Found ${messages.length} messages out of ${messageCount} total`);
+                const sorted = messages.sort((a, b) => a.timestamp - b.timestamp);
+                resolve(sorted);
+            }, 2000);
+        });
     }
     // ========================================================================
     // 7. UTILITY FUNCTIONS
@@ -490,6 +509,12 @@ class SHIP_01 {
     }
 }
 exports.SHIP_01 = SHIP_01;
+// GunDB Node Names - Constants for clarity
+SHIP_01.NODES = {
+    MESSAGES: 'messages',
+    USERS: 'users',
+    PUBLIC_KEYS: 'publicKeys'
+};
 // ============================================================================
 // 8. ESEMPIO D'USO COMPLETO
 // ============================================================================

package/dist/types/ship/implementation/SHIP_01.d.ts

@@ -29,6 +29,7 @@ import { ISEAPair } from "../../src/types/shogun";
  */
 declare class SHIP_01 implements ISHIP_01 {
     private shogun;
+    private static readonly NODES;
     constructor(shogunConfig: ShogunCoreConfig);
     /**
      * Registra un nuovo utente

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shogun-core",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "SHOGUN CORE - Core library for Shogun Ecosystem",
   "main": "./dist/index.js",
   "module": "./dist/index.js",