@capacitor-community/bluetooth-le 7.3.0 → 8.0.0-0

package/ios/{Plugin → Sources/BluetoothLe}/ThreadSafeDictionary.swift

@@ -1,13 +1,15 @@
-class ThreadSafeDictionary<K: Hashable, T> {
-    private var dictionary: [K: T] = [:]
-    private let queue = DispatchQueue(label: "threadSafeDictionaryQueue", attributes: .concurrent)
-
-    subscript(key: K) -> T? {
-        get {
-            return queue.sync { dictionary[key] }
-        }
-        set {
-            queue.async(flags: .barrier) { self.dictionary[key] = newValue }
-        }
-    }
-}
+import Foundation
+
+class ThreadSafeDictionary<K: Hashable, T> {
+    private var dictionary: [K: T] = [:]
+    private let queue = DispatchQueue(label: "threadSafeDictionaryQueue", attributes: .concurrent)
+
+    subscript(key: K) -> T? {
+        get {
+            return queue.sync { dictionary[key] }
+        }
+        set {
+            queue.async(flags: .barrier) { self.dictionary[key] = newValue }
+        }
+    }
+}

package/ios/Tests/BluetoothLeTests/ConversionTests.swift

@@ -0,0 +1,55 @@
+import Foundation
+import CoreBluetooth
+import XCTest
+@testable import BluetoothLe
+
+class ConversionTests: XCTestCase {
+
+    func testDataToString() throws {
+        let input = Data([0xA1, 0x2E, 0x38, 0xD4, 0x89, 0xC3])
+        let output = dataToString(input)
+        XCTAssertEqual(output, "a12e38d489c3")
+    }
+
+    func testStringToData() throws {
+        let input = "a12e38d489c3"
+        let output = stringToData(input)
+        let expected = Data([0xA1, 0x2E, 0x38, 0xD4, 0x89, 0xC3])
+        for (index, byte) in output.enumerated() {
+            XCTAssertEqual(byte, expected[index])
+        }
+    }
+
+    func testEmptyStringToData() throws {
+        let input = ""
+        let output = stringToData(input)
+        XCTAssertEqual(output, Data([]))
+    }
+
+    func testCbuuidToString() throws {
+        XCTAssertEqual(cbuuidToString(CBUUID(string: "180D")), "0000180d-0000-1000-8000-00805f9b34fb")
+        XCTAssertEqual(cbuuidToString(CBUUID(string: "AAAA180D")), "aaaa180d-0000-1000-8000-00805f9b34fb")
+        XCTAssertEqual(cbuuidToString(CBUUID(string: "fb005c80-02e7-f387-1cad-8acd2d8df0c8")), "fb005c80-02e7-f387-1cad-8acd2d8df0c8")
+    }
+
+    func testCbuuidToStringUppercase() throws {
+        XCTAssertEqual(cbuuidToStringUppercase(CBUUID(string: "180D")), "0000180D-0000-1000-8000-00805F9B34FB")
+        XCTAssertEqual(cbuuidToStringUppercase(CBUUID(string: "fb005c80-02e7-f387-1cad-8acd2d8df0c8")), "FB005C80-02E7-F387-1CAD-8ACD2D8DF0C8")
+    }
+
+    func testOptionalStringConversion() throws {
+        let str: String? = "180D"
+        XCTAssertEqual("\(str)", "Optional(\"180D\")")
+        XCTAssertEqual("\(str!)", "180D")
+    }
+
+    func testDescriptorValueToString() throws {
+        XCTAssertEqual(descriptorValueToString("Hello"), "48656c6c6f")
+        XCTAssertEqual(descriptorValueToString(Data([0, 5, 255])), "0005ff")
+        XCTAssertEqual(descriptorValueToString(UInt16(258)), "0201")
+        XCTAssertEqual(descriptorValueToString(UInt16(1)), "0100")
+        XCTAssertEqual(descriptorValueToString(NSNumber(1)), "0100")
+        XCTAssertEqual(descriptorValueToString(0), "")
+    }
+
+}

package/ios/Tests/BluetoothLeTests/PluginTests.swift

@@ -0,0 +1,27 @@
+import XCTest
+import Capacitor
+@testable import BluetoothLe
+
+class PluginTests: XCTestCase {
+
+    func testEcho() {
+        // This is an example of a functional test case for a plugin.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+
+        let value = "Hello, World!"
+        XCTAssertEqual(1, 1)
+
+        //        let plugin = MyPlugin()
+        //
+        //        let call = CAPPluginCall(callbackId: "test", options: [
+        //            "value": value
+        //        ], success: { (result, _) in
+        //            let resultValue = result!.data["value"] as? String
+        //            XCTAssertEqual(value, resultValue)
+        //        }, error: { (_) in
+        //            XCTFail("Error shouldn't have been called")
+        //        })
+        //
+        //        plugin.echo(call!)
+    }
+}

package/package.json

@@ -1,111 +1,115 @@
-{
-  "name": "@capacitor-community/bluetooth-le",
-  "version": "7.3.0",
-  "description": "Capacitor plugin for Bluetooth Low Energy ",
-  "main": "dist/plugin.cjs.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "unpkg": "dist/plugin.js",
-  "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "set -o pipefail && cd ios && pod install && xcodebuild clean build test -workspace Plugin.xcworkspace -scheme Plugin -destination \"platform=iOS Simulator,name=iPhone 16\" | xcpretty && cd ..",
-    "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run test:coverage && npm run build",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run lint:ios",
-    "lint:ios": "npm run swiftlint -- lint ios",
-    "lint:android": "cd android && ./gradlew clean lint && cd ..",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- lint --fix --format ios",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js}\"",
-    "swiftlint": "node-swiftlint",
-    "docgen": "docgen --api BleClientInterface --output-readme README.md --output-json dist/docs.json",
-    "postdocgen": "node scripts/fix-docgen-types.js && prettier README.md --write",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
-    "clean": "rimraf ./dist",
-    "watch": "tsc --watch",
-    "prepublishOnly": "npm run build",
-    "test": "jest",
-    "test:coverage": "jest --coverage",
-    "test:watch": "jest --watch",
-    "version:dev": "npm version --no-git-tag-version $(git describe)",
-    "release": "standard-version",
-    "release:minor": "standard-version -r minor",
-    "release:major": "standard-version -r major"
-  },
-  "author": "pwespi",
-  "license": "MIT",
-  "dependencies": {
-    "@types/web-bluetooth": "^0.0.20"
-  },
-  "devDependencies": {
-    "@capacitor/android": "^7.0.0",
-    "@capacitor/cli": "^7.0.0",
-    "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.0.0",
-    "@ionic/eslint-config": "^0.4.0",
-    "@ionic/prettier-config": "^4.0.0",
-    "@ionic/swiftlint-config": "^2.0.0",
-    "@types/jest": "^29.2.5",
-    "eslint": "^8.57.0",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
-    "prettier": "^3.4.2",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.30.1",
-    "standard-version": "^9.5.0",
-    "swiftlint": "^2.0.0",
-    "ts-jest": "^29.0.3",
-    "typescript": "~4.9.4"
-  },
-  "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
-  },
-  "files": [
-    "android/src/main/",
-    "android/build.gradle",
-    "dist/",
-    "ios/Plugin/",
-    "CapacitorCommunityBluetoothLe.podspec"
-  ],
-  "keywords": [
-    "capacitor",
-    "plugin",
-    "native",
-    "bluetooth"
-  ],
-  "capacitor": {
-    "ios": {
-      "src": "ios"
-    },
-    "android": {
-      "src": "android"
-    }
-  },
-  "prettier": "@ionic/prettier-config",
-  "swiftlint": "@ionic/swiftlint-config",
-  "eslintConfig": {
-    "extends": "@ionic/eslint-config/recommended",
-    "rules": {
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_",
-          "caughtErrorsIgnorePattern": "^_"
-        }
-      ]
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/capacitor-community/bluetooth-le"
-  },
-  "bugs": {
-    "url": "https://github.com/capacitor-community/bluetooth-le/issues"
-  },
-  "volta": {
-    "node": "22.13.1",
-    "npm": "11.0.0"
-  }
-}
+{
+  "name": "@capacitor-community/bluetooth-le",
+  "version": "8.0.0-0",
+  "description": "Capacitor plugin for Bluetooth Low Energy ",
+  "main": "dist/plugin.cjs.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "unpkg": "dist/plugin.js",
+  "scripts": {
+    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify:ios": "xcodebuild -scheme CapacitorCommunityBluetoothLe -destination generic/platform=iOS",
+    "verify:android": "cd android && ./gradlew clean build test && cd ..",
+    "verify:web": "npm run test:coverage && npm run build",
+    "lint": "npm run eslint && npm run prettier -- --check && npm run lint:ios",
+    "lint:ios": "npm run swiftlint -- lint ios",
+    "lint:android": "cd android && ./gradlew clean lint && cd ..",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- lint --fix --format ios",
+    "eslint": "eslint . --ext ts",
+    "prettier": "prettier \"**/*.{css,html,ts,js}\"",
+    "swiftlint": "node-swiftlint",
+    "docgen": "docgen --api BleClientInterface --output-readme README.md --output-json dist/docs.json",
+    "postdocgen": "node scripts/fix-docgen-types.js && prettier README.md --write",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "clean": "rimraf ./dist",
+    "watch": "tsc --watch",
+    "prepublishOnly": "npm run build",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
+    "test:watch": "jest --watch",
+    "test:ios": "xcodebuild test -scheme CapacitorCommunityBluetoothLe -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5'",
+    "version:dev": "npm version --no-git-tag-version $(git describe)",
+    "release": "standard-version",
+    "release:minor": "standard-version -r minor",
+    "release:major": "standard-version -r major"
+  },
+  "author": "pwespi",
+  "license": "MIT",
+  "dependencies": {
+    "@types/web-bluetooth": "^0.0.20"
+  },
+  "devDependencies": {
+    "@capacitor/android": "^8.0.0",
+    "@capacitor/cli": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.0.0",
+    "@ionic/eslint-config": "^0.4.0",
+    "@ionic/prettier-config": "^4.0.0",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "@types/jest": "^29.2.5",
+    "eslint": "^8.57.1",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.3.1",
+    "prettier": "^3.6.2",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
+    "standard-version": "^9.5.0",
+    "swiftlint": "^2.0.0",
+    "ts-jest": "^29.0.3",
+    "typescript": "^5.9.3",
+    "prettier-plugin-java": "^2.7.7"
+  },
+  "peerDependencies": {
+    "@capacitor/core": ">=8.0.0"
+  },
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
+    "CapacitorCommunityBluetoothLe.podspec"
+  ],
+  "keywords": [
+    "capacitor",
+    "plugin",
+    "native",
+    "bluetooth"
+  ],
+  "capacitor": {
+    "ios": {
+      "src": "ios"
+    },
+    "android": {
+      "src": "android"
+    }
+  },
+  "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
+  "eslintConfig": {
+    "extends": "@ionic/eslint-config/recommended",
+    "rules": {
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          "argsIgnorePattern": "^_",
+          "varsIgnorePattern": "^_",
+          "caughtErrorsIgnorePattern": "^_"
+        }
+      ]
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/capacitor-community/bluetooth-le"
+  },
+  "bugs": {
+    "url": "https://github.com/capacitor-community/bluetooth-le/issues"
+  },
+  "volta": {
+    "node": "22.13.1",
+    "npm": "11.0.0"
+  }
+}

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

package/ios/Plugin/Plugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/Plugin.m

@@ -1,41 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(BluetoothLe, "BluetoothLe",
-           CAP_PLUGIN_METHOD(initialize, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(isEnabled, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestEnable, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(enable, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(disable, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(startEnabledNotifications, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(stopEnabledNotifications, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(isLocationEnabled, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(openLocationSettings, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(openBluetoothSettings, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(openAppSettings, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setDisplayStrings, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestDevice, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestLEScan, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(stopLEScan, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getDevices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(discoverServices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getConnectedDevices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(connect, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(createBond, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(isBonded, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getBondedDevices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(disconnect, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getServices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getMtu, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestConnectionPriority, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(readRssi, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(read, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(write, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(writeWithoutResponse, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(readDescriptor, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(writeDescriptor, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(startNotifications, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(stopNotifications, CAPPluginReturnPromise);
-)