simplernble 1.2.1-dev116 → 1.2.1-dev122

package/cpp/HybridAdapterHandle.cpp

@@ -58,8 +58,8 @@ std::shared_ptr<Promise<void>> HybridAdapterHandle::scanStop() {
 }
 
 std::shared_ptr<Promise<void>> HybridAdapterHandle::scanFor(double timeoutMs) {
-    if (!(timeoutMs >= 0 && timeoutMs <= INT32_MAX) || std::floor(timeoutMs) != timeoutMs) {
-        throw std::invalid_argument("timeoutMs must be an integer from 0 to 2147483647");
+    if (!(timeoutMs >= INT32_MIN && timeoutMs <= INT32_MAX) || std::floor(timeoutMs) != timeoutMs) {
+        throw std::invalid_argument("timeoutMs must be a 32-bit integer");
     }
     auto adapter = adapter_;
     const int timeout = static_cast<int>(timeoutMs);

package/lib/adapter.js

@@ -64,8 +64,8 @@ class Adapter extends registry_1.NativeEmitter {
     async scanFor(timeoutMs) {
         if (typeof timeoutMs !== 'number')
             throw new TypeError('timeoutMs must be a number');
-        if (!Number.isInteger(timeoutMs) || timeoutMs < 0 || timeoutMs > 2 ** 31 - 1) {
-            throw new RangeError('timeoutMs must be an integer from 0 to 2147483647');
+        if (!Number.isInteger(timeoutMs) || timeoutMs < -(2 ** 31) || timeoutMs > 2 ** 31 - 1) {
+            throw new RangeError('timeoutMs must be a 32-bit integer');
         }
         return (0, errors_1.async)(() => this.#handle.scanFor(timeoutMs));
     }

package/native/VERSION

@@ -1 +1 @@
-1.2.1-dev116
+1.2.1-dev122

package/native/simpleble/include/simpleble/Exceptions.h

@@ -135,6 +135,12 @@ class SIMPLEBLE_EXPORT AdapterInUse : public BaseException {
     std::unique_ptr<Error> make_error() const override;
 };
 
+class SIMPLEBLE_EXPORT InvalidArgument : public BaseException {
+  public:
+    InvalidArgument(const std::string& err_msg);
+    std::unique_ptr<Error> make_error() const override;
+};
+
 }  // namespace Exception
 
 }  // namespace SimpleBLE

package/native/simpleble/src/Exceptions.cpp

@@ -103,3 +103,9 @@ AdapterInUse::AdapterInUse(const std::string& adapter)
 std::unique_ptr<Error> AdapterInUse::make_error() const {
     return std::make_unique<Error>(ErrorCode::ADAPTER_IN_USE, std::make_unique<AdapterInUse>(*this));
 }
+
+InvalidArgument::InvalidArgument(const std::string& err_msg) : BaseException(err_msg) {}
+
+std::unique_ptr<Error> InvalidArgument::make_error() const {
+    return std::make_unique<Error>(ErrorCode::INVALID_ARGUMENT, std::make_unique<InvalidArgument>(*this));
+}

package/native/simpleble/src/frontends/base/Adapter.cpp

@@ -89,6 +89,8 @@ void Adapter::scan_stop() {
 }
 
 void Adapter::scan_for(int timeout_ms) {
+    if (timeout_ms < 0) throw Exception::InvalidArgument("timeout_ms must not be negative");
+
     if (!(*this)->bluetooth_enabled()) {
         SIMPLEBLE_LOG_WARN(fmt::format("Bluetooth is not enabled."));
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplernble",
-  "version": "1.2.1-dev116",
+  "version": "1.2.1-dev122",
   "description": "SimpleBLE for React Native: a cross-platform Bluetooth Low Energy library for iOS and Android",
   "keywords": [
     "react-native",

package/prebuilt/release/SimpleBLE.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libsimpleble.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsimpleble.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/prebuilt/release/include/simpleble/Exceptions.h

@@ -135,6 +135,12 @@ class SIMPLEBLE_EXPORT AdapterInUse : public BaseException {
     std::unique_ptr<Error> make_error() const override;
 };
 
+class SIMPLEBLE_EXPORT InvalidArgument : public BaseException {
+  public:
+    InvalidArgument(const std::string& err_msg);
+    std::unique_ptr<Error> make_error() const override;
+};
+
 }  // namespace Exception
 
 }  // namespace SimpleBLE

package/src/adapter.ts

@@ -83,8 +83,8 @@ export class Adapter extends NativeEmitter<AdapterEvents> {
   /** Scans for `timeoutMs` milliseconds, then stops. Other calls on this adapter wait for it. */
   async scanFor(timeoutMs: number): Promise<void> {
     if (typeof timeoutMs !== 'number') throw new TypeError('timeoutMs must be a number');
-    if (!Number.isInteger(timeoutMs) || timeoutMs < 0 || timeoutMs > 2 ** 31 - 1) {
-      throw new RangeError('timeoutMs must be an integer from 0 to 2147483647');
+    if (!Number.isInteger(timeoutMs) || timeoutMs < -(2 ** 31) || timeoutMs > 2 ** 31 - 1) {
+      throw new RangeError('timeoutMs must be a 32-bit integer');
     }
     return async(() => this.#handle.scanFor(timeoutMs));
   }