Final updates for 3.10 (22145)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log #
 
+**As of June 2021, the Reactor Plugin for Vera/Luup (this project) is no longer released through the Vera App Marketplace. This Github repository is the only official repository for this plugin.**
+
+**If you are looking for information about my Multi-Hub Reactor project for Vera, Ezlo, Home Assistant, Hubitat, MQTT, and ZWave-JS, please go to [https://reactor.toggledbits.com/](https://reactor.toggledbits.com/).**
+
 NOTE TO OPENLUUP USERS: All current versions of Reactor REQUIRE openLuup 2020.04.14b or higher. Version 2021.01.03 or higher is recommended in particular for users of the Vera and eZLO Bridges.
 
 NOTE TO ALTUI USERS: All current versions of Reactor REQUIRE AltUI 2536 to 2553; versions outside this range *are not supported*. If you are having UI issues and running on a version other than those within the foregoing range, please install a supported version of ALTUI. Since testing of the UI has to happen on a large number of platforms and browsers, it takes time and there necessarily will be a delay in certifying the Reactor UI for new releases of ALTUI.
@@ -10,7 +14,7 @@ NOTE TO ALTUI USERS: All current versions of Reactor REQUIRE AltUI 2536 to 2553;
 
 **DEPRECATION NOTICE:** The `Reactor.groups` table is now deprecated; use `Reactor.conditions` instead (just change the name in your code, it works the same). See [the Reactor documentation](https://www.toggledbits.com/static/reactor/docs/Run-Lua-Action/) for more information.
 
-## Version 3.10 (22082)
+## Version 3.10 (22145)
 
 * ALTUI version 2553 allowed on reliance from user (not tested by author). YMMV.
 * Suppress parameter substitution in pure-JSON body for HTTP Request action;

J_ReactorSensor_ALTUI.js

@@ -3,15 +3,15 @@
  * J_ReactorSensor_ALTUI.js
  * Special presentation for ALTUI for ReactorSensor
  *
- * Copyright 2018,2019,2020 Patrick H. Rigney, All Rights Reserved.
+ * Copyright 2018-2022 Patrick H. Rigney, All Rights Reserved.
  * This file is part of Reactor. Use subject to license; please see
  * license details at https://www.toggledbits.com/static/reactor/docs/Installation#license-and-use-restrictions
  */
 /* globals window,MultiBox,ALTUI_PluginDisplays,_T */
 
 var ReactorSensor_ALTUI = ( function( window, undefined ) {
 
-	var pluginVersion = "3.10develop (22082)";
+	var pluginVersion = "3.10 (22145)";
 
 	var _UIVERSION = 21170;
 

J_ReactorSensor_UI7.js

@@ -3,7 +3,7 @@
  * J_ReactorSensor_UI7.js
  * Configuration interface for ReactorSensor
  *
- * Copyright 2018,2019,2020 Patrick H. Rigney, All Rights Reserved.
+ * Copyright 2018-2022 Patrick H. Rigney, All Rights Reserved.
  * This file is part of Reactor. Use subject to license; please see
  * license details at https://www.toggledbits.com/static/reactor/docs/Installation#license-and-use-restrictions
  *
@@ -18,7 +18,7 @@ var ReactorSensor = (function(api, $) {
 	/* unique identifier for this plugin... */
 	var uuid = '21b5725a-6dcd-11e8-8342-74d4351650de';
 
-	var pluginVersion = "3.10develop (22082)";
+	var pluginVersion = "3.10 (22145)";
 
 	var _UIVERSION = 21170;     /* must coincide with Lua core */
 

J_Reactor_ALTUI.js

@@ -3,7 +3,7 @@
  * J_Reactor_ALTUI.js
  * Special presentation for ALTUI for Reactor
  *
- * Copyright 2018,2019 Patrick H. Rigney, All Rights Reserved.
+ * Copyright 2018-2022 Patrick H. Rigney, All Rights Reserved.
  * This file is part of Reactor. For license information, see LICENSE at https://github.com/toggledbits/Reactor
  */
 /* globals window,MultiBox,ALTUI_PluginDisplays,_T */

J_Reactor_UI7.js

@@ -3,7 +3,7 @@
  * J_Reactor_UI7.js
  * Configuration interface for Reactor master device
  *
- * Copyright 2018,2019,2020 Patrick H. Rigney, All Rights Reserved.
+ * Copyright 2018-2022 Patrick H. Rigney, All Rights Reserved.
  * This file is part of Reactor. Use subject to license; please see
  * license details at https://www.toggledbits.com/static/reactor/docs/Installation#license-and-use-restrictions
  *
@@ -18,7 +18,7 @@ var Reactor = (function(api, $) {
 	/* unique identifier for this plugin... */
 	var uuid = '72acc6ea-f24d-11e8-bd87-74d4351650de';
 
-	var pluginVersion = "3.10 (22082)";
+	var pluginVersion = "3.10 (22145)";
 
 	var _UIVERSION = 21170;     /* must coincide with Lua core */
 

L_Reactor.lua

@@ -1,6 +1,6 @@
 --[[
 	L_Reactor.lua - Core module for Reactor
-	Copyright 2018,2019,2020,2021 Patrick H. Rigney, All Rights Reserved.
+	Copyright 2018-2022 Patrick H. Rigney, All Rights Reserved.
 	This file is part of Reactor.
 
 	RESTRICTED USE LICENSE
@@ -42,12 +42,12 @@ local debugMode = false
 
 local _PLUGIN_ID = 9086
 local _PLUGIN_NAME = "Reactor"
-local _PLUGIN_VERSION = "3.10develop (22082)"
+local _PLUGIN_VERSION = "3.10 (22145)"
 local _PLUGIN_URL = "https://www.toggledbits.com/reactor"
 local _DOC_URL = "https://www.toggledbits.com/static/reactor/docs/3.9/"
 local _FORUM_URL = "https://community.getvera.com/c/plugins-and-plugin-development/reactor/178"
 
-local _CONFIGVERSION	= 21129
+local _CONFIGVERSION	= 22145
 local _CDATAVERSION		= 20045	-- must coincide with JS
 local _UIVERSION		= 21170	-- must coincide with JS
 	  _SVCVERSION		= 20185	-- must coincide with impl file (not local)
@@ -996,6 +996,10 @@ local function sensor_runOnce( tdev )
 	deleteVar( RSSID, "ValueChangeHoldTime", tdev )
 	deleteVar( RSSID, "ReloadConditionHoldTime", tdev )
 
+	if s < 22145 then
+		setVar( RSSID, "WatchResponseHoldOff", "", tdev )
+	end
+
 	-- Update version last.
 	if s < _CONFIGVERSION then
 		luup.variable_set(RSSID, "Version", _CONFIGVERSION, tdev)
@@ -7439,8 +7443,7 @@ function request( lul_request, lul_parameters, lul_outputformat )
 				lul_parameters.branch .. ".zip'" )
 			grelease = table.concat( { "branch", lul_parameters.branch, os.time() } )
 		elseif lul_parameters.release then
-			os.execute( "curl -s -L -o '" .. tmpd ..
-				"/reactor.zip' -m 30 '" .. lul_parameters.url .. "'" )
+			os.execute( "curl -s -L -o '" .. tmpd .. "/reactor.zip' -m 30 '" .. lul_parameters.url .. "'" )
 			grelease = table.concat( { "release", lul_parameters.release } )
 		else
 			return json.encode( { status=false, message="Invalid request parameters" } ), MIMETYPE_JSON

README.md

@@ -1,4 +1,4 @@
-# Reactor #
+# Reactor
 
 A programmable logic plugin for Vera home automation systems to enhance the built-in trigger logic
 for scenes and other actions.
@@ -8,7 +8,7 @@ for scenes and other actions.
 * Easy to configure (no Lua or expression syntax to learn);
 * Powerful features for testing conditions and performing actions.
 
-**This repository is for the Reactor for Vera plugin only. If you are looking for the multi-hub version of Reactor (supports Vera, Ezlo, MQTT, Home Assistant, and Hubitat, with more planned), please see [https://reactor.toggledbits.com/](https://reactor.toggledbits.com).**
+**This repository is for the Reactor for Vera/Luup plugin only. If you are looking for the multi-hub version of Reactor (supports Vera, Ezlo, MQTT, Home Assistant, Hubitat, and ZWave-JS, with more planned), please see [https://reactor.toggledbits.com/](https://reactor.toggledbits.com/).**
 
 ## Background ##
 
@@ -53,6 +53,7 @@ My branching strategy for Reactor includes four branches, as follows:
 ## License ##
 
 Reactor currently is copyrighted and all rights are reserved. Although the source code is visible for public
-review, it is not an open source project at this time and the release of derivative works is not permitted.
+review, it is not an open source project at this time and the use of the whole or any part of this project in derivative
+works is expressly forbidden.
 
 Please refer to [the full license in the Reactor documentation](https://www.toggledbits.com/static/reactor/docs/Installation/).