Update to 5.0.48

bbindreiter · Nov 29, 2023 · a9dde73 · a9dde73
1 parent 69b4835
commit a9dde73
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 **node-red-contrib-alexa-remote2-applestrudel**
+- **5.0.48**
+  - Fix authentication to amazon alexa by @abstract-entity
+  - Updates dependency alexa-remote2 to v7.0.2
+- **5.0.47**
+  - Null check fix by @jonferreira
+  - Updates dependency alexa-remote2 to v7.0.0 
 - **5.0.46**
   - Updates dependency alexa-remote2 to v6.2.2
 - **5.0.45**

diff --git a/nodes/alexa-remote-account.html b/nodes/alexa-remote-account.html
@@ -56,6 +56,14 @@
 			<option value="off">Off</option>
 		</select>
 	</div>
+    <div class="form-row">
+        <label for="node-config-input-autoQueryActivityOnTrigger"><i class="fa fa-rocket"></i> Auto Query Activities</label>
+		<select id="node-config-input-autoQueryActivityOnTrigger" style="width: 70%;">
+			<option value="on">On</option>
+			<option value="off">Off</option>
+		</select>
+	</div>
+	<p>Please enable Auto Query Activities only when you rely on device activity sent via Alexa Event node.</p>
 	<hr>
     <div class="form-row">
         <label for="node-config-input-alexaServiceHost"><i class="fa fa-amazon"></i> Service Host</label>
@@ -228,20 +236,21 @@ <h3><strong>References</strong></h3>
             password: 	{ type: 'password' },
         },
         defaults: {
-			name:                { required: false, value: '' },
-			authMethod: 		 { required: true,  value: 'proxy' },
-			proxyOwnIp:			 { required: true,  value: 'localhost' },
-			proxyPort:			 { required: true,  value: 3456, validate: x => 0 <= Number(x) && Number(x) <= 65535 },
-			cookieFile:			 { required: false, value: ''},
-			refreshInterval:	 { required: false, value: '3'},
-            alexaServiceHost:    { required: true,  value: 'pitangui.amazon.com' },
-			pushDispatchHost:    { required: false, value: '' },
-			amazonPage:          { required: true,  value: 'amazon.com' },
-            acceptLanguage:      { required: false, value: 'en-US' },
-            onKeywordInLanguage: { required: false, value: 'on' },
-            userAgent:           { required: false, value: '' },
-			usePushConnection:	 { required: true,  value: 'on' },
-			autoInit:			 { required: true,  value: 'on' }
+			name:                           { required: false, value: '' },
+			authMethod: 		            { required: true,  value: 'proxy' },
+			proxyOwnIp:			            { required: true,  value: 'localhost' },
+			proxyPort:			            { required: true,  value: 3456, validate: x => 0 <= Number(x) && Number(x) <= 65535 },
+			cookieFile:			            { required: false, value: ''},
+			refreshInterval:	            { required: false, value: '3'},
+            alexaServiceHost:               { required: true,  value: 'pitangui.amazon.com' },
+			pushDispatchHost:               { required: false, value: '' },
+			amazonPage:                     { required: true,  value: 'amazon.com' },
+            acceptLanguage:                 { required: false, value: 'en-US' },
+            onKeywordInLanguage:            { required: false, value: 'on' },
+            userAgent:                      { required: false, value: '' },
+			usePushConnection:	            { required: true,  value: 'on' },
+			autoInit:			            { required: true,  value: 'on' },
+			autoQueryActivityOnTrigger:     { required: false, value: 'off' },
 		},
 		paletteLabel: 'Alexa Account',
         label: function () {

diff --git a/nodes/alexa-remote-account.js b/nodes/alexa-remote-account.js
@@ -306,6 +306,7 @@ module.exports = function (RED) {
 
 		tools.assign(this, ['authMethod', 'proxyOwnIp', 'proxyPort', 'cookieFile', 'refreshInterval', 'alexaServiceHost', 'pushDispatchHost', 'amazonPage', 'acceptLanguage', 'onKeywordInLanguage', 'userAgent'], input);
 		this.usePushConnection = input.usePushConnection === 'on';
+		this.autoQueryActivityOnTrigger = input.autoQueryActivityOnTrigger === "on";
 		this.autoInit  = input.autoInit  === 'on';
 		this.name = input.name;
 		this.onKeywordInLanguage = input.onKeywordInLanguage;
@@ -415,7 +416,7 @@ module.exports = function (RED) {
 			this.initing = true;
 
 			let config = {};
-			tools.assign(config, ['proxyOwnIp', 'proxyPort', 'alexaServiceHost', 'pushDispatchHost', 'amazonPage', 'acceptLanguage', 'onKeywordInLanguage', 'userAgent', 'usePushConnection'], this);
+			tools.assign(config, ['proxyOwnIp', 'proxyPort', 'alexaServiceHost', 'pushDispatchHost', 'amazonPage', 'acceptLanguage', 'onKeywordInLanguage', 'userAgent', 'usePushConnection', 'autoQueryActivityOnTrigger'], this);
 			config.logger = this.debugCb;
 			config.refreshCookieInterval = 0;
 			config.proxyLogLevel = 'warn';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-alexa-remote2-applestrudel",
-	"version": "5.0.46",
+	"version": "5.0.48",
 	"author": {
 		"name": "bbindreiter",
 		"email": "[email protected]"
@@ -17,6 +17,14 @@
 		{
 			"name": "DanPatten",
 			"url": "https://github.com/DanPatten"
+		},
+		{
+			"name": "jonferreira",
+			"url": "https://github.com/jonferreira"
+		},
+		{
+			"name": "abstract-entity",
+			"url": "https://github.com/abstract-entity"
 		}
 	],
 	"description": "node-red nodes for interacting with alexa",
@@ -47,7 +55,7 @@
 		"url": "https://github.com/bbindreiter/node-red-contrib-alexa-remote2-applestrudel/issues"
 	},
 	"dependencies": {
-		"alexa-remote2": "^6.2.2"
+		"alexa-remote2": "^7.0.2"
 	},
 	"engines": {
 		"node": ">=16.0.0"