fir-cli 2.0.16 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ad3ae892ccf32689209d90fd2d3053013fd1996365b20f02a82a6de0fde607
-  data.tar.gz: 784ba11435d2ad37d5762955753435672b5f6d087c23b2a0cf3602cd569d2310
+  metadata.gz: e15f62a0f7b559dac0e47d7aa637df6de1f267b950dc8d5c429f0539c0fd1f94
+  data.tar.gz: 8e42b4e2f0441651edd0871b8189b96fecfebbe068b6d5cd4408bc6e94d83137
 SHA512:
-  metadata.gz: b315d5ab9228498d1dd0aff2dc09d01d744bace237fc6cd79a2be2d1d947d101efad64297153356f03e5c08596ba5a6e00a5e220487a599ad65e1800859f2248
-  data.tar.gz: 275d8de0a02933dcd52d59c24303e1453bb5267b08fb79c9a70ff75a809307f2f8db2e75029bed4e2b698cb8e59bcb4d5720a2d3e0372ed576138db7f8ef5984
+  metadata.gz: df855650a9ba20ebf25a5b24b80802868a65c8883349639afe73ffe16c2adb00ec42483dc9627f023bb035b7b5c0422f4db8a2bc9bc97086c6055fb2d22f0e2f
+  data.tar.gz: bb152238bbd5b95af55dd6d1109087872edbb18fda3396ba71260bc596ceb4309bf2ecb3136f7969d0e6b1af73457190358c1b315f7da1cb16e788b013818a64

data/README.md

@@ -18,7 +18,9 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 - 现也有一个go 版本的 go-fir-cli 供大家使用, 无需安装依赖, 可以直接使用. 具体请访问  [https://github.com/PGYER/go-fir-cli](https://github.com/PGYER/go-fir-cli). 注意! 该版本功能并不与fir-cli 完全重合.
 
 # 最近更新
-- (2.0.16) 更新了 thor 
+- (2.0.18) 修复域名导致的飞书发送失败的问题
+- (2.0.17) 增加了上传百分比显示
+- (2.0.16) 更新了 thor
 - (2.0.15) 更换了 API 域名
 - (2.0.14) 第三方通知加入了 app 类型, 第三方报错将忽略异常继续运行
 - (2.0.13) 修正了企业微信通知的bug

data/fir-cli.gemspec

@@ -26,19 +26,10 @@ Gem::Specification.new do |spec|
      / __/ _/ // _, _/_____/ /___/ /____/ /
     /_/   /___/_/ |_|      \____/_____/___/
 
-  ## 更新记录
-  - (2.0.16) 更新了 thor
-  - (2.0.15) 修改了API域名
-  - (2.0.14) 第三方通知加入了 app 类型, 第三方报错将不再直接报出异常
-  - (2.0.13) 修复了无法跳过企业微信通知逻辑的bug
-  - (2.0.12) 修复因为钉钉机器人不再支持base64导致无法显示二维码，另外开始支持钉钉加签方式的鉴权， 参数为 --dingtalk_secret
-  - (2.0.11) 兼容了 ruby 3.0 版本, 增加了环境变量FEISHU_TIMEOUT，可以多给飞书一些超时时间
-  - (2.0.10) 飞书支持了 V2 版本的机器人推送
-  - (2.0.9) publish 支持了 企业微信通知 可以使用 --wxwork_access_token 或 --wxwork_webhook, 增加了回调超时时间至20秒
-  - (2.0.8) publish 支持 飞书通知, 可使用 `feishu_access_token` 和 `feishu_custom_message`, 详情见 `fir publish --help`
-  - (2.0.7) 修复了提示 token 有问题的错误
+  ##
   - [fir-cli](https://github.com/firhq/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
+  - 同时提供 go 版本的 fir-cli 二进制版本无依赖  [fir-cli-go](https://github.com/PGYER/go-fir-cli/releases)
   )
 
   spec.add_development_dependency 'bundler'

data/lib/fir/patches/progress.rb

@@ -0,0 +1,42 @@
+require 'net/http'
+require 'tempfile'
+require 'securerandom'
+
+class Net::HTTP::UploadProgress
+  attr_reader :upload_size
+
+  def initialize(req, &block)
+    @req = req
+    @callback = block
+    @upload_size = 0
+    if req.body_stream
+      @io = req.body_stream
+      req.body_stream = self
+    elsif req.instance_variable_get(:@body_data)
+      raise NotImplementedError if req.chunked?
+      raise NotImplementedError if /\Amultipart\/form-data\z/i !~ req.content_type
+      opt = req.instance_variable_get(:@form_option).dup
+      opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
+      req.set_content_type(req.content_type, boundary: opt[:boundary])
+      file = Tempfile.new('multipart')
+      file.binmode
+      req.send(:encode_multipart_form_data, file, req.instance_variable_get(:@body_data), opt)
+      file.rewind
+      req.content_length = file.size
+      @io = file
+      req.body_stream = self
+    else
+      raise NotImplementedError
+    end
+  end
+
+  def readpartial(maxlen, outbuf)
+    begin
+      str = @io.readpartial(maxlen, outbuf)
+    ensure
+      @callback.call(self) unless @upload_size.zero?
+    end
+    @upload_size += str.length
+    str
+  end
+end

data/lib/fir/patches.rb

@@ -8,3 +8,4 @@ require_relative './patches/native_patch'
 require_relative './patches/os_patch'
 require_relative './patches/try'
 require_relative './patches/default_headers'
+require_relative './patches/progress'

data/lib/fir/util/ali_uploader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative './app_uploader'
-# require 'byebug'
+
 
 module FIR
   class AliUploader < AppUploader
@@ -16,7 +16,7 @@ module FIR
         icon_info = uploading_icon_info
 
         logger.debug "icon_url = #{icon_url}, icon_info = #{icon_info}"
-        put_file(icon_url, uploading_icon_info, uploading_info[:cert][:icon][:custom_headers])
+        put_file(icon_url, uploading_icon_info, uploading_info[:cert][:icon][:custom_headers], false)
         callback_to_api(callback_url, callback_icon_information)
       end
     rescue StandardError => e
@@ -50,14 +50,43 @@ module FIR
 
     protected
 
-    def put_file(url, file, headers)
-      RestClient::Request.execute(
-        method: 'PUT',
-        url: url,
-        payload: file,
-        headers: headers,
-        timeout: 300
-      )
+    def put_file(url, file, headers, need_progress = true)
+
+      uri = URI(url)
+      hostname = uri.hostname 
+
+
+      File.open(file_path, 'rb') do |io|
+        t = Time.now
+        http = Net::HTTP.new(hostname, 443)
+        http.use_ssl = true
+        req = Net::HTTP::Put.new(uri.request_uri, headers)
+        req.content_length = io.size
+        req.body_stream = io
+        Net::HTTP::UploadProgress.new(req) do |progress|
+          if need_progress
+            if progress.upload_size == io.size
+              puts "upload finished"
+            else
+              if Time.now - t > 0.5
+                puts "progress: #{ ((progress.upload_size / io.size.to_f) * 100).round(2) }%"
+                t  = Time.now
+              end
+            end
+          end
+        end
+        res = http.request(req)
+      end
+
+
+
+      # RestClient::Request.execute(
+      #   method: 'PUT',
+      #   url: url,
+      #   payload: file,
+      #   headers: headers,
+      #   timeout: 300
+      # )
     end
 
     def callback_url

data/lib/fir/util/feishu_helper.rb

@@ -78,7 +78,7 @@ class FeishuHelper
   end
 
   def fetch_image_access_token
-    answer = DefaultRest.post(fir_api[:fetch_feishu_v3_token] || 'http://fir-api.admqr.com/user/fetch_feishu_v3_token', {})
+    answer = DefaultRest.post(fir_api[:user_feishu_access_token] || 'http://api.appmeta.cn/user/fetch_feishu_v3_token', {})
     answer[:feishu_v3_token]
   end
 

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "2.0.16"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.18
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -224,6 +224,7 @@ files:
 - lib/fir/patches/instance_variables.rb
 - lib/fir/patches/native_patch.rb
 - lib/fir/patches/os_patch.rb
+- lib/fir/patches/progress.rb
 - lib/fir/patches/try.rb
 - lib/fir/util.rb
 - lib/fir/util/ali_uploader.rb
@@ -271,14 +272,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  - (2.0.16) 更新了 thor\n  - (2.0.15) 修改了API域名\n  - (2.0.14) 第三方通知加入了 app
-  类型, 第三方报错将不再直接报出异常\n  - (2.0.13) 修复了无法跳过企业微信通知逻辑的bug\n  - (2.0.12) 修复因为钉钉机器人不再支持base64导致无法显示二维码，另外开始支持钉钉加签方式的鉴权，
-  参数为 --dingtalk_secret\n  - (2.0.11) 兼容了 ruby 3.0 版本, 增加了环境变量FEISHU_TIMEOUT，可以多给飞书一些超时时间\n
-  \ - (2.0.10) 飞书支持了 V2 版本的机器人推送\n  - (2.0.9) publish 支持了 企业微信通知 可以使用 --wxwork_access_token
-  或 --wxwork_webhook, 增加了回调超时时间至20秒\n  - (2.0.8) publish 支持 飞书通知, 可使用 `feishu_access_token`
-  和 `feishu_custom_message`, 详情见 `fir publish --help`\n  - (2.0.7) 修复了提示 token 有问题的错误\n
-  \ - [fir-cli](https://github.com/firhq/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
-  request\n  "
+  \ ##\n  - [fir-cli](https://github.com/firhq/fir-cli) 已经开源\n  - 欢迎 fork, issue 和
+  pull request\n  - 同时提供 go 版本的 fir-cli 二进制版本无依赖  [fir-cli-go](https://github.com/PGYER/go-fir-cli/releases)\n
+  \ "
 rdoc_options: []
 require_paths:
 - lib
@@ -293,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: fir.im command tool