@cappitolian/network-discovery 0.0.12 → 0.0.14

package/android/src/main/java/com/cappitolian/plugins/networkdiscovery/NetworkDiscovery.java

@@ -1,217 +1,158 @@
-package com.cappitolian.plugins.networkdiscovery;
-
-import android.content.Context;
-import android.net.nsd.NsdManager;
-import android.net.nsd.NsdServiceInfo;
-import android.util.Log;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.net.InetAddress;
-import java.util.Map;
-import java.util.Iterator;
-
-public class NetworkDiscovery {
-    private static final String TAG = "NetworkDiscovery";
-    private NsdManager nsdManager;
-    private NsdManager.RegistrationListener registrationListener;
-    private NsdManager.DiscoveryListener discoveryListener;
-    private NsdServiceInfo serviceInfo;
-    private Plugin plugin;
-
-    public NetworkDiscovery(Plugin plugin, Context context) {
-        this.plugin = plugin;
-        this.nsdManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE);
-    }
-
-    public void startAdvertising(
-        String serviceName,
-        String serviceType,
-        int port,
-        JSObject txtRecord,
-        AdvertisingCallback callback
-    ) {
-        serviceInfo = new NsdServiceInfo();
-        serviceInfo.setServiceName(serviceName);
-        serviceInfo.setServiceType(serviceType);
-        serviceInfo.setPort(port);
-
-        // Agregar TXT records
-        if (txtRecord != null) {
-            Iterator<String> keys = txtRecord.keys();
-            while (keys.hasNext()) {
-            String key = keys.next();
-                try {
-                    String value = txtRecord.getString(key);
-                    serviceInfo.setAttribute(key, value);
-                } catch (Exception e) {
-                    Log.e(TAG, "Error setting attribute: " + key, e);
-                }
-            }
-        }
-
-        registrationListener = new NsdManager.RegistrationListener() {
-            @Override
-            public void onRegistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                Log.e(TAG, "Service registration failed: " + errorCode);
-                callback.onError("Registration failed with error code: " + errorCode);
-            }
-
-            @Override
-            public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                Log.e(TAG, "Service unregistration failed: " + errorCode);
-            }
-
-            @Override
-            public void onServiceRegistered(NsdServiceInfo serviceInfo) {
-                Log.d(TAG, "Service registered: " + serviceInfo.getServiceName());
-                callback.onSuccess();
-            }
-
-            @Override
-            public void onServiceUnregistered(NsdServiceInfo serviceInfo) {
-                Log.d(TAG, "Service unregistered");
-            }
-        };
-
-        nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener);
-    }
-
-    public void stopAdvertising(StopCallback callback) {
-        if (registrationListener != null) {
-            try {
-                nsdManager.unregisterService(registrationListener);
-                registrationListener = null;
-                callback.onSuccess();
-            } catch (Exception e) {
-                callback.onError("Error stopping advertising: " + e.getMessage());
-            }
-        } else {
-            callback.onError("No active advertising to stop");
-        }
-    }
-
-    public void startDiscovery(String serviceType, DiscoveryCallback callback) {
-        discoveryListener = new NsdManager.DiscoveryListener() {
-            @Override
-            public void onStartDiscoveryFailed(String serviceType, int errorCode) {
-                Log.e(TAG, "Discovery start failed: " + errorCode);
-                nsdManager.stopServiceDiscovery(this);
-                callback.onError("Discovery failed with error code: " + errorCode);
-            }
-
-            @Override
-            public void onStopDiscoveryFailed(String serviceType, int errorCode) {
-                Log.e(TAG, "Discovery stop failed: " + errorCode);
-            }
-
-            @Override
-            public void onDiscoveryStarted(String serviceType) {
-                Log.d(TAG, "Service discovery started");
-                callback.onDiscoveryStarted();
-            }
-
-            @Override
-            public void onDiscoveryStopped(String serviceType) {
-                Log.d(TAG, "Service discovery stopped");
-            }
-
-            @Override
-            public void onServiceFound(NsdServiceInfo service) {
-                Log.d(TAG, "Service found: " + service.getServiceName());
-                
-                nsdManager.resolveService(service, new NsdManager.ResolveListener() {
-                    @Override
-                    public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
-                        Log.e(TAG, "Resolve failed: " + errorCode);
-                    }
-
-                    @Override
-                    public void onServiceResolved(NsdServiceInfo serviceInfo) {
-                        Log.d(TAG, "Service resolved: " + serviceInfo);
-                        
-                        JSObject serviceData = buildServiceObject(serviceInfo);
-                        callback.onServiceFound(serviceData);
-                    }
-                });
-            }
-
-            @Override
-            public void onServiceLost(NsdServiceInfo service) {
-                Log.d(TAG, "Service lost: " + service.getServiceName());
-                
-                JSObject serviceData = new JSObject();
-                serviceData.put("serviceName", service.getServiceName());
-                serviceData.put("serviceType", service.getServiceType());
-                
-                callback.onServiceLost(serviceData);
-            }
-        };
-
-        nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryListener);
-    }
-
-    public void stopDiscovery(StopCallback callback) {
-        if (discoveryListener != null) {
-            try {
-                nsdManager.stopServiceDiscovery(discoveryListener);
-                discoveryListener = null;
-                callback.onSuccess();
-            } catch (Exception e) {
-                callback.onError("Error stopping discovery: " + e.getMessage());
-            }
-        } else {
-            callback.onError("No active discovery to stop");
-        }
-    }
-
-    private JSObject buildServiceObject(NsdServiceInfo serviceInfo) {
-        JSObject serviceData = new JSObject();
-        serviceData.put("serviceName", serviceInfo.getServiceName());
-        serviceData.put("serviceType", serviceInfo.getServiceType());
-        serviceData.put("hostName", serviceInfo.getHost() != null ? serviceInfo.getHost().getHostName() : "");
-        serviceData.put("port", serviceInfo.getPort());
-        
-        // Agregar direcciones IP
-        InetAddress host = serviceInfo.getHost();
-        if (host != null) {
-          JSONArray addresses = new JSONArray();
-          addresses.put(host.getHostAddress());
-          serviceData.put("addresses", addresses);
-        }
-        
-        // Agregar TXT records
-        Map<String, byte[]> attributes = serviceInfo.getAttributes();
-        if (attributes != null && !attributes.isEmpty()) {
-            JSObject txtRecordObj = new JSObject();
-            for (Map.Entry<String, byte[]> entry : attributes.entrySet()) {
-                txtRecordObj.put(entry.getKey(), new String(entry.getValue()));
-            }
-            serviceData.put("txtRecord", txtRecordObj);
-        }
-        
-        return serviceData;
-    }
-
-    // Callbacks interfaces
-    public interface AdvertisingCallback {
-        void onSuccess();
-        void onError(String error);
-    }
-
-    public interface StopCallback {
-        void onSuccess();
-        void onError(String error);
-    }
-
-    public interface DiscoveryCallback {
-        void onDiscoveryStarted();
-        void onServiceFound(JSObject service);
-        void onServiceLost(JSObject service);
-        void onError(String error);
-    }
+package com.cappitolian.plugins.networkdiscovery;
+
+import android.content.Context;
+import android.net.nsd.NsdManager;
+import android.net.nsd.NsdServiceInfo;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+import android.os.Looper;
+import com.getcapacitor.JSObject;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+public class NetworkDiscovery {
+    private NsdManager nsdManager;
+    private WifiManager.MulticastLock multicastLock;
+    private NsdManager.RegistrationListener activeRegistrationListener;
+    private NsdManager.DiscoveryListener activeDiscoveryListener;
+
+    public interface Callback {
+        void success(JSObject data);
+        void error(String msg);
+    }
+
+    public NetworkDiscovery(Context context) {
+        nsdManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE);
+        WifiManager wm = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        multicastLock = wm.createMulticastLock("SSSPOS_Lock");
+        multicastLock.setReferenceCounted(true);
+    }
+
+    public void startServer(String name, String type, int port, Map<String, String> metadata, final Callback callback) {
+        stopServer(null);
+        if (!multicastLock.isHeld()) multicastLock.acquire();
+
+        // TRUCO: Incluimos la IP en el nombre por si los metadatos fallan en iOS
+        String ipForName = (metadata != null && metadata.containsKey("ip")) ? metadata.get("ip") : "";
+        String displayName = ipForName.isEmpty() ? name : name + "-" + ipForName;
+
+        NsdServiceInfo serviceInfo = new NsdServiceInfo();
+        serviceInfo.setServiceName(displayName);
+        serviceInfo.setServiceType(type);
+        serviceInfo.setPort(port);
+
+        // IMPORTANTE: Atributos antes de registrar
+        if (metadata != null) {
+            for (Map.Entry<String, String> entry : metadata.entrySet()) {
+                serviceInfo.setAttribute(entry.getKey().toLowerCase(), entry.getValue());
+            }
+        }
+
+        activeRegistrationListener = new NsdManager.RegistrationListener() {
+            @Override public void onServiceRegistered(NsdServiceInfo info) { callback.success(new JSObject()); }
+            @Override public void onRegistrationFailed(NsdServiceInfo info, int err) { callback.error("REG_ERR_" + err); }
+            @Override public void onServiceUnregistered(NsdServiceInfo info) {}
+            @Override public void onUnregistrationFailed(NsdServiceInfo info, int err) {}
+        };
+
+        nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, activeRegistrationListener);
+    }
+
+    public void findServer(String name, String type, int timeout, final Callback callback) {
+        stopDiscovery();
+        if (!multicastLock.isHeld()) multicastLock.acquire();
+
+        final String cleanType = type.startsWith("_") ? type : "_" + type;
+        final boolean[] finished = {false};
+
+        activeDiscoveryListener = new NsdManager.DiscoveryListener() {
+            @Override public void onDiscoveryStarted(String s) {}
+            @Override public void onStartDiscoveryFailed(String s, int i) { if(!finished[0]){ finished[0]=true; callback.error("START_FAIL"); } }
+            @Override
+            public void onServiceFound(NsdServiceInfo service) {
+                // 1. Log para ver qué está viendo Android realmente antes de filtrar
+                System.out.println("NSD_DEBUG: Servicio encontrado en red: " + service.getServiceName());
+
+                // 2. Filtro estricto: El nombre debe empezar con el prefijo exacto
+                if (service.getServiceName().startsWith(name)) {
+                    nsdManager.resolveService(service, new NsdManager.ResolveListener() {
+                        @Override public void onResolveFailed(NsdServiceInfo nsi, int i) {
+                            System.out.println("NSD_DEBUG: Fallo al resolver servicio: " + i);
+                        }
+
+                        @Override
+                        public void onServiceResolved(NsdServiceInfo resolved) {
+                            if (!finished[0]) {
+                                String sName = resolved.getServiceName();
+                                
+                                // --- LÓGICA ANTI-GHOSTING ---
+                                // Intentamos sacar la IP del nombre primero (es la fuente de verdad)
+                                String ipFromName = "";
+                                if (sName.contains("-")) {
+                                    ipFromName = sName.substring(sName.lastIndexOf("-") + 1);
+                                }
+
+                                // Si el nombre no tiene IP, usamos la resuelta por el sistema
+                                String resolvedIp = resolved.getHost().getHostAddress();
+                                if (resolvedIp.startsWith("/")) resolvedIp = resolvedIp.substring(1);
+
+                                // Decisión final de IP
+                                String finalIp = (!ipFromName.isEmpty()) ? ipFromName : resolvedIp;
+
+                                // IMPORTANTE: Si la IP resuelta es 0.0.0.0 o vacía, ignoramos este evento
+                                if (finalIp.equals("0.0.0.0") || finalIp.isEmpty()) return;
+
+                                finished[0] = true;
+                                stopDiscovery();
+
+                                JSObject res = new JSObject();
+                                JSObject meta = new JSObject();
+                                for (Map.Entry<String, byte[]> entry : resolved.getAttributes().entrySet()) {
+                                    meta.put(entry.getKey(), new String(entry.getValue(), StandardCharsets.UTF_8));
+                                }
+
+                                res.put("ip", finalIp);
+                                res.put("port", resolved.getPort());
+                                res.put("metadata", meta);
+                                
+                                System.out.println("NSD_DEBUG: IP Final entregada al Cliente: " + finalIp);
+                                callback.success(res);
+                            }
+                        }
+                    });
+                }
+            }
+            @Override public void onStopDiscoveryFailed(String s, int i) {}
+            @Override public void onDiscoveryStopped(String s) {}
+            @Override public void onServiceLost(NsdServiceInfo s) {}
+        };
+
+        nsdManager.discoverServices(cleanType, NsdManager.PROTOCOL_DNS_SD, activeDiscoveryListener);
+        new Handler(Looper.getMainLooper()).postDelayed(() -> {
+            if (!finished[0]) { finished[0]=true; stopDiscovery(); callback.error("TIMEOUT_ERROR"); }
+        }, timeout);
+    }
+
+    public void stopServer(Callback c) {
+        if (activeRegistrationListener != null) { try { nsdManager.unregisterService(activeRegistrationListener); } catch (Exception e) {} }
+        activeRegistrationListener = null;
+        if (multicastLock.isHeld()) multicastLock.release();
+        if (c != null) c.success(new JSObject());
+    }
+
+    public void stopDiscovery() {
+        if (activeDiscoveryListener != null) {
+            try {
+                nsdManager.stopServiceDiscovery(activeDiscoveryListener);
+                System.out.println("NSD_DEBUG: Discovery detenido.");
+            } catch (Exception e) {
+                System.out.println("NSD_DEBUG: Error al detener discovery: " + e.getMessage());
+            }
+            activeDiscoveryListener = null;
+        }
+        // Liberamos el lock solo si se detiene por completo el proceso
+        if (multicastLock != null && multicastLock.isHeld()) {
+            multicastLock.release();
+        }
+    }
 }

package/android/src/main/java/com/cappitolian/plugins/networkdiscovery/NetworkDiscoveryPlugin.java

@@ -1,116 +1,62 @@
-package com.cappitolian.plugins.networkdiscovery;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-@CapacitorPlugin(name = "NetworkDiscovery")
-public class NetworkDiscoveryPlugin extends Plugin {
-    private NetworkDiscovery implementation;
-
-    @Override
-    public void load() {
-        implementation = new NetworkDiscovery(this, getContext());
-    }
-
-    @PluginMethod
-    public void startAdvertising(PluginCall call) {
-        String serviceName = call.getString("serviceName");
-        String serviceType = call.getString("serviceType");
-        Integer port = call.getInt("port");
-        JSObject txtRecord = call.getObject("txtRecord");
-
-        if (serviceName == null || serviceType == null || port == null) {
-            call.reject("Missing required parameters");
-            return;
-        }
-
-        implementation.startAdvertising(
-            serviceName,
-            serviceType,
-            port,
-            txtRecord,
-            new NetworkDiscovery.AdvertisingCallback() {
-                @Override
-                public void onSuccess() {
-                    JSObject ret = new JSObject();
-                    ret.put("success", true);
-                    call.resolve(ret);
-                }
-
-                @Override
-                public void onError(String error) {
-                    call.reject(error);
-                }
-            }
-        );
-    }
-
-    @PluginMethod
-    public void stopAdvertising(PluginCall call) {
-        implementation.stopAdvertising(new NetworkDiscovery.StopCallback() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("success", true);
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
-
-    @PluginMethod
-    public void startDiscovery(PluginCall call) {
-        String serviceType = call.getString("serviceType");
-
-        if (serviceType == null) {
-            call.reject("Missing serviceType parameter");
-            return;
-        }
-
-        implementation.startDiscovery(serviceType, new NetworkDiscovery.DiscoveryCallback() {
-            @Override
-            public void onDiscoveryStarted() {
-                call.resolve();
-            }
-
-            @Override
-            public void onServiceFound(JSObject service) {
-                notifyListeners("serviceFound", service);
-            }
-
-            @Override
-            public void onServiceLost(JSObject service) {
-                notifyListeners("serviceLost", service);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
-
-    @PluginMethod
-    public void stopDiscovery(PluginCall call) {
-        implementation.stopDiscovery(new NetworkDiscovery.StopCallback() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("success", true);
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onError(String error) {
-                call.reject(error);
-            }
-        });
-    }
+package com.cappitolian.plugins.networkdiscovery;
+
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+@CapacitorPlugin(name = "NetworkDiscovery")
+public class NetworkDiscoveryPlugin extends Plugin {
+    private NetworkDiscovery implementation;
+
+    @Override
+    public void load() {
+        implementation = new NetworkDiscovery(getContext());
+    }
+
+    @PluginMethod
+    public void startServer(PluginCall call) {
+        String name = call.getString("serviceName");
+        String type = call.getString("serviceType");
+        Integer port = call.getInt("port", 8081);
+        JSObject metaJS = call.getObject("metadata");
+
+        Map<String, String> metadata = new HashMap<>();
+        if (metaJS != null) {
+            Iterator<String> keys = metaJS.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                metadata.put(key, metaJS.getString(key));
+            }
+        }
+
+        implementation.startServer(name, type, port, metadata, new NetworkDiscovery.Callback() {
+            @Override public void success(JSObject data) { call.resolve(data); }
+            @Override public void error(String msg) { call.reject(msg); }
+        });
+    }
+
+    @PluginMethod
+    public void stopServer(PluginCall call) {
+        implementation.stopServer(new NetworkDiscovery.Callback() {
+            @Override public void success(JSObject data) { call.resolve(data); }
+            @Override public void error(String msg) { call.reject(msg); }
+        });
+    }
+
+    @PluginMethod
+    public void findServer(PluginCall call) {
+        String name = call.getString("serviceName");
+        String type = call.getString("serviceType");
+        Integer timeout = call.getInt("timeout", 10000);
+
+        implementation.findServer(name, type, timeout, new NetworkDiscovery.Callback() {
+            @Override public void success(JSObject data) { call.resolve(data); }
+            @Override public void error(String msg) { call.reject(msg); }
+        });
+    }
 }