Skip to content

Commit

Permalink
r0b08x [chore] 3/29/2024, 6:00:08 PM
Browse files Browse the repository at this point in the history
  • Loading branch information
p3x-robot committed Mar 29, 2024
1 parent acd6df3 commit 31abe31
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion artifacts/cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 3 additions & 4 deletions src/lib/ioredis-cluster/set-default-options-from-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand All @@ -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
}
2 changes: 1 addition & 1 deletion src/service/koa/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

}

Expand Down
4 changes: 2 additions & 2 deletions src/service/socket.io/request/connection-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 4 additions & 3 deletions src/service/socket.io/request/redis-test-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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, {
Expand Down

0 comments on commit 31abe31

Please sign in to comment.