@all-smart/all-smart-tools 1.0.5 → 1.0.11

package/main.js

@@ -63,13 +63,30 @@ class asTools {
         });
     }
 
+    async createAdapterStorageObject(){
+        await this.adapter.setObjectNotExistsAsync(`${this.adapter.namespace.replace(/\.\d/g, '')}.storage`, {
+            "type": "config",
+            "common": {
+                "name": "Adapter storage",
+                "type": "config",
+                "expert": true
+            },
+            "native": {}
+        })
+    }
+
     async block() {
         return new Promise(async (resolve, reject) => {
+            await this.createAdapterStorageObject();
             const check = async () => {
-                if (fs.existsSync(__dirname + '/cache')) {
+                const adapterObject = await this.adapter.getForeignObjectAsync(`${this.adapter.namespace.replace(/\.\d/g, '')}.storage`);
+                if (adapterObject.native.licenseCertificate) {
                     if (await this.checkLocalLicenseCertificate()) {
-                        this.adapter.log.info('License Key file OK');
+                        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);
@@ -171,22 +188,22 @@ class asTools {
             "majorVersion": majorVersion
         }
         // encode license certificate
-        const licenseFileEncoded = JSON.stringify(licenseCertificate).toString('base64');
+        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, '')}`, {
+        await this.adapter.extendForeignObjectAsync(`${this.adapter.namespace.replace(/\.\d/g, '')}.storage`, {
             native: {
-                licenseCertificate: licenseFileEncoded
+                licenseCertificate: licenseCertificateEncoded
             }
         })
     }
 
     async checkLocalLicenseCertificate(){
         // read license certificate
-        const licenseFileEncoded = fs.readFileSync(__dirname + '/cache');
-        const adapterObj = this.adapter.getForeignObjectAsync(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`)
+        const adapterObj = await this.adapter.getForeignObjectAsync(`${this.adapter.namespace.replace(/\.\d/g, '')}.storage`);
         const licenseCertificateEncoded = adapterObj.native.licenseCertificate;
         // decode license file
-        const licenseCertificate = JSON.parse(licenseCertificateEncoded.toString().toString('ascii'));
+        const licenseCertificate = JSON.parse(Buffer.from(licenseCertificateEncoded, 'base64').toString('ascii'));
         // get system uuid
         const systemMeta = await this.adapter.getForeignObjectAsync('system.meta.uuid');
         const systemUuid = systemMeta.native.uuid;

package/package.json

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