opqr 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a52c3e306b1d2b8ad308fcd87036e12286b3c73a07b7318c0eb704c4a8453a
-  data.tar.gz: 1b8dee574c4ca006bf3319440f34408a171a61681a187f29c534acdf1851b9c8
+  metadata.gz: d2801c6161e2440277356456195199bc30ffe411f7b46650afb246d0f0b3ebdf
+  data.tar.gz: 657a5c3edbc0efaad67eba72a3c3cc0fe26233f64c792f20b3fd210fa5651ecb
 SHA512:
-  metadata.gz: 9fe904cf49d566a43e5a5a8998cb7a2ffef6e4b230de6e1e7236217d2db7be0135250b9843e19da6d6dad457f4d685ec09e504ab1700e346360c00aaa0f248e0
-  data.tar.gz: 2ecc6e3df3a963a85071a0117251191285ba5d5fa90573a5858cbd704efdfac707fb15f0f744189da714091df5d8bf6d738de22836f7ea75ea38578740b1bee7
+  metadata.gz: 19b67cd2247ff4d846decab98079dce9a46cc5e2aa3d0cef855673267b28542d1a5a247520177fa73f43e57e002e0a649c67b2f9b247cb7e502294e40452445b
+  data.tar.gz: 775a5018337cf7845fb23d2fe5b2e82ec778f4feb917d90cb64acaa96fba43746fe2d39275904a2ab30f07b70861d9ba0db9e1b150c1fae61b4207124252e6b6

data/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

data/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/opqr.iml" filepath="$PROJECT_DIR$/.idea/opqr.iml" />
+    </modules>
+  </component>
+</project>

data/.idea/opqr.iml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="ruby-3.2.2-p53" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.10, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.2.7, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.11.2, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.17.0, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket (v1.2.9, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.5, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-eventmachine-base (v1.2.0, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-eventmachine-server (v1.0.1, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.5, ruby-3.2.2-p53) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-native (v1.0.0, ruby-3.2.2-p53) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build opqr-0.1.3.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if opqr-0.1.3.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install opqr-0.1.3.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install opqr-0.1.3.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.1.3 and build and push opqr-0.1.3.gem to https://rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run tests" fullCommand="test" id="test" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
+</module>

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

data/Gemfile

@@ -11,3 +11,4 @@ gem "minitest", "~> 5.0"
 
 gem 'websocket-eventmachine-server', '~> 1.0'
 
+gem 'faye-websocket', '~> 0.11.2'

data/Gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: .
+  specs:
+    opqr (0.1.3)
+      faye-websocket (~> 0.11.2)
+
+GEM
+  remote: https://gems.ruby-china.com/
+  specs:
+    eventmachine (1.2.7)
+    faye-websocket (0.11.2)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    minitest (5.17.0)
+    rake (13.0.6)
+    websocket (1.2.9)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-eventmachine-base (1.2.0)
+      eventmachine (~> 1.0)
+      websocket (~> 1.0)
+      websocket-native (~> 1.0)
+    websocket-eventmachine-server (1.0.1)
+      websocket-eventmachine-base (~> 1.0)
+    websocket-extensions (0.1.5)
+    websocket-native (1.0.0)
+
+PLATFORMS
+  x64-mingw-ucrt
+
+DEPENDENCIES
+  faye-websocket (~> 0.11.2)
+  minitest (~> 5.0)
+  opqr!
+  rake (~> 13.0)
+  websocket-eventmachine-server (~> 1.0)
+
+BUNDLED WITH
+   2.4.10

data/README.md

@@ -1,39 +1,24 @@
-# Opqr
-
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/opqr`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/opqr. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/opqr/blob/master/CODE_OF_CONDUCT.md).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Opqr project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/opqr/blob/master/CODE_OF_CONDUCT.md).
+## opqr
+
+OPQ机器人的Ruby语言SDK
+
+## 使用说明
+项目结构
+```ruby
+My_Project
+| |-plugins
+|     |---dxx.rb
+|---main.rb
+
+1、main.rb为入口文件
+2、plugins文件夹存放实现功能的插件
+3、具体见example文件夹
+```
+获取opqr
+```ruby
+gem install opqr
+```
+运行
+```ruby
+ruby main.rb
+```

data/example/main.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require 'opqr'
+# 加载插件
+plugin_dir = File.join(File.dirname(__FILE__), 'plugins')
+ps = OPQ::PluginLoader.new
+ps.load_all(plugin_dir)
+# 必须是个数组
+# 使用OPQ::QqObj.new创建需要监听消息的对象，加入对象数组ob
+# 功能请在插件目录添加插件实现
+ob = []
+ob << OPQ::QqObj.new(1294222408,ps.plugins)
+bot = OPQ::Bot.new("127.0.0.1",8086,ob)
+

data/example/plugins/dxx.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'opqr'
+# ctx结构如下
+# @type
+# @from_uin
+# @sender_uin
+# @text
+# @msg_type
+# @raw_json
+
+class Dxx < OPQ::PluginBase
+  def receive_qq(qq, ctx)
+    p "dxx收到来自好友的消息"
+    OPQ::Api.new.send_text_qq(941094692,"我现在发消息给你",qq)
+  end
+  def receive_group(qq, ctx)
+    p "dxx收到了来自群的消息"
+    if ctx.text == "回我"
+    OPQ::Api.new.send_text_group(435994283,"我收到了你的消息",qq)
+    end
+  end
+end

data/lib/opqr/bot.rb

@@ -5,13 +5,12 @@ require_relative 'api'
 module OPQ
   class Bot
     attr_accessor :observer, :ws
-    def initialize(api_url, http_port, websocket_port, observers)
+    def initialize(api_url, http_port, observers)
       $http_port = http_port
-      $websocket_port = websocket_port
       $api_url = api_url
       @observer = Observer.new(observers)
       puts "[BOT] 正在尝试连接WS，请稍等~"
-      @ws = WsServer.new(api_url,websocket_port, @observer)
+      @ws = WsServer.new(@observer)
     end
   end
 end

data/lib/opqr/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Opqr
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/opqr/wsserver.rb

@@ -1,30 +1,45 @@
 # encoding=utf-8
 require 'eventmachine'
 require 'websocket-eventmachine-server'
+require 'faye/websocket'
 module OPQ
   class WsServer
-    def initialize(host, port, observer)
-      @host = host
-      @port = port
+    def initialize(observer)
       @observer = observer
       self.start
     end
     def start
-        EM.run do
-          WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => @port, :mode => :async) do |ws|
-            ws.onopen do
-              puts "[WS] 连接已建立"
-            end
-            ws.onmessage do |msg, type|
-              puts "[WS] 收到数据-->".force_encoding('UTF-8')+ "#{msg}".force_encoding('UTF-8')
-              @observer.on_message_received(msg)
-            end
+      EM.run {
+        ws = Faye::WebSocket::Client.new('ws://'+$api_url+':'+$http_port+'/ws')
+        ws.on :open do |event|
+          puts "[WS] 连接已建立"
+        end
+
+        ws.on :message do |event|
+          puts "[WS] 收到数据-->".force_encoding('UTF-8')+ "#{event.data}".force_encoding('UTF-8')
+          @observer.on_message_received(event.data)
+        end
 
-            ws.onclose do
-              puts "[WS] 连接已断开"
-            end
-          end
+        ws.on :close do |event|
+          puts "[WS] 连接已断开"
+          ws = nil
         end
+      }
+        # EM.run do
+        #   WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => @port, :mode => :async) do |ws|
+        #     ws.onopen do
+        #       puts "[WS] 连接已建立"
+        #     end
+        #     ws.onmessage do |msg, type|
+        #       puts "[WS] 收到数据-->".force_encoding('UTF-8')+ "#{msg}".force_encoding('UTF-8')
+        #       @observer.on_message_received(msg)
+        #     end
+        #
+        #     ws.onclose do
+        #       puts "[WS] 连接已断开"
+        #     end
+        #   end
+        # end
     end
   end
 

data/opqr.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "websocket-eventmachine-server", '~> 1.0'
-
+  spec.add_dependency 'faye-websocket', '~> 0.11.2'
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opqr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - intchensc
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-server
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.11.2
 description:
 email:
 - intchensc@qq.com
@@ -31,12 +31,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".idea/.gitignore"
+- ".idea/modules.xml"
+- ".idea/opqr.iml"
+- ".idea/vcs.xml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- example/main.rb
+- example/plugins/dxx.rb
 - lib/opqr.rb
 - lib/opqr/api.rb
 - lib/opqr/bot.rb