@bota-dev/react-native-sdk 0.0.5 → 0.0.6
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/lib/commonjs/ble/BleManager.js +36 -16
- package/lib/commonjs/ble/BleManager.js.map +1 -1
- package/lib/module/ble/BleManager.js +36 -16
- package/lib/module/ble/BleManager.js.map +1 -1
- package/lib/typescript/src/ble/BleManager.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/ble/BleManager.ts +31 -14
|
@@ -145,21 +145,26 @@ class BleManager extends _eventemitter.default {
|
|
|
145
145
|
return;
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
149
|
+
const deviceName = device?.localName || device?.name;
|
|
150
|
+
|
|
148
151
|
// Log all devices for debugging
|
|
149
|
-
if (
|
|
152
|
+
if (deviceName) {
|
|
150
153
|
log.info('BLE device found', {
|
|
151
|
-
name:
|
|
152
|
-
|
|
153
|
-
|
|
154
|
+
name: deviceName,
|
|
155
|
+
localName: device?.localName,
|
|
156
|
+
cachedName: device?.name,
|
|
157
|
+
id: device?.id,
|
|
158
|
+
rssi: device?.rssi
|
|
154
159
|
});
|
|
155
160
|
}
|
|
156
161
|
|
|
157
162
|
// For now, show all devices with a name (comment out Bota filter for debugging)
|
|
158
|
-
if (!device || !
|
|
163
|
+
if (!device || !deviceName) {
|
|
159
164
|
return;
|
|
160
165
|
}
|
|
161
166
|
// TODO: Re-enable this filter after debugging
|
|
162
|
-
// if (!
|
|
167
|
+
// if (!deviceName.startsWith(DEVICE_NAME_PREFIX)) {
|
|
163
168
|
// return;
|
|
164
169
|
// }
|
|
165
170
|
|
|
@@ -222,7 +227,10 @@ class BleManager extends _eventemitter.default {
|
|
|
222
227
|
* Parse a discovered device from BLE advertisement data
|
|
223
228
|
*/
|
|
224
229
|
parseDiscoveredDevice(device) {
|
|
225
|
-
|
|
230
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
231
|
+
// iOS caches device names, so localName is more accurate for renamed devices
|
|
232
|
+
const deviceName = device.localName || device.name;
|
|
233
|
+
if (!deviceName) {
|
|
226
234
|
return null;
|
|
227
235
|
}
|
|
228
236
|
|
|
@@ -246,17 +254,17 @@ class BleManager extends _eventemitter.default {
|
|
|
246
254
|
}
|
|
247
255
|
} else {
|
|
248
256
|
// Infer device type from name
|
|
249
|
-
if (
|
|
257
|
+
if (deviceName.includes('Pin4G')) {
|
|
250
258
|
deviceType = 'bota_pin_4g';
|
|
251
|
-
} else if (
|
|
259
|
+
} else if (deviceName.includes('Note')) {
|
|
252
260
|
deviceType = 'bota_note';
|
|
253
|
-
} else if (
|
|
261
|
+
} else if (deviceName.includes('Pin')) {
|
|
254
262
|
deviceType = 'bota_pin';
|
|
255
263
|
}
|
|
256
264
|
}
|
|
257
265
|
return {
|
|
258
266
|
id: device.id,
|
|
259
|
-
name:
|
|
267
|
+
name: deviceName,
|
|
260
268
|
deviceType,
|
|
261
269
|
firmwareVersion,
|
|
262
270
|
pairingState,
|
|
@@ -438,11 +446,23 @@ class BleManager extends _eventemitter.default {
|
|
|
438
446
|
}
|
|
439
447
|
return device.monitorCharacteristicForService(serviceUuid, characteristicUuid, (error, characteristic) => {
|
|
440
448
|
if (error) {
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
449
|
+
// Handle subscription cancellation gracefully - this is expected when we remove the subscription
|
|
450
|
+
const errorMessage = error.message || 'Unknown BLE error';
|
|
451
|
+
const isCancelled = errorMessage.includes('cancelled') || errorMessage.includes('disconnected') || error.errorCode === 2; // BleErrorCode.OperationCancelled
|
|
452
|
+
|
|
453
|
+
if (!isCancelled) {
|
|
454
|
+
log.error('Notification error', new Error(errorMessage), {
|
|
455
|
+
deviceId,
|
|
456
|
+
characteristicUuid
|
|
457
|
+
});
|
|
458
|
+
onError?.(new Error(errorMessage));
|
|
459
|
+
} else {
|
|
460
|
+
log.debug('Subscription ended', {
|
|
461
|
+
deviceId,
|
|
462
|
+
characteristicUuid,
|
|
463
|
+
reason: errorMessage
|
|
464
|
+
});
|
|
465
|
+
}
|
|
446
466
|
return;
|
|
447
467
|
}
|
|
448
468
|
if (characteristic?.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeBlePlx","require","_buffer","_eventemitter","_interopRequireDefault","_constants","_errors","_logger","_parsers","e","__esModule","default","log","logger","tag","BleManager","EventEmitter","stateSubscription","disconnectSubscriptions","Map","connectedDevices","discoveredDevices","isScanning","cachedState","State","Unknown","constructor","manager","RNBleManager","setupStateListener","onStateChange","state","debug","emit","getState","getCachedState","isReady","PoweredOn","waitForReady","timeoutMs","startTime","Date","now","Unsupported","BluetoothError","unavailable","Unauthorized","unauthorized","PoweredOff","poweredOff","Promise","resolve","setTimeout","startScan","options","warn","timeout","SCAN_TIMEOUT","deviceTypes","pairingState","minRssi","allowDuplicates","info","clear","scanTimeout","stopScan","startDeviceScan","error","device","clearTimeout","name","id","rssi","discovered","parseDiscoveredDevice","includes","deviceType","undefined","existingDevice","get","set","type","stopDeviceScan","getDiscoveredDevices","Array","from","values","firmwareVersion","manufacturerData","Buffer","length","parseDeviceType","parseFirmwareVersion","parsePairingState","deviceId","discoveredAt","connect","has","connectToDevice","CONNECTION_TIMEOUT","requestMTU","MAX_MTU","discoverAllServicesAndCharacteristics","disconnectSub","onDisconnected","disconnectedDevice","message","delete","remove","Error","bleError","DeviceError","connectionFailed","disconnect","cancelConnection","isConnected","getConnectedDevice","getMtu","DEFAULT_MTU","mtu","readCharacteristic","serviceUuid","characteristicUuid","notConnected","characteristic","readCharacteristicForService","value","alloc","writeCharacteristic","data","withResponse","base64Data","toString","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","subscribeToCharacteristic","onData","onError","monitorCharacteristicForService","destroy","sub","keys","catch","removeAllListeners","exports","instance","getBleManager","resetBleManager"],"sourceRoot":"../../../src","sources":["ble/BleManager.ts"],"mappings":";;;;;;;;AAIA,IAAAA,kBAAA,GAAAC,OAAA;AAOA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,UAAA,GAAAJ,OAAA;AAaA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,OAAA,GAAAN,OAAA;AACA,IAAAO,QAAA,GAAAP,OAAA;AAImB,SAAAG,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAjCnB;AACA;AACA;;AAiCA,MAAMG,GAAG,GAAGC,cAAM,CAACC,GAAG,CAAC,YAAY,CAAC;;AAEpC;AACA;AACA;;AAQA;AACA;AACA;AACO,MAAMC,UAAU,SAASC,qBAAY,CAAmB;EAErDC,iBAAiB,GAAwB,IAAI;EAC7CC,uBAAuB,GAA8B,IAAIC,GAAG,CAAC,CAAC;EAC9DC,gBAAgB,GAAwB,IAAID,GAAG,CAAC,CAAC;EACjDE,iBAAiB,GAAkC,IAAIF,GAAG,CAAC,CAAC;EAC5DG,UAAU,GAAG,KAAK;EAClBC,WAAW,GAAUC,wBAAK,CAACC,OAAO;EAE1CC,WAAWA,CAAA,EAAG;IACZ,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,OAAO,GAAG,IAAIC,6BAAY,CAAC,CAAC;IACjC,IAAI,CAACC,kBAAkB,CAAC,CAAC;EAC3B;;EAEA;AACF;AACA;EACUA,kBAAkBA,CAAA,EAAS;IACjC,IAAI,CAACZ,iBAAiB,GAAG,IAAI,CAACU,OAAO,CAACG,aAAa,CAAEC,KAAK,IAAK;MAC7DnB,GAAG,CAACoB,KAAK,CAAC,yBAAyB,EAAE;QAAED;MAAM,CAAC,CAAC;MAC/C,IAAI,CAACR,WAAW,GAAGQ,KAAK;MACxB,IAAI,CAACE,IAAI,CAAC,aAAa,EAAEF,KAAK,CAAC;IACjC,CAAC,EAAE,IAAI,CAAC;EACV;;EAEA;AACF;AACA;EACE,MAAMG,QAAQA,CAAA,EAAmB;IAC/B,MAAMH,KAAK,GAAG,MAAM,IAAI,CAACJ,OAAO,CAACI,KAAK,CAAC,CAAC;IACxC,IAAI,CAACR,WAAW,GAAGQ,KAAK;IACxB,OAAOA,KAAK;EACd;;EAEA;AACF;AACA;EACEI,cAAcA,CAAA,EAAU;IACtB,OAAO,IAAI,CAACZ,WAAW;EACzB;;EAEA;AACF;AACA;EACE,MAAMa,OAAOA,CAAA,EAAqB;IAChC,MAAML,KAAK,GAAG,MAAM,IAAI,CAACG,QAAQ,CAAC,CAAC;IACnC,OAAOH,KAAK,KAAKP,wBAAK,CAACa,SAAS;EAClC;;EAEA;AACF;AACA;EACE,MAAMC,YAAYA,CAACC,SAAiB,GAAG,KAAK,EAAiB;IAC3D,MAAMC,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAE5B,OAAOD,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF,SAAS,GAAGD,SAAS,EAAE;MACzC,MAAMR,KAAK,GAAG,MAAM,IAAI,CAACG,QAAQ,CAAC,CAAC;MAEnC,IAAIH,KAAK,KAAKP,wBAAK,CAACa,SAAS,EAAE;QAC7B;MACF;MAEA,IAAIN,KAAK,KAAKP,wBAAK,CAACmB,WAAW,EAAE;QAC/B,MAAMC,sBAAc,CAACC,WAAW,CAAC,CAAC;MACpC;MAEA,IAAId,KAAK,KAAKP,wBAAK,CAACsB,YAAY,EAAE;QAChC,MAAMF,sBAAc,CAACG,YAAY,CAAC,CAAC;MACrC;MAEA,IAAIhB,KAAK,KAAKP,wBAAK,CAACwB,UAAU,EAAE;QAC9B,MAAMJ,sBAAc,CAACK,UAAU,CAAC,CAAC;MACnC;;MAEA;MACA,MAAM,IAAIC,OAAO,CAAEC,OAAO,IAAKC,UAAU,CAACD,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1D;IAEA,MAAM,IAAIP,sBAAc,CAAC,wCAAwC,EAAE,SAAS,CAAC;EAC/E;;EAEA;AACF;AACA;EACE,MAAMS,SAASA,CAACC,OAAoB,GAAG,CAAC,CAAC,EAAiB;IACxD,IAAI,IAAI,CAAChC,UAAU,EAAE;MACnBV,GAAG,CAAC2C,IAAI,CAAC,0BAA0B,CAAC;MACpC;IACF;IAEA,MAAM,IAAI,CAACjB,YAAY,CAAC,CAAC;IAEzB,MAAM;MACJkB,OAAO,GAAGC,uBAAY;MACtBC,WAAW;MACXC,YAAY;MACZC,OAAO;MACPC,eAAe,GAAG;IACpB,CAAC,GAAGP,OAAO;IAEX1C,GAAG,CAACkD,IAAI,CAAC,mBAAmB,EAAE;MAAEN,OAAO;MAAEE,WAAW;MAAEC;IAAa,CAAC,CAAC;IAErE,IAAI,CAACtC,iBAAiB,CAAC0C,KAAK,CAAC,CAAC;IAC9B,IAAI,CAACzC,UAAU,GAAG,IAAI;;IAEtB;IACA,MAAM0C,WAAW,GAAGZ,UAAU,CAAC,MAAM;MACnC,IAAI,CAACa,QAAQ,CAAC,CAAC;IACjB,CAAC,EAAET,OAAO,CAAC;;IAEX;IACA,IAAI,CAAC7B,OAAO,CAACuC,eAAe,CAC1B,IAAI;IAAE;IACN;MAAEL;IAAgB,CAAC,EACnB,CAACM,KAAK,EAAEC,MAAM,KAAK;MACjB,IAAID,KAAK,EAAE;QACTvD,GAAG,CAACuD,KAAK,CAAC,YAAY,EAAEA,KAAK,CAAC;QAC9B,IAAI,CAACF,QAAQ,CAAC,CAAC;QACfI,YAAY,CAACL,WAAW,CAAC;QACzB;MACF;;MAEA;MACA,IAAII,MAAM,EAAEE,IAAI,EAAE;QAChB1D,GAAG,CAACkD,IAAI,CAAC,kBAAkB,EAAE;UAAEQ,IAAI,EAAEF,MAAM,CAACE,IAAI;UAAEC,EAAE,EAAEH,MAAM,CAACG,EAAE;UAAEC,IAAI,EAAEJ,MAAM,CAACI;QAAK,CAAC,CAAC;MACvF;;MAEA;MACA,IAAI,CAACJ,MAAM,IAAI,CAACA,MAAM,CAACE,IAAI,EAAE;QAC3B;MACF;MACA;MACA;MACA;MACA;;MAEA;MACA,MAAMG,UAAU,GAAG,IAAI,CAACC,qBAAqB,CAACN,MAAM,CAAC;MACrD,IAAI,CAACK,UAAU,EAAE;QACf;MACF;;MAEA;MACA,IAAIf,WAAW,IAAI,CAACA,WAAW,CAACiB,QAAQ,CAACF,UAAU,CAACG,UAAU,CAAC,EAAE;QAC/D;MACF;MAEA,IAAIjB,YAAY,IAAIc,UAAU,CAACd,YAAY,KAAKA,YAAY,EAAE;QAC5D;MACF;MAEA,IAAIC,OAAO,KAAKiB,SAAS,IAAIJ,UAAU,CAACD,IAAI,GAAGZ,OAAO,EAAE;QACtD;MACF;;MAEA;MACA,MAAMkB,cAAc,GAAG,IAAI,CAACzD,iBAAiB,CAAC0D,GAAG,CAACX,MAAM,CAACG,EAAE,CAAC;MAC5D,IAAIO,cAAc,IAAI,CAACjB,eAAe,EAAE;QACtC;QACAiB,cAAc,CAACN,IAAI,GAAGC,UAAU,CAACD,IAAI;QACrC;MACF;;MAEA;MACA,IAAI,CAACnD,iBAAiB,CAAC2D,GAAG,CAACZ,MAAM,CAACG,EAAE,EAAEE,UAAU,CAAC;MACjD7D,GAAG,CAACoB,KAAK,CAAC,mBAAmB,EAAE;QAC7BuC,EAAE,EAAEE,UAAU,CAACF,EAAE;QACjBD,IAAI,EAAEG,UAAU,CAACH,IAAI;QACrBW,IAAI,EAAER,UAAU,CAACG;MACnB,CAAC,CAAC;MACF,IAAI,CAAC3C,IAAI,CAAC,kBAAkB,EAAEwC,UAAU,CAAC;IAC3C,CACF,CAAC;EACH;;EAEA;AACF;AACA;EACER,QAAQA,CAAA,EAAS;IACf,IAAI,CAAC,IAAI,CAAC3C,UAAU,EAAE;MACpB;IACF;IAEAV,GAAG,CAACkD,IAAI,CAAC,mBAAmB,CAAC;IAC7B,IAAI,CAACnC,OAAO,CAACuD,cAAc,CAAC,CAAC;IAC7B,IAAI,CAAC5D,UAAU,GAAG,KAAK;EACzB;;EAEA;AACF;AACA;EACE6D,oBAAoBA,CAAA,EAAuB;IACzC,OAAOC,KAAK,CAACC,IAAI,CAAC,IAAI,CAAChE,iBAAiB,CAACiE,MAAM,CAAC,CAAC,CAAC;EACpD;;EAEA;AACF;AACA;EACUZ,qBAAqBA,CAACN,MAAc,EAA2B;IACrE,IAAI,CAACA,MAAM,CAACE,IAAI,EAAE;MAChB,OAAO,IAAI;IACb;;IAEA;IACA,IAAIM,UAAsB,GAAG,UAAU;IACvC,IAAIW,eAAe,GAAG,OAAO;IAC7B,IAAI5B,YAA0B,GAAG,UAAU;IAC3C,IAAI6B,gBAAwC;IAE5C,IAAIpB,MAAM,CAACoB,gBAAgB,EAAE;MAC3B,IAAI;QACFA,gBAAgB,GAAGC,cAAM,CAACJ,IAAI,CAACjB,MAAM,CAACoB,gBAAgB,EAAE,QAAQ,CAAC;QACjE,IAAIA,gBAAgB,CAACE,MAAM,IAAI,CAAC,EAAE;UAChCd,UAAU,GAAG,IAAAe,wBAAe,EAACH,gBAAgB,CAAC,CAAC,CAAC,CAAC;UACjDD,eAAe,GAAG,IAAAK,6BAAoB,EACpCJ,gBAAgB,CAAC,CAAC,CAAC,EACnBA,gBAAgB,CAAC,CAAC,CACpB,CAAC;UACD7B,YAAY,GAAG,IAAAkC,0BAAiB,EAACL,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACvD;MACF,CAAC,CAAC,OAAO/E,CAAC,EAAE;QACVG,GAAG,CAAC2C,IAAI,CAAC,mCAAmC,EAAE;UAAEuC,QAAQ,EAAE1B,MAAM,CAACG;QAAG,CAAC,CAAC;MACxE;IACF,CAAC,MAAM;MACL;MACA,IAAIH,MAAM,CAACE,IAAI,CAACK,QAAQ,CAAC,OAAO,CAAC,EAAE;QACjCC,UAAU,GAAG,aAAa;MAC5B,CAAC,MAAM,IAAIR,MAAM,CAACE,IAAI,CAACK,QAAQ,CAAC,MAAM,CAAC,EAAE;QACvCC,UAAU,GAAG,WAAW;MAC1B,CAAC,MAAM,IAAIR,MAAM,CAACE,IAAI,CAACK,QAAQ,CAAC,KAAK,CAAC,EAAE;QACtCC,UAAU,GAAG,UAAU;MACzB;IACF;IAEA,OAAO;MACLL,EAAE,EAAEH,MAAM,CAACG,EAAE;MACbD,IAAI,EAAEF,MAAM,CAACE,IAAI;MACjBM,UAAU;MACVW,eAAe;MACf5B,YAAY;MACZa,IAAI,EAAEJ,MAAM,CAACI,IAAI,IAAI,CAAC,GAAG;MACzBgB,gBAAgB;MAChBO,YAAY,EAAE,IAAItD,IAAI,CAAC;IACzB,CAAC;EACH;;EAEA;AACF;AACA;EACE,MAAMuD,OAAOA,CAACF,QAAgB,EAAmB;IAC/ClF,GAAG,CAACkD,IAAI,CAAC,sBAAsB,EAAE;MAAEgC;IAAS,CAAC,CAAC;;IAE9C;IACA,IAAI,IAAI,CAAC1E,gBAAgB,CAAC6E,GAAG,CAACH,QAAQ,CAAC,EAAE;MACvClF,GAAG,CAACoB,KAAK,CAAC,0BAA0B,EAAE;QAAE8D;MAAS,CAAC,CAAC;MACnD,OAAO,IAAI,CAAC1E,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAC5C;IAEA,IAAI;MACF;MACA,MAAM1B,MAAM,GAAG,MAAM,IAAI,CAACzC,OAAO,CAACuE,eAAe,CAACJ,QAAQ,EAAE;QAC1DtC,OAAO,EAAE2C,6BAAkB;QAC3BC,UAAU,EAAEC;MACd,CAAC,CAAC;MAEFzF,GAAG,CAACoB,KAAK,CAAC,wCAAwC,EAAE;QAAE8D;MAAS,CAAC,CAAC;;MAEjE;MACA,MAAM1B,MAAM,CAACkC,qCAAqC,CAAC,CAAC;;MAEpD;MACA,IAAI,CAAClF,gBAAgB,CAAC4D,GAAG,CAACc,QAAQ,EAAE1B,MAAM,CAAC;;MAE3C;MACA,MAAMmC,aAAa,GAAGnC,MAAM,CAACoC,cAAc,CAAC,CAACrC,KAAK,EAAEsC,kBAAkB,KAAK;QACzE7F,GAAG,CAACkD,IAAI,CAAC,qBAAqB,EAAE;UAC9BgC,QAAQ,EAAEW,kBAAkB,CAAClC,EAAE;UAC/BJ,KAAK,EAAEA,KAAK,EAAEuC;QAChB,CAAC,CAAC;QACF,IAAI,CAACtF,gBAAgB,CAACuF,MAAM,CAACF,kBAAkB,CAAClC,EAAE,CAAC;QACnD,IAAI,CAACrD,uBAAuB,CAAC6D,GAAG,CAAC0B,kBAAkB,CAAClC,EAAE,CAAC,EAAEqC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC1F,uBAAuB,CAACyF,MAAM,CAACF,kBAAkB,CAAClC,EAAE,CAAC;QAC1D,IAAI,CAACtC,IAAI,CACP,oBAAoB,EACpBwE,kBAAkB,CAAClC,EAAE,EACrBJ,KAAK,GAAG,IAAI0C,KAAK,CAAC1C,KAAK,CAACuC,OAAO,CAAC,GAAG7B,SACrC,CAAC;MACH,CAAC,CAAC;MACF,IAAI,CAAC3D,uBAAuB,CAAC8D,GAAG,CAACc,QAAQ,EAAES,aAAa,CAAC;MAEzD,IAAI,CAACtE,IAAI,CAAC,iBAAiB,EAAE6D,QAAQ,CAAC;MACtC,OAAO1B,MAAM;IACf,CAAC,CAAC,OAAOD,KAAK,EAAE;MACd,MAAM2C,QAAQ,GAAG3C,KAAiB;MAClCvD,GAAG,CAACuD,KAAK,CAAC,mBAAmB,EAAE,IAAI0C,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAAC,EAAE;QAAEZ;MAAS,CAAC,CAAC;MACzE,MAAMiB,mBAAW,CAACC,gBAAgB,CAAClB,QAAQ,EAAE,IAAIe,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAAC,CAAC;IAC3E;EACF;;EAEA;AACF;AACA;EACE,MAAMO,UAAUA,CAACnB,QAAgB,EAAiB;IAChDlF,GAAG,CAACkD,IAAI,CAAC,2BAA2B,EAAE;MAAEgC;IAAS,CAAC,CAAC;IAEnD,MAAM1B,MAAM,GAAG,IAAI,CAAChD,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAClD,IAAI,CAAC1B,MAAM,EAAE;MACXxD,GAAG,CAAC2C,IAAI,CAAC,uCAAuC,EAAE;QAAEuC;MAAS,CAAC,CAAC;MAC/D;IACF;IAEA,IAAI;MACF,MAAM1B,MAAM,CAAC8C,gBAAgB,CAAC,CAAC;IACjC,CAAC,CAAC,OAAO/C,KAAK,EAAE;MACd,MAAM2C,QAAQ,GAAG3C,KAAiB;MAClCvD,GAAG,CAAC2C,IAAI,CAAC,oCAAoC,EAAE;QAAEY,KAAK,EAAE2C,QAAQ,CAACJ;MAAQ,CAAC,CAAC;IAC7E;IAEA,IAAI,CAACtF,gBAAgB,CAACuF,MAAM,CAACb,QAAQ,CAAC;IACtC,IAAI,CAAC5E,uBAAuB,CAAC6D,GAAG,CAACe,QAAQ,CAAC,EAAEc,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC1F,uBAAuB,CAACyF,MAAM,CAACb,QAAQ,CAAC;EAC/C;;EAEA;AACF;AACA;EACEqB,WAAWA,CAACrB,QAAgB,EAAW;IACrC,OAAO,IAAI,CAAC1E,gBAAgB,CAAC6E,GAAG,CAACH,QAAQ,CAAC;EAC5C;;EAEA;AACF;AACA;EACEsB,kBAAkBA,CAACtB,QAAgB,EAAsB;IACvD,OAAO,IAAI,CAAC1E,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;EAC5C;;EAEA;AACF;AACA;EACE,MAAMuB,MAAMA,CAACvB,QAAgB,EAAmB;IAC9C,MAAM1B,MAAM,GAAG,IAAI,CAAChD,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAClD,IAAI,CAAC1B,MAAM,EAAE;MACX,OAAOkD,sBAAW;IACpB;IAEA,IAAI;MACF;MACA,OAAOlD,MAAM,CAACmD,GAAG,IAAID,sBAAW;IAClC,CAAC,CAAC,MAAM;MACN,OAAOA,sBAAW;IACpB;EACF;;EAEA;AACF;AACA;EACE,MAAME,kBAAkBA,CACtB1B,QAAgB,EAChB2B,WAAmB,EACnBC,kBAA0B,EACT;IACjB,MAAMtD,MAAM,GAAG,IAAI,CAAChD,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAClD,IAAI,CAAC1B,MAAM,EAAE;MACX,MAAM2C,mBAAW,CAACY,YAAY,CAAC7B,QAAQ,CAAC;IAC1C;IAEA,IAAI;MACF,MAAM8B,cAAc,GAAG,MAAMxD,MAAM,CAACyD,4BAA4B,CAC9DJ,WAAW,EACXC,kBACF,CAAC;MAED,IAAI,CAACE,cAAc,CAACE,KAAK,EAAE;QACzB,OAAOrC,cAAM,CAACsC,KAAK,CAAC,CAAC,CAAC;MACxB;MAEA,OAAOtC,cAAM,CAACJ,IAAI,CAACuC,cAAc,CAACE,KAAK,EAAE,QAAQ,CAAC;IACpD,CAAC,CAAC,OAAO3D,KAAK,EAAE;MACd,MAAM2C,QAAQ,GAAG3C,KAAiB;MAClCvD,GAAG,CAACuD,KAAK,CAAC,4BAA4B,EAAE,IAAI0C,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAAC,EAAE;QACnEZ,QAAQ;QACR2B,WAAW;QACXC;MACF,CAAC,CAAC;MACF,MAAM,IAAIX,mBAAW,CACnB,kCAAkCD,QAAQ,CAACJ,OAAO,EAAE,EACpD,aAAa,EACbZ,QAAQ,EACR,IAAIe,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAC5B,CAAC;IACH;EACF;;EAEA;AACF;AACA;EACE,MAAMsB,mBAAmBA,CACvBlC,QAAgB,EAChB2B,WAAmB,EACnBC,kBAA0B,EAC1BO,IAAY,EACZC,YAAqB,GAAG,IAAI,EACb;IACf,MAAM9D,MAAM,GAAG,IAAI,CAAChD,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAClD,IAAI,CAAC1B,MAAM,EAAE;MACX,MAAM2C,mBAAW,CAACY,YAAY,CAAC7B,QAAQ,CAAC;IAC1C;IAEA,MAAMqC,UAAU,GAAGF,IAAI,CAACG,QAAQ,CAAC,QAAQ,CAAC;IAE1C,IAAI;MACF,IAAIF,YAAY,EAAE;QAChB,MAAM9D,MAAM,CAACiE,yCAAyC,CACpDZ,WAAW,EACXC,kBAAkB,EAClBS,UACF,CAAC;MACH,CAAC,MAAM;QACL,MAAM/D,MAAM,CAACkE,4CAA4C,CACvDb,WAAW,EACXC,kBAAkB,EAClBS,UACF,CAAC;MACH;IACF,CAAC,CAAC,OAAOhE,KAAK,EAAE;MACd,MAAM2C,QAAQ,GAAG3C,KAAiB;MAClCvD,GAAG,CAACuD,KAAK,CAAC,6BAA6B,EAAE,IAAI0C,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAAC,EAAE;QACpEZ,QAAQ;QACR2B,WAAW;QACXC;MACF,CAAC,CAAC;MACF,MAAM,IAAIX,mBAAW,CACnB,mCAAmCD,QAAQ,CAACJ,OAAO,EAAE,EACrD,cAAc,EACdZ,QAAQ,EACR,IAAIe,KAAK,CAACC,QAAQ,CAACJ,OAAO,CAC5B,CAAC;IACH;EACF;;EAEA;AACF;AACA;EACE6B,yBAAyBA,CACvBzC,QAAgB,EAChB2B,WAAmB,EACnBC,kBAA0B,EAC1Bc,MAA8B,EAC9BC,OAAgC,EAClB;IACd,MAAMrE,MAAM,GAAG,IAAI,CAAChD,gBAAgB,CAAC2D,GAAG,CAACe,QAAQ,CAAC;IAClD,IAAI,CAAC1B,MAAM,EAAE;MACX,MAAM2C,mBAAW,CAACY,YAAY,CAAC7B,QAAQ,CAAC;IAC1C;IAEA,OAAO1B,MAAM,CAACsE,+BAA+B,CAC3CjB,WAAW,EACXC,kBAAkB,EAClB,CAACvD,KAAK,EAAEyD,cAAc,KAAK;MACzB,IAAIzD,KAAK,EAAE;QACTvD,GAAG,CAACuD,KAAK,CAAC,oBAAoB,EAAE,IAAI0C,KAAK,CAAC1C,KAAK,CAACuC,OAAO,CAAC,EAAE;UACxDZ,QAAQ;UACR4B;QACF,CAAC,CAAC;QACFe,OAAO,GAAG,IAAI5B,KAAK,CAAC1C,KAAK,CAACuC,OAAO,CAAC,CAAC;QACnC;MACF;MAEA,IAAIkB,cAAc,EAAEE,KAAK,EAAE;QACzB,MAAMG,IAAI,GAAGxC,cAAM,CAACJ,IAAI,CAACuC,cAAc,CAACE,KAAK,EAAE,QAAQ,CAAC;QACxDU,MAAM,CAACP,IAAI,CAAC;MACd;IACF,CACF,CAAC;EACH;;EAEA;AACF;AACA;EACEU,OAAOA,CAAA,EAAS;IACd/H,GAAG,CAACkD,IAAI,CAAC,wBAAwB,CAAC;IAElC,IAAI,CAACG,QAAQ,CAAC,CAAC;;IAEf;IACA,KAAK,MAAM2E,GAAG,IAAI,IAAI,CAAC1H,uBAAuB,CAACoE,MAAM,CAAC,CAAC,EAAE;MACvDsD,GAAG,CAAChC,MAAM,CAAC,CAAC;IACd;IACA,IAAI,CAAC1F,uBAAuB,CAAC6C,KAAK,CAAC,CAAC;;IAEpC;IACA,KAAK,MAAM+B,QAAQ,IAAI,IAAI,CAAC1E,gBAAgB,CAACyH,IAAI,CAAC,CAAC,EAAE;MACnD,IAAI,CAAC5B,UAAU,CAACnB,QAAQ,CAAC,CAACgD,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C;IACA,IAAI,CAAC1H,gBAAgB,CAAC2C,KAAK,CAAC,CAAC;;IAE7B;IACA,IAAI,CAAC9C,iBAAiB,EAAE2F,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC3F,iBAAiB,GAAG,IAAI;;IAE7B;IACA,IAAI,CAACU,OAAO,CAACgH,OAAO,CAAC,CAAC;IAEtB,IAAI,CAACI,kBAAkB,CAAC,CAAC;EAC3B;AACF;;AAEA;AACA;AACA;AAFAC,OAAA,CAAAjI,UAAA,GAAAA,UAAA;AAGA,IAAIkI,QAA2B,GAAG,IAAI;;AAEtC;AACA;AACA;AACO,SAASC,aAAaA,CAAA,EAAe;EAC1C,IAAI,CAACD,QAAQ,EAAE;IACbA,QAAQ,GAAG,IAAIlI,UAAU,CAAC,CAAC;EAC7B;EACA,OAAOkI,QAAQ;AACjB;;AAEA;AACA;AACA;AACO,SAASE,eAAeA,CAAA,EAAS;EACtC,IAAIF,QAAQ,EAAE;IACZA,QAAQ,CAACN,OAAO,CAAC,CAAC;IAClBM,QAAQ,GAAG,IAAI;EACjB;AACF","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_reactNativeBlePlx","require","_buffer","_eventemitter","_interopRequireDefault","_constants","_errors","_logger","_parsers","e","__esModule","default","log","logger","tag","BleManager","EventEmitter","stateSubscription","disconnectSubscriptions","Map","connectedDevices","discoveredDevices","isScanning","cachedState","State","Unknown","constructor","manager","RNBleManager","setupStateListener","onStateChange","state","debug","emit","getState","getCachedState","isReady","PoweredOn","waitForReady","timeoutMs","startTime","Date","now","Unsupported","BluetoothError","unavailable","Unauthorized","unauthorized","PoweredOff","poweredOff","Promise","resolve","setTimeout","startScan","options","warn","timeout","SCAN_TIMEOUT","deviceTypes","pairingState","minRssi","allowDuplicates","info","clear","scanTimeout","stopScan","startDeviceScan","error","device","clearTimeout","deviceName","localName","name","cachedName","id","rssi","discovered","parseDiscoveredDevice","includes","deviceType","undefined","existingDevice","get","set","type","stopDeviceScan","getDiscoveredDevices","Array","from","values","firmwareVersion","manufacturerData","Buffer","length","parseDeviceType","parseFirmwareVersion","parsePairingState","deviceId","discoveredAt","connect","has","connectToDevice","CONNECTION_TIMEOUT","requestMTU","MAX_MTU","discoverAllServicesAndCharacteristics","disconnectSub","onDisconnected","disconnectedDevice","message","delete","remove","Error","bleError","DeviceError","connectionFailed","disconnect","cancelConnection","isConnected","getConnectedDevice","getMtu","DEFAULT_MTU","mtu","readCharacteristic","serviceUuid","characteristicUuid","notConnected","characteristic","readCharacteristicForService","value","alloc","writeCharacteristic","data","withResponse","base64Data","toString","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","subscribeToCharacteristic","onData","onError","monitorCharacteristicForService","errorMessage","isCancelled","errorCode","reason","destroy","sub","keys","catch","removeAllListeners","exports","instance","getBleManager","resetBleManager"],"sourceRoot":"../../../src","sources":["ble/BleManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -138,21 +138,26 @@ export class BleManager extends EventEmitter {
|
|
|
138
138
|
return;
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
142
|
+
const deviceName = device?.localName || device?.name;
|
|
143
|
+
|
|
141
144
|
// Log all devices for debugging
|
|
142
|
-
if (
|
|
145
|
+
if (deviceName) {
|
|
143
146
|
log.info('BLE device found', {
|
|
144
|
-
name:
|
|
145
|
-
|
|
146
|
-
|
|
147
|
+
name: deviceName,
|
|
148
|
+
localName: device?.localName,
|
|
149
|
+
cachedName: device?.name,
|
|
150
|
+
id: device?.id,
|
|
151
|
+
rssi: device?.rssi
|
|
147
152
|
});
|
|
148
153
|
}
|
|
149
154
|
|
|
150
155
|
// For now, show all devices with a name (comment out Bota filter for debugging)
|
|
151
|
-
if (!device || !
|
|
156
|
+
if (!device || !deviceName) {
|
|
152
157
|
return;
|
|
153
158
|
}
|
|
154
159
|
// TODO: Re-enable this filter after debugging
|
|
155
|
-
// if (!
|
|
160
|
+
// if (!deviceName.startsWith(DEVICE_NAME_PREFIX)) {
|
|
156
161
|
// return;
|
|
157
162
|
// }
|
|
158
163
|
|
|
@@ -215,7 +220,10 @@ export class BleManager extends EventEmitter {
|
|
|
215
220
|
* Parse a discovered device from BLE advertisement data
|
|
216
221
|
*/
|
|
217
222
|
parseDiscoveredDevice(device) {
|
|
218
|
-
|
|
223
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
224
|
+
// iOS caches device names, so localName is more accurate for renamed devices
|
|
225
|
+
const deviceName = device.localName || device.name;
|
|
226
|
+
if (!deviceName) {
|
|
219
227
|
return null;
|
|
220
228
|
}
|
|
221
229
|
|
|
@@ -239,17 +247,17 @@ export class BleManager extends EventEmitter {
|
|
|
239
247
|
}
|
|
240
248
|
} else {
|
|
241
249
|
// Infer device type from name
|
|
242
|
-
if (
|
|
250
|
+
if (deviceName.includes('Pin4G')) {
|
|
243
251
|
deviceType = 'bota_pin_4g';
|
|
244
|
-
} else if (
|
|
252
|
+
} else if (deviceName.includes('Note')) {
|
|
245
253
|
deviceType = 'bota_note';
|
|
246
|
-
} else if (
|
|
254
|
+
} else if (deviceName.includes('Pin')) {
|
|
247
255
|
deviceType = 'bota_pin';
|
|
248
256
|
}
|
|
249
257
|
}
|
|
250
258
|
return {
|
|
251
259
|
id: device.id,
|
|
252
|
-
name:
|
|
260
|
+
name: deviceName,
|
|
253
261
|
deviceType,
|
|
254
262
|
firmwareVersion,
|
|
255
263
|
pairingState,
|
|
@@ -431,11 +439,23 @@ export class BleManager extends EventEmitter {
|
|
|
431
439
|
}
|
|
432
440
|
return device.monitorCharacteristicForService(serviceUuid, characteristicUuid, (error, characteristic) => {
|
|
433
441
|
if (error) {
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
442
|
+
// Handle subscription cancellation gracefully - this is expected when we remove the subscription
|
|
443
|
+
const errorMessage = error.message || 'Unknown BLE error';
|
|
444
|
+
const isCancelled = errorMessage.includes('cancelled') || errorMessage.includes('disconnected') || error.errorCode === 2; // BleErrorCode.OperationCancelled
|
|
445
|
+
|
|
446
|
+
if (!isCancelled) {
|
|
447
|
+
log.error('Notification error', new Error(errorMessage), {
|
|
448
|
+
deviceId,
|
|
449
|
+
characteristicUuid
|
|
450
|
+
});
|
|
451
|
+
onError?.(new Error(errorMessage));
|
|
452
|
+
} else {
|
|
453
|
+
log.debug('Subscription ended', {
|
|
454
|
+
deviceId,
|
|
455
|
+
characteristicUuid,
|
|
456
|
+
reason: errorMessage
|
|
457
|
+
});
|
|
458
|
+
}
|
|
439
459
|
return;
|
|
440
460
|
}
|
|
441
461
|
if (characteristic?.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BleManager","RNBleManager","State","Buffer","EventEmitter","DEFAULT_MTU","MAX_MTU","CONNECTION_TIMEOUT","SCAN_TIMEOUT","BluetoothError","DeviceError","logger","parseDeviceType","parsePairingState","parseFirmwareVersion","log","tag","stateSubscription","disconnectSubscriptions","Map","connectedDevices","discoveredDevices","isScanning","cachedState","Unknown","constructor","manager","setupStateListener","onStateChange","state","debug","emit","getState","getCachedState","isReady","PoweredOn","waitForReady","timeoutMs","startTime","Date","now","Unsupported","unavailable","Unauthorized","unauthorized","PoweredOff","poweredOff","Promise","resolve","setTimeout","startScan","options","warn","timeout","deviceTypes","pairingState","minRssi","allowDuplicates","info","clear","scanTimeout","stopScan","startDeviceScan","error","device","clearTimeout","name","id","rssi","discovered","parseDiscoveredDevice","includes","deviceType","undefined","existingDevice","get","set","type","stopDeviceScan","getDiscoveredDevices","Array","from","values","firmwareVersion","manufacturerData","length","e","deviceId","discoveredAt","connect","has","connectToDevice","requestMTU","discoverAllServicesAndCharacteristics","disconnectSub","onDisconnected","disconnectedDevice","message","delete","remove","Error","bleError","connectionFailed","disconnect","cancelConnection","isConnected","getConnectedDevice","getMtu","mtu","readCharacteristic","serviceUuid","characteristicUuid","notConnected","characteristic","readCharacteristicForService","value","alloc","writeCharacteristic","data","withResponse","base64Data","toString","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","subscribeToCharacteristic","onData","onError","monitorCharacteristicForService","destroy","sub","keys","catch","removeAllListeners","instance","getBleManager","resetBleManager"],"sourceRoot":"../../../src","sources":["ble/BleManager.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["BleManager","RNBleManager","State","Buffer","EventEmitter","DEFAULT_MTU","MAX_MTU","CONNECTION_TIMEOUT","SCAN_TIMEOUT","BluetoothError","DeviceError","logger","parseDeviceType","parsePairingState","parseFirmwareVersion","log","tag","stateSubscription","disconnectSubscriptions","Map","connectedDevices","discoveredDevices","isScanning","cachedState","Unknown","constructor","manager","setupStateListener","onStateChange","state","debug","emit","getState","getCachedState","isReady","PoweredOn","waitForReady","timeoutMs","startTime","Date","now","Unsupported","unavailable","Unauthorized","unauthorized","PoweredOff","poweredOff","Promise","resolve","setTimeout","startScan","options","warn","timeout","deviceTypes","pairingState","minRssi","allowDuplicates","info","clear","scanTimeout","stopScan","startDeviceScan","error","device","clearTimeout","deviceName","localName","name","cachedName","id","rssi","discovered","parseDiscoveredDevice","includes","deviceType","undefined","existingDevice","get","set","type","stopDeviceScan","getDiscoveredDevices","Array","from","values","firmwareVersion","manufacturerData","length","e","deviceId","discoveredAt","connect","has","connectToDevice","requestMTU","discoverAllServicesAndCharacteristics","disconnectSub","onDisconnected","disconnectedDevice","message","delete","remove","Error","bleError","connectionFailed","disconnect","cancelConnection","isConnected","getConnectedDevice","getMtu","mtu","readCharacteristic","serviceUuid","characteristicUuid","notConnected","characteristic","readCharacteristicForService","value","alloc","writeCharacteristic","data","withResponse","base64Data","toString","writeCharacteristicWithResponseForService","writeCharacteristicWithoutResponseForService","subscribeToCharacteristic","onData","onError","monitorCharacteristicForService","errorMessage","isCancelled","errorCode","reason","destroy","sub","keys","catch","removeAllListeners","instance","getBleManager","resetBleManager"],"sourceRoot":"../../../src","sources":["ble/BleManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../../../../src/ble/BleManager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAEL,MAAM,EACN,KAAK,EACL,YAAY,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,YAAY,MAAM,eAAe,CAAC;AASzC,OAAO,KAAK,EACV,gBAAgB,EAGhB,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAW1B;;GAEG;AACH,UAAU,gBAAgB;IACxB,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACpC,gBAAgB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACrD,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAC5D,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,uBAAuB,CAAwC;IACvE,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,iBAAiB,CAA4C;IACrE,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAwB;;IAQ3C;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAQ1B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC;IAMhC;;OAEG;IACH,cAAc,IAAI,KAAK;IAIvB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAKjC;;OAEG;IACG,YAAY,CAAC,SAAS,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B5D;;OAEG;IACG,SAAS,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../../../../src/ble/BleManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/ble/BleManager.ts
CHANGED
|
@@ -171,17 +171,20 @@ export class BleManager extends EventEmitter<BleManagerEvents> {
|
|
|
171
171
|
return;
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
175
|
+
const deviceName = device?.localName || device?.name;
|
|
176
|
+
|
|
174
177
|
// Log all devices for debugging
|
|
175
|
-
if (
|
|
176
|
-
log.info('BLE device found', { name: device
|
|
178
|
+
if (deviceName) {
|
|
179
|
+
log.info('BLE device found', { name: deviceName, localName: device?.localName, cachedName: device?.name, id: device?.id, rssi: device?.rssi });
|
|
177
180
|
}
|
|
178
181
|
|
|
179
182
|
// For now, show all devices with a name (comment out Bota filter for debugging)
|
|
180
|
-
if (!device || !
|
|
183
|
+
if (!device || !deviceName) {
|
|
181
184
|
return;
|
|
182
185
|
}
|
|
183
186
|
// TODO: Re-enable this filter after debugging
|
|
184
|
-
// if (!
|
|
187
|
+
// if (!deviceName.startsWith(DEVICE_NAME_PREFIX)) {
|
|
185
188
|
// return;
|
|
186
189
|
// }
|
|
187
190
|
|
|
@@ -248,7 +251,11 @@ export class BleManager extends EventEmitter<BleManagerEvents> {
|
|
|
248
251
|
* Parse a discovered device from BLE advertisement data
|
|
249
252
|
*/
|
|
250
253
|
private parseDiscoveredDevice(device: Device): DiscoveredDevice | null {
|
|
251
|
-
|
|
254
|
+
// Prioritize localName (from current advertisement) over name (iOS cached)
|
|
255
|
+
// iOS caches device names, so localName is more accurate for renamed devices
|
|
256
|
+
const deviceName = device.localName || device.name;
|
|
257
|
+
|
|
258
|
+
if (!deviceName) {
|
|
252
259
|
return null;
|
|
253
260
|
}
|
|
254
261
|
|
|
@@ -274,18 +281,18 @@ export class BleManager extends EventEmitter<BleManagerEvents> {
|
|
|
274
281
|
}
|
|
275
282
|
} else {
|
|
276
283
|
// Infer device type from name
|
|
277
|
-
if (
|
|
284
|
+
if (deviceName.includes('Pin4G')) {
|
|
278
285
|
deviceType = 'bota_pin_4g';
|
|
279
|
-
} else if (
|
|
286
|
+
} else if (deviceName.includes('Note')) {
|
|
280
287
|
deviceType = 'bota_note';
|
|
281
|
-
} else if (
|
|
288
|
+
} else if (deviceName.includes('Pin')) {
|
|
282
289
|
deviceType = 'bota_pin';
|
|
283
290
|
}
|
|
284
291
|
}
|
|
285
292
|
|
|
286
293
|
return {
|
|
287
294
|
id: device.id,
|
|
288
|
-
name:
|
|
295
|
+
name: deviceName,
|
|
289
296
|
deviceType,
|
|
290
297
|
firmwareVersion,
|
|
291
298
|
pairingState,
|
|
@@ -510,11 +517,21 @@ export class BleManager extends EventEmitter<BleManagerEvents> {
|
|
|
510
517
|
characteristicUuid,
|
|
511
518
|
(error, characteristic) => {
|
|
512
519
|
if (error) {
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
520
|
+
// Handle subscription cancellation gracefully - this is expected when we remove the subscription
|
|
521
|
+
const errorMessage = error.message || 'Unknown BLE error';
|
|
522
|
+
const isCancelled = errorMessage.includes('cancelled') ||
|
|
523
|
+
errorMessage.includes('disconnected') ||
|
|
524
|
+
error.errorCode === 2; // BleErrorCode.OperationCancelled
|
|
525
|
+
|
|
526
|
+
if (!isCancelled) {
|
|
527
|
+
log.error('Notification error', new Error(errorMessage), {
|
|
528
|
+
deviceId,
|
|
529
|
+
characteristicUuid,
|
|
530
|
+
});
|
|
531
|
+
onError?.(new Error(errorMessage));
|
|
532
|
+
} else {
|
|
533
|
+
log.debug('Subscription ended', { deviceId, characteristicUuid, reason: errorMessage });
|
|
534
|
+
}
|
|
518
535
|
return;
|
|
519
536
|
}
|
|
520
537
|
|