proto.io 0.0.208 → 0.0.210

package/dist/adapters/storage/progres.mjs

@@ -5,9 +5,10 @@ import QueryStream from 'pg-query-stream';
 import { asyncStream, IteratorPool } from '@o2ter/utils-js';
 import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
-import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-DlY33lfO.mjs';
+import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-DPPLcZx8.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType$1, g as generateId, Q as QueryValidator } from '../../internals/random-ZgzzM5v_.mjs';
+import { r as resolveColumn, a as resolveDataType$1, g as generateId, Q as QueryValidator } from '../../internals/random-ycCeBd0S.mjs';
+import { c as PROTO_EVENT } from '../../internals/const-Dkp7Nsv5.mjs';
 import { P as PVK } from '../../internals/private-CNw40LZ7.mjs';
 
 //
@@ -1059,24 +1060,24 @@ class PostgresClientDriver {
     }
     async publish(channel, payload) {
         await this.withClient(async (db) => {
-            await db.query(`NOTIFY ${channel}, ${quote(JSON.stringify(_encodeValue(payload)))}`);
+            await db.query(`NOTIFY ${PROTO_EVENT}, ${quote(JSON.stringify(_encodeValue({ channel, payload })))}`);
         });
     }
 }
 class PostgresPubSub {
     client;
-    subscribers = {};
-    channels = [];
+    subscribers = [];
     constructor(client) {
         this.client = client;
         (async () => {
             try {
-                (await client).on('notification', ({ channel, payload }) => {
-                    if (!payload)
+                client = await client;
+                client.on('notification', ({ channel, payload }) => {
+                    if (_.toUpper(channel) !== PROTO_EVENT || !payload)
                         return;
                     try {
                         const _payload = _decodeValue(JSON.parse(payload));
-                        for (const subscriber of this.subscribers[_.toUpper(channel)]) {
+                        for (const subscriber of this.subscribers) {
                             subscriber(_payload);
                         }
                     }
@@ -1084,6 +1085,7 @@ class PostgresPubSub {
                         console.error(`Unknown payload: ${e}`);
                     }
                 });
+                await client.query(`LISTEN ${PROTO_EVENT}`);
             }
             catch (e) {
                 console.error(e);
@@ -1093,20 +1095,14 @@ class PostgresPubSub {
     async shutdown() {
         (await this.client).release();
     }
-    async listen(channel) {
-        this.channels.push(channel);
-        await (await this.client).query(`LISTEN ${channel}`);
-    }
-    subscribe(channel, callback) {
-        if (_.isNil(this.subscribers[channel]))
-            this.subscribers[channel] = [];
-        this.subscribers[channel].push(callback);
+    subscribe(callback) {
+        this.subscribers.push(callback);
         return () => {
-            this.subscribers[channel] = this.subscribers[channel].filter(x => x !== callback);
+            this.subscribers = this.subscribers.filter(x => x !== callback);
         };
     }
     isEmpty() {
-        return _.every(_.values(this.subscribers), x => _.isEmpty(x));
+        return _.isEmpty(this.subscribers);
     }
 }
 class PostgresDriver extends PostgresClientDriver {
@@ -1125,14 +1121,9 @@ class PostgresDriver extends PostgresClientDriver {
         await this.database.end();
     }
     _init_pubsub() {
-        if (this.pubsub)
+        if (this.pubsub || this.database.ending || this.database.ended)
             return;
-        try {
-            this.pubsub = new PostgresPubSub(this.database.connect());
-        }
-        catch (e) {
-            console.error(e);
-        }
+        this.pubsub = new PostgresPubSub(this.database.connect());
     }
     async _release_pubsub() {
         const pubsub = this.pubsub;
@@ -1141,9 +1132,12 @@ class PostgresDriver extends PostgresClientDriver {
     }
     subscribe(channel, callback) {
         this._init_pubsub();
-        if (!_.includes(this.pubsub.channels, channel))
-            this.pubsub.listen(channel);
-        const release = this.pubsub.subscribe(channel, callback);
+        if (!this.pubsub)
+            return () => void 0;
+        const release = this.pubsub.subscribe(({ channel: _channel, payload }) => {
+            if (_channel === channel)
+                callback(payload);
+        });
         return () => {
             release();
             if (this.pubsub?.isEmpty())