proto.io 0.0.208 → 0.0.210

package/dist/adapters/file/google-cloud-storage.mjs

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import { F as FileChunkStorageBase } from '../../internals/chunk-DxYhYVky.mjs';
-import '../../internals/base-CfQi0T0I.mjs';
+import { F as FileChunkStorageBase } from '../../internals/chunk-bpt1C6W4.mjs';
+import '../../internals/base-DYc1_peK.mjs';
 import 'util';
 import 'zlib';
 import '@o2ter/utils-js';
@@ -44,19 +44,29 @@ class GoogleCloudStorage extends FileChunkStorageBase {
     async createChunk(proto, token, start, end, compressed) {
         await this.bucket.file(`${token}/${start}.chunk`).save(compressed);
     }
-    async listChunks(proto, token) {
-        const [response] = await this.bucket.getFiles({
+    async *listChunks(proto, token, start, end) {
+        let query = {
+            autoPaginate: false,
             prefix: `${token}/`,
             delimiter: '/',
-        });
-        const files = _.map(response, x => ({
-            file: x,
-            name: _.last(_.split(x.name, '/')),
-        }));
-        return _.map(_.filter(files, x => !!x.name?.match(/^\d+\.chunk$/)), x => ({
-            file: x.file,
-            start: parseInt(x.name.slice(0, -6)),
-        }));
+        };
+        do {
+            const [response, nextPage] = await this.bucket.getFiles(query);
+            if (_.isEmpty(response))
+                break;
+            for (const item of response) {
+                const name = _.last(_.split(item.name, '/'));
+                if (!name?.match(/^\d+\.chunk$/))
+                    continue;
+                const pos = parseInt(name.slice(0, -6));
+                if (start && pos < start)
+                    continue;
+                if (end && pos >= end)
+                    continue;
+                yield { start: pos, file: item };
+            }
+            query = nextPage;
+        } while (query);
     }
     async readChunk(proto, file) {
         const [buffer] = await file.download() ?? [];

package/dist/adapters/file/google-cloud-storage.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"google-cloud-storage.mjs","sources":["../../../../src/adapters/file/google-cloud-storage/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { Storage, File } from '@google-cloud/storage';\nimport { FileStorageOptions } from '../base';\nimport { FileChunkStorageBase } from '../base/chunk';\n\nexport class GoogleCloudStorage extends FileChunkStorageBase<File> {\n\n  private _storage: Storage;\n  private _bucket: string;\n\n  constructor(storage: Storage, bucket: string, options: FileStorageOptions = {}) {\n    super(options);\n    this._storage = storage;\n    this._bucket = bucket;\n  }\n\n  get bucket() {\n    return this._storage.bucket(this._bucket);\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n    await this.bucket.file(`${token}/${start}.chunk`).save(compressed);\n  }\n\n  async listChunks<E>(proto: ProtoService<E>, token: string) {\n    const [response] = await this.bucket.getFiles({\n      prefix: `${token}/`,\n      delimiter: '/',\n    });\n    const files = _.map(response, x => ({\n      file: x,\n      name: _.last(_.split(x.name, '/'))!,\n    }));\n    return _.map(_.filter(files, x => !!x.name?.match(/^\\d+\\.chunk$/)), x => ({\n      file: x.file,\n      start: parseInt(x.name.slice(0, -6)),\n    }));\n  }\n\n  async readChunk<E>(proto: ProtoService<E>, file: File) {\n    const [buffer] = await file.download() ?? [];\n    if (!buffer) throw Error('Unable to connect cloud storage');\n    return buffer;\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    await this.bucket.deleteFiles({ prefix: `${token}/` });\n  }\n};\n\nexport default GoogleCloudStorage;"],"names":[],"mappings":";;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQM,MAAO,kBAAmB,SAAQ,oBAA0B,CAAA;AAExD,IAAA,QAAQ;AACR,IAAA,OAAO;AAEf,IAAA,WAAA,CAAY,OAAgB,EAAE,MAAc,EAAE,UAA8B,EAAE,EAAA;QAC5E,KAAK,CAAC,OAAO,CAAC;AACd,QAAA,IAAI,CAAC,QAAQ,GAAG,OAAO;AACvB,QAAA,IAAI,CAAC,OAAO,GAAG,MAAM;;AAGvB,IAAA,IAAI,MAAM,GAAA;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;;IAG3C,MAAM,WAAW,CAAI,KAAsB,EAAE,KAAa,EAAE,KAAa,EAAE,GAAW,EAAE,UAAkB,EAAA;AACxG,QAAA,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAG,EAAA,KAAK,CAAI,CAAA,EAAA,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;;AAGpE,IAAA,MAAM,UAAU,CAAI,KAAsB,EAAE,KAAa,EAAA;QACvD,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC5C,MAAM,EAAE,CAAG,EAAA,KAAK,CAAG,CAAA,CAAA;AACnB,YAAA,SAAS,EAAE,GAAG;AACf,SAAA,CAAC;AACF,QAAA,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK;AAClC,YAAA,IAAI,EAAE,CAAC;AACP,YAAA,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAE;AACpC,SAAA,CAAC,CAAC;AACH,QAAA,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,KAAK;YACxE,IAAI,EAAE,CAAC,CAAC,IAAI;AACZ,YAAA,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrC,SAAA,CAAC,CAAC;;AAGL,IAAA,MAAM,SAAS,CAAI,KAAsB,EAAE,IAAU,EAAA;QACnD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;AAC5C,QAAA,IAAI,CAAC,MAAM;AAAE,YAAA,MAAM,KAAK,CAAC,iCAAiC,CAAC;AAC3D,QAAA,OAAO,MAAM;;AAGf,IAAA,MAAM,OAAO,CAAI,KAAsB,EAAE,KAAa,EAAA;AACpD,QAAA,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAG,EAAA,KAAK,CAAG,CAAA,CAAA,EAAE,CAAC;;AAEzD;;;;"}
+{"version":3,"file":"google-cloud-storage.mjs","sources":["../../../../src/adapters/file/google-cloud-storage/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { Storage, File, GetFilesOptions } from '@google-cloud/storage';\nimport { FileStorageOptions } from '../base';\nimport { FileChunkStorageBase } from '../base/chunk';\n\nexport class GoogleCloudStorage extends FileChunkStorageBase<File> {\n\n  private _storage: Storage;\n  private _bucket: string;\n\n  constructor(storage: Storage, bucket: string, options: FileStorageOptions = {}) {\n    super(options);\n    this._storage = storage;\n    this._bucket = bucket;\n  }\n\n  get bucket() {\n    return this._storage.bucket(this._bucket);\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n    await this.bucket.file(`${token}/${start}.chunk`).save(compressed);\n  }\n\n  async* listChunks<E>(proto: ProtoService<E>, token: string, start?: number, end?: number) {\n    let query: any = {\n      autoPaginate: false,\n      prefix: `${token}/`,\n      delimiter: '/',\n    };\n    do {\n      const [response, nextPage] = await this.bucket.getFiles(query);\n      if (_.isEmpty(response)) break;\n      for (const item of response) {\n        const name = _.last(_.split(item.name, '/'));\n        if (!name?.match(/^\\d+\\.chunk$/)) continue;\n        const pos = parseInt(name.slice(0, -6));\n        if (start && pos < start) continue;\n        if (end && pos >= end) continue;\n        yield { start: pos, file: item };\n      }\n      query = nextPage;\n    } while (query);\n  }\n\n  async readChunk<E>(proto: ProtoService<E>, file: File) {\n    const [buffer] = await file.download() ?? [];\n    if (!buffer) throw Error('Unable to connect cloud storage');\n    return buffer;\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    await this.bucket.deleteFiles({ prefix: `${token}/` });\n  }\n};\n\nexport default GoogleCloudStorage;"],"names":[],"mappings":";;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQM,MAAO,kBAAmB,SAAQ,oBAA0B,CAAA;AAExD,IAAA,QAAQ;AACR,IAAA,OAAO;AAEf,IAAA,WAAA,CAAY,OAAgB,EAAE,MAAc,EAAE,UAA8B,EAAE,EAAA;QAC5E,KAAK,CAAC,OAAO,CAAC;AACd,QAAA,IAAI,CAAC,QAAQ,GAAG,OAAO;AACvB,QAAA,IAAI,CAAC,OAAO,GAAG,MAAM;;AAGvB,IAAA,IAAI,MAAM,GAAA;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;;IAG3C,MAAM,WAAW,CAAI,KAAsB,EAAE,KAAa,EAAE,KAAa,EAAE,GAAW,EAAE,UAAkB,EAAA;AACxG,QAAA,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAG,EAAA,KAAK,CAAI,CAAA,EAAA,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;;IAGpE,OAAO,UAAU,CAAI,KAAsB,EAAE,KAAa,EAAE,KAAc,EAAE,GAAY,EAAA;AACtF,QAAA,IAAI,KAAK,GAAQ;AACf,YAAA,YAAY,EAAE,KAAK;YACnB,MAAM,EAAE,CAAG,EAAA,KAAK,CAAG,CAAA,CAAA;AACnB,YAAA,SAAS,EAAE,GAAG;SACf;AACD,QAAA,GAAG;AACD,YAAA,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;AAC9D,YAAA,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAAE;AACzB,YAAA,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;AAC3B,gBAAA,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC5C,gBAAA,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC;oBAAE;AAClC,gBAAA,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACvC,gBAAA,IAAI,KAAK,IAAI,GAAG,GAAG,KAAK;oBAAE;AAC1B,gBAAA,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG;oBAAE;gBACvB,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE;;YAElC,KAAK,GAAG,QAAQ;SACjB,QAAQ,KAAK;;AAGhB,IAAA,MAAM,SAAS,CAAI,KAAsB,EAAE,IAAU,EAAA;QACnD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;AAC5C,QAAA,IAAI,CAAC,MAAM;AAAE,YAAA,MAAM,KAAK,CAAC,iCAAiC,CAAC;AAC3D,QAAA,OAAO,MAAM;;AAGf,IAAA,MAAM,OAAO,CAAI,KAAsB,EAAE,KAAa,EAAA;AACpD,QAAA,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAG,EAAA,KAAK,CAAG,CAAA,CAAA,EAAE,CAAC;;AAEzD;;;;"}

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-A-hoMfDO.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-DIRjiWPh.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())