magnetk 2.3.0 → 2.4.0

package/client.js

@@ -24,6 +24,8 @@ const MSG_TYPE = {
     MSG_CHUNK_RES: 0x21,
     MSG_GET_IDENTITY: 0x32,
     MSG_IDENTITY_RES: 0x33,
+    MSG_PROXY_CONNECT: 0x40,
+    MSG_PROXY_READY: 0x41,
     MSG_ERROR: 0xFF
 };
 
@@ -512,7 +514,54 @@ export class MagnetkClient extends EventEmitter {
             } catch (e) { }
         }
 
-        if (!socket) throw new Error('All seed connection attempts failed.');
+        if (!socket) {
+            // ===== RELAY PROXY FALLBACK =====
+            // All direct connections failed — try connecting through the relay
+            if (this.config.enableRelayFallback !== false && lookupResult && lookupResult.found && lookupResult.seeds.length > 0) {
+                const seed = lookupResult.seeds[0];
+                console.log(`[Magnetk-JS] Direct connection failed, trying relay proxy for seed ${seed.peer_id.substring(0, 12)}...`);
+
+                try {
+                    socket = await this.connect(relayHost, discoveryPort);
+                    const proxyWriter = new FrameWriter(socket);
+                    const proxyReader = new FrameReader(socket);
+
+                    // Request relay to proxy connection to seed
+                    await proxyWriter.writeJSON(MSG_TYPE.MSG_PROXY_CONNECT, {
+                        peer_id: seed.peer_id,
+                        file_hash: ml.fileHash
+                    });
+
+                    // Wait for proxy ready or error
+                    const proxyFrame = await proxyReader.readFrame();
+                    if (proxyFrame.type === MSG_TYPE.MSG_PROXY_READY) {
+                        const proxyResult = JSON.parse(proxyFrame.payload.toString());
+                        if (proxyResult.success) {
+                            console.log(`[Magnetk-JS] Relay proxy connected to seed`);
+                            connectionType = CONNECTION_TYPE.RELAYED;
+                            finalAddr = `relay-proxy:${relayHost}:${discoveryPort}`;
+                            this.emit('connection-type', { type: connectionType });
+                        } else {
+                            socket.destroy();
+                            socket = null;
+                        }
+                    } else if (proxyFrame.type === MSG_TYPE.MSG_ERROR) {
+                        const errResult = JSON.parse(proxyFrame.payload.toString());
+                        console.log(`[Magnetk-JS] Relay proxy error: ${errResult.message}`);
+                        socket.destroy();
+                        socket = null;
+                    } else {
+                        socket.destroy();
+                        socket = null;
+                    }
+                } catch (e) {
+                    console.log(`[Magnetk-JS] Relay proxy failed: ${e.message}`);
+                    if (socket) { socket.destroy(); socket = null; }
+                }
+            }
+        }
+
+        if (!socket) throw new Error('All seed connection attempts failed (direct + relay proxy).');
 
         this.lastDownloadStats.connectionType = connectionType;
         this.lastDownloadStats.remoteAddr = finalAddr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magnetk",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "JavaScript SDK for Magnetk P2P File Transfer System",
   "main": "index.js",
   "bin": {