proto.io 0.0.164 → 0.0.166

package/dist/index.mjs

@@ -1,18 +1,18 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, r as resolveColumn, g as generateId, a as resolveDataType } from './internals/random-w8WDYQEe.mjs';
+import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-DrURPPxr.mjs';
 import { P as PVK } from './internals/private-BUpLAMZi.mjs';
 import { asyncStream, asyncIterableToArray, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-BoP4kl2R.mjs';
-export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-BoP4kl2R.mjs';
-import { i as isPointer, a as isRelation, d as decodeUpdateOp, T as TObject, b as isShape, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-ByfpVHca.mjs';
+import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-CUJMde7V.mjs';
+export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-CUJMde7V.mjs';
+import { i as isPointer, a as isRelation, d as decodeUpdateOp, T as TObject, b as isShape, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-BYbMU-Ao.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-S5Bq-KsU.mjs';
+import { Q as QuerySelector } from './internals/index-BejQNqvC.mjs';
 import queryType from 'query-types';
 import busboy from 'busboy';
 export { Decimal } from 'decimal.js';
@@ -780,8 +780,10 @@ const validateShapedObject = (schema, dataType) => {
     }
 };
 const validateSchemaName = (schema) => {
-    if (!_.isNil(schema['_Schema']) || !_.isNil(schema['_Config']))
-        throw Error('Reserved name of class');
+    for (const name of ['_Schema', '_Config']) {
+        if (!_.isNil(schema[name]))
+            throw Error('Reserved name of class');
+    }
     for (const [, _schema] of _.toPairs(schema)) {
         for (const [key] of _.toPairs(_schema.fields)) {
             if (_.includes(TObject.defaultKeys, key))
@@ -853,6 +855,12 @@ class ProtoInternal {
         validateSchemaName(options.schema);
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
         validateSchema(schema);
+        if (!_.every(options.roleInheritKeys, k => {
+            const type = resolveDataType(schema, 'Role', k);
+            return type && isRelation(type) && _.includes(['User', 'Role'], type.target);
+        })) {
+            throw Error(`Invalid role keys`);
+        }
         this.options = {
             ...options,
             schema,
@@ -1291,29 +1299,7 @@ const signUser = async (proto, res, user, options) => {
 //
 const scheduleOp = {
     expireDocument: async (proto) => {
-        for (const className of proto.classes()) {
-            if (className === 'File') {
-                const found = proto.storage.find({
-                    className: 'File',
-                    filter: QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
-                    matches: {},
-                    includes: ['_id', '_expired_at', 'token'],
-                    objectIdSize: 0
-                });
-                for await (const item of found) {
-                    const token = item.get('token');
-                    if (!_.isEmpty(token))
-                        await proto.fileStorage.destroy(proto, token);
-                }
-            }
-            await proto.storage.deleteMany({
-                className,
-                filter: QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
-                includes: ['_id', '_expired_at'],
-                matches: {},
-                objectIdSize: 0
-            });
-        }
+        await proto.gc();
     }
 };
 const schedule = (proto) => {
@@ -1375,6 +1361,7 @@ class ProtoService extends ProtoType {
     constructor(options) {
         super();
         this[PVK] = new ProtoInternal({
+            roleInheritKeys: [],
             objectIdSize: 10,
             maxFetchLimit: 1000,
             maxUploadSize: 20 * 1024 * 1024,
@@ -1460,6 +1447,32 @@ class ProtoService extends ProtoType {
         const payload = _.create(this, { session });
         return _.assign(payload, _.isFunction(attrs) ? attrs(payload) : attrs);
     }
+    async userRoles(user) {
+        const roleInheritKeys = this[PVK].options.roleInheritKeys;
+        const schema = this.schema;
+        const userKeys = _.filter(roleInheritKeys, k => {
+            const type = resolveDataType(schema, 'Role', k);
+            return !!type && isRelation(type) && type.target === 'User';
+        });
+        const roleKeys = _.filter(roleInheritKeys, k => {
+            const type = resolveDataType(schema, 'Role', k);
+            return !!type && isRelation(type) && type.target === 'Role';
+        });
+        let queue = await this.Query('Role')
+            .or(_.map(_.uniq(['users', ...userKeys]), k => q => q.isIntersect(k, [user])))
+            .includes('name')
+            .find({ master: true });
+        let roles = queue;
+        while (!_.isEmpty(queue)) {
+            queue = await this.Query('Role')
+                .or(_.map(_.uniq(['roles', ...roleKeys]), k => q => q.isIntersect(k, queue)))
+                .notContainsIn('_id', _.compact(_.map(roles, x => x.objectId)))
+                .includes('name')
+                .find({ master: true });
+            roles = _.uniqBy([...roles, ...queue], x => x.objectId);
+        }
+        return roles;
+    }
     async becomeUser(req, user, options) {
         if (!user.objectId)
             throw Error('Invalid user object');
@@ -1564,6 +1577,31 @@ class ProtoService extends ProtoType {
                 yield self.rebind(object);
         });
     }
+    async gc(classNames) {
+        for (const className of _.castArray(classNames ?? this.classes())) {
+            if (className === 'File') {
+                const found = this.storage.find({
+                    className: 'File',
+                    filter: QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
+                    matches: {},
+                    includes: ['_id', '_expired_at', 'token'],
+                    objectIdSize: 0
+                });
+                for await (const item of found) {
+                    const token = item.get('token');
+                    if (!_.isEmpty(token))
+                        await this.fileStorage.destroy(this, token);
+                }
+            }
+            await this.storage.deleteMany({
+                className,
+                filter: QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
+                includes: ['_id', '_expired_at'],
+                matches: {},
+                objectIdSize: 0
+            });
+        }
+    }
 }
 
 //
@@ -1749,7 +1787,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => defaultHandler(req));
     });
     router.post('/relation', Server.text({ type: '*/*' }), async (req, res) => {
@@ -1781,7 +1819,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).find({ master: payload.isMaster }));
     });
@@ -1795,7 +1833,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const { weight } = req.query;
         if (_.isEmpty(weight) || !_.isString(weight))
@@ -1815,7 +1853,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).nonrefs({ master: payload.isMaster }));
     });
@@ -1829,7 +1867,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => payload.Query(name).get(id, { master: payload.isMaster }));
     });
@@ -1838,7 +1876,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => payload.refs(payload.Object(name, id), { master: payload.isMaster }));
     });
@@ -1847,7 +1885,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const query = payload.Query(name).equalTo('_id', id);
         const update = _.mapValues(deserialize(req.body), v => ({ $set: v }));
@@ -1856,29 +1894,29 @@ var classesRoute = (router, proto) => {
     router.delete('/classes/:name', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
     });
     router.delete('/relation', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const payload = proto.connect(req);
         await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
     });
     router.delete('/classes/:name/:id', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const query = payload.Query(name).equalTo('_id', id);
         await response(res, () => query.deleteOne({ master: payload.isMaster }));
@@ -1915,7 +1953,7 @@ var functionRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto[PVK].functions[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => {
             const payload = proto.connect(req, x => ({
                 params: null,
@@ -1927,7 +1965,7 @@ var functionRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto[PVK].functions[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => {
             const payload = proto.connect(req, x => ({
                 params: x.rebind(deserialize(req.body, { objAttrs: TObject.defaultReadonlyKeys })),
@@ -1989,9 +2027,9 @@ var filesRoute = (router, proto) => {
         const query = payload.Query('File').equalTo('_id', id);
         const file = await query.first({ master: payload.isMaster });
         if (!file || file.filename !== name)
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         if (_.isNil(file.token) || _.isNil(file.size) || _.isNil(file.type))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const ranges = req.range(file.size);
         const match = req.headers['if-none-match'];
         if (match === `"${id}"`) {
@@ -2146,7 +2184,7 @@ var schemaRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto.schema[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => {
             if (!payload.isMaster)
@@ -2247,10 +2285,9 @@ const schema = _.assign((x) => x, {
     relation: (target, foreignField) => ({ type: 'relation', target, foreignField }),
 });
 const ProtoRoute = async (options) => {
-    const { adapters, proto: _proto, } = options;
-    const proto = _proto instanceof ProtoService ? _proto : new ProtoService(_proto);
+    const proto = options.proto instanceof ProtoService ? options.proto : new ProtoService(options.proto);
     await proto[PVK].prepare();
-    const router = Server.Router().use(authHandler(proto), ..._.map(adapters, x => ((req, res, next) => x(proto.connect(req), res, next))), (req, res, next) => {
+    const router = Server.Router().use(authHandler(proto), (req, res, next) => {
         const payload = proto.connect(req);
         if (!payload.isInvalidMasterToken)
             return next();