proto.io 0.0.209 → 0.0.211

package/dist/adapters/file/aliyun-oss.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoService } from '../../internals/index-Dn1IkLDx.js';
+import { P as ProtoService } from '../../internals/index-lTzbCO8S.js';
 import OSS from 'ali-oss';
-import { a as FileStorageOptions } from '../../internals/base-DbSaGX_u.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-bYrnqXiI.js';
+import { a as FileStorageOptions } from '../../internals/base-BCWOHUaQ.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-2pKgkO5-.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-Dn1IkLDx.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-DbSaGX_u.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-lTzbCO8S.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-BCWOHUaQ.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _ = require('lodash');
 var base = require('../../internals/base-NsJYo2MG.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('../../internals/index-CkAvNaAe.js');
+var index = require('../../internals/index-D8O7SinR.js');
 require('util');
 require('zlib');
 require('../../internals/private-Ciddhure.js');

package/dist/adapters/file/database.mjs

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/base-DYc1_peK.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
-import { Q as QuerySelector } from '../../internals/index-DlY33lfO.mjs';
+import { Q as QuerySelector } from '../../internals/index-DPPLcZx8.mjs';
 import 'util';
 import 'zlib';
 import '../../internals/private-CNw40LZ7.mjs';

package/dist/adapters/file/filesystem.d.ts

@@ -1,6 +1,6 @@
-import { P as ProtoService } from '../../internals/index-Dn1IkLDx.js';
-import { a as FileStorageOptions } from '../../internals/base-DbSaGX_u.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-bYrnqXiI.js';
+import { P as ProtoService } from '../../internals/index-lTzbCO8S.js';
+import { a as FileStorageOptions } from '../../internals/base-BCWOHUaQ.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-2pKgkO5-.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,8 +1,8 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { File, Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-Dn1IkLDx.js';
-import { a as FileStorageOptions } from '../../internals/base-DbSaGX_u.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-bYrnqXiI.js';
+import { P as ProtoService } from '../../internals/index-lTzbCO8S.js';
+import { a as FileStorageOptions } from '../../internals/base-BCWOHUaQ.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-2pKgkO5-.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QuerySelector, y as DecodedSortOption, z as DecodedQuery, A as FindOptions, I as InsertOptions, B as TStorage, C as TransactionOptions, j as TObject, G as TQueryRandomOptions, H as TPubSub } from '../../internals/index-Dn1IkLDx.js';
+import { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QuerySelector, y as DecodedSortOption, z as DecodedQuery, A as FindOptions, I as InsertOptions, B as TStorage, C as TransactionOptions, j as TObject, G as TQueryRandomOptions, H as TPubSub } from '../../internals/index-lTzbCO8S.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -9,9 +9,10 @@ var QueryStream = require('pg-query-stream');
 var utilsJs = require('@o2ter/utils-js');
 var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
-var index$1 = require('../../internals/index-CkAvNaAe.js');
+var index$1 = require('../../internals/index-D8O7SinR.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-B0V0EnjP.js');
+var random$1 = require('../../internals/random-CyU_Y2Ay.js');
+var _const = require('../../internals/const-C3I6cfav.js');
 var _private = require('../../internals/private-Ciddhure.js');
 
 //
@@ -1063,24 +1064,24 @@ class PostgresClientDriver {
     }
     async publish(channel, payload) {
         await this.withClient(async (db) => {
-            await db.query(`NOTIFY ${channel}, ${quote(JSON.stringify(index._encodeValue(payload)))}`);
+            await db.query(`NOTIFY ${_const.PROTO_EVENT}, ${quote(JSON.stringify(index._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) !== _const.PROTO_EVENT || !payload)
                         return;
                     try {
                         const _payload = index._decodeValue(JSON.parse(payload));
-                        for (const subscriber of this.subscribers[_.toUpper(channel)]) {
+                        for (const subscriber of this.subscribers) {
                             subscriber(_payload);
                         }
                     }
@@ -1088,6 +1089,7 @@ class PostgresPubSub {
                         console.error(`Unknown payload: ${e}`);
                     }
                 });
+                await client.query(`LISTEN ${_const.PROTO_EVENT}`);
             }
             catch (e) {
                 console.error(e);
@@ -1097,20 +1099,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 {
@@ -1129,14 +1125,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;
@@ -1145,9 +1136,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())