@onekeyfe/hd-transport-react-native 1.0.20 → 1.0.21

package/dist/BleTransport.d.ts

@@ -6,6 +6,9 @@ export default class BleTransport {
     writeCharacteristic: Characteristic;
     notifyCharacteristic: Characteristic;
     nofitySubscription?: () => void;
+    static MAX_RETRIES: number;
+    static RETRY_DELAY: number;
     constructor(device: Device, writeCharacteristic: Characteristic, notifyCharacteristic: Characteristic);
+    writeWithRetry(data: string, retryCount?: number): Promise<void>;
 }
 //# sourceMappingURL=BleTransport.d.ts.map

package/dist/BleTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;gBAG9B,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;CAQvC"}
+{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAgB,MAAM,gCAAgC,CAAC;AAMtF,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAEhC,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,WAAW,SAAQ;gBAGxB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;IAehC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,SAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BzF"}

package/dist/index.d.ts

@@ -32,7 +32,7 @@ declare class ReactNativeBleTransport {
     }>;
     _monitorCharacteristic(characteristic: Characteristic): () => void;
     release(uuid: string): Promise<boolean>;
-    call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey | undefined>;
+    call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
     stop(): void;
     cancel(): void;
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,gCAAgC,CAAC;AAExC,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA2MpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+FpE,IAAI;IAIJ,MAAM;CAOP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,gCAAgC,CAAC;AAExC,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAmNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAgF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAwHpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -7,6 +7,7 @@ var ByteBuffer = require('bytebuffer');
 var transport = require('@onekeyfe/hd-transport');
 var hdShared = require('@onekeyfe/hd-shared');
 var BleManager = require('react-native-ble-manager');
+var hdCore = require('@onekeyfe/hd-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -158,6 +159,7 @@ const isHeaderChunk = (chunk) => {
     return false;
 };
 
+const Log = hdCore.getLogger(hdCore.LoggerNames.HdBleTransport);
 class BleTransport {
     constructor(device, writeCharacteristic, notifyCharacteristic) {
         this.mtuSize = 20;
@@ -167,7 +169,37 @@ class BleTransport {
         this.notifyCharacteristic = notifyCharacteristic;
         console.log(`BleTransport(${String(this.id)}) new instance`);
     }
+    writeWithRetry(data, retryCount = BleTransport.MAX_RETRIES) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.writeCharacteristic.writeWithoutResponse(data);
+            }
+            catch (error) {
+                Log === null || Log === void 0 ? void 0 : Log.debug(`Write retry attempt ${BleTransport.MAX_RETRIES - retryCount + 1}, error: ${error}`);
+                if (retryCount > 0) {
+                    yield hdCore.wait(BleTransport.RETRY_DELAY);
+                    if (error.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected ||
+                        error.errorCode === reactNativeBlePlx.BleErrorCode.CharacteristicNotFound) {
+                        try {
+                            yield this.device.connect();
+                            yield this.device.discoverAllServicesAndCharacteristics();
+                        }
+                        catch (e) {
+                            Log === null || Log === void 0 ? void 0 : Log.debug(`Connect or discoverAllServicesAndCharacteristics error: ${e}`);
+                        }
+                    }
+                    else {
+                        Log === null || Log === void 0 ? void 0 : Log.debug(`writeCharacteristic error: ${error}`);
+                    }
+                    return this.writeWithRetry(data, retryCount - 1);
+                }
+                throw error;
+            }
+        });
+    }
 }
+BleTransport.MAX_RETRIES = 5;
+BleTransport.RETRY_DELAY = 2000;
 
 const { check, buildBuffers, receiveOne, parseConfigure } = transport__default["default"];
 const transportCache = {};
@@ -447,14 +479,24 @@ class ReactNativeBleTransport {
             });
             const disconnectSubscription = device.onDisconnected(() => {
                 var _a;
-                this.Log.debug('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
-                (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-disconnect', {
-                    name: device === null || device === void 0 ? void 0 : device.name,
-                    id: device === null || device === void 0 ? void 0 : device.id,
-                    connectId: device === null || device === void 0 ? void 0 : device.id,
-                });
-                this.release(uuid);
-                disconnectSubscription === null || disconnectSubscription === void 0 ? void 0 : disconnectSubscription.remove();
+                try {
+                    this.Log.debug('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
+                    (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-disconnect', {
+                        name: device === null || device === void 0 ? void 0 : device.name,
+                        id: device === null || device === void 0 ? void 0 : device.id,
+                        connectId: device === null || device === void 0 ? void 0 : device.id,
+                    });
+                    if (this.runPromise) {
+                        this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError));
+                    }
+                }
+                catch (e) {
+                    this.Log.debug('device disconnect error: ', e);
+                }
+                finally {
+                    this.release(uuid);
+                    disconnectSubscription === null || disconnectSubscription === void 0 ? void 0 : disconnectSubscription.remove();
+                }
             });
             return { uuid };
         });
@@ -463,7 +505,7 @@ class ReactNativeBleTransport {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (error) {
                 this.Log.debug(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
                 if (this.runPromise) {
@@ -477,12 +519,12 @@ class ReactNativeBleTransport {
                     if (((_c = error.reason) === null || _c === void 0 ? void 0 : _c.includes('Cannot write client characteristic config descriptor')) ||
                         ((_d = error.reason) === null || _d === void 0 ? void 0 : _d.includes('Cannot find client characteristic config descriptor')) ||
                         ((_e = error.reason) === null || _e === void 0 ? void 0 : _e.includes('The handle is invalid'))) {
-                        this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure, (_f = error.message) !== null && _f !== void 0 ? _f : error.reason));
+                        this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure));
                         this.Log.debug(`${hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`);
                         return;
                     }
-                    this.runPromise.reject(hdShared.ERRORS.TypedError(ERROR, (_g = error.reason) !== null && _g !== void 0 ? _g : error.message));
-                    this.Log.debug(': monitor notify error, and has unreleased Promise');
+                    this.runPromise.reject(hdShared.ERRORS.TypedError(ERROR));
+                    this.Log.debug(': monitor notify error, and has unreleased Promise', Error);
                 }
                 return;
             }
@@ -502,12 +544,12 @@ class ReactNativeBleTransport {
                     const value = buffer.Buffer.from(buffer$1);
                     bufferLength = 0;
                     buffer$1 = [];
-                    (_h = this.runPromise) === null || _h === void 0 ? void 0 : _h.resolve(value.toString('hex'));
+                    (_f = this.runPromise) === null || _f === void 0 ? void 0 : _f.resolve(value.toString('hex'));
                 }
             }
             catch (error) {
                 this.Log.debug('monitor data error: ', error);
-                (_j = this.runPromise) === null || _j === void 0 ? void 0 : _j.reject(error);
+                (_g = this.runPromise) === null || _g === void 0 ? void 0 : _g.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError));
             }
         });
         return () => {
@@ -557,27 +599,42 @@ class ReactNativeBleTransport {
                 this.Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
             }
             const buffers = buildBuffers(messages, name, data);
-            if (name === 'FirmwareUpload' || name === 'EmmcFileWrite') {
-                const packetCapacity = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
-                let index = 0;
-                let chunk = ByteBuffer__default["default"].allocate(packetCapacity);
-                while (index < buffers.length) {
-                    const buffer = buffers[index].toBuffer();
-                    chunk.append(buffer);
-                    index += 1;
-                    if (chunk.offset === packetCapacity || index >= buffers.length) {
-                        chunk.reset();
-                        try {
-                            yield transport$1.writeCharacteristic.writeWithoutResponse(chunk.toString('base64'));
-                            chunk = ByteBuffer__default["default"].allocate(packetCapacity);
-                        }
-                        catch (e) {
-                            this.runPromise = null;
-                            this.Log.error('writeCharacteristic write error: ', e);
-                            return;
+            function writeChunkedData(buffers, writeFunction, onError) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const packetCapacity = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
+                    let index = 0;
+                    let chunk = ByteBuffer__default["default"].allocate(packetCapacity);
+                    while (index < buffers.length) {
+                        const buffer = buffers[index].toBuffer();
+                        chunk.append(buffer);
+                        index += 1;
+                        if (chunk.offset === packetCapacity || index >= buffers.length) {
+                            chunk.reset();
+                            try {
+                                yield writeFunction(chunk.toString('base64'));
+                                chunk = ByteBuffer__default["default"].allocate(packetCapacity);
+                            }
+                            catch (e) {
+                                onError(e);
+                                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+                            }
                         }
                     }
-                }
+                });
+            }
+            if (name === 'EmmcFileWrite') {
+                yield writeChunkedData(buffers, data => transport$1.writeWithRetry(data), e => {
+                    this.runPromise = null;
+                    this.Log.error('writeCharacteristic write error: ', e);
+                });
+            }
+            else if (name === 'FirmwareUpload') {
+                yield writeChunkedData(buffers, (data) => __awaiter(this, void 0, void 0, function* () {
+                    yield transport$1.writeCharacteristic.writeWithoutResponse(data);
+                }), e => {
+                    this.runPromise = null;
+                    this.Log.error('writeCharacteristic write error: ', e);
+                });
             }
             else {
                 for (const o of buffers) {
@@ -591,10 +648,12 @@ class ReactNativeBleTransport {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
-                        if (e.errorCode === reactNativeBlePlx.BleErrorCode.OperationStartFailed) {
+                        else if (e.errorCode === reactNativeBlePlx.BleErrorCode.OperationStartFailed) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError, e.reason);
                         }
-                        return;
+                        else {
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+                        }
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,10 +19,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.20",
-    "@onekeyfe/hd-transport": "^1.0.20",
+    "@onekeyfe/hd-shared": "^1.0.21",
+    "@onekeyfe/hd-transport": "^1.0.21",
     "@onekeyfe/react-native-ble-plx": "3.0.1",
     "react-native-ble-manager": "^8.1.0"
   },
-  "gitHead": "c1fd68371775203bf6ac57059c0a72eda6fa7fba"
+  "gitHead": "b50c64ebefa5db4435b9d1a4d64409587c8d1416"
 }

package/src/BleTransport.ts

@@ -1,4 +1,8 @@
-import { Device, Characteristic } from '@onekeyfe/react-native-ble-plx';
+import { Device, Characteristic, BleErrorCode } from '@onekeyfe/react-native-ble-plx';
+import { getLogger, LoggerNames, wait } from '@onekeyfe/hd-core';
+// import { wait } from '@onekeyfe/hd-core/src/utils';
+
+const Log = getLogger(LoggerNames.HdBleTransport);
 
 export default class BleTransport {
   id: string;
@@ -13,6 +17,10 @@ export default class BleTransport {
 
   nofitySubscription?: () => void;
 
+  static MAX_RETRIES = 5;
+
+  static RETRY_DELAY = 2000;
+
   constructor(
     device: Device,
     writeCharacteristic: Characteristic,
@@ -24,4 +32,38 @@ export default class BleTransport {
     this.notifyCharacteristic = notifyCharacteristic;
     console.log(`BleTransport(${String(this.id)}) new instance`);
   }
+
+  /**
+   * @description only for pro / touch , while upgrade firmware
+   * @param data
+   * @param retryCount
+   * @returns
+   */
+  async writeWithRetry(data: string, retryCount = BleTransport.MAX_RETRIES): Promise<void> {
+    try {
+      await this.writeCharacteristic.writeWithoutResponse(data);
+    } catch (error) {
+      Log?.debug(
+        `Write retry attempt ${BleTransport.MAX_RETRIES - retryCount + 1}, error: ${error}`
+      );
+      if (retryCount > 0) {
+        await wait(BleTransport.RETRY_DELAY);
+        if (
+          error.errorCode === BleErrorCode.DeviceDisconnected ||
+          error.errorCode === BleErrorCode.CharacteristicNotFound
+        ) {
+          try {
+            await this.device.connect();
+            await this.device.discoverAllServicesAndCharacteristics();
+          } catch (e) {
+            Log?.debug(`Connect or discoverAllServicesAndCharacteristics error: ${e}`);
+          }
+        } else {
+          Log?.debug(`writeCharacteristic error: ${error}`);
+        }
+        return this.writeWithRetry(data, retryCount - 1);
+      }
+      throw error;
+    }
+  }
 }

package/src/index.ts

@@ -374,14 +374,22 @@ export default class ReactNativeBleTransport {
     });
 
     const disconnectSubscription = device.onDisconnected(() => {
-      this.Log.debug('device disconnect: ', device?.id);
-      this.emitter?.emit('device-disconnect', {
-        name: device?.name,
-        id: device?.id,
-        connectId: device?.id,
-      });
-      this.release(uuid);
-      disconnectSubscription?.remove();
+      try {
+        this.Log.debug('device disconnect: ', device?.id);
+        this.emitter?.emit('device-disconnect', {
+          name: device?.name,
+          id: device?.id,
+          connectId: device?.id,
+        });
+        if (this.runPromise) {
+          this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleConnectedError));
+        }
+      } catch (e) {
+        this.Log.debug('device disconnect error: ', e);
+      } finally {
+        this.release(uuid);
+        disconnectSubscription?.remove();
+      }
     });
 
     return { uuid };
@@ -415,19 +423,17 @@ export default class ReactNativeBleTransport {
             error.reason?.includes('The handle is invalid')
           ) {
             this.runPromise.reject(
-              ERRORS.TypedError(
-                HardwareErrorCode.BleCharacteristicNotifyChangeFailure,
-                error.message ?? error.reason
-              )
+              ERRORS.TypedError(HardwareErrorCode.BleCharacteristicNotifyChangeFailure)
             );
             this.Log.debug(
               `${HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`
             );
             return;
           }
-          this.runPromise.reject(ERRORS.TypedError(ERROR, error.reason ?? error.message));
-          this.Log.debug(': monitor notify error, and has unreleased Promise');
+          this.runPromise.reject(ERRORS.TypedError(ERROR));
+          this.Log.debug(': monitor notify error, and has unreleased Promise', Error);
         }
+
         return;
       }
 
@@ -459,7 +465,7 @@ export default class ReactNativeBleTransport {
         }
       } catch (error) {
         this.Log.debug('monitor data error: ', error);
-        this.runPromise?.reject(error);
+        this.runPromise?.reject(ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError));
       }
     });
 
@@ -516,30 +522,55 @@ export default class ReactNativeBleTransport {
       this.Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
     }
 
-    const buffers = buildBuffers(messages, name, data);
+    const buffers = buildBuffers(messages, name, data) as Array<ByteBuffer>;
 
-    if (name === 'FirmwareUpload' || name === 'EmmcFileWrite') {
+    async function writeChunkedData(
+      buffers: ByteBuffer[],
+      writeFunction: (data: string) => Promise<void>,
+      onError: (e: any) => void
+    ) {
       const packetCapacity = Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
       let index = 0;
       let chunk = ByteBuffer.allocate(packetCapacity);
+
       while (index < buffers.length) {
         const buffer = buffers[index].toBuffer();
         chunk.append(buffer);
         index += 1;
+
         if (chunk.offset === packetCapacity || index >= buffers.length) {
           chunk.reset();
-          // Upgrading Packet Logs, Too much content to ignore
-          // this.Log.debug('send more packet hex strting: ', chunk.toString('hex'));
           try {
-            await transport.writeCharacteristic.writeWithoutResponse(chunk.toString('base64'));
+            await writeFunction(chunk.toString('base64'));
             chunk = ByteBuffer.allocate(packetCapacity);
           } catch (e) {
-            this.runPromise = null;
-            this.Log.error('writeCharacteristic write error: ', e);
-            return;
+            onError(e);
+            throw ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
           }
         }
       }
+    }
+
+    if (name === 'EmmcFileWrite') {
+      await writeChunkedData(
+        buffers,
+        data => transport.writeWithRetry(data),
+        e => {
+          this.runPromise = null;
+          this.Log.error('writeCharacteristic write error: ', e);
+        }
+      );
+    } else if (name === 'FirmwareUpload') {
+      await writeChunkedData(
+        buffers,
+        async data => {
+          await transport.writeCharacteristic.writeWithoutResponse(data);
+        },
+        e => {
+          this.runPromise = null;
+          this.Log.error('writeCharacteristic write error: ', e);
+        }
+      );
     } else {
       for (const o of buffers) {
         const outData = o.toString('base64');
@@ -552,11 +583,11 @@ export default class ReactNativeBleTransport {
           this.runPromise = null;
           if (e.errorCode === BleErrorCode.DeviceDisconnected) {
             throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded);
-          }
-          if (e.errorCode === BleErrorCode.OperationStartFailed) {
+          } else if (e.errorCode === BleErrorCode.OperationStartFailed) {
             throw ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError, e.reason);
+          } else {
+            throw ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
           }
-          return;
         }
       }
     }