@all-smart/all-smart-tools 1.0.13 → 1.0.15

package/.idea/deployment.xml

@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="local" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
+  <component name="PublishConfigData" autoUpload="Always" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
     <option name="confirmBeforeUploading" value="false" />
-    <serverData>
-      <paths name="local">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>
 </project>

package/LICENSE.MD

@@ -40,9 +40,9 @@ and the **Licensee**
   
    
 10. __Signature__  
-   This Agreement shall automatically come into force as soon as the Licensee uses the "ALL SMART Tools" software.
+   This Agr13eement shall automatically come into force as soon as the Licensee uses the "ALL SMART Tools" software.
 
 LICENSOR  
 Christoph Gerle  
-Schwabenstr. 40  
-87668 Rieden, Germany
+Dorfstr. 10
+86842 Türkheim, Germany

package/main.js

@@ -107,39 +107,85 @@ class asTools {
     }
 
     async checkLicenseKey(){
-        try {
+        if (!this.adapter.config.licenseKey || typeof this.adapter.config.licenseKey !== 'string' || this.adapter.config.licenseKey.trim() === '') {
+            this.adapter.log.warn('License Key is empty');
+            return false;
+        }
 
-            const responseValidate = await axios.get(`${baseUrl}/wp-json/lmfwc/v2/licenses/${this.adapter.config.licenseKey}`, {
-                headers: {
-                    authorization: `Basic ${Buffer.from(`${key1}:${key2}`).toString('base64')}`,
+        try {
+            const licenseKey = encodeURIComponent(this.adapter.config.licenseKey.trim());
+            let responseValidate;
+            try {
+                responseValidate = await axios.get(`${baseUrl}/wp-json/lmfwc/v2/licenses/${licenseKey}`, {
+                    headers: {
+                        authorization: `Basic ${Buffer.from(`${key1}:${key2}`).toString('base64')}`,
+                    }
+                });
+            } catch (e) {
+                if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
+                    this.adapter.log.warn('License Key not found (404)');
+                } else {
+                    this.adapter.log.error('Error during license key validation: ' + e.message);
                 }
-            });
+                return false;
+            }
 
-            const responseProduct = await axios.get(`${baseUrl}/wp-json/wc/v3/products/${responseValidate.data.data.productId}`, {
-                headers: {
-                    authorization: `Basic ${Buffer.from(`${key3}:${key4}`).toString('base64')}`
-                }
-            });
+            if (!responseValidate.data || !responseValidate.data.success || !responseValidate.data.data || Array.isArray(responseValidate.data.data)) {
+                this.adapter.log.warn('License Key not found or invalid response from server');
+                return false;
+            }
 
-            const majorVersion = this.adapter.version.split('.')[0];
+            if (!responseValidate.data.data.productId) {
+                this.adapter.log.info('License has no product ID assigned, skipping product check.');
+                return await this.handleActivationStatus(responseValidate.data.data);
+            }
+
+            let responseProduct;
+            try {
+                responseProduct = await axios.get(`${baseUrl}/wp-json/wc/v3/products/${responseValidate.data.data.productId}`, {
+                    headers: {
+                        authorization: `Basic ${Buffer.from(`${key3}:${key4}`).toString('base64')}`
+                    }
+                });
+            } catch (e) {
+                this.adapter.log.warn(`Could not fetch product details for ID ${responseValidate.data.data.productId}: ${e.message}`);
+                // If product details cannot be fetched, we skip the product name check instead of failing completely.
+                // This avoids the 404 issue when a product is deleted or API keys have no access, but the license is valid.
+                this.adapter.log.info('Skipping product name and version check due to missing product details.');
+                return await this.handleActivationStatus(responseValidate.data.data);
+            }
 
-            const productName = responseProduct.data.name.split(' ')[0].toLowerCase().replace('iobroker.', '');
-            const productVersion = responseProduct.data.name.split(' ')[1].replace(/[v|V]/g, '');
+            const majorVersion = this.adapter.version.split('.')[0];
+            const productNameFull = responseProduct.data.name || '';
+            const productName = productNameFull.split(' ')[0].toLowerCase().replace('iobroker.', '');
+            const productVersionMatch = productNameFull.match(/[v|V](\d+)/);
+            const productVersion = productVersionMatch ? productVersionMatch[1] : productNameFull.split(' ')[1]?.replace(/[v|V]/g, '');
 
             if(productName.trim() !== this.adapter.name.trim()  || productVersion !== majorVersion){
-                this.adapter.log.info('License Key is not valid for this product');
+                this.adapter.log.warn(`License Key is not valid for this product. Expected ${this.adapter.name} v${majorVersion}, but license is for ${productName} v${productVersion}`);
                 this.adapter.disable();
                 return false;
             }
 
-            if(responseValidate.data.data.timesActivated === null || responseValidate.data.data.timesActivated < responseValidate.data.data.timesActivatedMax){
-                this.adapter.log.info('License Key is not activated yet');
-                return await this.activateLicenseKey();
-            } else if(responseValidate.data.data.timesActivated === responseValidate.data.data.timesActivatedMax){
-                this.adapter.log.info('License Key was already activated');
-                this.adapter.stop();
-                return false;
-            }
+            return await this.handleActivationStatus(responseValidate.data.data);
+        } catch (e) {
+            this.adapter.log.error('Unexpected error during license check: ' + e.message);
+            return false;
+        }
+
+    }
+
+    async handleActivationStatus(data) {
+        if(data.timesActivated === null || data.timesActivated < data.timesActivatedMax){
+            this.adapter.log.info('License Key is not activated yet');
+            return await this.activateLicenseKey();
+        } else if(data.timesActivated >= data.timesActivatedMax){
+            this.adapter.log.warn('License Key was already activated (max activations reached)');
+            this.adapter.stop();
+            return false;
+        }
+        return true;
+    }
 
             // await this.createLocalLicenseFile(); Why here? This has to be in activateLicenseKey
             // return true;
@@ -152,8 +198,13 @@ class asTools {
     }
 
     async activateLicenseKey(){
+        if (!this.adapter.config.licenseKey || typeof this.adapter.config.licenseKey !== 'string' || this.adapter.config.licenseKey.trim() === '') {
+            return false;
+        }
+
         try {
-            const response = await axios.get(`${baseUrl}/wp-json/lmfwc/v2/licenses/activate/${this.adapter.config.licenseKey}`, {
+            const licenseKey = encodeURIComponent(this.adapter.config.licenseKey.trim());
+            const response = await axios.get(`${baseUrl}/wp-json/lmfwc/v2/licenses/activate/${licenseKey}`, {
                 headers: {
                     authorization: `Basic ${Buffer.from(`${key1}:${key2}`).toString('base64')}`,
                 }
@@ -168,7 +219,11 @@ class asTools {
                 return false;
             }
         } catch (e) {
-            this.adapter.log.debug('Error license key activation: ' + e);
+            if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
+                this.adapter.log.warn('License Key activation failed: Key not found (404)');
+            } else {
+                this.adapter.log.debug('Error license key activation: ' + e);
+            }
             return false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@all-smart/all-smart-tools",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,7 +9,7 @@
   "author": "Christoph Gerle",
   "license": "SEE LICENSE IN LICENSE.MD",
   "dependencies": {
-    "axios": "^1.6.5"
+    "axios": "1.20.0"
   },
   "devDependencies": {},
   "description": ""

package/.idea/webServers.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebServers">
-    <option name="servers">
-      <webServer id="d117c297-54c1-40da-9610-cce0b85b1a74" name="local" url="http://localhost">
-        <fileTransfer mountedRoot="$PROJECT_DIR$/../ioBroker.we-are-one/node_modules/all-smart-tools" accessType="MOUNT" port="0" />
-      </webServer>
-    </option>
-  </component>
-</project>