From 3c3a29d42f770cad833d9ae6550ba110a8349760 Mon Sep 17 00:00:00 2001 From: Steven Penny Date: Mon, 27 Feb 2023 19:55:34 -0600 Subject: [PATCH] renamed: blog/2023-02-27-protos/AndroidAppDeliveryData.java -> blog/java/AndroidAppDeliveryData.java --- .ignore | 2 +- blog/go.mod | 3 + blog/readme.md | 2 +- checkin.go | 20 ++-- delivery.go | 91 ++++++++++--------- details.go | 13 ++- .../AndroidAppDeliveryData.java | 0 .../AppDetails.java | 0 .../AppFileMetadata.java | 0 .../Checkin$AndroidCheckinRequest.java | 0 .../Checkin$AndroidCheckinResponse.java | 0 {blog/2023-02-27-protos => java}/Common.java | 0 .../Containers.java | 0 .../DeliveryResponse.java | 0 {blog/2023-02-27-protos => java}/Details.java | 0 .../DeviceConfiguration.java | 0 .../DocDetails.java | 0 {blog/2023-02-27-protos => java}/DocV2.java | 0 .../FileMetadata.java | 0 .../GetReviewsResponse.java | 0 .../InstallDetails.java | 0 .../ListResponse.java | 0 .../Logs$AndroidBuildProto.java | 0 .../Logs$AndroidCheckinProto.java | 0 .../2023-02-27-protos => java}/PreFetch.java | 0 {blog/2023-02-27-protos => java}/Rating.java | 0 .../2023-02-27-protos => java}/Response.java | 0 {blog/2023-02-27-protos => java}/Review.java | 0 .../ReviewResponse.java | 0 .../SearchSuggest.java | 0 .../ServerCommands.java | 0 .../SplitDeliveryData.java | 0 {blog/2023-02-27-protos => java}/readme.md | 0 33 files changed, 73 insertions(+), 58 deletions(-) create mode 100644 blog/go.mod rename {blog/2023-02-27-protos => java}/AndroidAppDeliveryData.java (100%) rename {blog/2023-02-27-protos => java}/AppDetails.java (100%) rename {blog/2023-02-27-protos => java}/AppFileMetadata.java (100%) rename {blog/2023-02-27-protos => java}/Checkin$AndroidCheckinRequest.java (100%) rename {blog/2023-02-27-protos => java}/Checkin$AndroidCheckinResponse.java (100%) rename {blog/2023-02-27-protos => java}/Common.java (100%) rename {blog/2023-02-27-protos => java}/Containers.java (100%) rename {blog/2023-02-27-protos => java}/DeliveryResponse.java (100%) rename {blog/2023-02-27-protos => java}/Details.java (100%) rename {blog/2023-02-27-protos => java}/DeviceConfiguration.java (100%) rename {blog/2023-02-27-protos => java}/DocDetails.java (100%) rename {blog/2023-02-27-protos => java}/DocV2.java (100%) rename {blog/2023-02-27-protos => java}/FileMetadata.java (100%) rename {blog/2023-02-27-protos => java}/GetReviewsResponse.java (100%) rename {blog/2023-02-27-protos => java}/InstallDetails.java (100%) rename {blog/2023-02-27-protos => java}/ListResponse.java (100%) rename {blog/2023-02-27-protos => java}/Logs$AndroidBuildProto.java (100%) rename {blog/2023-02-27-protos => java}/Logs$AndroidCheckinProto.java (100%) rename {blog/2023-02-27-protos => java}/PreFetch.java (100%) rename {blog/2023-02-27-protos => java}/Rating.java (100%) rename {blog/2023-02-27-protos => java}/Response.java (100%) rename {blog/2023-02-27-protos => java}/Review.java (100%) rename {blog/2023-02-27-protos => java}/ReviewResponse.java (100%) rename {blog/2023-02-27-protos => java}/SearchSuggest.java (100%) rename {blog/2023-02-27-protos => java}/ServerCommands.java (100%) rename {blog/2023-02-27-protos => java}/SplitDeliveryData.java (100%) rename {blog/2023-02-27-protos => java}/readme.md (100%) diff --git a/.ignore b/.ignore index 2ef297d..f3d360b 100644 --- a/.ignore +++ b/.ignore @@ -1 +1 @@ -docs/com/google +java diff --git a/blog/go.mod b/blog/go.mod new file mode 100644 index 0000000..9c323af --- /dev/null +++ b/blog/go.mod @@ -0,0 +1,3 @@ +module blog + +go 1.20 diff --git a/blog/readme.md b/blog/readme.md index ae84a04..7486932 100644 --- a/blog/readme.md +++ b/blog/readme.md @@ -17,7 +17,7 @@ versionCode | 25 versionName | 7.1.2 - https://apkmirror.com/apk/google-inc/google-play-store -- https://github.com/MCMrARM/Google-Play-API/blob/master/proto/gsf.proto +- https://apkmirror.com/apk/google-inc/google-services-framework ## How to install Android App Bundle? diff --git a/checkin.go b/checkin.go index 4cf8b5f..93b4d26 100644 --- a/checkin.go +++ b/checkin.go @@ -143,16 +143,6 @@ func (c Config) Checkin(native_platform string) (*Response, error) { return &Response{res}, nil } -// Checkin$AndroidCheckinResponse -type Device struct { - protobuf.Message -} - -// AndroidId -func (d Device) ID() (uint64, error) { - return d.Get_Fixed64(7) -} - type Native_Platform map[int64]string var Platforms = Native_Platform{ @@ -174,3 +164,13 @@ func (n Native_Platform) String() string { } return string(b) } + +// Checkin$AndroidCheckinResponse +type Device struct { + protobuf.Message +} + +// AndroidId +func (d Device) ID() (uint64, error) { + return d.Get_Fixed64(7) +} diff --git a/delivery.go b/delivery.go index 4814303..abed0a2 100644 --- a/delivery.go +++ b/delivery.go @@ -9,33 +9,6 @@ import ( "strconv" ) -type Delivery struct { - protobuf.Message -} - -func (d Delivery) Additional_File() []File_Metadata { - var files []File_Metadata - // .additionalFile - for _, file := range d.Get_Messages(4) { - files = append(files, File_Metadata{file}) - } - return files -} - -// .downloadUrl -func (d Delivery) Download_URL() (string, error) { - return d.Get_String(3) -} - -func (d Delivery) Split_Data() []Split_Data { - var splits []Split_Data - // .splitDeliveryData - for _, split := range d.Get_Messages(15) { - splits = append(splits, Split_Data{split}) - } - return splits -} - type File struct { Package_Name string Version_Code uint64 @@ -68,20 +41,6 @@ func (f File) OBB(file_type uint64) string { return string(b) } -type File_Metadata struct { - protobuf.Message -} - -// .downloadUrl -func (f File_Metadata) Download_URL() (string, error) { - return f.Get_String(4) -} - -// .fileType -func (f File_Metadata) File_Type() (uint64, error) { - return f.Get_Varint(1) -} - func (h Header) Delivery(app string, ver uint64) (*Delivery, error) { req, err := http.NewRequest( "GET", "https://play-fe.googleapis.com/fdfe/delivery", nil, @@ -131,16 +90,60 @@ func (h Header) Delivery(app string, ver uint64) (*Delivery, error) { return &del, nil } +// .downloadUrl +func (d Delivery) Download_URL() (string, error) { + return d.Get_String(3) +} + +func (d Delivery) Split_Data() []Split_Data { + var splits []Split_Data + // .splitDeliveryData + for _, split := range d.Get_Messages(15) { + splits = append(splits, Split_Data{split}) + } + return splits +} + +// AndroidAppDeliveryData +type Delivery struct { + protobuf.Message +} + +func (d Delivery) Additional_File() []App_File_Metadata { + var files []App_File_Metadata + // .additionalFile + for _, file := range d.Get_Messages(4) { + files = append(files, App_File_Metadata{file}) + } + return files +} + +// SplitDeliveryData type Split_Data struct { protobuf.Message } +// .id +func (s Split_Data) ID() (string, error) { + return s.Get_String(1) +} + // .downloadUrl func (s Split_Data) Download_URL() (string, error) { return s.Get_String(5) } -// .id -func (s Split_Data) ID() (string, error) { - return s.Get_String(1) +// AppFileMetadata +type App_File_Metadata struct { + protobuf.Message +} + +// .fileType +func (a App_File_Metadata) File_Type() (uint64, error) { + return a.Get_Varint(1) +} + +// .downloadUrl +func (a App_File_Metadata) Download_URL() (string, error) { + return a.Get_String(4) } diff --git a/details.go b/details.go index 6b57bf3..77abbcc 100644 --- a/details.go +++ b/details.go @@ -171,8 +171,6 @@ func (h Header) Details(app string) (*Details, error) { return &det, nil } -/////////////// - // .details.appDetails.installationSize func (d Details) Installation_Size() (uint64, error) { value, err := d.Get(13).Get(1).Get_Varint(9) @@ -190,3 +188,14 @@ func (d Details) File() []File_Metadata { } return files } + +// FileMetadata +// This is similar to AppFileMetadata, but notably field 4 is different. +type File_Metadata struct { + protobuf.Message +} + +// .fileType +func (f File_Metadata) File_Type() (uint64, error) { + return f.Get_Varint(1) +} diff --git a/blog/2023-02-27-protos/AndroidAppDeliveryData.java b/java/AndroidAppDeliveryData.java similarity index 100% rename from blog/2023-02-27-protos/AndroidAppDeliveryData.java rename to java/AndroidAppDeliveryData.java diff --git a/blog/2023-02-27-protos/AppDetails.java b/java/AppDetails.java similarity index 100% rename from blog/2023-02-27-protos/AppDetails.java rename to java/AppDetails.java diff --git a/blog/2023-02-27-protos/AppFileMetadata.java b/java/AppFileMetadata.java similarity index 100% rename from blog/2023-02-27-protos/AppFileMetadata.java rename to java/AppFileMetadata.java diff --git a/blog/2023-02-27-protos/Checkin$AndroidCheckinRequest.java b/java/Checkin$AndroidCheckinRequest.java similarity index 100% rename from blog/2023-02-27-protos/Checkin$AndroidCheckinRequest.java rename to java/Checkin$AndroidCheckinRequest.java diff --git a/blog/2023-02-27-protos/Checkin$AndroidCheckinResponse.java b/java/Checkin$AndroidCheckinResponse.java similarity index 100% rename from blog/2023-02-27-protos/Checkin$AndroidCheckinResponse.java rename to java/Checkin$AndroidCheckinResponse.java diff --git a/blog/2023-02-27-protos/Common.java b/java/Common.java similarity index 100% rename from blog/2023-02-27-protos/Common.java rename to java/Common.java diff --git a/blog/2023-02-27-protos/Containers.java b/java/Containers.java similarity index 100% rename from blog/2023-02-27-protos/Containers.java rename to java/Containers.java diff --git a/blog/2023-02-27-protos/DeliveryResponse.java b/java/DeliveryResponse.java similarity index 100% rename from blog/2023-02-27-protos/DeliveryResponse.java rename to java/DeliveryResponse.java diff --git a/blog/2023-02-27-protos/Details.java b/java/Details.java similarity index 100% rename from blog/2023-02-27-protos/Details.java rename to java/Details.java diff --git a/blog/2023-02-27-protos/DeviceConfiguration.java b/java/DeviceConfiguration.java similarity index 100% rename from blog/2023-02-27-protos/DeviceConfiguration.java rename to java/DeviceConfiguration.java diff --git a/blog/2023-02-27-protos/DocDetails.java b/java/DocDetails.java similarity index 100% rename from blog/2023-02-27-protos/DocDetails.java rename to java/DocDetails.java diff --git a/blog/2023-02-27-protos/DocV2.java b/java/DocV2.java similarity index 100% rename from blog/2023-02-27-protos/DocV2.java rename to java/DocV2.java diff --git a/blog/2023-02-27-protos/FileMetadata.java b/java/FileMetadata.java similarity index 100% rename from blog/2023-02-27-protos/FileMetadata.java rename to java/FileMetadata.java diff --git a/blog/2023-02-27-protos/GetReviewsResponse.java b/java/GetReviewsResponse.java similarity index 100% rename from blog/2023-02-27-protos/GetReviewsResponse.java rename to java/GetReviewsResponse.java diff --git a/blog/2023-02-27-protos/InstallDetails.java b/java/InstallDetails.java similarity index 100% rename from blog/2023-02-27-protos/InstallDetails.java rename to java/InstallDetails.java diff --git a/blog/2023-02-27-protos/ListResponse.java b/java/ListResponse.java similarity index 100% rename from blog/2023-02-27-protos/ListResponse.java rename to java/ListResponse.java diff --git a/blog/2023-02-27-protos/Logs$AndroidBuildProto.java b/java/Logs$AndroidBuildProto.java similarity index 100% rename from blog/2023-02-27-protos/Logs$AndroidBuildProto.java rename to java/Logs$AndroidBuildProto.java diff --git a/blog/2023-02-27-protos/Logs$AndroidCheckinProto.java b/java/Logs$AndroidCheckinProto.java similarity index 100% rename from blog/2023-02-27-protos/Logs$AndroidCheckinProto.java rename to java/Logs$AndroidCheckinProto.java diff --git a/blog/2023-02-27-protos/PreFetch.java b/java/PreFetch.java similarity index 100% rename from blog/2023-02-27-protos/PreFetch.java rename to java/PreFetch.java diff --git a/blog/2023-02-27-protos/Rating.java b/java/Rating.java similarity index 100% rename from blog/2023-02-27-protos/Rating.java rename to java/Rating.java diff --git a/blog/2023-02-27-protos/Response.java b/java/Response.java similarity index 100% rename from blog/2023-02-27-protos/Response.java rename to java/Response.java diff --git a/blog/2023-02-27-protos/Review.java b/java/Review.java similarity index 100% rename from blog/2023-02-27-protos/Review.java rename to java/Review.java diff --git a/blog/2023-02-27-protos/ReviewResponse.java b/java/ReviewResponse.java similarity index 100% rename from blog/2023-02-27-protos/ReviewResponse.java rename to java/ReviewResponse.java diff --git a/blog/2023-02-27-protos/SearchSuggest.java b/java/SearchSuggest.java similarity index 100% rename from blog/2023-02-27-protos/SearchSuggest.java rename to java/SearchSuggest.java diff --git a/blog/2023-02-27-protos/ServerCommands.java b/java/ServerCommands.java similarity index 100% rename from blog/2023-02-27-protos/ServerCommands.java rename to java/ServerCommands.java diff --git a/blog/2023-02-27-protos/SplitDeliveryData.java b/java/SplitDeliveryData.java similarity index 100% rename from blog/2023-02-27-protos/SplitDeliveryData.java rename to java/SplitDeliveryData.java diff --git a/blog/2023-02-27-protos/readme.md b/java/readme.md similarity index 100% rename from blog/2023-02-27-protos/readme.md rename to java/readme.md