corebasic 1.0.83 → 1.0.85

package/libs/messaging.js

@@ -16,10 +16,15 @@ async function disconnect(user, uid) {
     if (!users_pool[user])
         return
 
+    let [{res}] = users_pool[user].reqres.filter(item => item.uid === uid).concat([{}])
+    res.end()
+
     if (users_pool[user].listeners[uid]) {
-        await consumer.unsubscribe(user, users_pool[user].listeners[uid]);
+        if (users_pool[user].listeners.count == 1)
+            await consumer.unsubscribe(user, users_pool[user].listeners[uid]);
         users_pool[user].listeners.count --
     }
+    users_pool[user].reqres = users_pool[user].reqres.filter(item => item.uid !== uid)
     delete users_pool[user].listeners[uid]
     if (!users_pool[user].listeners.count)
         delete users_pool[user]
@@ -27,15 +32,19 @@ async function disconnect(user, uid) {
     // await consumer.unsubscribe(user);
 }
 async function connect({user,req,res, uid}) {
+    res.writeHead(200, {'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache', 'Connection': 'keep-alive'})
     const listener = (message, channel) => {
         if (users_pool[user]) {
             try {message = JSON.parse(message)} catch {}
-            users_pool[user].res.write(JSON.stringify({message, channel}) + "\n")
+            for (let {req, res} of users_pool[user].reqres)
+                res.write(JSON.stringify({message, channel}) + "\n")
         }
     }
-    users_pool[user] = users_pool[user] ?? {req,res,listeners: {count: 0}}
+    users_pool[user] = users_pool[user] ?? {reqres: [], listeners: {count: 0}}
+    users_pool[user].reqres.push({req, res, uid})
     users_pool[user].listeners[uid] = listener
-    await consumer.subscribe(user, listener);
+    if (!users_pool[user].listeners.count)
+        await consumer.subscribe(user, listener);
     users_pool[user].listeners.count ++
 }
 
@@ -49,21 +58,15 @@ export async function start(app) {
     consumer.on('error', err => console.log('Redis Client Error', err));
 
     app.get('/messages/:user', async (req, res) => {
-        let uid = Utils.uid()
+        let uid = req.body.client
         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
     })
     app.get('/messages/disconnects/:user', async (req, res) => {
-        if (users_pool[req.params.user]) {
-            let userRes = users_pool[req.params.user].res
-            for (let uid in users_pool[req.params.user].listeners) {
-                if (uid === "count")
-                    continue
-                await disconnect(req.params.user, uid)
-            }
-            userRes.end()
-        }
+        let uid = req.body.client
+        if (users_pool[req.params.user])
+            await disconnect(req.params.user, uid)
         res.json({})
     })
 }

package/package.json

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