CQHTTP 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f5a329e4ce5dc8b0472737f61d828a43e95c6f
-  data.tar.gz: 959f0d0984d8121fe4e525a618aba376f712cae9
+  metadata.gz: 1af39bae6b5ce49f4525cb37041f90a35f685833
+  data.tar.gz: b4c17f35245594f7c576a79710c14495af48df95
 SHA512:
-  metadata.gz: 1d487d975cfcf243045d29bdaf35c7702907e7867d2074cb22d6f075bcfc30807a7a3f173bf6e9d68b9ac493e4f2d4fb41734c655d853b1a660ae7bbd19ed0f3
-  data.tar.gz: e02241186ec51057dd9b82636876503c1094e01f241a8cdeb11b0ac30a4df68714dcee21b8e4df5816505ac8681bf5b438b7db494b16eda5f4ea7f010b87357f
+  metadata.gz: 66b73f44ef7f147a2811bb324cfa427e5f9ac941337c3ed705e97b5e8612ce3a36198060f6db4c76efa0297e3d349642636aeb3fb7f4132c6b0ce8cc650b6ceb
+  data.tar.gz: fb11483346c7dff8a5b2fc0170d4e33bd2c336ec87c9b3f2957376d960acdf47e27993ce59105e2a8bbfccff54c38c32c4c29b140156659e76e2c42daa066aeb

data/CQHTTP.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake',    '~> 10.0'
   spec.add_development_dependency 'rspec',   '~> 3.0'
+
+  spec.add_dependency 'ruby-dbus', '~> 0.13.0'
 end

data/exe/cqhttp-dbus

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require 'CQHTTP'
+require 'dbus'
+Thread.abort_on_exception = true
+
+# DBus
+class CQHTTP2DBus < DBus::Object
+  dbus_interface 'org.dastudio.cqhttp' do
+    dbus_signal :message, 'message_type:s, json:s'
+    dbus_signal :event, 'event:s, json:s'
+    dbus_signal :friend_request, 'json:s'
+    dbus_signal :join_request, 'json:s'
+    dbus_signal :invite_request, 'json:s'
+    dbus_signal :all, 'json:s'
+    dbus_signal :unknow, 'json:s'
+  end
+end
+
+def cqhttp2dbus(c, obj)
+  j = c.json
+  obj.all j.to_json
+  case j['post_type']
+  when 'message' then obj.message j['message_type'], j.to_json
+  when 'event' then obj.event j['event'], j.to_json
+  when 'request'
+    case j['request_type']
+    when 'friend' then obj.friend_request j.to_json
+    when 'group'
+      case j['sub_type']
+      when 'add' then obj.join_request j.to_json
+      when 'invite' then obj.invite_request j.to_json
+      else obj.unknow j.to_json
+      end
+    else obj.unknow j.to_json
+    end
+  else obj.unknow j.to_json
+  end
+end
+
+bus = DBus::SessionBus.instance
+service = bus.request_service 'org.dastudio.qq'
+obj = CQHTTP2DBus.new '/org/dastudio/qq'
+service.export obj
+
+cqhttp = CQHTTP::Service.new
+cqhttp.bind ->(c) { cqhttp2dbus c, obj }
+
+Thread.new { cqhttp.run }
+
+main = DBus::Main.new
+main << bus
+main.run

data/lib/CQHTTP/service.rb

@@ -0,0 +1,42 @@
+module CQHTTP
+  # TODO
+  class Service
+    attr_reader :json
+
+    def initialize(hostname: '0.0.0.0', port: 9455)
+      @server = TCPServer.new(hostname, port)
+      @event_method = []
+    end
+
+    def bind(func)
+      @event_method << func
+    end
+
+    def run
+      loop do
+        socket = @server.accept
+
+        head socket if $VERBOSE
+
+        socket.print "HTTP/1.1 204\r\nContent-Type: application/json\r\n\r\n"
+        data = socket.gets
+        @json = JSON.parse data
+
+        @event_method.each { |func| func.call self }
+
+        socket.close
+      end
+    end
+
+    private
+
+    def head(socket)
+      puts 'head'
+      while (line = socket.gets) != "\r\n"
+        print '  '
+        puts line
+      end
+      puts 'end'
+    end
+  end
+end

data/lib/CQHTTP/version.rb

@@ -1,3 +1,3 @@
 module CQHTTP
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/CQHTTP.rb

@@ -1,7 +1,8 @@
 require 'CQHTTP/version'
 
-require 'CQHTTP/api.rb'
-require 'CQHTTP/network.rb'
+require 'CQHTTP/api'
+require 'CQHTTP/network'
+require 'CQHTTP/service'
 
 require 'uri'
 require 'net/http'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CQHTTP
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,10 +52,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-dbus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 description: 
 email:
 - DAStudio.71e6fd52@gmail.com
-executables: []
+executables:
+- cqhttp-dbus
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,10 +84,12 @@ files:
 - bin/console
 - bin/gen_api_list
 - bin/setup
+- exe/cqhttp-dbus
 - lib/CQHTTP.rb
 - lib/CQHTTP/API.md
 - lib/CQHTTP/api.rb
 - lib/CQHTTP/network.rb
+- lib/CQHTTP/service.rb
 - lib/CQHTTP/version.rb
 homepage: https://github.com/71e6fd52/cqhttp-ruby
 licenses: []