proto.io 0.0.165 → 0.0.167

package/dist/index.mjs

@@ -1,10 +1,10 @@
 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-B1P0EZO5.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-BibByOcU.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-BibByOcU.mjs';
+import { prototypes, 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-Dyfia5Om.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-Dyfia5Om.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';
@@ -246,14 +246,7 @@ const dispatcher = (proto, options, disableSecurity) => {
 const proxy = (x) => {
     const self = x;
     const proxy = _.create(self);
-    const _prototypes = (x) => {
-        const prototype = Object.getPrototypeOf(x);
-        if (_.isNil(prototype) || prototype === Object.prototype)
-            return [];
-        return [prototype, ..._prototypes(prototype)];
-    };
-    const prototypes = _prototypes(proxy);
-    for (const name of _.uniq(_.flatMap(prototypes, x => Object.getOwnPropertyNames(x)))) {
+    for (const name of _.uniq(_.flatMap(prototypes(proxy), x => Object.getOwnPropertyNames(x)))) {
         if (name === 'constructor')
             continue;
         if (_.isFunction(self[name])) {
@@ -855,6 +848,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,
@@ -1293,29 +1292,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) => {
@@ -1377,6 +1354,7 @@ class ProtoService extends ProtoType {
     constructor(options) {
         super();
         this[PVK] = new ProtoInternal({
+            roleInheritKeys: [],
             objectIdSize: 10,
             maxFetchLimit: 1000,
             maxUploadSize: 20 * 1024 * 1024,
@@ -1462,6 +1440,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');
@@ -1566,6 +1570,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
+            });
+        }
+    }
 }
 
 //
@@ -1632,7 +1661,7 @@ const encodeError = (error) => {
     if (error instanceof String)
         return { message: error };
     if (error instanceof Error)
-        return { ...error, message: error.message };
+        return { message: error.message };
     return error;
 };
 const response = async (res, callback) => {