@react-native-ohos/react-native-ble-plx 3.2.1 → 3.5.1

package/harmony/rn_bleplx/src/main/ets/common/BleErrorToJsObjectConverter.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 import { BleError } from './BleError';
 
@@ -60,4 +40,4 @@ export class BleErrorToJsObjectConverter {
       obj[key] = null;
     }
   }
-}
+}

package/harmony/rn_bleplx/src/main/ets/common/BleEvent.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 export const BleEvent = {
   scanEvent: 'ScanEvent',
@@ -30,4 +10,4 @@ export const BleEvent = {
   disconnectionEvent: 'DisconnectionEvent',
   connectingEvent: 'ConnectingEvent',
   connectedEvent: 'ConnectedEvent'
-}
+}

package/harmony/rn_bleplx/src/main/ets/common/BleUtils.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 import { ValuesBucket } from '@kit.ArkData';
 import { ble } from '@kit.ConnectivityKit';

package/harmony/rn_bleplx/src/main/ets/common/IdGenerator.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 import { IdGeneratorKey } from './IdGeneratorKey';
 

package/harmony/rn_bleplx/src/main/ets/common/IdGeneratorKey.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 export class IdGeneratorKey {
   readonly deviceAddress: string;

package/harmony/rn_bleplx/src/main/ets/common/InstanceIdGenerator.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 export class InstanceIdGenerator {
   static instanceMap: Map<string, number> = new Map();
@@ -34,4 +14,4 @@ export class InstanceIdGenerator {
     }
     return value;
   }
-}
+}

package/harmony/rn_bleplx/src/main/ets/common/Logger.ts

@@ -1,7 +1,7 @@
 /**
  * MIT License
  *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
+ * Copyright (C) 2025 Huawei Device Co., Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/harmony/rn_bleplx/src/main/ets/common/PermissionHandler.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 import bundleManager from '@ohos.bundle.bundleManager';
 import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';

package/harmony/rn_bleplx/src/main/ets/common/ServiceFactory.ts

@@ -1,26 +1,6 @@
-/*
- * MIT License
- *
- * Copyright (C) 2023 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
 
 import ble from '@ohos.bluetooth.ble';
 import { InstanceIdGenerator } from './InstanceIdGenerator';

package/harmony/rn_bleplx/src/main/ets/generated/components/ts.ts

@@ -1,5 +1,8 @@
-
 /**
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export {}

package/harmony/rn_bleplx/src/main/ets/generated/index.ets

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * from "./ts"

package/harmony/rn_bleplx/src/main/ets/generated/ts.ts

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * as RNC from "./components/ts"

package/harmony/rn_bleplx/src/main/ets/generated/turboModules/BlePlx.ts

@@ -1,5 +1,10 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ * 
+ * @generatorVersion: 1
  */
 
 import { Tag } from "@rnoh/react-native-openharmony/ts"
@@ -74,11 +79,11 @@ export namespace BlePlx {
   
     writeCharacteristic(characteristicIdentifier: number, valueBase64: string, response: boolean, transactionId: string): Promise<Object>;
   
-    monitorCharacteristicForDevice(deviceId: string, serviceUUID: string, characteristicUUID: string, transactionId: string): Promise<void>;
+    monitorCharacteristicForDevice(deviceId: string, serviceUUID: string, characteristicUUID: string, transactionId: string, subscriptionType: string): Promise<void>;
   
-    monitorCharacteristicForService(serviceIdentifier: number, characteristicUUID: string, transactionId: string): Promise<void>;
+    monitorCharacteristicForService(serviceIdentifier: number, characteristicUUID: string, transactionId: string, subscriptionType: string): Promise<void>;
   
-    monitorCharacteristic(characteristicIdentifier: number, transactionId: string): Promise<void>;
+    monitorCharacteristic(characteristicIdentifier: number, transactionId: string, subscriptionType: string): Promise<void>;
   
     readDescriptorForDevice(deviceId: string, serviceUUID: string, characteristicUUID: string, descriptorUUID: string, transactionId: string): Promise<Object>;
   

package/harmony/rn_bleplx/src/main/ets/generated/turboModules/ts.ts

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  */
 
 export * from "./BlePlx"

package/harmony/rn_bleplx/ts.ts

@@ -0,0 +1,6 @@
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
+
+export * from "./src/main/ets/BlePlxPackage"
+export * from "./src/main/ets/BlePlxModule"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-ble-plx",
-  "version": "3.2.1",
+  "version": "3.5.1",
   "description": "React Native Bluetooth Low Energy library",
   "main": "src/index",
   "module": "src/index",
@@ -11,19 +11,11 @@
     "@react-native/codegen": "0.74.0"
   },
   "harmony": {
-    "alias": "react-native-ble-plx",
-    "autolinking": {
-      "etsPackageClassName":"BlePlxPackage",
-      "cppPackageClassName":"BlePlxPackage",
-      "cmakeLibraryTargetName": "rnoh_ble_plx", 
-      "ohPackageName": "@react-native-ohos/react-native-ble-plx"
-    }
+    "alias": "react-native-ble-plx"
   },
   "files": [
     "src",
     "lib",
-    "android",
-    "ios",
     "cpp",
     "harmony",
     "plugin/build",
@@ -58,12 +50,10 @@
     "clean:plugin": "expo-module clean plugin",
     "test:plugin": "jest --config plugin/jest.config.js",
     "lint:plugin": "eslint plugin/src/*",
-    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-ble-plx --cpp-output-path ./harmony/rn_bleplx/src/main/cpp/generated --ets-output-path ./harmony/rn_bleplx/src/main/ets/generated --turbo-modules-spec-paths ./src --arkts-components-spec-paths ./src"
+    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name rn_bleplx --cpp-output-path ../harmony/rn_bleplx/src/main/cpp/generated --ets-output-path ../harmony/rn_bleplx/src/main/ets/generated --turbo-modules-spec-paths ./src"
   },
   "keywords": [
     "react-native",
-    "ios",
-    "android",
     "React",
     "Native",
     "Bluetooth",
@@ -73,9 +63,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-ble-plx"
+    "url": "git+https://gitcode.com/openharmony-sig/rntpc_react-native-ble-plx.git"
   },
-  "author": "dotintent (https://withintent.com/)",
   "license": "MIT",
   "bugs": {
     "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-ble-plx/issues"
@@ -90,6 +79,7 @@
     "@babel/preset-flow": "^7.22.15",
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
+    "@react-native-community/cli": "^15.0.1",
     "@react-native-community/eslint-config": "^3.0.2",
     "@react-native/eslint-config": "^0.73.1",
     "@release-it/conventional-changelog": "^5.0.0",
@@ -117,19 +107,20 @@
     "jest": "^29.7.0",
     "pod-install": "^0.1.0",
     "prettier": "^3.0.3",
-    "react": "18.2.0",
-    "react-native": "0.72.14",
+    "react": "18.3.1",
+    "react-native": "0.77.1",
     "react-native-builder-bob": "^0.20.0",
     "release-it": "^17.3.0",
     "turbo": "^1.10.7",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "@react-native-oh/react-native-harmony-cli": "file:packages/rnoh-react-native-harmony-cli-0.77.10.tgz"
   },
   "resolutions": {
     "@types/react": "^18.2.44"
   },
   "dependencies": {
     "@expo/config-plugins": "^7.2.5 || ^8.0.0",
-    "react-native-ble-plx": "3.2.0"
+    "react-native-ble-plx": "3.5.0"
   },
   "peerDependencies": {
     "react": "*",
@@ -182,4 +173,4 @@
       ]
     ]
   }
-}
+}

package/src/BleManager.js

@@ -5,7 +5,7 @@ import { Device } from './Device'
 import { Service } from './Service'
 import { Characteristic } from './Characteristic'
 import { Descriptor } from './Descriptor'
-import { State, LogLevel, type BleErrorCodeMessageMapping, ConnectionPriority } from './TypeDefinition'
+import { State, LogLevel, ConnectionPriority } from './TypeDefinition'
 // import { BleModule, EventEmitter } from './BleModule'
 import { EventEmitter } from './BleModule'
 import BleModule from './NativeBlePlx'
@@ -20,16 +20,19 @@ import {
 } from './BleError'
 import type { NativeDevice, NativeCharacteristic, NativeDescriptor, NativeBleRestoredState } from './BleModule'
 import type {
+  BleErrorCodeMessageMapping,
   Subscription,
   DeviceId,
   Identifier,
   UUID,
   TransactionId,
+  CharacteristicSubscriptionType,
   Base64,
   ScanOptions,
   ConnectionOptions,
   BleManagerOptions
 } from './TypeDefinition'
+import { isIOS } from './Utils'
 import { Platform } from 'react-native'
 
 const enableDisableDeprecatedMessage =
@@ -65,11 +68,20 @@ export class BleManager {
 
   // Map of error codes to error messages
   _errorCodesToMessagesMapping: BleErrorCodeMessageMapping
+  
+  static sharedInstance: BleManager | null = null
 
   /**
    * Creates an instance of {@link BleManager}.
+   * It will return already created instance if it was created before.
+   * If you want to create a new instance to for example use different options, you have to call {@link #blemanagerdestroy|destroy()} on the previous one.
    */
   constructor(options: BleManagerOptions = {}) {
+    if (BleManager.sharedInstance !== null) {
+      // $FlowFixMe - Constructor returns shared instance for singleton pattern
+      return BleManager.sharedInstance
+    }
+    
     this._eventEmitter = new EventEmitter(BleModule)
     this._uniqueId = 0
     this._activePromises = {}
@@ -99,6 +111,7 @@ export class BleManager {
       : BleErrorCodeMessage
 
     BleModule.createClient(options.restoreStateIdentifier || null)
+    BleManager.sharedInstance = this
   }
 
   /**
@@ -137,7 +150,7 @@ export class BleManager {
    * @returns {Promise<void>} Promise may return an error when the function cannot be called.
    * {@link #bleerrorcodebluetoothmanagerdestroyed|BluetoothManagerDestroyed} error code.
    */
-  destroy = async (): Promise<void> => {
+  async destroy(): Promise<void> {
     const response = await this._callPromise(BleModule.destroyClient())
 
     // Unsubscribe from any subscriptions
@@ -146,6 +159,10 @@ export class BleManager {
       this._scanEventSubscription = null
     }
     this._destroySubscriptions()
+    
+    if (BleManager.sharedInstance) {
+      BleManager.sharedInstance = null
+    }
 
     // Destroy all promises
     this._destroyPromises()
@@ -231,7 +248,7 @@ export class BleManager {
    * @param {TransactionId} transactionId Id of pending transactions.
    * @returns {Promise<void>}
    */
-  cancelTransaction(transactionId: TransactionId) {
+  cancelTransaction(transactionId: TransactionId): Promise<void> {
     return this._callPromise(BleModule.cancelTransaction(transactionId))
   }
 
@@ -273,7 +290,7 @@ export class BleManager {
    *
    * @returns {Promise<State>} Promise which emits current state of BleManager.
    */
-  state = (): Promise<$Keys<typeof State>> => {
+  state(): Promise<$Keys<typeof State>> {
     return this._callPromise(BleModule.state())
   }
 
@@ -294,10 +311,10 @@ export class BleManager {
    *
    * @returns {Subscription} Subscription on which `remove()` function can be called to unsubscribe.
    */
-  onStateChange = (
+  onStateChange(
     listener: (newState: $Keys<typeof State>) => void,
     emitCurrentState: boolean = false
-  ): Subscription => {
+  ): Subscription {
     const subscription: Subscription = this._eventEmitter.addListener(Platform.OS === 'harmony' ? 'StateChangeEvent' : BleModule.StateChangeEvent, listener)
     const id = this._nextUniqueID()
     var wrappedSubscription: Subscription
@@ -305,7 +322,6 @@ export class BleManager {
     if (emitCurrentState) {
       var cancelled = false
       this._callPromise(this.state()).then(currentState => {
-        console.log(currentState)
         if (!cancelled) {
           listener(currentState)
         }
@@ -354,7 +370,7 @@ export class BleManager {
     UUIDs: ?Array<UUID>,
     options: ?ScanOptions,
     listener: (error: ?BleError, scannedDevice: ?Device) => Promise<void>
-  ) {
+  ): Promise<void> {
     const scanListener = ([error, nativeDevice]: [?string, ?NativeDevice]) => {
       listener(
         error ? parseBleError(error, this._errorCodesToMessagesMapping) : null,
@@ -371,7 +387,7 @@ export class BleManager {
    * Stops {@link Device} scan if in progress.
    * @returns {Promise<void>} the promise may be rejected if the operation is impossible to perform.
    */
-  stopDeviceScan = async (): Promise<void> => {
+  stopDeviceScan (): Promise<void> {
     if (this._scanEventSubscription != null) {
       this._scanEventSubscription.remove()
       this._scanEventSubscription = null
@@ -400,7 +416,15 @@ export class BleManager {
     const nativeDevice = await this._callPromise(
       BleModule.requestConnectionPriorityForDevice(deviceIdentifier, connectionPriority, transactionId)
     )
-    return new Device(nativeDevice, this)
+    const services = await this._callPromise(BleModule.servicesForDevice(deviceIdentifier))
+    const serviceUUIDs = (services || []).map(service => service.uuid)
+    
+    // $FlowFixMe
+    const device = {
+      ...nativeDevice,
+      serviceUUIDs
+    }
+    return new Device(device, this)
   }
 
   /**
@@ -941,11 +965,15 @@ export class BleManager {
     serviceUUID: UUID,
     characteristicUUID: UUID,
     listener: (error: ?BleError, characteristic: ?Characteristic) => void,
-    transactionId: ?TransactionId
+    transactionId: ?TransactionId,
+    subscriptionType: ?CharacteristicSubscriptionType
   ): Subscription {
     const filledTransactionId = transactionId || this._nextUniqueID()
+    const commonArgs = [deviceIdentifier, serviceUUID, characteristicUUID, filledTransactionId]
+    const args = isIOS ? commonArgs : [...commonArgs, subscriptionType]
+    
     return this._handleMonitorCharacteristic(
-      BleModule.monitorCharacteristicForDevice(deviceIdentifier, serviceUUID, characteristicUUID, filledTransactionId),
+      BleModule.monitorCharacteristicForDevice(...args),
       filledTransactionId,
       listener
     )
@@ -968,11 +996,15 @@ export class BleManager {
     serviceIdentifier: Identifier,
     characteristicUUID: UUID,
     listener: (error: ?BleError, characteristic: ?Characteristic) => void,
-    transactionId: ?TransactionId
+    transactionId: ?TransactionId,
+    subscriptionType: ?CharacteristicSubscriptionType
   ): Subscription {
     const filledTransactionId = transactionId || this._nextUniqueID()
+    const commonArgs = [serviceIdentifier, characteristicUUID, filledTransactionId]
+    const args = isIOS ? commonArgs : [...commonArgs, subscriptionType]
+    
     return this._handleMonitorCharacteristic(
-      BleModule.monitorCharacteristicForService(serviceIdentifier, characteristicUUID, filledTransactionId),
+      BleModule.monitorCharacteristicForService(...args),
       filledTransactionId,
       listener
     )
@@ -986,6 +1018,7 @@ export class BleManager {
    * @param {function(error: ?BleError, characteristic: ?Characteristic)} listener - callback which emits
    * {@link Characteristic} objects with modified value for each notification.
    * @param {?TransactionId} transactionId optional `transactionId` which can be used in
+   * @param {?CharacteristicSubscriptionType} subscriptionType subscription type of the characteristic
    * {@link #blemanagercanceltransaction|cancelTransaction()} function.
    * @returns {Subscription} Subscription on which `remove()` function can be called to unsubscribe.
    * @private
@@ -993,13 +1026,17 @@ export class BleManager {
   _monitorCharacteristic(
     characteristicIdentifier: Identifier,
     listener: (error: ?BleError, characteristic: ?Characteristic) => void,
-    transactionId: ?TransactionId
+    transactionId: ?TransactionId,
+    subscriptionType: ?CharacteristicSubscriptionType
   ): Subscription {
     const filledTransactionId = transactionId || this._nextUniqueID()
+    const commonArgs = [characteristicIdentifier, filledTransactionId]
+    const args = isIOS ? commonArgs : [...commonArgs, subscriptionType]
+    
     return this._handleMonitorCharacteristic(
-      BleModule.monitorCharacteristic(characteristicIdentifier, filledTransactionId),
-      filledTransactionId,
-      listener
+    BleModule.monitorCharacteristic(...args), 
+    filledTransactionId, 
+    listener
     )
   }