proto.io 0.0.215 → 0.0.216

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-CZUGnb-y.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-CZUGnb-y.js';
+import { P as ProtoClient } from './internals/index-CYhA8SU8.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-CYhA8SU8.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-YLrO0f2D.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-HdMgLYtD.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.mjs

@@ -1,10 +1,10 @@
-import { b as ProtoClient } from './internals/index-ZPbBr9Db.mjs';
-export { c as classExtends, d as deserialize, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser, s as serialize } from './internals/index-ZPbBr9Db.mjs';
+import { b as ProtoClient } from './internals/index-DF2AfSGK.mjs';
+export { c as classExtends, d as deserialize, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser, s as serialize } from './internals/index-DF2AfSGK.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
-import './internals/index-al1N-qi7.mjs';
+import './internals/index-BzDsTt4R.mjs';
 import 'axios';
 import './internals/const-Dkp7Nsv5.mjs';
 import '@o2ter/server-js/dist/const';

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, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-YLrO0f2D.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-YLrO0f2D.js';
+import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-HdMgLYtD.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-HdMgLYtD.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-CZUGnb-y.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-CYhA8SU8.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var validator = require('./internals/validator-m6wY35c6.js');
+var validator = require('./internals/validator-BBjOdLiT.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
 var index = require('./internals/index-DfnPpl1I.js');
@@ -132,9 +132,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', validator.QueryValidator.patterns.path))
-                throw Error('No permission');
-            return proto.storage.random(decoded, opts);
+            const weight = opts?.weight ? validator.QueryExpression.decode(opts.weight, false) : undefined;
+            for (const key of weight?.keyPaths() ?? []) {
+                if (!_validator.validateKey(query.className, key, 'read', validator.QueryValidator.patterns.path))
+                    throw Error('No permission');
+            }
+            return proto.storage.random(decoded, { weight });
         },
         async insert(options, values) {
             if (!createFile && options.className === 'File')
@@ -2001,16 +2004,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) => {