proto.io 0.0.165 → 0.0.167

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-RPh4TX0T.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DaDfXlay.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-y8EePsDY.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-RPh4TX0T.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DaDfXlay.js';
+import { P as ProtoService } from '../../internals/index-y8EePsDY.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-RPh4TX0T.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DaDfXlay.js';
+import { P as ProtoService } from '../../internals/index-y8EePsDY.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-RPh4TX0T.js';
+import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-y8EePsDY.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.mjs

@@ -7,7 +7,7 @@ import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
 import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-BejQNqvC.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-B1P0EZO5.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-DrURPPxr.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-bCACA0cS.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-bCACA0cS.js';
+import { P as ProtoClient } from './internals/index-BQggoDNX.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-BQggoDNX.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-RPh4TX0T.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-y8EePsDY.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-Dz3jvqxZ.js');
+var index = require('./internals/index-CyzpkgJB.js');
 var Decimal = require('decimal.js');
 require('./internals/index-CVutVPmd.js');
 require('lodash');

package/dist/client.mjs

@@ -1,5 +1,5 @@
-import { c as ProtoClient } from './internals/index-BibByOcU.mjs';
-export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-BibByOcU.mjs';
+import { c as ProtoClient } from './internals/index-Dyfia5Om.mjs';
+export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-Dyfia5Om.mjs';
 export { Decimal } from 'decimal.js';
 import './internals/index-BYbMU-Ao.mjs';
 import 'lodash';

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, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-RPh4TX0T.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-RPh4TX0T.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-y8EePsDY.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-y8EePsDY.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-bCACA0cS.js';
+export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-BQggoDNX.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -7,7 +7,7 @@ var serverJs = require('@o2ter/server-js');
 var random = require('./internals/random-q0PeamQE.js');
 var _private = require('./internals/private-CSB1Ep4g.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-Dz3jvqxZ.js');
+var index = require('./internals/index-CyzpkgJB.js');
 var index$1 = require('./internals/index-CVutVPmd.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -249,14 +249,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(utilsJs.prototypes(proxy), x => Object.getOwnPropertyNames(x)))) {
         if (name === 'constructor')
             continue;
         if (_.isFunction(self[name])) {
@@ -858,6 +851,12 @@ class ProtoInternal {
         validateSchemaName(options.schema);
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
         validateSchema(schema);
+        if (!_.every(options.roleInheritKeys, k => {
+            const type = random.resolveDataType(schema, 'Role', k);
+            return type && index$1.isRelation(type) && _.includes(['User', 'Role'], type.target);
+        })) {
+            throw Error(`Invalid role keys`);
+        }
         this.options = {
             ...options,
             schema,
@@ -1296,29 +1295,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: index$2.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: index$2.QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
-                includes: ['_id', '_expired_at'],
-                matches: {},
-                objectIdSize: 0
-            });
-        }
+        await proto.gc();
     }
 };
 const schedule = (proto) => {
@@ -1380,6 +1357,7 @@ class ProtoService extends index.ProtoType {
     constructor(options) {
         super();
         this[_private.PVK] = new ProtoInternal({
+            roleInheritKeys: [],
             objectIdSize: 10,
             maxFetchLimit: 1000,
             maxUploadSize: 20 * 1024 * 1024,
@@ -1465,6 +1443,32 @@ class ProtoService extends index.ProtoType {
         const payload = _.create(this, { session });
         return _.assign(payload, _.isFunction(attrs) ? attrs(payload) : attrs);
     }
+    async userRoles(user) {
+        const roleInheritKeys = this[_private.PVK].options.roleInheritKeys;
+        const schema = this.schema;
+        const userKeys = _.filter(roleInheritKeys, k => {
+            const type = random.resolveDataType(schema, 'Role', k);
+            return !!type && index$1.isRelation(type) && type.target === 'User';
+        });
+        const roleKeys = _.filter(roleInheritKeys, k => {
+            const type = random.resolveDataType(schema, 'Role', k);
+            return !!type && index$1.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');
@@ -1569,6 +1573,31 @@ class ProtoService extends index.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: index$2.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: index$2.QuerySelector.decode({ _expired_at: { $lt: new Date() } }),
+                includes: ['_id', '_expired_at'],
+                matches: {},
+                objectIdSize: 0
+            });
+        }
+    }
 }
 
 //
@@ -1635,7 +1664,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) => {