ExistRuby 2019.1.23 → 2022.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fbc668932a6edab8aed5b49ccde3bd19df01de62
-  data.tar.gz: b78fe070a12afbc02b2909c8a9aa997d07fb13da
+SHA256:
+  metadata.gz: b9bef4f3ba1fe32c10e576a41a2a9ffc48274092a1e80f67b1cb444b694a65c7
+  data.tar.gz: 795bbe7d57adfd0474ecae3d2cc4a887f15deaca8f50c55e41581f690f0f414e
 SHA512:
-  metadata.gz: c14632e8266eec00774ae6d1bf04355b5283dcb98378911878cec2864cd3126c26d8e0452071e98376b7d19a19900f9ab28da4741380fd681ceb84ff5b0608c1
-  data.tar.gz: 79d33a10deeb037c96f26795a4e39b34fbd25b2880440f1f9936fc62d410d78e0ffe54c57112911485f065b5ec9746a08a0a0a663699ebbdb66c9f3d8fa6e5e2
+  metadata.gz: 3cf39729bdf16d60c4c58c3853e7f42ecc35fc90e2cfecfc71f63b9214627b8620f201212a9809430d4ea749534f7ff7299624f96c2eca621debe72218819d23
+  data.tar.gz: a31066d510ecc118e8b6dfd7cb45d8057e5fc76a1e3e9bec921fbdf4c404c832e41946d66d6d43eba22c47ae82c5f85b79619b7a7222bdfdabb8cdba8af8b5f4

data/lib/ExistRuby/MulticastHandler.rb

@@ -14,7 +14,8 @@ class MulticastHandler < EventMachine::Connection
     end
     
     def receive_data(data)
-#         puts data
+        #puts "received #{data}"
+        ExistRuby::processMessage(data) # 处理消息
     end
     
     def post_init

data/lib/ExistRuby.rb

@@ -1,9 +1,29 @@
 #!/usr/bin/env ruby
 
-require 'ExistRuby/ExistMessage_pb'
+#require 'ExistRuby/ExistMessage_pb'
 require 'ExistRuby/MulticastHandler'
+require 'cbor'
 
 class ExistRuby
+  SERVICEPUBLISH=0 # 服务发布。
+  
+  def self.setController(controller)
+    @@controller=controller # 记录
+  end
+  
+  def self.processMessage(data) # 处理消息
+    messageObject=CBOR.decode(data) # 解析消息。
+    #puts "message object: #{messageObject}" # Debug
+    
+    if messageObject['messageType']==0 # 服务发布消息。
+      servicePublishMessage=CBOR.decode(messageObject['servicePublishMessage'])
+      #puts "service publish message: #{servicePublishMessage}" # Debug.
+      
+      @@controller.reportServiceDetected(servicePublishMessage['name'], servicePublishMessage['port'], servicePublishMessage['protocolType']) # 报告已经发现了服务。
+    else # 服务探测消息。
+    end
+  end
+  
     def initialize
         host = '239.173.40.5' #组播组主机地址。
         port = 11500 #组播组端口。
@@ -22,19 +42,33 @@ class ExistRuby
     #   lanServicePort: (int)
     #   lanServiceProtocolType: (enum)
     def publishService(lanServiceName, lanServicePort, lanServiceProtocolType)
-        existMessage=Com::Stupidbeauty::Exist::ExistMessage.new #消息体。
+        #existMessage=Com::Stupidbeauty::Exist::ExistMessage.new #消息体。
 
-        existMessage.messageType= Com::Stupidbeauty::Exist::ExistMessage::MessageType::SERVICEPUBLISH #设置消息类型。
+        #existMessage.messageType= Com::Stupidbeauty::Exist::ExistMessage::MessageType::SERVICEPUBLISH #设置消息类型。
 
-        existMessage.servicePublishMessage=Com::Stupidbeauty::Exist::ServicePublishMessage.new #创建服务发布消息体。
+        #existMessage.servicePublishMessage=Com::Stupidbeauty::Exist::ServicePublishMessage.new #创建服务发布消息体。
         
-        existMessage.servicePublishMessage.name=lanServiceName #设置服务名字。
-        existMessage.servicePublishMessage.port=lanServicePort #设置端口号。
-        existMessage.servicePublishMessage.protocolType=lanServiceProtocolType #设置协议类型。
+        #existMessage.servicePublishMessage.name=lanServiceName #设置服务名字。
+        #existMessage.servicePublishMessage.port=lanServicePort #设置端口号。
+        #existMessage.servicePublishMessage.protocolType=lanServiceProtocolType #设置协议类型。
+
+        #packageString=Com::Stupidbeauty::Exist::ExistMessage.encode(existMessage) #序列化为字符串。
+      
+      servicePublishMessage={} # 服务发布消息。
+      servicePublishMessage['name']=lanServiceName # 服务名字。
+      servicePublishMessage['port']=lanServicePort # 服务端口
+      servicePublishMessage['protocolType']=lanServiceProtocolType # 协议类型。
+      
+      servicePublishMessageBytteArray=servicePublishMessage.to_cbor # 服务发布消息体。
 
-        packageString=Com::Stupidbeauty::Exist::ExistMessage.encode(existMessage) #序列化为字符串。
+      existMessage={} # 我存在消息体。
+      existMessage['messageType']=SERVICEPUBLISH # 服务发布。
+      
+      existMessage['servicePublishMessage']=servicePublishMessageBytteArray # 服务发布消息体。
+      
+      replyByteArray = existMessage.to_cbor # # 打包成字节数组。
 
         #发送：
-        @networkThread.castData(packageString) #发送数据。
+        @networkThread.castData(replyByteArray) #发送数据。
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ExistRuby
 version: !ruby/object:Gem::Version
-  version: 2019.1.23
+  version: 2022.1.31
 platform: ruby
 authors:
 - Hxcan Cai
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hx_cbor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2021.8.20
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2021.8.20
 description: Exist ruby. Auto service discovery in the LAN.
 email: caihuosheng@gmail.com
 executables: []
@@ -57,7 +71,7 @@ homepage: http://rubygems.org/gems/ExistRuby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,9 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Exist ruby.
 test_files: []