don't delete anything

[zc] / zc-mqtt

diff --git a/zc-mqtt b/zc-mqtt
index 5a6cd86..e1593be 100755 (executable)
--- a/zc-mqtt
+++ b/zc-mqtt
@@ -117,6 +117,9 @@ while (1) {
         print $msg->string, "\n";
       }
 
+      # skip retained
+      next if $msg->string =~ m{Publish/at-most-once,retain};
+
        my $topic = $msg->topic;
        # Inclinometer/ZCT330Ex_SWP_N_YK/869858031634109/up
        my $dir = $topic; # leave imei in dir
@@ -132,29 +135,32 @@ while (1) {
        mkdir "$queue/$dir/$date" if ! -d "$queue/$dir/$date";
        write_file "$queue/$dir/$date/$time.$t.$up_down.$function_code", $msg->message;
 
-       if ( substr($msg->message,2,1) eq "\x07" ) { # heartbeat
-               $topic =~ s/up$/down/;
-
-               my @all_pending = sort glob "$queue/$dir/.pending/*";
-               if ( my $pending = shift @all_pending ) {
-                       my $raw = read_file $pending;
-                       my $pending_function_code = unpack('C',substr($msg->message,2,1));
-
-                       send_message($socket,
-                               message_type => MQTT_PUBLISH,
-                               retain => 0, #$retain,
-                               topic => $topic,
-                               message => $raw);
-                       $pending =~ s{$queue/$dir/.pending/}{};
-                       rename "$queue/$dir/.pending/$pending", "$queue/$dir/$pending.sent.$pending_function_code";
-               }
-
+       if ( $function_code == 7 || $function_code == 8 ) { #  7 = heartbeat, 8 = alarm
                my $hash = protocol_decode( $up_down, $msg->message );
                $sth->execute( map { $hash->{data_id}->{$_} } @insert_data_ids );
 
 
       }
 
+
+       # send pending messages on any connection
+       my @all_pending = sort glob "$queue/$dir/.pending/*";
+       if ( my $pending = shift @all_pending ) {
+               my $raw = read_file $pending;
+               my $pending_function_code = unpack('C',substr($msg->message,2,1));
+
+               $topic =~ s/up$/down/;
+
+               send_message($socket,
+                       message_type => MQTT_PUBLISH,
+                       retain => 0, #$retain,
+                       topic => $topic,
+                       message => $raw);
+               $pending =~ s{$queue/$dir/.pending/}{};
+               rename "$queue/$dir/.pending/$pending", "$queue/$dir/$pending.sent.$pending_function_code";
+       }
+
+
       if (defined $count && --$count == 0) {
         exit;
       }