@rdlabo/capacitor-brotherprint 6.0.3 → 6.2.0-0

package/ios/Plugin/Model/PrinterModel.swift

@@ -0,0 +1,264 @@
+import Foundation
+import BRLMPrinterKit
+import BRPtouchPrinterKit
+
+class BrotherModel {
+    static func getModelName(from: String) -> BRLMPrinterModel {
+        switch from {
+        case "QL_810W":
+            return BRLMPrinterModel.QL_810W
+        case "QL_820NWB":
+            return BRLMPrinterModel.QL_820NWB
+        case "TD_2320D_203":
+            return BRLMPrinterModel.TD_2320D_203
+        case "TD_2030AD":
+            return BRLMPrinterModel.TD_2030A
+        case "TD_2350D_203":
+            return BRLMPrinterModel.TD_2350D_203
+        default:
+            return BRLMPrinterModel.unknown
+        }
+    }
+
+    static func getLabelSize(from: String) -> BRLMQLPrintSettingsLabelSize {
+        switch from {
+        case "W17H54":
+            return BRLMQLPrintSettingsLabelSize.dieCutW17H54
+        case "W17H87":
+            return BRLMQLPrintSettingsLabelSize.dieCutW17H87
+        case "W23H23":
+            return BRLMQLPrintSettingsLabelSize.dieCutW23H23
+        case "W29H42":
+            return BRLMQLPrintSettingsLabelSize.dieCutW29H42
+        case "W29H90":
+            return BRLMQLPrintSettingsLabelSize.dieCutW29H90
+        case "W38H90":
+            return BRLMQLPrintSettingsLabelSize.dieCutW38H90
+        case "W39H48":
+            return BRLMQLPrintSettingsLabelSize.dieCutW39H48
+        case "W52H29":
+            return BRLMQLPrintSettingsLabelSize.dieCutW52H29
+        case "W62H29":
+            return BRLMQLPrintSettingsLabelSize.dieCutW62H29
+        case "W62H100":
+            return BRLMQLPrintSettingsLabelSize.dieCutW62H100
+        case "W12":
+            return BRLMQLPrintSettingsLabelSize.rollW12
+        case "W38":
+            return BRLMQLPrintSettingsLabelSize.rollW38
+        case "W50":
+            return BRLMQLPrintSettingsLabelSize.rollW50
+        case "W54":
+            return BRLMQLPrintSettingsLabelSize.rollW54
+        case "W62":
+            return BRLMQLPrintSettingsLabelSize.rollW62
+        case "W60H86":
+            return BRLMQLPrintSettingsLabelSize.dieCutW60H86
+        case "W62RB":
+            return BRLMQLPrintSettingsLabelSize.rollW62RB
+        case "W54H29":
+            return BRLMQLPrintSettingsLabelSize.dieCutW54H29
+        case "W12DIA":
+            return BRLMQLPrintSettingsLabelSize.roundW12DIA
+        case "W24DIA":
+            return BRLMQLPrintSettingsLabelSize.roundW24DIA
+        case "W58DIA":
+            return BRLMQLPrintSettingsLabelSize.roundW58DIA
+        case "W62H60":
+            return BRLMQLPrintSettingsLabelSize.dieCutW62H60
+        case "W62H75":
+            return BRLMQLPrintSettingsLabelSize.dieCutW62H75
+        default:
+            return BRLMQLPrintSettingsLabelSize.rollW62
+        }
+    }
+}
+
+enum PrinterModel: String, CaseIterable {
+    //    case PJ_673 = "PJ-673" // swiftlint:disable:this identifier_name
+    //    case PJ_763MFi = "PJ-763" // swiftlint:disable:this identifier_name
+    //    case PJ_773 = "PJ-773" // swiftlint:disable:this identifier_name
+    //    case MW_145MFi = "MW-145MFi" // swiftlint:disable:this identifier_name
+    //    case MW_260MFi = "MW-260MFi" // swiftlint:disable:this identifier_name
+    //    case MW_170 = "MW-170" // swiftlint:disable:this identifier_name
+    //    case MW_270 = "MW-270" // swiftlint:disable:this identifier_name
+    //    case RJ_4030Ai = "RJ-4030Ai" // swiftlint:disable:this identifier_name
+    //    case RJ_4040 = "RJ-4040" // swiftlint:disable:this identifier_name
+    //    case RJ_3050 = "RJ-3050" // swiftlint:disable:this identifier_name
+    //    case RJ_3150 = "RJ-3150" // swiftlint:disable:this identifier_name
+    //    case RJ_3050Ai = "RJ-3050Ai" // swiftlint:disable:this identifier_name
+    //    case RJ_3150Ai = "RJ-3150Ai" // swiftlint:disable:this identifier_name
+    //    case RJ_2050 = "RJ-2050" // swiftlint:disable:this identifier_name
+    //    case RJ_2140 = "RJ-2140" // swiftlint:disable:this identifier_name
+    //    case RJ_2150 = "RJ-2150" // swiftlint:disable:this identifier_name
+    //    case RJ_4230B = "RJ-4230B" // swiftlint:disable:this identifier_name
+    //    case RJ_4250WB = "RJ-4250WB" // swiftlint:disable:this identifier_name
+    //    case TD_2120N = "TD-2120N" // swiftlint:disable:this identifier_name
+    //    case TD_2130N = "TD-2130N" // swiftlint:disable:this identifier_name
+    //    case TD_4100N = "TD-4100N" // swiftlint:disable:this identifier_name
+    //    case TD_4420DN = "TD-4420DN" // swiftlint:disable:this identifier_name
+    //    case TD_4520DN = "TD-4520DN" // swiftlint:disable:this identifier_name
+    //    case TD_4550DNWB = "TD-4550DNWB" // swiftlint:disable:this identifier_name
+    //    case QL_710W = "QL-710W" // swiftlint:disable:this identifier_name
+    //    case QL_720NW = "QL-720NW" // swiftlint:disable:this identifier_name
+    case QL_810W = "QL-810W" // swiftlint:disable:this identifier_name
+    case QL_820NWB = "QL-820NWB" // swiftlint:disable:this identifier_name
+    //    case QL_1110NWB = "QL-1110NWB" // swiftlint:disable:this identifier_name
+    //    case QL_1115NWB = "QL-1115NWB" // swiftlint:disable:this identifier_name
+    //    case PT_E550W = "PT-E550W" // swiftlint:disable:this identifier_name
+    //    case PT_P750W = "PT-P750W" // swiftlint:disable:this identifier_name
+    //    case PT_D800W = "PT-D800W" // swiftlint:disable:this identifier_name
+    //    case PT_E800W = "PT-E800W" // swiftlint:disable:this identifier_name
+    //    case PT_E850TKW = "PT-E850TKW" // swiftlint:disable:this identifier_name
+    //    case PT_P900W = "PT-P900W" // swiftlint:disable:this identifier_name
+    //    case PT_P950NW = "PT-P950NW" // swiftlint:disable:this identifier_name
+    //    case PT_P300BT = "PT-P300BT" // swiftlint:disable:this identifier_name
+    //    case PT_P710BT = "PT-P710BT" // swiftlint:disable:this identifier_name
+    //    case PT_P715eBT = "PT-P715eBT" // swiftlint:disable:this identifier_name
+    //    case PT_P910BT = "PT-P910BT" // swiftlint:disable:this identifier_name
+    //    case RJ_3230B = "RJ-3230B" // swiftlint:disable:this identifier_name
+    //    case RJ_3250WB = "RJ-3250WB" // swiftlint:disable:this identifier_name
+    //    case PT_D410 = "PT-D410" // swiftlint:disable:this identifier_name
+    //    case PT_D460BT = "PT-D460BT" // swiftlint:disable:this identifier_name
+    //    case PT_D610BT = "PT-D610BT" // swiftlint:disable:this identifier_name
+    //    case PJ_822 = "PJ-822" // swiftlint:disable:this identifier_name
+    //    case PJ_823 = "PJ-823" // swiftlint:disable:this identifier_name
+    //    case PJ_862 = "PJ-862" // swiftlint:disable:this identifier_name
+    //    case PJ_863 = "PJ-863" // swiftlint:disable:this identifier_name
+    //    case PJ_883 = "PJ-883" // swiftlint:disable:this identifier_name
+        case TD_2030A = "TD-2030A" // swiftlint:disable:this identifier_name
+    //    case TD_2125N = "TD-2125N" // swiftlint:disable:this identifier_name
+    //    case TD_2125NWB = "TD-2125NWB" // swiftlint:disable:this identifier_name
+    //    case TD_2135N = "TD-2135N" // swiftlint:disable:this identifier_name
+    //    case TD_2135NWB = "TD-2135NWB" // swiftlint:disable:this identifier_name
+    //    case PT_E310BT = "PT-E310BT" // swiftlint:disable:this identifier_name
+    //    case PT_E510 = "PT-E510" // swiftlint:disable:this identifier_name
+    //    case PT_E560BT = "PT-E560BT" // swiftlint:disable:this identifier_name
+    //    case TD_2310D_203 = "TD-2310D_203" // swiftlint:disable:this identifier_name
+    //    case TD_2310D_300 = "TD-2310D_300" // swiftlint:disable:this identifier_name
+        case TD_2320D_203 = "TD-2320D_203" // swiftlint:disable:this identifier_name
+    //    case TD_2320D_300 = "TD-2320D_300" // swiftlint:disable:this identifier_name
+    //    case TD_2320DF_203 = "TD-2320DF_203" // swiftlint:disable:this identifier_name
+    //    case TD_2320DF_300 = "TD-2320DF_300" // swiftlint:disable:this identifier_name
+    //    case TD_2320DSA_203 = "TD-2320DSA_203" // swiftlint:disable:this identifier_name
+    //    case TD_2320DSA_300 = "TD-2320DSA_300" // swiftlint:disable:this identifier_name
+        case TD_2350D_203 = "TD-2350D_203" // swiftlint:disable:this identifier_name
+    //    case TD_2350D_300 = "TD-2350D_300" // swiftlint:disable:this identifier_name
+    //    case TD_2350DF_203 = "TD-2350DF_203" // swiftlint:disable:this identifier_name
+    //    case TD_2350DF_300 = "TD-2350DF_300" // swiftlint:disable:this identifier_name
+    //    case TD_2350DSA_203 = "TD-2350DSA_203" // swiftlint:disable:this identifier_name
+    //    case TD_2350DSA_300 = "TD-2350DSA_300" // swiftlint:disable:this identifier_name
+    //    case TD_2350DFSA_203 = "TD-2350DFSA_203" // swiftlint:disable:this identifier_name
+    //    case TD_2350DFSA_300 = "TD-2350DFSA_300" // swiftlint:disable:this identifier_name
+
+    init?(sdkModelName: String) {
+        guard let printer = PrinterModel.allCases.first(where: { $0.sdkModelName == sdkModelName }) else { return nil }
+        self = printer
+    }
+
+    init?(modelName: String) {
+        guard let printer = PrinterModel.allCases.first(where: { $0.rawValue == modelName }) else { return nil }
+        self = printer
+    }
+
+    static let defaultPrinter = PrinterModel.QL_820NWB
+
+    var sdkModelName: String {
+        return "Brother \(rawValue)"
+    }
+
+    var searchModelName: String {
+        var modelName = sdkModelName
+
+        // Remove resolution info for TD-2a series
+        let string203 = "_203"
+        let string300 = "_300"
+        if rawValue.contains(string203) {
+            modelName = modelName.replacingOccurrences(of: string203, with: "")
+        } else if rawValue.contains(string300) {
+            modelName = modelName.replacingOccurrences(of: string300, with: "")
+        }
+        return modelName
+
+    }
+
+    var printerModel: BRLMPrinterModel {
+        switch self {
+        //        case .PJ_673: return .PJ_673
+        //        case .PJ_763MFi: return .pj_763MFi
+        //        case .PJ_773: return .PJ_773
+        //        case .MW_145MFi: return .mw_145MFi
+        //        case .MW_260MFi: return .mw_260MFi
+        //        case .MW_170: return .MW_170
+        //        case .MW_270: return .MW_270
+        //        case .RJ_4030Ai: return .rj_4030Ai
+        //        case .RJ_4040: return .RJ_4040
+        //        case .RJ_3050: return .RJ_3050
+        //        case .RJ_3150: return .RJ_3150
+        //        case .RJ_3050Ai: return .rj_3050Ai
+        //        case .RJ_3150Ai: return .rj_3150Ai
+        //        case .RJ_2050: return .RJ_2050
+        //        case .RJ_2140: return .RJ_2140
+        //        case .RJ_2150: return .RJ_2150
+        //        case .RJ_4230B: return .RJ_4230B
+        //        case .RJ_4250WB: return .RJ_4250WB
+        //        case .TD_2120N: return .TD_2120N
+        //        case .TD_2130N: return .TD_2130N
+        //        case .TD_4100N: return .TD_4100N
+        //        case .TD_4420DN: return .TD_4420DN
+        //        case .TD_4520DN: return .TD_4520DN
+        //        case .TD_4550DNWB: return .TD_4550DNWB
+        //        case .QL_710W: return .QL_710W
+        //        case .QL_720NW: return .QL_720NW
+        case .QL_810W: return .QL_810W
+        case .QL_820NWB: return .QL_820NWB
+        //        case .QL_1110NWB: return .QL_1110NWB
+        //        case .QL_1115NWB: return .QL_1115NWB
+        //        case .PT_E550W: return .PT_E550W
+        //        case .PT_P750W: return .PT_P750W
+        //        case .PT_D800W: return .PT_D800W
+        //        case .PT_E800W: return .PT_E800W
+        //        case .PT_E850TKW: return .PT_E850TKW
+        //        case .PT_P900W: return .PT_P900W
+        //        case .PT_P950NW: return .PT_P950NW
+        //        case .PT_P300BT: return .PT_P300BT
+        //        case .PT_P710BT: return .PT_P710BT
+        //        case .PT_P715eBT: return .pt_P715eBT
+        //        case .PT_P910BT: return .PT_P910BT
+        //        case .RJ_3230B: return .RJ_3230B
+        //        case .RJ_3250WB: return .RJ_3250WB
+        //        case .PT_D410: return .PT_D410
+        //        case .PT_D460BT: return .PT_D460BT
+        //        case .PT_D610BT: return .PT_D610BT
+        //        case .PJ_822: return .PJ_822
+        //        case .PJ_823: return .PJ_823
+        //        case .PJ_862: return .PJ_862
+        //        case .PJ_863: return .PJ_863
+        //        case .PJ_883: return .PJ_883
+                case .TD_2030A: return .TD_2030A
+        //        case .TD_2125N: return .TD_2125N
+        //        case .TD_2125NWB: return .TD_2125NWB
+        //        case .TD_2135N: return .TD_2135N
+        //        case .TD_2135NWB: return .TD_2135NWB
+        //        case .PT_E310BT: return .PT_E310BT
+        //        case .PT_E510: return .PT_E510
+        //        case .PT_E560BT: return .PT_E560BT
+        //        case .TD_2310D_203: return .TD_2310D_203
+        //        case .TD_2310D_300: return .TD_2310D_300
+                case .TD_2320D_203: return .TD_2320D_203
+        //        case .TD_2320D_300: return .TD_2320D_300
+        //        case .TD_2320DF_203: return .TD_2320DF_203
+        //        case .TD_2320DF_300: return .TD_2320DF_300
+        //        case .TD_2320DSA_203: return .TD_2320DSA_203
+        //        case .TD_2320DSA_300: return .TD_2320DSA_300
+                case .TD_2350D_203: return .TD_2350D_203
+        //        case .TD_2350D_300: return .TD_2350D_300
+        //        case .TD_2350DF_203: return .TD_2350DF_203
+        //        case .TD_2350DF_300: return .TD_2350DF_300
+        //        case .TD_2350DSA_203: return .TD_2350DSA_203
+        //        case .TD_2350DSA_300: return .TD_2350DSA_300
+        //        case .TD_2350DFSA_203: return .TD_2350DFSA_203
+        //        case .TD_2350DFSA_300: return .TD_2350DFSA_300
+        }
+    }
+}

package/ios/Plugin/Plugin.m

@@ -5,7 +5,7 @@
 // each method the plugin supports using the CAP_PLUGIN_METHOD macro.
 CAP_PLUGIN(BrotherPrint, "BrotherPrint",
            CAP_PLUGIN_METHOD(printImage, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(searchWiFiPrinter, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(searchBLEPrinter, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(stopSearchBLEPrinter, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(search, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(cancelSearchWiFiPrinter, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(cancelSearchBluetoothPrinter, CAPPluginReturnPromise);
 )

package/ios/Plugin/Plugin.swift

@@ -8,153 +8,198 @@ import BRPtouchPrinterKit
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(BrotherPrint)
-public class BrotherPrint: CAPPlugin, BRPtouchNetworkDelegate {
-    private var networkManager: BRPtouchNetworkManager?
-    
+public class BrotherPrint: CAPPlugin {
+    private var cancelRoutineWiFi: (() -> Void)?
+    private var cancelRoutineBluetooth: (() -> Void)?
+
     @objc func printImage(_ call: CAPPluginCall) {
-        let encodedImage: String = call.getString("encodedImage") ?? "";
-        if (encodedImage == "") {
-            call.error("Error - Image data is not found.");
-            return;
-        }
-        
-        let newImageData = Data(base64Encoded: encodedImage, options: []);
-        
-        let printerType: String = call.getString("printerType") ?? "";
-        if (printerType == "") {
-            call.error("Error - printerType is not found.");
-            return;
+        let encodedImage: String = call.getString("encodedImage", "")
+        if encodedImage == "" {
+            call.reject("Error - Image data is not found.")
+            return
         }
-        
-        if (printerType != "QL-820NWB") {
-            // iOS非対応
-            call.error("Error - connection is not found.");
-            return;
-        }
-        
-        
+
+        let newImageData = Data(base64Encoded: encodedImage, options: [])
+
         // 検索からデバイス情報が得られた場合
-        let localName: String = call.getString("localName") ?? "";
-        let ipAddress: String = call.getString("ipAddress") ?? "";
-        
+        let port: String = call.getString("port", "wifi")
+        let localName: String = call.getString("localName", "")
+        let ipAddress: String = call.getString("ipAddress", "")
+        let serialNumber: String = call.getString("serialNumber", "")
+        let autoCut: Bool = call.getBool("autoCut", true)
+
+        let modelName = BrotherModel.getModelName(from: call.getString("modelName", "QL-820NWB"))
+        let labelSize = BrotherModel.getLabelSize(from: call.getString("labelName", "rollW62"))
+
+        NSLog(call.getString("modelName", "not set"))
+        NSLog(call.getString("labelName", "not set"))
+
         // メインスレッドにて処理
         DispatchQueue.main.async {
-            var channel: BRLMChannel;
-            if (localName != "") {
-                channel = BRLMChannel(bleLocalName: localName);
-            } else if (ipAddress != "") {
-                channel = BRLMChannel(wifiIPAddress: ipAddress);
-            } else {
-                // iOSは有線接続ができない
-                self.notifyListeners("onPrintFailedCommunication", data: [
-                    "value": true
-                ]);
-                return;
+            var channel: BRLMChannel
+
+            switch port {
+            case "wifi":
+                channel = BRLMChannel(wifiIPAddress: ipAddress)
+            case "bluetooth":
+                channel = BRLMChannel(bluetoothSerialNumber: serialNumber)
+            case "bluetoothLowEnergy":
+                channel = BRLMChannel(bleLocalName: localName)
+            default:
+                call.reject("Error - connection is not found.")
+                return
             }
-            
-            let generateResult = BRLMPrinterDriverGenerator.open(channel);
+
+            let generateResult = BRLMPrinterDriverGenerator.open(channel)
             guard generateResult.error.code == BRLMOpenChannelErrorCode.noError,
-                let printerDriver = generateResult.driver else {
-                    self.notifyListeners("onPrintError", data: [
-                        "value": generateResult.error.code
-                    ]);
-                    NSLog("Error - Open Channel: \(generateResult.error.code)")
-                    return
+                  let printerDriver = generateResult.driver else {
+                let message = OpenChannelErrorModel.fetchChannelErrorCode(error: generateResult.error.code)
+                self.notifyListeners(BrotherPrinterEvent.onPrintError.rawValue, data: [
+                    "message": message,
+                    "code": generateResult.error.code
+                ])
+                call.reject("Error - Open Channel: \(generateResult.error.code)")
+                return
             }
-            
+
             guard
-                let decodedByte = UIImage(data: newImageData! as Data),
-                let printSettings = BRLMQLPrintSettings(defaultPrintSettingsWith: BRLMPrinterModel.QL_820NWB)
-                else {
-                    printerDriver.closeChannel();
-                    self.notifyListeners("onPrintError", data: [
-                        "value": "Error - Image file is not found."
-                    ]);
-                    return
-            }
-            
-            let labelNameIndex = call.getInt("labelNameIndex") ?? 16;
-            printSettings.labelSize = labelNameIndex == 16 ?
-                BRLMQLPrintSettingsLabelSize.rollW62 : BRLMQLPrintSettingsLabelSize.rollW62RB;
-            printSettings.autoCut = true
-            printSettings.numCopies = UInt(call.getInt("numberOfCopies") ?? 1);
-            
-            let printError = printerDriver.printImage(with: decodedByte.cgImage!, settings: printSettings);
-            
-            
-            if printError.code != .noError {
-                printerDriver.closeChannel();
-                self.notifyListeners("onPrintError", data: [
-                    "value": printError.code
-                ]);
-                return;
+                let decodedByte = UIImage(data: newImageData! as Data)
+            else {
+                printerDriver.closeChannel()
+                self.notifyListeners(BrotherPrinterEvent.onPrintError.rawValue, data: [
+                    "code": 0,
+                    "message": "Error - Create decodedByte From ImageData is failed."
+                ])
+                call.reject("Error - Create decodedByte From ImageData is failed.")
+                return
             }
+
+            guard
+                let printSettings = BRLMQLPrintSettings(defaultPrintSettingsWith: modelName)
             else {
-                NSLog("Success - Print Image")
-                printerDriver.closeChannel();
-                call.success([
-                    "value": true
-                ]);
+                printerDriver.closeChannel()
+                self.notifyListeners(BrotherPrinterEvent.onPrintError.rawValue, data: [
+                    "code": 0,
+                    "message": "Error - Create BRLMQLPrintSettings is failed."
+                ])
+                call.reject("Error - Create BRLMQLPrintSettings is failed.")
+                return
+            }
+
+            printSettings.labelSize = labelSize
+            printSettings.autoCut = autoCut
+            printSettings.numCopies = UInt(call.getInt("numberOfCopies", 1))
+
+            let printError = printerDriver.printImage(with: decodedByte.cgImage!, settings: printSettings)
+
+            if printError.code != .noError {
+                printerDriver.closeChannel()
+                let message = PrintErrorModel.fetchErrorCode(errorCode: Int32(printError.code.rawValue))
+                self.notifyListeners(BrotherPrinterEvent.onPrintError.rawValue, data: [
+                    "message": message,
+                    "code": printError.code.rawValue
+                ])
+                call.reject("Error - Print Image: \(printError.code)")
+                return
             }
+
+            printerDriver.closeChannel()
+            call.resolve()
         }
     }
-    
-    @objc func searchWiFiPrinter(_ call: CAPPluginCall) {
-        NSLog("Start searchWiFiPrinter");
-        DispatchQueue.main.async {
-            let manager = BRPtouchNetworkManager()
-            manager.setPrinterName("QL-820NWB")
-            manager.delegate = self
-            manager.startSearch(5)
-            self.networkManager = manager
+
+    @objc func search(_ call: CAPPluginCall) {
+        switch call.getString("port", "wifi") {
+        case "wifi":
+            self.searchWiFiPrinter(call)
+        case "bluetooth":
+            self.checkBLEChannel(call)
+        case "bluetoothLowEnergy":
+            self.searchBLEPrinter(call)
+        default:
+            call.reject("port is not 'wifi' | 'bluetooth' | 'bluetoothLowEnergy'")
         }
     }
-    
-    // BRPtouchNetworkDelegate
-    public func didFinishSearch(_ sender: Any!) {
-        NSLog("Start didFinishSearch");
-        DispatchQueue.main.async {
-            guard let manager = sender as? BRPtouchNetworkManager else {
-                return
+
+    private func searchWiFiPrinter(_ call: CAPPluginCall) {
+        DispatchQueue.global().async {
+            self.cancelRoutineWiFi = {
+                BRLMPrinterSearcher.cancelNetworkSearch()
             }
-            guard let devices = manager.getPrinterNetInfo() else {
-                return
+
+            let option = BRLMNetworkSearchOption()
+            option.printerList = PrinterModel.allCases.map { $0.searchModelName }
+            option.searchDuration = TimeInterval(call.getInt("searchDuration", 15))
+
+            NSLog("BRLMPrinterSearcher.startNetworkSearch")
+            BRLMPrinterSearcher.startNetworkSearch(option) { channel in
+                NSLog(channel.channelInfo)
+                let printer = self.chanelToPrinter(port: "wifi", channel: channel)
+                self.notifyListeners(BrotherPrinterEvent.onPrinterAvailable.rawValue, data: printer)
             }
-            var resultList: [String] = [];
-            for deviceInfo in devices {
-                if let deviceInfo = deviceInfo as? BRPtouchDeviceInfo {
-                    resultList.append(deviceInfo.strIPAddress);
-                }
+            self.cancelRoutineWiFi = nil
+            call.resolve()
+        }
+    }
+
+    private func checkBLEChannel(_ call: CAPPluginCall) {
+        DispatchQueue.global().async {
+            NSLog("BRLMPrinterSearcher.startBluetoothSearch")
+            let searcher = BRLMPrinterSearcher.startBluetoothSearch()
+            for channel in searcher.channels {
+                NSLog(channel.channelInfo)
+                self.notifyListeners(BrotherPrinterEvent.onPrinterAvailable.rawValue, data: self.chanelToPrinter(port: "bluetooth", channel: channel))
             }
-            self.notifyListeners("onIpAddressAvailable", data: [
-                "ipAddressList": resultList,
-            ]);
+            call.resolve()
         }
     }
-    
-    @objc func searchBLEPrinter(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            NSLog("Start searchBLEPrinter");
-            BRPtouchBLEManager.shared().startSearch {
-                (deviceInfo: BRPtouchDeviceInfo?) in
-                if let deviceInfo = deviceInfo {
-                    var resultList: [String] = [];
-                    resultList.append(deviceInfo.strBLEAdvertiseLocalName);
-                    self.notifyListeners("onBLEAvailable", data: [
-                        "localNameList": resultList,
-                    ]);
-                }
+
+    private func searchBLEPrinter(_ call: CAPPluginCall) {
+        DispatchQueue.global().async {
+            self.cancelRoutineBluetooth = {
+                BRLMPrinterSearcher.cancelBLESearch()
+            }
+            let option = BRLMBLESearchOption()
+            option.searchDuration = TimeInterval(call.getInt("searchDuration", 15))
+            NSLog("BRLMPrinterSearcher.startBLESearch")
+            BRLMPrinterSearcher.startBLESearch(option) { channel in
+                self.notifyListeners(BrotherPrinterEvent.onPrinterAvailable.rawValue, data: self.chanelToPrinter(port: "bluetoothLowEnergy", channel: channel))
             }
-            self.notifyListeners("onBLEAvailable", data: [
-                "localNameList": [],
-            ]);
+            self.cancelRoutineBluetooth = nil
+            call.resolve()
         }
     }
-    
-    @objc func stopSearchBLEPrinter(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            BRPtouchBLEManager.shared().stopSearch()
+
+    private func chanelToPrinter(port: String, channel: BRLMChannel) -> JSObject {
+        let modelName = channel.extraInfo?.value(forKey: BRLMChannelExtraInfoKeyModelName) as? String ?? ""
+        let serialNumber = channel.extraInfo?.value(forKey: BRLMChannelExtraInfoKeySerialNumber) as? String ?? ""
+        let macAddress = channel.extraInfo?.value(forKey: BRLMChannelExtraInfoKeyMacAddress) as? String ?? ""
+        let nodeName = channel.extraInfo?.value(forKey: BRLMChannelExtraInfoKeyNodeName) as? String ?? ""
+        let location = channel.extraInfo?.value(forKey: BRLMChannelExtraInfoKeyLocation) as? String ?? ""
+        let ipaddress = channel.channelInfo
+
+        return [
+            "port": port,
+            "modelName": modelName,
+            "serialNumber": serialNumber,
+            "macAddress": macAddress,
+            "ipAddress": ipaddress,
+            "nodeName": nodeName,
+            "location": location
+        ]
+    }
+
+    @objc func cancelSearchWiFiPrinter(_ call: CAPPluginCall) {
+        DispatchQueue.global().async {
+            self.cancelRoutineWiFi?()
+            self.cancelRoutineWiFi = nil
         }
     }
-}
 
+    @objc func cancelSearchBluetoothPrinter(_ call: CAPPluginCall) {
+        DispatchQueue.global().async {
+            self.cancelRoutineBluetooth?()
+            self.cancelRoutineBluetooth = nil
+        }
+    }
+}

package/ios/Plugin/module.modulemap

@@ -1,9 +1,17 @@
 module BRLMPrinterKit {
     header "../../../../../ios/App/Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BRLMPrinterKit.h"
+//    header "../Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BRLMPrinterKit.h"
     link "BRLMPrinterKit"
 }
 
 module BRPtouchPrinterKit {
     header "../../../../../ios/App/Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BRPtouchPrinterKit.h"
+//    header "../Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BRPtouchPrinterKit.h"
     link "BRPtouchPrinterKit"
 }
+
+module BMSPrinterKit {
+    header "../../../../../ios/App/Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BRPtouchPrinterKit.h"
+//    header "../Pods/BRLMPrinterKit_v4/BRLMPrinterKit/BRLMPrinterKit.xcframework/ios-arm64/BRLMPrinterKit.framework/Headers/BMSPrinterKit.h"
+    link "BMSPrinterKit"
+}