ruby-cqhttp 0.0.3 → 0.1.0

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, 'Puma')
+
+        @ws.on :message do |event|
+          Thread.new { dataParse(event.data) }
+        end
+
+        @ws.on :close do |event|
+          @eventLogger.log(['客户端', '断开', event.code].to_s, ::Logger::INFO, 'Puma')
+          @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

data/ruby-cqhttp.gemspec

@@ -3,19 +3,21 @@ $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.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.license       = 'MIT'
-  s.files         = `git ls-files -z`.split("\x0")
+  s.version = '0.1.0'
+  s.summary = '一个基于 OneBot 标准的 QQ 机器人框架'
+  s.description = '一个基于 OneBot 标准的 QQ 机器人框架'
+  s.authors = ['fantasyzhjk']
+  s.email = 'fantasyzhjk@outlook.com'
+  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 'event_emitter'
+  s.add_runtime_dependency 'faye-websocket'
+  s.add_runtime_dependency 'json'
+  s.add_runtime_dependency 'logger'
+  s.add_runtime_dependency 'rack'
 end

data/tests/client.rb

@@ -0,0 +1,21 @@
+require '../lib/onebot-ruby'
+
+logger = Onebot::Logging::Logger.new.setLoggerLevel(Logger::INFO)
+api = Onebot::Http::API.new.setLogger(logger)
+
+Onebot::Core.connect url: 'ws://localhost:7700', logger: logger, options: { headers: { 'Authorization' => 'Bearer xxxxxxxxxxxx' } } do |bot|
+  bot.on :logged do |_botqq|
+    logger.log('我开了欸')
+  end
+
+  bot.on :privateMessage do |session|
+    bot.sendMessage(session.message, session)
+  end
+
+  bot.on :notice do |notice_type, data|
+    if notice_type == 'friend_recall'
+      req = bot.get_msg(data.message_id)
+      bot.sendPrivateMessage req.message, req.sender.user_id
+    end
+  end
+end

data/tests/rainbows.conf

@@ -0,0 +1,3 @@
+Rainbows! do
+  use :EventMachine
+end

data/tests/server.rb

@@ -0,0 +1,77 @@
+require '../lib/onebot-ruby'
+require 'faye/websocket'
+require 'rack'
+
+logger = Onebot::Logging::Logger.new.setLoggerLevel(Logger::INFO)
+static  = Rack::File.new(File.dirname(__FILE__))
+options = { ping: 5 }
+
+App = lambda do |env|
+  if Faye::WebSocket.websocket?(env)
+    bot = Onebot::WebSocket::Server.new(env:, logger:, options:)
+
+    bot.on :logged do |_botqq|
+      logger.log('我开了欸')
+    end
+
+    bot.on :privateMessage do |session|
+      # p session.message
+      # p session
+      p Onebot::Utils.cqParse(session.message)
+      bot.sendPrivateMessage(session.message, session.userId)
+    end
+
+    bot.rack_response
+  else
+    static.call(env)
+  end
+end
+
+def App.log(message); end
+
+port   = ARGV[0] || 7000
+secure = ARGV[1] == 'tls'
+engine = ARGV[2] || 'thin'
+spec   = File.expand_path(__dir__)
+
+Faye::WebSocket.load_adapter(engine)
+
+case engine
+
+when 'goliath'
+  class WebSocketServer < Goliath::API
+    def response(env)
+      App.call(env)
+    end
+  end
+
+when 'puma'
+  require 'puma/binder'
+  require 'puma/events'
+  events = Puma::Events.new($stdout, $stderr)
+  binder = Puma::Binder.new(events)
+  binder.parse(["tcp://0.0.0.0:#{port}"], App)
+  server = Puma::Server.new(App, events)
+  server.binder = binder
+  server.run.join
+
+when 'rainbows'
+  rackup = Unicorn::Configurator::RACKUP
+  rackup[:port] = port
+  rackup[:set_listener] = true
+  options = rackup[:options]
+  options[:config_file] = File.expand_path('rainbows.conf', __dir__)
+  Rainbows::HttpServer.new(App, options).start.join
+
+when 'thin'
+  thin = Rack::Handler.get('thin')
+  thin.run(App, Host: '0.0.0.0', Port: port) do |server|
+    if secure
+      server.ssl_options = {
+        private_key_file: spec + '/server.key',
+        cert_chain_file: spec + '/server.crt'
+      }
+      server.ssl = true
+    end
+  end
+end

metadata

@@ -1,31 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - fantasyzhjk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
-dependencies: []
-description: ruby-cqhttp for osucat
+date: 2022-05-17 00:00:00.000000000 Z
+dependencies:
+- !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'
+- !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: 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: rack
+  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: 一个基于 OneBot 标准的 QQ 机器人框架
 email: fantasyzhjk@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/Bot/Api.rb
-- lib/Bot/Bot.rb
-- lib/Bot/Utils.rb
-- lib/ruby-cqhttp.rb
+- ".bundle/config"
+- ".gitignore"
+- ".rubocop.yml"
+- Gemfile
+- README.md
+- icon.png
+- 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
 - ruby-cqhttp.gemspec
-homepage: http://rubygems.org/gems/ruby-cqhttp
+- tests/client.rb
+- tests/rainbows.conf
+- tests/server.rb
+homepage: https://github.com/fantasyzhjk/ruby-cqhttp/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -33,15 +118,15 @@ 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
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
-summary: ruby-cqhttp for osucat
+summary: 一个基于 OneBot 标准的 QQ 机器人框架
 test_files: []

data/lib/Bot/Api.rb

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