proto.io 0.0.187 → 0.0.189

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-fdvea17W.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-wofihxjH.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-BDHXW8gd.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BfsVioOA.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var index = require('../../internals/index-DfPY7Xbb.js');
-var index$1 = require('../../internals/index-DBuC2OsV.js');
+var index$1 = require('../../internals/index-COOeeeBE.js');
 var utilsJs = require('@o2ter/utils-js');
 require('util');
 require('zlib');
 require('../../internals/private-Ciddhure.js');
-require('../../internals/index-BszoCthH.js');
+require('../../internals/index-Dej3GgVf.js');
 require('decimal.js');
 
 //

package/dist/adapters/file/database.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/index-BAFVUYCo.mjs';
-import { Q as QuerySelector } from '../../internals/index-MPHIZrIu.mjs';
+import { Q as QuerySelector } from '../../internals/index-ikHjpb6F.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
 import 'util';
 import 'zlib';
 import '../../internals/private-CNw40LZ7.mjs';
-import '../../internals/index-B1FyA93S.mjs';
+import '../../internals/index-j8PFq8Ci.mjs';
 import 'decimal.js';
 
 //

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

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-fdvea17W.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-wofihxjH.js';
+import { P as ProtoService } from '../../internals/index-BDHXW8gd.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BfsVioOA.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-fdvea17W.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-wofihxjH.js';
+import { P as ProtoService } from '../../internals/index-BDHXW8gd.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BfsVioOA.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 { _ as _TValue, T as TSchema, Q as QuerySelector, q as DecodedQuery, F as FindOptions, R as RelationOptions, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-fdvea17W.js';
+import { _ as _TValue, T as TSchema, Q as QuerySelector, q as DecodedQuery, F as FindOptions, R as RelationOptions, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-BDHXW8gd.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-var index = require('../../internals/index-BszoCthH.js');
+var index = require('../../internals/index-Dej3GgVf.js');
 var pg = require('pg');
 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-DBuC2OsV.js');
+var index$1 = require('../../internals/index-COOeeeBE.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-Bfm98f9v.js');
+var random$1 = require('../../internals/random-CObICDCy.js');
 var _private = require('../../internals/private-Ciddhure.js');
 
 //

package/dist/adapters/storage/progres.mjs

@@ -1,13 +1,13 @@
 import _ from 'lodash';
-import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, _ as _isTypeof, f as isVector, g as _encodeValue, h as _decodeValue, j as dimensionOf, k as _typeof } from '../../internals/index-B1FyA93S.mjs';
+import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, _ as _isTypeof, f as isVector, g as _encodeValue, h as _decodeValue, j as dimensionOf, k as _typeof } from '../../internals/index-j8PFq8Ci.mjs';
 import { Pool, types } from 'pg';
 import QueryStream from 'pg-query-stream';
 import { asyncStream } 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-MPHIZrIu.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-ikHjpb6F.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-D6jBS4Q9.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-uHM4KXoV.mjs';
 import { P as PVK } from '../../internals/private-CNw40LZ7.mjs';
 
 //

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-DSxxREND.js';
-export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DSxxREND.js';
+import { P as ProtoClient } from './internals/index-z8mWupzT.js';
+export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-z8mWupzT.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-fdvea17W.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BDHXW8gd.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-PN4p9vcR.js');
+var index = require('./internals/index-M-VqTiz9.js');
 var Decimal = require('decimal.js');
 require('@o2ter/utils-js');
 require('./internals/private-Ciddhure.js');
 require('lodash');
-require('./internals/index-BszoCthH.js');
+require('./internals/index-Dej3GgVf.js');
 require('axios');
 require('@o2ter/server-js/dist/const');
 require('socket.io-client');

package/dist/client.mjs

@@ -1,10 +1,10 @@
-import { e as ProtoClient } from './internals/index-CEgTPv9-.mjs';
-export { f as classExtends, d as deserialize, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-CEgTPv9-.mjs';
+import { e as ProtoClient } from './internals/index-BAbXyJEC.mjs';
+export { f as classExtends, d as deserialize, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-BAbXyJEC.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
-import './internals/index-B1FyA93S.mjs';
+import './internals/index-j8PFq8Ci.mjs';
 import 'axios';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import * as socket_io from 'socket.io';
 import { Router } from 'express';
 import { Server } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-fdvea17W.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-fdvea17W.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-BDHXW8gd.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BDHXW8gd.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DSxxREND.js';
+export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-z8mWupzT.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,21 +4,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-Bfm98f9v.js');
+var random = require('./internals/random-CObICDCy.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-PN4p9vcR.js');
-var index$1 = require('./internals/index-BszoCthH.js');
+var index = require('./internals/index-M-VqTiz9.js');
+var index$1 = require('./internals/index-Dej3GgVf.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
 var node_stream = require('node:stream');
 var node_crypto = require('node:crypto');
 var util = require('util');
 var cryptoJs = require('@o2ter/crypto-js');
-var index$2 = require('./internals/index-DBuC2OsV.js');
+var Decimal = require('decimal.js');
+var index$2 = require('./internals/index-COOeeeBE.js');
 var queryType = require('query-types');
 var busboy = require('busboy');
-var Decimal = require('decimal.js');
 require('axios');
 require('@o2ter/server-js/dist/const');
 require('socket.io-client');
@@ -493,7 +493,7 @@ const defaultSchema = {
             type: { update: [] },
             token: { update: [] },
             nonce: { update: [] },
-            _expired_at: { create: [], update: [] },
+            _expired_at: { update: [] },
         },
         indexes: [
             {
@@ -903,11 +903,12 @@ class ProtoInternal {
         return object;
     }
     varifyUploadToken(proto, token, isMaster) {
-        const { nonce, maxUploadSize } = (_.isString(token) ? this.jwtVarify(token, 'upload') ?? {} : {});
+        const { nonce, attributes, maxUploadSize, } = (_.isString(token) ? this.jwtVarify(token, 'upload') ?? {} : {});
         if (!isMaster && !nonce)
             throw Error('Upload token is required');
         return {
             nonce,
+            attributes: _.isObject(attributes) ? index.deserialize(JSON.stringify(attributes)) : {},
             maxUploadSize: maxUploadSize ?? this.options.maxUploadSize,
         };
     }
@@ -915,7 +916,7 @@ class ProtoInternal {
         const data = object[_private.PVK].extra.data;
         if (_.isNil(data))
             throw Error('Invalid file object');
-        const { nonce, maxUploadSize } = this.varifyUploadToken(proto, options?.uploadToken, options?.master);
+        const { nonce, maxUploadSize, attributes } = this.varifyUploadToken(proto, options?.uploadToken, options?.master);
         if (nonce) {
             const found = await proto.Query('File').equalTo('nonce', nonce).first({ master: true });
             if (found)
@@ -949,6 +950,9 @@ class ProtoInternal {
             throw Error('Invalid file object');
         }
         try {
+            for (const [key, value] of _.entries(attributes)) {
+                object.set(key, value);
+            }
             object.set('token', file._id);
             object.set('size', file.size);
             if (nonce)
@@ -1625,6 +1629,7 @@ class ProtoService extends index.ProtoType {
         return this[_private.PVK].jwtSign({
             nonce: cryptoJs.randomUUID(),
             maxUploadSize: options.maxUploadSize,
+            attributes: JSON.parse(index.serialize(options.attributes ?? {})),
         }, options?.jwtSignOptions ?? 'upload');
     }
     jwtSign(payload, options) {