proto.io 0.0.187 → 0.0.189

package/dist/index.mjs

@@ -1,21 +1,21 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-D6jBS4Q9.mjs';
+import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-uHM4KXoV.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { asyncStream, prototypes, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-CEgTPv9-.mjs';
-export { e as ProtoClient, f as classExtends, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-CEgTPv9-.mjs';
-import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-B1FyA93S.mjs';
+import { T as TQuery, d as deserialize, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-BAbXyJEC.mjs';
+export { e as ProtoClient, f as classExtends, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-BAbXyJEC.mjs';
+import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-j8PFq8Ci.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
 import { Readable } from 'node:stream';
 import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
-import { Q as QuerySelector } from './internals/index-MPHIZrIu.mjs';
+export { Decimal } from 'decimal.js';
+import { Q as QuerySelector } from './internals/index-ikHjpb6F.mjs';
 import queryType from 'query-types';
 import busboy from 'busboy';
-export { Decimal } from 'decimal.js';
 import 'axios';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';
@@ -490,7 +490,7 @@ const defaultSchema = {
             type: { update: [] },
             token: { update: [] },
             nonce: { update: [] },
-            _expired_at: { create: [], update: [] },
+            _expired_at: { update: [] },
         },
         indexes: [
             {
@@ -900,11 +900,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) ? deserialize(JSON.stringify(attributes)) : {},
             maxUploadSize: maxUploadSize ?? this.options.maxUploadSize,
         };
     }
@@ -912,7 +913,7 @@ class ProtoInternal {
         const data = object[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)
@@ -946,6 +947,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)
@@ -1622,6 +1626,7 @@ class ProtoService extends ProtoType {
         return this[PVK].jwtSign({
             nonce: randomUUID(),
             maxUploadSize: options.maxUploadSize,
+            attributes: JSON.parse(serialize(options.attributes ?? {})),
         }, options?.jwtSignOptions ?? 'upload');
     }
     jwtSign(payload, options) {