syntex-automation - npm Package Compare versions

Comparing version 1.2.1-b1 to 1.2.1-b10

package.json

 {
 	"name": "syntex-automation",
-	"version": "1.2.1-b1",
+	"version": "1.2.1-b10",
 	"description": "An automation system for your smart home",
@@ -12,5 +12,4 @@ "main": "main.js",
 	"dependencies": {
-		"axios": "^0.21.1",
-		"syntex-filesystem": "1.0.3-b1",
-		"syntex-logger": "1.0.9-b1"
+		"syntex-filesystem": "1.0.3-b8",
+		"syntex-logger": "1.0.9-b2"
 	},
@@ -17,0 +16,0 @@ "keywords": [

src/automation.js

@@ -1,3 +0,1 @@
-const axios = require('axios');
-
 module.exports = class Automation
@@ -21,2 +19,3 @@ {
 		this.EventManager = platform.EventManager;
+		this.RequestManager = platform.RequestManager;
 		this.TypeManager = platform.TypeManager;
@@ -208,10 +207,17 @@
 
-					if(logic == 'AND' && AND(result))
+					if(!result.includes(null))
 					{
-						resolve(true);
+						if(logic == 'AND' && AND(result))
+						{
+							resolve(true);
+						}
+						else if(logic == 'OR' && OR(result))
+						{
+							resolve(true);
+						}
+						else
+						{
+							resolve(false);
+						}
 					}
-					else if(logic == 'OR' && OR(result))
-					{
-						resolve(true);
-					}
 					else
@@ -402,2 +408,7 @@ {
 				this.logger.log('success', trigger.id, trigger.letters, '[' + trigger.name + '] %automation_executed[0]% [' + automation.name + '] %automation_executed[1]%!');
+
+				if(this.platform.bridgeConnection != null)
+				{
+					this.platform.bridgeConnection.send('/serverside/push', { notification : { type : 'push-automation-' + automation.id, body : '[' + trigger.name + '] hat die Automation [' + automation.name + '] ausgeführt!' }});
+				}
 			}
@@ -411,7 +422,10 @@ });
 
-			axios.get(theRequest.url, theRequest).then((response) => resolve(response.data)).catch((err) => {
+			this.RequestManager.fetch(theRequest.url, theRequest).then((data, err) => {
+			
+				if(data == null)
+				{
+					this.logger.log('error', element.id, element.letters, '[' + name + '] %request_result[0]% [' + theRequest.url + '] %request_result[1]% [' + (err.response != null ? err.response.status : -1) + '] %request_result[2]%: [' + (err.response != null ? err.response.data : '') + '] ', err.stack);
+				}
 
-				resolve(null);
-
-				this.logger.log('error', element.id, element.letters, '[' + name + '] %request_result[0]% [' + theRequest.url + '] %request_result[1]% [' + (err.response != null ? err.response.status : -1) + '] %request_result[2]%: [' + (err.response != null ? err.response.data : '') + '] ', err.stack);
+				resolve(data);
 			});
@@ -418,0 +432,0 @@ });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

22562

increased by1.83%

Dependency count

2

decreased by-33.33%

Lines of code

658

increased by2.17%

Dependency changes

• + Addedsyntex-filesystem@1.0.3-b8(transitive)

• + Addedsyntex-logger@1.0.9-b2(transitive)

• - Removedaxios@^0.21.1

• - Removedaxios@0.21.4(transitive)

• - Removedfollow-redirects@1.15.9(transitive)

• - Removedsyntex-filesystem@1.0.3-b1(transitive)

• - Removedsyntex-logger@1.0.9-b1(transitive)

• Updatedsyntex-filesystem@1.0.3-b8

• Updatedsyntex-logger@1.0.9-b2