rsmp 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e36c6f5f96850c9ad1a07ab856efc1e094deafee596074a611a08a2535f57ec
-  data.tar.gz: efedbe0726d80f1fff7e3d37fa171fa1afe1df1705cf50e142eee0667c6e8dff
+  metadata.gz: 957caaa3191011a85a0284ef530434184e15620b7762e4971a8547f45a955ec3
+  data.tar.gz: 8905eb13b36d26d6c50fe0e4466f40e2f742d18384e93bc2b7e67d2e77975441
 SHA512:
-  metadata.gz: 6f4362c8689573a0c7ce8e91ea079c0ce06a6b8d73bc27ce964d781dd64ee53b92c271a7ba41f31e89af62475adf341ae2a5b6682418758d3558930e72c037d3
-  data.tar.gz: 9f595995ec7247fdfb2e782e235c83adb475b1db85c8834aa434a42b5bc5e1ca6f4ae8e71233473bcee21b7c722b8f5a4862a8531098f793f629e7832b0eda3c
+  metadata.gz: 100b1c357a27939ec7142ac0f63e9589ee36a044bfc54fcaea30303c2fb1eba277a3d0e1927f578fabe99717f9ffeaa83f5eceeb65dd7492d260458ab4d61689
+  data.tar.gz: 729b6355adef1914f9621c10c69bd88318c688b40ef2881125a0783ed83533a4f34bc1e1192e338d073f44af4e7ae6c416732693622fa7ef478a48b63c31ba7d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.11.5)
+    rsmp (0.12.0)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -27,7 +27,7 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    console (1.14.0)
+    console (1.15.0)
       fiber-local
     contracts (0.17)
     cucumber (7.1.0)

data/config/tlc.yaml

@@ -51,8 +51,11 @@ security_codes:
 log:
   ip: false
   site_id: 9
-  component: 2
+  component: 3
   level: false
   debug: true
   json: true
 live_output: tmp/tlc.state
+skip_validation:
+  - AlarmSuspend
+  - AlarmResume

data/lib/rsmp/alarm_state.rb

@@ -0,0 +1,25 @@
+module RSMP
+  # class that tracks the state of an alarm
+  class AlarmState
+    attr_reader :component_id, :code, :acknowledged, :suspended, :active, :timestamp, :category, :priority
+
+    def initialize component_id:, code:
+      @component_id = component_id
+      @code = code
+      @acknowledged = false
+      @suspended = false
+      @active = false
+      @timestamp = nil
+      @category = nil
+      @priority = nil
+    end
+
+    def suspend
+      @suspended = true
+    end
+
+    def resume
+      @suspended = false
+    end
+  end
+end

data/lib/rsmp/collect/collector.rb

@@ -159,6 +159,7 @@ module RSMP
         if message.attribute('oMId') == @options[:m_id]
           m_id_short = RSMP::Message.shorten_m_id @options[:m_id], 8
           cancel RSMP::MessageRejected.new("#{@title} #{m_id_short} was rejected with '#{message.attribute('rea')}'")
+          @notifier.log "#{identifier}: cancelled due to a NotAck", level: :debug
           true
         end
       end

data/lib/rsmp/collect/state_collector.rb

@@ -186,19 +186,19 @@ module RSMP
       @queries.each do |query|
         want = query.want
         got = query.got
-        if got['cCI']
+        if want['cCI']
           cCI = want['cCI']
           h[cCI] ||= {}
           cO = want['cO']
           h[cCI][cO] ||= {}
           n = want['n']
-          v = got['v']
+          v = got ? got['v'] : nil
           h[cCI][cO][n] = v
         elsif want['sCI']
           sCI = want['sCI']
           h[sCI] ||= {}
           n = want['n']
-          s = got['s']
+          s = got ? got['s'] : nil
           h[sCI][n] = s
         end
       end

data/lib/rsmp/component.rb

@@ -1,72 +1,10 @@
 module RSMP
 
-  # Class that represents an RMSP component.
-  # Currently this class is used by both SiteProxy and SupervisorProxy, and can
-  # therefore represent either a local or remote (proxy) component.
-
-  class Component
-    include Inspect
-
-    attr_reader :c_id, :node, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
-
-    AGGREGATED_STATUS_KEYS = [ :local_control,
-                               :communication_distruption,
-                               :high_priority_alarm,
-                               :medium_priority_alarm,
-                               :low_priority_alarm,
-                               :normal,
-                               :rest,
-                               :not_connected ]
+  # RSMP component
 
+  class Component < ComponentBase
     def initialize node:, id:, grouped: false
-      @c_id = id
-      @node = node
-      @grouped = grouped
-      @alarms = {}
-      @statuses = {}
-      @subscribes = {}
-      clear_aggregated_status
-    end
-
-    def clear_aggregated_status
-      @aggregated_status = []
-      @aggregated_status_bools = Array.new(8,false)
-      @aggregated_status_bools[5] = true
-    end
-
-    def set_aggregated_status status, options={}
-      status = [status] if status.is_a? Symbol
-      raise InvalidArgument unless status.is_a? Array
-      input = status & AGGREGATED_STATUS_KEYS
-      if input != @aggregated_status
-        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
-          @aggregated_status_bools[index] = status.include?(key)
-        end
-        aggregated_status_changed options
-      end
-    end
-
-    def set_aggregated_status_bools status
-      raise InvalidArgument unless status.is_a? Array
-      raise InvalidArgument unless status.size == 8
-      if status != @aggregated_status_bools
-        @aggregated_status = []
-        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
-          on = status[index] == true
-          @aggregated_status_bools[index] = on
-          @aggregated_status << key if on
-        end
-        aggregated_status_changed
-      end
-    end
-
-    def aggregated_status_changed options={}
-      @node.aggregated_status_changed self, options
-    end
-
-    def log str, options
-      default = { component: c_id}
-      @node.log str, default.merge(options)
+      super
     end
 
     def handle_command command_code, arg
@@ -77,108 +15,35 @@ module RSMP
       raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
     end
 
-    # handle incoming alarm
-    def handle_alarm message
-      code = message.attribute('aCId')
-      previous = @alarms[code]
-      if previous
-        unless message.differ?(previous)
-          raise RepeatedAlarmError.new("no changes from previous alarm #{previous.m_id_short}")
-        end
-        if Time.parse(message.attribute('aTs')) < Time.parse(previous.attribute('aTs'))
-          raise TimestampError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
-        end
-      end
-    ensure
-      @alarms[code] = message
-    end
-
-    # set alarm
-    def send_alarm code:, status:
-      # TODO
-      # we need to manage the state of alarms internally (an ALarm class probably),
-      # and handle request from the supervisor to suspend and resume alarms etc.
-      # when this state changes, we then send an alarm message
-      alarm = Alarm.new(
-        'cId' => c_id,
-        'aTs' => @node.clock.to_s,
-        'aCId' => code,
-        'aSp' => 'Issue',
-        'ack' => 'Acknowledged',
-        'sS' => 'notSuspended',
-        'aS' => status,
-        'cat' => 'D',
-        'pri' => '2',
-        'rvs' => []
-      )
-      @node.alarm_changed self, alarm
-    end
-
-    # Handle an incoming status respone, by storing the values
-    def handle_status_response message
-      store_status message, check_repeated: false
+    def get_alarm_state alarm_code
+      alarm = @alarms[alarm_code] ||= RSMP::AlarmState.new component_id: c_id, code: alarm_code
     end
 
-    # Handle an incoming status update, by storing the values
-    def handle_status_update message
-      store_status message, check_repeated: true
-    end
-
-    # Our proxy subscribed to status updates
-    # Store update rates, so we can check for repeated alarm if we asked for updates only
-    # when there's a change, not on a regular interval.
-    # After subscribing, an update status us send regarless of whether values changes,
-    # and we store that.
-    def handle_status_subscribe status_list
-      status_list.each do |item|
-        sCI, n, uRt = item['sCI'], item['n'], item['uRt']
-
-        # record the update rate, so we can check for repeated status values if rate is zero
-        @subscribes[sCI] ||= {}
-        @subscribes[sCI][n] = {'uRt'=>uRt}
-
-        # record that we expect an upeate, even though the value might not change
-        @statuses[sCI] ||= {}
-        @statuses[sCI][n] ||= {}
-        @statuses[sCI][n][:initial] = true
+    def suspend_alarm alarm_code
+      alarm_state = get_alarm_state alarm_code
+      if alarm.suspended == false
+        log "Suspending alarm #{alarm_code}", level: :info
+        alarm.suspend
+        @node.alarm_suspended_or_resumed alarm
+      else
+        log "Alarm #{alarm_code} already suspended", level: :info
       end
     end
 
-    # Our proxy unsubscribed to status updates.
-    # Update our list of update rates.
-    def handle_status_unsubscribe status_list
-      status_list.each do |item|
-        sCI, n = item['sCI'], item['n']
-        if @subscribes[sCI]
-          @subscribes[sCI].delete n
-        end
-        if @subscribes[sCI].empty?
-          @subscribes.delete sCI
-        end
-
-        # remove any mark that would allow the next update to be a repeat
-        item = @statuses.dig sCI, n
-        item.delete(:initial) if item
+    def resume_alarm alarm_code
+      alarm_state = get_alarm_state alarm_code
+      if alarm.suspended
+        log "Resuming alarm #{alarm_code}", level: :info
+        alarm.resume
+        @node.alarm_suspended_or_resumed alarm
+      else
+        log "Alarm #{alarm_code} not suspended", level: :info
       end
     end
 
-    # Store the latest status update values, optionally
-    # checking that we're not receiving unchanged values if we're subscribed
-    # wit updates only on change
-    def store_status message, check_repeated:
-      message.attribute('sS').each do |item|
-        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
-        uRt = @subscribes.dig(sCI,n,'uRt')
-        new_values = {'s'=>s,'q'=>q}
-        old_values = @statuses.dig(sCI,n)
-        if check_repeated && uRt.to_i == 0
-          if new_values == old_values
-            raise RSMP::RepeatedStatusError.new "no change for #{sCI} '#{n}'"
-          end
-        end
-        @statuses[sCI] ||= {}
-        @statuses[sCI][n] = new_values
-      end
+    # send alarm
+    def send_alarm code:, status:
+      @node.alarm_changed self, alarm
     end
 
   end

data/lib/rsmp/component_base.rb

@@ -0,0 +1,69 @@
+module RSMP
+
+  # RSMP component base class.
+
+  class ComponentBase
+    include Inspect
+
+    attr_reader :c_id, :node, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
+
+    AGGREGATED_STATUS_KEYS = [ :local_control,
+                               :communication_distruption,
+                               :high_priority_alarm,
+                               :medium_priority_alarm,
+                               :low_priority_alarm,
+                               :normal,
+                               :rest,
+                               :not_connected ]
+
+    def initialize node:, id:, grouped: false
+      @c_id = id
+      @node = node
+      @grouped = grouped
+      @alarms = {}
+      clear_aggregated_status
+    end
+
+    def clear_aggregated_status
+      @aggregated_status = []
+      @aggregated_status_bools = Array.new(8,false)
+      @aggregated_status_bools[5] = true
+    end
+
+    def log str, options
+      default = { component: c_id}
+      @node.log str, default.merge(options)
+    end
+
+    def set_aggregated_status status, options={}
+      status = [status] if status.is_a? Symbol
+      raise InvalidArgument unless status.is_a? Array
+      input = status & AGGREGATED_STATUS_KEYS
+      if input != @aggregated_status
+        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
+          @aggregated_status_bools[index] = status.include?(key)
+        end
+        aggregated_status_changed options
+      end
+    end
+
+    def set_aggregated_status_bools status
+      raise InvalidArgument unless status.is_a? Array
+      raise InvalidArgument unless status.size == 8
+      if status != @aggregated_status_bools
+        @aggregated_status = []
+        AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
+          on = status[index] == true
+          @aggregated_status_bools[index] = on
+          @aggregated_status << key if on
+        end
+        aggregated_status_changed
+      end
+    end
+
+    def aggregated_status_changed options={}
+      @node.aggregated_status_changed self, options
+    end
+
+  end
+end

data/lib/rsmp/component_proxy.rb

@@ -0,0 +1,67 @@
+module RSMP
+
+  # A proxy to a remote RSMP component.
+
+  class ComponentProxy < ComponentBase
+    def initialize node:, id:, grouped: false
+      super
+      @statuses = {}
+      @allow_repeat_updates = {}
+    end
+
+    # allow the next status update to be a repeat value
+    def allow_repeat_updates subscribe_list
+      subscribe_list.each do |item|
+        sCI = item['sCI']
+        n = item['n']
+        @allow_repeat_updates[sCI] ||= Set.new  # Set is like an array, but with no duplicates
+        @allow_repeat_updates[sCI] << n
+      end
+    end
+
+    # Check that were not receiving repeated update values.
+    # The check is not performed for item with an update interval.
+    def check_repeat_values message, subscription_list
+      message.attribute('sS').each do |item|
+        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
+        uRt = subscription_list.dig(c_id,sCI,n,'uRt')
+        next if uRt.to_i > 0
+        next if @allow_repeat_updates[sCI] && @allow_repeat_updates[sCI].include?(n)
+        new_values = {'s'=>s,'q'=>q}
+        old_values = @statuses.dig(sCI,n)
+        if new_values == old_values
+          raise RSMP::RepeatedStatusError.new "no change for #{sCI} '#{n}'"
+        end
+      end
+    end
+        # Store the latest status update values
+    def store_status message
+      message.attribute('sS').each do |item|
+        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
+        @statuses[sCI] ||= {}
+        @statuses[sCI][n] = {'s'=>s,'q'=>q}
+
+        # once a value is received, don't allow the value to be a repeat
+        @allow_repeat_updates[sCI].delete(n) if @allow_repeat_updates[sCI]
+      end
+    end
+ 
+    # handle incoming alarm
+    def handle_alarm message
+#      code = message.attribute('aCId')
+#      previous = @alarms[code]
+#      if previous
+#        unless message.differ?(previous)
+#          raise RepeatedAlarmError.new("no changes from previous alarm #{previous.m_id_short}")
+#        end
+#        if Time.parse(message.attribute('aTs')) < Time.parse(previous.attribute('aTs'))
+#          raise TimestampError.new("timestamp is earlier than previous alarm #{previous.m_id_short}")
+#        end
+#      end
+#      p message
+#    ensure
+#      @alarms[code] = message
+    end
+
+ end
+end

data/lib/rsmp/components.rb

@@ -36,9 +36,9 @@ module RSMP
       @components[component.c_id] = component
     end
 
-    def build_component id:, type:, settings:{}
-      Component.new id:id, node: self, grouped: type=='main'
-    end
+    #def build_component id:, type:, settings:{}
+    #  Component.new id:id, node: self, grouped: type=='main'
+    #end
 
     def infer_component_type component_id
       Component

data/lib/rsmp/message.rb

@@ -61,15 +61,15 @@ module RSMP
 
     def self.build_alarm attributes
       case attributes["aSp"]
-      when 'Issue'
+      when /Issue/i
         AlarmIssue.new attributes
-      when 'Request'
+      when /Request/i
         AlarmRequest.new attributes
-      when 'Acknowledge'
+      when /Acknowledge/i
         AlarmAcknowledged.new attributes
-      when 'Suspend'
+      when /Suspend/i
         AlarmSuspend.new attributes
-      when 'Resume'
+      when /Resume/i
         AlarmResume.new attributes
       else
         Alarm.new attributes

data/lib/rsmp/proxy.rb

@@ -209,7 +209,6 @@ module RSMP
 
     def start_watchdog
       log "Starting watchdog with interval #{@site_settings['intervals']['watchdog']} seconds", level: :debug
-      send_watchdog
       @watchdog_started = true
     end
 
@@ -439,6 +438,7 @@ module RSMP
     end
 
     def will_not_handle message
+      "WILL NOT HANDLE"
       reason = "since we're a #{self.class.name.downcase}" unless reason
       log "Ignoring #{message.type}, #{reason}", message: message, level: :warning
       dont_acknowledge message, nil, reason

data/lib/rsmp/site.rb

@@ -93,9 +93,25 @@ module RSMP
       end
     end
 
-    def alarm_changed component, alarm
+    def alarm_state_to_message alarm_state
+      Alarm.new(
+        'cId' => alarm_state.component_id,
+        'aTs' => clock.to_s,
+        'aCId' => alarm_state.code,
+        'aSp' => (alarm_state.suspended ? 'Suspend' : 'Issue'),
+        'ack' => (alarm_state.acknowledged ? 'Acknowledged' : 'notAcknowledged'),
+        'sS' => (alarm_state.suspended ? 'suspended' : 'notSuspended'),
+        'aS' => (alarm_state.active ? 'Active' : 'inActive'),
+        'cat' => (alarm_state.category || 'D'),
+        'pri' => (alarm_state.priority || '2'),
+        'rvs' => []
+      )
+    end
+
+    def alarm_suspended_or_resumed alarm_state
+      alarm = alarm_state_to_message alarm_state
       @proxies.each do |proxy|
-        proxy.send_alarm component, alarm if proxy.ready?
+        proxy.send_message alarm if proxy.ready?
       end
     end
 
@@ -135,5 +151,9 @@ module RSMP
       end
       nil
     end
+
+    def build_component id:, type:, settings:{}
+      Component.new id:id, node: self, grouped: type=='main'
+    end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -12,6 +12,7 @@ module RSMP
       @supervisor = options[:supervisor]
       @settings = @supervisor.supervisor_settings.clone
       @site_id = options[:site_id]
+      @status_subscriptions = {}
     end
 
     # handle communication
@@ -47,7 +48,8 @@ module RSMP
     def handshake_complete
       super
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :log
+      start_watchdog
     end
 
     def process_message message
@@ -91,6 +93,20 @@ module RSMP
       @version_determined = true
     end
 
+    def acknowledged_first_ingoing message
+      case message.type
+      when "Watchdog"
+        send_watchdog
+      end
+    end
+
+    def acknowledged_first_outgoing message
+      case message.type
+      when "Watchdog"
+        handshake_complete
+      end
+    end
+
     def validate_ready action
       raise NotReady.new("Can't #{action} because connection is not ready. (Currently #{@state})") unless ready?
     end
@@ -152,14 +168,10 @@ module RSMP
     end
 
     def version_acknowledged
-      handshake_complete
     end
 
     def process_watchdog message
       super
-      if @watchdog_started == false
-        start_watchdog
-      end
     end
 
     def site_ids_changed
@@ -192,7 +204,7 @@ module RSMP
 
     def process_status_response message
       component = find_component message.attribute("cId")
-      component.handle_status_response message
+      component.store_status message
       log "Received #{message.type}", message: message, level: :log
       acknowledge message
     end
@@ -202,11 +214,23 @@ module RSMP
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       # additional items can be used when verifying the response,
-      # but must to remove from the subscribe message
+      # but must be removed from the subscribe message
       subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt') }
 
+      # update our subcription list
+      @status_subscriptions[component_id] ||= {}
+      subscribe_list.each do |item|
+        sCI = item["sCI"]
+        n = item["n"]
+        uRt = item["uRt"]
+        @status_subscriptions[component_id][sCI] ||= {}
+        @status_subscriptions[component_id][sCI][n] ||= {}
+        @status_subscriptions[component_id][sCI][n]['uRt'] = uRt
+      end
+
+      p @status_subscriptions
       component = find_component component_id
-      component.handle_status_subscribe subscribe_list
+      component.allow_repeat_updates subscribe_list
 
       message = RSMP::StatusSubscribe.new({
           "ntsOId" => '',
@@ -225,15 +249,24 @@ module RSMP
     end
 
     def unsubscribe_to_status component_id, status_list, options={}
-      component = find_component component_id
-      component.handle_status_subscribe status_list
-
       validate_ready 'unsubscribe to status'
+
+      # update our subcription list
+      status_list.each do |item|
+        sCI = item["sCI"]
+        n = item["n"]
+        if @status_subscriptions.dig(component_id,sCI,n)
+          @status_subscriptions[component_id][sCI].delete n
+          @status_subscriptions[component_id].delete(sCI) if @status_subscriptions[component_id][sCI].empty?
+          @status_subscriptions.delete(component_id) if @status_subscriptions[component_id].empty?
+        end
+      end
+
       message = RSMP::StatusUnsubscribe.new({
-          "ntsOId" => '',
-          "xNId" => '',
-          "cId" => component_id,
-          "sS" => status_list
+        "ntsOId" => '',
+        "xNId" => '',
+        "cId" => component_id,
+        "sS" => status_list
       })
       send_message message, validate: options[:validate]
       message
@@ -241,7 +274,8 @@ module RSMP
 
     def process_status_update message
       component = find_component message.attribute("cId")
-      component.handle_status_update message
+      component.check_repeat_values message, @status_subscriptions
+      component.store_status message
       log "Received #{message.type}", message: message, level: :log
       acknowledge message
     end
@@ -346,5 +380,10 @@ module RSMP
       @supervisor.notify_error e, options if @supervisor
       distribute_error e, options
     end
+
+    def build_component id:, type:, settings:{}
+      ComponentProxy.new id:id, node: self, grouped: type=='main'
+    end
+
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -82,33 +82,33 @@ module RSMP
     end
 
     def handshake_complete
-      super
       sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
+      send_all_aggregated_status if @site_settings['send_after_connect']
+      super
     end
 
     def process_message message
       case message
-        when Alarm
-        when StatusResponse
-        when StatusUpdate
-        when AggregatedStatus
-          will_not_handle message
-        when AggregatedStatusRequest
-          process_aggregated_status_request message
-        when CommandRequest
-          process_command_request message
-        when CommandResponse
-          process_command_response message
-        when StatusRequest
-          process_status_request message
-        when StatusSubscribe
-          process_status_subcribe message
-        when StatusUnsubscribe
-          process_status_unsubcribe message
-        else
-          super message
+      when StatusResponse, StatusUpdate, AggregatedStatus, AlarmIssue
+        will_not_handle message
+      when AggregatedStatusRequest
+        process_aggregated_status_request message
+      when CommandRequest
+        process_command_request message
+      when CommandResponse
+        process_command_response message
+      when StatusRequest
+        process_status_request message
+      when StatusSubscribe
+        process_status_subcribe message
+      when StatusUnsubscribe
+        process_status_unsubcribe message
+      when AlarmAcknowledged, AlarmSuspend, AlarmResume, AlarmRequest
+        process_alarm message
+      else
+        super message
       end
     rescue UnknownComponent, UnknownCommand, UnknownStatus,
            MessageRejected, MissingAttribute => e
@@ -120,10 +120,8 @@ module RSMP
       # aggregateds status should only be send for later version of rsmp
       # to handle verison differences, we probably need inherited classes
       case message.type
-        when "Watchdog"
-          if @site_settings['send_after_connect']
-            send_all_aggregated_status
-          end
+      when "Watchdog"
+        handshake_complete
       end
     end
 
@@ -148,8 +146,8 @@ module RSMP
       log "Received Version message, using RSMP #{@rsmp_version}", message: message, level: :log
       start_timer
       acknowledge message
-      handshake_complete
       @version_determined = true
+      send_watchdog
     end
 
     def send_aggregated_status component, options={}
@@ -183,13 +181,39 @@ module RSMP
     end
 
     def process_alarm message
+      case message
+      when AlarmAcknowledged
+        handle_alarm_acknowledge message
+      when AlarmSuspend
+        handle_alarm_suspend message
+      when AlarmResume
+        handle_alarm_resume message
+      when AlarmRequest
+        handle_alarm_request message
+      else
+        dont_acknowledge message, "Invalid alarm message type"
+      end
+    end
+
+    # handle incoming alarm suspend
+    def handle_alarm_suspend message
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
       alarm_code = message.attribute("aCId")
-      asp = message.attribute("aSp")
-      status = ["ack","aS","sS"].map { |key| message.attribute(key) }.join(',')
-      log "Received #{message.type}, #{alarm_code} #{asp} [#{status}]", message: message, level: :log
+      log "Received #{message.type} #{alarm_code} suspend", message: message, level: :log
       acknowledge message
+      component.suspend_alarm alarm_code
     end
 
+    # handle incoming alarm resume
+    def handle_alarm_resume message
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
+      alarm_code = message.attribute("aCId")
+      log "Received #{message.type} #{alarm_code} resume", message: message, level: :log
+      acknowledge message
+      component.resume_alarm alarm_code
+    end
     # reorganize rmsp command request arg attribute:
     # [{"cCI":"M0002","cO":"setPlan","n":"status","v":"True"},{"cCI":"M0002","cO":"setPlan","n":"securityCode","v":"5678"},{"cCI":"M0002","cO":"setPlan","n":"timeplan","v":"3"}]
     # into the simpler, but equivalent:
@@ -263,24 +287,28 @@ module RSMP
       # for each component, containing all the requested statuses
 
       update_list = {}
-      component = message.attributes["cId"]
-      @status_subscriptions[component] ||= {}
-      update_list[component] ||= {}
+      component_id = message.attributes["cId"]
+      @status_subscriptions[component_id] ||= {}
+      update_list[component_id] ||= {}
       now = Time.now  # internal timestamp
-      subs = @status_subscriptions[component]
+      subs = @status_subscriptions[component_id]
 
       message.attributes["sS"].each do |arg|
         sCI = arg["sCI"]
         subcription = {interval: arg["uRt"].to_i, last_sent_at: now}
         subs[sCI] ||= {}
         subs[sCI][arg["n"]] = subcription
-        update_list[component][sCI] ||= []
-        update_list[component][sCI] << arg["n"]
+        update_list[component_id][sCI] ||= []
+        update_list[component_id][sCI] << arg["n"]
       end
       acknowledge message
       send_status_updates update_list   # send status after subscribing is accepted
     end
 
+    def get_status_subscribe_interval component_id, sCI, n
+      @status_subscriptions.dig component_id, sCI, n
+    end
+
     def process_status_unsubcribe message
       log "Received #{message.type}", message: message, level: :log
       component = message.attributes["cId"]

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.11.5"
+  VERSION = "0.12.0"
 end

data/lib/rsmp.rb

@@ -30,7 +30,10 @@ require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'
 require 'rsmp/collect/alarm_collector'
+require 'rsmp/alarm_state'
+require 'rsmp/component_base'
 require 'rsmp/component'
+require 'rsmp/component_proxy'
 require 'rsmp/site'
 require 'rsmp/proxy'
 require 'rsmp/supervisor_proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -208,6 +208,7 @@ files:
 - documentation/tasks.md
 - exe/rsmp
 - lib/rsmp.rb
+- lib/rsmp/alarm_state.rb
 - lib/rsmp/archive.rb
 - lib/rsmp/cli.rb
 - lib/rsmp/collect/aggregated_status_collector.rb
@@ -225,6 +226,8 @@ files:
 - lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_query.rb
 - lib/rsmp/component.rb
+- lib/rsmp/component_base.rb
+- lib/rsmp/component_proxy.rb
 - lib/rsmp/components.rb
 - lib/rsmp/convert/export/json_schema.rb
 - lib/rsmp/convert/import/yaml.rb