corebasic 1.0.67 → 1.0.69

package/index.js

@@ -7,6 +7,7 @@ import * as Utils from './libs/utils.js'
 import * as Session from './libs/session.js'
 import * as Auth from './libs/auth.js'
 import * as Features from './libs/features.js'
+import * as Messaging from './libs/messaging.js'
 
 export {
     Elabase,
@@ -15,5 +16,6 @@ export {
     Utils,
     Session,
     Auth,
-    Features
+    Features,
+    Messaging
 }

package/libs/dipper.js

@@ -1,4 +1,5 @@
 import axios from 'axios'
+// import {curly} from 'node-libcurl'
 
 function hashStr(str) {
     let hash = 0;
@@ -35,6 +36,20 @@ function shard(key) {
 
 export let shard_hits = {}
 
+async function postDip(url, arg) {
+    return (await axios.post(url, arg)).data
+  // curl
+  // -----
+//   const { data } = await curly.post(url, {
+//   postFields: JSON.stringify(arg),
+//   httpHeader: [
+//     'Content-Type: application/json',
+//     'Accept: application/json'
+//     ],
+//   })
+//   return data
+}
+
 export default async function dipper(arg) {
 
     let result = []
@@ -45,7 +60,7 @@ export default async function dipper(arg) {
         let result = []
         for (let url of shards) {
             shard_hits[url] = (shard_hits[url] ?? 0) + 1
-            result.push((await axios.post(`http://${url}/execute`, arg)).data)
+            result.push(await postDip(`http://${url}/execute`, arg))
         }
 
     } else {
@@ -55,7 +70,7 @@ export default async function dipper(arg) {
             let key = shard(id)
             let url = shards[key]
             shard_hits[url] = (shard_hits[url] ?? 0) + 1
-            result.push((await axios.post(`http://${url}/execute`, arg)).data)
+            result.push(await postDip(`http://${url}/execute`, arg))
        }
     }
 

package/libs/features.js

@@ -1,6 +1,7 @@
 import * as Elabase from './elabase.js'
 import * as Kafka from './kafka.js'
 import * as Utils from './utils.js'
+import * as Messaging from './messaging.js'
 
 
 let  features = {}
@@ -8,14 +9,14 @@ let apis = {}
 
 export const start = async (app, url, file) => {
     features = await Utils.fileToJson(url, file)
-    
+
 
     // Registering handlers
     for (let name in features) {
         let feature = features[name]
         apis[feature.api] = apis[feature.api] ?? {}
         apis[feature.api][name] = feature
-        
+
         name = name.split('.')
         let handler = name.pop()
         name = `src/${name.join('/')}`
@@ -75,7 +76,7 @@ export const start = async (app, url, file) => {
                 } catch {
                     console.warn(`Feature: ${message.feature}, error in executing handler during Kafka.receive(topic: ${topic})`)
                 }
-                await timer(10000); 
+                await timer(10000);
             }
         })
     }
@@ -92,8 +93,10 @@ export const start = async (app, url, file) => {
             res.status(500).json({ message: "Failed to retreive data" })
         }
     })
+
+    try { await Messaging.start(app) } catch { console.log('Messaging failed to start. Maybe missing redis') }
 }
- 
+
 const commandAction = async (req, res, topic) => {
     let txn = req.body.txn ?? Util.uid()
     let _id = req.body.data._id ?? txn

package/libs/messaging.js

@@ -0,0 +1,50 @@
+
+import axios from 'axios'
+import { createClient } from 'redis';
+
+// url: 'redis://alice:foobared@localhost:6380'
+let consumer, publisher
+
+
+
+let users_pool = {
+
+}
+
+async function disconnect(user) {
+    delete users_pool[user]
+    await consumer.unsubscribe(user);
+}
+async function connect({user,req,res}) {
+    users_pool[user] = {req,res}
+    await consumer.subscribe(user, (message, channel) => {
+        if (users_pool[user])
+            users_pool[user].res.write(JSON.stringify({message, channel}) + "\n")
+    });
+}
+
+export async function start(app) {
+    consumer = createClient({ url: 'redis://localhost:6380' });
+    await consumer.connect();
+    publisher = createClient({ url: 'redis://localhost:6380' });
+    await publisher.connect();
+
+    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
+    })
+}
+
+
+export async function publish(channel, message) {
+    if (publisher)
+        await publisher.publish(channel, typeof message === "object" ? JSON.stringify(message) : message);
+}
+
+
+
+
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "axios": "^1.4.0",
     "jsonminify": "^0.4.2",
     "jsonwebtoken": "^9.0.1",
-    "otp-generator": "^4.0.1"
+    "otp-generator": "^4.0.1",
+    "redis": "^4.6.8"
   }
 }