mqtt-sub_handler 0.1.6 → 0.1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d57768280da99134fc12c1ab6d07b441df823f59992d88411a1bc8b88cfe16
-  data.tar.gz: 34ead01f1186b52591969071404c2812badd339e17a404178b44295d6d6ed8e8
+  metadata.gz: bfe901d34d1a891840006f77467ef0929bfb9ff1363ccc3ece47cf35454178b0
+  data.tar.gz: 1e601e44349b5e360068d3e07a4a59caa0254cfc2aaee1e1f870fe1069041e96
 SHA512:
-  metadata.gz: 11569eef332d8d8c186b6c246bfd32bea0643270152e27c06b1e92e560c93a091809a2994c3424fd36ed9e0d2898defcc8f45e7e57da3879a276e837d6e2b663
-  data.tar.gz: a1d962a3af87a942f45af28540b5902903cf0e37a569d7b174793dd471183c8337fc95f1bd4f0a06a9b9997cb04da78e60ed663be399968bddced5e641ad0aad
+  metadata.gz: 589b2c0307aa5ec6aa0e253805d8b095ce73997bd9461bc7abc060d306ac6f1b5c8ff18ddee861a1c2d43d6b7e3685bacb9b4994360b106c1ad19791c91bd511
+  data.tar.gz: 4d5d90483bfa7ce80c4c6359d5fb38faad29a08f447d987cebf1779597190c4e7d692950a0bafa1d63b98d5d76d5fcdedd696b6385ab170a5c917da0c4ef0ac0

data/lib/mqtt/sub_handler.rb

@@ -74,7 +74,7 @@ class SubHandler
 						h.offer(tMatch, data)
 					}
 				rescue Timeout::Error
-					STDERR.puts "MQTT Callback Timeout #{h}"
+					STDERR.puts "MQTT: Callback Timeout #{h}".red
 				end
 				topicHasReceivers = true;
 			end
@@ -84,10 +84,18 @@ class SubHandler
 	end
 	private :call_interested
 
+	def queue_packet(data)
+		@packetQueueMutex.synchronize {
+			@packetQueue << data;
+			@packetQueue.shift if @packetQueue.size > 100
+
+			@publisherThread.run() if @publisherThreadWaiting;
+		}
+	end
+
 	# Handle sending a subscription-message to the server
 	def raw_subscribe_to(topic, qos: 1)
-		@subscribeQueue << [topic, qos];
-		@publisherThread.run();
+		queue_packet({topic: topic, qos: qos, type: :sub});
 	end
 	private :raw_subscribe_to
 
@@ -211,8 +219,14 @@ class SubHandler
 			data = data.to_json
 		end
 
-		@publishQueue << {topic: topic, data: data, qos: qos, retain: retain}
-		@publisherThread.run();
+		if(qos > 1)
+			qos = 1
+			STDERR.puts("MQTT push with QOS > 1 was attempted, this is not supported yet!".yellow) unless $MQTTPubQOSWarned
+
+			$MQTTPubQOSWarned = true;
+		end
+
+		queue_packet({type: :pub, topic: topic, data: data, qos: qos, retain: retain});
 	end
 	alias publishTo publish_to
 
@@ -259,40 +273,47 @@ class SubHandler
 
 	def mqtt_push_thread
 		loop do
+			@packetQueueMutex.synchronize {
+				@publisherThreadWaiting = true;
+			}
 			Thread.stop();
+			@packetQueueMutex.synchronize {
+				@publisherThreadWaiting = false;
+			}
 
 			next unless @connected
 
 			begin
-				until @subscribeQueue.empty? do
-					h = @subscribeQueue[-1];
-					Timeout.timeout(3) {
-						@mqtt.subscribe(h[0] => h[1]);
+				until @packetQueue.empty? do
+					h = nil;
+					@packetQueueMutex.synchronize {
+						h = @packetQueue[0];
 					}
-					@subscribeQueue.pop;
-					sleep 0.01
-				end
-				until @publishQueue.empty? do
-					h = @publishQueue[-1];
 					Timeout.timeout(3) {
-						@mqtt.publish(h[:topic], h[:data], h[:retain], h[:qos]);
+						if(h[:type] == :sub)
+							@mqtt.subscribe(h[:topic] => h[:qos]);
+						elsif(h[:type] == :pub)
+							@mqtt.publish(h[:topic], h[:data], h[:retain], h[:qos]);
+						end
 					}
-					@publishQueue.pop;
-					sleep 0.01
-				end
-			rescue MQTT::Exception, SocketError, SystemCallError, Timeout::Error
-					@conChangeMutex.synchronize {
-						@connected = false;
+					@packetQueueMutex.synchronize {
+						@packetQueue.shift();
 					}
-					@mqtt.disconnect();
+				end
+			rescue MQTT::Exception, SocketError, SystemCallError, Timeout::Error => e
+					STDERR.puts("MQTT: #{@mqtt.host} push error, disconnecting!".red) if @connected
+					STDERR.puts(e.inspect);
+
+					sleep 1
 			end
 		end
 	end
 	private :mqtt_push_thread
 
 	def mqtt_resub_thread
-		while(true)
+		loop do
 			begin
+				STDERR.puts("MQTT: #{@mqtt.host} trying reconnect...".yellow)
 				Timeout.timeout(4) {
 					@mqtt.connect()
 				}
@@ -300,12 +321,16 @@ class SubHandler
 				@conChangeMutex.synchronize {
 					@connected = true;
 				}
-				@publisherThread.run();
+
+				@packetQueueMutex.synchronize {
+					@publisherThread.run() if (@publisherThread && @publisherThreadWaiting)
+				}
+
 				@mqtt.get do |topic, message|
 					call_interested(topic, message);
 				end
 			rescue MQTT::Exception, Timeout::Error, SocketError, SystemCallError
-				STDERR.puts("MQTT #{@mqtt.host} disconnected!".red);
+				STDERR.puts("MQTT: #{@mqtt.host} disconnected!".red) if @connected
 				@connected = false;
 
 				@conChangeMutex.unlock if @conChangeMutex.owned?
@@ -328,11 +353,11 @@ class SubHandler
 		Thread.stop();
 	end
 	def flush_pubqueue()
-		unless @publishQueue.empty?
+		unless @packetQueue.empty?
 			print "Finishing sending of MQTT messages ... "
 			begin
 				Timeout.timeout(4) {
-					until @publishQueue.empty? do
+					until @packetQueue.empty? do
 						sleep 0.05;
 					end
 				}
@@ -370,8 +395,10 @@ class SubHandler
 
 		@mqtt.client_id ||= MQTT::Client.generate_client_id("MQTT_Sub_", 8);
 
-		@publishQueue 		= Array.new();
-		@subscribeQueue 	= Array.new();
+		@packetQueue = Array.new();
+		@packetQueueMutex = Mutex.new();
+		@publisherThreadWaiting = false;
+
 		@subscribedTopics 	= Hash.new();
 
 		@trackerHash = Hash.new();
@@ -382,13 +409,8 @@ class SubHandler
 		end
 		@listenerThread.abort_on_exception = true;
 
-		@publisherThread = Thread.new do
-			mqtt_push_thread();
-		end
-		@publisherThread.abort_on_exception = true;
-
 		begin
-			Timeout.timeout(3) {
+			Timeout.timeout(5) {
 				until(@connected)
 					sleep 0.1;
 				end
@@ -397,10 +419,15 @@ class SubHandler
 			STDERR.puts "MQTT: #{@mqtt.host} did not connect!".red
 		end
 
+		@publisherThread = Thread.new do
+			mqtt_push_thread();
+		end
+		@publisherThread.abort_on_exception = true;
+
 		at_exit {
 			flush_pubqueue();
+			@connected = false;
 			@listenerThread.kill();
-			@publisherThread.kill();
 			ensure_clean_exit();
 		}
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sub_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.6.2
 platform: ruby
 authors:
 - Xasin