proto.io 0.0.180 → 0.0.181

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.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-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.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-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.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, 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-BgZqiNxF.js';
+import { _ as _TValue, 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-YpB-hXxf.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-CyXddWjz.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-CyXddWjz.js';
+import { P as ProtoClient } from './internals/index-cKx59cIc.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-cKx59cIc.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-BgZqiNxF.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-YpB-hXxf.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-DwCNTJb5.js');
+var index = require('./internals/index-BnDahEvz.js');
 var Decimal = require('decimal.js');
 require('./internals/index-DRq6T_5w.js');
 require('lodash');

package/dist/client.mjs

@@ -1,5 +1,5 @@
-import { e as ProtoClient } from './internals/index-CPodB1P0.mjs';
-export { f as classExtends, d as deserialize, k as isFile, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-CPodB1P0.mjs';
+import { e as ProtoClient } from './internals/index-CmJh3t_k.mjs';
+export { f as classExtends, d as deserialize, k as isFile, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-CmJh3t_k.mjs';
 export { Decimal } from 'decimal.js';
 import './internals/index-DyjcBbS1.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-BgZqiNxF.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BgZqiNxF.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-YpB-hXxf.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-YpB-hXxf.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-CyXddWjz.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-cKx59cIc.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-CDtFUuES.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-DwCNTJb5.js');
+var index = require('./internals/index-BnDahEvz.js');
 var index$1 = require('./internals/index-DRq6T_5w.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -523,6 +523,61 @@ const defaultSchema = {
             },
         ],
     },
+    '_Job': {
+        fields: {
+            name: 'string',
+            data: 'object',
+            error: 'object',
+            user: { type: 'pointer', target: 'User' },
+            startedAt: 'date',
+            completedAt: 'date',
+            locks: { type: 'relation', target: '_JobScope', foreignField: 'job' },
+        },
+        classLevelPermissions: {
+            find: [],
+            count: [],
+            create: [],
+            update: [],
+            delete: [],
+        },
+        fieldLevelPermissions: {
+            name: { update: [] },
+            data: { update: [] },
+            error: { update: [] },
+            user: { update: [] },
+            startedAt: { create: [], update: [] },
+            completedAt: { create: [], update: [] },
+            _expired_at: { create: [], update: [] },
+        },
+        indexes: [
+            { keys: { completedAt: 1, _created_at: 1 } },
+        ],
+    },
+    '_JobScope': {
+        fields: {
+            scope: 'string',
+            job: { type: 'pointer', target: '_Job' },
+        },
+        classLevelPermissions: {
+            get: [],
+            find: [],
+            count: [],
+            create: [],
+            update: [],
+            delete: [],
+        },
+        fieldLevelPermissions: {
+            scope: { update: [] },
+            job: { update: [] },
+            _expired_at: { create: [], update: [] },
+        },
+        indexes: [
+            {
+                keys: { scope: 1 },
+                unique: true,
+            },
+        ],
+    },
 };
 
 //
@@ -755,6 +810,8 @@ const mergeSchema = (...schemas) => _.reduce(schemas, (acc, schema) => ({
 class ProtoInternal {
     options;
     functions = {};
+    jobs = {};
+    jobRunner = new JobRunner();
     constructor(options) {
         validateSchemaName(options.schema);
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
@@ -773,6 +830,9 @@ class ProtoInternal {
     async prepare() {
         await this.options.storage.prepare(this.options.schema);
     }
+    shutdown() {
+        this.jobRunner.shutdown();
+    }
     generateId() {
         return random.generateId(this.options.objectIdSize);
     }
@@ -789,7 +849,7 @@ class ProtoInternal {
         return this.options.storage.setConfig(normalize(values), normalize(acl));
     }
     async run(proto, name, payload, options) {
-        const func = this.functions?.[name];
+        const func = this.functions[name];
         if (_.isNil(func))
             throw Error('Function not found');
         if (_.isFunction(func))
@@ -1039,6 +1099,127 @@ class ProtoInternal {
         const storage = _serviceOf(options)?.storage ?? this.options.storage;
         return storage.refs(object, classNames, options?.master ? undefined : roles);
     }
+    async scheduleJob(proto, name, params, options) {
+        const opt = this.jobs[name];
+        if (_.isNil(opt))
+            throw Error('Job not found');
+        const user = await proto.currentUser();
+        if (!_.isFunction(opt)) {
+            const roles = await proto.currentRoles();
+            const { validator } = opt;
+            if (!options?.master) {
+                if (!!validator?.requireUser && !user)
+                    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');
+            }
+        }
+        const obj = proto.Object('_Job');
+        obj.set('name', name);
+        obj.set('data', params);
+        obj.set('user', user);
+        await obj.save({ master: true });
+        this.jobRunner.excuteJob(proto);
+        return obj;
+    }
+}
+class JobRunner {
+    _running = false;
+    _stopped = false;
+    static TIMEOUT = 1000 * 60 * 5;
+    static HEALTH = 1000 * 60;
+    shutdown() {
+        this._stopped = true;
+    }
+    async cleanUpOldJobs(proto) {
+        await proto.Query('_JobScope').or(q => q.lessThan('_updated_at', new Date(Date.now() - JobRunner.TIMEOUT)), q => q.notEqualTo('job.completedAt', null)).deleteMany({ master: true });
+    }
+    async getAvailableJobs(proto) {
+        const running = _.map(await proto.Query('_JobScope').find({ master: true }), x => x.get('scope'));
+        const availableJobs = _.pickBy(proto[_private.PVK].jobs, opt => {
+            return _.isFunction(opt) || _.isEmpty(_.intersection(opt.scopes ?? [], running));
+        });
+        return _.keys(availableJobs);
+    }
+    async getNextJob(proto) {
+        const availableJobs = await this.getAvailableJobs(proto);
+        return await proto.Query('_Job')
+            .containsIn('name', availableJobs)
+            .or(q => q.lessThan('startedAt', new Date(Date.now() - JobRunner.TIMEOUT)), q => q.equalTo('startedAt', null))
+            .equalTo('completedAt', null)
+            .empty('locks')
+            .includes('*', 'user')
+            .sort({ _created_at: 1 })
+            .first({ master: true });
+    }
+    async startJob(proto, job, opt) {
+        await proto.withTransaction(async (session) => {
+            for (const scope of _.isFunction(opt) ? [] : opt.scopes ?? []) {
+                const obj = session.Object('_JobScope');
+                obj.set('scope', scope);
+                obj.set('job', job);
+                await obj.save({ master: true });
+            }
+            job.set('startedAt', new Date());
+            await job.save({ master: true, session });
+        });
+    }
+    async updateJobScope(proto, job) {
+        try {
+            await proto.Query('_JobScope').equalTo('job', job).updateOne({}, { master: true });
+        }
+        catch (e) { }
+    }
+    async executeJobFunction(proto, job, opt) {
+        const payload = Object.setPrototypeOf({ params: job.data, user: job.user, job }, this);
+        const func = _.isFunction(opt) ? opt : opt.callback;
+        await func(proxy(payload));
+    }
+    async finalizeJob(job, error = null) {
+        if (error)
+            job.set('error', _.pick(error, _.uniq(_.flatMap(utilsJs.prototypes(error), x => Object.getOwnPropertyNames(x)))));
+        job.set('completedAt', new Date());
+        await job.save({ master: true });
+    }
+    async excuteJob(proto) {
+        if (this._running || this._stopped)
+            return;
+        this._running = true;
+        while (!this._stopped) {
+            await this.cleanUpOldJobs(proto);
+            const job = await this.getNextJob(proto);
+            if (!job)
+                break;
+            const opt = proto[_private.PVK].jobs[job.name];
+            if (_.isNil(opt))
+                continue;
+            try {
+                await this.startJob(proto, job, opt);
+            }
+            catch (e) {
+                continue;
+            }
+            (async () => {
+                const timer = setInterval(() => this.updateJobScope(proto, job), JobRunner.HEALTH);
+                try {
+                    await this.executeJobFunction(proto, job, opt);
+                    await this.finalizeJob(job);
+                }
+                catch (e) {
+                    await this.finalizeJob(job, e);
+                }
+                finally {
+                    clearInterval(timer);
+                }
+                this.excuteJob(proto);
+            })();
+        }
+        this._running = false;
+    }
 }
 
 //
@@ -1209,7 +1390,10 @@ const signUser = async (proto, res, user, options) => {
 const scheduleOp = {
     expireDocument: async (proto) => {
         await proto.gc();
-    }
+    },
+    excuteJob: async (proto) => {
+        proto[_private.PVK].jobRunner.excuteJob(proto);
+    },
 };
 const schedule = (proto) => {
     let running = false;
@@ -1297,6 +1481,7 @@ class ProtoService extends index.ProtoType {
     }
     async shutdown() {
         this._schedule.destroy();
+        this[_private.PVK].shutdown();
     }
     classes() {
         return _.keys(this[_private.PVK].options.schema);
@@ -1436,6 +1621,12 @@ class ProtoService extends index.ProtoType {
     define(name, callback, options) {
         this[_private.PVK].functions[name] = options ? { callback, ...options } : callback;
     }
+    scheduleJob(name, params, options) {
+        return this[_private.PVK].scheduleJob(this, name, params, options);
+    }
+    defineJob(name, callback, options) {
+        this[_private.PVK].jobs[name] = options ? { callback, ...options } : callback;
+    }
     lockTable(className, update) {
         return this.storage.lockTable(className, update);
     }
@@ -1886,6 +2077,55 @@ var functionRoute = (router, proto) => {
     return router;
 };
 
+//
+//  job.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  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[_private.PVK].jobs[name]))
+            return void res.sendStatus(404);
+        await response(res, () => {
+            const payload = proto.connect(req);
+            return payload[_private.PVK].scheduleJob(payload, name, null, { master: payload.isMaster });
+        });
+    });
+    router.post('/jobs/:name', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        const { name } = req.params;
+        if (_.isNil(proto[_private.PVK].jobs[name]))
+            return void res.sendStatus(404);
+        await response(res, () => {
+            const payload = proto.connect(req);
+            const params = payload.rebind(index.deserialize(req.body, { objAttrs: index$1.TObject.defaultReadonlyKeys }));
+            return payload[_private.PVK].scheduleJob(payload, name, params, { master: payload.isMaster });
+        });
+    });
+    return router;
+};
+
 //
 //  files.ts
 //
@@ -2280,6 +2520,7 @@ const ProtoRoute = async (options) => {
     });
     classesRoute(router, proto);
     functionRoute(router, proto);
+    jobRoute(router, proto);
     filesRoute(router, proto);
     userRoute(router, proto);
     notifyRoute(router, proto);