proto.io 0.0.215 → 0.0.217

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, b as QuerySelector } from './internals/validator-ChrCrz_C.mjs';
+import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-CEcBF4Cn.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { prototypes, asyncStream, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-ZPbBr9Db.mjs';
-export { b as ProtoClient, c as classExtends, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser } from './internals/index-ZPbBr9Db.mjs';
-import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-al1N-qi7.mjs';
+import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-DfqABzjr.mjs';
+export { b as ProtoClient, c as classExtends } from './internals/index-DfqABzjr.mjs';
+import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-BzDsTt4R.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
 import { Readable } from 'node:stream';
@@ -14,9 +14,9 @@ import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
 import { P as PROTO_NOTY_MSG, a as PROTO_LIVEQUERY_MSG, M as MASTER_USER_HEADER_NAME, b as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/const-Dkp7Nsv5.mjs';
-export { Decimal } from 'decimal.js';
 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';
@@ -129,9 +129,12 @@ const dispatcher = (proto, options) => {
             const isGet = _validator.isGetMethod(decoded.filter);
             if (!_validator.validateCLPs(query.className, isGet ? 'get' : 'find'))
                 throw Error('No permission');
-            if (opts?.weight && !_validator.validateKey(query.className, opts.weight, 'read', QueryValidator.patterns.path))
-                throw Error('No permission');
-            return proto.storage.random(decoded, opts);
+            const weight = opts?.weight ? QueryExpression.decode(opts.weight, false) : undefined;
+            for (const key of weight?.keyPaths() ?? []) {
+                if (!_validator.validateKey(query.className, key, 'read', QueryValidator.patterns.path))
+                    throw Error('No permission');
+            }
+            return proto.storage.random(decoded, { weight });
         },
         async insert(options, values) {
             if (!createFile && options.className === 'File')
@@ -1998,16 +2001,12 @@ var classesRoute = (router, proto) => {
             return void res.sendStatus(404);
         const payload = proto.connect(req);
         const { weight } = req.query;
-        if (_.isEmpty(weight) || !_.isString(weight))
-            throw Error('Invalid operation');
         await response(res, async () => createQuery(payload, req, true).random({ weight }, { master: payload.isMaster }));
     });
     router.get('/relation/random', queryType.middleware(), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const payload = proto.connect(req);
         const { weight } = req.query;
-        if (_.isEmpty(weight) || !_.isString(weight))
-            throw Error('Invalid operation');
         await response(res, async () => createQuery(payload, req, true).random({ weight }, { master: payload.isMaster }));
     });
     router.get('/classes/:name/nonrefs', queryType.middleware(), async (req, res) => {