IosIapPurchaseResult can be Unknown

if an invalid product ID is used for a purchase (fixes #1)

Author: extrawurst

CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## [ru-0.1.2] - 2024-05-06
+
+### Added
+* `IosIapPurchaseResult` can be `Unknown` if an invalid product ID is used for a purchas (fixes #1)

Package.swift

@@ -17,6 +17,8 @@ let package = Package(
         // Targets can depend on other targets in this package and products from dependencies.
         .binaryTarget(
             name: "RustXcframework",
+            // for local development:
+            // path: "RustXcframework.xcframework"),
             url: "https://github.com/rustunit/bevy_ios_iap/releases/download/rs-0.1.1/RustXcframework.xcframework.zip",
             checksum: "02ce1e897058362cf4c12db55f557c6708dd8b8dc8e4bd34fd7e895e4b3fbf26"),
         .target(

RustXcframework.xcframework/ios-arm64/Headers/bevy_ios_iap.h

@@ -104,6 +104,7 @@ void* __swift_bridge__$IosIapProductType$new_auto_renewable(void);
 void* __swift_bridge__$IosIapPurchaseResult$success(void);
 void* __swift_bridge__$IosIapPurchaseResult$canceled(void);
 void* __swift_bridge__$IosIapPurchaseResult$pending(void);
+void* __swift_bridge__$IosIapPurchaseResult$unknown(void* id);
 void* __swift_bridge__$IosIapPurchaseResult$error(void* e);
 void* __swift_bridge__$IosIapEnvironment$sandbox(void);
 void* __swift_bridge__$IosIapEnvironment$production(void);

RustXcframework.xcframework/ios-arm64_x86_64-simulator/Headers/bevy_ios_iap.h

@@ -104,6 +104,7 @@ void* __swift_bridge__$IosIapProductType$new_auto_renewable(void);
 void* __swift_bridge__$IosIapPurchaseResult$success(void);
 void* __swift_bridge__$IosIapPurchaseResult$canceled(void);
 void* __swift_bridge__$IosIapPurchaseResult$pending(void);
+void* __swift_bridge__$IosIapPurchaseResult$unknown(void* id);
 void* __swift_bridge__$IosIapPurchaseResult$error(void* e);
 void* __swift_bridge__$IosIapEnvironment$sandbox(void);
 void* __swift_bridge__$IosIapEnvironment$production(void);

Sources/bevy_ios_iap/BevyIosIAP.swift

@@ -12,13 +12,14 @@ import RustXcframework
 public func ios_iap_products(products:RustVec<RustString>)
 {
     Task {
+        //TODO: wrap in do catch for error handling
+        
         var productIds:[String] = []
         for p in products {
             productIds.append(p.as_str().toString())
         }
 
         let products = try await Product.products(for: productIds)
-//        print("products:\n \(products)")
 
         let rust_products = RustVec<IosIapProduct>()
 
@@ -46,7 +47,12 @@ public func ios_iap_purchase(id: RustString)
         do {
             let productIds = [id.toString()]
             let products = try await Product.products(for: productIds)
-            let purchase  = try await products[0].purchase()
+            
+            if products.isEmpty {
+                return purchase_processed(IosIapPurchaseResult.unknown(id.toString()))
+            }
+            
+            let purchase  = try await products.first!.purchase()
 
             let result = switch purchase {
             case .success(_):
@@ -60,7 +66,6 @@ public func ios_iap_purchase(id: RustString)
 
             purchase_processed(result)
         } catch {
-            print("ios_iap_purchase error: \(error).")
             purchase_processed(IosIapPurchaseResult.error(error.localizedDescription))
         }
    }
@@ -88,15 +93,16 @@ public func ios_iap_transaction_finish(id: UInt64) {
             }
 
             transaction_finished(IosIapTransactionFinished.unknown(id))
-        }catch {
-            print("ios_iap_transaction_finish error: \(error).")
+        } catch {
             transaction_finished(IosIapTransactionFinished.error(error.localizedDescription))
         }
     }
 }
 
 public func ios_iap_transactions_all() {
     Task {
+        //TODO: wrap in do catch for error handling
+        
         var transactions = RustVec<IosIapTransaction>.init()
 
         for await t in Transaction.all {

Sources/bevy_ios_iap/bevy_ios_iap.swift

@@ -482,6 +482,10 @@ public class IosIapPurchaseResult: IosIapPurchaseResultRefMut {
     }
 }
 extension IosIapPurchaseResult {
+    class public func unknown<GenericIntoRustString: IntoRustString>(_ id: GenericIntoRustString) -> IosIapPurchaseResult {
+        IosIapPurchaseResult(ptr: __swift_bridge__$IosIapPurchaseResult$unknown({ let rustString = id.intoRustString(); rustString.isOwned = false; return rustString.ptr }()))
+    }
+
     class public func error<GenericIntoRustString: IntoRustString>(_ e: GenericIntoRustString) -> IosIapPurchaseResult {
         IosIapPurchaseResult(ptr: __swift_bridge__$IosIapPurchaseResult$error({ let rustString = e.intoRustString(); rustString.isOwned = false; return rustString.ptr }()))
     }

bevy_ios_iap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_ios_iap"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 build = "build.rs"
 readme = "../README.md"

bevy_ios_iap/src/lib.rs

@@ -32,6 +32,8 @@ pub enum IosIapPurchaseResult {
     Success,
     Canceled,
     Pending,
+    /// Unknown / invalid product ID
+    Unknown(String),
     Error(String),
 }
 
@@ -48,6 +50,10 @@ impl IosIapPurchaseResult {
         Self::Pending
     }
 
+    fn unknown(id: String) -> Self {
+        Self::Unknown(id)
+    }
+
     fn error(e: String) -> Self {
         Self::Error(e)
     }

bevy_ios_iap/src/native.rs

@@ -48,6 +48,8 @@ mod ffi {
         #[swift_bridge(associated_to = IosIapPurchaseResult)]
         fn pending() -> IosIapPurchaseResult;
         #[swift_bridge(associated_to = IosIapPurchaseResult)]
+        fn unknown(id: String) -> IosIapPurchaseResult;
+        #[swift_bridge(associated_to = IosIapPurchaseResult)]
         fn error(e: String) -> IosIapPurchaseResult;
 
         #[swift_bridge(associated_to = IosIapEnvironment)]