ruby-cqhttp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925802d93d0690ccc22b020a3236b52c837b3d0961d55a9962cd9bb4f6d55b69
-  data.tar.gz: ac87d2efe8fc65a2f8a3b6c5216306b69c7c59b25c68c3f1c9067b4b2138c87a
+  metadata.gz: f4ded7c0bb8d8255401a9d13b5c98eafdba3324f7221bf6ef4e1c0bf7646ba8e
+  data.tar.gz: 2cc88a1e903da48f2b74859f3f7bc8a7c5cc2292d70061f219d528c1b90ead2e
 SHA512:
-  metadata.gz: c1e82a77d99140324a348d12d5aac54a5dffa137c577ba9260773607849dfa596934cd79a86ad6f98d35f1ec4ad8b4020eac8049e1bf2b1a38908804d517fc07
-  data.tar.gz: 483be6c942157ed36fe9f206e2a6b14265dd563a6441e5effc36e9ffa9d18d03dbc3060932c17d2f5f7a34d2ca36936c4677619d9db2fb2395517b3330da2454
+  metadata.gz: 8e2d94cbf60ef8697ac9a8fef81a46051939f2daac915ddb4b8b6d31193ef4cd87acfb27686c4762680e0ffbfe53653d4e9ccec2a304fbac9f8b5c604073a795
+  data.tar.gz: 5925ec6144d391cded1963e7790907dece0a8c945e269ce0c19c2a8f5e930395e98443c607a871690db8fef6306d4e6ad4722566fb70e79b13631597cb70f5e2

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Zh_Jk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,7 +1,8 @@
 # ruby-cqhttp
 
+[![Badge](https://img.shields.io/badge/OneBot-11-black?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxQTFRF////29vbr6+vAAAAk1hCcwAAAAR0Uk5T////AEAqqfQAAAKcSURBVHja7NrbctswDATQXfD//zlpO7FlmwAWIOnOtNaTM5JwDMa8E+PNFz7g3waJ24fviyDPgfhz8fHP39cBcBL9KoJbQUxjA2iYqHL3FAnvzhL4GtVNUcoSZe6eSHizBcK5LL7dBr2AUZlev1ARRHCljzRALIEog6H3U6bCIyqIZdAT0eBuJYaGiJaHSjmkYIZd+qSGWAQnIaz2OArVnX6vrItQvbhZJtVGB5qX9wKqCMkb9W7aexfCO/rwQRBzsDIsYx4AOz0nhAtWu7bqkEQBO0Pr+Ftjt5fFCUEbm0Sbgdu8WSgJ5NgH2iu46R/o1UcBXJsFusWF/QUaz3RwJMEgngfaGGdSxJkE/Yg4lOBryBiMwvAhZrVMUUvwqU7F05b5WLaUIN4M4hRocQQRnEedgsn7TZB3UCpRrIJwQfqvGwsg18EnI2uSVNC8t+0QmMXogvbPg/xk+Mnw/6kW/rraUlvqgmFreAA09xW5t0AFlHrQZ3CsgvZm0FbHNKyBmheBKIF2cCA8A600aHPmFtRB1XvMsJAiza7LpPog0UJwccKdzw8rdf8MyN2ePYF896LC5hTzdZqxb6VNXInaupARLDNBWgI8spq4T0Qb5H4vWfPmHo8OyB1ito+AysNNz0oglj1U955sjUN9d41LnrX2D/u7eRwxyOaOpfyevCWbTgDEoilsOnu7zsKhjRCsnD/QzhdkYLBLXjiK4f3UWmcx2M7PO21CKVTH84638NTplt6JIQH0ZwCNuiWAfvuLhdrcOYPVO9eW3A67l7hZtgaY9GZo9AFc6cryjoeFBIWeU+npnk/nLE0OxCHL1eQsc1IciehjpJv5mqCsjeopaH6r15/MrxNnVhu7tmcslay2gO2Z1QfcfX0JMACG41/u0RrI9QAAAABJRU5ErkJggg==)](https://github.com/botuniverse/onebot-11)
 [![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/)
+[![yard docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://www.rubydoc.info/github/fantasyzhjk/ruby-cqhttp)
 
 ![图标](https://raw.githubusercontent.com/fantasyzhjk/ruby-cqhttp/main/icon.png)
 
@@ -67,4 +68,4 @@ Onebot::Core.connect url: "ws://127.0.0.1:6700", logger: logger do |bot|
 end
 ```
 
-**具体使用方法请查看 tests*
+**具体使用方法请查看 examples*

data/lib/Core/Http/API.rb

@@ -11,11 +11,11 @@ module Onebot
 
       # (初始化) 设置API地址
       #
-      # @param apiIp [String]
-      # @param apiPort [Number]
+      # @param host [String]
+      # @param port [Number]
       # @return [URI]
-      def initialize(apiIp: '127.0.0.1', apiPort: 5700)
-        @url = URI::HTTP.build(host: apiIp, port: apiPort)
+      def initialize(host: '127.0.0.1', port: 5700)
+        @url = URI::HTTP.build(host: host, port: port)
         @logger = Logging::EventLogger.new
       end
 
@@ -28,7 +28,6 @@ module Onebot
       #
       # @param group_id [Number]
       # @param group_name [String]
-      # @param url [URI]
       # @return [Hash]
       def setGroupName(group_id, group_name)
         data = sendReq('set_group_name', { group_id: group_id.to_i, group_name: })
@@ -43,7 +42,6 @@ module Onebot
       # 获取图片信息
       #
       # @param file [String]
-      # @param url [URI]
       # @return [Hash]
       def getImage(file)
         data = sendReq('get_image', { file: })
@@ -58,7 +56,6 @@ module Onebot
       # 获取消息
       #
       # @param message_id [Number]
-      # @param url [URI]
       # @return [Hash]
       def get_msg(message_id)
         data = sendReq('get_msg', { message_id: })
@@ -74,7 +71,6 @@ module Onebot
       #
       # @param msg [String]
       # @param user_id [Number]
-      # @param url [URI]
       # @return [Hash]
       def sendPrivateMessage(msg, user_id)
         data = sendReq('send_private_msg', { user_id:, message: msg })
@@ -91,7 +87,6 @@ module Onebot
       #
       # @param msg [String]
       # @param group_id [Number]
-      # @param url [URI]
       # @return [Hash]
       def sendGroupMessage(msg, group_id)
         data = sendReq('send_group_msg', { group_id:, message: msg })
@@ -108,7 +103,6 @@ module Onebot
       #
       # @param flag [String]
       # @param reason [String]
-      # @param url [URI]
       # @return [Boolean]
       def acceptFriendRequest(flag, reason = nil)
         data = sendReq('set_friend_add_request', { flag:, approve: true, remark: reason })
@@ -124,7 +118,6 @@ module Onebot
       # 拒绝好友邀请
       #
       # @param flag [String]
-      # @param url [URI]
       # @return [Boolean]
       def refuseFriendRequest(flag)
         data = sendReq('set_friend_add_request', { flag:, approve: false })
@@ -141,7 +134,6 @@ module Onebot
       #
       # @param flag [String]
       # @param sub_type [String]
-      # @param url [URI]
       # @return [Boolean]
       def acceptGroupRequest(flag, sub_type)
         data = sendReq('set_group_add_request', { flag:, sub_type:, approve: true })
@@ -159,7 +151,6 @@ module Onebot
       # @param flag [String]
       # @param sub_type [String]
       # @param reason [String]
-      # @param url [URI]
       # @return [Boolean]
       def refuseGroupRequest(flag, sub_type, reason = nil)
         data = sendReq('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
@@ -175,7 +166,7 @@ module Onebot
       private
 
       def sendReq(action, params, url = @url)
-        url.path = action
+        url.path = '/' << action
         JSON.parse(Utils.httpPost(url, params.to_json))
       end
     end

data/lib/Core/WebSocket/API.rb

@@ -54,15 +54,14 @@ module Onebot
       #
       # @param flag [String]
       # @param reason [String]
-      # @param url [URI]
       # @return [Boolean]
       def acceptFriendRequest(flag, reason = nil)
         data = sendReq('set_friend_add_request', { flag:, approve: true, remark: reason })
         if parseRet(data)
-          @logger.log '已通过好友请求'
+          @eventLogger.log '已通过好友请求'
           true
         else
-          @logger.log '请求通过失败', Logger::WARN
+          @eventLogger.log '请求通过失败', Logger::WARN
           false
         end
       end
@@ -70,15 +69,14 @@ module Onebot
       # 拒绝好友邀请
       #
       # @param flag [String]
-      # @param url [URI]
       # @return [Boolean]
       def refuseFriendRequest(flag)
         data = sendReq('set_friend_add_request', { flag:, approve: false })
         if parseRet(data)
-          @logger.log '已拒绝好友请求'
+          @eventLogger.log '已拒绝好友请求'
           true
         else
-          @logger.log '请求拒绝失败', Logger::WARN
+          @eventLogger.log '请求拒绝失败', Logger::WARN
           false
         end
       end
@@ -87,15 +85,14 @@ module Onebot
       #
       # @param flag [String]
       # @param sub_type [String]
-      # @param url [URI]
       # @return [Boolean]
       def acceptGroupRequest(flag, sub_type)
         data = sendReq('set_group_add_request', { flag:, sub_type:, approve: true })
         if parseRet(data)
-          @logger.log '已通过加群请求'
+          @eventLogger.log '已通过加群请求'
           true
         else
-          @logger.log '请求通过失败', Logger::WARN
+          @eventLogger.log '请求通过失败', Logger::WARN
           false
         end
       end
@@ -105,15 +102,14 @@ module Onebot
       # @param flag [String]
       # @param sub_type [String]
       # @param reason [String]
-      # @param url [URI]
       # @return [Boolean]
       def refuseGroupRequest(flag, sub_type, reason = nil)
         data = sendReq('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
         if parseRet(data)
-          @logger.log '已拒绝加群请求'
+          @eventLogger.log '已拒绝加群请求'
           true
         else
-          @logger.log '请求拒绝失败', Logger::WARN
+          @eventLogger.log '请求拒绝失败', Logger::WARN
           false
         end
       end

data/lib/Core/WebSocket/Server.rb

@@ -13,14 +13,14 @@ module Onebot
         @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')
+        @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, 'Puma')
+          @eventLogger.log(['客户端', '断开', event.code].to_s, ::Logger::INFO, 'Server')
           @ws = nil
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - fantasyzhjk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_emitter
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -73,25 +87,78 @@ dependencies:
     - - ">="
       - !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:
-- ".bundle/config"
-- ".gitignore"
-- ".rubocop.yml"
-- Gemfile
+- LICENSE
 - README.md
-- icon.png
 - lib/Core/Core.rb
 - lib/Core/Http/API.rb
 - lib/Core/Logging/EventLogger.rb
@@ -102,16 +169,16 @@ files:
 - lib/Core/WebSocket/Client.rb
 - lib/Core/WebSocket/Server.rb
 - lib/onebot-ruby.rb
-- ruby-cqhttp.gemspec
-- tests/client.rb
-- tests/rainbows.conf
-- tests/server.rb
 homepage: https://github.com/fantasyzhjk/ruby-cqhttp/
 licenses:
 - MIT
 metadata: {}
 post_install_message:
-rdoc_options: []
+rdoc_options:
+- "--main"
+- README.md
+- "--markup"
+- markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_PATH: "vendor/bundle"

data/.gitignore

@@ -1,12 +0,0 @@
-ruby-cqhttp-*.gem
-Gemfile.lock
-
-# debug files
-data/
-logs/
-vendor/
-go-cqhttp*
-session.token
-device.json
-config.yml
-.yardoc

data/.rubocop.yml

@@ -1,27 +0,0 @@
-AllCops:
-  TargetRubyVersion: 3.2
-  NewCops: enable
-Naming/VariableName:
-  Enabled: false
-Naming/MethodName:
-  Enabled: false
-Naming/FileName:
-  Enabled: false
-Style/AsciiComments:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Layout/LineLength:
-  Enabled: false
-Naming/MethodParameterName:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-gem 'event_emitter'
-gem 'eventmachine', platform: :ruby
-gem 'faye-websocket'
-gem 'json'
-gem 'puma'
-gem 'rack'
-gem 'solargraph'

data/ruby-cqhttp.gemspec

@@ -1,23 +0,0 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |s|
-  s.name = 'ruby-cqhttp'
-  s.version = '0.1.2'
-  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 '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

@@ -1,21 +0,0 @@
-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 |data|
-    bot.sendMessage(session.message, data)
-  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

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

data/tests/server.rb

@@ -1,77 +0,0 @@
-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 |data|
-      # p data.message
-      # p data
-      p Onebot::Utils.cqParse(data.message)
-      bot.sendPrivateMessage(data.message, data.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