corebasic 1.0.73 → 1.0.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/libs/elabase.js CHANGED
@@ -76,7 +76,7 @@ export function transactionCommit(arg) {
76
76
  isTransaction = false
77
77
  transactions = []
78
78
  return new Promise((resolve, reject) => resolve())
79
- .then(() => execute({ "transaction": txns, mode, stats: arg?.stats ?? false, version: arg.version }))
79
+ .then(() => execute({ "transaction": txns, mode, stats: arg?.stats ?? false, version: arg?.version, compression: arg?.compression }))
80
80
  .then (result => {
81
81
  Events.send("Elabase.transactionCommit", { response: result })
82
82
  return result
@@ -194,6 +194,7 @@ function execute(arg) {
194
194
  // }
195
195
  arg.db = arg.db ?? db
196
196
  arg.engine = arg.engine ?? internal.engineName
197
+ arg.compression = true // Compress all for now
197
198
 
198
199
  if (stats)
199
200
  arg.stats = true
package/libs/messaging.js CHANGED
@@ -1,6 +1,7 @@
1
1
 
2
2
  import axios from 'axios'
3
3
  import { createClient } from 'redis';
4
+ import * as Utils from './utils.js'
4
5
 
5
6
  // url: 'redis://alice:foobared@localhost:6380'
6
7
  let consumer, publisher
@@ -11,21 +12,28 @@ let users_pool = {
11
12
 
12
13
  }
13
14
 
14
- async function disconnect(user) {
15
- await consumer.unsubscribe(user, users_pool[user].listener);
16
- delete users_pool[user]
15
+ async function disconnect(user, uid) {
16
+ if (users_pool[user].listeners[uid]) {
17
+ await consumer.unsubscribe(user, users_pool[user].listeners[uid]);
18
+ users_pool[user].listeners.count --
19
+ }
20
+ delete users_pool[user].listeners[uid]
21
+ if (!users_pool[user].listeners.count)
22
+ delete users_pool[user]
23
+
17
24
  // await consumer.unsubscribe(user);
18
25
  }
19
- async function connect({user,req,res}) {
26
+ async function connect({user,req,res, uid}) {
20
27
  const listener = (message, channel) => {
21
28
  if (users_pool[user]) {
22
29
  try {message = JSON.parse(message)} catch {}
23
30
  users_pool[user].res.write(JSON.stringify({message, channel}) + "\n")
24
31
  }
25
32
  }
26
- users_pool[user] = {req,res,listener}
33
+ users_pool[user] = users_pool[user] ?? {req,res,listeners: {count: 0}}
34
+ users_pool[user].listeners[uid] = listener
27
35
  await consumer.subscribe(user, listener);
28
-
36
+ users_pool[user].listeners.count ++
29
37
  }
30
38
 
31
39
  export async function start(app) {
@@ -37,9 +45,10 @@ export async function start(app) {
37
45
  consumer.on('error', err => console.log('Redis Client Error', err));
38
46
 
39
47
  app.get('/messages/:user', async (req, res) => {
40
- await connect({user: req.params.user, req, res})
41
- req.on("close", async () => await disconnect(req.params.user)) // request closed unexpectedly
42
- req.on("end", async () => await disconnect(req.params.user)) // request ended normally
48
+ let uid = Utils.uid()
49
+ await connect({user: req.params.user, req, res, uid})
50
+ req.on("close", async () => await disconnect(req.params.user, uid)) // request closed unexpectedly
51
+ req.on("end", async () => await disconnect(req.params.user, uid)) // request ended normally
43
52
  })
44
53
  }
45
54
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "corebasic",
3
3
  "type": "module",
4
- "version": "1.0.73",
4
+ "version": "1.0.75",
5
5
  "description": "",
6
6
  "main": "index.js",
7
7
  "scripts": {