corebasic 1.0.72 → 1.0.74

package/libs/messaging.js

@@ -1,6 +1,7 @@
 
 import axios from 'axios'
 import { createClient } from 'redis';
+import * as Utils from './utils.js'
 
 // url: 'redis://alice:foobared@localhost:6380'
 let consumer, publisher
@@ -11,21 +12,28 @@ let users_pool = {
 
 }
 
-async function disconnect(user) {
-    await consumer.unsubscribe(user, users_pool[user].listener);
-    delete users_pool[user]
+async function disconnect(user, uid) {
+    if (users_pool[user].listeners[uid]) {
+        await consumer.unsubscribe(user, users_pool[user].listeners[uid]);
+        users_pool[user].listeners.count --
+    }
+    delete users_pool[user].listeners[uid]
+    if (!users_pool[user].listeners.count)
+        delete users_pool[user]
+
     // await consumer.unsubscribe(user);
 }
-async function connect({user,req,res}) {
+async function connect({user,req,res, uid}) {
     const listener = (message, channel) => {
         if (users_pool[user]) {
             try {message = JSON.parse(message)} catch {}
             users_pool[user].res.write(JSON.stringify({message, channel}) + "\n")
         }
     }
-    users_pool[user] = {req,res,listener}
+    users_pool[user] = users_pool[user] ?? {req,res,listeners: {count: 0}}
+    users_pool[user].listeners[uid] = listener
     await consumer.subscribe(user, listener);
-
+    users_pool[user].listeners.count ++
 }
 
 export async function start(app) {
@@ -37,9 +45,10 @@ export async function start(app) {
     consumer.on('error', err => console.log('Redis Client Error', err));
 
     app.get('/messages/:user', async (req, res) => {
-        await connect({user: req.params.user, req, res})
-        req.on("close", async () => await disconnect(req.params.user)) // request closed unexpectedly
-        req.on("end", async () => await disconnect(req.params.user)) // request ended normally
+        let uid = Utils.uid()
+        await connect({user: req.params.user, req, res, uid})
+        req.on("close", async () => await disconnect(req.params.user, uid)) // request closed unexpectedly
+        req.on("end", async () => await disconnect(req.params.user, uid)) // request ended normally
     })
 }
 

package/libs/utils.js

@@ -163,7 +163,7 @@ export async function fileToJson(path, file) {
 
 
 function execute(pipeline, errfn) {
-    startPipeline(pipeline, 0, undefined, errfn)  
+    startPipeline(pipeline, 0, undefined, errfn)
 }
 
 function startPipeline(pipeline, index, data, errfn) {
@@ -177,9 +177,26 @@ function startPipeline(pipeline, index, data, errfn) {
 // S3 Object Storage
 // -----------------
 
-export async function getUrl(path, expiry = 3600) { // expiry default: 1 Hour 
+export async function getUrl(path, expiry = 3600) { // expiry default: 1 Hour
     return await getSignedUrl(S3, new GetObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry })
 }
-export async function putUrl(path, expiry = 3600) { // expiry default: 1 Hour 
+export async function putUrl(path, expiry = 3600) { // expiry default: 1 Hour
     return await getSignedUrl(S3, new PutObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry })
 }
+
+// ---------------------------
+// Express Middleware Exclude
+// ---------------------------
+export const excludeMiddleware = function(middleware, ...paths) {
+    return function(req, res, next) {
+        const pathCheck = paths.some(path => {
+          let url  = req.path.split('/')
+          let cmp  = path.split('/')
+          if (url.length !== cmp.length)
+              return false
+          let f = cmp.map((p,index) =>  p.startsWith(":") ? url[index] : p).join('/')
+          return f === req.path
+        })
+        pathCheck ? next() : middleware(req, res, next);
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "",
   "main": "index.js",
   "scripts": {