proto.io 0.0.145 → 0.0.147

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { Server } from '@o2ter/server-js';
 import { Q as QueryValidator, g as generateId } from './internals/random-BjV_01xP.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-ZIegYNKT.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-ZIegYNKT.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-Do-zNOpD.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-Do-zNOpD.mjs';
 import { d as decodeUpdateOp, T as TObject, i as isShape, a as isPointer, b as isRelation, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-EOtjV6U_.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -797,14 +797,16 @@ class ProtoInternal {
             return func(proxy(payload ?? proto));
         const { callback, validator } = func;
         const roles = await proto.currentRoles();
-        if (!!validator?.requireUser && !(await proto.currentUser()))
-            throw Error('No permission');
-        if (!!validator?.requireMaster && !options?.master)
-            throw Error('No permission');
-        if (_.isArray(validator?.requireAnyUserRoles) && !_.some(validator?.requireAnyUserRoles, x => _.includes(roles, x)))
-            throw Error('No permission');
-        if (_.isArray(validator?.requireAllUserRoles) && _.some(validator?.requireAllUserRoles, x => !_.includes(roles, x)))
-            throw Error('No permission');
+        if (!options?.master) {
+            if (!!validator?.requireUser && !(await proto.currentUser()))
+                throw Error('No permission');
+            if (!!validator?.requireMaster)
+                throw Error('No permission');
+            if (_.isArray(validator?.requireAnyUserRoles) && !_.some(validator?.requireAnyUserRoles, x => _.includes(roles, x)))
+                throw Error('No permission');
+            if (_.isArray(validator?.requireAllUserRoles) && _.some(validator?.requireAllUserRoles, x => !_.includes(roles, x)))
+                throw Error('No permission');
+        }
         return callback(proxy(payload ?? proto));
     }
     async varifyPassword(proto, user, password, options) {
@@ -918,7 +920,7 @@ class ProtoInternal {
             return object;
         }
         catch (e) {
-            this.destoryFileData(proto, file._id);
+            this.destroyFileData(proto, file._id);
             throw e;
         }
     }
@@ -956,7 +958,7 @@ class ProtoInternal {
             object[PVK].mutated = {};
             object[PVK].extra = {};
         }
-        this.destoryFileData(proto, object.token);
+        this.destroyFileData(proto, object.token);
         if (_.isFunction(afterDelete)) {
             await afterDelete(proxy(Object.setPrototypeOf({ object, context }, proto)));
         }
@@ -972,10 +974,10 @@ class ProtoInternal {
             }
         });
     }
-    destoryFileData(proto, id) {
+    destroyFileData(proto, id) {
         (async () => {
             try {
-                await proto.fileStorage.destory(proto, id);
+                await proto.fileStorage.destroy(proto, id);
             }
             catch (e) {
                 console.error(e);
@@ -1199,7 +1201,7 @@ const scheduleOp = {
                 for await (const item of found) {
                     const token = item.get('token');
                     if (!_.isEmpty(token))
-                        await proto.fileStorage.destory(proto, token);
+                        await proto.fileStorage.destroy(proto, token);
                 }
             }
             await proto.storage.deleteMany({
@@ -1233,7 +1235,7 @@ const schedule = (proto) => {
     const schedule = setInterval(execute, 60 * 1000);
     return {
         execute,
-        destory() { clearInterval(schedule); }
+        destroy() { clearInterval(schedule); }
     };
 };
 
@@ -1295,7 +1297,7 @@ class ProtoService extends ProtoType {
         });
     }
     async shutdown() {
-        this._schedule.destory();
+        this._schedule.destroy();
     }
     classes() {
         return _.keys(this[PVK].options.schema);
@@ -1826,7 +1828,7 @@ var filesRoute = (router, proto) => {
             }
             catch (e) {
                 if (file?._id)
-                    proto[PVK].destoryFileData(proto, file._id);
+                    proto[PVK].destroyFileData(proto, file._id);
                 throw e;
             }
         });