simplejsble 0.0.7 → 0.0.9

package/{simplejsble/packages/simplejsble/NitroSimplejsble.podspec → NitroSimplejsble.podspec}

@@ -1,13 +1,6 @@
 require "json"
 
-# package.json is now at repo root, podspec is in simplejsble/packages/simplejsble/
-# Try repo root first (npm package), then local (monorepo development)
-package_json_path = File.join(__dir__, "..", "..", "..", "package.json")
-if !File.exist?(package_json_path)
-  # Fallback to local package.json for monorepo development
-  package_json_path = File.join(__dir__, "package.json")
-end
-package = JSON.parse(File.read(package_json_path))
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
   s.name         = "NitroSimplejsble"
@@ -19,9 +12,7 @@ Pod::Spec.new do |s|
 
   s.platforms    = { :ios => min_ios_version_supported, :visionos => 1.0 }
 
-  # When package.json is at repo root, podspec is in simplejsble/packages/simplejsble/
-  # So we need to reference the podspec's directory, not the repo root
-  s.source = { :path => File.dirname(__FILE__) }
+  s.source = { :path => "." }
 
   # Build SimpleBLE from source only if XCFramework doesn't exist
   # When installed from npm, the pre-built XCFramework is already included

package/{simplejsble/packages/simplejsble/android → android}/CMakeLists.txt

@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.9.0)
 
 # Determine if we're in the SimpleBLE monorepo or npm package
 # In monorepo: packages/simplejsble/android → ../../../../ has cmake/
-# In npm: simplejsble/packages/simplejsble/android → ../../../ has cmake/ (at repo root in package)
-if(EXISTS "${CMAKE_SOURCE_DIR}/../../../../cmake/prelude.cmake")
-    # Monorepo: packages/simplejsble/android → ../../../../ 
-    set(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR}/../../../../)
-elseif(EXISTS "${CMAKE_SOURCE_DIR}/../../../cmake/prelude.cmake")
-    # npm package: simplejsble/packages/simplejsble/android → ../../../ (to repo root in package)
-    set(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR}/../../../)
+# In npm: node_modules/simplejsble/android → ../ has cmake/ (bundled)
+if(EXISTS "${CMAKE_SOURCE_DIR}/../cmake/prelude.cmake")
+    # npm package - bundled cmake
+    set(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/../../../../cmake/prelude.cmake")
+    # Monorepo
+    set(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR}/../../../..)
 else()
     message(FATAL_ERROR "Cannot find SimpleBLE cmake files. Make sure you're using a complete package.")
 endif()

package/{simplejsble/packages/simplejsble/android → android}/build.gradle

@@ -51,7 +51,6 @@ android {
       cmake {
         cppFlags "-frtti -fexceptions -Wall -Wextra -fstack-protector-all"
         arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-        abiFilters (*reactNativeArchitectures())
 
         buildTypes {
           debug {

package/{simplejsble/packages/simplejsble/ios → ios}/CMakeLists.txt

@@ -1,18 +1,7 @@
 cmake_minimum_required(VERSION 3.21)
 
-# Determine if we're in monorepo or npm package
-# In monorepo: packages/simplejsble/ios → ../../../../ has cmake/
-# In npm: simplejsble/packages/simplejsble/ios → ../../../ has cmake/ (at repo root in package)
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../cmake/prelude.cmake")
-    # Monorepo: packages/simplejsble/ios → ../../../../ 
-    set(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../)
-elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/prelude.cmake")
-    # npm package: simplejsble/packages/simplejsble/ios → ../../../ (to repo root in package)
-    set(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
-else()
-    message(FATAL_ERROR "Cannot find SimpleBLE cmake files. Make sure you're using a complete package.")
-endif()
-
+# Path: packages/simplejsble/ios → ../../../.. → repo root (where simpleble/ lives)
+set(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(BUILD_SHARED_LIBS OFF)  # Static library for iOS
 
 include(${PROJECT_ROOT_DIR}/cmake/prelude.cmake)

package/ios/SimpleBLE.xcframework/Info.plist

@@ -0,0 +1,47 @@
+<?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/{simplejsble/packages/simplejsble/ios → ios}/build_simpleble.sh

@@ -4,20 +4,6 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 IOS_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET:-13.4}"
 
-# Determine if we're in monorepo or npm package
-# In monorepo: packages/simplejsble/ios → ../../../../ has cmake/
-# In npm: simplejsble/packages/simplejsble/ios → ../../../ has cmake/ (at repo root in package)
-if [ -f "${SCRIPT_DIR}/../../../../cmake/prelude.cmake" ]; then
-    # Monorepo: packages/simplejsble/ios → ../../../../ 
-    PROJECT_ROOT_DIR="${SCRIPT_DIR}/../../../../"
-elif [ -f "${SCRIPT_DIR}/../../../cmake/prelude.cmake" ]; then
-    # npm package: simplejsble/packages/simplejsble/ios → ../../../ (to repo root in package)
-    PROJECT_ROOT_DIR="${SCRIPT_DIR}/../../../"
-else
-    echo "Error: Cannot find SimpleBLE cmake files. Make sure you're using a complete package."
-    exit 1
-fi
-
 build_for_platform() {
     local PLATFORM=$1  # iphoneos or iphonesimulator
     local ARCH=$2      # arm64 or x86_64

package/ios/simpleble_iphoneos_arm64/include/simpleble/Adapter.h

@@ -0,0 +1,102 @@
+#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_iphoneos_arm64/include/simpleble/AdapterSafe.h

@@ -0,0 +1,58 @@
+#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_iphoneos_arm64/include/simpleble/Advanced.h

@@ -0,0 +1,50 @@
+#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_iphoneos_arm64/include/simpleble/Characteristic.h

@@ -0,0 +1,39 @@
+#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_iphoneos_arm64/include/simpleble/Config.h

@@ -0,0 +1,64 @@
+#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

package/ios/simpleble_iphoneos_arm64/include/simpleble/Descriptor.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <memory>
+
+#include <simpleble/export.h>
+
+#include <simpleble/Exceptions.h>
+#include <simpleble/Types.h>
+
+namespace SimpleBLE {
+
+class DescriptorBase;
+
+class SIMPLEBLE_EXPORT Descriptor {
+  public:
+    Descriptor() = default;
+    virtual ~Descriptor() = default;
+
+    bool initialized() const;
+
+    BluetoothUUID uuid();
+
+  protected:
+    DescriptorBase* operator->();
+    const DescriptorBase* operator->() const;
+
+    std::shared_ptr<DescriptorBase> internal_;
+};
+
+}  // namespace SimpleBLE

package/ios/simpleble_iphoneos_arm64/include/simpleble/Exceptions.h

@@ -0,0 +1,72 @@
+#pragma once
+
+#include <stdexcept>
+#include <string>
+
+#include <simpleble/export.h>
+
+#include "Types.h"
+
+namespace SimpleBLE {
+
+namespace Exception {
+
+class SIMPLEBLE_EXPORT BaseException : public std::runtime_error {
+  public:
+    BaseException(const std::string& __arg) : std::runtime_error(__arg) {}
+};
+
+class SIMPLEBLE_EXPORT NotInitialized : public BaseException {
+  public:
+    NotInitialized();
+};
+
+class SIMPLEBLE_EXPORT NotConnected : public BaseException {
+  public:
+    NotConnected();
+};
+
+class SIMPLEBLE_EXPORT InvalidReference : public BaseException {
+  public:
+    InvalidReference();
+};
+
+class SIMPLEBLE_EXPORT ServiceNotFound : public BaseException {
+  public:
+    ServiceNotFound(BluetoothUUID uuid);
+};
+
+class SIMPLEBLE_EXPORT CharacteristicNotFound : public BaseException {
+  public:
+    CharacteristicNotFound(BluetoothUUID uuid);
+};
+
+class SIMPLEBLE_EXPORT DescriptorNotFound : public BaseException {
+  public:
+    DescriptorNotFound(BluetoothUUID uuid);
+};
+
+class SIMPLEBLE_EXPORT OperationNotSupported : public BaseException {
+  public:
+    OperationNotSupported();
+};
+
+class SIMPLEBLE_EXPORT OperationFailed : public BaseException {
+  public:
+    OperationFailed();
+    OperationFailed(const std::string& err_msg);
+};
+
+class SIMPLEBLE_EXPORT WinRTException : public BaseException {
+  public:
+    WinRTException(int32_t err_code, const std::string& err_msg);
+};
+
+class SIMPLEBLE_EXPORT CoreBluetoothException : public BaseException {
+  public:
+    CoreBluetoothException(const std::string& err_msg);
+};
+
+}  // namespace Exception
+
+}  // namespace SimpleBLE

package/ios/simpleble_iphoneos_arm64/include/simpleble/Logging.h

@@ -0,0 +1,73 @@
+#pragma once
+
+#include <cstdint>
+#include <functional>
+#include <mutex>
+#include <string>
+
+#include <simpleble/export.h>
+
+namespace SimpleBLE {
+
+namespace Logging {
+
+enum Level : int {
+    None = 0,
+    Fatal,
+    Error,
+    Warn,
+    Info,
+    Debug,
+    Verbose,
+};
+
+// clang-format off
+using Callback = std::function<void(
+    Level,
+    const std::string& module,
+    const std::string& file,
+    uint32_t line,
+    const std::string& function,
+    const std::string& message)>;
+// clang-format on
+
+class SIMPLEBLE_EXPORT Logger {
+  public:
+    static Logger* get();
+
+    void set_level(Level level);
+    Level get_level();
+
+    void set_callback(Callback callback);
+    bool has_callback();
+
+    void log_default_stdout();
+    void log_default_file();
+    void log_default_file(const std::string path);
+
+    // clang-format off
+    void log(
+        Level level,
+        const std::string& module,
+        const std::string& file,
+        uint32_t line,
+        const std::string& function,
+        const std::string& message);
+    // clang-format on
+
+  private:
+    Logger();
+    ~Logger();
+    Logger(Logger& other) = delete;          // Remove copy constructor
+    void operator=(const Logger&) = delete;  // Remove copy assignment
+
+    static std::string level_to_str(Level level);
+
+    Level level_{Level::Info};
+    Callback callback_{nullptr};
+    std::recursive_mutex mutex_;
+};
+
+}  // namespace Logging
+
+}  // namespace SimpleBLE