@iobroker/socket-classes 0.1.2 → 0.1.5

package/README.md

@@ -12,7 +12,7 @@ This library is used for following adapters:
 ```
 const TTL_SEC      = 3600;
 
-const SocketAdmin  = require('./lib/socketAdmin');
+const SocketAdmin  = require('@iobroker/socket-classes').SocketAdmin;
 const ws           = require('@iobroker/ws-server');
 const session      = require('express-session');
 const utils 	   = require('@iobroker/adapter-core'); // Get common adapter utils
@@ -44,7 +44,7 @@ io.close();
 const TTL_SEC      = 3600;
 
 const ws           = require('@iobroker/ws-server');
-const SocketWS     = require('./lib/socketWS.js');
+const SocketWS     = require('@iobroker/socket-classes').SocketCommon;
 const session      = require('express-session');
 const utils 	   = require('@iobroker/adapter-core'); // Get common adapter utils
 const AdapterStore = require(utils.controllerDir + '/lib/session.js')(session, TTL_SEC);
@@ -69,6 +69,12 @@ io.close();
 -->
 
 ## Changelog
+### 0.1.5 (2022-04-25)
+* (bluefox) added updateRatings
+
+### 0.1.4 (2022-04-24)
+* (bluefox) added passportSocket
+
 ### 0.1.2 (2022-04-24)
 * (bluefox) initial commit
 

package/index.js

@@ -2,10 +2,18 @@ const SocketAdmin = require('./lib/socketAdmin');
 const SocketCommon = require('./lib/socketCommon');
 const SocketCommands = require('./lib/socketCommands');
 const SocketCommandsAdmin = require('./lib/socketCommandsAdmin');
+const passportSocket = require('./lib/passportSocket');
 
 module.exports = {
     SocketAdmin,
     SocketCommon,
     SocketCommands,
-    SocketCommandsAdmin
+    SocketCommandsAdmin,
+    passportSocket,
+    get passport() {
+        return require('passport');
+    },
+    get cookieParser() {
+        return require('cookie-parser');
+    }
 };

package/lib/socketAdmin.js

@@ -173,6 +173,10 @@ class SocketAdmin extends SocketCommon {
             this.server.sockets.emit(obj.command, obj.message.id, obj.message.data);
         }
     }
+
+    updateRatings(uuid, isAutoUpdate) {
+        return this.commands.updateRatings(uuid, isAutoUpdate);
+    }
 }
 
 module.exports = SocketAdmin;

package/lib/socketCommands.js

@@ -750,18 +750,18 @@ class SocketCommands {
             }
         };
 
-        this.commands['chownFile'] = (socket, _adapter, filename, options, callback) => {
-            if (this._checkPermissions(socket, 'chownFile', callback, filename)) {
+        this.commands['chownFile'] = (socket, _adapter, fileName, options, callback) => {
+            if (this._checkPermissions(socket, 'chownFile', callback, fileName)) {
                 options = options || {};
                 options.user = socket._acl.user;
-                this.adapter.chownFile(_adapter, filename, options, (err, ...args) =>
+                this.adapter.chownFile(_adapter, fileName, options, (err, ...args) =>
                     SocketCommands._fixCallback(callback, err, ...args));
             }
         };
 
-        this.commands['fileExists'] = (socket, _adapter, filename, callback) => {
-            if (this._checkPermissions(socket, 'fileExists', callback, filename)) {
-                this.adapter.fileExists(_adapter, filename, {user: socket._acl.user}, (err, ...args) =>
+        this.commands['fileExists'] = (socket, _adapter, fileName, callback) => {
+            if (this._checkPermissions(socket, 'fileExists', callback, fileName)) {
+                this.adapter.fileExists(_adapter, fileName, {user: socket._acl.user}, (err, ...args) =>
                     SocketCommands._fixCallback(callback, err, ...args));
             }
         };

package/lib/socketCommandsAdmin.js

@@ -97,6 +97,36 @@ class SocketCommandsAdmin extends SocketCommands {
         }
     }
 
+    async updateRatings(uuid) {
+        if (!uuid) {
+            const obj = await this.adapter.getForeignObjectAsync('system.meta.uuid');
+            uuid = obj.native.uuid;
+        }
+
+        try {
+            const response = await axios.get('https://rating.iobroker.net/rating?uuid=' + uuid, {timeout: 15000, validateStatus: status => status < 400})
+            this.adapter._ratings = response.data;
+            if (!this.adapter._ratings || typeof this.adapter._ratings !== 'object' || Array.isArray(this.adapter._ratings)) {
+                this.adapter._ratings = {};
+            }
+            this.adapter._ratings.uuid = uuid;
+
+            // auto update only in admin
+            if (this.adapter.name === 'admin') {
+                this.adapter.ratingTimeout && clearTimeout(this.adapter.ratingTimeout);
+                this.adapter.ratingTimeout = setTimeout(() => {
+                    this.adapter.ratingTimeout = null;
+                    this.updateRatings(uuid, true)
+                        .then(() => this.adapter.log.info('Adapter rating updated'));
+                }, 24 * 3600000);
+            }
+
+            return this.adapter._ratings;
+        } catch (error) {
+            this.adapter.log.warn('Cannot update rating: ' + (error.response ? error.response.data : (error.message || error.code)));
+        }
+    }
+
     _readInstanceConfig(id, user, isTab, configs) {
         return new Promise(resolve =>
             this.adapter.getForeignObject('system.adapter.' + id, {user}, (err, obj) => {
@@ -607,25 +637,25 @@ class SocketCommandsAdmin extends SocketCommands {
                             if (config && config.log && config.log.transport) {
                                 for (const transport in config.log.transport) {
                                     if (Object.prototype.hasOwnProperty.call(config.log.transport, transport) && config.log.transport[transport].type === 'file') {
-                                        let filename = config.log.transport[transport].filename || 'log/';
-                                        const parts = filename.replace(/\\/g, '/').split('/');
+                                        let fileName = config.log.transport[transport].filename || 'log/';
+                                        const parts = fileName.replace(/\\/g, '/').split('/');
                                         parts.pop();
-                                        filename = parts.join('/');
-                                        if (filename[0] !== '/' && !filename.match(/^\W:/)) {
-                                            const _filename = path.normalize(__dirname + '/../../../') + filename;
+                                        fileName = parts.join('/');
+                                        if (fileName[0] !== '/' && !fileName.match(/^\W:/)) {
+                                            const _filename = path.normalize(__dirname + '/../../../') + fileName;
                                             if (!fs.existsSync(_filename)) {
-                                                filename = path.normalize(__dirname + '/../../') + filename;
+                                                fileName = path.normalize(__dirname + '/../../') + fileName;
                                             } else {
-                                                filename = _filename;
+                                                fileName = _filename;
                                             }
                                         }
-                                        if (fs.existsSync(filename)) {
-                                            const files = fs.readdirSync(filename);
+                                        if (fs.existsSync(fileName)) {
+                                            const files = fs.readdirSync(fileName);
 
                                             for (let f = 0; f < files.length; f++) {
                                                 try {
                                                     if (!files[f].endsWith('-audit.json')) {
-                                                        const stat = fs.lstatSync(filename + '/' + files[f]);
+                                                        const stat = fs.lstatSync(fileName + '/' + files[f]);
                                                         if (!stat.isDirectory()) {
                                                             result.list.push({
                                                                 fileName: 'log/' + transport + '/' + files[f],
@@ -636,7 +666,7 @@ class SocketCommandsAdmin extends SocketCommands {
                                                 } catch (e) {
                                                     // push unchecked
                                                     // result.list.push('log/' + transport + '/' + files[f]);
-                                                    this.adapter.log.error(`Cannot check file: ${filename}/${files[f]}`);
+                                                    this.adapter.log.error(`Cannot check file: ${fileName}/${files[f]}`);
                                                 }
                                             }
                                         }
@@ -692,8 +722,8 @@ class SocketCommandsAdmin extends SocketCommands {
         };
 
         this.commands['getRatings'] = (socket, update, callback) => {
-            if (update) {
-                this.adapter._updateRatings()
+            if (update || !this.adapter._ratings) {
+                this.updateRatings()
                     .then(() => typeof callback === 'function' && callback(null, this.adapter._ratings));
             } else {
                 typeof callback === 'function' && callback(null, this.adapter._ratings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",