corebasic 1.0.82 → 1.0.84

package/libs/features.js

@@ -2,11 +2,32 @@ import * as Dip from './dip.js'
 import * as Kafka from './kafka.js'
 import * as Utils from './utils.js'
 import * as Messaging from './messaging.js'
+import axios from 'axios'
 
 
 let  features = {}
 let apis = {}
 
+const getFeatureMethod = api => api.split(' ')[0].toLowerCase()
+const getFeatureUrl = api => api.split(' ')[1]
+const getFeature = name => features[name]
+
+export const send = async (feature, params, payload) => {
+    let {api} = getFeature(feature)
+    let method = getFeatureMethod(api)
+    let url = getFeatureUrl(api)
+
+    if (params || url.includes(':')) {
+        for (let key in params)
+            url = url.replace(`:${key}`, params[key])
+        if (url.includes(':'))
+            throw {feature, when: 'api/params/substitution', message: "Internal Feature Call" }
+    }
+
+    return await (axios[method](`http://127.0.0.1${url}`,payload).timeout(1000))
+}
+
+
 export const start = async (app, url, file) => {
     features = await Utils.fileToJson(url, file)
 
@@ -29,13 +50,13 @@ export const start = async (app, url, file) => {
 
     // Registering apis
     for (let api in apis) {
-        let method = api.split(' ')[0].toLowerCase()
+        let method = getFeatureMethod(api)
         let url = api.split(' ')[1]
         if (api === 'GET /transactions/:id')
             continue
 
         app[method](url, async (req, res) => {
-            let feature = features[req.body.feature]
+            let feature = getFeature(req.body.feature)
             let topic = feature.topic
             try {
                 if (method === "get") {

package/libs/messaging.js

@@ -17,9 +17,11 @@ async function disconnect(user, uid) {
         return
 
     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 +29,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,19 +55,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) => {
+        let uid = req.body.client
         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)
-            }
+            await disconnect(req.params.user, uid)
             userRes.end()
         }
         res.json({})

package/package.json

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