proto.io 0.0.163 → 0.0.165

package/dist/client.d.ts

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

package/dist/client.mjs

@@ -1,7 +1,7 @@
-import { c as ProtoClient } from './internals/index-BoP4kl2R.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-BoP4kl2R.mjs';
+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';
 export { Decimal } from 'decimal.js';
-import './internals/index-ByfpVHca.mjs';
+import './internals/index-BYbMU-Ao.mjs';
 import 'lodash';
 import './internals/private-BUpLAMZi.mjs';
 import '@o2ter/utils-js';

package/dist/index.d.ts

@@ -1,12 +1,11 @@
 import * as socket_io from 'socket.io';
-import * as socket_io_dist_typed_events from 'socket.io/dist/typed-events';
-import * as express_serve_static_core from 'express-serve-static-core';
-import { Server, RequestHandler } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-YdOGTHp1.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-YdOGTHp1.js';
+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 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-BsuUdR0W.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';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';
@@ -62,14 +61,10 @@ declare const schema: ((x: Record<string, TSchema>) => Record<string, TSchema>)
         readonly foreignField: string | undefined;
     };
 };
-type AdapterHandler<E, Handler extends RequestHandler = RequestHandler> = Handler extends (req: infer Req, ...args: infer Rest) => void ? (req: ProtoService<E> & {
-    req: Req;
-}, ...args: Rest) => void : never;
 declare const ProtoRoute: <E>(options: {
-    adapters?: AdapterHandler<E>[];
     proto: ProtoService<E> | (ProtoServiceOptions<E> & ProtoServiceKeyOptions);
-}) => Promise<express_serve_static_core.Router>;
-declare const registerProtoSocket: <E>(proto: ProtoService<E>, server: Server, endpoint?: string) => socket_io.Server<socket_io_dist_typed_events.DefaultEventsMap, socket_io_dist_typed_events.DefaultEventsMap, socket_io_dist_typed_events.DefaultEventsMap, any> | socket_io.Namespace<socket_io_dist_typed_events.DefaultEventsMap, socket_io_dist_typed_events.DefaultEventsMap, socket_io_dist_typed_events.DefaultEventsMap, any>;
+}) => Promise<Router>;
+declare const registerProtoSocket: <E>(proto: ProtoService<E>, server: Server, endpoint?: string) => socket_io.Server<socket_io.DefaultEventsMap, socket_io.DefaultEventsMap, socket_io.DefaultEventsMap, any> | socket_io.Namespace<socket_io.DefaultEventsMap, socket_io.DefaultEventsMap, socket_io.DefaultEventsMap, any>;
 
 export { ProtoRoute, ProtoService, ProtoRoute as default, registerProtoSocket, schema };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-uT4D0y_q.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');
@@ -783,8 +783,10 @@ const validateShapedObject = (schema, dataType) => {
     }
 };
 const validateSchemaName = (schema) => {
-    if (!_.isNil(schema['_Schema']) || !_.isNil(schema['_Config']))
-        throw Error('Reserved name of class');
+    for (const name of ['_Schema', '_Config']) {
+        if (!_.isNil(schema[name]))
+            throw Error('Reserved name of class');
+    }
     for (const [, _schema] of _.toPairs(schema)) {
         for (const [key] of _.toPairs(_schema.fields)) {
             if (_.includes(index$1.TObject.defaultKeys, key))
@@ -1752,7 +1754,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => defaultHandler(req));
     });
     router.post('/relation', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
@@ -1784,7 +1786,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).find({ master: payload.isMaster }));
     });
@@ -1798,7 +1800,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const { weight } = req.query;
         if (_.isEmpty(weight) || !_.isString(weight))
@@ -1818,7 +1820,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).nonrefs({ master: payload.isMaster }));
     });
@@ -1832,7 +1834,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => payload.Query(name).get(id, { master: payload.isMaster }));
     });
@@ -1841,7 +1843,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, async () => payload.refs(payload.Object(name, id), { master: payload.isMaster }));
     });
@@ -1850,7 +1852,7 @@ var classesRoute = (router, proto) => {
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const query = payload.Query(name).equalTo('_id', id);
         const update = _.mapValues(index.deserialize(req.body), v => ({ $set: v }));
@@ -1859,29 +1861,29 @@ var classesRoute = (router, proto) => {
     router.delete('/classes/:name', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
     });
     router.delete('/relation', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const payload = proto.connect(req);
         await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
     });
     router.delete('/classes/:name/:id', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))
-            return res.sendStatus(400);
+            return void res.sendStatus(400);
         const { name, id } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         const query = payload.Query(name).equalTo('_id', id);
         await response(res, () => query.deleteOne({ master: payload.isMaster }));
@@ -1918,7 +1920,7 @@ var functionRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto[_private.PVK].functions[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => {
             const payload = proto.connect(req, x => ({
                 params: null,
@@ -1930,7 +1932,7 @@ var functionRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto[_private.PVK].functions[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         await response(res, () => {
             const payload = proto.connect(req, x => ({
                 params: x.rebind(index.deserialize(req.body, { objAttrs: index$1.TObject.defaultReadonlyKeys })),
@@ -1992,9 +1994,9 @@ var filesRoute = (router, proto) => {
         const query = payload.Query('File').equalTo('_id', id);
         const file = await query.first({ master: payload.isMaster });
         if (!file || file.filename !== name)
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         if (_.isNil(file.token) || _.isNil(file.size) || _.isNil(file.type))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const ranges = req.range(file.size);
         const match = req.headers['if-none-match'];
         if (match === `"${id}"`) {
@@ -2149,7 +2151,7 @@ var schemaRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         if (_.isNil(proto.schema[name]))
-            return res.sendStatus(404);
+            return void res.sendStatus(404);
         const payload = proto.connect(req);
         await response(res, () => {
             if (!payload.isMaster)
@@ -2250,10 +2252,9 @@ const schema = _.assign((x) => x, {
     relation: (target, foreignField) => ({ type: 'relation', target, foreignField }),
 });
 const ProtoRoute = async (options) => {
-    const { adapters, proto: _proto, } = options;
-    const proto = _proto instanceof ProtoService ? _proto : new ProtoService(_proto);
+    const proto = options.proto instanceof ProtoService ? options.proto : new ProtoService(options.proto);
     await proto[_private.PVK].prepare();
-    const router = serverJs.Server.Router().use(authHandler(proto), ..._.map(adapters, x => ((req, res, next) => x(proto.connect(req), res, next))), (req, res, next) => {
+    const router = serverJs.Server.Router().use(authHandler(proto), (req, res, next) => {
         const payload = proto.connect(req);
         if (!payload.isInvalidMasterToken)
             return next();