mqtt-sub_handler 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea6058ba5750daeebbf41696765e1702b60495a
-  data.tar.gz: 3dbea34eea6371096173df3cccf2468d682e0786
+  metadata.gz: 7e09d59deb9258997fe1da980c6829a8a8a46bdc
+  data.tar.gz: a1c0f844c2c1091264b76ce512ce7c3ec0d2208c
 SHA512:
-  metadata.gz: 9cda8aadc97990675ca7d3b443fa69f82dfb253a4c67eddad0f0bc7a769b24012d30947cd8e7d72df417eea919981590a17e3166e7aa31f9a7deb6bde58d9478
-  data.tar.gz: 1cf6cd63dde250ad6da0d09dbea8b0610cbd375db61305df229d31951961902d26d789fe476b77b9d9be932f9ffcf779474d70372b8a2c30bbbee84d8582534b
+  metadata.gz: d9a99a82f2d2f83c088ddf25230db211796a1b6f435f976052fc6f5075d79eadf3ccbc4d6bf78b797a388ecd6f8aece4cde3e88152d40b50f1d897d8f65166e3
+  data.tar.gz: d0412d540d2b44a00879b1965b9bc46301d2d716135229fb43d5fbf84565d664488993ec9177836b5ad2b23ca8160f22dceeda23b8f6749809d45707101ca290

data/lib/mqtt/mqtt_hash.rb

@@ -0,0 +1,73 @@
+
+require 'json'
+
+require_relative 'sub_handler.rb'
+
+module MQTT
+	class TXHash
+		attr_reader :hash
+
+		def publish_layer(currentHash = nil, currentList = nil)
+			currentHash ||= @hash;
+			currentList ||= Array.new();
+
+			status = catch(:halt) do
+				loop do
+					throw :halt, :publish_layer 			if currentList[-1] == "+"
+					throw :halt, :publish_all_layered	if currentList[-1] == "#"
+					throw :halt, :publish_hash 			if currentList.length == @topicList.length
+
+					currentList << @topicList[currentList.length]
+				end
+			end
+
+			case status
+			when :publish_hash
+				@mqtt.publish_to currentList.join("/"), currentHash.to_json, retain: true
+
+			when :publish_layer
+				if(currentHash.is_a? Hash) then
+					currentHash.each do |key, val|
+						newList = currentList.clone();
+						newList[-1] = key;
+						publish_layer(val, newList);
+					end
+				else
+					@mqtt.publish_to currentList.join("/"), currentHash.to_json, retain: true
+				end
+
+			when :publish_all_layered
+				if(currentHash.is_a? Hash) then
+					currentHash.each do |key, val|
+						publish_layer(val, (currentList.clone[-1] = key)<<"#");
+					end
+				else
+					@mqtt.publish_to currentList.join("/"), currentHash.to_json, retain: true
+				end
+			end
+		end
+		alias update_hash publish_layer
+		private :update_hash
+
+		def initialize(mqtt, topic, startHash: Hash.new)
+			@mqtt	 = mqtt;
+			@topicList = MQTT::SubHandler.get_topic_split(topic);
+
+			@hash  = startHash;
+		end
+
+		def hash=(newHash)
+			@hash = newHash;
+			update_hash
+		end
+
+		def [](key)
+			return @hash[key]
+		end
+
+		def []=(key, val)
+			@hash[key]= val
+			update_hash
+		end
+	end
+end

data/lib/mqtt/sub_handler.rb

@@ -67,7 +67,9 @@ class SubHandler
 		@callbackList.each do |h|
 			tMatch = SubHandler.getTopicMatch(topic, h.topic_split);
 			if tMatch
-				h.offer(tMatch, data)
+				Timeout.timeout(3) {
+					h.offer(tMatch, data)
+				}
 				topicHasReceivers = true;
 			end
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/mqtt/Waitpoint.rb
+- lib/mqtt/mqtt_hash.rb
 - lib/mqtt/persistence.rb
 - lib/mqtt/persistence_extensions.rb
 - lib/mqtt/sub_handler.rb