@cappitolian/network-discovery 0.0.8 → 0.0.10

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["NetworkDiscoveryPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
     ],
     targets: [
         .target(

package/README.md

@@ -35,7 +35,7 @@ import { NetworkDiscovery } from '@cappitolian/network-discovery';
 // Start advertising your server
 await NetworkDiscovery.startAdvertising({
   serviceName: 'MyAppServer',
-  serviceType: '_http._tcp',  // or '_myapp._tcp' for custom service to avoid conflicts with other services
+  serviceType: '_http._tcp',  // or '_myapp._tcp' for custom service
   port: 8080,
   txtRecord: {
     ip: '192.168.1.100',      // Your server IP
@@ -69,7 +69,7 @@ NetworkDiscovery.addListener('serviceLost', (service) => {
 
 // Start discovery
 await NetworkDiscovery.startDiscovery({
-  serviceType: '_http._tcp',  // Must match the server's serviceType or '_myapp._tcp' for custom service to avoid conflicts with other services
+  serviceType: '_http._tcp',  // Must match the server's serviceType
   domain: 'local.'            // Optional, defaults to 'local.'
 });
 
@@ -94,7 +94,7 @@ async startServer() {
   // Advertise server
   await NetworkDiscovery.startAdvertising({
     serviceName: 'MyAppServer',
-    serviceType: '_http._tcp', // Must match the server's serviceType or '_myapp._tcp' for custom service to avoid conflicts with other services
+    serviceType: '_myapp._tcp',
     port: 8080,
     txtRecord: { 
       ip: ip,
@@ -138,7 +138,7 @@ async findAndConnectToServer() {
     
     // Start discovery
     NetworkDiscovery.startDiscovery({
-      serviceType: '_http._tcp' // Must match the server's serviceType or '_myapp._tcp' for custom service to avoid conflicts with other services
+      serviceType: '_myapp._tcp'
     });
     
     // Timeout after 10 seconds

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

@@ -1,217 +1,225 @@
-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.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, "Android: Service RESOLVED");
+                        Log.d(TAG, "   Name: " + serviceInfo.getServiceName());
+                        Log.d(TAG, "   Host: " + (serviceInfo.getHost() != null ? serviceInfo.getHost().getHostAddress() : "null"));
+                        Log.d(TAG, "   Port: " + serviceInfo.getPort());
+    
+                        JSObject serviceData = buildServiceObject(serviceInfo);
+    
+                        Log.d(TAG, "Android: Calling callback.onServiceFound with data: " + serviceData.toString());
+    
+                        callback.onServiceFound(serviceData);
+    
+                        Log.d(TAG, "Android: callback.onServiceFound COMPLETED");
+}
+                    });
+            }
+
+            @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/android/src/main/java/com/cappitolian/plugins/networkdiscovery/NetworkDiscoveryPlugin.java

@@ -8,6 +8,7 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 
 @CapacitorPlugin(name = "NetworkDiscovery")
 public class NetworkDiscoveryPlugin extends Plugin {
+
     private NetworkDiscovery implementation;
 
     @Override
@@ -82,12 +83,24 @@ public class NetworkDiscoveryPlugin extends Plugin {
 
             @Override
             public void onServiceFound(JSObject service) {
-                notifyListeners("serviceFound", service);
+                // ✅ IMPORTANTE: Usar getBridge().executeOnMainThread
+                getBridge().executeOnMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        notifyListeners("serviceFound", service);
+                    }
+                });
             }
 
             @Override
             public void onServiceLost(JSObject service) {
-                notifyListeners("serviceLost", service);
+                // ✅ IMPORTANTE: Usar getBridge().executeOnMainThread
+                getBridge().executeOnMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        notifyListeners("serviceLost", service);
+                    }
+                });
             }
 
             @Override

package/ios/Sources/NetworkDiscoveryPlugin/NetworkDiscoveryPlugin.swift

@@ -2,32 +2,15 @@ import Foundation
 import Capacitor
 
 @objc(NetworkDiscoveryPlugin)
-public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscoveryDelegate {
-    
-    // MARK: - CAPBridgedPlugin Properties
-    public let identifier = "NetworkDiscoveryPlugin"
-    public let jsName = "NetworkDiscovery"
-    public let pluginMethods: [CAPPluginMethod] = [
-        CAPPluginMethod(name: "startAdvertising", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopAdvertising", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "startDiscovery", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopDiscovery", returnType: CAPPluginReturnPromise)
-    ]
-    
-    // MARK: - Properties
+public class NetworkDiscoveryPlugin: CAPPlugin, NetworkDiscoveryDelegate {
     private var implementation: NetworkDiscovery?
     
-    // MARK: - Lifecycle
-    public override func load() {
-        print("✅ NetworkDiscoveryPlugin: Plugin loaded")
+    override public func load() {
         implementation = NetworkDiscovery()
         implementation?.delegate = self
     }
     
-    // MARK: - Plugin Methods
     @objc func startAdvertising(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: startAdvertising() called")
-        
         guard let serviceName = call.getString("serviceName"),
               let serviceType = call.getString("serviceType"),
               let port = call.getInt("port") else {
@@ -37,8 +20,6 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
         
         let txtRecord = call.getObject("txtRecord") as? [String: String]
         
-        print("📡 NetworkDiscoveryPlugin: Starting advertising - \(serviceName)")
-        
         implementation?.startAdvertising(
             serviceName: serviceName,
             serviceType: serviceType,
@@ -50,14 +31,11 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
     }
     
     @objc func stopAdvertising(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: stopAdvertising() called")
         implementation?.stopAdvertising()
         call.resolve(["success": true])
     }
     
     @objc func startDiscovery(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: startDiscovery() called")
-        
         guard let serviceType = call.getString("serviceType") else {
             call.reject("Missing serviceType parameter")
             return
@@ -65,40 +43,33 @@ public class NetworkDiscoveryPlugin: CAPPlugin, CAPBridgedPlugin, NetworkDiscove
         
         let domain = call.getString("domain") ?? "local."
         
-        print("🔍 NetworkDiscoveryPlugin: Starting discovery for \(serviceType)")
-        
         implementation?.startDiscovery(serviceType: serviceType, domain: domain)
         call.resolve()
     }
     
     @objc func stopDiscovery(_ call: CAPPluginCall) {
-        print("📞 NetworkDiscoveryPlugin: stopDiscovery() called")
         implementation?.stopDiscovery()
         call.resolve(["success": true])
     }
     
     // MARK: - NetworkDiscoveryDelegate
     public func advertisingDidStart() {
-        print("✅ NetworkDiscoveryPlugin: Advertising started successfully")
+        print("Advertising started successfully")
     }
     
     public func advertisingDidFail(error: String) {
-        print("❌ NetworkDiscoveryPlugin: Advertising failed - \(error)")
+        print("Advertising failed: \(error)")
     }
     
     public func serviceFound(serviceData: [String : Any]) {
-        print("📨 NetworkDiscoveryPlugin: Service found, notifying listeners")
-        print("   Service data: \(serviceData)")
         notifyListeners("serviceFound", data: serviceData)
     }
     
     public func serviceLost(serviceData: [String : Any]) {
-        print("📨 NetworkDiscoveryPlugin: Service lost, notifying listeners")
-        print("   Service data: \(serviceData)")
         notifyListeners("serviceLost", data: serviceData)
     }
     
     public func discoveryDidFail(error: String) {
-        print("❌ NetworkDiscoveryPlugin: Discovery failed - \(error)")
+        print("Discovery failed: \(error)")
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cappitolian/network-discovery",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A Capacitor plugin for network service discovery using mDNS/Bonjour. Allows automatic server-client connection without manual IP configuration.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -52,10 +52,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^7.4.5",
-    "@capacitor/core": "^7.4.5",
+    "@capacitor/android": "^7.0.0",
+    "@capacitor/core": "^7.0.0",
     "@capacitor/docgen": "^0.3.1",
-    "@capacitor/ios": "^7.4.5",
+    "@capacitor/ios": "^7.0.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
@@ -68,7 +68,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": "^7.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",