From 31abe311e1e8a6eba1f47d807d74f41b0df289e6 Mon Sep 17 00:00:00 2001 From: patrikx3 Date: Fri, 29 Mar 2024 18:00:08 +0100 Subject: [PATCH] r0b08x [chore] 3/29/2024, 6:00:08 PM --- README.md | 4 ++-- artifacts/cluster.md | 2 +- package.json | 2 +- src/lib/ioredis-cluster/set-default-options-from-server.js | 7 +++---- src/service/koa/index.js | 2 +- src/service/socket.io/request/connection-connect.js | 4 ++-- src/service/socket.io/request/redis-test-connection.js | 7 ++++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 7e0e874..498cb48 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ https://corifeus.com/redis-ui --- -# 🏍️ The p3x-redis-ui-server package motor that is connected to the p3x-redis-ui-material web user interface v2024.4.177 +# 🏍️ The p3x-redis-ui-server package motor that is connected to the p3x-redis-ui-material web user interface v2024.4.178 @@ -112,7 +112,7 @@ All my domains ([patrikx3.com](https://patrikx3.com) and [corifeus.com](https:// --- -[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.177 +[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.178 [![NPM](https://img.shields.io/npm/v/p3x-redis-ui-server.svg)](https://www.npmjs.com/package/p3x-redis-ui-server) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/artifacts/cluster.md b/artifacts/cluster.md index 1443179..b17134d 100644 --- a/artifacts/cluster.md +++ b/artifacts/cluster.md @@ -25,7 +25,7 @@ All my domains ([patrikx3.com](https://patrikx3.com) and [corifeus.com](https:// --- -[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.177 +[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.178 [![NPM](https://img.shields.io/npm/v/p3x-redis-ui-server.svg)](https://www.npmjs.com/package/p3x-redis-ui-server) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/package.json b/package.json index 2e0a771..653ad57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p3x-redis-ui-server", - "version": "2024.4.177", + "version": "2024.4.178", "description": "🏍️ The p3x-redis-ui-server package motor that is connected to the p3x-redis-ui-material web user interface", "corifeus": { "icon": "fas fa-flag-checkered", diff --git a/src/lib/ioredis-cluster/set-default-options-from-server.js b/src/lib/ioredis-cluster/set-default-options-from-server.js index d07671e..c73d3ae 100644 --- a/src/lib/ioredis-cluster/set-default-options-from-server.js +++ b/src/lib/ioredis-cluster/set-default-options-from-server.js @@ -7,7 +7,7 @@ function getDefaultOptionsFromServer(server) { module.exports = function(options, server) { const serverOptions = getDefaultOptionsFromServer(server) - console.log('serverOptions', serverOptions) + //console.log('serverOptions', serverOptions) let {redisOptions} = options if (redisOptions === undefined) { redisOptions = {} @@ -26,9 +26,8 @@ module.exports = function(options, server) { ca: serverOptions.tlsCa, } } - if ((typeof serverOptions.tlsCa === 'string' && serverOptions.tlsCa.trim() !== '') || serverOptions.tlsWithoutCert) { - redisOptions.tls.rejectUnauthorized = serverOptions.tlsRejectUnauthorized - redisOptions.tls.rejectUnauthorized = serverOptions.tlsRejectUnauthorized === undefined ? false : serverOptions.tlsRejectUnauthorized + if (redisConfig.hasOwnProperty('tls')) { + redisConfig.tls.rejectUnauthorized = redisConfig.tlsRejectUnauthorized === undefined ? false : redisConfig.tlsRejectUnauthorized } return options } diff --git a/src/service/koa/index.js b/src/service/koa/index.js index 7854df8..2cc4856 100644 --- a/src/service/koa/index.js +++ b/src/service/koa/index.js @@ -108,7 +108,7 @@ const koaService = function () { this.server = server; - server.listen(p3xrs.cfg.http.port || 7843, '0.0.0.0'); + server.listen(p3xrs.cfg.http.port || 7843, p3xrs.cfg.http.bind ? p3xrs.cfg.http.bind : '0.0.0.0'); } diff --git a/src/service/socket.io/request/connection-connect.js b/src/service/socket.io/request/connection-connect.js index acdaccb..1b5379d 100644 --- a/src/service/socket.io/request/connection-connect.js +++ b/src/service/socket.io/request/connection-connect.js @@ -183,8 +183,8 @@ module.exports = async (options) => { ca: redisConfig.tlsCa, } } - if ((typeof redisConfig.tlsCa === 'string' && redisConfig.tlsCa.trim() !== '') || redisConfig.tlsWithoutCert) { - redisConfig.tls.rejectUnauthorized = redisConfig.tlsRejectUnauthorized === undefined ? false : redisConfig.tlsRejectUnauthorized + if (redisConfig.hasOwnProperty('tls')) { + redisConfig.tls.rejectUnauthorized = redisConfig.tlsRejectUnauthorized === undefined ? false : redisConfig.tlsRejectUnauthorized } if (redisConfig.hasOwnProperty('sentinel') && redisConfig.sentinel === true) { diff --git a/src/service/socket.io/request/redis-test-connection.js b/src/service/socket.io/request/redis-test-connection.js index ddf11f3..73ca022 100644 --- a/src/service/socket.io/request/redis-test-connection.js +++ b/src/service/socket.io/request/redis-test-connection.js @@ -41,13 +41,14 @@ module.exports = async (options) => { //rejectUnauthorized: false, cert: redisConfig.tlsCrt, key: redisConfig.tlsKey, - ca: redisConfig.tlsCa, + ca: redisConfig.tlsCa, } } - if ((typeof redisConfig.tlsCa === 'string' && redisConfig.tlsCa.trim() !== '') || redisConfig.tlsWithoutCert) { + if (redisConfig.hasOwnProperty('tls')) { redisConfig.tls.rejectUnauthorized = redisConfig.tlsRejectUnauthorized === undefined ? false : redisConfig.tlsRejectUnauthorized } + if (redisConfig.hasOwnProperty('sentinel') && redisConfig.sentinel === true) { redisConfig.nodes = redisConfig.nodes.map((node) => { if (node.password === node.id) { @@ -138,7 +139,7 @@ module.exports = async (options) => { } let redis = new Redis(redisConfig) - console.info('redis-test-connection', redisConfig) + //console.info('redis-test-connection', redisConfig) redis.on('error', function (error) { console.error(error) socket.emit(options.responseEvent, {