@all-smart/all-smart-tools 1.0.4 → 1.0.10

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/main.js

@@ -1,5 +1,6 @@
 const axios = require('axios').default;
 const fs = require('fs');
+const { exec } = require('child_process');
 
 const baseUrl = 'https://www.all-smart.net';
 const key1 = 'ck_440f2f1282170f72411ac1072bfcfb4103dbd71d';
@@ -12,11 +13,15 @@ class asTools {
         this.licenseInvalidMassage = false;
         this.reCheckTimeout = null;
         this.adapter.on("message", this.onMessage.bind(this));
+
+        this.isLxc = false;
+        this.isDocker = false;
         this.main();
     }
 
     async main() {
-
+        this.checkLxc();
+        this.checkDocker();
     }
 
     async onMessage(obj) {
@@ -30,6 +35,22 @@ class asTools {
         }
     }
 
+    checkLxc(){
+        exec('cat /proc/self/mountinfo | grep lxc', (error, stdout, stderr) => {
+            if(stdout.length > 0) {
+                this.isLxc = true;
+            }
+        })
+    }
+
+    checkDocker(){
+        exec('ls /.dockerenv', (error, stdout, stderr) => {
+            if(error !== null && error !== undefined) {
+                this.isDocker = true;
+            }
+        })
+    }
+
     async checkObjectsUpdate(){
 
         return  this.block().then((isValid) => {
@@ -45,10 +66,14 @@ class asTools {
     async block() {
         return new Promise(async (resolve, reject) => {
             const check = async () => {
-                if (fs.existsSync(__dirname + '/cache')) {
-                    if (await this.checkLocalLicenseFile()) {
-                        this.adapter.log.info('License Key file OK');
+                const adapterObject = await this.adapter.getForeignObjectAsync(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`);
+                if (adapterObject.native.licenseCertificate) {
+                    if (await this.checkLocalLicenseCertificate()) {
+                        this.adapter.log.info('License Certificate OK');
                         resolve(true);
+                    } else {
+                        this.adapter.log.warn('There was an error validating the license')
+                        reject(false);
                     }
                 } else if (await this.checkLicenseKey()) {
                     resolve(true);
@@ -123,7 +148,7 @@ class asTools {
 
             if(response.data.success === true){
                 this.adapter.log.info('License Key activated');
-                await this.createLocalLicenseFile();
+                await this.createLocalLicenseCertificate();
                 return true;
             } else {
                 this.adapter.log.info('License Key activation failed');
@@ -135,7 +160,7 @@ class asTools {
         }
     }
 
-    async createLocalLicenseFile(){
+    async createLocalLicenseCertificate(){
         // get system uuid
         const systemMeta = await this.adapter.getForeignObjectAsync('system.meta.uuid');
         const systemUuid = systemMeta.native.uuid;
@@ -144,27 +169,36 @@ class asTools {
         // get Major version
         const majorVersion = this.adapter.version.split('.')[0];
         // create license file
-        const licenseFile = {
+        const licenseCertificate = {
             "licenseKey": licenseKey,
             "systemUuid": systemUuid,
             "majorVersion": majorVersion
         }
-        // encode license file
-        const licenseFileEncoded = Buffer.from(JSON.stringify(licenseFile)).toString('base64');
-        // write license file
-        fs.writeFileSync(__dirname + '/cache', licenseFileEncoded);
+        // encode license certificate
+        const licenseCertificateEncoded = Buffer.from(JSON.stringify(licenseCertificate)).toString('base64');
+        this.adapter.log.debug(licenseCertificateEncoded);
+        // write license certificate
+        await this.adapter.extendForeignObjectAsync(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`, {
+            native: {
+                licenseCertificate: licenseCertificateEncoded
+            }
+        })
     }
 
-    async checkLocalLicenseFile(){
-        // read license file
-        const licenseFileEncoded = fs.readFileSync(__dirname + '/cache');
+    async checkLocalLicenseCertificate(){
+        // read license certificate
+        const adapterObj = await this.adapter.getForeignObjectAsync(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`);
+        this.adapter.log.debug(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`);
+        this.adapter.log.debug(JSON.stringify(adapterObj));
+        const licenseCertificateEncoded = adapterObj.native.licenseCertificate;
         // decode license file
-        const licenseFile = JSON.parse(Buffer.from(licenseFileEncoded.toString(), 'base64').toString('ascii'));
+        const licenseCertificate = JSON.parse(Buffer.from(licenseCertificateEncoded, 'base64').toString('ascii'));
+        this.adapter.log.info(JSON.stringify(licenseCertificate));
         // get system uuid
         const systemMeta = await this.adapter.getForeignObjectAsync('system.meta.uuid');
         const systemUuid = systemMeta.native.uuid;
         // check if license file is valid
-        if(licenseFile.systemUuid === systemUuid && licenseFile.majorVersion === this.adapter.version.split('.')[0] && licenseFile.licenseKey === this.adapter.config.licenseKey){
+        if(licenseCertificate.systemUuid === systemUuid && licenseCertificate.majorVersion === this.adapter.version.split('.')[0] && licenseCertificate.licenseKey === this.adapter.config.licenseKey){
             return true;
         } else {
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@all-smart/all-smart-tools",
-  "version": "1.0.4",
+  "version": "1.0.10",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"