publish mod 26.10

Author: ChristopherHX

.DS_Store

@@ -1,13 +1,19 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.6...4.0)
 
-project(mcpelauncherupdates LANGUAGES CXX)
+project(mcpelauncher-updates LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 find_library(log-lib log)
 
-add_subdirectory(libjnivm)
-add_subdirectory(Webserver)
-add_subdirectory(Google-Play-API)
-add_library(mcpelauncherupdates SHARED src/main.cpp)
-target_link_libraries(mcpelauncherupdates PUBLIC jnivm gplayapi ${log-lib})
+set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_CONFORMANCE OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_LIBPROTOC OFF CACHE BOOL "" FORCE)
+set(protobuf_DISABLE_RTTI ON CACHE BOOL "" FORCE)
+add_subdirectory(protobuf)
+add_subdirectory(google-play-api)
+add_library(mcpelauncher-updates SHARED src/main.cpp)
+target_compile_definitions(mcpelauncher-updates PRIVATE ENABLE_VALIDATION)
+target_link_libraries(mcpelauncher-updates PUBLIC libprotobuf gplayapi)

CMakeLists.txt

@@ -1,29 +1,31 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0.0)
 project(gplaydl)
 
-set(CMAKE_CXX_STANDARD 11)
+# protobuf now requires c++17
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
 find_package(Threads REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(Protobuf REQUIRED)
-
-if (NOT DEFINED Protobuf_LIBRARIES)
-    set(Protobuf_LIBRARIES ${PROTOBUF_LIBRARIES})
-    set(Protobuf_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
-endif()
+#find_package(CURL REQUIRED)
+find_package(Protobuf)
 
 protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS proto/gsf.proto proto/play_common.proto proto/play_document.proto proto/play_respone.proto proto/play_settings.proto proto/play_toc.proto proto/play_download.proto proto/play_filter_rules.proto proto/play_ownership.proto proto/play_containers.proto proto/play_link.proto proto/play_device_config.proto proto/play_search.proto proto/play_browse.proto proto/play_details.proto)
 
 set(LIB_UTIL_SOURCE_FILES lib/playapi/util/http.cpp include/playapi/util/http.h lib/playapi/util/config.cpp include/playapi/util/config.h lib/playapi/util/rand.cpp include/playapi/util/rand.h lib/playapi/util/base64.cpp include/playapi/util/base64.h)
 set(LIB_SOURCE_FILES lib/playapi/login.cpp include/playapi/login.h lib/playapi/device_info.cpp include/playapi/device_info.h lib/playapi/checkin.cpp include/playapi/checkin.h include/playapi/api.h lib/playapi/api.cpp lib/playapi/experiments.cpp include/playapi/experiments.h include/playapi/login_cache.h include/playapi/file_login_cache.h lib/playapi/file_login_cache.cpp include/playapi/task.h include/playapi/http_task.h)
 add_library(gplayapi STATIC ${LIB_SOURCE_FILES} ${LIB_UTIL_SOURCE_FILES} ${PROTO_SRCS})
-target_link_libraries(gplayapi ${ZLIB_LIBRARIES} ${Protobuf_LIBRARIES} Net)
-target_include_directories(gplayapi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${ZLIB_INCLUDE_DIRS} ${Protobuf_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(gplayapi libprotobuf Threads::Threads)
+if (ABSEIL)
+	target_link_libraries(gplayapi absl::log_internal_check_op)
+endif()
+target_include_directories(gplayapi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(gplaydl src/gplaydl.cpp src/common.cpp src/config.cpp src/config.h)
-target_link_libraries(gplaydl gplayapi)
-target_include_directories(gplaydl PUBLIC ${ZLIB_INCLUDE_DIRS})
+# add_executable(gplaydl src/gplaydl.cpp src/common.cpp src/config.cpp src/config.h)
+# target_link_libraries(gplaydl gplayapi)
+# #target_include_directories(gplaydl PUBLIC ${CURL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
 
-add_executable(gplayver src/gplayver.cpp src/common.cpp src/config.cpp src/config.h)
-target_link_libraries(gplayver gplayapi)
-target_include_directories(gplayver PUBLIC ${ZLIB_INCLUDE_DIRS})
+# add_executable(gplayver src/gplayver.cpp src/common.cpp src/config.cpp src/config.h)
+# target_link_libraries(gplayver gplayapi)
+#target_include_directories(gplayver PUBLIC ${CURL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})

Google-Play-API/CMakeLists.txt

@@ -0,0 +1,57 @@
+# google-play-api
+
+## Features
+- gplayver Query play store apk version code
+- gplaydl Download play store apk
+
+## Usage
+
+### Device Configs
+
+By default the x86 32bit apk is downloaded. Use a `device.conf` to change device properties.
+```
+config.native_platforms = [
+    armeabi-v7a
+]
+```
+```
+config.native_platforms = [
+    arm64-v8a
+]
+```
+```
+config.native_platforms = [
+    x86
+]
+```
+```
+config.native_platforms = [
+    x86_64
+]
+```
+
+### Authenticate
+
+- Build https://github.com/minecraft-linux/playdl-signin-ui-qt then run it to login.
+- playdl-signin-ui-qt
+- ```
+  gplaydl --interactive --device device.conf --save-auth --accept-tos
+  We haven't authorized you yet. Please select your preferred login method:
+  1. via login and password
+  2. via access token
+  3. via master token
+  Please type the selected number and press enter: 2
+  Please enter your access token: oauth2_4/...
+  ```
+
+### gplayver
+
+```shell
+gplayver --device device.conf --app com.mojang.minecraftpe --accept-tos
+```
+
+### gplaydl
+
+```shell
+gplaydl --device device.conf --app com.mojang.minecraftpe --accept-tos
+```

Google-Play-API/README.md

@@ -54,35 +54,33 @@ struct device_info {
     std::string build_bootloader = "unknown";
     std::string build_client = "android-google";
     long long build_timestamp = 1480546800;
-    int build_google_services = 10084470;
+    int build_google_services = 251333035;
+    int vending_version = 84582130;
+    std::string vending_version_string = "45.8.21-31 [0] [PR] 747433787";
     std::string build_device = "D001";
-    int build_sdk_version = 23;
+    int build_sdk_version = 36;
     std::string build_version_string = "6.0.1";
     std::string build_model = "DIY_D001";
     std::string build_manufacturer = "diy";
     std::string build_build_product = "desktop";
     bool build_ota_installed = false;
     std::vector<std::pair<std::string, int>> build_google_packages;
-    std::string build_security_patch = "2019-01-05";
+    std::string build_security_patch = "";
 
     device_touch_screen config_touch_screen = device_touch_screen::finger;
     device_keyboard config_keyboard = device_keyboard::qwerty;
     device_navigation config_navigation = device_navigation::nonav;
     device_screen_layout config_screen_layout = device_screen_layout::xlarge;
     bool config_has_hard_keyboard = false;
     bool config_has_five_way_navig = false;
-    int config_screen_density = 120;
-    int config_gles_version = 0x30000;
-    std::vector<std::string> config_system_shared_libraries = {"android.test.runner",
-                                                               "com.android.future.usb.accessory",
-                                                               "com.android.location.provider",
-                                                               "com.google.android.gms", "javax.obex",
-                                                               "org.apache.http.legacy"};
+    int config_screen_density = 420;
+    int config_gles_version = 0x30002;
+    std::vector<std::string> config_system_shared_libraries = {"android.test.base", "android.test.mock", "com.vzw.apnlib", "android.hidl.manager-V1.0-java", "com.android.hotwordenrollment.common.util", "com.google.pixel.camera.services.cameraidremapper", "google-ril", "libedgetpu_client.google.so", "libOpenCL.so", "libedgetpu_util.so", "android.telephony.satellite", "com.google.android.camera.experimental2024_system", "com.google.pixel.camera.connectivity", "com.android.omadm.radioconfig", "android.hidl.base-V1.0-java", "com.google.pixel.camera.services.lyricconfigprovider", "lib_jpg_encoder.so", "com.google.android.camera.experimental2024", "libOpenCL-pixel.so", "com.android.location.provider", "androidx.window.extensions", "libedgetpu_dba.google.so", "com.google.pixel.camera.connectivity.impl", "oemrilhook", "com.google.pixel.camera.services.cameraidremapper.impl", "android.net.ipsec.ike", "com.android.future.usb.accessory", "com.google.pixel.camera.services.lyricconfigprovider.impl", "androidx.camera.extensions.impl", "android.ext.shared", "javax.obex", "com.google.android.gms", "lib_aion_buffer.so", "libgxp.so", "libedgetpu_tachyon.google.so", "android.test.runner", "com.google.android.dialer.support", "org.apache.http.legacy", "com.google.android.camera.extensions", "com.google.android.hardwareinfo", "com.android.cts.ctsshim.shared_library", "com.android.nfc_extras", "com.android.media.remotedisplay", "com.google.android.camerax.extensions", "com.android.mediadrm.signer", "androidx.window.sidecar"};
     std::vector<std::pair<std::string, int>> config_system_features; // this will be initialized in the constructor
     std::vector<std::string> config_native_platforms = {"x86", "armeabi-x7a", "armeabi"};
-    int config_screen_width = 1920;
-    int config_screen_height = 1080;
-    std::vector<std::string> config_system_supported_locales = {"en", "en-US"};
+    int config_screen_width = 1080;
+    int config_screen_height = 2424;
+    std::vector<std::string> config_system_supported_locales = {"af", "af_ZA", "am", "am_ET", "ar", "ar_EG", "ar_XB", "as", "ast", "az", "be", "bg", "bg_BG", "bn", "bs", "ca", "ca_ES", "cs", "cs_CZ", "da", "da_DK", "de", "de_DE", "el", "el_GR", "en", "en_AU", "en_CA", "en_GB", "en_IN", "en_US", "en_XA", "en_XC", "eo", "es", "es_419", "es_ES", "es_US", "et", "et_EE", "eu", "fa", "fa_IR", "fi", "fi_FI", "fil", "fil_PH", "fr", "fr_CA", "fr_FR", "gl", "gu", "he", "hi", "hi_IN", "hr", "hr_HR", "hu", "hu_HU", "hy", "ia", "in", "in_ID", "is", "it", "it_IT", "iw", "iw_IL", "ja", "ja_JP", "ka", "kk", "km", "kmr", "kn", "ko", "ko_KR", "ky", "lo", "lt", "lt_LT", "lv", "lv_LV", "mk", "ml", "mn", "mr", "ms", "ms_MY", "my", "nb", "nb_NO", "ne", "nl", "nl_NL", "or", "pa", "pl", "pl_PL", "pt", "pt_BR", "pt_PT", "ro", "ro_RO", "ru", "ru_RU", "sc", "si", "sk", "sk_SK", "sl", "sl_SI", "so", "sq", "sr", "sr_Latn", "sr_RS", "sv", "sv_SE", "sw", "sw_TZ", "ta", "te", "th", "th_TH", "tr", "tr_TR", "uk", "uk_UA", "ur", "uz", "vi", "vi_VN", "yue", "zh_CN", "zh_HK", "zh_TW", "zu", "zu_ZA"};
     std::vector<std::string> config_gl_extensions;
     int config_smallest_screen_width_dp = 1080;
     bool config_low_ram = false;

Google-Play-API/include/playapi/device_info.h

@@ -19,11 +19,11 @@ class http_task : public task<http_response> {
 
     void call(std::function<void (http_response&&)> success, std::function<void (std::exception_ptr)> error) override {
         req.perform([success, error](http_response resp) {
-            try {
+            // try {
                 success(std::move(resp));
-            } catch (std::exception& e) {
-                error(std::current_exception());
-            }
+            // } catch (std::exception& e) {
+            //     error(std::current_exception());
+            // }
         }, error);
     }
 

Google-Play-API/include/playapi/http_task.h

@@ -98,12 +98,12 @@ class function_task<void, Args...> : public task<void, Args...> {
     }
 
     void call(Args&&... args, std::function<void ()> success, std::function<void (std::exception_ptr)> error) override {
-        try {
+        // try {
             func(std::forward<Args...>(args)...);
             success();
-        } catch (std::exception& e) {
-            error(std::current_exception());
-        }
+        // } catch (std::exception& e) {
+        //     error(std::current_exception());
+        // }
     }
 
     void call(Args&&... args) override {
@@ -127,11 +127,11 @@ class function_task : public task<T, Args...> {
     }
 
     void call(Args&&... args, std::function<void (T&&)> success, std::function<void (std::exception_ptr)> error) override {
-        try {
+        // try {
             success(func(std::forward<Args...>(args)...));
-        } catch (std::exception& e) {
-            error(std::current_exception());
-        }
+        // } catch (std::exception& e) {
+        //     error(std::current_exception());
+        // }
     }
 
     T call(Args&&... args) override {
@@ -156,14 +156,14 @@ class flat_function_task : public task<T, Args...> {
 
     void call(Args&&... args, std::function<void (T&&)> success, std::function<void (std::exception_ptr)> error) override {
         task_ptr<T> ret;
-        try {
+        // try {
             ret = func(std::forward<Args...>(args)...);
             if (!ret)
-                throw std::runtime_error("flat_function_task's function must return a valid pointer");
-        } catch (std::exception& e) {
-            error(std::current_exception());
-            return;
-        }
+                {} // throw std::runtime_error("flat_function_task's function must return a valid pointer");
+        // } catch (std::exception& e) {
+        //     error(std::current_exception());
+        //     return;
+        // }
         ret->call(success, error);
     }
 

Google-Play-API/include/playapi/task.h

@@ -37,7 +37,8 @@ void api::set_checkin_data(const checkin_result& result) {
 
 std::string api::build_user_agent() {
     std::stringstream ua;
-    ua << "Android-Finsky/14.2.63-all [0] [PR] 240807813 (api=3,versionCode=81426300,";
+    ua << "Android-Finsky/" << device.vending_version_string << " (api=3,";
+    ua << "versionCode=" << device.vending_version << ",";
     ua << "sdk=" << device.build_sdk_version << ",";
     ua << "device=" << device.build_device << ",";
     ua << "hardware=" << device.build_product << ",";
@@ -94,15 +95,15 @@ api::request_task api::send_request(http_method method, const std::string& path,
     req.set_body(bin_data);
     return http_task::make(req)->then<ret_type>([this, method, path, bin_data, options](http_response&& resp) {
         if (!resp)
-            throw std::runtime_error("Failed to send request");
+        {} //    throw std::runtime_error("Failed to send request");
         if (resp.get_status_code() == 401) {
             return invalidate_token()->then<ret_type>([this, method, path, bin_data, options]() {
                 return send_request(method, path, bin_data, options);
             });
         }
         ret_type ret;
         if (!ret.ParseFromString(resp.get_body()))
-            throw std::runtime_error("Failed to parse response");
+        {} //    throw std::runtime_error("Failed to parse response");
 #ifndef NDEBUG
         printf("api response body = %s\n", ret.DebugString().c_str());
 #endif

Google-Play-API/lib/playapi/api.cpp

@@ -140,11 +140,11 @@ task_ptr<checkin_result> checkin_api::perform_checkin(const checkin_result& last
 
     return http_task::make(http)->then<checkin_result>([](http_response&& http_resp) {
         if (!http_resp)
-            throw std::runtime_error("Failed to send checkin");
+        {} //    throw std::runtime_error("Failed to send checkin");
 
         proto::gsf::AndroidCheckinResponse resp;
         if (!resp.ParseFromString(http_resp.get_body()))
-            throw std::runtime_error("Failed to parse checkin");
+        {} //    throw std::runtime_error("Failed to parse checkin");
 #ifndef NDEBUG
         printf("Checkin response: %s\n", resp.DebugString().c_str());
 #endif