proto.io 0.0.194 → 0.0.196

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { Server } from '@o2ter/server-js';
 import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-uHM4KXoV.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { asyncStream, prototypes, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, d as deserialize, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-BAbXyJEC.mjs';
-export { e as ProtoClient, f as classExtends, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-BAbXyJEC.mjs';
+import { T as TQuery, d as deserialize, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-C9eiMOSP.mjs';
+export { e as ProtoClient, f as classExtends, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-C9eiMOSP.mjs';
 import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-j8PFq8Ci.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -666,12 +666,8 @@ const proxy = (x) => {
     for (const name of _.uniq(_.flatMap(prototypes(proxy), x => Object.getOwnPropertyNames(x)))) {
         if (name === 'constructor')
             continue;
-        if (_.isFunction(self[name])) {
-            proxy[name] = self[name].bind(self);
-        }
-        else {
-            Object.defineProperty(proxy, name, { get: () => self[name] });
-        }
+        const value = _.isFunction(self[name]) ? self[name].bind(self) : self[name];
+        Object.defineProperty(proxy, name, { get: () => value });
     }
     return proxy;
 };
@@ -1142,7 +1138,7 @@ class JobRunner {
     async getNextJob(proto) {
         const availableJobs = await this.getAvailableJobs(proto);
         return await proto.Query('_Job')
-            .containsIn('name', availableJobs)
+            .containedIn('name', availableJobs)
             .or(q => q.lessThan('startedAt', new Date(Date.now() - JobRunner.TIMEOUT)), q => q.equalTo('startedAt', null))
             .equalTo('completedAt', null)
             .empty('locks')
@@ -1559,7 +1555,7 @@ class ProtoService extends ProtoType {
             while (!_.isEmpty(queue)) {
                 queue = await self.Query('Role')
                     .or(_.map(_.uniq(['roles', ...roleKeys]), k => q => q.isIntersect(k, queue)))
-                    .notContainsIn('_id', _.compact(_.map(roles, x => x.objectId)))
+                    .notContainedIn('_id', _.compact(_.map(roles, x => x.objectId)))
                     .includes('name')
                     .find({ master: true });
                 roles = _.uniqBy([...roles, ...queue], x => x.objectId);
@@ -2051,18 +2047,6 @@ var classesRoute = (router, proto) => {
 //  THE SOFTWARE.
 //
 var functionRoute = (router, proto) => {
-    router.get('/functions/:name', async (req, res) => {
-        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
-        const { name } = req.params;
-        if (_.isNil(proto[PVK].functions[name]))
-            return void res.sendStatus(404);
-        await response(res, () => {
-            const payload = proto.connect(req, x => ({
-                params: null,
-            }));
-            return payload[PVK].run(payload, name, payload, { master: payload.isMaster });
-        });
-    });
     router.post('/functions/:name', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
@@ -2103,16 +2087,6 @@ var functionRoute = (router, proto) => {
 //  THE SOFTWARE.
 //
 var jobRoute = (router, proto) => {
-    router.get('/jobs/:name', async (req, res) => {
-        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
-        const { name } = req.params;
-        if (_.isNil(proto[PVK].jobs[name]))
-            return void res.sendStatus(404);
-        await response(res, () => {
-            const payload = proto.connect(req);
-            return payload[PVK].scheduleJob(payload, name, null, { master: payload.isMaster });
-        });
-    });
     router.post('/jobs/:name', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;