ruby-cqhttp 0.0.7 → 0.1.3

data/lib/Core/WebSocket/API.rb

@@ -0,0 +1,137 @@
+module Onebot
+  # WebSocket连接处理部分
+  module WebSocket
+    class API
+      attr_accessor :queueList
+
+      def initialize(ws, eventLogger)
+        @ws = ws
+        @eventLogger = eventLogger
+        @queueList = {}
+      end
+
+      def get_msg(message_id, _url = @apiUrl)
+        ret = sendReq('get_msg', { message_id: })
+        if parseRet(ret)
+          @eventLogger.log "获取消息成功 (#{message_id})"
+        else
+          @eventLogger.log "获取消息失败，错误码: #{ret.msg}, 错误消息: #{ret.wording}", Logger::WARN
+        end
+        ret[:data]
+      end
+
+      # 发送私聊消息
+      #
+      # @param msg [String]
+      # @param user_id [Number]
+      # @return [Hash]
+      def sendPrivateMessage(message, user_id)
+        ret = sendReq('send_private_msg', { user_id:, message: })
+        if parseRet(ret)
+          @eventLogger.log "发送至私聊 #{user_id} 的消息: #{message} (#{ret.data.message_id})"
+        else
+          @eventLogger.log "发送私聊消息失败，错误码: #{ret.msg}, 错误消息: #{ret.wording}", Logger::WARN
+        end
+        ret[:data]
+      end
+
+      # 发送群聊消息
+      #
+      # @param msg [String]
+      # @param group_id [Number]
+      # @return [Hash]
+      def sendGroupMessage(message, group_id)
+        ret = sendReq('send_group_msg', { group_id:, message: })
+        if parseRet(ret)
+          @eventLogger.log "发送至群 #{group_id} 的消息: #{message} (#{ret.data.message_id})"
+        else
+          @eventLogger.log "发送群消息失败，错误码: #{ret.msg}, 错误消息: #{ret.wording}", Logger::WARN
+        end
+        ret[:data]
+      end
+
+      # 接受好友邀请
+      #
+      # @param flag [String]
+      # @param reason [String]
+      # @return [Boolean]
+      def acceptFriendRequest(flag, reason = nil)
+        data = sendReq('set_friend_add_request', { flag:, approve: true, remark: reason })
+        if parseRet(data)
+          @eventLogger.log '已通过好友请求'
+          true
+        else
+          @eventLogger.log '请求通过失败', Logger::WARN
+          false
+        end
+      end
+
+      # 拒绝好友邀请
+      #
+      # @param flag [String]
+      # @return [Boolean]
+      def refuseFriendRequest(flag)
+        data = sendReq('set_friend_add_request', { flag:, approve: false })
+        if parseRet(data)
+          @eventLogger.log '已拒绝好友请求'
+          true
+        else
+          @eventLogger.log '请求拒绝失败', Logger::WARN
+          false
+        end
+      end
+
+      # 接受加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @return [Boolean]
+      def acceptGroupRequest(flag, sub_type)
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: true })
+        if parseRet(data)
+          @eventLogger.log '已通过加群请求'
+          true
+        else
+          @eventLogger.log '请求通过失败', Logger::WARN
+          false
+        end
+      end
+
+      # 拒绝加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @param reason [String]
+      # @return [Boolean]
+      def refuseGroupRequest(flag, sub_type, reason = nil)
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
+        if parseRet(data)
+          @eventLogger.log '已拒绝加群请求'
+          true
+        else
+          @eventLogger.log '请求拒绝失败', Logger::WARN
+          false
+        end
+      end
+
+      private
+
+      #
+      #  解析API返回
+      #
+      def parseRet(ret)
+        return true if ret.status == 'ok'
+        return false if ret.status == 'failed'
+      end
+
+      def sendReq(action, params)
+        echo = Time.now.to_i.to_s
+        @ws.send({ action:, params:, echo: }.to_json)
+        @queueList[echo] = Queue.new
+        ret = @queueList[echo].pop
+        @queueList.delete(echo)
+        ret
+      end
+    end
+  end
+end

data/lib/Core/WebSocket/Bot.rb

@@ -0,0 +1,69 @@
+module Onebot
+  # WebSocket连接处理部分
+  module WebSocket
+    class Bot
+      include EventEmitter
+      # @return [Number] self QQ id
+      attr_accessor :selfID
+
+      def initialize(**args); end
+
+      def method_missing(name, *args, &)
+        return @api.send(name, *args, &) if !@api.nil? && @api.respond_to?(name)
+
+        super
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        (!@api.nil? && @api.respond_to?(name)) || super
+      end
+
+      # 发送消息
+      def sendMessage(msg, session)
+        return sendGroupMessage msg, session.group_id if session.message_type == 'group'
+        return sendPrivateMessage msg, session.user_id if session.message_type == 'private'
+      end
+
+      private
+
+      #
+      #  消息解析部分
+      #
+      def dataParse(data)
+        msg = JSON.parse(data, symbolize_names: true)
+        @eventLogger.dataParse(msg)
+        # 连接成功
+        if msg.meta_event_type == 'lifecycle' && msg.sub_type == 'connect'
+          @selfID = msg.self_id
+          emit :logged, @selfID
+        end
+        #
+        # 函数回调
+        #
+        @api.queueList[msg.echo] << msg if msg.include?(:echo) # 往API模块回调返回消息
+        case msg.post_type
+        #
+        # 请求事件
+        #
+        when 'request'
+          emit :request, msg.request_type, msg
+          #
+          # 提醒事件
+          #
+        when 'notice'
+          emit :notice, msg.notice_type, msg
+          #
+          # 消息事件
+          #
+        when 'message'
+          if msg.message_type == 'group' # 判断是否为群聊
+            emit :groupMessage, msg
+          else
+            emit :privateMessage, msg
+          end
+          emit :message, msg
+        end
+      end
+    end
+  end
+end

data/lib/Core/WebSocket/Client.rb

@@ -0,0 +1,44 @@
+module Onebot
+  # WebSocket连接处理部分
+  module WebSocket
+    class Client < Bot
+      # @return [URI] WS URL
+      attr_accessor :url
+      # @return [Faye::WebSocket::Client] WS Conn
+      attr_accessor :ws
+      attr_accessor :api
+
+      # 设置 WS URL
+      def initialize(url: nil, logger: nil, **args)
+        super
+        @eventLogger = Logging::EventLogger.new(logger)
+        @url = url
+      end
+
+      # 连接 WS
+      def connect(protocols = nil, options = {})
+        @eventLogger.log '正在连接到 ' << @url
+        EM.run do
+          @ws = Faye::WebSocket::Client.new(@url, protocols, options)
+          @api = API.new(@ws, @eventLogger)
+
+          @ws.on :message do |event|
+            Thread.new { dataParse(event.data) }
+          end
+
+          @ws.on :close do |event|
+            emit :close, event
+            @eventLogger.log '连接断开'
+            @ws = nil
+            EM.stop
+          end
+
+          @ws.on :error do |event|
+            emit :error, event
+            @ws = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/Core/WebSocket/Server.rb

@@ -0,0 +1,35 @@
+module Onebot
+  # WebSocket连接处理部分
+  module WebSocket
+    class Server < Bot
+      # @return [Faye::WebSocket] ws server
+      attr_accessor :ws
+      attr_accessor :api
+
+      require 'rack'
+
+      def initialize(env:, logger: nil, options: { ping: 5 }, &block)
+        super
+        @eventLogger = Logging::EventLogger.new(logger)
+        @ws = Faye::WebSocket.new(env, %w[irc xmpp], options)
+        @api = API.new(@ws, @eventLogger)
+        @eventLogger.log(['客户端', '连接', @ws.url, @ws.version], ::Logger::INFO, 'Server')
+
+        @ws.on :message do |event|
+          Thread.new { dataParse(event.data) }
+        end
+
+        @ws.on :close do |event|
+          @eventLogger.log(['客户端', '断开', event.code].to_s, ::Logger::INFO, 'Server')
+          @ws = nil
+        end
+
+        yield self if block_given?
+      end
+
+      def rack_response
+        @ws.rack_response
+      end
+    end
+  end
+end

data/lib/onebot-ruby.rb

@@ -0,0 +1,44 @@
+require 'faye/websocket'
+require 'json'
+require 'event_emitter'
+require 'net/http'
+require 'logger'
+
+class Hash
+  def method_missing(m, *a)
+    if m.to_s =~ /=$/
+      self[Regexp.last_match.pre_match] = a[0]
+    elsif a.empty?
+      self[m]
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(m, include_private = false)
+    super unless m.to_s =~ /=$/
+  end
+end
+
+# 一个基于 OneBot 标准的 QQ 机器人框架
+module Onebot
+  module Logging
+    autoload :Logger, File.expand_path('Core/Logging/Logger', __dir__)
+    autoload :EventLogger, File.expand_path('Core/Logging/EventLogger', __dir__)
+  end
+
+  module WebSocket
+    autoload :Session, File.expand_path('Core/WebSocket/Session', __dir__)
+    autoload :API, File.expand_path('Core/WebSocket/API', __dir__)
+    autoload :Bot, File.expand_path('Core/WebSocket/Bot', __dir__)
+    autoload :Client, File.expand_path('Core/WebSocket/Client', __dir__)
+    autoload :Server, File.expand_path('Core/WebSocket/Server', __dir__)
+  end
+
+  module Http
+    autoload :API, File.expand_path('Core/Http/API', __dir__)
+  end
+
+  autoload :Core, File.expand_path('Core/Core', __dir__)
+  autoload :Utils, File.expand_path('Core/Utils', __dir__)
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.3
 platform: ruby
 authors:
 - fantasyzhjk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: event_emitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,39 +81,104 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: event_emitter
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: goliath
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: passenger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: 一个基于 OneBot 标准的 QQ 机器人框架
 email: fantasyzhjk@outlook.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- ".gitignore"
-- Gemfile
+- LICENSE
 - README.md
-- lib/Bot/Api.rb
-- lib/Bot/Bot.rb
-- lib/Bot/Utils.rb
-- lib/ruby-cqhttp.rb
-- ruby-cqhttp.gemspec
+- lib/Core/Core.rb
+- lib/Core/Http/API.rb
+- lib/Core/Logging/EventLogger.rb
+- lib/Core/Logging/Logger.rb
+- lib/Core/Utils.rb
+- lib/Core/WebSocket/API.rb
+- lib/Core/WebSocket/Bot.rb
+- lib/Core/WebSocket/Client.rb
+- lib/Core/WebSocket/Server.rb
+- lib/onebot-ruby.rb
 homepage: https://github.com/fantasyzhjk/ruby-cqhttp/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
-rdoc_options: []
+post_install_message:
+rdoc_options:
+- "--main"
+- README.md
+- "--markup"
+- markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -127,8 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: 一个基于 OneBot 标准的 QQ 机器人框架
 test_files: []

data/.gitignore

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

data/Gemfile

@@ -1,11 +0,0 @@
-# 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'