Merge pull request #63 from ekharkunov/emscripten-update

Update js code according to new Emscripten version (3.1.55).

.github/workflows/bob.yml

@@ -0,0 +1,76 @@
+name: Build with bob
+
+on:
+  push:
+  pull_request_target:
+  schedule:
+    # nightly at 05:00 on the 1st and 15th
+    - cron: 0 5 1,15 * *
+
+env:
+  VERSION_FILENAME: 'info.json'
+  BUILD_SERVER: 'https://build.defold.com'
+
+jobs:
+  build_with_bob:
+    strategy:
+      matrix:
+        platform: [armv7-android, x86_64-linux, x86_64-win32, x86-win32, js-web]
+    runs-on: ubuntu-latest
+
+    name: Build
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.2'
+
+      - name: Get Defold version
+        run: |
+          TMPVAR=`curl -s http://d.defold.com/stable/${{env.VERSION_FILENAME}} | jq -r '.sha1'`
+          echo "DEFOLD_VERSION=${TMPVAR}" >> $GITHUB_ENV
+          echo "Found version ${TMPVAR}"
+
+      - name: Download bob.jar
+        run: |
+          wget -q http://d.defold.com/archive/stable/${{env.DEFOLD_VERSION}}/bob/bob.jar
+          java -jar bob.jar --version
+
+      - name: Resolve libraries
+        run: java -jar bob.jar resolve --email a@b.com --auth 123456
+      - name: Build
+        run: java -jar bob.jar --platform=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
+      - name: Bundle
+        run: java -jar bob.jar --platform=${{ matrix.platform }} bundle
+
+  # macOS is not technically needed for building, but we want to test bundling as well, since we're also testing the manifest merging
+  build_with_bob_macos:
+    strategy:
+      matrix:
+        platform: [armv7-darwin, x86_64-darwin]
+    runs-on: macOS-latest
+
+    name: Build
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.2'
+
+      - name: Get Defold version
+        run: |
+          TMPVAR=`curl -s http://d.defold.com/stable/${{env.VERSION_FILENAME}} | jq -r '.sha1'`
+          echo "DEFOLD_VERSION=${TMPVAR}" >> $GITHUB_ENV
+          echo "Found version ${TMPVAR}"
+
+      - name: Download bob.jar
+        run: |
+          wget -q http://d.defold.com/archive/stable/${{env.DEFOLD_VERSION}}/bob/bob.jar
+          java -jar bob.jar --version
+
+      - name: Resolve libraries
+        run: java -jar bob.jar resolve --email a@b.com --auth 123456
+      - name: Build
+        run: java -jar bob.jar --platform=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
+      - name: Bundle
+        run: java -jar bob.jar --platform=${{ matrix.platform }} bundle

README.md

@@ -1,3 +1,5 @@
+[![Actions Status Alpha](https://github.com/defold/extension-iap/actions/workflows/bob.yml/badge.svg)](https://github.com/defold/extension-iap/actions)
+
 # In-app purchase extension for Defold
 
 Defold [native extension](https://www.defold.com/manuals/extensions/) which provides access to In-app purchase functionality on iOS, Android (Google Play and Amazon) and Facebook Canvas platforms.

docs/index.md

@@ -1,6 +1,6 @@
 ---
 title: Defold In-app purchase extension API documentation
-brief: This manual covers how to setup and use Google Play Game Services in Defold.
+brief: This manual covers how to setup and use In-App Purchases in Defold.
 ---
 
 # Defold In-app purchase extension API documentation
@@ -8,7 +8,7 @@ brief: This manual covers how to setup and use Google Play Game Services in Defo
 This extension provides a unified, simple to use interface to several different stores for in-app purchase:
 
 * Apple’s iOS Appstore - StoreKit
-* Google Play Billing 3.0
+* Google Play Billing 5.0
 * Amazon 'in-app billing' 2.0.61
 * Facebook Canvas 'game payments'
 
@@ -31,7 +31,7 @@ Detailed documentation from Apple, Google, Amazon and Facebook can be found here
 ## Installation
 To use this library in your Defold project, add the following URL to your `game.project` dependencies:
 
-https://github.com/defold/extension-iap/archive/master.zip
+[https://github.com/defold/extension-iap/archive/master.zip](https://github.com/defold/extension-iap/archive/master.zip)
 
 We recommend using a link to a zip file of a [specific release](https://github.com/defold/extension-iap/releases).
 

extension-iap/api/iap.script_api

@@ -9,7 +9,7 @@
 
   - name: buy
     type: function
-    desc: Sets the listener function for In-app purchase events.
+    desc: Purchase a product.
     parameters:
       - name: id
         type: string
@@ -21,8 +21,12 @@
         members:
         - name: request_id
           type: string
-          desc: Facebook only. [icon:facebook] Optional custom unique request id to
+          desc: Facebook only [icon:facebook]. Optional custom unique request id to
                 set for this transaction. The id becomes attached to the payment within the Graph API.
+        - name: token
+          type: string
+          desc: Google Play only [icon:googleplay]. Which subscription offer to use when buying a subscription. The token can be retrieved from
+                the subscriptions table returned when calling iap.list()
 
     examples:
       - desc: |-
@@ -128,15 +132,56 @@
         - name: price
           type: number
           desc: The price of the product.
+                For Google Play [icon:googleplay] this is used only for in-app products
 
         - name: price_string
           type: string
           desc: The price of the product, as a formatted string (amount and currency symbol).
+                For Google Play [icon:googleplay] this is used only for in-app products
 
         - name: currency_code
           type: string
-          desc: The currency code. On Google Play, this reflects the merchant's locale, instead of the user's.
+          desc: The currency code.
-                [icon:ios] [icon:googleplay] [icon:facebook]
+                For Google Play [icon:googleplay] this is the merchant's locale, instead of the user's.
+                For Google Play [icon:googleplay] this is used only for in-app products
+
+        - name: subscriptions
+          type: table
+          desc: Only available for Google Play [icon:googleplay]. List of subscription offers.
+                Each offer contains a token and a list of price and billing options.
+                See https://developer.android.com/reference/com/android/billingclient/api/ProductDetails.PricingPhase
+          members:
+          - name: token
+            type: string
+            desc: The token associated with the pricing phases for the subscription.
+
+          - name: pricing
+            type: table
+            desc: The pricing phases for the subscription.
+            members:
+            - name: price_string
+              type: string
+              desc: Formatted price for the payment cycle, including currency sign.
+
+            - name: price
+              type: number
+              desc: Price of the payment cycle in micro-units.
+
+            - name: currency_code
+              type: string
+              desc: ISO 4217 currency code
+
+            - name: billing_period
+              type: string
+              desc: Billing period of the payment cycle, specified in ISO 8601 format
+
+            - name: billing_cycle_count
+              type: number
+              desc: Number of cycles for which the billing period is applied.
+
+            - name: recurrence_mode
+              type: string
+              desc: FINITE, INFINITE or NONE
 
       - name: error
         type: table
@@ -224,32 +269,36 @@
 
         - name: original_trans
           type: string
-          desc: Apple only[icon:apple]. The original transaction. This field is only set when `state` is `TRANS_STATE_RESTORED`.
+          desc: Apple only [icon:apple]. The original transaction. This field is only set when `state` is `TRANS_STATE_RESTORED`.
+
+        - name: original_json
+          type: string
+          desc: Android only [icon:android]. The purchase order details in JSON format.
 
         - name: signature
           type: string
-          desc: Google Play only[icon:googleplay]. A string containing the signature of the purchase data that was signed with the private key of the developer.
+          desc: Google Play only [icon:googleplay]. A string containing the signature of the purchase data that was signed with the private key of the developer.
 
         - name: request_id
           type: string
-          desc: Facebook only[icon:facebook]. This field is set to the optional custom unique request id `request_id` if set in the `iap.buy()` call parameters.
+          desc: Facebook only [icon:facebook]. This field is set to the optional custom unique request id `request_id` if set in the `iap.buy()` call parameters.
 
         - name: user_id
           type: string
-          desc: Amazon Pay only[icon:amazon]. The user ID.
+          desc: Amazon Pay only [icon:amazon]. The user ID.
 
         - name: is_sandbox_mode
           type: boolean
-          desc: Amazon Pay only[icon:amazon]. If `true`, the SDK is running in Sandbox mode.
+          desc: Amazon Pay only [icon:amazon]. If `true`, the SDK is running in Sandbox mode.
                 This only allows interactions with the Amazon AppTester. Use this mode only for testing locally.
 
         - name: cancel_date
           type: string
-          desc: Amazon Pay only[icon:amazon]. The cancel date for the purchase. This field is only set if the purchase is canceled.
+          desc: Amazon Pay only [icon:amazon]. The cancel date for the purchase. This field is only set if the purchase is canceled.
 
         - name: canceled
           type: string
-          desc: Amazon Pay only[icon:amazon]. Is set to `true` if the receipt was canceled or has expired; otherwise `false`.
+          desc: Amazon Pay only [icon:amazon]. Is set to `true` if the receipt was canceled or has expired; otherwise `false`.
 
       - name: error
         type: table

extension-iap/ext.manifest

@@ -1,10 +1,6 @@
 name: IAPExt
 
 platforms:
-    armv7-ios:
-        context:
-            weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']
-
     arm64-ios:
         context:
             weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']

extension-iap/lib/web/library_facebook_iap.js

@@ -71,7 +71,7 @@ var LibraryFacebookIAP = {
 
                     if(url_index == product_count-1) {
                         var productsJSON = JSON.stringify(products);
-                        var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
+                        var res_buf = stringToUTF8OnStack(productsJSON);
                         {{{ makeDynCall('vii', 'callback')}}}(lua_callback, res_buf);
                     } else {
                         var xmlhttp = new XMLHttpRequest();
@@ -143,7 +143,7 @@ var LibraryFacebookIAP = {
 	                    }
 
 	                    var productsJSON = JSON.stringify(result)
-	                    var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
+	                    var res_buf = stringToUTF8OnStack(productsJSON);
 	                    {{{ makeDynCall('viii', 'callback')}}}(lua_callback, res_buf, 0);
 
 	                } else {
@@ -166,4 +166,4 @@ var LibraryFacebookIAP = {
 }
 
 autoAddDeps(LibraryFacebookIAP, '$FBinner');
-mergeInto(LibraryManager.library, LibraryFacebookIAP);
+addToLibrary(LibraryFacebookIAP);

extension-iap/manifests/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
 <uses-sdk android:minSdkVersion="{{android.minimum_sdk_version}}" android:targetSdkVersion="{{android.target_sdk_version}}" />
     <application>
         <!-- For Amazon IAP -->
-        <receiver android:name="com.amazon.device.iap.ResponseReceiver" >
+        <receiver android:exported="true" android:name="com.amazon.device.iap.ResponseReceiver" android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY">
             <intent-filter>
-                <action android:name="com.amazon.inapp.purchasing.NOTIFY" android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY" />
+                <action android:name="com.amazon.inapp.purchasing.NOTIFY" />
             </intent-filter>
         </receiver>
     </application>

extension-iap/manifests/android/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation 'com.android.billingclient:billing:3.0.0'
+    implementation 'com.android.billingclient:billing:5.0.0'
 }

extension-iap/src/iap_android.cpp

@@ -1,7 +1,8 @@
 #if defined(DM_PLATFORM_ANDROID)
 
 #include <dmsdk/sdk.h>
-#include <jni.h>
+#include <dmsdk/dlib/android.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include "iap.h"
@@ -9,19 +10,6 @@
 
 #define LIB_NAME "iap"
 
-static JNIEnv* Attach()
-{
-    JNIEnv* env;
-    dmGraphics::GetNativeAndroidJavaVM()->AttachCurrentThread(&env, NULL);
-    return env;
-}
-
-static void Detach()
-{
-    dmGraphics::GetNativeAndroidJavaVM()->DetachCurrentThread();
-}
-
-
 struct IAP
 {
     IAP()
@@ -30,7 +18,6 @@ struct IAP
         m_autoFinishTransactions = true;
         m_ProviderId = PROVIDER_ID_GOOGLE;
     }
-    int             m_InitCount;
     bool            m_autoFinishTransactions;
     int             m_ProviderId;
 
@@ -53,24 +40,27 @@ static IAP g_IAP;
 
 static int IAP_ProcessPendingTransactions(lua_State* L)
 {
-    JNIEnv* env = Attach();
+    DM_LUA_STACK_CHECK(L, 0);
+
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_ProcessPendingConsumables, g_IAP.m_IAPJNI);
-    Detach();
 
     return 0;
 }
 
 static int IAP_List(lua_State* L)
 {
-    int top = lua_gettop(L);
+    DM_LUA_STACK_CHECK(L, 0);
+
     char* buf = IAP_List_CreateBuffer(L);
     if( buf == 0 )
     {
-        assert(top == lua_gettop(L));
         return 0;
     }
 
-    JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     IAPCommand* cmd = new IAPCommand;
     cmd->m_Callback = dmScript::CreateCallback(L, 2);
     cmd->m_Command = IAP_PRODUCT_RESULT;
@@ -78,39 +68,48 @@ static int IAP_List(lua_State* L)
     jstring products = env->NewStringUTF(buf);
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_List, products, g_IAP.m_IAPJNI, (jlong)cmd);
     env->DeleteLocalRef(products);
-    Detach();
 
     free(buf);
-    assert(top == lua_gettop(L));
     return 0;
 }
 
 static int IAP_Buy(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 0);
+
     int top = lua_gettop(L);
-
     const char* id = luaL_checkstring(L, 1);
+    const char* token = "";
 
-    JNIEnv* env = Attach();
+    if (top >= 2 && lua_istable(L, 2)) {
+        luaL_checktype(L, 2, LUA_TTABLE);
+        lua_pushvalue(L, 2);
+        lua_getfield(L, -1, "token");
+        token = lua_isnil(L, -1) ? "" : luaL_checkstring(L, -1);
+        lua_pop(L, 2);
+    }
+
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     jstring ids = env->NewStringUTF(id);
-    env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Buy, ids, g_IAP.m_IAPJNI);
+    jstring tokens = env->NewStringUTF(token);
+    env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Buy, ids, tokens, g_IAP.m_IAPJNI);
     env->DeleteLocalRef(ids);
-    Detach();
+    env->DeleteLocalRef(tokens);
 
-    assert(top == lua_gettop(L));
     return 0;
 }
 
 static int IAP_Finish(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 0);
+
     if(g_IAP.m_autoFinishTransactions)
     {
         dmLogWarning("Calling iap.finish when autofinish transactions is enabled. Ignored.");
         return 0;
     }
 
-    int top = lua_gettop(L);
-
     luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_getfield(L, -1, "state");
@@ -120,7 +119,6 @@ static int IAP_Finish(lua_State* L)
         {
             dmLogError("Invalid transaction state (must be iap.TRANS_STATE_PURCHASED).");
             lua_pop(L, 1);
-            assert(top == lua_gettop(L));
             return 0;
         }
     }
@@ -136,20 +134,19 @@ static int IAP_Finish(lua_State* L)
         const char * receipt = lua_tostring(L, -1);
         lua_pop(L, 1);
 
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         jstring receiptUTF = env->NewStringUTF(receipt);
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_FinishTransaction, receiptUTF, g_IAP.m_IAPJNI);
         env->DeleteLocalRef(receiptUTF);
-        Detach();
     }
 
-    assert(top == lua_gettop(L));
     return 0;
 }
 
 static int IAP_Acknowledge(lua_State* L)
 {
-    int top = lua_gettop(L);
+    DM_LUA_STACK_CHECK(L, 0);
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
@@ -160,7 +157,6 @@ static int IAP_Acknowledge(lua_State* L)
         {
             dmLogError("Invalid transaction state (must be iap.TRANS_STATE_PURCHASED).");
             lua_pop(L, 1);
-            assert(top == lua_gettop(L));
             return 0;
         }
     }
@@ -176,14 +172,13 @@ static int IAP_Acknowledge(lua_State* L)
         const char * receipt = lua_tostring(L, -1);
         lua_pop(L, 1);
 
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         jstring receiptUTF = env->NewStringUTF(receipt);
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_AcknowledgeTransaction, receiptUTF, g_IAP.m_IAPJNI);
         env->DeleteLocalRef(receiptUTF);
-        Detach();
     }
 
-    assert(top == lua_gettop(L));
     return 0;
 }
 
@@ -191,13 +186,11 @@ static int IAP_Restore(lua_State* L)
 {
     // TODO: Missing callback here for completion/error
     // See iap_ios.mm
+    DM_LUA_STACK_CHECK(L, 1);
 
-    int top = lua_gettop(L);
+    dmAndroid::ThreadAttacher threadAttacher;
-    JNIEnv* env = Attach();
+    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Restore, g_IAP.m_IAPJNI);
-    Detach();
-
-    assert(top == lua_gettop(L));
 
     lua_pushboolean(L, 1);
     return 1;
@@ -205,6 +198,8 @@ static int IAP_Restore(lua_State* L)
 
 static int IAP_SetListener(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 0);
+
     IAP* iap = &g_IAP;
 
     bool had_previous = iap->m_Listener != 0;
@@ -216,15 +211,17 @@ static int IAP_SetListener(lua_State* L)
 
     // On first set listener, trigger process old ones.
     if (!had_previous) {
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_ProcessPendingConsumables, g_IAP.m_IAPJNI);
-        Detach();
     }
     return 0;
 }
 
 static int IAP_GetProviderId(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 1);
+
     lua_pushinteger(L, g_IAP.m_ProviderId);
     return 1;
 }
@@ -309,23 +306,9 @@ static void HandleProductResult(const IAPCommand* cmd)
     }
 
     if (cmd->m_ResponseCode == BILLING_RESPONSE_RESULT_OK) {
-        dmJson::Document doc;
+        const char* json = (const char*)cmd->m_Data;
-        dmJson::Result r = dmJson::Parse((const char*) cmd->m_Data, &doc);
+        dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails
-        if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
+        lua_pushnil(L);
-            char err_str[128];
-            if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                dmLogError("Failed converting product result JSON to Lua; %s", err_str);
-                lua_pushnil(L);
-                IAP_PushError(L, "failed to convert JSON to Lua for product response", REASON_UNSPECIFIED);
-            } else {
-                lua_pushnil(L);
-            }
-        } else {
-            dmLogError("Failed to parse product response (%d)", r);
-            lua_pushnil(L);
-            IAP_PushError(L, "failed to parse product response", REASON_UNSPECIFIED);
-        }
-        dmJson::Free(&doc);
     } else {
         dmLogError("IAP error %d", cmd->m_ResponseCode);
         lua_pushnil(L);
@@ -359,23 +342,9 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
 
     if (cmd->m_ResponseCode == BILLING_RESPONSE_RESULT_OK) {
         if (cmd->m_Data != 0) {
-            dmJson::Document doc;
+            const char* json = (const char*)cmd->m_Data;
-            dmJson::Result r = dmJson::Parse((const char*) cmd->m_Data, &doc);
+            dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails
-            if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
+            lua_pushnil(L);
-                char err_str[128];
-                if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                    dmLogError("Failed converting purchase JSON result to Lua; %s", err_str);
-                    lua_pushnil(L);
-                    IAP_PushError(L, "failed to convert purchase response JSON to Lua", REASON_UNSPECIFIED);
-                } else {
-                    lua_pushnil(L);
-                }
-            } else {
-                dmLogError("Failed to parse purchase response (%d)", r);
-                lua_pushnil(L);
-                IAP_PushError(L, "failed to parse purchase response", REASON_UNSPECIFIED);
-            }
-            dmJson::Free(&doc);
         } else {
             dmLogError("IAP error, purchase response was null");
             lua_pushnil(L);
@@ -399,59 +368,41 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
+    IAP_Queue_Create(&g_IAP.m_CommandQueue);
-    // Extend extension functionality with per system initalization?
-    if (g_IAP.m_InitCount == 0) {
-        IAP_Queue_Create(&g_IAP.m_CommandQueue);
 
-        g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
+    g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
 
-        JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
 
-        jclass activity_class = env->FindClass("android/app/NativeActivity");
+    const char* provider = dmConfigFile::GetString(params->m_ConfigFile, "android.iap_provider", "GooglePlay");
-        jmethodID get_class_loader = env->GetMethodID(activity_class,"getClassLoader", "()Ljava/lang/ClassLoader;");
+    const char* class_name = "com.defold.iap.IapGooglePlay";
-        jobject cls = env->CallObjectMethod(dmGraphics::GetNativeAndroidActivity(), get_class_loader);
-        jclass class_loader = env->FindClass("java/lang/ClassLoader");
-        jmethodID find_class = env->GetMethodID(class_loader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
 
-        const char* provider = dmConfigFile::GetString(params->m_ConfigFile, "android.iap_provider", "GooglePlay");
+    g_IAP.m_ProviderId = PROVIDER_ID_GOOGLE;
-        const char* class_name = "com.defold.iap.IapGooglePlay";
+    if (!strcmp(provider, "Amazon")) {
-
+        g_IAP.m_ProviderId = PROVIDER_ID_AMAZON;
-        g_IAP.m_ProviderId = PROVIDER_ID_GOOGLE;
+        class_name = "com.defold.iap.IapAmazon";
-        if (!strcmp(provider, "Amazon")) {
-            g_IAP.m_ProviderId = PROVIDER_ID_AMAZON;
-            class_name = "com.defold.iap.IapAmazon";
-        }
-        else if (strcmp(provider, "GooglePlay")) {
-            dmLogWarning("Unknown IAP provider name [%s], defaulting to GooglePlay", provider);
-        }
-
-        jstring str_class_name = env->NewStringUTF(class_name);
-
-        jclass iap_class = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
-        env->DeleteLocalRef(str_class_name);
-
-        str_class_name = env->NewStringUTF("com.defold.iap.IapJNI");
-        jclass iap_jni_class = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
-        env->DeleteLocalRef(str_class_name);
-
-        g_IAP.m_List = env->GetMethodID(iap_class, "listItems", "(Ljava/lang/String;Lcom/defold/iap/IListProductsListener;J)V");
-        g_IAP.m_Buy = env->GetMethodID(iap_class, "buy", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
-        g_IAP.m_Restore = env->GetMethodID(iap_class, "restore", "(Lcom/defold/iap/IPurchaseListener;)V");
-        g_IAP.m_Stop = env->GetMethodID(iap_class, "stop", "()V");
-        g_IAP.m_ProcessPendingConsumables = env->GetMethodID(iap_class, "processPendingConsumables", "(Lcom/defold/iap/IPurchaseListener;)V");
-        g_IAP.m_FinishTransaction = env->GetMethodID(iap_class, "finishTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
-        g_IAP.m_AcknowledgeTransaction = env->GetMethodID(iap_class, "acknowledgeTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
-
-        jmethodID jni_constructor = env->GetMethodID(iap_class, "<init>", "(Landroid/app/Activity;Z)V");
-        g_IAP.m_IAP = env->NewGlobalRef(env->NewObject(iap_class, jni_constructor, dmGraphics::GetNativeAndroidActivity(), g_IAP.m_autoFinishTransactions));
-
-        jni_constructor = env->GetMethodID(iap_jni_class, "<init>", "()V");
-        g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor));
-
-        Detach();
     }
-    g_IAP.m_InitCount++;
+    else if (strcmp(provider, "GooglePlay")) {
+        dmLogWarning("Unknown IAP provider name [%s], defaulting to GooglePlay", provider);
+    }
+
+    jclass iap_class = dmAndroid::LoadClass(env, class_name);
+    jclass iap_jni_class = dmAndroid::LoadClass(env, "com.defold.iap.IapJNI");
+
+    g_IAP.m_List = env->GetMethodID(iap_class, "listItems", "(Ljava/lang/String;Lcom/defold/iap/IListProductsListener;J)V");
+    g_IAP.m_Buy = env->GetMethodID(iap_class, "buy", "(Ljava/lang/String;Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
+    g_IAP.m_Restore = env->GetMethodID(iap_class, "restore", "(Lcom/defold/iap/IPurchaseListener;)V");
+    g_IAP.m_Stop = env->GetMethodID(iap_class, "stop", "()V");
+    g_IAP.m_ProcessPendingConsumables = env->GetMethodID(iap_class, "processPendingConsumables", "(Lcom/defold/iap/IPurchaseListener;)V");
+    g_IAP.m_FinishTransaction = env->GetMethodID(iap_class, "finishTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
+    g_IAP.m_AcknowledgeTransaction = env->GetMethodID(iap_class, "acknowledgeTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
+
+    jmethodID jni_constructor = env->GetMethodID(iap_class, "<init>", "(Landroid/app/Activity;Z)V");
+    g_IAP.m_IAP = env->NewGlobalRef(env->NewObject(iap_class, jni_constructor, threadAttacher.GetActivity()->clazz, g_IAP.m_autoFinishTransactions));
+
+    jni_constructor = env->GetMethodID(iap_jni_class, "<init>", "()V");
+    g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor));
 
     lua_State*L = params->m_L;
     int top = lua_gettop(L);
@@ -494,21 +445,18 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
-    --g_IAP.m_InitCount;
 
     if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
         dmScript::DestroyCallback(g_IAP.m_Listener);
         g_IAP.m_Listener = 0;
     }
 
-    if (g_IAP.m_InitCount == 0) {
+    dmAndroid::ThreadAttacher threadAttacher;
-        JNIEnv* env = Attach();
+    JNIEnv* env = threadAttacher.GetEnv();
-        env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop);
+    env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop);
-        env->DeleteGlobalRef(g_IAP.m_IAP);
+    env->DeleteGlobalRef(g_IAP.m_IAP);
-        env->DeleteGlobalRef(g_IAP.m_IAPJNI);
+    env->DeleteGlobalRef(g_IAP.m_IAPJNI);
-        Detach();
+    g_IAP.m_IAP = NULL;
-        g_IAP.m_IAP = NULL;
-    }
     return dmExtension::RESULT_OK;
 }
 

extension-iap/src/iap_emscripten.cpp

@@ -46,23 +46,8 @@ static void IAPList_Callback(void* luacallback, const char* result_json)
 
     if(result_json != 0)
     {
-        dmJson::Document doc;
+        dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails
-        dmJson::Result r = dmJson::Parse(result_json, &doc);
+        lua_pushnil(L);
-        if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
-            char err_str[128];
-            if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                dmLogError("Failed converting list result JSON to Lua; %s", err_str);
-                lua_pushnil(L);
-                IAP_PushError(L, "Failed converting list result JSON to Lua", REASON_UNSPECIFIED);
-            } else {
-                lua_pushnil(L);
-            }
-        } else {
-            dmLogError("Failed to parse list result JSON (%d)", r);
-            lua_pushnil(L);
-            IAP_PushError(L, "Failed to parse list result JSON", REASON_UNSPECIFIED);
-        }
-        dmJson::Free(&doc);
     }
     else
     {
@@ -112,23 +97,8 @@ static void IAPListener_Callback(void* luacallback, const char* result_json, int
     }
 
     if (result_json) {
-        dmJson::Document doc;
+        dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails
-        dmJson::Result r = dmJson::Parse(result_json, &doc);
+        lua_pushnil(L);
-        if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
-            char err_str[128];
-            if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                dmLogError("Failed converting purchase result JSON to Lua; %s", err_str);
-                lua_pushnil(L);
-                IAP_PushError(L, "failed converting purchase result JSON to Lua", REASON_UNSPECIFIED);
-            } else {
-                lua_pushnil(L);
-            }
-        } else {
-            dmLogError("Failed to parse purchase response (%d)", r);
-            lua_pushnil(L);
-            IAP_PushError(L, "failed to parse purchase response", REASON_UNSPECIFIED);
-        }
-        dmJson::Free(&doc);
     } else {
         lua_pushnil(L);
         switch(error_code)

extension-iap/src/iap_ios.mm

@@ -24,7 +24,7 @@ struct IAP
         memset(this, 0, sizeof(*this));
         m_AutoFinishTransactions = true;
     }
-    int                             m_InitCount;
+    int                             m_Version;
     bool                            m_AutoFinishTransactions;
     NSMutableDictionary*            m_PendingTransactions;
     dmScript::LuaCallbackInfo*      m_Listener;
@@ -103,11 +103,17 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
     @property dmScript::LuaCallbackInfo* m_Callback;
     @property (assign) SKProductsRequest* m_Request;
+    @property int m_Version;
 @end
 
 @implementation SKProductsRequestDelegate
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{
 
+    if (self.m_Version != g_IAP.m_Version) {
+        dmLogWarning("Received products but the extension has been restarted")
+        return;
+    }
+
     if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
@@ -162,7 +168,7 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPResponse* response = (IAPResponse*)cmd->m_Data;
 
-    lua_State* L = dmScript::GetCallbackLuaContext(g_IAP.m_Listener);
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
     if (!dmScript::SetupCallback(cmd->m_Callback))
@@ -409,6 +415,7 @@ static int IAP_List(lua_State* L)
 
     delegate.m_Callback = dmScript::CreateCallback(L, 2);
     delegate.m_Request = products_request;
+    delegate.m_Version = g_IAP.m_Version;
     products_request.delegate = delegate;
     [products_request start];
 
@@ -529,13 +536,9 @@ static const luaL_reg IAP_methods[] =
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
+    g_IAP.m_AutoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
-    // Extend extension functionality with per system initalization?
+    g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2];
-    if (g_IAP.m_InitCount == 0) {
+    g_IAP.m_Version++;
-        g_IAP.m_AutoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
-        g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2];
-    }
-    g_IAP.m_InitCount++;
 
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
     IAP_Queue_Create(&g_IAP.m_ObservableQueue);
@@ -590,26 +593,22 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
-    --g_IAP.m_InitCount;
+    if (g_IAP.m_Listener)
-
+    {
-    // TODO: Should we support one listener per lua-state?
-    // Or just use a single lua-state...?
-    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
         dmScript::DestroyCallback(g_IAP.m_Listener);
-        g_IAP.m_Listener = 0;
     }
 
-    if (g_IAP.m_InitCount == 0) {
+    g_IAP.m_Listener = 0;
-        if (g_IAP.m_PendingTransactions) {
-             [g_IAP.m_PendingTransactions release];
-             g_IAP.m_PendingTransactions = 0;
-        }
 
-        if (g_IAP.m_Observer) {
+    if (g_IAP.m_PendingTransactions) {
-            [[SKPaymentQueue defaultQueue] removeTransactionObserver: g_IAP.m_Observer];
+         [g_IAP.m_PendingTransactions release];
-            [g_IAP.m_Observer release];
+         g_IAP.m_PendingTransactions = 0;
-            g_IAP.m_Observer = 0;
+    }
-        }
+
+    if (g_IAP.m_Observer) {
+        [[SKPaymentQueue defaultQueue] removeTransactionObserver: g_IAP.m_Observer];
+        [g_IAP.m_Observer release];
+        g_IAP.m_Observer = 0;
     }
 
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);

extension-iap/src/iap_private.cpp

@@ -121,18 +121,22 @@ void IAP_Queue_Push(IAPCommandQueue* queue, IAPCommand* cmd)
 void IAP_Queue_Flush(IAPCommandQueue* queue, IAPCommandFn fn, void* ctx)
 {
     assert(fn != 0);
+
     if (queue->m_Commands.Empty())
     {
         return;
     }
 
-    DM_MUTEX_SCOPED_LOCK(queue->m_Mutex);
+    dmArray<IAPCommand> tmp;
-
-    for(uint32_t i = 0; i != queue->m_Commands.Size(); ++i)
     {
-        fn(&queue->m_Commands[i], ctx);
+        DM_MUTEX_SCOPED_LOCK(queue->m_Mutex);
+        tmp.Swap(queue->m_Commands);
+    }
+
+    for(uint32_t i = 0; i != tmp.Size(); ++i)
+    {
+        fn(&tmp[i], ctx);
     }
-    queue->m_Commands.SetSize(0);
 }
 
 #endif // DM_PLATFORM_HTML5 || DM_PLATFORM_ANDROID || DM_PLATFORM_IOS

extension-iap/src/iap_private.h

@@ -7,8 +7,8 @@
 
 enum EIAPCommand
 {
-	IAP_PRODUCT_RESULT,
+    IAP_PRODUCT_RESULT,
-	IAP_PURCHASE_RESULT,
+    IAP_PURCHASE_RESULT,
 };
 
 struct DM_ALIGNED(16) IAPCommand
@@ -21,7 +21,7 @@ struct DM_ALIGNED(16) IAPCommand
     // Used for storing eventual callback info (if needed)
     dmScript::LuaCallbackInfo* m_Callback;
 
-    // THe actual command payload
+    // The actual command payload
     int32_t  	m_Command;
     int32_t  	m_ResponseCode;
     void*    	m_Data;

extension-iap/src/java/com/defold/iap/IapAmazon.java

@@ -11,6 +11,7 @@ import java.util.concurrent.BlockingQueue;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONArray;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -80,7 +81,7 @@ public class IapAmazon implements PurchasingListener {
         }
     }
 
-    public void buy(final String product, final IPurchaseListener listener) {
+    public void buy(final String product, final String token, final IPurchaseListener listener) {
         synchronized (purchaseListeners) {
             RequestId req = PurchasingService.purchase(product);
             if (req != null) {
@@ -173,9 +174,13 @@ public class IapAmazon implements PurchasingListener {
         if (productDataResponse.getRequestStatus() != ProductDataResponse.RequestStatus.SUCCESSFUL) {
             listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
         } else {
+            for (final String s : productDataResponse.getUnavailableSkus()) {
+                Log.v(TAG, "Unavailable SKU: " + s);
+            }
+
             Map<String, Product> products = productDataResponse.getProductData();
             try {
-                JSONObject data = new JSONObject();
+                JSONArray data = new JSONArray();
                 for (Map.Entry<String, Product> entry : products.entrySet()) {
                     String key = entry.getKey();
                     Product product = entry.getValue();
@@ -189,7 +194,7 @@ public class IapAmazon implements PurchasingListener {
                         // Based on return values from getPrice: https://developer.amazon.com/public/binaries/content/assets/javadoc/in-app-purchasing-api/com/amazon/inapp/purchasing/item.html
                         item.put("price", priceString.replaceAll("[^0-9.,]", ""));
                     }
-                    data.put(key, item);
+                    data.put(item);
                 }
                 listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString(), commadPtr);
             } catch (JSONException e) {

extension-iap/src/java/com/defold/iap/IapGooglePlay.java

@@ -19,26 +19,34 @@ import android.util.Log;
 
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClient.BillingResponseCode;
-import com.android.billingclient.api.BillingClient.SkuType;
+import com.android.billingclient.api.BillingClient.ProductType;
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.Purchase;
-import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.Purchase.PurchaseState;
-import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.ProductDetails;
+import com.android.billingclient.api.ProductDetails.OneTimePurchaseOfferDetails;
+import com.android.billingclient.api.ProductDetails.PricingPhases;
+import com.android.billingclient.api.ProductDetails.PricingPhase;
+import com.android.billingclient.api.ProductDetails.RecurrenceMode;
+import com.android.billingclient.api.ProductDetails.SubscriptionOfferDetails;
 import com.android.billingclient.api.ConsumeParams;
 import com.android.billingclient.api.BillingFlowParams;
-import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.BillingFlowParams.ProductDetailsParams;
+import com.android.billingclient.api.QueryPurchasesParams;
+import com.android.billingclient.api.QueryProductDetailsParams;
+import com.android.billingclient.api.QueryProductDetailsParams.Product;
 import com.android.billingclient.api.AcknowledgePurchaseParams;
 import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.ConsumeResponseListener;
-import com.android.billingclient.api.SkuDetailsResponseListener;
+import com.android.billingclient.api.PurchasesResponseListener;
+import com.android.billingclient.api.ProductDetailsResponseListener;
 import com.android.billingclient.api.AcknowledgePurchaseResponseListener;
 
 public class IapGooglePlay implements PurchasesUpdatedListener {
     public static final String TAG = "IapGooglePlay";
 
-    private Map<String, SkuDetails> products = new HashMap<String, SkuDetails>();
+    private Map<String, ProductDetails> products = new HashMap<String, ProductDetails>();
     private BillingClient billingClient;
     private IPurchaseListener purchaseListener;
     private boolean autoFinishTransactions;
@@ -102,6 +110,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
             p.put("date", toISO8601(new Date(purchase.getPurchaseTime())));
             p.put("receipt", purchase.getPurchaseToken());
             p.put("signature", purchase.getSignature());
+            p.put("original_json", purchase.getOriginalJson());
         }
         catch (JSONException e) {
             Log.wtf(TAG, "Failed to convert purchase", e);
@@ -109,16 +118,67 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
         return p.toString();
     }
 
-    private JSONObject convertSkuDetails(SkuDetails skuDetails) {
+    private JSONArray convertSubscriptionOfferPricingPhases(SubscriptionOfferDetails details) {
-        JSONObject p = new JSONObject();
+        JSONArray a = new JSONArray();
         try {
-            p.put("price_string", skuDetails.getPrice());
+            List<PricingPhase> pricingPhases = details.getPricingPhases().getPricingPhaseList();
-            p.put("ident", skuDetails.getSku());
+            for (PricingPhase pricingPhase : pricingPhases) {
-            p.put("currency_code", skuDetails.getPriceCurrencyCode());
+                JSONObject o = new JSONObject();
-            p.put("price", skuDetails.getPriceAmountMicros() * 0.000001);
+                o.put("price_string", pricingPhase.getFormattedPrice());
+                o.put("price", pricingPhase.getPriceAmountMicros() * 0.000001);
+                o.put("currency_code", pricingPhase.getPriceCurrencyCode());
+                o.put("billing_period", pricingPhase.getBillingPeriod());
+                o.put("billing_cycle_count", pricingPhase.getBillingCycleCount());
+                switch (pricingPhase.getRecurrenceMode()) {
+                case RecurrenceMode.FINITE_RECURRING:
+                    o.put("recurrence_mode", "FINITE");
+                    break;
+                case RecurrenceMode.INFINITE_RECURRING:
+                    o.put("recurrence_mode", "INFINITE");
+                    break;
+                default:
+                case RecurrenceMode.NON_RECURRING:
+                    o.put("recurrence_mode", "NONE");
+                    break;
+                }
+                a.put(o);
+            }
         }
         catch(JSONException e) {
-            Log.wtf(TAG, "Failed to convert sku details", e);
+            Log.wtf(TAG, "Failed to convert subscription offer pricing phases", e);
+        }
+        return a;
+    }
+
+    private JSONObject convertProductDetails(ProductDetails productDetails) {
+        JSONObject p = new JSONObject();
+        try {
+            p.put("ident", productDetails.getProductId());
+            p.put("title", productDetails.getTitle());
+            p.put("description", productDetails.getDescription());
+            if (productDetails.getProductType().equals(ProductType.INAPP)) {
+                OneTimePurchaseOfferDetails offerDetails = productDetails.getOneTimePurchaseOfferDetails();
+                p.put("price_string", offerDetails.getFormattedPrice());
+                p.put("currency_code", offerDetails.getPriceCurrencyCode());
+                p.put("price", offerDetails.getPriceAmountMicros() * 0.000001);
+            }
+            else if (productDetails.getProductType().equals(ProductType.SUBS)) {
+                List<SubscriptionOfferDetails> subscriptionOfferDetails = productDetails.getSubscriptionOfferDetails();
+                JSONArray a = new JSONArray();
+                for (SubscriptionOfferDetails offerDetails : subscriptionOfferDetails) {
+                    JSONObject o = new JSONObject();
+                    o.put("token", offerDetails.getOfferToken());
+                    o.put("pricing", convertSubscriptionOfferPricingPhases(offerDetails));
+                    a.put(o);
+                }
+                p.put("subscriptions", a);
+            }
+            else {
+                Log.i(TAG, "convertProductDetails() unknown product type " + productDetails.getProductType());
+            }
+        }
+        catch(JSONException e) {
+            Log.wtf(TAG, "Failed to convert product details", e);
         }
         return p;
     }
@@ -183,19 +243,18 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
         return billingResponseCodeToDefoldResponse(result.getResponseCode());
     }
 
-    /**
+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, int billingResultCode, String purchaseData) {
-     * Query Google Play for purchases done within the app.
+        if (purchaseListener == null) {
-     */
+            Log.w(TAG, "Received billing result but no listener has been set");
-    private List<Purchase> queryPurchases(final String type) {
+            return;
-        PurchasesResult result = billingClient.queryPurchases(type);
-        List<Purchase> purchases = result.getPurchasesList();
-        if (purchases == null) {
-            purchases = new ArrayList<Purchase>();
         }
-        if (result.getBillingResult().getResponseCode() != BillingResponseCode.OK) {
+        purchaseListener.onPurchaseResult(billingResultCode, purchaseData);
-            Log.e(TAG, "Unable to query pending purchases: " + result.getBillingResult().getDebugMessage());
+    }
-        }
+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, BillingResult billingResult, Purchase purchase) {
-        return purchases;
+        invokeOnPurchaseResultListener(purchaseListener, billingResultToDefoldResponse(billingResult), convertPurchase(purchase));
+    }
+    private void invokeOnPurchaseResultListener(IPurchaseListener purchaseListener, BillingResult billingResult) {
+        invokeOnPurchaseResultListener(purchaseListener, billingResultToDefoldResponse(billingResult), "");
     }
 
     /**
@@ -206,12 +265,34 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      */
     public void processPendingConsumables(final IPurchaseListener purchaseListener) {
         Log.d(TAG, "processPendingConsumables()");
-        List<Purchase> purchasesList = new ArrayList<Purchase>();
+
-        purchasesList.addAll(queryPurchases(SkuType.INAPP));
+
-        purchasesList.addAll(queryPurchases(SkuType.SUBS));
+        PurchasesResponseListener purchasesListener = new PurchasesResponseListener() {
-        for (Purchase purchase : purchasesList) {
+            private List<Purchase> allPurchases = new ArrayList<Purchase>();
-            handlePurchase(purchase, purchaseListener);
+            private int queries = 2;
-        }
+
+            @Override
+            public void onQueryPurchasesResponse(BillingResult billingResult, List<Purchase> purchases) {
+                if (billingResult.getResponseCode() != BillingResponseCode.OK) {
+                    Log.e(TAG, "Unable to query pending purchases: " + billingResult.getDebugMessage());
+                }
+                if (purchases != null) {
+                    allPurchases.addAll(purchases);
+                }
+                // we're finished when we have queried for both in-app and subs
+                queries--;
+                if (queries == 0) {
+                    for (Purchase purchase : allPurchases) {
+                        handlePurchase(purchase, purchaseListener);
+                    }
+                }
+            }
+        };
+
+        final QueryPurchasesParams inappParams = QueryPurchasesParams.newBuilder().setProductType(ProductType.INAPP).build();
+        final QueryPurchasesParams subsParams = QueryPurchasesParams.newBuilder().setProductType(ProductType.SUBS).build();
+        billingClient.queryPurchasesAsync(inappParams, purchasesListener);
+        billingClient.queryPurchasesAsync(subsParams, purchasesListener);
     }
 
     /**
@@ -220,7 +301,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      */
     private void consumePurchase(final String purchaseToken, final ConsumeResponseListener consumeListener) {
         Log.d(TAG, "consumePurchase() " + purchaseToken);
-        ConsumeParams consumeParams = ConsumeParams.newBuilder()
+        final ConsumeParams consumeParams = ConsumeParams.newBuilder()
             .setPurchaseToken(purchaseToken)
             .build();
 
@@ -239,7 +320,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                 // note: we only call the purchase listener if an error happens
                 if (billingResult.getResponseCode() != BillingResponseCode.OK) {
                     Log.e(TAG, "Unable to consume purchase: " + billingResult.getDebugMessage());
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult);
                 }
             }
         });
@@ -262,7 +343,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                 // note: we only call the purchase listener if an error happens
                 if (billingResult.getResponseCode() != BillingResponseCode.OK) {
                     Log.e(TAG, "Unable to acknowledge purchase: " + billingResult.getDebugMessage());
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult);
                 }
             }
         });
@@ -272,7 +353,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      * Handle a purchase. If the extension is configured to automatically
      * finish transactions the purchase will be immediately consumed. Otherwise
      * the product will be returned via the listener without being consumed.
-     * NOTE: Billing 3.0 requires purchases to be acknowledged within 3 days of
+     * NOTE: Billing 3.0+ requires purchases to be acknowledged within 3 days of
      * purchase unless they are consumed.
      */
     private void handlePurchase(final Purchase purchase, final IPurchaseListener purchaseListener) {
@@ -281,12 +362,12 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
                 @Override
                 public void onConsumeResponse(BillingResult billingResult, String purchaseToken) {
                     Log.d(TAG, "handlePurchase() response code " + billingResult.getResponseCode() + " purchaseToken: " + purchaseToken);
-                    purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), convertPurchase(purchase));
+                    invokeOnPurchaseResultListener(purchaseListener, billingResult, purchase);
                 }
             });
         }
         else {
-            purchaseListener.onPurchaseResult(billingResponseCodeToDefoldResponse(BillingResponseCode.OK), convertPurchase(purchase));
+            invokeOnPurchaseResultListener(purchaseListener, billingResponseCodeToDefoldResponse(BillingResponseCode.OK), convertPurchase(purchase));
         }
     }
 
@@ -295,13 +376,17 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      */
     @Override
     public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
-        if (billingResult.getResponseCode() == BillingResponseCode.OK && purchases != null) {
+        if (billingResult.getResponseCode() == BillingResponseCode.OK) {
-            for (Purchase purchase : purchases) {
+            if (purchases != null && !purchases.isEmpty()) {
-                handlePurchase(purchase, this.purchaseListener);
+                for (Purchase purchase : purchases) {
+                    if (purchase != null) {
+                        handlePurchase(purchase, this.purchaseListener);
+                    }
+                }
             }
         }
         else {
-            this.purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+            invokeOnPurchaseResultListener(this.purchaseListener, billingResult);
         }
     }
 
@@ -309,42 +394,53 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      * Buy a product. This method stores the listener and uses it in the
      * onPurchasesUpdated() callback.
      */
-    private void buyProduct(SkuDetails sku, final IPurchaseListener purchaseListener) {
+    private void buyProduct(ProductDetails pd, final String token, final IPurchaseListener purchaseListener) {
         this.purchaseListener = purchaseListener;
 
-        BillingFlowParams billingFlowParams = BillingFlowParams.newBuilder()
+        List<ProductDetailsParams> productDetailsParams = new ArrayList();
-            .setSkuDetails(sku)
+        if (pd.getProductType().equals(ProductType.SUBS)) {
-            .build();
+            productDetailsParams.add(ProductDetailsParams.newBuilder().setProductDetails(pd).setOfferToken(token).build());
+        }
+        else {
+            productDetailsParams.add(ProductDetailsParams.newBuilder().setProductDetails(pd).build());
+        }
+
+        final BillingFlowParams billingFlowParams = BillingFlowParams.newBuilder().setProductDetailsParamsList(productDetailsParams).build();
 
         BillingResult billingResult = billingClient.launchBillingFlow(this.activity, billingFlowParams);
         if (billingResult.getResponseCode() != BillingResponseCode.OK) {
             Log.e(TAG, "Purchase failed: " + billingResult.getDebugMessage());
-            purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+            invokeOnPurchaseResultListener(purchaseListener, billingResult);
         }
     }
 
     /**
      * Called from Lua.
      */
-    public void buy(final String product, final IPurchaseListener purchaseListener) {
+    public void buy(final String product, final String token, final IPurchaseListener purchaseListener) {
         Log.d(TAG, "buy()");
 
-        SkuDetails sku = this.products.get(product);
+        ProductDetails pd = this.products.get(product);
-        if (sku != null) {
+        if (pd != null) {
-            buyProduct(sku, purchaseListener);
+            buyProduct(pd, token, purchaseListener);
         }
         else {
-            List<String> skuList = new ArrayList<String>();
+            List<String> productList = new ArrayList<String>();
-            skuList.add(product);
+            productList.add(product);
-            querySkuDetailsAsync(skuList, new SkuDetailsResponseListener() {
+            queryProductDetailsAsync(productList, new ProductDetailsResponseListener() {
                 @Override
-                public void onSkuDetailsResponse(BillingResult billingResult, List<SkuDetails> skuDetailsList) {
+                public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetailsList) {
-                    if (billingResult.getResponseCode() == BillingResponseCode.OK) {
+                    if (billingResult.getResponseCode() == BillingResponseCode.OK && (productDetailsList != null) && !productDetailsList.isEmpty()) {
-                        buyProduct(skuDetailsList.get(0), purchaseListener);
+                        for (ProductDetails productDetails : productDetailsList) {
+                            if (productDetails != null) {
+                                buyProduct(productDetails, token, purchaseListener);
+                                break;
+                            }
+                        }
                     }
                     else {
                         Log.e(TAG, "Unable to get product details before buying: " + billingResult.getDebugMessage());
-                        purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
+                        invokeOnPurchaseResultListener(purchaseListener, billingResult);
                     }
                 }
             });
@@ -355,30 +451,45 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
      * Get details for a list of products. The products can be a mix of
      * in-app products and subscriptions.
      */
-    private void querySkuDetailsAsync(final List<String> skuList, final SkuDetailsResponseListener listener) {
+    private void queryProductDetailsAsync(final List<String> productList, final ProductDetailsResponseListener listener) {
-        SkuDetailsResponseListener detailsListener = new SkuDetailsResponseListener() {
+        ProductDetailsResponseListener detailsListener = new ProductDetailsResponseListener() {
-            private List<SkuDetails> allSkuDetails = new ArrayList<SkuDetails>();
+            private List<ProductDetails> allProductDetails = new ArrayList<ProductDetails>();
             private int queries = 2;
 
             @Override
-            public void onSkuDetailsResponse(BillingResult billingResult, List<SkuDetails> skuDetails) {
+            public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) {
-                if (skuDetails != null) {
+                if (productDetails != null && !productDetails.isEmpty()) {
-                    // cache skus (cache will be used to speed up buying)
+                    // cache products (cache will be used to speed up buying)
-                    for (SkuDetails sd : skuDetails) {
+                    for (ProductDetails pd : productDetails) {
-                        IapGooglePlay.this.products.put(sd.getSku(), sd);
+                        if (pd != null) {
+                            IapGooglePlay.this.products.put(pd.getProductId(), pd);
+                        }
                     }
-                    // add to list of all sku details
+                    // add to list of all product details
-                    allSkuDetails.addAll(skuDetails);
+                    allProductDetails.addAll(productDetails);
                 }
                 // we're finished when we have queried for both in-app and subs
                 queries--;
                 if (queries == 0) {
-                    listener.onSkuDetailsResponse(billingResult, allSkuDetails);
+                    listener.onProductDetailsResponse(billingResult, allProductDetails);
                 }
             }
         };
-        billingClient.querySkuDetailsAsync(SkuDetailsParams.newBuilder().setSkusList(skuList).setType(SkuType.INAPP).build(), detailsListener);
+
-        billingClient.querySkuDetailsAsync(SkuDetailsParams.newBuilder().setSkusList(skuList).setType(SkuType.SUBS).build(), detailsListener);
+        // we don't know if a product is a subscription or inapp product type
+        // instread we create two product lists from the same set of products and use INAPP for one and SUBS for the other
+        List<Product> inappProductList = new ArrayList();
+        List<Product> subsProductList = new ArrayList();
+        for (String productId : productList) {
+            inappProductList.add(Product.newBuilder().setProductId(productId).setProductType(ProductType.INAPP).build());
+            subsProductList.add(Product.newBuilder().setProductId(productId).setProductType(ProductType.SUBS).build());
+        }
+
+        // do one query per product type
+        final QueryProductDetailsParams inappParams = QueryProductDetailsParams.newBuilder().setProductList(inappProductList).build();
+        final QueryProductDetailsParams subsParams = QueryProductDetailsParams.newBuilder().setProductList(subsProductList).build();
+        billingClient.queryProductDetailsAsync(inappParams, detailsListener);
+        billingClient.queryProductDetailsAsync(subsParams, detailsListener);
     }
 
     /**
@@ -387,21 +498,23 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
     public void listItems(final String products, final IListProductsListener productsListener, final long commandPtr) {
         Log.d(TAG, "listItems()");
 
-        // create list of skus from comma separated string
+        // create list of product ids from comma separated string
-        List<String> skuList = new ArrayList<String>();
+        List<String> productList = new ArrayList<String>();
         for (String p : products.split(",")) {
             if (p.trim().length() > 0) {
-                skuList.add(p);
+                productList.add(p);
             }
         }
 
-        querySkuDetailsAsync(skuList, new SkuDetailsResponseListener() {
+        queryProductDetailsAsync(productList, new ProductDetailsResponseListener() {
             @Override
-            public void onSkuDetailsResponse(BillingResult billingResult, List<SkuDetails> skuDetails) {
+            public void onProductDetailsResponse(BillingResult billingResult, List<ProductDetails> productDetails) {
                 JSONArray a = new JSONArray();
-                if (billingResult.getResponseCode() == BillingResponseCode.OK) {
+                if ((billingResult.getResponseCode() == BillingResponseCode.OK) && (productDetails != null) && !productDetails.isEmpty()) {
-                    for (SkuDetails sd : skuDetails) {
+                    for (ProductDetails pd : productDetails) {
-                        a.put(convertSkuDetails(sd));
+                        if (pd != null) {
+                            a.put(convertProductDetails(pd));
+                        }
                     }
                 }
                 else {

game.project

@@ -16,7 +16,7 @@ target_sdk_version = 29
 
 [project]
 title = extension-iap
-dependencies = https://github.com/andsve/dirtylarry/archive/master.zip
+dependencies#0 = https://github.com/andsve/dirtylarry/archive/master.zip
 
 [library]
 include_dirs = extension-iap

main/main.gui

@@ -1,7 +1,7 @@
 script: "/main/main.gui_script"
 fonts {
-  name: "system_font"
+  name: "default"
-  font: "/builtins/fonts/system_font.font"
+  font: "/builtins/fonts/default.font"
 }
 background_color {
   x: 0.0
@@ -47,6 +47,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -102,6 +104,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -166,6 +172,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -205,6 +215,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -261,6 +273,10 @@ nodes {
   overridden_fields: 4
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -325,6 +341,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -360,7 +380,7 @@ nodes {
   type: TYPE_TEXT
   blend_mode: BLEND_MODE_ALPHA
   text: "<text>"
-  font: "system_font"
+  font: "default"
   id: "log"
   xanchor: XANCHOR_NONE
   yanchor: YANCHOR_NONE
@@ -387,6 +407,10 @@ nodes {
   template_node_child: false
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -426,6 +450,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -481,6 +507,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -545,6 +575,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -584,6 +618,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -639,6 +675,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -703,6 +743,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -742,6 +786,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -798,6 +844,10 @@ nodes {
   overridden_fields: 4
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -862,6 +912,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -901,6 +955,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -956,6 +1012,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1020,6 +1080,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1059,6 +1123,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/button.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -1115,6 +1181,10 @@ nodes {
   overridden_fields: 4
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1179,6 +1249,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1218,6 +1292,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/checkbox_label.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -1273,6 +1349,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1337,6 +1417,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1376,6 +1460,8 @@ nodes {
   alpha: 1.0
   template: "/dirtylarry/checkbox_label.gui"
   template_node_child: false
+  custom_type: 0
+  enabled: true
 }
 nodes {
   position {
@@ -1431,6 +1517,10 @@ nodes {
   alpha: 1.0
   template_node_child: true
   size_mode: SIZE_MODE_MANUAL
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 nodes {
   position {
@@ -1495,6 +1585,10 @@ nodes {
   template_node_child: true
   text_leading: 1.0
   text_tracking: 0.0
+  custom_type: 0
+  enabled: true
+  visible: true
+  material: ""
 }
 material: "/builtins/materials/gui.material"
 adjust_reference: ADJUST_REFERENCE_PARENT

main/main.gui_script

@@ -3,7 +3,7 @@ local dirtylarry = require "dirtylarry/dirtylarry"
 local GOLDBARS_SMALL = "com.defold.iap.goldbar.small"
 local GOLDBARS_MEDIUM = "com.defold.iap.goldbar.medium"
 local GOLDBARS_LARGE = "com.defold.iap.goldbar.large"
-local SUBSCRIPTION = "com.defold.iap.subscription"
+local SUBSCRIPTION = "com.defold.iap.subscription.one"
 local NON_CONSUMABLE = "com.defold.iap.removeads"
 
 local items = {
@@ -66,6 +66,7 @@ local function list()
 		for k,p in pairs(products) do
 			available_items[p.ident] = p
 			log("Item %s", p.ident)
+			pprint(p)
 			local button = item_buttons[p.ident]
 			if button then
 				gui.set_color(gui.get_node(button.."/larrylabel"), vmath.vector4(1,1,1,1))