removed workaround for intermediate certificate

Black-Thunder · Jul 30, 2023 · fe5ad62 · fe5ad62
1 parent 5c03b49
commit fe5ad62
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 173 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,9 @@ Documentation:
 	Placeholder for the next version (at the beginning of the line):
 	### __WORK IN PROGRESS__
 -->
+### __WORK IN PROGRESS__
+* (Black-Thunder) Memory leak was fixed
+
 ### 1.3.4 (2023-05-11)
 * (Black-Thunder) Certificate issues were fixed (e.g. "Error: unable to verify the first certificate")
 

diff --git a/lib/melcloudAtaDevice.js b/lib/melcloudAtaDevice.js
@@ -2,6 +2,7 @@
 
 const commonDefines = require("./commonDefines");
 const HttpStatus = require("http-status-codes");
+const Axios = require("axios").default;
 
 let gthat = null; // pointer to "this" from main.js/MelCloud instance
 
@@ -877,7 +878,7 @@ class MelcloudAtaDevice {
 
 			const url = `https://app.melcloud.com/Mitsubishi.Wifi.Client/Device/Get?id=${gthis.id}&buildingID=${gthis.buildingId}`;
 
-			gthat.mainAxiosInstance.get(url, {
+			Axios.get(url, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey
 				}
@@ -1016,7 +1017,7 @@ class MelcloudAtaDevice {
 			const body = JSON.stringify(modifiedAirInfo);
 			gthat.log.silly(`Request body: ${body}`);
 
-			gthat.mainAxiosInstance.post(url, body, {
+			Axios.post(url, body, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey,
 					"content-type": "application/json"
@@ -1178,7 +1179,7 @@ class MelcloudAtaDevice {
 
 			if (body == "{}") return; // creating body failed or was provided dates were invalid
 
-			gthat.mainAxiosInstance.post(url, body, {
+			Axios.post(url, body, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey,
 					"content-type": "application/json"
@@ -1297,7 +1298,7 @@ class MelcloudAtaDevice {
 			// Step 1: Get current timer infos
 			const getTimerUrl = `https://app.melcloud.com/Mitsubishi.Wifi.Client/Timer/Get2?deviceId=${gthis.id}`;
 
-			gthat.mainAxiosInstance.get(getTimerUrl, {
+			Axios.get(getTimerUrl, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey
 				}
@@ -1345,7 +1346,7 @@ class MelcloudAtaDevice {
 					const body = JSON.stringify(toggleRequest);
 					gthat.log.silly(`Request body: ${body}`);
 
-					gthat.mainAxiosInstance.post(setTimerUrl, body, {
+					Axios.post(setTimerUrl, body, {
 						headers: {
 							"X-MitsContextKey": gthis.platform.contextKey,
 							"content-type": "application/json"

diff --git a/lib/melcloudAtwDevice.js b/lib/melcloudAtwDevice.js
@@ -2,6 +2,7 @@
 
 const commonDefines = require("./commonDefines");
 const HttpStatus = require("http-status-codes");
+const Axios = require("axios").default;
 
 let gthat = null; // pointer to "this" from main.js/MelCloud instance
 
@@ -1102,7 +1103,7 @@ class MelcloudAtwDevice {
 
 			const url = `https://app.melcloud.com/Mitsubishi.Wifi.Client/Device/Get?id=${gthis.id}&buildingID=${gthis.buildingId}`;
 
-			gthat.mainAxiosInstance.get(url, {
+			Axios.get(url, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey
 				}
@@ -1289,7 +1290,7 @@ class MelcloudAtwDevice {
 			const body = JSON.stringify(modifiedAirInfo);
 			gthat.log.silly(`Request body: ${body}`);
 
-			gthat.mainAxiosInstance.post(url, body, {
+			Axios.post(url, body, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey,
 					"content-type": "application/json"
@@ -1399,7 +1400,7 @@ class MelcloudAtwDevice {
 
 			if (body == "{}") return; // creating body failed or was provided dates were invalid
 
-			gthat.mainAxiosInstance.post(url, body, {
+			Axios.post(url, body, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey,
 					"content-type": "application/json"
@@ -1521,7 +1522,7 @@ class MelcloudAtwDevice {
 			// Step 1: Get current timer infos
 			const getTimerUrl = `https://app.melcloud.com/Mitsubishi.Wifi.Client/Timer/Get2?deviceId=${gthis.id}`;
 
-			gthat.mainAxiosInstance.get(getTimerUrl, {
+			Axios.get(getTimerUrl, {
 				headers: {
 					"X-MitsContextKey": gthis.platform.contextKey
 				}
@@ -1569,7 +1570,7 @@ class MelcloudAtwDevice {
 					const body = JSON.stringify(toggleRequest);
 					gthat.log.silly(`Request body: ${body}`);
 
-					gthat.mainAxiosInstance.post(setTimerUrl, body, {
+					Axios.post(setTimerUrl, body, {
 						headers: {
 							"X-MitsContextKey": gthis.platform.contextKey,
 							"content-type": "application/json"

diff --git a/lib/melcloudPlatform.js b/lib/melcloudPlatform.js
@@ -5,6 +5,7 @@ const MelCloudAtaDevice = require("./melcloudAtaDevice");
 const MelCloudAtwDevice = require("./melcloudAtwDevice");
 const commonDefines = require("./commonDefines");
 const HttpStatus = require("http-status-codes");
+const Axios = require("axios").default;
 
 let gthat = null; // pointer to "this" from main.js/MelCloud instance
 let gthis = null; // pointer to "this" from MelcloudPlatform
@@ -39,7 +40,7 @@ class MelcloudPlatform {
 		form.append("Password", gthis.password);
 		form.append("Persist", "true");
 
-		gthat.mainAxiosInstance.post(loginUrl, form, { headers: form.getHeaders() })
+		Axios.post(loginUrl, form, { headers: form.getHeaders() })
 			.then(function handleLoginResponse(response) {
 				if (!response) {
 					gthat.log.error(`There was a problem receiving the response from: ${loginUrl}`);
@@ -100,7 +101,7 @@ class MelcloudPlatform {
 
 		const url = "https://app.melcloud.com/Mitsubishi.Wifi.Client/User/ListDevices";
 
-		gthat.mainAxiosInstance.get(url, {
+		Axios.get(url, {
 			headers: {
 				"X-MitsContextKey": gthis.contextKey
 			}

diff --git a/lib/melcloud_intermediate.pem b/lib/melcloud_intermediate.pem
diff --git a/main.js b/main.js
@@ -10,10 +10,6 @@ const utils = require("@iobroker/adapter-core");
 // Needed modules
 const cloudPlatform = require("./lib/melcloudPlatform");
 const commonDefines = require("./lib/commonDefines");
-const Axios = require("axios").default;
-const Https = require("https");
-const RootCas = require("ssl-root-cas").create();
-const Path = require("path");
 
 let gthis = null; // global to 'this' of Melcloud main instance
 let CloudPlatform = null;
@@ -35,12 +31,6 @@ class Melcloud extends utils.Adapter {
 		gthis = this;
 		this.deviceObjects = []; // array of all device objects
 		this.currentKnownDeviceIDs = []; // array of all current known device IDs
-
-		// MELCloud intermediate certificate, needed as otherwise requests will fail with "Unable to verify the first certificate"
-		RootCas.addFile(Path.resolve(__dirname, "lib/melcloud_intermediate.pem"));
-		this.mainAxiosInstance = Axios.create({
-			httpsAgent: new Https.Agent({ ca: RootCas })
-		});
 	}
 
 	async checkSettings() {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,8 +24,7 @@
     "@iobroker/adapter-core": "^2.6.8",
     "axios": "^1.4.0",
     "form-data": "^4.0.0",
-    "http-status-codes": "^2.2.0",
-    "ssl-root-cas": "^1.3.1"
+    "http-status-codes": "^2.2.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.6.0",
@@ -68,4 +67,4 @@
     "url": "https://github.com/Black-Thunder/ioBroker.melcloud/issues"
   },
   "readmeFilename": "README.md"
-}
+}