Update release-script

Remove request lib

.github/workflows/test-and-release.yml

@@ -96,7 +96,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/[email protected]

.npmignore

@@ -1,12 +1,14 @@
-gruntfile.js
-example
-tasks
-test
-.travis.yml
-appveyor.yml
-admin/i18n
-package-lock.json
-iob_npm.done
-.idea
-.github
-node_modules
+/**/*
+/gulpfile.js
+gulpfile.js
+!/lib/**/*
+!/lib/*
+!/admin/**/*
+!/admin/*
+!/example/*
+!/example/**/*
+!/io-package.json
+!/package.json
+!/LICENSE
+!/main.js
+!/README.md

.releaseconfig.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["iobroker", "license"]
+}

README.md

@@ -315,6 +315,7 @@ You can set option *Force Web-Sockets* to force using only web-sockets transport
 
 ### __WORK IN PROGRESS__
 * (foxriver76) make error logging on failed authentication more specific
+* (foxriver76) "request" was repalced by "axios" 
 
 ### 3.1.4 (2021-01-13)
 * (Apollon77) Define instanceObject "connected" to prevent warning with js-controller 3.2

lib/socket.js

@@ -10,7 +10,7 @@ const fs           = require('fs');
 const cookieParser = require('cookie-parser');
 const EventEmitter = require('events');
 const util         = require('util');
-let request        = null;
+let axios          = null;
 
 // From settings used only secure, auth and crossDomain
 function IOSocket(server, settings, adapter) {
@@ -810,17 +810,17 @@ function IOSocket(server, settings, adapter) {
 
     function socketEvents(socket, address) {
         if (socket.conn) {
-            that.adapter.log.info('==>Connected ' + socket._acl.user + ' from ' + address);
+            that.adapter.log.info(`==>Connected ${socket._acl.user} from ${address}`);
         } else {
-            that.adapter.log.info('Trying to connect as ' + socket._acl.user + ' from ' + address);
+            that.adapter.log.info(`Trying to connect as ${socket._acl.user} from ${address}`);
         }
 
         if (!that.infoTimeout) {
             that.infoTimeout = setTimeout(updateConnectedInfo, 1000);
         }
 
         socket.on('authenticate', function (user, pass, callback) {
-            that.adapter.log.debug((new Date()).toISOString() + ' Request authenticate [' + socket._acl.user + ']');
+            that.adapter.log.debug(`${(new Date()).toISOString()} Request authenticate [${socket._acl.user}]`);
             if (typeof user === 'function') {
                 callback = user;
                 user = undefined;
@@ -830,7 +830,7 @@ function IOSocket(server, settings, adapter) {
                     callback(true, socket._secure);
                 }
             } else {
-                that.adapter.log.debug((new Date()).toISOString() + ' Request authenticate [' + socket._acl.user + ']');
+                that.adapter.log.debug(`${(new Date()).toISOString()} Request authenticate [${socket._acl.user}]`);
                 socket._authPending = callback;
             }
         });
@@ -844,7 +844,7 @@ function IOSocket(server, settings, adapter) {
                     that.infoTimeout = setTimeout(updateConnectedInfo, 1000);
                 }
             } else if (this._name !== name) {
-                that.adapter.log.warn('socket ' + this.id + ' changed socket name from ' + this._name + ' to ' + name);
+                that.adapter.log.warn(`socket ${this.id} changed socket name from ${this._name} to ${name}`);
                 this._name = name;
             }
             if (typeof cb === 'function') {
@@ -1280,10 +1280,12 @@ function IOSocket(server, settings, adapter) {
         // HTTP
         socket.on('httpGet', function (url, callback) {
             if (updateSession(socket) && checkPermissions(socket, 'httpGet', callback, url)) {
-                if (!request) request = require('request');
+                axios = axios || require('axios');
                 that.adapter.log.debug('httpGet: ' + url);
                 try {
-                    request(url, callback);
+                    axios(url, {responseType: 'arraybuffer'})
+                        .then(result => callback(null, {status: result.status, statusText: result.statusText}, result.data))
+                        .catch(error => callback(error));
                 } catch (err) {
                     callback(err);
                 }

package.json

@@ -17,15 +17,17 @@
   },
   "dependencies": {
     "socket.io": "^2.4.1",
-    "request": "^2.88.2",
+    "axios": "^0.23.0",
     "cookie-parser": "^1.4.5",
     "express-session": "^1.17.2",
     "@iobroker/adapter-core": "^2.5.1"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^2.2.1",
+    "@alcalzone/release-script": "^3.4.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.3.0",
+    "@alcalzone/release-script-plugin-license": "^3.3.0",
     "gulp": "^4.0.2",
-    "mocha": "^9.1.2",
+    "mocha": "^9.1.3",
     "chai": "^4.3.4"
   },
   "bugs": {
@@ -34,7 +36,8 @@
   "main": "main.js",
   "scripts": {
     "test": "node node_modules/mocha/bin/mocha --exit",
-    "release": "release-script"
+    "release": "release-script patch --yes",
+    "release-minor": "release-script minor --yes"
   },
   "license": "MIT",
   "readmeFilename": "README.md"