proto.io 0.0.216 → 0.0.218

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-LNgZGT_l.mjs';
+import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-DX2nXeQo.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { prototypes, asyncStream, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-DF2AfSGK.mjs';
-export { b as ProtoClient, c as classExtends, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser } from './internals/index-DF2AfSGK.mjs';
-import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-BzDsTt4R.mjs';
+import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-CZ5fKgiJ.mjs';
+export { b as ProtoClient, c as classExtends } from './internals/index-CZ5fKgiJ.mjs';
+import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-gWcE22mf.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
 import { Readable } from 'node:stream';
@@ -14,9 +14,9 @@ import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
 import { P as PROTO_NOTY_MSG, a as PROTO_LIVEQUERY_MSG, M as MASTER_USER_HEADER_NAME, b as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/const-Dkp7Nsv5.mjs';
-export { Decimal } from 'decimal.js';
 import queryType from 'query-types';
 import busboy from 'busboy';
+export { Decimal } from 'decimal.js';
 import 'axios';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';
@@ -79,7 +79,7 @@ const normalize = (x) => {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
-const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.objectId]));
+const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.id]));
 const dispatcher = (proto, options) => {
     const acls = async () => options.master ? [] : await fetchUserPerms(proto);
     const validator = async () => new QueryValidator(proto, await acls(), {
@@ -849,34 +849,34 @@ class ProtoInternal {
         return callback(proxy(payload ?? proto));
     }
     async varifyPassword(proto, user, password, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         const _user = await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id', 'password')
             .first(options);
         const { alg, ...opts } = _user?.get('password') ?? {};
         return varifyPassword(alg, password, opts);
     }
     async setPassword(proto, user, password, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         if (_.isEmpty(password))
             throw Error('Invalid password');
         const { alg, ...opts } = this.options.passwordHashOptions;
         const hashed = await passwordHash(alg, password, opts);
         await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id')
             .updateOne({
             password: { $set: hashed },
         }, options);
     }
     async unsetPassword(proto, user, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id')
             .updateOne({
             password: { $set: {} },
@@ -887,7 +887,7 @@ class ProtoInternal {
             throw Error('Invalid filename');
         }
         const updated = await proto.Query(object.className)
-            .equalTo('_id', object.objectId)
+            .equalTo('_id', object.id)
             .includes(...object.keys())
             .updateOne(object[PVK].mutated, options);
         if (updated) {
@@ -967,7 +967,7 @@ class ProtoInternal {
         }
     }
     async saveFile(proto, object, options) {
-        if (object.objectId) {
+        if (object.id) {
             object = await this.updateFile(proto, object, options);
         }
         else {
@@ -978,7 +978,7 @@ class ProtoInternal {
     async deleteFile(proto, object, options) {
         object = await object.fetchIfNeeded(['token'], options);
         const deleted = await proto.Query('File')
-            .equalTo('_id', object.objectId)
+            .equalTo('_id', object.id)
             .deleteOne(options);
         if (deleted) {
             object[PVK].attributes = deleted.attributes;
@@ -1387,11 +1387,11 @@ const signUser = async (proto, res, user, options) => {
         sessionId: session?.sessionId ?? randomUUID(),
         createdAt: session?.createdAt?.getTime() ?? Date.now(),
         loginedAt: user ? session?.loginedAt?.getTime() ?? Date.now() : undefined,
-        user: user?.objectId,
+        user: user?.id,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');
     res.cookie(AUTH_COOKIE_KEY, token, cookieOptions);
-    sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.objectId) : {});
+    sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.id) : {});
 };
 
 //
@@ -1539,13 +1539,13 @@ class ProtoService extends ProtoType {
         return new ProtoQuery(className, this, {});
     }
     Relation(object, key) {
-        const objectId = object.objectId;
-        if (!objectId)
+        const id = object.id;
+        if (!id)
             throw Error('Invalid object');
         return new ProtoRelationQuery(this, {
             relatedBy: {
                 className: object.className,
-                objectId,
+                id: id,
                 key,
             },
         });
@@ -1611,10 +1611,10 @@ class ProtoService extends ProtoType {
             while (!_.isEmpty(queue)) {
                 queue = await self.Query('Role')
                     .or(_.map(_.uniq(['roles', ...roleKeys]), k => q => q.isIntersect(k, queue)))
-                    .notContainedIn('_id', _.compact(_.map(roles, x => x.objectId)))
+                    .notContainedIn('_id', _.compact(_.map(roles, x => x.id)))
                     .includes('name')
                     .find({ master: true });
-                roles = _.uniqBy([...roles, ...queue], x => x.objectId);
+                roles = _.uniqBy([...roles, ...queue], x => x.id);
             }
             return roles;
         };
@@ -1623,7 +1623,7 @@ class ProtoService extends ProtoType {
         return defaultResolver();
     }
     async becomeUser(req, user, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         if (req.res)
             await signUser(this, req.res, user, options);
@@ -1725,7 +1725,7 @@ class ProtoService extends ProtoType {
         });
     }
     refs(object, options) {
-        if (!object.objectId)
+        if (!object.id)
             throw Error('Invalid object');
         const self = this;
         return asyncStream(async function* () {
@@ -1889,7 +1889,7 @@ const verifyRelatedBy = (relatedBy) => {
         return;
     if (!_.isString(relatedBy.className) || _.isEmpty(relatedBy.className))
         throw Error('Invalid option');
-    if (!_.isString(relatedBy.objectId) || _.isEmpty(relatedBy.objectId))
+    if (!_.isString(relatedBy.id) || _.isEmpty(relatedBy.id))
         throw Error('Invalid option');
     if (!_.isString(relatedBy.key) || _.isEmpty(relatedBy.key))
         throw Error('Invalid option');
@@ -1900,7 +1900,7 @@ var classesRoute = (router, proto) => {
         const { operation, random, attributes, update, setOnInsert, relatedBy, silent, ...options } = deserialize(req.body);
         verifyRelatedBy(relatedBy);
         const payload = proto.connect(req);
-        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.id), relatedBy.key) : payload.Query(name);
         query[PVK].options = options;
         const opts = { master: payload.isMaster, silent };
         if (_.includes(['File', '_Job', '_JobScope'], name) &&
@@ -1963,7 +1963,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const { filter, sort, includes, skip, limit, relatedBy, } = req.query;
         verifyRelatedBy(relatedBy);
-        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.id), relatedBy.key) : payload.Query(name);
         query[PVK].options.filter = !_.isEmpty(filter) && _.isString(filter) ? _.castArray(deserialize(filter)) : [];
         query[PVK].options.sort = _.isPlainObject(sort) && _.every(_.values(sort), _.isNumber) ? sort : undefined;
         query[PVK].options.includes = _.isArray(includes) && _.every(includes, _.isString) ? includes : undefined;
@@ -2601,7 +2601,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
             const { remove: remove_livequery } = payload[PVK]._liveQuery(payload, (ev, objs) => {
                 const ids = {};
                 for (const obj of objs) {
-                    ids[obj.objectId] = _.keys(_.pickBy(queries, v => {
+                    ids[obj.id] = _.keys(_.pickBy(queries, v => {
                         if (v.event !== ev || v.className !== obj.className)
                             return false;
                         return v.filter instanceof QuerySelector ? v.filter.eval(obj) : v.filter;
@@ -2609,7 +2609,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
                 }
                 if (_.isEmpty(ids))
                     return;
-                const payload = JSON.parse(serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.objectId]))));
+                const payload = JSON.parse(serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.id]))));
                 socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });
             });
             return () => {