capacitor-stripe-terminal 3.0.0-beta.7 → 3.0.0-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ios/Plugin/Plugin.swift +33 -20
- package/package.json +1 -1
package/ios/Plugin/Plugin.swift
CHANGED
|
@@ -15,6 +15,7 @@ public class StripeTerminal: CAPPlugin, ConnectionTokenProvider, DiscoveryDelega
|
|
|
15
15
|
private var pendingReaderAutoReconnect: Cancelable?
|
|
16
16
|
private var currentUpdate: ReaderSoftwareUpdate?
|
|
17
17
|
private var currentPaymentIntent: PaymentIntent?
|
|
18
|
+
private var cancelDiscoverReadersCall: CAPPluginCall?
|
|
18
19
|
private var isInitialized: Bool = false
|
|
19
20
|
private var thread = DispatchQueue.init(label: "CapacitorStripeTerminal")
|
|
20
21
|
|
|
@@ -93,36 +94,48 @@ public class StripeTerminal: CAPPlugin, ConnectionTokenProvider, DiscoveryDelega
|
|
|
93
94
|
|
|
94
95
|
let discoveryMethod = StripeTerminalUtils.translateDiscoveryMethod(method: method)
|
|
95
96
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
97
|
+
let config = DiscoveryConfiguration(
|
|
98
|
+
discoveryMethod: discoveryMethod,
|
|
99
|
+
locationId: locationId,
|
|
100
|
+
simulated: simulated
|
|
101
|
+
)
|
|
102
|
+
|
|
103
|
+
guard pendingDiscoverReaders == nil else {
|
|
104
|
+
call.reject("discoverReaders is busy")
|
|
105
|
+
return
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
self.pendingDiscoverReaders = Terminal.shared.discoverReaders(config, delegate: self) { error in
|
|
104
109
|
if let error = error {
|
|
105
110
|
call.reject(error.localizedDescription, nil, error)
|
|
111
|
+
self.pendingDiscoverReaders = nil
|
|
106
112
|
} else {
|
|
107
113
|
call.resolve()
|
|
114
|
+
self.pendingDiscoverReaders = nil
|
|
115
|
+
|
|
116
|
+
// if cancelDiscoverReadersCall exists, resolve it since the discovery is complete now
|
|
117
|
+
self.cancelDiscoverReadersCall?.resolve()
|
|
118
|
+
self.cancelDiscoverReadersCall = nil
|
|
108
119
|
}
|
|
109
|
-
}
|
|
120
|
+
}
|
|
110
121
|
}
|
|
111
122
|
|
|
112
123
|
@objc func cancelDiscoverReaders(_ call: CAPPluginCall? = nil) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
if let error = error {
|
|
116
|
-
call?.reject(error.localizedDescription, nil, error)
|
|
117
|
-
} else {
|
|
118
|
-
call?.resolve()
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
|
|
124
|
+
guard let cancelable = pendingDiscoverReaders else {
|
|
125
|
+
call?.resolve()
|
|
122
126
|
return
|
|
123
127
|
}
|
|
124
|
-
|
|
125
|
-
|
|
128
|
+
|
|
129
|
+
cancelable.cancel() { error in
|
|
130
|
+
if let error = error as NSError? {
|
|
131
|
+
call?.reject(error.localizedDescription, nil, error)
|
|
132
|
+
self.pendingDiscoverReaders = nil
|
|
133
|
+
} else {
|
|
134
|
+
// do not call resolve, let discoverReaders call it when it is actually complete
|
|
135
|
+
self.cancelDiscoverReadersCall = call
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
126
139
|
}
|
|
127
140
|
|
|
128
141
|
@objc func connectBluetoothReader(_ call: CAPPluginCall) {
|
package/package.json
CHANGED