@volcanicminds/backend 2.0.4 → 2.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -7
- package/dist/index.d.ts +7 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +160 -210
- package/dist/index.js.map +1 -1
- package/dist/lib/api/auth/controller/auth.d.ts +35 -0
- package/dist/lib/api/auth/controller/auth.d.ts.map +1 -0
- package/dist/lib/api/auth/controller/auth.js +245 -333
- package/dist/lib/api/auth/controller/auth.js.map +1 -1
- package/dist/lib/api/auth/routes.d.ts +90 -0
- package/dist/lib/api/auth/routes.d.ts.map +1 -0
- package/dist/lib/api/auth/routes.js +1 -2
- package/dist/lib/api/auth/routes.js.map +1 -1
- package/dist/lib/api/health/controller/health.d.ts +3 -0
- package/dist/lib/api/health/controller/health.d.ts.map +1 -0
- package/dist/lib/api/health/controller/health.js +1 -4
- package/dist/lib/api/health/controller/health.js.map +1 -1
- package/dist/lib/api/health/routes.d.ts +26 -0
- package/dist/lib/api/health/routes.d.ts.map +1 -0
- package/dist/lib/api/health/routes.js +1 -2
- package/dist/lib/api/health/routes.js.map +1 -1
- package/dist/lib/api/token/controller/token.d.ts +16 -0
- package/dist/lib/api/token/controller/token.d.ts.map +1 -0
- package/dist/lib/api/token/controller/token.js +69 -105
- package/dist/lib/api/token/controller/token.js.map +1 -1
- package/dist/lib/api/token/routes.d.ts +179 -0
- package/dist/lib/api/token/routes.d.ts.map +1 -0
- package/dist/lib/api/token/routes.js +1 -2
- package/dist/lib/api/token/routes.js.map +1 -1
- package/dist/lib/api/tool/controller/tool.d.ts +3 -0
- package/dist/lib/api/tool/controller/tool.d.ts.map +1 -0
- package/dist/lib/api/tool/controller/tool.js +8 -22
- package/dist/lib/api/tool/controller/tool.js.map +1 -1
- package/dist/lib/api/tool/routes.d.ts +26 -0
- package/dist/lib/api/tool/routes.d.ts.map +1 -0
- package/dist/lib/api/tool/routes.js +1 -2
- package/dist/lib/api/tool/routes.js.map +1 -1
- package/dist/lib/api/users/controller/user.d.ts +12 -0
- package/dist/lib/api/users/controller/user.d.ts.map +1 -0
- package/dist/lib/api/users/controller/user.js +59 -112
- package/dist/lib/api/users/controller/user.js.map +1 -1
- package/dist/lib/api/users/routes.d.ts +173 -0
- package/dist/lib/api/users/routes.d.ts.map +1 -0
- package/dist/lib/api/users/routes.js +1 -2
- package/dist/lib/api/users/routes.js.map +1 -1
- package/dist/lib/apollo/context.d.ts +6 -0
- package/dist/lib/apollo/context.d.ts.map +1 -0
- package/dist/lib/apollo/context.js +2 -16
- package/dist/lib/apollo/context.js.map +1 -1
- package/dist/lib/apollo/resolvers.d.ts +8 -0
- package/dist/lib/apollo/resolvers.d.ts.map +1 -0
- package/dist/lib/apollo/resolvers.js +1 -2
- package/dist/lib/apollo/resolvers.js.map +1 -1
- package/dist/lib/apollo/type-defs.d.ts +3 -0
- package/dist/lib/apollo/type-defs.d.ts.map +1 -0
- package/dist/lib/apollo/type-defs.js +1 -2
- package/dist/lib/apollo/type-defs.js.map +1 -1
- package/dist/lib/config/general.d.ts +12 -0
- package/dist/lib/config/general.d.ts.map +1 -0
- package/dist/lib/config/general.js +1 -2
- package/dist/lib/config/general.js.map +1 -1
- package/dist/lib/config/plugins.d.ts +25 -0
- package/dist/lib/config/plugins.d.ts.map +1 -0
- package/dist/lib/config/plugins.js +1 -2
- package/dist/lib/config/plugins.js.map +1 -1
- package/dist/lib/config/roles.d.ts +7 -0
- package/dist/lib/config/roles.d.ts.map +1 -0
- package/dist/lib/config/roles.js +1 -2
- package/dist/lib/config/roles.js.map +1 -1
- package/dist/lib/config/tracking.d.ts +10 -0
- package/dist/lib/config/tracking.d.ts.map +1 -0
- package/dist/lib/config/tracking.js +1 -2
- package/dist/lib/config/tracking.js.map +1 -1
- package/dist/lib/hooks/onError.d.ts +3 -0
- package/dist/lib/hooks/onError.d.ts.map +1 -0
- package/dist/lib/hooks/onError.js +2 -12
- package/dist/lib/hooks/onError.js.map +1 -1
- package/dist/lib/hooks/onRequest.d.ts +3 -0
- package/dist/lib/hooks/onRequest.d.ts.map +1 -0
- package/dist/lib/hooks/onRequest.js +24 -35
- package/dist/lib/hooks/onRequest.js.map +1 -1
- package/dist/lib/hooks/onResponse.d.ts +3 -0
- package/dist/lib/hooks/onResponse.d.ts.map +1 -0
- package/dist/lib/hooks/onResponse.js +2 -12
- package/dist/lib/hooks/onResponse.js.map +1 -1
- package/dist/lib/hooks/preHandler.d.ts +3 -0
- package/dist/lib/hooks/preHandler.d.ts.map +1 -0
- package/dist/lib/hooks/preHandler.js +3 -47
- package/dist/lib/hooks/preHandler.js.map +1 -1
- package/dist/lib/hooks/preSerialization.d.ts +3 -0
- package/dist/lib/hooks/preSerialization.d.ts.map +1 -0
- package/dist/lib/hooks/preSerialization.js +6 -53
- package/dist/lib/hooks/preSerialization.js.map +1 -1
- package/dist/lib/loader/general.d.ts +3 -0
- package/dist/lib/loader/general.d.ts.map +1 -0
- package/dist/lib/loader/general.js +15 -13
- package/dist/lib/loader/general.js.map +1 -1
- package/dist/lib/loader/hooks.d.ts +2 -0
- package/dist/lib/loader/hooks.d.ts.map +1 -0
- package/dist/lib/loader/hooks.js +19 -18
- package/dist/lib/loader/hooks.js.map +1 -1
- package/dist/lib/loader/plugins.d.ts +2 -0
- package/dist/lib/loader/plugins.d.ts.map +1 -0
- package/dist/lib/loader/plugins.js +11 -12
- package/dist/lib/loader/plugins.js.map +1 -1
- package/dist/lib/loader/roles.d.ts +3 -0
- package/dist/lib/loader/roles.d.ts.map +1 -0
- package/dist/lib/loader/roles.js +11 -12
- package/dist/lib/loader/roles.js.map +1 -1
- package/dist/lib/loader/router.d.ts +2 -0
- package/dist/lib/loader/router.d.ts.map +1 -0
- package/dist/lib/loader/router.js +111 -129
- package/dist/lib/loader/router.js.map +1 -1
- package/dist/lib/loader/schedules.d.ts +3 -0
- package/dist/lib/loader/schedules.d.ts.map +1 -0
- package/dist/lib/loader/schedules.js +18 -25
- package/dist/lib/loader/schedules.js.map +1 -1
- package/dist/lib/loader/schemas.d.ts +2 -0
- package/dist/lib/loader/schemas.d.ts.map +1 -0
- package/dist/lib/loader/schemas.js +26 -22
- package/dist/lib/loader/schemas.js.map +1 -1
- package/dist/lib/loader/tracking.d.ts +6 -0
- package/dist/lib/loader/tracking.d.ts.map +1 -0
- package/dist/lib/loader/tracking.js +17 -19
- package/dist/lib/loader/tracking.js.map +1 -1
- package/dist/lib/loader/translation.d.ts +2 -0
- package/dist/lib/loader/translation.d.ts.map +1 -0
- package/dist/lib/loader/translation.js +11 -10
- package/dist/lib/loader/translation.js.map +1 -1
- package/dist/lib/middleware/dispatchForgotPasswordLink.d.ts +3 -0
- package/dist/lib/middleware/dispatchForgotPasswordLink.d.ts.map +1 -0
- package/dist/lib/middleware/dispatchForgotPasswordLink.js +2 -16
- package/dist/lib/middleware/dispatchForgotPasswordLink.js.map +1 -1
- package/dist/lib/middleware/isAdmin.d.ts +3 -0
- package/dist/lib/middleware/isAdmin.d.ts.map +1 -0
- package/dist/lib/middleware/isAdmin.js +1 -4
- package/dist/lib/middleware/isAdmin.js.map +1 -1
- package/dist/lib/middleware/isAuthenticated.d.ts +3 -0
- package/dist/lib/middleware/isAuthenticated.d.ts.map +1 -0
- package/dist/lib/middleware/isAuthenticated.js +2 -6
- package/dist/lib/middleware/isAuthenticated.js.map +1 -1
- package/dist/lib/middleware/postAuth.d.ts +3 -0
- package/dist/lib/middleware/postAuth.d.ts.map +1 -0
- package/dist/lib/middleware/postAuth.js +2 -16
- package/dist/lib/middleware/postAuth.js.map +1 -1
- package/dist/lib/middleware/preAuth.d.ts +3 -0
- package/dist/lib/middleware/preAuth.d.ts.map +1 -0
- package/dist/lib/middleware/preAuth.js +1 -15
- package/dist/lib/middleware/preAuth.js.map +1 -1
- package/dist/lib/middleware/preForgotPasswordHandler.d.ts +3 -0
- package/dist/lib/middleware/preForgotPasswordHandler.d.ts.map +1 -0
- package/dist/lib/middleware/preForgotPasswordHandler.js +1 -15
- package/dist/lib/middleware/preForgotPasswordHandler.js.map +1 -1
- package/dist/lib/schedules/test.job.d.ts +4 -0
- package/dist/lib/schedules/test.job.d.ts.map +1 -0
- package/dist/lib/schedules/test.job.js +3 -18
- package/dist/lib/schedules/test.job.js.map +1 -1
- package/dist/lib/schemas/auth.d.ts +175 -0
- package/dist/lib/schemas/auth.d.ts.map +1 -0
- package/dist/lib/schemas/auth.js +9 -12
- package/dist/lib/schemas/auth.js.map +1 -1
- package/dist/lib/schemas/common.d.ts +81 -0
- package/dist/lib/schemas/common.d.ts.map +1 -0
- package/dist/lib/schemas/common.js +6 -9
- package/dist/lib/schemas/common.js.map +1 -1
- package/dist/lib/schemas/global.d.ts +29 -0
- package/dist/lib/schemas/global.d.ts.map +1 -0
- package/dist/lib/schemas/global.js +2 -5
- package/dist/lib/schemas/global.js.map +1 -1
- package/dist/lib/schemas/token.d.ts +68 -0
- package/dist/lib/schemas/token.d.ts.map +1 -0
- package/dist/lib/schemas/token.js +3 -6
- package/dist/lib/schemas/token.js.map +1 -1
- package/dist/lib/schemas/user.d.ts +120 -0
- package/dist/lib/schemas/user.d.ts.map +1 -0
- package/dist/lib/schemas/user.js +5 -8
- package/dist/lib/schemas/user.js.map +1 -1
- package/dist/lib/util/common.d.ts +5 -0
- package/dist/lib/util/common.d.ts.map +1 -0
- package/dist/lib/util/common.js +4 -8
- package/dist/lib/util/common.js.map +1 -1
- package/dist/lib/util/errors.d.ts +15 -0
- package/dist/lib/util/errors.d.ts.map +1 -0
- package/dist/lib/util/errors.js +7 -7
- package/dist/lib/util/errors.js.map +1 -1
- package/dist/lib/util/generate.d.ts +2 -0
- package/dist/lib/util/generate.d.ts.map +1 -0
- package/dist/lib/util/generate.js +2 -5
- package/dist/lib/util/generate.js.map +1 -1
- package/dist/lib/util/logger.d.ts +35 -0
- package/dist/lib/util/logger.d.ts.map +1 -0
- package/dist/lib/util/logger.js +8 -12
- package/dist/lib/util/logger.js.map +1 -1
- package/dist/lib/util/mark.d.ts +2 -0
- package/dist/lib/util/mark.d.ts.map +1 -0
- package/dist/lib/util/mark.js +2 -4
- package/dist/lib/util/mark.js.map +1 -1
- package/dist/lib/util/path.d.ts +2 -0
- package/dist/lib/util/path.d.ts.map +1 -0
- package/dist/lib/util/path.js +5 -5
- package/dist/lib/util/path.js.map +1 -1
- package/dist/lib/util/regexp.d.ts +12 -0
- package/dist/lib/util/regexp.d.ts.map +1 -0
- package/dist/lib/util/regexp.js +11 -14
- package/dist/lib/util/regexp.js.map +1 -1
- package/dist/lib/util/require.d.ts +3 -0
- package/dist/lib/util/require.d.ts.map +1 -0
- package/dist/lib/util/require.js +4 -0
- package/dist/lib/util/require.js.map +1 -0
- package/dist/lib/util/tracker.d.ts +4 -0
- package/dist/lib/util/tracker.d.ts.map +1 -0
- package/dist/lib/util/tracker.js +63 -86
- package/dist/lib/util/tracker.js.map +1 -1
- package/dist/lib/util/yn.d.ts +2 -0
- package/dist/lib/util/yn.d.ts.map +1 -0
- package/dist/lib/util/yn.js +1 -3
- package/dist/lib/util/yn.js.map +1 -1
- package/dist/server.d.ts +2 -0
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +1 -2
- package/dist/server.js.map +1 -1
- package/lib/api/auth/controller/auth.ts +1 -1
- package/lib/api/auth/routes.ts +1 -1
- package/lib/api/health/routes.ts +1 -1
- package/lib/api/token/routes.ts +1 -1
- package/lib/api/tool/routes.ts +1 -1
- package/lib/api/users/controller/user.ts +2 -2
- package/lib/api/users/routes.ts +1 -1
- package/lib/apollo/resolvers.ts +1 -1
- package/lib/config/general.ts +1 -3
- package/lib/config/plugins.ts +1 -3
- package/lib/config/roles.ts +1 -1
- package/lib/config/tracking.ts +1 -1
- package/lib/hooks/onError.ts +1 -1
- package/lib/hooks/onRequest.ts +8 -6
- package/lib/hooks/onResponse.ts +1 -1
- package/lib/hooks/preHandler.ts +2 -2
- package/lib/hooks/preSerialization.ts +2 -2
- package/lib/loader/general.ts +13 -9
- package/lib/loader/hooks.ts +15 -11
- package/lib/loader/plugins.ts +14 -10
- package/lib/loader/roles.ts +14 -9
- package/lib/loader/router.ts +106 -88
- package/lib/loader/schedules.ts +6 -6
- package/lib/loader/schemas.ts +27 -19
- package/lib/loader/tracking.ts +14 -9
- package/lib/loader/translation.ts +9 -14
- package/lib/schedules/test.job.ts +1 -1
- package/lib/util/common.ts +1 -1
- package/lib/util/generate.ts +1 -1
- package/lib/util/logger.ts +1 -1
- package/lib/util/mark.ts +1 -0
- package/lib/util/path.ts +6 -1
- package/lib/util/require.ts +3 -0
- package/lib/util/tracker.ts +1 -1
- package/package.json +24 -15
- package/.dockerignore +0 -6
- package/.mocharc.json +0 -3
- package/.nvmrc +0 -1
- package/.prettierignore +0 -5
- package/.prettierrc +0 -9
- package/DOCKER.md +0 -27
- package/Dockerfile +0 -24
- package/Dockerfile.prod +0 -33
- package/NPM.md +0 -24
- package/TODO.md +0 -14
- package/combine.js +0 -124
- package/dist/lib/locales/en.json +0 -12
- package/dist/lib/locales/it.json +0 -12
- package/dist/nodemon.json +0 -7
- package/dist/package-lock.json +0 -9787
- package/dist/package.json +0 -108
- package/dist/tsconfig.json +0 -32
- package/index.d.ts +0 -16
- package/index.ts +0 -410
- package/logo-dark.png +0 -0
- package/nodemon.json +0 -7
- package/server.ts +0 -5
- package/test/common/api.ts +0 -80
- package/test/common/bootstrap.ts +0 -33
- package/test/demo/demo.ts +0 -9
- package/test/demo/index.ts +0 -14
- package/test/e2e/index.ts +0 -14
- package/test/index.spec.ts +0 -20
- package/test/unit/index.ts +0 -14
- package/test/unit/semver.ts +0 -24
- package/test/unit/translation.ts +0 -77
- package/tsconfig.json +0 -40
- package/types/global.d.ts +0 -225
|
@@ -1,68 +1,73 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
45
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
|
-
};
|
|
47
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.load = load;
|
|
49
|
-
exports.apply = apply;
|
|
50
|
-
const yn_1 = __importDefault(require("../util/yn"));
|
|
51
|
-
const path_1 = require("../util/path");
|
|
52
|
-
const glob = require('glob');
|
|
53
|
-
const path = require('path');
|
|
1
|
+
import yn from '../util/yn.js';
|
|
2
|
+
import { normalizePatterns } from '../util/path.js';
|
|
3
|
+
import { globSync } from 'glob';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { fileURLToPath } from 'url';
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
54
8
|
const methods = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'PATCH', 'OPTIONS'];
|
|
55
|
-
function
|
|
9
|
+
async function tryToLoadFile(fileName) {
|
|
10
|
+
try {
|
|
11
|
+
const module = await import(fileName);
|
|
12
|
+
return module.default || module;
|
|
13
|
+
}
|
|
14
|
+
catch (err) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
async function loadMiddleware(base, middleware = '') {
|
|
19
|
+
const key = 'global.';
|
|
20
|
+
const isGlobal = middleware.indexOf(key) > -1;
|
|
21
|
+
let loadedModule = null;
|
|
22
|
+
if (isGlobal) {
|
|
23
|
+
const name = middleware.substring(key.length);
|
|
24
|
+
const localPath = path.resolve(process.cwd() + '/src/middleware/' + name + '.ts');
|
|
25
|
+
const localPathJs = path.resolve(process.cwd() + '/src/middleware/' + name + '.js');
|
|
26
|
+
loadedModule = await tryToLoadFile(localPath);
|
|
27
|
+
if (!loadedModule)
|
|
28
|
+
loadedModule = await tryToLoadFile(localPathJs);
|
|
29
|
+
if (!loadedModule) {
|
|
30
|
+
const libPath = path.resolve(__dirname + '/../middleware/' + name + '.js');
|
|
31
|
+
loadedModule = await tryToLoadFile(libPath);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
const routeMiddPath = path.resolve(base + '/middleware/' + middleware);
|
|
36
|
+
loadedModule = await tryToLoadFile(routeMiddPath + '.ts');
|
|
37
|
+
if (!loadedModule)
|
|
38
|
+
loadedModule = await tryToLoadFile(routeMiddPath + '.js');
|
|
39
|
+
if (!loadedModule)
|
|
40
|
+
loadedModule = await tryToLoadFile(routeMiddPath);
|
|
41
|
+
}
|
|
42
|
+
if (!loadedModule) {
|
|
43
|
+
log.error(`Middleware ${middleware} not loaded`);
|
|
44
|
+
throw new Error(`Middleware ${middleware} not loaded`);
|
|
45
|
+
}
|
|
46
|
+
return loadedModule;
|
|
47
|
+
}
|
|
48
|
+
async function loadMiddlewares(base, middlewares = []) {
|
|
49
|
+
const midds = {};
|
|
50
|
+
for (const m of middlewares) {
|
|
51
|
+
const middleware = await loadMiddleware(base, m);
|
|
52
|
+
Object.keys(middleware).map((name) => (midds[name] = [...(midds[name] || []), middleware[name]]));
|
|
53
|
+
}
|
|
54
|
+
return midds;
|
|
55
|
+
}
|
|
56
|
+
async function load() {
|
|
56
57
|
const validRoutes = [];
|
|
57
|
-
const patterns =
|
|
58
|
+
const patterns = normalizePatterns(['..', 'api', '**', 'routes.{ts,js}'], ['src', 'api', '**', 'routes.{ts,js}']);
|
|
58
59
|
const authMiddlewares = ['global.isAuthenticated', 'global.isAdmin'];
|
|
59
|
-
|
|
60
|
+
for (const pattern of patterns) {
|
|
60
61
|
log.t && log.trace('Looking for ' + pattern);
|
|
61
|
-
|
|
62
|
+
const files = globSync(pattern, { windowsPathsNoEscape: true });
|
|
63
|
+
for (const f of files) {
|
|
64
|
+
if (f.endsWith('.d.ts'))
|
|
65
|
+
continue;
|
|
62
66
|
const base = path.dirname(f);
|
|
63
67
|
const dir = path.basename(base);
|
|
64
68
|
const file = path.join(dir, path.basename(f));
|
|
65
|
-
const
|
|
69
|
+
const module = await import(f);
|
|
70
|
+
const routesjs = module.default || module;
|
|
66
71
|
const { routes = [], config: defaultConfig = {} } = routesjs || {};
|
|
67
72
|
log.t && log.trace(`* Add ${routes.length} routes from ${file}`);
|
|
68
73
|
routes.forEach((route, index) => {
|
|
@@ -80,26 +85,23 @@ function load() {
|
|
|
80
85
|
}
|
|
81
86
|
const reqAuth = middlewares.some((m) => authMiddlewares.includes(m)) ||
|
|
82
87
|
requiredRoles.every((r) => r.code !== roles.public.code);
|
|
83
|
-
if (!
|
|
88
|
+
if (!config?.security && reqAuth) {
|
|
84
89
|
config.security = 'bearer';
|
|
85
90
|
}
|
|
86
|
-
const { title = '', description = '', enable = (
|
|
91
|
+
const { title = '', description = '', enable = yn(defaultConfig.enable, true), deprecated = yn(defaultConfig.deprecated, false), tags = defaultConfig.tags, version = defaultConfig.version || '', security = defaultConfig.security, query, params, body, response, consumes, rawBody = false } = config || {};
|
|
87
92
|
const endpoint = `${dir}${pathName.replace(/\/+$/, '')}`;
|
|
88
93
|
const method = methodCase.toUpperCase();
|
|
89
94
|
const num = index + 1;
|
|
90
95
|
const handlerParts = handler.split('.');
|
|
91
96
|
if (enable) {
|
|
92
|
-
if (!pathName.startsWith('/'))
|
|
97
|
+
if (!pathName.startsWith('/'))
|
|
93
98
|
errors.push(`Error in [${file}] bad path [${pathName}] at route n. ${num}`);
|
|
94
|
-
|
|
95
|
-
if (!methods.includes(method)) {
|
|
99
|
+
if (!methods.includes(method))
|
|
96
100
|
errors.push(`Error in [${file}] bad method [${method}] at route n. ${num}`);
|
|
97
|
-
|
|
98
|
-
if (handlerParts.length !== 2) {
|
|
101
|
+
if (handlerParts.length !== 2)
|
|
99
102
|
errors.push(`Error in [${file}] bad handler [${handler}] at route n. ${num}`);
|
|
100
|
-
}
|
|
101
103
|
const key = method + endpoint + version;
|
|
102
|
-
if (validRoutes.some((r) =>
|
|
104
|
+
if (validRoutes.some((r) => `${r.method}${r.path}${r.doc?.version}` === key)) {
|
|
103
105
|
errors.push(`Error in [${file}] duplicated path [${pathName}] at route n. ${num}`);
|
|
104
106
|
}
|
|
105
107
|
if (errors.length > 0) {
|
|
@@ -109,7 +111,7 @@ function load() {
|
|
|
109
111
|
const toAdd = enable && errors.length === 0;
|
|
110
112
|
toAdd
|
|
111
113
|
? log.t &&
|
|
112
|
-
log.trace(`* Method [${method}] path ${endpoint} handler ${handler} enabled with ${
|
|
114
|
+
log.trace(`* Method [${method}] path ${endpoint} handler ${handler} enabled with ${middlewares?.length || 0} middlewares`)
|
|
113
115
|
: log.w && log.warn(`* Method [${method}] path ${endpoint} handler ${handler} disabled. Skip.`);
|
|
114
116
|
if (toAdd) {
|
|
115
117
|
const doc = {
|
|
@@ -145,79 +147,59 @@ function load() {
|
|
|
145
147
|
});
|
|
146
148
|
}
|
|
147
149
|
});
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
150
152
|
log.d && log.debug(`Routes loaded: ${validRoutes.length}`);
|
|
151
153
|
return validRoutes;
|
|
152
154
|
}
|
|
153
|
-
function
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
resolve(required);
|
|
159
|
-
}
|
|
160
|
-
catch (err) {
|
|
161
|
-
reject(err);
|
|
162
|
-
}
|
|
163
|
-
});
|
|
164
|
-
});
|
|
165
|
-
}
|
|
166
|
-
function loadMiddleware(base_1) {
|
|
167
|
-
return __awaiter(this, arguments, void 0, function* (base, middleware = '') {
|
|
168
|
-
const key = 'global.';
|
|
169
|
-
const isGlobal = middleware.indexOf(key) > -1;
|
|
170
|
-
let required = null;
|
|
171
|
-
if (isGlobal) {
|
|
172
|
-
const name = middleware.substring(key.length);
|
|
173
|
-
required = yield tryToLoadFile(path.resolve(process.cwd() + '/src/middleware/' + name)).catch(() => __awaiter(this, void 0, void 0, function* () {
|
|
174
|
-
return yield tryToLoadFile(path.resolve(__dirname + '/../middleware/' + name));
|
|
175
|
-
}));
|
|
176
|
-
}
|
|
177
|
-
else {
|
|
178
|
-
required = yield tryToLoadFile(path.resolve(base + '/middleware/' + middleware));
|
|
179
|
-
}
|
|
180
|
-
if (!required) {
|
|
181
|
-
log.error(`Middleware ${middleware} not loaded`);
|
|
182
|
-
throw new Error(`Middleware ${middleware} not loaded`);
|
|
183
|
-
}
|
|
184
|
-
return required;
|
|
185
|
-
});
|
|
186
|
-
}
|
|
187
|
-
function loadMiddlewares(base_1) {
|
|
188
|
-
return __awaiter(this, arguments, void 0, function* (base, middlewares = []) {
|
|
189
|
-
const midds = {};
|
|
190
|
-
yield Promise.all(middlewares.map((m) => __awaiter(this, void 0, void 0, function* () {
|
|
191
|
-
const middleware = yield loadMiddleware(base, m);
|
|
192
|
-
Object.keys(middleware).map((name) => (midds[name] = [...(midds[name] || []), middleware[name]]));
|
|
193
|
-
})));
|
|
194
|
-
return midds;
|
|
195
|
-
});
|
|
196
|
-
}
|
|
197
|
-
function apply(server, routes) {
|
|
155
|
+
async function applyRoutes(server, routes) {
|
|
156
|
+
if (!routes || routes.length === 0) {
|
|
157
|
+
log.w && log.warn('No routes to apply to server');
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
198
160
|
log.t && log.trace(`Apply ${routes.length} routes to server with pid ${process.pid}`);
|
|
199
|
-
|
|
200
|
-
if (route
|
|
161
|
+
for (const route of routes) {
|
|
162
|
+
if (route?.enable) {
|
|
201
163
|
const { handler, method, path, middlewares, roles, rawBody, rateLimit, base, file, func, doc } = route;
|
|
202
164
|
log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`);
|
|
203
|
-
const midds =
|
|
204
|
-
server.route(
|
|
165
|
+
const midds = await loadMiddlewares(base, middlewares);
|
|
166
|
+
server.route({
|
|
167
|
+
method: method,
|
|
168
|
+
path: path,
|
|
169
|
+
schema: doc,
|
|
170
|
+
...midds,
|
|
171
|
+
config: {
|
|
205
172
|
requiredRoles: roles || [],
|
|
206
173
|
rawBody: rawBody || false,
|
|
207
174
|
rateLimit: rateLimit || undefined
|
|
208
|
-
},
|
|
209
|
-
|
|
175
|
+
},
|
|
176
|
+
handler: async function (req, reply) {
|
|
177
|
+
try {
|
|
178
|
+
let module;
|
|
210
179
|
try {
|
|
211
|
-
|
|
212
|
-
return yield module[func](req, reply);
|
|
180
|
+
module = await import(file + '.js');
|
|
213
181
|
}
|
|
214
|
-
catch
|
|
215
|
-
|
|
216
|
-
|
|
182
|
+
catch {
|
|
183
|
+
try {
|
|
184
|
+
module = await import(file + '.ts');
|
|
185
|
+
}
|
|
186
|
+
catch {
|
|
187
|
+
module = await import(file);
|
|
188
|
+
}
|
|
217
189
|
}
|
|
218
|
-
|
|
219
|
-
|
|
190
|
+
return await module[func](req, reply);
|
|
191
|
+
}
|
|
192
|
+
catch (err) {
|
|
193
|
+
log.e && log.error(`Cannot find ${file} or method ${func}: ${err}`);
|
|
194
|
+
return reply.code(500).send(`Invalid handler ${handler}`);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
});
|
|
220
198
|
}
|
|
221
|
-
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
export async function apply(server) {
|
|
202
|
+
const routes = await load();
|
|
203
|
+
return await applyRoutes(server, routes);
|
|
222
204
|
}
|
|
223
205
|
//# sourceMappingURL=router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../lib/loader/router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../lib/loader/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,eAAe,CAAA;AAG9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAGnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;AAE5E,KAAK,UAAU,aAAa,CAAC,QAAgB;IAC3C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;QACrC,OAAO,MAAM,CAAC,OAAO,IAAI,MAAM,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,aAAqB,EAAE;IACjE,MAAM,GAAG,GAAG,SAAS,CAAA;IACrB,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7C,IAAI,YAAY,GAAQ,IAAI,CAAA;IAE5B,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAE7C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,IAAI,GAAG,KAAK,CAAC,CAAA;QACjF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,IAAI,GAAG,KAAK,CAAC,CAAA;QAEnF,YAAY,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,CAAA;QAC7C,IAAI,CAAC,YAAY;YAAE,YAAY,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,CAAA;QAGlE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,iBAAiB,GAAG,IAAI,GAAG,KAAK,CAAC,CAAA;YAC1E,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;SAAM,CAAC;QAEN,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,cAAc,GAAG,UAAU,CAAC,CAAA;QAEtE,YAAY,GAAG,MAAM,aAAa,CAAC,aAAa,GAAG,KAAK,CAAC,CAAA;QACzD,IAAI,CAAC,YAAY;YAAE,YAAY,GAAG,MAAM,aAAa,CAAC,aAAa,GAAG,KAAK,CAAC,CAAA;QAC5E,IAAI,CAAC,YAAY;YAAE,YAAY,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAA;IACtE,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAA;QAChD,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAA;IACxD,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,cAAwB,EAAE;IACrE,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QAEhD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACnG,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,WAAW,GAAsB,EAAE,CAAA;IACzC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAA;IACjH,MAAM,eAAe,GAAG,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;IAEpE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAA;QAE/D,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,SAAQ;YAEjC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;YAE7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAA;YACzC,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,QAAQ,IAAI,EAAE,CAAA;YAElE,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,gBAAgB,IAAI,EAAE,CAAC,CAAA;YAEhE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAY,EAAE,KAAa,EAAE,EAAE;gBAC7C,MAAM,MAAM,GAAa,EAAE,CAAA;gBAC3B,MAAM,EACJ,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,QAAQ,GAAG,GAAG,EACpB,OAAO,EACP,KAAK,EAAE,EAAE,GAAG,EAAE,EACd,MAAM,GAAG,EAAiB,EAC1B,WAAW,GAAG,EAAE,EAChB,SAAS,EACV,GAAG,KAAK,CAAA;gBAET,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC5C,IAAI,aAAa,GAAW,EAAE,CAAA;gBAE9B,IAAI,CAAC;oBACH,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;gBAC5F,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,8BAA8B,UAAU,IAAI,QAAQ,KAAK,OAAO,GAAG,CAAC,CAAA;oBACvF,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACvB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAA;gBACvB,CAAC;gBAED,MAAM,OAAO,GACX,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACpD,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBAE1D,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,OAAO,EAAE,CAAC;oBACjC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;gBAC5B,CAAC;gBAED,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,WAAW,GAAG,EAAE,EAChB,MAAM,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,EACvC,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,EAChD,IAAI,GAAG,aAAa,CAAC,IAAI,EACzB,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,EAAE,EACrC,QAAQ,GAAG,aAAa,CAAC,QAAQ,EACjC,KAAK,EACL,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,OAAO,GAAG,KAAK,EAChB,GAAG,MAAM,IAAI,EAAE,CAAA;gBAEhB,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;gBACxD,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;gBACvC,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,CAAA;gBACrB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAEvC,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;wBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,eAAe,QAAQ,iBAAiB,GAAG,EAAE,CAAC,CAAA;oBAC1G,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,iBAAiB,MAAM,iBAAiB,GAAG,EAAE,CAAC,CAAA;oBAC1G,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;wBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,kBAAkB,OAAO,iBAAiB,GAAG,EAAE,CAAC,CAAA;oBAE5G,MAAM,GAAG,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;oBACvC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC;wBAC7E,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,sBAAsB,QAAQ,iBAAiB,GAAG,EAAE,CAAC,CAAA;oBACpF,CAAC;oBAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtB,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;oBACtD,CAAC;gBACH,CAAC;gBAED,MAAM,KAAK,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;gBAC3C,KAAK;oBACH,CAAC,CAAC,GAAG,CAAC,CAAC;wBACL,GAAG,CAAC,KAAK,CACP,aAAa,MAAM,UAAU,QAAQ,YAAY,OAAO,iBACtD,WAAW,EAAE,MAAM,IAAI,CACzB,cAAc,CACf;oBACH,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,MAAM,UAAU,QAAQ,YAAY,OAAO,kBAAkB,CAAC,CAAA;gBAEjG,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,GAAG,GAAG;wBACV,OAAO,EAAE,KAAK;wBACd,WAAW;wBACX,UAAU;wBACV,IAAI;wBACJ,OAAO;wBACP,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ;wBAC7D,QAAQ;qBACF,CAAA;oBAER,IAAI,KAAK;wBAAE,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;oBAClC,IAAI,MAAM;wBAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;oBAC/B,IAAI,IAAI;wBAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;oBACzB,IAAI,QAAQ;wBAAE,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;oBAErC,WAAW,CAAC,IAAI,CAAC;wBACf,OAAO;wBACP,MAAM;wBACN,IAAI,EAAE,GAAG,GAAG,QAAQ;wBACpB,WAAW;wBACX,KAAK,EAAE,aAAa;wBACpB,MAAM;wBACN,OAAO;wBACP,SAAS;wBACT,IAAI;wBACJ,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,IAAI,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;wBAChF,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;wBACrB,GAAG,EAAE,GAAG;qBACT,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,kBAAkB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;IAC1D,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,MAAW,EAAE,MAAyB;IAC/D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QACjD,OAAM;IACR,CAAC;IAED,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,8BAA8B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAErF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;YAEtG,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,MAAM,IAAI,IAAI,cAAc,OAAO,EAAE,CAAC,CAAA;YACvE,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;YAEtD,MAAM,CAAC,KAAK,CAAC;gBACX,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,GAAG;gBACX,GAAG,KAAK;gBACR,MAAM,EAAE;oBACN,aAAa,EAAE,KAAK,IAAI,EAAE;oBAC1B,OAAO,EAAE,OAAO,IAAI,KAAK;oBACzB,SAAS,EAAE,SAAS,IAAI,SAAS;iBAClC;gBACD,OAAO,EAAE,KAAK,WAAW,GAAmB,EAAE,KAAmB;oBAC/D,IAAI,CAAC;wBAIH,IAAI,MAAM,CAAA;wBACV,IAAI,CAAC;4BACH,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,CAAA;wBACrC,CAAC;wBAAC,MAAM,CAAC;4BACP,IAAI,CAAC;gCACH,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,CAAA;4BACrC,CAAC;4BAAC,MAAM,CAAC;gCACP,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAA;4BAC7B,CAAC;wBACH,CAAC;wBAED,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;oBACvC,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,cAAc,IAAI,KAAK,GAAG,EAAE,CAAC,CAAA;wBACnE,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAA;oBAC3D,CAAC;gBACH,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,MAAW;IACrC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;IAC3B,OAAO,MAAM,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAC1C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedules.d.ts","sourceRoot":"","sources":["../../../lib/loader/schedules.ts"],"names":[],"mappings":"AAQA,wBAAgB,IAAI,IAAI,GAAG,EAAE,CAiF5B;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAiD7C"}
|
|
@@ -1,17 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const path_1 = require("../util/path");
|
|
10
|
-
const toad_scheduler_1 = require("toad-scheduler");
|
|
11
|
-
const glob = require('glob');
|
|
12
|
-
const path = require('path');
|
|
13
|
-
function load() {
|
|
14
|
-
const patterns = (0, path_1.normalizePatterns)(['..', 'schedules', '*.job.{ts,js}'], ['src', 'schedules', '*.job.{ts,js}']);
|
|
1
|
+
import _ from 'lodash';
|
|
2
|
+
import { normalizePatterns } from '../util/path.js';
|
|
3
|
+
import { CronJob, SimpleIntervalJob, Task, AsyncTask } from 'toad-scheduler';
|
|
4
|
+
import { globSync } from 'glob';
|
|
5
|
+
import path from 'path';
|
|
6
|
+
import require from '../util/require.js';
|
|
7
|
+
export function load() {
|
|
8
|
+
const patterns = normalizePatterns(['..', 'schedules', '*.job.{ts,js}'], ['src', 'schedules', '*.job.{ts,js}']);
|
|
15
9
|
const jobs = [];
|
|
16
10
|
const jobScheduleDefaults = {
|
|
17
11
|
active: false,
|
|
@@ -30,16 +24,15 @@ function load() {
|
|
|
30
24
|
};
|
|
31
25
|
patterns.forEach((pattern) => {
|
|
32
26
|
log.t && log.trace('Looking for ' + pattern);
|
|
33
|
-
|
|
34
|
-
var _a;
|
|
27
|
+
globSync(pattern, { windowsPathsNoEscape: true }).forEach((f) => {
|
|
35
28
|
log.t && log.trace(`* Add job schedule from ${f}`);
|
|
36
29
|
const jobName = path.basename(f, path.extname(f));
|
|
37
30
|
let { job, schedule: s } = require(f);
|
|
38
31
|
let isLoadedAndEnabled = false;
|
|
39
32
|
if (s && s.active) {
|
|
40
33
|
isLoadedAndEnabled = true;
|
|
41
|
-
let schedule =
|
|
42
|
-
schedule =
|
|
34
|
+
let schedule = _.cloneDeep(jobScheduleDefaults);
|
|
35
|
+
schedule = _.merge(schedule, s);
|
|
43
36
|
if (!job || typeof job !== 'function') {
|
|
44
37
|
log.t && log.error(`* Job ${jobName} `);
|
|
45
38
|
isLoadedAndEnabled = false;
|
|
@@ -48,7 +41,7 @@ function load() {
|
|
|
48
41
|
log.t && log.error(`* Job ${jobName}: schedule.type must be cron or interval`);
|
|
49
42
|
isLoadedAndEnabled = false;
|
|
50
43
|
}
|
|
51
|
-
if (schedule.type === 'cron' && !
|
|
44
|
+
if (schedule.type === 'cron' && !schedule.cron?.expression) {
|
|
52
45
|
log.t && log.error(`* Job ${jobName}: schedule.cron.expression not defined`);
|
|
53
46
|
isLoadedAndEnabled = false;
|
|
54
47
|
}
|
|
@@ -70,26 +63,26 @@ function load() {
|
|
|
70
63
|
log.t && log.trace(`* Job schedule ${jobName} ${isLoadedAndEnabled ? 'enabled' : 'disabled'}`);
|
|
71
64
|
});
|
|
72
65
|
});
|
|
73
|
-
log.d && log.debug(`Schedule Jobs loaded: ${
|
|
66
|
+
log.d && log.debug(`Schedule Jobs loaded: ${jobs?.length || 0}`);
|
|
74
67
|
return jobs;
|
|
75
68
|
}
|
|
76
|
-
function start(server, jobs) {
|
|
69
|
+
export function start(server, jobs) {
|
|
77
70
|
if (jobs.length > 0) {
|
|
78
71
|
log.trace('* Job schedule attach all tasks');
|
|
79
72
|
jobs.forEach((job) => {
|
|
80
73
|
const { schedule, job: fn, jobName } = job;
|
|
81
74
|
let task = null;
|
|
82
75
|
if (schedule.async) {
|
|
83
|
-
task = new
|
|
76
|
+
task = new AsyncTask(jobName, fn, (err) => {
|
|
84
77
|
log.error(`Job ${jobName} throws an error`);
|
|
85
78
|
log.error(err);
|
|
86
79
|
});
|
|
87
80
|
}
|
|
88
81
|
else {
|
|
89
|
-
task = new
|
|
82
|
+
task = new Task(jobName, fn);
|
|
90
83
|
}
|
|
91
84
|
if (schedule.type === 'cron') {
|
|
92
|
-
const taskJob = new
|
|
85
|
+
const taskJob = new CronJob({
|
|
93
86
|
cronExpression: schedule.cron.expression,
|
|
94
87
|
timezone: schedule.cron.tomezone
|
|
95
88
|
}, task, {
|
|
@@ -98,7 +91,7 @@ function start(server, jobs) {
|
|
|
98
91
|
server.schedule.addCronJob(taskJob);
|
|
99
92
|
}
|
|
100
93
|
else {
|
|
101
|
-
const taskJob = new
|
|
94
|
+
const taskJob = new SimpleIntervalJob({
|
|
102
95
|
days: schedule.interval.days || 0,
|
|
103
96
|
hours: schedule.interval.hours || 0,
|
|
104
97
|
minutes: schedule.interval.minutes || 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../lib/loader/schedules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../lib/loader/schedules.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../lib/loader/schemas.ts"],"names":[],"mappings":"AAIA,wBAAsB,KAAK,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEtD"}
|
|
@@ -1,22 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const path = require('path');
|
|
7
|
-
function apply(server) {
|
|
8
|
-
const [baseSchemaPath, customSchemaPath] = (0, path_1.normalizePatterns)(['..', 'schemas', '*.{ts,js}'], ['src', 'schemas', '*.{ts,js}']);
|
|
1
|
+
import { normalizePatterns } from '../util/path.js';
|
|
2
|
+
import { globSync } from 'glob';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
export async function apply(server) {
|
|
5
|
+
const [baseSchemaPath, customSchemaPath] = normalizePatterns(['..', 'schemas', '*.{ts,js}'], ['src', 'schemas', '*.{ts,js}']);
|
|
9
6
|
const customSchemas = [];
|
|
10
7
|
const customSchemaIds = new Set();
|
|
11
8
|
let schemaCount = 0;
|
|
12
9
|
log.t && log.trace('Looking for custom schemas in ' + customSchemaPath);
|
|
13
|
-
|
|
10
|
+
const customFiles = globSync(customSchemaPath, { windowsPathsNoEscape: true });
|
|
11
|
+
for (const f of customFiles) {
|
|
12
|
+
if (f.endsWith('.d.ts'))
|
|
13
|
+
continue;
|
|
14
14
|
try {
|
|
15
|
-
const
|
|
16
|
-
const
|
|
15
|
+
const schemaModule = await import(f);
|
|
16
|
+
const schemaClass = schemaModule.default || schemaModule;
|
|
17
|
+
const schemaNames = Object.keys(schemaModule);
|
|
17
18
|
schemaNames.forEach((name) => {
|
|
18
|
-
const schema =
|
|
19
|
-
if (schema
|
|
19
|
+
const schema = schemaModule[name];
|
|
20
|
+
if (schema && typeof schema === 'object' && schema.$id) {
|
|
20
21
|
customSchemas.push(schema);
|
|
21
22
|
customSchemaIds.add(schema.$id);
|
|
22
23
|
}
|
|
@@ -25,21 +26,24 @@ function apply(server) {
|
|
|
25
26
|
catch (e) {
|
|
26
27
|
log.w && log.warn(`Could not load custom schema file: ${f}`, e);
|
|
27
28
|
}
|
|
28
|
-
}
|
|
29
|
+
}
|
|
29
30
|
customSchemas.forEach((schema) => {
|
|
30
31
|
log.trace(`* Registering custom schema [${schema.$id}]`);
|
|
31
32
|
server.addSchema(schema);
|
|
32
33
|
schemaCount++;
|
|
33
34
|
});
|
|
34
35
|
log.t && log.trace('Looking for base schemas in ' + baseSchemaPath);
|
|
35
|
-
|
|
36
|
+
const baseFiles = globSync(baseSchemaPath, { windowsPathsNoEscape: true });
|
|
37
|
+
for (const f of baseFiles) {
|
|
38
|
+
if (f.endsWith('.d.ts'))
|
|
39
|
+
continue;
|
|
36
40
|
try {
|
|
37
41
|
const schemaFileName = path.basename(f);
|
|
38
|
-
const
|
|
39
|
-
const schemaNames = Object.keys(
|
|
42
|
+
const schemaModule = await import(f);
|
|
43
|
+
const schemaNames = Object.keys(schemaModule);
|
|
40
44
|
schemaNames.forEach((name) => {
|
|
41
|
-
const schema =
|
|
42
|
-
if (schema
|
|
45
|
+
const schema = schemaModule[name];
|
|
46
|
+
if (schema && typeof schema === 'object' && schema.$id) {
|
|
43
47
|
if (customSchemaIds.has(schema.$id)) {
|
|
44
48
|
log.w &&
|
|
45
49
|
log.warn(`* Base schema [${schema.$id}] from ${schemaFileName} is overridden by a custom schema and will be ignored.`);
|
|
@@ -50,15 +54,15 @@ function apply(server) {
|
|
|
50
54
|
schemaCount++;
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
|
-
else {
|
|
54
|
-
log.w && log.warn(`* Schema with no $id found in ${schemaFileName}, cannot be registered.`);
|
|
57
|
+
else if (name !== 'default') {
|
|
58
|
+
log.w && log.warn(`* Schema with no $id found in ${schemaFileName} (export ${name}), cannot be registered.`);
|
|
55
59
|
}
|
|
56
60
|
});
|
|
57
61
|
}
|
|
58
62
|
catch (e) {
|
|
59
63
|
log.w && log.warn(`Could not load base schema file: ${f}`, e);
|
|
60
64
|
}
|
|
61
|
-
}
|
|
65
|
+
}
|
|
62
66
|
log.d && log.debug(`Schemas loaded: ${schemaCount} referenceable by $ref`);
|
|
63
67
|
}
|
|
64
68
|
//# sourceMappingURL=schemas.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../lib/loader/schemas.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../lib/loader/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,MAAW;IACrC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAC1D,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAC9B,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,CAChC,CAAA;IAED,MAAM,aAAa,GAAU,EAAE,CAAA;IAC/B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAA;IACjC,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,gCAAgC,GAAG,gBAAgB,CAAC,CAAA;IACvE,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAA;IAE9E,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAQ;QAEjC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,CAAA;YACpC,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,IAAI,YAAY,CAAA;YACxD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAE7C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;gBACjC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;oBACvD,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBAC1B,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;IAED,aAAa,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/B,GAAG,CAAC,KAAK,CAAC,gCAAgC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAA;QACxD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACxB,WAAW,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,cAAc,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAA;IAE1E,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAQ;QAEjC,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YACvC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,CAAA;YACpC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAE7C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;gBACjC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;oBACvD,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,GAAG,CAAC,CAAC;4BACH,GAAG,CAAC,IAAI,CACN,kBAAkB,MAAM,CAAC,GAAG,UAAU,cAAc,wDAAwD,CAC7G,CAAA;oBACL,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,KAAK,CAAC,8BAA8B,MAAM,CAAC,GAAG,UAAU,cAAc,EAAE,CAAC,CAAA;wBAC7E,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;wBACxB,WAAW,EAAE,CAAA;oBACf,CAAC;gBACH,CAAC;qBAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC9B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,iCAAiC,cAAc,YAAY,IAAI,0BAA0B,CAAC,CAAA;gBAC9G,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;IAED,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,WAAW,wBAAwB,CAAC,CAAA;AAC5E,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tracking.d.ts","sourceRoot":"","sources":["../../../lib/loader/tracking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAMjF,wBAAsB,IAAI;;;GAqCzB"}
|