openhab-scripting 5.42.0 → 5.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14c40c5db6a5210c78c66a315ab449cf71e2960f6de3675f01146b7dd441610
-  data.tar.gz: 7862488bf7df6e277c9833e11b15d0e5d54fe6eff3a62fa159dfe26641ab8aad
+  metadata.gz: 6b42fbceb3c29151aaef433d5992fa21dd38662e25e3644cdbdc0a81cfa392d5
+  data.tar.gz: 7ce847854bad3ccc7b2734cbd788b5a1a3fe21e82ec966240554a645a19b3518
 SHA512:
-  metadata.gz: e72be1db208c31047b81bbba773e6e1f930c7eb47cf61740e151c2d4918e96e192a36fbc3ac94e3ecbece62811f01792574f4bc78d386e14015e66bf4ebf73af
-  data.tar.gz: 21a972d3941e63c8ca7729f660c7f60cba586f6d210bed9294c6d81cbfb33df6b9897aa7d4258cdf9f199188a8f90301ac3d353278fb96f4a3e86e0ec198d8d7
+  metadata.gz: 8f0940e4520b47a7f35dada758fea1e079d8fca10e9e484e4d54f2cea738b7ca6d06dd81eed936c1525b5f9ef9fb884d4fb36fd4e714adc47c8d87544a824368
+  data.tar.gz: edba4793deda5989f59b0b8c106273d3ffb3963575c8dbcbeb45d75e316141cba86528c8e6126c4e53629043be86d21a6b321c174a2ec90803eec22217853634

data/lib/openhab/core/events/abstract_event.rb

@@ -39,7 +39,7 @@ module OpenHAB
         #
         # Returns the event payload as a Hash.
         #
-        # @return [Hash, nil] The payload object parsed by JSON. The keys are symbolized.
+        # @return [Hash, String, nil] The payload object parsed by JSON. The keys are symbolized.
         #   `nil` when the payload is empty.
         #
         def payload
@@ -48,6 +48,8 @@ module OpenHAB
           original_verbose = $VERBOSE
           $VERBOSE = nil
           @payload ||= JSON.parse(get_payload, symbolize_names: true) unless get_payload.empty?
+        rescue JSON::ParserError
+          get_payload
         ensure
           $VERBOSE = original_verbose
         end

data/lib/openhab/core/items/item.rb

@@ -10,6 +10,9 @@ module OpenHAB
       # The core features of an openHAB item.
       #
       module Item
+        EVENT_SOURCE = "org.openhab.automation.jrubyscripting"
+        private_constant :EVENT_SOURCE
+
         class << self
           # @!visibility private
           #
@@ -152,6 +155,7 @@ module OpenHAB
         def command(command, source: nil)
           command = format_command(command)
           logger.trace { "Sending Command #{command} to #{name}" }
+          source ||= infer_source if VERSION >= V5_1
           if source
             Events.publisher.post(Events::ItemEventFactory.create_command_event(name, command, source.to_s))
           else
@@ -179,6 +183,7 @@ module OpenHAB
         #   When given a {State} argument, it will be passed directly.
         #   Otherwise, the result of `#to_s` will be parsed into a {State} first.
         #   If `nil` is passed, the item will be updated to {NULL}.
+        # @param [String, nil] source Optional string to identify what sent the event.
         # @return [self, nil] nil when `ensure` is in effect and the item was already in the same state,
         #   otherwise the item.
         #
@@ -196,10 +201,15 @@ module OpenHAB
         # @example Updating with a string to a dimensioned {NumberItem}
         #   InsideTemperature.update("22.5 °C") # The string will be parsed and converted to a QuantityType
         #
-        def update(state)
+        def update(state, source: nil)
           state = format_update(state)
           logger.trace { "Sending Update #{state} to #{name}" }
-          $events.post_update(self, state)
+          source ||= infer_source if VERSION >= V5_1
+          if source
+            Events.publisher.post(Events::ItemEventFactory.create_state_event(name, state, source.to_s))
+          else
+            $events.post_update(self, state)
+          end
           Proxy.new(self)
         end
         alias_method :update!, :update
@@ -630,6 +640,17 @@ module OpenHAB
         # Allows sub-classes to append additional details to the type in an inspect string
         # @return [String]
         def type_details; end
+
+        def infer_source
+          actor = if $ctx&.key?("ruleUID")
+                    "rule:#{$ctx["ruleUID"]}"
+                  elsif (rule_uid = Thread.current[:openhab_rule_uid])
+                    "#{Thread.current[:openhab_rule_type]}:#{rule_uid}"
+                  else
+                    Log.top_level_file
+                  end
+          org.openhab.core.events.AbstractEvent.build_source(EVENT_SOURCE, actor)
+        end
       end
     end
   end

data/lib/openhab/dsl/rules/builder.rb

@@ -1804,6 +1804,7 @@ module OpenHAB
         #   end
         #
         def event(topic, source: nil, types: nil, attach: nil)
+          types ||= org.openhab.core.events.EventSubscriber::ALL_EVENT_TYPES
           types = types.join(",") if types.is_a?(Enumerable)
           trigger("core.GenericEventTrigger",
                   topic:,

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.42.0"
+    VERSION = "5.43.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.42.0
+  version: 5.43.0
 platform: ruby
 authors:
 - Brian O'Connell