r0b08x [chore] 4/25/2024, 2:01:43 AM

Author: p3x-robot

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.219
+# 🏍️ The p3x-redis-ui-server package motor that is connected to the p3x-redis-ui-material web user interface v2024.4.221
 
 
 
@@ -26,7 +26,7 @@ https://corifeus.com/redis-ui
 ### Built on NodeJs version
 
 ```txt
-v20.12.1
+v20.12.2
 ```
 
 
@@ -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.219
+[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.221
 
  [![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)
 

artifacts/boot/p3xrs.json

@@ -2,7 +2,9 @@
     "p3xrs": {
         "http": {
             "port-info": "this is ommitted, it will be default 7843",
-            "port": 7843
+            "port": 7843,
+            "bind-info": "the interface with listen to, could be 127.0.0.1 or 0.0.0.0 or specific interface",
+            "bind": "0.0.0.0"
         },
         "connections": {
             "home-dir-info": "if the dir config is empty or home, the connections are saved in the home folder, otherwise it will resolve the directory set as it is, either relative ./ or absolute starting with /. NodeJs will resolve this directory in p3xrs.connections.dir",

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.219
+[**P3X-REDIS-UI-SERVER**](https://corifeus.com/redis-ui-server) Build v2024.4.221
 
  [![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)
 

package.json

@@ -1,13 +1,13 @@
 {
     "name": "p3x-redis-ui-server",
-    "version": "2024.4.219",
+    "version": "2024.4.221",
     "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",
         "code": "Reverse",
         "opencollective": false,
         "build": true,
-        "nodejs": "v20.12.1",
+        "nodejs": "v20.12.2",
         "reponame": "redis-ui-server",
         "publish": true,
         "prefix": "p3x-",
@@ -58,8 +58,8 @@
         "chalk": "^4.1.2",
         "commander": "^12.0.0",
         "corifeus-utils": "^2024.4.118",
-        "ioredis": "^5.3.2",
-        "koa": "^2.15.2",
+        "ioredis": "^5.4.1",
+        "koa": "^2.15.3",
         "koa-send": "^5.0.1",
         "koa-static": "^5.0.0",
         "lodash": "^4.17.21",

src/lib/cli.js

@@ -20,9 +20,25 @@ const cli = () => {
     if (!process.versions.hasOwnProperty('electron') && !process.env.hasOwnProperty('P3XRS_DOCKER_HOME')) {
 
         if (!programOptions.config) {
-
-
-            programOptions.config = path.resolve(path.dirname(require.main.filename) + path.sep + '..', `.${path.sep}p3xrs.json`)
+            const path = require('path');
+            const fs = require('fs');
+            const findConfigFile = (startPath, filename) => {
+                let currentPath = startPath;
+                while (currentPath !== path.resolve(currentPath, '..')) { // Check until we reach the root directory
+                    const filePath = path.join(currentPath, filename);
+                    if (fs.existsSync(filePath)) {
+                        return filePath;
+                    }
+                    currentPath = path.resolve(currentPath, '..'); // Move up one directory level
+                }
+                throw new Error('The specified configuration file could not be found.');
+            }
+            const resolveConfigPath = () => {
+                // Attempt to find the config file starting from the directory of the main script or current directory
+                const startPath = process.cwd();
+                return findConfigFile(startPath, 'p3xrs.json');
+            }
+            programOptions.config = resolveConfigPath()
 
             //        program.outputHelp()
             //        return false
@@ -51,7 +67,9 @@ const cli = () => {
         p3xrs.cfg = {
             "http": {
                 "port-info": "this is ommitted, it will be default 7843",
-                "port": process.env.hasOwnProperty('P3XRS_DOCKER_HOME') ? 7843 : global.p3xrsElectronPort
+                "port": process.env.hasOwnProperty('P3XRS_DOCKER_HOME') ? 7843 : global.p3xrsElectronPort,
+                "bind-info": "the interface with listen to, could be 127.0.0.1 or 0.0.0.0 or specific interface",
+                "bind": "0.0.0.0",
             },
             "connections": {
                 "home-dir-info": "if the dir config is empty or home, the connections are saved in the home folder, otherwise it will resolve the directory set as it is, either relative ./ or absolute starting with /. NodeJs will resolve this directory in p3xrs.connections.dir",

src/service/koa/index.js

@@ -18,15 +18,31 @@ const koaService = function () {
 
         // app.use(koaBody());
 
+        const path = require('path');
+        const fs = require('fs');
+        
+        const findModulePath = (startPath, targetPath) => {
+            let currentPath = startPath;
+            while (currentPath !== path.resolve(currentPath, '..')) { // Check until we reach the root directory
+                const nodeModulesPath = path.join(currentPath, targetPath);
+                if (fs.existsSync(nodeModulesPath)) {
+                    return nodeModulesPath;
+                }
+                currentPath = path.resolve(currentPath, '..'); // Move up one directory level
+            }
+            throw new Error('The specified module could not be found in any node_modules directory');
+        }
+        
         const resolvePath = (inputPath) => {
-            let resolvedPath
             if (inputPath.startsWith('~')) {
-                const inputPathFromNodeModules = inputPath.substring(1)
-                resolvedPath = path.resolve(path.dirname(require.main.filename) + path.sep + '..', `node_modules${path.sep}${inputPathFromNodeModules}`)
+                const inputPathFromNodeModules = inputPath.substring(1);
+                // Attempt to find the module starting from the directory of the main script or current directory
+                const startPath = __dirname;
+                return findModulePath(startPath, inputPathFromNodeModules);
             } else {
-                resolvedPath = path.resolve(process.cwd(), inputPath)
+                // Resolve the path relative to the current working directory for non-module specific paths
+                return path.resolve(process.cwd(), inputPath);
             }
-            return resolvedPath
         }
 
         let hasStatic = false

src/service/socket.io/request/connection-connect.js

@@ -322,24 +322,6 @@ module.exports = async (options) => {
             redis.on('disconnect', redisErrorFun)
             redisSubscriber.on('error', redisErrorFun)
 
-            //console.warn('create psubscribe', actualConnection.id)
-            redisSubscriber.psubscribe('*', function (error, count) {
-                if (error) {
-                    console.error(error)
-                }
-            })
-
-            //console.warn('create pmessage', actualConnection.id)
-            redisSubscriber.on('pmessage', function (channel, pattern, message) {
-                //console.log(`receive pmessage channel: ${channel} - pattern: ${pattern}, message: ${message}`);
-                //console.log('list clients', actualConnection.id, JSON.stringify(p3xrs.redisConnections[actualConnection.id].clients, null, 4))
-                
-                socket.emit('pubsub-message', {
-                    channel: pattern,
-                    message: message,
-                })
-            });
-
             redis.on('connect', async function () {
 
                 try {

src/service/socket.io/request/set-subscription.js

@@ -0,0 +1,41 @@
+module.exports = async (options) => {
+    const { socket, payload } = options;
+
+    try {
+        if (socket.p3xrs && socket.p3xrs.subscription) {
+            // Unsubscribe before clearing the old listener to prevent memory leaks
+            await socket.p3xrs.ioredisSubscriber.punsubscribe('*');
+
+            // Remove old listeners to prevent multiple listeners from accumulating
+            socket.p3xrs.ioredisSubscriber.removeAllListeners('pmessage');
+        }
+
+        // Updating subscription settings
+        socket.p3xrs.subscription = payload.subscription;
+        if (typeof payload.subscriberPattern !== 'string' || payload.subscriberPattern.trim().length === 0) {
+            payload.subscriberPattern = '*'; // Default pattern
+        }
+
+        if (socket.p3xrs.subscription === true) {
+            // Subscribe to the pattern
+            await socket.p3xrs.ioredisSubscriber.psubscribe(payload.subscriberPattern);
+
+            console.log('socket.p3xrs.subscription', payload.subscriberPattern)
+
+            // Handle incoming messages
+            socket.p3xrs.ioredisSubscriber.on('pmessage', (pattern, channel, message) => {
+                //console.log('subscription', pattern, channel, message)
+                socket.emit('pubsub-message', { 
+                    channel: channel,
+                    message: message,
+                });
+            });
+        }
+        // Confirm successful setup
+        socket.emit(options.responseEvent, { status: 'ok' });
+    } catch (e) {
+        console.error('Subscription error:', e);
+        socket.emit(options.responseEvent, { status: 'error', error: e.message });
+    }
+};
+

src/service/socket.io/socket.js

@@ -27,6 +27,7 @@ module.exports = (io) => {
             tunnelClient: undefined,
             readonly: undefined,
             // commands: undefined,
+            subsciber: false,
         }
 
         console.info(`socket.io connected ${socket.id}`);