From 7e15b5f46d7785fdbddcb424c5f411dfa958dcbc Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Fri, 22 Oct 2021 22:55:13 +0200 Subject: [PATCH] Update release-script Remove request lib --- .github/workflows/test-and-release.yml | 2 +- .npmignore | 26 ++++++++++++++------------ .releaseconfig.json | 3 +++ .travis.yml | 21 --------------------- README.md | 1 + appveyor.yml | 22 ---------------------- lib/socket.js | 18 ++++++++++-------- package.json | 11 +++++++---- 8 files changed, 36 insertions(+), 68 deletions(-) create mode 100644 .releaseconfig.json delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 8758c8b..008f060 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -96,7 +96,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v2.4.1 diff --git a/.npmignore b/.npmignore index 4df4143..827874f 100644 --- a/.npmignore +++ b/.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 \ No newline at end of file +/**/* +/gulpfile.js +gulpfile.js +!/lib/**/* +!/lib/* +!/admin/**/* +!/admin/* +!/example/* +!/example/**/* +!/io-package.json +!/package.json +!/LICENSE +!/main.js +!/README.md diff --git a/.releaseconfig.json b/.releaseconfig.json new file mode 100644 index 0000000..6f9d0f5 --- /dev/null +++ b/.releaseconfig.json @@ -0,0 +1,3 @@ +{ + "plugins": ["iobroker", "license"] +} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e8729a5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -os: - - linux - - osx - - windows -language: node_js -node_js: - - '12' - - '14' - - '16' -before_script: - - export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1) - - 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi' - - npm -v -env: - - CXX=g++-6 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 diff --git a/README.md b/README.md index 78a45cf..dd3d738 100644 --- a/README.md +++ b/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 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 6afce63..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 'test-{build}' -environment: - matrix: - - nodejs_version: '12' - - nodejs_version: '14' - - nodejs_version: '16' -platform: - - x86 - - x64 -clone_folder: 'c:\projects\%APPVEYOR_PROJECT_NAME%' -install: - - ps: 'Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform' - - ps: '$NpmVersion = (npm -v).Substring(0,1)' - - ps: 'if($NpmVersion -eq 5) { npm install -g npm@5 }' - - ps: npm --version - - npm install -test_script: - - echo %cd% - - node --version - - npm --version - - npm test -build: 'off' diff --git a/lib/socket.js b/lib/socket.js index bd2bf8a..f40ec5b 100644 --- a/lib/socket.js +++ b/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,9 +810,9 @@ 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) { @@ -820,7 +820,7 @@ function IOSocket(server, settings, adapter) { } 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); } diff --git a/package.json b/package.json index 5ef221d..efc19f2 100644 --- a/package.json +++ b/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"