simplejsble 0.0.21 → 0.0.22

package/NitroSimplejsble.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported, :visionos => 1.0, :osx => '13.0' }
+  s.platforms    = { :ios => min_ios_version_supported, :osx => '13.0' }
 
   s.source = { :path => "." }
 
@@ -22,8 +22,55 @@ Pod::Spec.new do |s|
       echo "SimpleBLE.xcframework (iOS) already exists, skipping build"
     else
       echo "Building SimpleBLE for iOS..."
-      chmod +x ios/build_simpleble.sh
-      ios/build_simpleble.sh
+      set -e
+      IOS_DIR="ios"
+      IOS_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET:-13.4}"
+      
+      build_for_platform() {
+          local PLATFORM=$1  # iphoneos or iphonesimulator
+          local ARCH=$2      # arm64 or x86_64
+      
+          local BUILD_DIR="${IOS_DIR}/build_${PLATFORM}_${ARCH}"
+          local INSTALL_DIR="${IOS_DIR}/simpleble_${PLATFORM}_${ARCH}"
+      
+          echo "Building SimpleBLE for ${PLATFORM} (${ARCH})..."
+      
+          cmake -B "${BUILD_DIR}" -S "${IOS_DIR}" \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_SYSTEM_NAME=iOS \
+              -DCMAKE_OSX_SYSROOT="${PLATFORM}" \
+              -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
+              -DCMAKE_OSX_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET}" \
+              -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+              -DBUILD_SHARED_LIBS=OFF \
+              -DSIMPLEBLE_EXCLUDE_C=ON
+      
+          cmake --build "${BUILD_DIR}" --config Release --parallel
+          cmake --install "${BUILD_DIR}" --config Release
+      
+          echo "Installed to ${INSTALL_DIR}"
+      }
+      
+      # Build for device
+      build_for_platform "iphoneos" "arm64"
+      
+      # Build for simulator (Apple Silicon)
+      build_for_platform "iphonesimulator" "arm64"
+      
+      # Create XCFramework from the static libraries
+      echo "Creating XCFramework..."
+      XCFRAMEWORK_PATH="${IOS_DIR}/SimpleBLE.xcframework"
+      rm -rf "${XCFRAMEWORK_PATH}"
+      
+      xcodebuild -create-xcframework \
+          -library "${IOS_DIR}/simpleble_iphoneos_arm64/lib/libsimpleble.a" \
+          -headers "${IOS_DIR}/simpleble_iphoneos_arm64/include" \
+          -library "${IOS_DIR}/simpleble_iphonesimulator_arm64/lib/libsimpleble.a" \
+          -headers "${IOS_DIR}/simpleble_iphonesimulator_arm64/include" \
+          -output "${XCFRAMEWORK_PATH}"
+      
+      echo "SimpleBLE build complete!"
+      echo "XCFramework created at: ${XCFRAMEWORK_PATH}"
     fi
 
     # Build macOS XCFramework if not present
@@ -37,12 +84,18 @@ Pod::Spec.new do |s|
   CMD
 
   s.source_files = [
+    # Implementation (Swift)
+    "ios/**/*.{swift}",
+    "macos/**/*.{swift}",
+    # Autolinking/Registration (Objective-C++)
+    "ios/**/*.{m,mm}",
+    "macos/**/*.{m,mm}",
     # Implementation (C++ objects)
     "cpp/**/*.{hpp,cpp}",
   ]
 
   # Exclude CMakeLists.txt from source files
-  s.exclude_files = ["ios/CMakeLists.txt", "macos/CMakeLists.txt"]
+  s.exclude_files = ["ios/CMakeLists.txt"]
 
   load 'nitrogen/generated/ios/NitroSimplejsble+autolinking.rb'
   add_nitrogen_files(s)

package/app.plugin.js

@@ -0,0 +1,7 @@
+const { withAndroidManifest } = require('@expo/config-plugins');
+
+// This plugin ensures Expo autolinking detects the package
+// The actual native module registration is handled by react-native.config.js
+module.exports = function withSimplejsble(config) {
+  return config;
+};

package/lib/specs/Adapter.nitro.js

@@ -1 +1 @@
-export {};
+import {} from 'react-native-nitro-modules';

package/nitrogen/generated/android/NitroSimplejsble+autolinking.cmake

@@ -2,7 +2,7 @@
 # NitroSimplejsble+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2025 Marc Rousavy @ Margelo
+# Copyright © 2026 Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroSimplejsble+autolinking.gradle

@@ -2,7 +2,7 @@
 /// NitroSimplejsble+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroSimplejsbleOnLoad.cpp

@@ -2,7 +2,7 @@
 /// NitroSimplejsbleOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_NITROSIMPLEJSBLE_WITH_GENERATED_CMAKE_PROJECT

package/nitrogen/generated/android/NitroSimplejsbleOnLoad.hpp

@@ -2,7 +2,7 @@
 /// NitroSimplejsbleOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>

package/nitrogen/generated/android/kotlin/com/margelo/nitro/simplejsble/NitroSimplejsbleOnLoad.kt

@@ -2,7 +2,7 @@
 /// NitroSimplejsbleOnLoad.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.simplejsble

package/nitrogen/generated/ios/NitroSimplejsble+autolinking.rb

@@ -2,7 +2,7 @@
 # NitroSimplejsble+autolinking.rb
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2025 Marc Rousavy @ Margelo
+# Copyright © 2026 Marc Rousavy @ Margelo
 #
 
 # This is a Ruby script that adds all files generated by Nitrogen

package/nitrogen/generated/ios/NitroSimplejsble-Swift-Cxx-Bridge.cpp

@@ -2,7 +2,7 @@
 /// NitroSimplejsble-Swift-Cxx-Bridge.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #include "NitroSimplejsble-Swift-Cxx-Bridge.hpp"

package/nitrogen/generated/ios/NitroSimplejsble-Swift-Cxx-Bridge.hpp

@@ -2,7 +2,7 @@
 /// NitroSimplejsble-Swift-Cxx-Bridge.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/ios/NitroSimplejsble-Swift-Cxx-Umbrella.hpp

@@ -2,7 +2,7 @@
 /// NitroSimplejsble-Swift-Cxx-Umbrella.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/ios/NitroSimplejsbleAutolinking.mm

@@ -2,7 +2,7 @@
 /// NitroSimplejsbleAutolinking.mm
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #import <Foundation/Foundation.h>

package/nitrogen/generated/ios/NitroSimplejsbleAutolinking.swift

@@ -2,7 +2,7 @@
 /// NitroSimplejsbleAutolinking.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 public final class NitroSimplejsbleAutolinking {

package/nitrogen/generated/shared/c++/HybridAdapterSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridAdapterSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #include "HybridAdapterSpec.hpp"

package/nitrogen/generated/shared/c++/HybridAdapterSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridAdapterSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © 2026 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -13,7 +13,6 @@
     "nitrogen",
     "android/",
     "ios/",
-    "macos/",
     "cpp/",
     "simpleble/",
     "simpledroidbridge/",
@@ -23,14 +22,13 @@
     "react-native.config.js",
     "nitro.json",
     "*.podspec",
-    "scripts/",
+    "app.plugin.js",
     "README.md"
   ],
   "scripts": {
     "prepack": "node scripts/prepare-package.js",
-    "postinstall": "node scripts/postinstall.js",
     "typecheck": "tsc --noEmit",
-    "build": "tsc --composite false",
+    "build": "tsc --noEmit false",
     "clean": "rm -rf android/build android/.cxx android/.gradle lib",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "prepublishOnly": "npm run build",
@@ -45,8 +43,7 @@
     "nitro",
     "nitro-modules",
     "ios",
-    "android",
-    "macos"
+    "android"
   ],
   "repository": {
     "type": "git",

package/react-native.config.js

@@ -11,10 +11,6 @@ module.exports = {
        * @type {import('@react-native-community/cli-types').AndroidDependencyParams}
        */
       android: {},
-      /**
-       * macOS uses the same configuration as iOS (shares Apple platform toolchain)
-       */
-      macos: {},
     },
   },
 }

package/ios/SimpleBLE.xcframework/Info.plist

@@ -1,47 +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>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>libsimpleble.a</string>
-			<key>HeadersPath</key>
-			<string>Headers</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>libsimpleble.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>libsimpleble.a</string>
-			<key>HeadersPath</key>
-			<string>Headers</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libsimpleble.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

package/ios/SimpleBLE.xcframework/ios-arm64/Headers/simpleble/Adapter.h

@@ -1,102 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <simpleble/export.h>
-
-#include <simpleble/Exceptions.h>
-#include <simpleble/Peripheral.h>
-#include <simpleble/Types.h>
-
-namespace SimpleBLE {
-
-class AdapterBase;
-
-/**
- * Bluetooth Adapter.
- *
- * A default-constructed Adapter object is not initialized. Calling any method
- * other than `initialized()` on an uninitialized Adapter will throw an exception
- * of type `SimpleBLE::NotInitialized`.
- *
- * NOTE: This class is intended to be used by the user only. Library developers
- * should use shared pointers to `AdapterBase` instead.
- */
-class SIMPLEBLE_EXPORT Adapter {
-  public:
-    Adapter() = default;
-    virtual ~Adapter() = default;
-
-    bool initialized() const;
-
-    /**
-     * Retrieve the underlying OS object/handle.
-     *
-     * For certain compatibility with external libraries, we sometimes need to
-     * expose the actual OS handle to the user. This is particularly important
-     * for MacOS right now.
-     */
-    void* underlying() const;
-
-    std::string identifier();
-    BluetoothAddress address();
-
-    /**
-     * Control the power state of the adapter.
-     *
-     * NOTE: The power on/off functionality is only supported on Windows and Linux (implementation pending).
-     *       On other platforms, this method will do nothing.
-     * NOTE: Callbacks are currently a placeholder for future implementation.
-     */
-    void power_on();
-    void power_off();
-    bool is_powered();
-    void set_callback_on_power_on(std::function<void()> on_power_on);
-    void set_callback_on_power_off(std::function<void()> on_power_off);
-
-    void scan_start();
-    void scan_stop();
-    void scan_for(int timeout_ms);
-    bool scan_is_active();
-    std::vector<Peripheral> scan_get_results();
-
-    void set_callback_on_scan_start(std::function<void()> on_scan_start);
-    void set_callback_on_scan_stop(std::function<void()> on_scan_stop);
-    void set_callback_on_scan_updated(std::function<void(Peripheral)> on_scan_updated);
-    void set_callback_on_scan_found(std::function<void(Peripheral)> on_scan_found);
-
-    /**
-     * Retrieve a list of all paired peripherals.
-     *
-     * NOTE:This method is currently only supported by the Linux, Windows and Android backends.
-     */
-    std::vector<Peripheral> get_paired_peripherals();
-
-    /**
-     * Retrieve a list of all connected peripherals.
-     *
-     * NOTE: This method is currently only supported by the Windows backend. (More backends coming soon.)
-     */
-    std::vector<Peripheral> get_connected_peripherals();
-
-    static bool bluetooth_enabled();
-
-    /**
-     * Fetches a list of all available adapters from all available backends.
-     *
-     * This will cause backends to be instantiated/initialized and adapters
-     * too.
-     */
-    static std::vector<Adapter> get_adapters();
-
-  protected:
-    AdapterBase* operator->();
-    const AdapterBase* operator->() const;
-
-    std::shared_ptr<AdapterBase> internal_;
-};
-
-}  // namespace SimpleBLE

package/ios/SimpleBLE.xcframework/ios-arm64/Headers/simpleble/AdapterSafe.h

@@ -1,58 +0,0 @@
-#pragma once
-
-#include <simpleble/export.h>
-
-#include <simpleble/Adapter.h>
-#include <simpleble/PeripheralSafe.h>
-#include <memory>
-#include <optional>
-#include <vector>
-
-namespace SimpleBLE {
-
-namespace Safe {
-
-/**
- * Wrapper around the Adapter class that provides a noexcept interface.
- *
- * We use instances of this class directly and not through shared_ptr because
- * this is just a wrapper around the Adapter class, which is already managed by
- * shared_ptr.
- */
-class SIMPLEBLE_EXPORT Adapter {
-  public:
-    Adapter(SimpleBLE::Adapter& adapter);
-    Adapter(SimpleBLE::Adapter&& adapter);
-    virtual ~Adapter() = default;
-
-    std::optional<std::string> identifier() noexcept;
-    std::optional<BluetoothAddress> address() noexcept;
-
-    bool scan_start() noexcept;
-    bool scan_stop() noexcept;
-    bool scan_for(int timeout_ms) noexcept;
-    std::optional<bool> scan_is_active() noexcept;
-    std::optional<std::vector<SimpleBLE::Safe::Peripheral>> scan_get_results() noexcept;
-
-    bool set_callback_on_scan_start(std::function<void()> on_scan_start) noexcept;
-    bool set_callback_on_scan_stop(std::function<void()> on_scan_stop) noexcept;
-    bool set_callback_on_scan_updated(std::function<void(SimpleBLE::Safe::Peripheral)> on_scan_updated) noexcept;
-    bool set_callback_on_scan_found(std::function<void(SimpleBLE::Safe::Peripheral)> on_scan_found) noexcept;
-
-    std::optional<std::vector<SimpleBLE::Safe::Peripheral>> get_paired_peripherals() noexcept;
-
-    static std::optional<bool> bluetooth_enabled() noexcept;
-    static std::optional<std::vector<SimpleBLE::Safe::Adapter>> get_adapters() noexcept;
-
-    /**
-     * Cast to the underlying adapter object.
-     */
-    operator SimpleBLE::Adapter() const noexcept;
-
-  protected:
-    SimpleBLE::Adapter internal_;
-};
-
-}  // namespace Safe
-
-}  // namespace SimpleBLE

package/ios/SimpleBLE.xcframework/ios-arm64/Headers/simpleble/Advanced.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#include <simpleble/export.h>
-
-#if __APPLE__
-#include "TargetConditionals.h"
-#endif
-
-/**
- * Advanced Features
- *
- * The functions presented in this namespace are OS-specific backdoors that are
- * not part of the standard SimpleBLE API, which allow the user to access
- * low-level details of the implementation for advanced use cases.
- *
- * These functions should be used with caution.
- */
-
-#if defined(_WIN32)
-namespace SimpleBLE::Advanced::Windows {}
-
-#endif
-
-#if TARGET_OS_OSX
-namespace SimpleBLE::Advanced::MacOS {}
-
-#endif
-
-#if TARGET_OS_IOS
-namespace SimpleBLE::Advanced::iOS {}
-
-#endif
-
-#if defined(__ANDROID__)
-
-#include <jni.h>
-
-namespace SimpleBLE::Advanced::Android {
-
-JavaVM* SIMPLEBLE_EXPORT get_jvm();
-void SIMPLEBLE_EXPORT set_jvm(JavaVM* jvm);
-
-}  // namespace SimpleBLE::Advanced::Android
-
-#endif
-
-#if defined(__linux__) && !defined(__ANDROID__)
-namespace SimpleBLE::Advanced::Linux {}
-
-#endif

package/ios/SimpleBLE.xcframework/ios-arm64/Headers/simpleble/Characteristic.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include <simpleble/export.h>
-
-#include <simpleble/Descriptor.h>
-#include <simpleble/Exceptions.h>
-#include <simpleble/Types.h>
-
-namespace SimpleBLE {
-
-class CharacteristicBase;
-
-class SIMPLEBLE_EXPORT Characteristic {
-  public:
-    Characteristic() = default;
-    virtual ~Characteristic() = default;
-
-    bool initialized() const;
-
-    BluetoothUUID uuid();
-    std::vector<Descriptor> descriptors();
-    std::vector<std::string> capabilities();
-
-    bool can_read();
-    bool can_write_request();
-    bool can_write_command();
-    bool can_notify();
-    bool can_indicate();
-
-  protected:
-    CharacteristicBase* operator->();
-    const CharacteristicBase* operator->() const;
-
-    std::shared_ptr<CharacteristicBase> internal_;
-};
-
-}  // namespace SimpleBLE

package/ios/SimpleBLE.xcframework/ios-arm64/Headers/simpleble/Config.h

@@ -1,64 +0,0 @@
-#pragma once
-#include <chrono>
-
-namespace SimpleBLE {
-namespace Config {
-    namespace SimpleBluez {
-        extern bool use_legacy_bluez_backend;
-        extern std::chrono::steady_clock::duration connection_timeout;
-        extern std::chrono::steady_clock::duration disconnection_timeout;
-
-        static void reset() {
-            use_legacy_bluez_backend = true;
-            connection_timeout = std::chrono::seconds(2);
-            disconnection_timeout = std::chrono::seconds(1);
-        }
-    }
-
-    namespace WinRT {
-        extern bool experimental_use_own_mta_apartment;
-        extern bool experimental_reinitialize_winrt_apartment_on_main_thread;
-
-        static void reset() {
-            experimental_use_own_mta_apartment = true;
-            experimental_reinitialize_winrt_apartment_on_main_thread = false;
-        }
-    }
-
-    namespace CoreBluetooth {
-        static void reset() {}
-    }
-
-    namespace Android {
-        enum class ConnectionPriorityRequest {
-            DISABLED = -1,
-            BALANCED = 0,
-            HIGH = 1,
-            LOW_POWER = 2,
-            DCK = 3
-        };
-
-        extern ConnectionPriorityRequest connection_priority_request;
-
-        static void reset() {
-            connection_priority_request = ConnectionPriorityRequest::DISABLED;
-        }
-    }
-
-    namespace Dongl {
-        extern bool use_dongl_backend;
-        static void reset() {
-            use_dongl_backend = false;
-        }
-    }
-
-    namespace Base {
-        static void reset_all() {
-            SimpleBluez::reset();
-            WinRT::reset();
-            CoreBluetooth::reset();
-            Android::reset();
-        }
-    }
-}  // namespace Config
-}  // namespace SimpleBLE