ruby-cqhttp 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e4e75d7c60595d1c8b7819e463ef23f400300735a747e6176e12ea6e7d3591
-  data.tar.gz: 88a63f60407888c0ba0a258ccbca71253e84492268bfd87dc193e319554c40dd
+  metadata.gz: dc16893adf2a71ea90af191c3d83c6bbea44417d58b661914f10d1a38284b6fa
+  data.tar.gz: b25414575ff09da58a404ec81fca6832a195f9935b3a5c0e9da1f629db002479
 SHA512:
-  metadata.gz: 9ad14175baf0305ba55f86f33446772336939fa89f3163b274906100c8d520bb9e8a51174b6e92793e4d4dc375df092bf35fa4ad27f6e9dd28f18da06c9f3249
-  data.tar.gz: 31f469412b075c00bb95f6ec3acb1190a20647391fba290cb06f8449669eddb570612de507a689fe1c5993f7695c8d12af5ff3771265543387ca8e5f0a5e1b8d
+  metadata.gz: 83bd2c919fd51fe8f356fc91ab2c4a2e04b4f778ff70b492fe0f5d18b07165fb3bf201caecfc818ecca812fd1c7f1e200e6d6b6407233b7d9e34aeeadefbd9e2
+  data.tar.gz: d0dc12c9582ca47c100886c80c4baa2eed56e44a44b42f09d8a1f7b80da01b61619ed7aa652546c9902d9c6c737742987835e6680d83466905bbbb1fbc936938

data/.gitignore

@@ -0,0 +1,2 @@
+ruby-cqhttp-*.gem
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'faye-websocket'
+gem 'eventmachine'
+gem 'json'
+gem 'event_emitter'
+gem 'uri', '~> 0.10.1'

data/README.md

@@ -0,0 +1,59 @@
+# RUBY-CQHTTP
+
+[![Gem Version](https://badge.fury.io/rb/ruby-cqhttp.svg)](https://badge.fury.io/rb/ruby-cqhttp)
+[![yard docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://www.rubydoc.info/gems/ruby-cqhttp)
+
+用 Ruby 写 QQ 机器人！
+
+## 使用
+
+安装
+
+    $ gem install ruby-cqhttp
+
+或者
+
+在 `Gemfile` 中添加
+
+```ruby
+gem 'eventmachine'
+```
+
+然后运行
+
+    $ bundle
+
+安装
+
+## 示例
+
+```ruby
+require 'ruby-cqhttp'
+
+CQHttp::Bot.connect host: '127.0.0.1', port: 6700 do |bot|
+  bot.on :logged do |botQQ|
+    CQHttp::Utils.log('我开了欸')
+  end
+
+  bot.on :message do |msg, sdr, tar|
+    CQHttp::Utils.log('我收到消息了欸')
+  end
+
+  # 获取并发出好友撤回的消息
+  bot.on :notice do |notice_type, data|
+    if notice_type == 'friend_recall'
+      req = CQHttp::Api.get_msg data['message_id']
+      bot.sendPrivateMessage req['message'], req['sender']['user_id']
+    end
+  end
+  
+  # 自动同意群邀请和好友请求
+  bot.on :request do |request_type, sub_type, flag|
+    if request_type == 'group'
+      CQHttp::Api.acceptGroupRequest(flag, sub_type) if sub_type == 'invite'
+    elsif request_type == 'friend'
+      CQHttp::Api.acceptFriendRequest(flag)
+    end
+  end
+end
+```

data/lib/Bot/Api.rb

@@ -1,103 +1,113 @@
 module CQHttp
   class Api
     attr_accessor :apiUrl
-
-    @apiUrl = 'http://127.0.0.1:5700'
     class << self
+      def setUrl(apiIp:'127.0.0.1', apiPort:5700)
+        @apiUrl = URI::HTTP.build(host: apiIp, port: apiPort)
+      end
       def setGroupName(group_id, group_name, url=@apiUrl)
+        url.path = "/set_group_name"
         ret = { group_id: group_id.to_i, group_name: group_name }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/set_group_name", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '设置群头像成功'
+          Utils.log '设置群头像成功'
         else
-          Utils.log Time.new, '×', '设置群头像失败'
+          Utils.log '设置群头像失败', Logger::WARN
         end
       end
 
       def getImage(file, url=@apiUrl)   # UNFINSHED
+        url.path = "/get_image"
         ret = { file: file }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/get_image", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '下载图片成功'
+          Utils.log '下载图片成功'
           return data['data']
         else
-          Utils.log Time.new, '×', '下载图片失败'
+          Utils.log '下载图片失败', Logger::WARN
         end
       end
 
       def get_msg(message_id, url=@apiUrl)   # UNFINSHED
+        url.path = "/get_msg"
         ret = { message_id: message_id }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/get_msg", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '消息获取成功'
+          Utils.log '消息获取成功'
           return data['data']
         else
-          Utils.log Time.new, '×', '消息获取失败'
+          Utils.log '消息获取失败', Logger::WARN
         end
         
       end
 
       def sendPrivateMessage(msg, user_id, url=@apiUrl)
+        url.path = "/send_private_msg"
         ret = { user_id: user_id, message: msg }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/send_private_msg", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           message_id = data['data']['message_id']
-          Utils.log Time.new, '↑', "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
+          Utils.log "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
           return message_id
         else
-          Utils.log Time.new, '×', '发送消息失败'
+          Utils.log '发送消息失败', Logger::WARN
         end
       end
 
       def sendGroupMessage(msg, group_id, url=@apiUrl)
+        url.path = "/send_group_msg"
         ret = { group_id: group_id, message: msg }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/send_group_msg", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          message_id = data['data']['group_id']
-          Utils.log Time.new, '↑', "发送至群 #{user_id} 的消息: #{msg} (#{message_id})"
+          message_id = data['data']['message_id']
+          Utils.log "发送至群 #{group_id} 的消息: #{msg} (#{message_id})"
           return message_id
         else
-          Utils.log Time.new, '×', '发送消息失败'
+          Utils.log '发送消息失败', Logger::WARN
         end
       end
 
       def acceptFriendRequest(flag, url=@apiUrl)
+        url.path = "/set_friend_add_request"
         ret = { flag: flag, approve: true }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/set_friend_add_request", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '已通过好友请求'
+          Utils.log '已通过好友请求'
         else
-          Utils.log Time.new, '×', '请求通过失败'
+          Utils.log '请求通过失败', Logger::WARN
         end
       end
 
       def refuseFriendRequest(flag, url=@apiUrl)
+        url.path = "/set_friend_add_request"
         ret = { flag: flag, approve: false }.to_json
-        user_id = JSON.parse(Utils.httpPost("#{url}/set_friend_add_request", ret))
+        user_id = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '已拒绝好友请求'
+          Utils.log '已拒绝好友请求'
         else
-          Utils.log Time.new, '×', '请求拒绝失败'
+          Utils.log '请求拒绝失败', Logger::WARN
         end
       end
 
       def acceptGroupRequest(flag, sub_type, url=@apiUrl)
+        url.path = "/set_group_add_request"
         ret = { flag: flag, sub_type: sub_type, approve: true }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/set_group_add_request", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '已通过加群请求'
+          Utils.log '已通过加群请求'
         else
-          Utils.log Time.new, '×', '请求通过失败'
+          Utils.log '请求通过失败', Logger::WARN
         end
       end
 
       def refuseGroupRequest(flag, sub_type, url=@apiUrl)
+        url.path = "/set_group_add_request"
         ret = { flag: flag, sub_type: sub_type, approve: false }.to_json
-        data = JSON.parse(Utils.httpPost("#{url}/set_group_add_request", ret))
+        data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
-          Utils.log Time.new, '√', '已拒绝加群请求'
+          Utils.log '已拒绝加群请求'
         else
-          Utils.log Time.new, '×', '请求拒绝失败'
+          Utils.log '请求拒绝失败', Logger::WARN
         end
       end
     end

data/lib/Bot/Bot.rb

@@ -2,9 +2,11 @@ module CQHttp
   class Bot
     Sender = Struct.new(:age, :member_role, :card, :qqlevel, :nickname, :title, :sex)
     Target = Struct.new(:messagetype, :time, :group_id, :user_id, :message_id, :message)
-
-    def self.connect(url, debugmode=false)
-      client = ::CQHttp::Bot::WebSocket.new(url, debugmode)
+    def self.connect(host:, port:)
+      url = URI::WS.build(host: host, port: port)
+      Api.setUrl()
+      Utils.log '正在连接到 ' << url.to_s
+      client = ::CQHttp::Bot::WebSocket.new(url)
       yield client if block_given?
       client.connect
       client
@@ -12,30 +14,25 @@ module CQHttp
 
     class WebSocket
       attr_accessor :url
-      attr_accessor :debugmode
       attr_accessor :selfID
 
       include EventEmitter
 
-      def initialize(url, debugmode)
+      def initialize(url)
         @url = url
-        @debugmode = debugmode
       end
 
       def connect
         EM.run do
-          @ws = Faye::WebSocket::Client.new(@url)
-
-          @ws.on :open do
-          end
+          @ws = Faye::WebSocket::Client.new(@url.to_s)
 
           @ws.on :message do |event|
             Thread.new { dataParse(event.data)}
           end
 
-          @ws.on :close do
-            emit :close
-            Utils.log Time.new, '!', '已断开连接'
+          @ws.on :close do |event|
+            emit :close, event
+            Utils.log '连接断开'
             @ws = nil
             exit
           end
@@ -50,15 +47,20 @@ module CQHttp
 
       def sendPrivateMessage(msg, user_id)
         ret = { action: 'send_private_msg', params: { user_id: user_id, message: msg }, echo: 'BotPrivateMessage' }.to_json
-        Utils.log Time.new, '↑', "发送至私聊 #{user_id} 的消息: #{msg}"
+        Utils.log "发送至私聊 #{user_id} 的消息: #{msg}"
         @ws.send ret
       end
 
       def sendGroupMessage(msg, group_id)
         ret = { action: 'send_group_msg', params: { group_id: group_id, message: msg }, echo: 'BotGroupMessage' }.to_json
-        Utils.log Time.new, '↑', "发送至群 #{group_id} 的消息: #{msg}"
+        Utils.log "发送至群 #{group_id} 的消息: #{msg}"
         @ws.send ret
       end
+      
+      def sendMessage(msg, target)
+        sendGroupMessage msg, target.group_id if target.messagetype == 'group'
+        sendPrivateMessage msg, target.user_id if target.messagetype == 'private'
+      end
 
       private
 
@@ -69,12 +71,10 @@ module CQHttp
         tar.time = msg['time']
         if msg['meta_event_type'] == 'lifecycle' && msg['sub_type'] == 'connect'
           @selfID = msg['self_id']
-          Utils.log Time.at(tar.time), '!', "连接成功, BotQQ: #{@selfID}"
+          Utils.log "连接成功, BotQQ: #{@selfID}"
           emit :logged, @selfID
         end
-        if @debugmode == true # 判断是否为debug模式
-          puts msg if msg['meta_event_type'] != 'heartbeat' # 过滤心跳
-        end
+        Utils.log msg, Logger::DEBUG if msg['meta_event_type'] != 'heartbeat' # 过滤心跳
         case msg['post_type']
         #
         # 请求事件
@@ -83,10 +83,10 @@ module CQHttp
           case msg['request_type']
           when 'group'
             if msg['sub_type'] == 'invite' # 加群邀请
-              Utils.log Time.at(tar.time), '↓', "收到用户 #{msg['user_id']} 的加群 #{msg['group_id']} 请求 (#{msg['flag']})"
+              Utils.log "收到用户 #{msg['user_id']} 的加群 #{msg['group_id']} 请求 (#{msg['flag']})"
             end
           when 'friend' # 加好友邀请
-            Utils.log Time.at(tar.time), '↓', "收到用户 #{msg['user_id']} 的好友请求 (#{msg['flag']})"
+            Utils.log "收到用户 #{msg['user_id']} 的好友请求 (#{msg['flag']})"
           end
           emit :request, msg['request_type'], msg['sub_type'], msg['flag']
         #
@@ -96,12 +96,12 @@ module CQHttp
           case msg['notice_type']
           when 'group_decrease' # 群数量减少
             if msg['sub_type'] == 'kick_me' # 被踢出
-              Utils.log Time.at(tar.time), '!', "被 #{msg['operator_id']} 踢出群 #{msg['group_id']}"
+              Utils.log "被 #{msg['operator_id']} 踢出群 #{msg['group_id']}"
             end
           when 'group_recall'
-            Utils.log Time.at(tar.time), '!', "群 #{msg['group_id']} 中 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
+            Utils.log "群 #{msg['group_id']} 中 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
           when 'friend_recall'
-            Utils.log Time.at(tar.time), '!', "好友 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
+            Utils.log "好友 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
           end
           emit :notice, msg['notice_type'], msg
           
@@ -123,10 +123,10 @@ module CQHttp
           sdr.member_role = msg['sender']['role'] # 群成员地位
           sdr.qqlevel = msg['sender']['level'] # 群成员等级
           if tar.messagetype == 'group' # 判断是否为群聊
-            Utils.log Time.at(tar.time), '↓', "收到群 #{tar.group_id} 内 #{sdr.nickname}(#{tar.user_id}) 的消息: #{tar.message} (#{tar.message_id})"
+            Utils.log "收到群 #{tar.group_id} 内 #{sdr.nickname}(#{tar.user_id}) 的消息: #{tar.message} (#{tar.message_id})"
             emit :groupMessage, tar.message, sdr, tar
           else
-            Utils.log Time.at(tar.time), '↓', "收到好友 #{sdr.nickname}(#{tar.user_id}) 的消息: #{tar.message} (#{tar.message_id})"
+            Utils.log "收到好友 #{sdr.nickname}(#{tar.user_id}) 的消息: #{tar.message} (#{tar.message_id})"
             emit :privateMessage, tar.message, sdr, tar
           end
           emit :message, tar.message, sdr, tar

data/lib/Bot/Utils.rb

@@ -1,14 +1,37 @@
 module CQHttp
   class Utils
+    attr_accessor :stdLogger, :fileLogger, :loggerFile
     class << self
-      def log(time, status, str)
-        puts "[#{time.strftime('%Y-%m-%d %H:%M:%S')}][#{status}]: #{str}"
+      def setLogger(logger)
+        logger.level = 'INFO'
+        logger.formatter = proc do |severity, datetime, progname, msg|
+            if progname == nil
+                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{severity}]: #{msg.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
+            else
+                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{progname}][#{severity}]: #{msg.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
+            end
+        end
+        logger
+      end
+      def initLogger(loggerFile=nil)
+        @loggerFile = loggerFile
+        @stdLogger = setLogger(Logger.new(STDOUT))
+        @fileLogger = setLogger(Logger.new(@loggerFile, 'daily')) if @loggerFile
+      end
+
+      def setLoggerLevel(loggerLevel)
+        @stdLogger.level = loggerLevel
+        @fileLogger.level = loggerLevel if @loggerFile
+      end
+
+      def log(str, severity=Logger::INFO, app="RUBY-CQHTTP")
+        @stdLogger.log(severity, str, app)
+        @fileLogger.log(severity, str, app) if @loggerFile
       end
 
-      def httpPost(*args)
-        url = URI.parse args[0]
+      def httpPost(url, ret)
         req = Net::HTTP::Post.new(url.path, { 'Content-Type' => 'application/json' })
-        req.body = args[1]
+        req.body = ret
         res = Net::HTTP.start(url.hostname, url.port) do |http|
           http.request(req)
         end

data/lib/ruby-cqhttp.rb

@@ -3,6 +3,9 @@ require 'eventmachine'
 require 'json'
 require 'event_emitter'
 require 'net/http'
+require 'uri/ws'
+require 'uri'
+require 'logger'
 
 module CQHttp
   autoload :Bot, File.expand_path('Bot/Bot', __dir__)
@@ -10,3 +13,4 @@ module CQHttp
   autoload :Utils, File.expand_path('Bot/Utils', __dir__)
 end
 
+CQHttp::Utils.initLogger

data/ruby-cqhttp.gemspec

@@ -3,19 +3,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = 'ruby-cqhttp'
-  s.version       = '0.0.3'
-  s.date          = '2020-11-04'
+  s.version       = '0.0.6'
+  s.date          = '2021-03-23'
   s.summary       = 'ruby-cqhttp for osucat'
   s.description   = 'ruby-cqhttp for osucat'
   s.authors       = ['fantasyzhjk']
   s.email         = 'fantasyzhjk@outlook.com'
-  s.files         = ['lib/ruby-cqhttp.rb']
-  s.homepage      = 'http://rubygems.org/gems/ruby-cqhttp'
+  s.platform    = Gem::Platform::RUBY
+  s.homepage      = 'https://github.com/fantasyzhjk/ruby-cqhttp/'
   s.license       = 'MIT'
   s.files         = `git ls-files -z`.split("\x0")
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 2.7.0'
 
-  #   s.add_runtime_dependency  'json', '~> 1.1'
-  #   s.add_runtime_dependency  'eventmachine', '~> 1.1'
-  #   s.add_runtime_dependency  'faye-websocket', '~> 1.1'
+  s.add_runtime_dependency  'json'
+  s.add_runtime_dependency  'logger'
+  s.add_runtime_dependency  'uri', '~> 0.10.1'
+  s.add_runtime_dependency  'eventmachine'
+  s.add_runtime_dependency  'faye-websocket'
+  s.add_runtime_dependency  'event_emitter'
 end

metadata

@@ -1,27 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - fantasyzhjk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ruby-cqhttp for osucat
 email: fantasyzhjk@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- README.md
 - lib/Bot/Api.rb
 - lib/Bot/Bot.rb
 - lib/Bot/Utils.rb
 - lib/ruby-cqhttp.rb
 - ruby-cqhttp.gemspec
-homepage: http://rubygems.org/gems/ruby-cqhttp
+homepage: https://github.com/fantasyzhjk/ruby-cqhttp/
 licenses:
 - MIT
 metadata: {}
@@ -33,14 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ruby-cqhttp for osucat