corebasic 1.0.68 → 1.0.70

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/features.js

@@ -1,6 +1,7 @@
-import * as Elabase from './elabase.js'
+import * as Dip from './dip.js'
 import * as Kafka from './kafka.js'
 import * as Utils from './utils.js'
+import * as Messaging from './messaging.js'
 
 
 let  features = {}
@@ -69,8 +70,9 @@ export const start = async (app, url, file) => {
             topic = topic.replace('Features.','')
             while (true) {
                 try {
+                    await Dip.update(`users.txns.${message.user}`, {_id: message.txn}, { $setOnInsert: { user: message.user, feature: message.feature, date: message.date, created: message.date, updated: message.date, status: "Queued" } }, {upsert: true}) // Can always update the status later
                     await features[message.feature].handler(topic, message)
-                    await Elabase.insert("Features.txns", {_id: message.txn, status: "Processed"})
+                    await Dip.insert("Features.txns", {_id: message.txn, status: "Processed"})
                     break
                 } catch {
                     console.warn(`Feature: ${message.feature}, error in executing handler during Kafka.receive(topic: ${topic})`)
@@ -83,7 +85,7 @@ export const start = async (app, url, file) => {
     // Transaction status api
     app.get('/transactions/:id', async (req, res) => {
         try {
-            let items = await Elabase.query("Features.txns", {_id: req.params.id})
+            let items = await Dip.query("Features.txns", {_id: req.params.id})
             if (items.length)
                 res.json({ data: { ...items[0], txn: items._id } })
             else
@@ -92,6 +94,15 @@ export const start = async (app, url, file) => {
             res.status(500).json({ message: "Failed to retreive data" })
         }
     })
+    app.get('/users/transactions', async (req, res) => {
+        try {
+            res.json({ data: await Dip.query(`users.txns.${message.user}`, {}, { $orderby: { date: -1 } }) })
+        } catch {
+            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) => {

package/libs/messaging.js

@@ -3,12 +3,8 @@ import axios from 'axios'
 import { createClient } from 'redis';
 
 // url: 'redis://alice:foobared@localhost:6380'
-const consumer = createClient({ url: 'redis://localhost:6380' });
-await consumer.connect();
-const publisher = createClient({ url: 'redis://localhost:6380' });
-await publisher.connect();
+let consumer, publisher
 
-consumer.on('error', err => console.log('Redis Client Error', err));
 
 
 let users_pool = {
@@ -27,7 +23,14 @@ async function connect({user,req,res}) {
     });
 }
 
-export function start(app) {
+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
@@ -37,7 +40,8 @@ export function start(app) {
 
 
 export async function publish(channel, message) {
-    await publisher.publish(channel, typeof message === "object" ? JSON.stringify(message) : 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.68",
+  "version": "1.0.70",
   "description": "",
   "main": "index.js",
   "scripts": {