wifidirectplugin 1.3.6 → 1.3.8

package/android/src/main/java/com/ht/plugins/wifidirect/WifiDirectPlugin.java

@@ -19,6 +19,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
 import android.util.Log;
+import android.widget.Toast;
 
 import androidx.activity.result.ActivityResult;
 
@@ -49,6 +50,13 @@ public class WifiDirectPlugin extends Plugin {
 
     private PluginCall pendingConnectCall = null;
 
+    // peer 검색: discoverPeers 는 "시작"만 알리므로, 실제 peer 는 WIFI_P2P_PEERS_CHANGED_ACTION
+    // 브로드캐스트가 올 때 requestPeers 로 수집한다. target 을 찾으면 즉시 resolve, 못 찾으면 timeout 으로 마감.
+    private PluginCall pendingScanCall = null;
+    private String pendingScanTargetName = null;
+    private Runnable pendingScanTimeout = null;
+    private static final long SCAN_TIMEOUT_MS = 15000L;
+
     // Group 형성 broadcast가 안 올 경우 대비한 timeout과 메인 핸들러
     private final Handler mainHandler = new Handler(Looper.getMainLooper());
     private Runnable pendingConnectTimeout = null;
@@ -62,7 +70,7 @@ public class WifiDirectPlugin extends Plugin {
     private Network boundP2pNetwork = null;
 
     private void showToast(String message) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
     }
 
     private final BroadcastReceiver wifiP2pReceiver = new BroadcastReceiver() {
@@ -92,6 +100,11 @@ public class WifiDirectPlugin extends Plugin {
                         pendingConnectCall = null;
                     }
                 }
+            } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
+                // peer 목록이 갱신됨 → 진행 중인 스캔이 있으면 수집 시도
+                if (pendingScanCall != null) {
+                    requestAndResolvePeers(false);
+                }
             }
         }
     };
@@ -126,6 +139,10 @@ public class WifiDirectPlugin extends Plugin {
         } catch (IllegalArgumentException e) {
             Log.w(TAG, "Receiver not registered or already registered");
         }
+        if (pendingScanCall != null) {
+            pendingScanCall.reject("Plugin unloaded");
+            clearPendingScan();
+        }
         unregisterP2pNetworkCallback();
     }
     @PluginMethod
@@ -137,47 +154,84 @@ public class WifiDirectPlugin extends Plugin {
             call.reject("WifiP2pManager or Channel not initialized");
             return;
         }
+
+        // 진행 중인 이전 스캔이 있으면 정리(누수 방지)
+        if (pendingScanCall != null) {
+            pendingScanCall.reject("superseded by a new scan");
+            clearPendingScan();
+        }
+        pendingScanCall = call;
+        pendingScanTargetName = targetDeviceName;
+
+        // 타임아웃: 그때까지 target peer 를 못 찾으면 현재 목록(빈 배열 가능)으로 마감
+        pendingScanTimeout = () -> {
+            Log.d(TAG, "scanWifiPeers timeout — resolving with current peers");
+            requestAndResolvePeers(true);
+        };
+        mainHandler.postDelayed(pendingScanTimeout, SCAN_TIMEOUT_MS);
+
         manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
             @Override
             public void onSuccess() {
-                manager.requestPeers(channel, peerList -> {
-                    Log.d(TAG, "scanWifi onSuccess Called");
-
-                    peerWifiDirDevices.clear();
-                    peerWifiDirDevices.addAll(peerList.getDeviceList());
-                    JSONArray devicesJson = new JSONArray();
-                    for(WifiP2pDevice device: peerWifiDirDevices) {
-                        try {
-                            if (targetDeviceName != null && !targetDeviceName.isEmpty()) {
-                                if (!device.deviceName.toUpperCase().contains(targetDeviceName.toUpperCase())) {
-                                    continue;
-                                }
-                            }
-                            JSONObject deviceJson = new JSONObject();
-                            deviceJson.put("deviceName", device.deviceName);
-                            deviceJson.put("deviceAddress", device.deviceAddress);
-                            deviceJson.put("status", device.status);
-                            deviceJson.put("connected", device.status == WifiP2pDevice.CONNECTED);
-                    
-                            devicesJson.put(deviceJson);
-                        } catch (JSONException e) {
-                            Log.e(TAG, "JSON error: ", e);
-                        }
-                    }
-                    JSObject ret = new JSObject();
-                    ret.put("devices", devicesJson);
-                    call.resolve(ret);
-                });
+                // discovery 가 "시작"된 것뿐. 실제 peer 는 WIFI_P2P_PEERS_CHANGED_ACTION 에서 수집한다.
+                Log.d(TAG, "discoverPeers started");
             }
 
             @Override
             public void onFailure(int reason) {
                 Log.e(TAG, "scanWifi onFailure: " + reason);
+                clearPendingScan();
                 call.reject("Peer discovery failed: " + reason);
             }
         });
     }
 
+    // 현재 peer 목록을 받아 target 필터를 적용해 pendingScanCall 을 resolve 한다.
+    // resolveEvenIfEmpty=false 면 target 을 찾았을 때만 resolve(아니면 계속 대기), true 면 빈 목록이라도 마감.
+    private void requestAndResolvePeers(boolean resolveEvenIfEmpty) {
+        if (manager == null || channel == null || pendingScanCall == null) return;
+        final String target = pendingScanTargetName;
+        manager.requestPeers(channel, peerList -> {
+            if (pendingScanCall == null) return; // 이미 처리됨
+            peerWifiDirDevices.clear();
+            peerWifiDirDevices.addAll(peerList.getDeviceList());
+            JSONArray devicesJson = new JSONArray();
+            for (WifiP2pDevice device : peerWifiDirDevices) {
+                if (target != null && !target.isEmpty()
+                        && !device.deviceName.toUpperCase().contains(target.toUpperCase())) {
+                    continue;
+                }
+                try {
+                    JSONObject deviceJson = new JSONObject();
+                    deviceJson.put("deviceName", device.deviceName);
+                    deviceJson.put("deviceAddress", device.deviceAddress);
+                    deviceJson.put("status", device.status);
+                    deviceJson.put("connected", device.status == WifiP2pDevice.CONNECTED);
+                    devicesJson.put(deviceJson);
+                } catch (JSONException e) {
+                    Log.e(TAG, "JSON error: ", e);
+                }
+            }
+            if (devicesJson.length() > 0 || resolveEvenIfEmpty) {
+                PluginCall call = pendingScanCall;
+                clearPendingScan();
+                JSObject ret = new JSObject();
+                ret.put("devices", devicesJson);
+                call.resolve(ret);
+            }
+            // 그 외(target 미발견): 다음 PEERS_CHANGED 또는 timeout 까지 계속 대기
+        });
+    }
+
+    private void clearPendingScan() {
+        if (pendingScanTimeout != null) {
+            mainHandler.removeCallbacks(pendingScanTimeout);
+            pendingScanTimeout = null;
+        }
+        pendingScanCall = null;
+        pendingScanTargetName = null;
+    }
+
     @PluginMethod
     public void connectToDevice(PluginCall call) {
         Log.d(TAG, "connectToDevice Called");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wifidirectplugin",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "HT-Installer Wifi Direct Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",