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

package/main.js

@@ -22,6 +22,7 @@ class asTools {
     async main() {
         this.checkLxc();
         this.checkDocker();
+        await this.createAdapterStorageObject();
     }
 
     async onMessage(obj) {
@@ -63,10 +64,22 @@ class asTools {
         });
     }
 
+    async createAdapterStorageObject(){
+        await this.adapter.setForeignObjectNotExistsAsync(`${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) => {
             const check = async () => {
-                const adapterObject = await this.adapter.getForeignObjectAsync(`system.adapter.${this.adapter.namespace.replace(/\.\d/g, '')}`);
+                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 Certificate OK');
@@ -178,7 +191,7 @@ class asTools {
         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: licenseCertificateEncoded
             }
@@ -187,13 +200,10 @@ class asTools {
 
     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 adapterObj = await this.adapter.getForeignObjectAsync(`${this.adapter.namespace.replace(/\.\d/g, '')}.storage`);
         const licenseCertificateEncoded = adapterObj.native.licenseCertificate;
         // decode license file
         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;

package/package.json

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