wifidirectplugin 0.0.9 → 1.0.1

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

@@ -1,173 +1,102 @@
 package com.ht.plugins.wifidirect;
 
+import static android.content.ContentValues.TAG;
+
 import android.content.Context;
-import android.content.IntentFilter;
-import android.content.BroadcastReceiver;
-import android.content.pm.PackageManager;
-import android.net.wifi.p2p.WifiP2pDevice;
-import android.net.wifi.p2p.WifiP2pManager;
-import android.net.wifi.p2p.WifiP2pConfig;
-import android.net.wifi.p2p.WifiP2pDeviceList;
-import android.net.wifi.WifiManager;
-import android.content.Intent;
+import android.net.wifi.WpsInfo;
+import android.net.wifi.p2p.*;
+import android.net.NetworkInfo;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Logger;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
+import android.util.Log;
+
+import com.getcapacitor.*;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.*;
+
 @CapacitorPlugin(name = "WifiDirect")
 public class WifiDirectPlugin extends Plugin {
-
     private WifiP2pManager manager;
     private WifiP2pManager.Channel channel;
-
-    private BroadcastReceiver receiver;
-    private IntentFilter intentFilter;
-
-    private final Handler handler = new Handler(Looper.getMainLooper());
-    private boolean isConnecting = false;
+    private Context context;
+    private List<WifiP2pDevice> peerWifiDirDevices = new ArrayList<>();
 
     @Override
     public void load() {
-        Logger.info("WifiDirectPlugin loaded");
-        manager = (WifiP2pManager) getContext().getSystemService(Context.WIFI_P2P_SERVICE);
-        channel = manager.initialize(getContext(), getActivity().getMainLooper(), null);
-
-        intentFilter = new IntentFilter();
-        intentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
-
-        intentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
-        intentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
-        
-    }
-
-    private void unregisterExistingReceiver() {
-        if (receiver != null) {
-            try {
-                getContext().unregisterReceiver(receiver);
-            } catch (IllegalArgumentException ignored) {
-            }
-            receiver = null;
-        }
-    }
-
-    private void cancelExistingConnection(Runnable onComplete) {
-        if (!isConnecting) {
-            onComplete.run();
-            return;
-        }
-
-        try {
-
-            manager.cancelConnect(channel, new WifiP2pManager.ActionListener() {
-                @Override
-                public void onSuccess() {
-                    onComplete.run();
-                }
-
-                @Override
-                public void onFailure(int reason) {
-                    onComplete.run();
-                }
-            });
-        } catch (Throwable t) {
-            isConnecting = false;
-            onComplete.run();
-        }
+        context = getContext();
+        manager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
+        channel = manager.initialize(context, context.getMainLooper(), null);
     }
 
     @PluginMethod
-    public void discoverAndConnect(PluginCall call) {
-        WifiManager wifiManager = (WifiManager) getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (!wifiManager.isWifiEnabled()) {
-                // Android 10 이상부터는 WiFi 직접 켜기 불가, 설정 화면 이동 요청
-                Intent panelIntent = new Intent(android.provider.Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
-                panelIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                getContext().startActivity(panelIntent);
-    
-                call.reject("WiFi is disabled. Please enable WiFi first.");
-                return;
-            }
-        }
-
-        unregisterExistingReceiver();
-
-        cancelExistingConnection(() -> {
-            receiver = new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, android.content.Intent intent) {
-                    String action = intent.getAction();
-                    if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
-                        manager.requestPeers(channel, new WifiP2pManager.PeerListListener() {
-                            @Override
-                            public void onPeersAvailable(WifiP2pDeviceList peerList) {
-                                WifiP2pDevice targetDevice = null;
-                                for (WifiP2pDevice device : peerList.getDeviceList()) {
-                                    if (device.deviceName != null && device.deviceName.startsWith("DIRECT-LINKVUE")) {
-                                        targetDevice = device;
-                                        break;
-                                    }
-                                }
-                                if (targetDevice != null) {
-                                    connectToDevice(targetDevice, call);
-                                    Logger.info("Found and connecting to device: " + targetDevice.deviceName);
-                                } else {
-                                    call.reject("No Direct-LINKVUE device found");
-                                }
-                            }
-                        });
-                    }
-                }
-            };
-        });
-
-        getContext().registerReceiver(receiver, intentFilter);
-
+    public void scanWifiPeers(PluginCall call) {
+        Log.d(TAG, "scanWifiPeers Called");
         manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
             @Override
             public void onSuccess() {
-                Logger.info("Peer discovery started");
-                JSObject ret = new JSObject();
-                ret.put("message", "Discovery started");
-                call.resolve(ret);
+                manager.requestPeers(channel, peerList -> {
+                    peerWifiDirDevices.clear();
+                    peerWifiDirDevices.addAll(peerList.getDeviceList());
+                    JSONArray devicesJson = new JSONArray();
+                    for(WifiP2pDevice device: peerWifiDirDevices) {
+                        try {
+                            if(!device.deviceName.toUpperCase().contains("LINKVUE")) 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) {
+                            e.printStackTrace();
+                        }
+                    }
+                    JSObject ret = new JSObject();
+                    ret.put("devices", devicesJson);
+                    call.resolve(ret);
+                });
             }
-    
+
             @Override
             public void onFailure(int reason) {
-                call.reject("Peer discovery failed, reason: " + reason);
-                getContext().unregisterReceiver(receiver);
+                call.reject("Peer discovery failed: " + reason);
             }
         });
     }
 
-    private void connectToDevice(WifiP2pDevice device, PluginCall call) {
-        isConnecting = true;
+    @PluginMethod
+    public void connectToDevice(PluginCall call) {
+        String deviceAddress = call.getString("deviceAddress");
+        String pin = call.getString("pin");
 
+        if(deviceAddress == null) {
+            call.reject("Device address is required");
+            return;
+        }
         WifiP2pConfig config = new WifiP2pConfig();
-        config.deviceAddress = device.deviceAddress;
+        config.deviceAddress = deviceAddress;
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && pin != null) {
+            config.wps.setup = WpsInfo.KEYPAD;
+            config.wps.pin = pin;
+        }
         manager.connect(channel, config, new WifiP2pManager.ActionListener() {
             @Override
             public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("message", "Connecting to " + device.deviceName);
-                call.resolve(ret);
-                getContext().unregisterReceiver(receiver); // 연결 시도 후 리시버 해제
+                call.resolve();
             }
 
             @Override
             public void onFailure(int reason) {
-                call.reject("Connection failed with reason: " + reason);
-                getContext().unregisterReceiver(receiver);
+                call.reject("Connection failed: " + reason);
             }
         });
     }
+
+
 }

package/package.json

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