pindo 4.7.5 → 4.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8159df0872fa738e51e47c58871fd774599288933ad5b0abb06a1f75d034576
-  data.tar.gz: 7092870505178a36f55cc54d5eaa8248314a0f5c0af5188f446dab6e42bb65d0
+  metadata.gz: d67d718e2507fa330a19b44df9b7abefb0ae417dac58a4c5d431cf3c9f63dc13
+  data.tar.gz: 3377d33ac73c5c5024beb48de2fa30d0b1813f0637eae2d990a30eb0ae37f9f7
 SHA512:
-  metadata.gz: bb1cf7c60caf44e8d92ee0d0cab2118c63fd842c4d0a27a3d4e0a0b33ac03d01a3a4b59b29c7589f30476f957dcd5011c4b0753bb155aa1efe2762fa19730ee3
-  data.tar.gz: b734c08d987650edd74d00b63a1c7bd9eec5dd7ba5ba947691f5a82a539b04e09fb3d96d76d5fde205f6fbca1bab6ec23137afc5503ad0cd42a9d8edc6b0a8d7
+  metadata.gz: '01038d7dfe0a9b0705056798db4cdbd6897baadb944c9d9808910526a7dead73d5f5573efa73bd0ef9d7dad5dd0e14c28628046b5dbb658571f5865afff2cf86'
+  data.tar.gz: c23e4788703dc11aa106d94c12c8c28ade2d5e0c72241b77bd75263b1e36115abb0a4ff1b633d37ccd9a784f51252f45e1ea8899ce676a91e832b775d386b760

data/lib/pindo/base/aeshelper.rb

@@ -1,4 +1,6 @@
+
 require 'openssl'
+require 'match'
 
 module Pindo
 

data/lib/pindo/client/aws3sclient.rb

@@ -113,7 +113,6 @@ module Pindo
         end
 
         object_key = upload_path + file_uuid + extension
-
         puts "上传路径: #{object_key}"
         puts
         

data/lib/pindo/client/httpclient.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'json'
 require 'faraday'
 require 'pindo/base/aeshelper'
+require 'faraday/retry'
 
 module Pindo
  
@@ -24,8 +25,18 @@ module Pindo
             password: ENV['HTTP_PROXY_PASSWORD']
           }
 
-          con = Faraday.new 
-          con.proxy = proxy_options.compact if proxy_options[:uri]
+          retry_options = {
+            max: 3,                   # Retry a failed request up to 5 times
+            interval: 0.5,            # First retry after 0.5s
+            backoff_factor: 2,        # Double the delay for each subsequent retry
+            interval_randomness: 0.5, # Specify "jitter" of up to 50% of interval
+          }
+
+          con = Faraday.new do |config|
+            config.request :retry, retry_options
+            config.proxy = proxy_options.compact if proxy_options[:uri]  
+          end
+          
           con
       end
 

data/lib/pindo/client/pgyeruploadclient.rb

@@ -0,0 +1,291 @@
+
+require 'uri'
+require 'json'
+require 'faraday'
+require 'securerandom'
+require 'pindo/base/aeshelper'
+require 'typhoeus'
+
+module Pindo
+
+
+  class PgyerUploadClient
+
+
+      attr_accessor :token
+
+      attr_accessor :region
+      attr_accessor :bucket_name
+
+      attr_accessor :default_url
+      attr_accessor :attach_url
+
+
+      def initialize()
+
+          begin
+
+            @pgyer_token_file = File.join(File::expand_path(Pindoconfig.instance.pindo_dir), ".pgyer_token")
+            config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "pgyer_client_config.json")
+            config_json = JSON.parse(File.read(config_file))
+
+            @region = config_json["region"]
+            @bucket_name = config_json["bucket_name"]
+            @default_url = config_json["default_url"]
+            @attach_url = config_json["attach_url"]
+
+            @use_local_wechat_url = config_json["use_local_wechat_url"]
+            @baseurl = config_json["pgyerapps_base_url"]
+            @request_config = config_json["pgyerapps_req_config"]
+            @pgyer_aes_key = config_json["pgyerapps_aes_key"]
+
+            @token = load_token
+
+          rescue => error
+              raise Informative,  "PgyerUploadClient 初始化失败！"
+          end
+
+      end
+
+      def load_token()
+          token = nil
+          if File.exist?(@pgyer_token_file)
+              begin
+                data = File.read(@pgyer_token_file)
+
+                data_string = AESHelper::aes_128_ecb_decrypt(@pgyer_aes_key, data)
+                temp_token = data_string
+                temp_token = JSON.parse(data_string)
+                if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
+                    token = temp_token
+                end
+              rescue => error
+                  raise Informative,  "PgyerUploadClient 加载pgyer token 失败!!!"
+              end
+          end
+          return token
+      end
+
+      def upload_file(binary_file:nil, isAttach:false)
+
+        extension = File.extname(binary_file)
+        filename = File.basename(binary_file)
+        filesize = File.size(binary_file)
+        size_level = 1024 * 1024
+        file_bytes = File.binread(binary_file)
+        checksum = Digest::MD5.hexdigest(file_bytes)
+        file_uuid = SecureRandom.uuid
+        total_m = sprintf("%.2f", 1.00 * filesize / 1024 /1024 )
+
+
+
+        upload_path = @default_url
+        content_disposition = nil
+        if isAttach
+            upload_path = @default_url + @attach_url
+            content_disposition = "attachment; filename=#{filename}"
+        end
+
+        object_key = upload_path + file_uuid + extension
+
+        puts "文件路径: #{binary_file}"
+        puts "文件大小: #{total_m}M"
+        puts "上传路径: #{object_key}"
+        puts
+
+
+        @upload_total_size = filesize
+
+
+        upload_result = nil
+
+        file_size_param = 1.00 * filesize / 1024 /1024
+        result_data = post_upload_url_req(upload_key:object_key, file_size:file_size_param.ceil)
+
+        upload_id= result_data["data"]["uploadId"]
+        upload_params_list = result_data["data"]["uploadParamsList"]
+
+        
+
+        Funlog.instance.fancyinfo_start("开始上传...")
+
+        eTags = []
+        eTags = single_task_upload_data_req(binary_file:binary_file, upload_params_list:upload_params_list)
+
+        result_data = post_upload_finish_req(upload_key:object_key, upload_id:upload_id, eTags:eTags)
+
+        if result_data["code"] == 200
+            upload_result = object_key
+            # set_progress(filesize, filesize)
+            Funlog.instance.fancyinfo_success("文件#{binary_file} 上传成功! 😎😎😎")
+        else
+            upload_result = nil
+            Funlog.instance.fancyinfo_error("文件#{binary_file} 上传失败! 😭😭😭")
+        end
+
+        return upload_result
+
+      end
+
+      def single_task_upload_data_req(binary_file:nil, upload_params_list:nil)
+        filesize = File.size(binary_file)
+        eTags = []
+        if !upload_params_list.nil? && upload_params_list.length > 0
+            for i in 0..upload_params_list.length-1 do
+                part_result = single_task_upload_part_data_req(filesize:filesize, binary_file:binary_file, upload_url:upload_params_list[i]["signedUrl"], part_no:upload_params_list[i]["partNo"])
+                eTag_item = { partNumber: upload_params_list[i]["partNo"], tag: part_result}
+                eTags << eTag_item
+            end
+        end
+
+        return eTags
+      end
+
+      def single_task_upload_part_data_req(filesize:nil, binary_file:nil, upload_url:nil, part_no:nil)
+
+          # puts "start upload part #{part_no} -----"
+
+          file_size_ele = 1024 * 1024 * 5  #5M
+          start_position = file_size_ele * (part_no -1)
+          if part_no * file_size_ele > filesize
+            read_length = filesize - start_position
+          else
+            read_length = file_size_ele
+          end
+
+          file = File.open(binary_file, "rb")
+          file.seek(start_position)
+          put_data = file.read(read_length)
+
+        
+          request = nil
+
+          proxy_options = {
+            proxy: ENV['http_proxy'] || ENV['https_proxy'], 
+            proxyuserpwd: "#{ENV['HTTP_PROXY_USER']}:#{ENV['HTTP_PROXY_PASSWORD']}"
+          }
+          
+          if proxy_options[:proxy]
+            request = Typhoeus::Request.new(
+              upload_url,
+              method: :put,
+              proxy: proxy_options[:proxy],
+              proxyuserpwd: proxy_options[:proxyuserpwd],
+              :body => put_data,
+              :headers => {
+                'Content-Type' => 'application/octet-stream',
+                'token' => @token['token'],
+                'Content-Length' => read_length.to_s
+              }
+            )
+          else
+            request = Typhoeus::Request.new(
+              upload_url,
+              method: :put,
+              :body => put_data,
+              :headers => {
+                'Content-Type' => 'application/octet-stream',
+                'token' => @token['token'],
+                'Content-Length' => read_length.to_s
+              }
+            )
+          end
+
+
+          @upload_num = start_position
+          request.on_progress do |dltotal, dlnow, ultotal, ulnow|
+              # puts "dltotal (#{dltotal}), dlnow (#{dlnow}), ultotal (#{ultotal}), ulnow (#{ulnow})"
+              if ulnow
+                @upload_num = start_position + ulnow
+                set_progress(@upload_num, filesize)
+              end
+          end
+
+          return_data = nil
+          request.on_complete do |response|
+              if response.success?
+                # puts "on_complete success"
+                return_data = response.headers["ETag"]
+              else
+                # puts "on_complete fail"
+              end
+          end
+
+          request.run
+
+          return  return_data
+
+      end
+
+      def post_upload_finish_req(upload_key:nil, upload_id:nil, eTags:nil)
+
+          boss_url = @baseurl + @request_config["multi_signed_url_upload"]
+
+          body_params = {
+              functionName:"finish",
+              fileKey:upload_key,
+              uploadId:upload_id,
+              tags:eTags
+          }
+
+          con = HttpClient.create_instance_with_proxy
+          res = con.post do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+              req.body = body_params.to_json
+          end
+
+
+          result_data = nil
+          if !res.body.nil?
+              result_data = JSON.parse(res.body)
+          end
+
+          return  result_data
+
+      end
+
+
+        def post_upload_url_req(upload_key:nil, file_size:nil)
+
+          # puts "post_upload_url_req start ..."
+          # puts "file_size: #{file_size} MB"
+          boss_url = @baseurl + @request_config["multi_signed_url_upload"]
+
+          body_params = {
+              functionName:"start",
+              fileKey:upload_key,
+              fileSize:file_size
+          }
+
+          con = HttpClient.create_instance_with_proxy
+          res = con.post do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+              req.body = body_params.to_json
+          end
+
+
+          result_data = nil
+          if !res.body.nil?
+              result_data = JSON.parse(res.body)
+          end
+
+          # puts JSON.pretty_generate(result_data)
+
+          return  result_data
+
+      end
+
+      def set_progress(index_num, total_num,  char ='>' )
+          progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
+          total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 )
+          index = 40.0 * index_num / total_num
+          upload_message = "已上传:#{progress_str}\%【" + (char * (index/1).floor).ljust(40.0, '_') +  "】Total: #{total_size} M"
+          Funlog.instance.fancyinfo_update(upload_message)
+      end
+
+  end
+end

data/lib/pindo/command/deploy/bundleid.rb

@@ -1,7 +1,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
-require "fastlane"
+# require "fastlane"
 require "spaceship"
 
 module Pindo

data/lib/pindo/command/deploy/cert.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'match'
 require 'pindo/module/build/swarkhelper'
 require 'pindo/module/cert/xcodecerthelper'
 require 'pindo/module/cert/certhelper'

data/lib/pindo/command/deploy/quswark.rb

@@ -2,7 +2,6 @@ require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'xcodeproj'
-require 'match'
 require 'yaml'
 
 module Pindo

data/lib/pindo/command/dev/createbuild.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'match'
 require 'pindo/client/giteeclient'
 
 module Pindo

data/lib/pindo/command/utils/device.rb

@@ -58,91 +58,93 @@ module Pindo
 
 
                 def login
-                    Spaceship::Portal.login(pindo_single_config.demo_apple_id)
-                    Spaceship::Portal.select_team
+                    # Spaceship::Portal.login(pindo_single_config.demo_apple_id)
+                    # Spaceship::Portal.select_team
                 end
 
                 def fetch_device
 
 
-                    devices = Spaceship::Portal.device.all(include_disabled: true).select do |device|
-                        device.enabled?
-                    end
-                    mac_disabled_devices = Spaceship::Portal.device.all(mac: true, include_disabled: true).select do |device|
-                        device.enabled?
-                    end
+                    # devices = Spaceship::Portal.device.all(include_disabled: true).select do |device|
+                    #     device.enabled?
+                    # end
+                    # mac_disabled_devices = Spaceship::Portal.device.all(mac: true, include_disabled: true).select do |device|
+                    #     device.enabled?
+                    # end
 
-                    my_total_devices = {}
+                    # my_total_devices = {}
 
-                    devices.each do |item|
-                        device_item =  DeviceItem.new
-                        device_item.name = item.name
-                        device_item.name = device_item.name.downcase
-                        device_item.udid = item.udid
-                        device_item.platform = item.platform
-                        device_item.device_model = item.model
-                        device_item.device_type = item.device_type
+                    # devices.each do |item|
+                    #     device_item =  DeviceItem.new
+                    #     device_item.name = item.name
+                    #     device_item.name = device_item.name.downcase
+                    #     device_item.udid = item.udid
+                    #     device_item.platform = item.platform
+                    #     device_item.device_model = item.model
+                    #     device_item.device_type = item.device_type
 
-                        device_item.device_description = ""
-                        my_total_devices[item.udid] = device_item
-                    end
+                    #     device_item.device_description = ""
+                    #     my_total_devices[item.udid] = device_item
+                    # end
 
-                    mac_disabled_devices.each do |item|
-                        # puts item
-                        device_item =  DeviceItem.new
-                        device_item.name = item.name
-                        device_item.name = device_item.name.downcase
-                        device_item.udid = item.udid
-                        device_item.platform = item.platform
-                        device_item.device_model = item.model
-                        device_item.device_type = item.device_type
-                        device_item.device_description = ""
-                        my_total_devices[item.udid] = device_item
-                    end
+                    # mac_disabled_devices.each do |item|
+                    #     # puts item
+                    #     device_item =  DeviceItem.new
+                    #     device_item.name = item.name
+                    #     device_item.name = device_item.name.downcase
+                    #     device_item.udid = item.udid
+                    #     device_item.platform = item.platform
+                    #     device_item.device_model = item.model
+                    #     device_item.device_type = item.device_type
+                    #     device_item.device_description = ""
+                    #     my_total_devices[item.udid] = device_item
+                    # end
 
 
 
-                    use_devices =  read_user_csv()
+                    # use_devices =  read_user_csv()
 
-                    use_devices.each do |key, item|
-                        if !my_total_devices[key].nil?
+                    # use_devices.each do |key, item|
+                    #     if !my_total_devices[key].nil?
 
-                            if !item.device_description.nil?
-                                my_total_devices[key].device_description = item.device_description
-                            end
-                            if my_total_devices[key].device_description.nil? || my_total_devices[key].device_description.eql?("")
-                                my_total_devices[key].device_description = item.name.to_s.downcase
-                            end
+                    #         if !item.device_description.nil?
+                    #             my_total_devices[key].device_description = item.device_description
+                    #         end
+                    #         if my_total_devices[key].device_description.nil? || my_total_devices[key].device_description.eql?("")
+                    #             my_total_devices[key].device_description = item.name.to_s.downcase
+                    #         end
 
-                            if my_total_devices[key].device_model.nil? || my_total_devices[key].device_model.eql?("")
-                                my_total_devices[key].device_model = item.device_model
+                    #         if my_total_devices[key].device_model.nil? || my_total_devices[key].device_model.eql?("")
+                    #             my_total_devices[key].device_model = item.device_model
 
-                            end
-                            if my_total_devices[key].device_model.nil? || my_total_devices[key].device_model.eql?("")
-                                my_total_devices[key].device_model = item.name.to_s.downcase
-                            end
-                        end
-                    end
+                    #         end
+                    #         if my_total_devices[key].device_model.nil? || my_total_devices[key].device_model.eql?("")
+                    #             my_total_devices[key].device_model = item.name.to_s.downcase
+                    #         end
+                    #     end
+                    # end
 
 
 
 
-                    pgyer_devices =  read_apppgyer_csv()
-                    pgyer_devices.each do |key, item|
-                        if !my_total_devices[key].nil?
+                    # pgyer_devices =  read_apppgyer_csv()
+                    # pgyer_devices.each do |key, item|
+                    #     if !my_total_devices[key].nil?
+
+                    #         if !item.device_description.nil?
+                    #             my_total_devices[key].device_description = item.device_description
+                    #         end
+                    #     end
+                    # end
 
-                            if !item.device_description.nil?
-                                my_total_devices[key].device_description = item.device_description
-                            end
-                        end
-                    end
 
+                    my_total_devices =  read_user_csv()
 
-                    # my_total_devices =  read_user_csv()
+                    JSON.pretty_generate(my_total_devices)
 
 
                     write_appstore_text(devices:my_total_devices)
-                    # write_user_csv(devices:my_total_devices)
+                    write_user_csv(devices:my_total_devices)
                     write_apppgyer_csv(devices:my_total_devices)
 
                 end
@@ -155,11 +157,13 @@ module Pindo
                     str_text = "DEVICE ID\tDEVICE NAME\tDEVICE PLATFORM\n"
                     devices.each do |key, device|
                         if device.platform.nil? || !(device.platform.to_s.eql?("ios") || device.platform.to_s.eql?("mac"))
-                            if device.device_type.to_s.downcase!.eql?("mac")
+    
+                            if device.device_type.to_s.strip.downcase.eql?("mac")
                                 device.platform = "mac"
                             else
                                 device.platform = "ios"
                             end
+
                         end
                         str = String.new
                         str = str + device.udid
@@ -268,7 +272,7 @@ module Pindo
                             line_num += 1
                         end
                     end
-                    # puts devices
+                    puts devices
                     return devices
 
                 end

data/lib/pindo/module/cert/certhelper.rb

@@ -1,5 +1,5 @@
 
-require 'match'
+
 require 'openssl'
 require 'pindo/base/aeshelper'
 require 'pindo/module/cert/keychainhelper'

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -5,7 +5,8 @@ require 'json'
 require 'faraday'
 require "rqrcode"
 require 'pindo/client/pgyerclient'
-require 'pindo/client/aws3sclient'
+# require 'pindo/client/aws3sclient'
+require 'pindo/client/pgyeruploadclient'
 
 
 module Pindo
@@ -171,7 +172,8 @@ module Pindo
                 puts description
 
 
-                aws_client = AWSS3Client.new
+                # aws_client = AWSS3Client.new
+                aws_client = PgyerUploadClient.new
                 upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
 
                 attach_key_url = nil
@@ -202,6 +204,8 @@ module Pindo
                     })
 
                     return result_data
+                else
+                    raise Informative, "上传失败!"
                 end
 
 

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.5"
+  	VERSION = "4.7.6"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.5
+  version: 4.7.6
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -36,60 +36,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.3
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.15.2
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.211'
+        version: '2.220'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.220.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.211'
+        version: '2.220'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.220.0
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -151,25 +131,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.123.0
+        version: 1.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.123.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.123.0
+        version: 1.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.123.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - lib/pindo/client/giteeclient.rb
 - lib/pindo/client/httpclient.rb
 - lib/pindo/client/pgyerclient.rb
+- lib/pindo/client/pgyeruploadclient.rb
 - lib/pindo/client/tgateclient.rb
 - lib/pindo/command.rb
 - lib/pindo/command/appstore.rb