@openforis/arena-server 2.5.3 → 2.6.0
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/dist/api/auth/login.js +11 -8
- package/dist/api/auth/login.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrate.js +2 -2
- package/dist/db/dbMigrator/dbMigrate.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrator.js +2 -2
- package/dist/db/dbMigrator/dbMigrator.js.map +1 -1
- package/dist/db/dbMigrator/migration/create.js +2 -2
- package/dist/db/dbMigrator/migration/create.js.map +1 -1
- package/dist/db/dbs/transformCallback.js +1 -1
- package/dist/db/dbs/transformCallback.js.map +1 -1
- package/dist/db/sql/sqlDeleteBuilder.d.ts +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js.map +1 -1
- package/dist/db/sql/sqlInsertBuilder.d.ts +1 -1
- package/dist/db/sql/sqlInsertBuilder.js +1 -1
- package/dist/db/sql/sqlInsertBuilder.js.map +1 -1
- package/dist/db/sql/sqlJoinBuilder.d.ts +2 -2
- package/dist/db/sql/sqlJoinBuilder.js +1 -1
- package/dist/db/sql/sqlJoinBuilder.js.map +1 -1
- package/dist/db/sql/sqlSelectBuilder.d.ts +6 -6
- package/dist/db/sql/sqlSelectBuilder.js.map +1 -1
- package/dist/db/sql/sqlUpdateBuilder.d.ts +3 -3
- package/dist/db/sql/sqlUpdateBuilder.js +4 -2
- package/dist/db/sql/sqlUpdateBuilder.js.map +1 -1
- package/dist/job/jobManager.d.ts +1 -1
- package/dist/job/jobManager.js +2 -2
- package/dist/job/jobManager.js.map +1 -1
- package/dist/job/jobThread.d.ts +1 -1
- package/dist/job/jobThread.js +12 -7
- package/dist/job/jobThread.js.map +1 -1
- package/dist/job/tests/testJobs.js +0 -1
- package/dist/job/tests/testJobs.js.map +1 -1
- package/dist/repository/authGroup/getMany.js +1 -1
- package/dist/repository/authGroup/getMany.js.map +1 -1
- package/dist/repository/dataQuery/delete.js +1 -1
- package/dist/repository/dataQuery/delete.js.map +1 -1
- package/dist/repository/dataQuery/insert.js +1 -1
- package/dist/repository/dataQuery/insert.js.map +1 -1
- package/dist/repository/dataQuery/read.js +1 -1
- package/dist/repository/dataQuery/read.js.map +1 -1
- package/dist/repository/user/get.js +1 -1
- package/dist/repository/user/get.js.map +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js.map +1 -1
- package/dist/server/arenaServer/start.d.ts +1 -1
- package/dist/server/arenaServer/start.js +2 -2
- package/dist/server/arenaServer/start.js.map +1 -1
- package/dist/server/arenaServer/stop.d.ts +1 -1
- package/dist/service/info/index.js +1 -1
- package/dist/service/info/index.js.map +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.d.ts +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.js +28 -19
- package/dist/service/survey/docExport/SurveyDocWalker.js.map +1 -1
- package/dist/thread/thread.js +6 -6
- package/dist/thread/thread.js.map +1 -1
- package/dist/thread/worker.d.ts +1 -1
- package/dist/thread/worker.js +2 -2
- package/dist/thread/worker.js.map +1 -1
- package/dist/webSocket/server.d.ts +4 -4
- package/dist/webSocket/server.js.map +1 -1
- package/package.json +1 -1
package/dist/api/auth/login.js
CHANGED
|
@@ -65,17 +65,20 @@ const authenticationSuccessful = ({ req, res, next, user, callback, }) => req.lo
|
|
|
65
65
|
const serviceRegistry = arena_core_1.ServiceRegistry.getInstance();
|
|
66
66
|
const userAuthTokenService = serviceRegistry.getService(arena_core_1.ServiceType.userAuthToken);
|
|
67
67
|
const refreshTokenProps = (0, authApiCommon_1.extractRefreshTokenProps)({ req });
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
try {
|
|
69
|
+
const { authToken, refreshToken } = await userAuthTokenService.createUserAuthTokens({
|
|
70
|
+
userUuid,
|
|
71
|
+
props: refreshTokenProps,
|
|
72
|
+
});
|
|
71
73
|
(0, authApiCommon_1.setRefreshTokenCookie)({ res, refreshToken });
|
|
72
|
-
sendUser({ res, req, user, authToken: authToken.token });
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
.catch((error) => {
|
|
74
|
+
await sendUser({ res, req, user, authToken: authToken.token });
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
76
77
|
next(error);
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
77
80
|
callback?.();
|
|
78
|
-
}
|
|
81
|
+
}
|
|
79
82
|
}
|
|
80
83
|
});
|
|
81
84
|
const getUser2FAService = () => arena_core_1.ServiceRegistry.getInstance().getService(server_1.ServerServiceType.user2FA);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrate = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const db_migrate_1 = __importDefault(require("db-migrate"));
|
|
9
9
|
const processEnv_1 = require("../../processEnv");
|
|
10
10
|
const schemata_1 = require("../schemata");
|
|
@@ -38,7 +38,7 @@ const getInstance = (schema, cwd = __dirname) => {
|
|
|
38
38
|
const folder = schema === schemata_1.Schemata.PUBLIC ? MigrationFolder.public : MigrationFolder.survey;
|
|
39
39
|
const options = {
|
|
40
40
|
config: getConfig(schema),
|
|
41
|
-
cwd: `${
|
|
41
|
+
cwd: `${node_path_1.default.join(cwd, 'migration', folder)}`,
|
|
42
42
|
env: processEnv_1.ProcessEnv.nodeEnv,
|
|
43
43
|
throwUncatched: true,
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,4DAAkC;AAElC,iDAA6C;AAC7C,0CAAsC;AAEtC,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;AACnB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAED,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,GAAG,EAAE,uBAAU,CAAC,KAAK;QACnB,CAAC,CAAC;YACE,kBAAkB,EAAE,CAAC,uBAAU,CAAC,sBAAsB;SACvD;QACH,CAAC,CAAC,KAAK;IACT,MAAM,EAAE,EAAE;CACX,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,MAAc,EAAO,EAAE;IACxC,MAAM,MAAM,GAAG,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,CAAA;IACxC,OAAO;QACL,WAAW,EAAE,MAAM;QACnB,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,MAAc,SAAS,EAAa,EAAE;IACzE,MAAM,MAAM,GAAG,MAAM,KAAK,mBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAA;IAE3F,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC;QACzB,GAAG,EAAE,GAAG,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;QAC7C,GAAG,EAAE,uBAAU,CAAC,OAAO;QAGvB,cAAc,EAAE,IAAI;KACrB,CAAA;IACD,OAAO,oBAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC,CAAA;AAEY,QAAA,SAAS,GAAG;IACvB,WAAW;CACZ,CAAA"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrator = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
8
|
const arena_core_1 = require("@openforis/arena-core");
|
|
9
9
|
const log_1 = require("../../log");
|
|
10
10
|
const repository_1 = require("../../repository");
|
|
@@ -17,7 +17,7 @@ const surveySchemaMigrationRequired = (appVersion) => appVersion === null ||
|
|
|
17
17
|
[...APP_VERSIONS_REQUIRING_SURVEY_SCHEMA_MIGRATION].some((version) => arena_core_1.Versions.isGreaterThan(version, appVersion));
|
|
18
18
|
const migrateSchema = async (params = {}) => {
|
|
19
19
|
const { schema = schemata_1.Schemata.PUBLIC, migrationsFolder = __dirname } = params;
|
|
20
|
-
if (!
|
|
20
|
+
if (!node_fs_1.default.existsSync(migrationsFolder))
|
|
21
21
|
return;
|
|
22
22
|
if (schema !== schemata_1.Schemata.PUBLIC) {
|
|
23
23
|
await db_1.DB.none(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
7
7
|
const schemata_1 = require("../../schemata");
|
|
8
8
|
const dbMigrate_1 = require("../dbMigrate");
|
|
9
9
|
var ArgName;
|
|
@@ -27,7 +27,7 @@ const getArgv = (name, defaultValue) => {
|
|
|
27
27
|
};
|
|
28
28
|
const name = getArgv(ArgName.name);
|
|
29
29
|
const schema = getArgv(ArgName.schema, schemata_1.Schemata.PUBLIC);
|
|
30
|
-
const cwd = getArgv(ArgName.cwd,
|
|
30
|
+
const cwd = getArgv(ArgName.cwd, node_path_1.default.resolve(__dirname, '..'));
|
|
31
31
|
const dbMigrate = dbMigrate_1.DBMigrate.getInstance(schema, cwd);
|
|
32
32
|
dbMigrate.create(name);
|
|
33
33
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAE5B,6CAAyC;AACzC,4CAAwC;AAExC,IAAK,OAIJ;AAJD,WAAK,OAAO;IACV,wBAAa,CAAA;IACb,sBAAW,CAAA;IACX,4BAAiB,CAAA;AACnB,CAAC,EAJI,OAAO,KAAP,OAAO,QAIX;AAED,MAAM,KAAK,GAAG,2BAA2B,OAAO,CAAC,IAAI,aAAa,OAAO,CAAC,MAAM,eAAe,OAAO,CAAC,GAAG,QAAQ,CAAA;AAElH,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,YAAqB,EAAU,EAAE;IAC/D,MAAM,WAAW,GAAG,KAAK,IAAI,GAAG,CAAA;IAChC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,IAAI,YAAY;YAAE,OAAO,YAAY,CAAA;QAErC,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,cAAc,CAAC,CAAA;QAC7C,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC,CAAA;QAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAQ,CAAC,MAAM,CAAC,CAAA;AACvD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA;AAE/D,MAAM,SAAS,GAAG,qBAAS,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AACpD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA"}
|
|
@@ -8,7 +8,7 @@ const mergeProps = (options) => {
|
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
10
|
const { props = {}, props_draft: propsDraft = {}, ...rest } = row;
|
|
11
|
-
const propsUpdate = draft ? { ...
|
|
11
|
+
const propsUpdate = draft ? { ...props, ...propsDraft } : props;
|
|
12
12
|
return { ...rest, props: propsUpdate };
|
|
13
13
|
};
|
|
14
14
|
const _assocPublishedDraft = (row) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;IAC/D,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;IAC1C,GAAG,GAAG;IACN,SAAS,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;IACtC,KAAK,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;CACzC,CAAC,CAAA;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAMjC,EAAO,EAAE;IACR,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,mBAAmB,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAC9F,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,MAAM,UAAU,GAAG,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAClF,MAAM,UAAU,GAAG,oBAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC9C,IAAI,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QACrD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC;QAC9C,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;IAGD,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,WAAW,CAAA;IACvC,OAAO,UAAU,CAAC,WAAW,CAAA;IAC7B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AA/BY,QAAA,iBAAiB,qBA+B7B;AAEM,MAAM,sBAAsB,GAAG,CAAC,GAAQ,EAAU,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAAjE,QAAA,sBAAsB,0BAA2C"}
|
|
@@ -8,7 +8,7 @@ export declare class SqlDeleteBuilder extends SqlBuilder {
|
|
|
8
8
|
private _table;
|
|
9
9
|
private _whereRaw;
|
|
10
10
|
private _whereValues;
|
|
11
|
-
private _returning;
|
|
11
|
+
private readonly _returning;
|
|
12
12
|
deleteFrom(table: Table): this;
|
|
13
13
|
whereRaw(condition: string): this;
|
|
14
14
|
where(values: ValuesByColumn): this;
|
|
@@ -32,7 +32,7 @@ class SqlDeleteBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
34
|
if (arena_core_1.Objects.isEmpty(this._table) || (arena_core_1.Objects.isEmpty(this._whereValues) && arena_core_1.Objects.isEmpty(this._whereRaw)))
|
|
35
|
-
throw new Error(`missingParams, ${this._table}, ${this._whereValues}`);
|
|
35
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._whereValues)}`);
|
|
36
36
|
const whereCondition = this._whereRaw ??
|
|
37
37
|
Object.keys(this._whereValues)
|
|
38
38
|
.map((columnName) => `${columnName} = $/${columnName}/`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;IACxB,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAsB;QAC1B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QACzE,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzG,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QAExF,MAAM,cAAc,GAClB,IAAI,CAAC,SAAS;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBAC3B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,QAAQ,UAAU,GAAG,CAAC;iBACvD,IAAI,CAAC,OAAO,CAAC,CAAA;QAElB,IAAI,GAAG,GAAG,eAAe,IAAI,CAAC,MAAM,UAAU,cAAc,EAAE,CAAA;QAC9D,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/E,GAAG,IAAI,cAAc,eAAe,EAAE,CAAA;QACxC,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAjDD,4CAiDC"}
|
|
@@ -7,7 +7,7 @@ interface ValuesByColumn {
|
|
|
7
7
|
export declare class SqlInsertBuilder extends SqlBuilder {
|
|
8
8
|
private _table;
|
|
9
9
|
private _valuesByColumn;
|
|
10
|
-
private _returning;
|
|
10
|
+
private readonly _returning;
|
|
11
11
|
insertInto(table: Table): this;
|
|
12
12
|
valuesByColumn(valuesByColumn: ValuesByColumn): this;
|
|
13
13
|
returning(...fields: Array<Column>): this;
|
|
@@ -21,7 +21,7 @@ class SqlInsertBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
21
21
|
}
|
|
22
22
|
build() {
|
|
23
23
|
if (arena_core_1.Objects.isEmpty(this._table) || arena_core_1.Objects.isEmpty(this._valuesByColumn))
|
|
24
|
-
throw new Error(`missingParams, ${this._table}, ${this._valuesByColumn}`);
|
|
24
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._valuesByColumn)}`);
|
|
25
25
|
const columnNames = [];
|
|
26
26
|
const valuesParams = [];
|
|
27
27
|
for (const columnName of Object.keys(this._valuesByColumn)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;IAC3B,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,cAA8B;QAC3C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;YACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAE3F,MAAM,WAAW,GAAa,EAAE,CAAA;QAChC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5B,YAAY,CAAC,IAAI,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QACvC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElH,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACvD,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;CACF;AAvCD,4CAuCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Table } from '../table';
|
|
2
2
|
import { SqlBuilder } from './sqlBuilder';
|
|
3
3
|
export declare class SqlJoinBuilder extends SqlBuilder {
|
|
4
|
-
private _tables;
|
|
5
|
-
private _on;
|
|
4
|
+
private readonly _tables;
|
|
5
|
+
private readonly _on;
|
|
6
6
|
join(table: Table): this;
|
|
7
7
|
on(condition: string): this;
|
|
8
8
|
build(): string;
|
|
@@ -16,7 +16,7 @@ class SqlJoinBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
16
16
|
}
|
|
17
17
|
build() {
|
|
18
18
|
if (arena_core_1.Objects.isEmpty(this._tables) || arena_core_1.Objects.isEmpty(this._on))
|
|
19
|
-
throw new Error(`missingParams:
|
|
19
|
+
throw new Error(`missingParams: tables: [${this._tables.join(', ')}], on: [${this._on.join(', ')}]`);
|
|
20
20
|
return `JOIN ${this._tables.join(' ')} ON ${this._on.join(' ')}`;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;IAC3B,OAAO,GAAiB,EAAE,CAAA;IAC1B,GAAG,GAAkB,EAAE,CAAA;IAExC,IAAI,CAAC,KAAY;QACf,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,EAAE,CAAC,SAAiB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACtG,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAClE,CAAC;CACF;AAnBD,wCAmBC"}
|
|
@@ -3,14 +3,14 @@ import { Table } from '../table';
|
|
|
3
3
|
import { SqlBuilder } from './sqlBuilder';
|
|
4
4
|
import { SqlJoinBuilder } from './sqlJoinBuilder';
|
|
5
5
|
export declare class SqlSelectBuilder extends SqlBuilder {
|
|
6
|
-
private _select;
|
|
7
|
-
private _from;
|
|
8
|
-
private _join;
|
|
9
|
-
private _where;
|
|
10
|
-
private _groupBy;
|
|
6
|
+
private readonly _select;
|
|
7
|
+
private readonly _from;
|
|
8
|
+
private readonly _join;
|
|
9
|
+
private readonly _where;
|
|
10
|
+
private readonly _groupBy;
|
|
11
11
|
private _offset;
|
|
12
12
|
private _limit;
|
|
13
|
-
private _orderBy;
|
|
13
|
+
private readonly _orderBy;
|
|
14
14
|
select(...fields: Array<Column | string>): this;
|
|
15
15
|
from(...tables: Array<Table>): this;
|
|
16
16
|
join(...joins: Array<SqlJoinBuilder>): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAI/C,6CAAyC;AAGzC,MAAa,gBAAiB,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { Table } from '../table';
|
|
|
3
3
|
import { Column } from '../column';
|
|
4
4
|
export declare class SqlUpdateBuilder extends SqlBuilder {
|
|
5
5
|
private _update;
|
|
6
|
-
private _set;
|
|
7
|
-
private _where;
|
|
8
|
-
private _returning;
|
|
6
|
+
private readonly _set;
|
|
7
|
+
private readonly _where;
|
|
8
|
+
private readonly _returning;
|
|
9
9
|
update(table: Table): this;
|
|
10
10
|
set(column: Column | string, value: string): this;
|
|
11
11
|
setColumnNames(columnNames: string[]): this;
|
|
@@ -31,8 +31,10 @@ class SqlUpdateBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
31
31
|
return this;
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
|
-
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set))
|
|
35
|
-
|
|
34
|
+
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set)) {
|
|
35
|
+
const setSummary = this._set.map(({ column, value }) => [String(column), value].join(' = ')).join(', ');
|
|
36
|
+
throw new Error(`missingParams, ${this._update}, ${setSummary}`);
|
|
37
|
+
}
|
|
36
38
|
const _getColumnName = (column) => (typeof column === 'string' ? column : column.columnName);
|
|
37
39
|
const _buildSetValue = (params) => {
|
|
38
40
|
const { column, value } = params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAMzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,OAAO,GAAiB,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/job/jobManager.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Worker } from '../thread';
|
|
2
2
|
import { JobContext } from './jobContext';
|
|
3
3
|
export declare class JobManager {
|
|
4
|
-
private static workers;
|
|
4
|
+
private static readonly workers;
|
|
5
5
|
static cancelUserJob(userUuid: string): void;
|
|
6
6
|
private static onMessage;
|
|
7
7
|
static executeJob<C extends JobContext = JobContext>(data: C): Worker<C>;
|
package/dist/job/jobManager.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.JobManager = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const webSocket_1 = require("../webSocket");
|
|
9
9
|
const thread_1 = require("../thread");
|
|
10
10
|
const jobMessage_1 = require("./jobMessage");
|
|
@@ -32,7 +32,7 @@ class JobManager {
|
|
|
32
32
|
}, 1000);
|
|
33
33
|
}
|
|
34
34
|
static executeJob(data) {
|
|
35
|
-
const worker = new thread_1.Worker(
|
|
35
|
+
const worker = new thread_1.Worker(node_path_1.default.resolve(__dirname, 'jobThread.js'), data);
|
|
36
36
|
worker.on('message', JobManager.onMessage);
|
|
37
37
|
JobManager.workers.set(data.user.uuid, worker);
|
|
38
38
|
return worker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobManager.js","sourceRoot":"","sources":["../../src/job/jobManager.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"jobManager.js","sourceRoot":"","sources":["../../src/job/jobManager.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,4CAA8D;AAC9D,sCAAkC;AAClC,6CAAiF;AAGjF,MAAa,UAAU;IACb,MAAM,CAAU,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAA;IAEhE,MAAM,CAAC,aAAa,CAAC,QAAgB;QACnC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,6BAAgB,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,GAAkB;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,8BAAiB,CAAC,SAAS;YAAE,OAAM;QAEpD,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;QACnB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QAC/B,IAAI,CAAC,QAAQ;YAAE,OAAM;QAErB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAE/C,2BAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,0BAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;QAEnE,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;YAAE,OAAM;QAG7B,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;QACpE,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CAAC,UAAU,CAAoC,IAAO;QAC1D,MAAM,MAAM,GAAG,IAAI,eAAM,CAAI,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3E,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;QAC1C,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC9C,OAAO,MAAM,CAAA;IACf,CAAC;;AAjCH,gCAkCC"}
|
package/dist/job/jobThread.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { JobContext } from './jobContext';
|
|
|
3
3
|
import { JobMessageIn, JobMessageOut } from './jobMessage';
|
|
4
4
|
export declare class JobThread<C extends JobContext> extends Thread<JobMessageIn, JobMessageOut, C> {
|
|
5
5
|
private job;
|
|
6
|
-
startJob(): void
|
|
6
|
+
startJob(): Promise<void>;
|
|
7
7
|
onMessage(msg: JobMessageIn): Promise<void>;
|
|
8
8
|
private postJob;
|
|
9
9
|
}
|
package/dist/job/jobThread.js
CHANGED
|
@@ -1,22 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.JobThread = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_worker_threads_1 = require("node:worker_threads");
|
|
5
5
|
const server_1 = require("../server");
|
|
6
6
|
const thread_1 = require("../thread");
|
|
7
7
|
const jobMessage_1 = require("./jobMessage");
|
|
8
8
|
const jobRegistry_1 = require("./jobRegistry");
|
|
9
9
|
class JobThread extends thread_1.Thread {
|
|
10
10
|
job;
|
|
11
|
-
startJob() {
|
|
12
|
-
|
|
11
|
+
async startJob() {
|
|
12
|
+
try {
|
|
13
|
+
const jobRegistry = await jobRegistry_1.JobRegistry.getInstance();
|
|
13
14
|
const Job = jobRegistry.get(this.data.type);
|
|
14
15
|
if (!Job)
|
|
15
16
|
throw new server_1.ServerError('jobNotRegistered', this.data);
|
|
16
17
|
this.job = new Job(this.data);
|
|
17
18
|
this.job.onEvent(() => this.postJob());
|
|
18
|
-
this.job.start();
|
|
19
|
-
}
|
|
19
|
+
await this.job.start();
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
this.logger.error(`Error starting job: ${error.toString()}`);
|
|
23
|
+
this.postMessage({ error, type: thread_1.WorkerMessageType.error });
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
async onMessage(msg) {
|
|
22
27
|
switch (msg.type) {
|
|
@@ -37,6 +42,6 @@ class JobThread extends thread_1.Thread {
|
|
|
37
42
|
}
|
|
38
43
|
}
|
|
39
44
|
exports.JobThread = JobThread;
|
|
40
|
-
if (!
|
|
41
|
-
new JobThread().startJob();
|
|
45
|
+
if (!node_worker_threads_1.isMainThread)
|
|
46
|
+
void new JobThread().startJob();
|
|
42
47
|
//# sourceMappingURL=jobThread.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobThread.js","sourceRoot":"","sources":["../../src/job/jobThread.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"jobThread.js","sourceRoot":"","sources":["../../src/job/jobThread.ts"],"names":[],"mappings":";;;AAAA,6DAAkD;AAElD,sCAAuC;AACvC,sCAAqD;AAGrD,6CAA+F;AAC/F,+CAA2C;AAE3C,MAAa,SAAgC,SAAQ,eAAsC;IACjF,GAAG,CAAiC;IAE5C,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,yBAAW,CAAC,WAAW,EAAE,CAAA;YACnD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3C,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,oBAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAE9D,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC7B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YACtC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;QACxB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;YAC5D,IAAI,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAiB,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAiB;QAC/B,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,6BAAgB,CAAC,SAAS;gBAC7B,IAAI,CAAC,OAAO,EAAE,CAAA;gBACd,MAAK;YACP,KAAK,6BAAgB,CAAC,MAAM;gBAC1B,MAAM,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAA;gBACxB,MAAK;YACP;gBACE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QACnE,CAAC;IACH,CAAC;IAEO,OAAO;QACb,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,8BAAiB,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACjF,CAAC;IACH,CAAC;CACF;AApCD,8BAoCC;AAED,IAAI,CAAC,kCAAY;IAAE,KAAK,IAAI,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testJobs.js","sourceRoot":"","sources":["../../../src/job/tests/testJobs.ts"],"names":[],"mappings":";;;AAAA,gCAAkC;AAOlC,MAAa,SAAU,SAAQ,eAAmC;IAChE,MAAM,CAAU,IAAI,GAAW,QAAQ,CAAA;IAE7B,KAAK,CAAC,OAAO;QACrB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAA;QAGd,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACxD,IAAI,CAAC,uBAAuB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"testJobs.js","sourceRoot":"","sources":["../../../src/job/tests/testJobs.ts"],"names":[],"mappings":";;;AAAA,gCAAkC;AAOlC,MAAa,SAAU,SAAQ,eAAmC;IAChE,MAAM,CAAU,IAAI,GAAW,QAAQ,CAAA;IAE7B,KAAK,CAAC,OAAO;QACrB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAA;QAGd,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACxD,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAChC,CAAC;IAES,KAAK,CAAC,cAAc;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;IACjC,CAAC;;AAbH,8BAcC;AAED,MAAa,iBAAkB,SAAQ,SAAS;IAC9C,MAAM,CAAU,IAAI,GAAW,gBAAgB,CAAA;IAE/C,YAAY,IAAsB;QAChC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC7F,CAAC;IAES,KAAK,CAAC,cAAc;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAS,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACpF,CAAC;;AATH,8CAUC"}
|
|
@@ -5,7 +5,7 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
5
5
|
const db_1 = require("../../db");
|
|
6
6
|
const getMany = (options, client = db_1.DB) => {
|
|
7
7
|
if (!('userUuid' in options))
|
|
8
|
-
throw new Error(`missingParams, ${options}`);
|
|
8
|
+
throw new Error(`missingParams, ${JSON.stringify(options)}`);
|
|
9
9
|
const { userUuid } = options;
|
|
10
10
|
const tableAuthGroup = new db_1.TableAuthGroup();
|
|
11
11
|
const tableAuthGroupUser = new db_1.TableAuthGroupUser();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMany.js","sourceRoot":"","sources":["../../../src/repository/authGroup/getMany.ts"],"names":[],"mappings":";;;AAAA,sDAA8D;AAC9D,iCAAiH;AAE1G,MAAM,OAAO,GAAG,CAAC,OAA6B,EAAE,SAAuB,OAAE,EAA4B,EAAE;IAC5G,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"getMany.js","sourceRoot":"","sources":["../../../src/repository/authGroup/getMany.ts"],"names":[],"mappings":";;;AAAA,sDAA8D;AAC9D,iCAAiH;AAE1G,MAAM,OAAO,GAAG,CAAC,OAA6B,EAAE,SAAuB,OAAE,EAA4B,EAAE;IAC5G,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC1F,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAE5B,MAAM,cAAc,GAAG,IAAI,mBAAc,EAAE,CAAA;IAC3C,MAAM,kBAAkB,GAAG,IAAI,uBAAkB,EAAE,CAAA;IAEnD,MAAM,UAAU,GAAG,IAAI,mBAAc,EAAE;SACpC,IAAI,CAAC,cAAc,CAAC;SACpB,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,MAAM,kBAAkB,CAAC,SAAS,EAAE,CAAC,CAAA;IAEjE,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,MAAM,CACL,cAAc,CAAC,IAAI,EACnB,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,IAAI,EACnB,cAAc,CAAC,WAAW,EAC1B,cAAc,CAAC,WAAW,EAC1B,kBAAkB,CAAC,KAAK,CACzB;SACA,IAAI,CAAC,kBAAkB,CAAC;SACxB,IAAI,CAAC,UAAU,CAAC;SAChB,KAAK,CAAC,GAAG,kBAAkB,CAAC,QAAQ,OAAO,CAAC;SAC5C,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAgB,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,oBAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACxG,CAAC,CAAA;AA1BY,QAAA,OAAO,WA0BnB"}
|
|
@@ -5,7 +5,7 @@ const db_1 = require("../../db");
|
|
|
5
5
|
const deleteItem = (params, client = db_1.DB) => {
|
|
6
6
|
const { surveyId, uuid } = params;
|
|
7
7
|
if (!surveyId || !uuid)
|
|
8
|
-
throw new Error(`missingParams, ${params}`);
|
|
8
|
+
throw new Error(`missingParams, ${JSON.stringify(params)}`);
|
|
9
9
|
const table = new db_1.TableDataQuery(surveyId);
|
|
10
10
|
const values = {
|
|
11
11
|
[table.uuid.columnName]: uuid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/delete.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAE3E,MAAM,UAAU,GAAG,CACxB,MAA0C,EAC1C,SAAuB,OAAE,EACS,EAAE;IACpC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IACjC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/delete.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAE3E,MAAM,UAAU,GAAG,CACxB,MAA0C,EAC1C,SAAuB,OAAE,EACS,EAAE;IACpC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IACjC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAEnF,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAE1C,MAAM,MAAM,GAAG;QACb,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI;KAC9B,CAAA;IAED,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,UAAU,CAAC,KAAK,CAAC;SACjB,KAAK,CAAC,MAAM,CAAC;SACb,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,SAAS,CAAmB,GAAG,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AACjG,CAAC,CAAA;AApBY,QAAA,UAAU,cAoBtB"}
|
|
@@ -5,7 +5,7 @@ const db_1 = require("../../db");
|
|
|
5
5
|
const insert = (params, client = db_1.DB) => {
|
|
6
6
|
const { surveyId, item } = params;
|
|
7
7
|
if (!surveyId || !item)
|
|
8
|
-
throw new Error(`missingParams, ${params}`);
|
|
8
|
+
throw new Error(`missingParams, ${JSON.stringify(params)}`);
|
|
9
9
|
const table = new db_1.TableDataQuery(surveyId);
|
|
10
10
|
const { content, props, uuid } = item;
|
|
11
11
|
const values = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/insert.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAE3E,MAAM,MAAM,GAAG,CACpB,MAAoD,EACpD,SAAuB,OAAE,EACE,EAAE;IAC7B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IACjC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/insert.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAE3E,MAAM,MAAM,GAAG,CACpB,MAAoD,EACpD,SAAuB,OAAE,EACE,EAAE;IAC7B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IACjC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAEnF,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IAErC,MAAM,MAAM,GAAG;QACb,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO;QACnC,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK;QAC/B,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI;KAC9B,CAAA;IAED,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,UAAU,CAAC,KAAK,CAAC;SACjB,cAAc,CAAC,MAAM,CAAC;SACtB,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAmB,GAAG,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC3F,CAAC,CAAA;AAvBY,QAAA,MAAM,UAuBlB"}
|
|
@@ -13,7 +13,7 @@ exports.count = count;
|
|
|
13
13
|
const getAll = (params, client = db_1.DB) => {
|
|
14
14
|
const { surveyId } = params;
|
|
15
15
|
if (!surveyId)
|
|
16
|
-
throw new Error(`missingParams, ${params}`);
|
|
16
|
+
throw new Error(`missingParams, ${JSON.stringify(params)}`);
|
|
17
17
|
const table = new db_1.TableDataQuery(surveyId);
|
|
18
18
|
const sql = new db_1.SqlSelectBuilder()
|
|
19
19
|
.select(table.id, table.uuid, table.props, table.dateCreated, table.dateModified)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/read.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAClF,sCAAoD;AAE7C,MAAM,KAAK,GAAG,CAAC,MAA4B,EAAE,SAAuB,OAAE,EAAmB,EAAE;IAChG,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC3B,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,GAAG,GAAG,IAAI,2BAAqB,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAA;IACtE,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,QAAG,CAAC,sBAAsB,CAAC,CAAA;AACxD,CAAC,CAAA;AALY,QAAA,KAAK,SAKjB;AAEM,MAAM,MAAM,GAAG,CAAC,MAA4B,EAAE,SAAuB,OAAE,EAA+B,EAAE;IAC7G,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC3B,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/repository/dataQuery/read.ts"],"names":[],"mappings":";;;AAEA,iCAAkF;AAClF,sCAAoD;AAE7C,MAAM,KAAK,GAAG,CAAC,MAA4B,EAAE,SAAuB,OAAE,EAAmB,EAAE;IAChG,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC3B,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,GAAG,GAAG,IAAI,2BAAqB,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAA;IACtE,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,QAAG,CAAC,sBAAsB,CAAC,CAAA;AACxD,CAAC,CAAA;AALY,QAAA,KAAK,SAKjB;AAEM,MAAM,MAAM,GAAG,CAAC,MAA4B,EAAE,SAAuB,OAAE,EAA+B,EAAE;IAC7G,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC3B,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAE1E,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAE1C,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;SAChF,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAmB,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC/F,CAAC,CAAA;AAZY,QAAA,MAAM,UAYlB;AAQM,MAAM,SAAS,GAAG,KAAK,EAC5B,MAGC,EACD,SAAuB,OAAE,EACE,EAAE;IAC7B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IAEjC,MAAM,KAAK,GAAG,IAAI,mBAAc,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;SAC/F,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC;SAC3B,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CACvD,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CACjE,CAAA;AACH,CAAC,CAAA;AAnBY,QAAA,SAAS,aAmBrB"}
|
|
@@ -9,7 +9,7 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
9
9
|
const db_1 = require("../../db");
|
|
10
10
|
const get = async (options, client = db_1.DB) => {
|
|
11
11
|
if (!('userUuid' in options) && !('email' in options))
|
|
12
|
-
throw new Error(`missingParams, ${options}`);
|
|
12
|
+
throw new Error(`missingParams, ${JSON.stringify(options)}`);
|
|
13
13
|
const table = new db_1.TableUser();
|
|
14
14
|
const selectFields = [table.uuid, table.name, table.email, table.prefs, table.status, table.props];
|
|
15
15
|
let filterByValue = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/repository/user/get.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA6B;AAC7B,sDAAwD;AAExD,iCAAwE;AAUjE,MAAM,GAAG,GAAG,KAAK,EAAE,OAAuB,EAAE,SAAuB,OAAE,EAAwB,EAAE;IACpG,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/repository/user/get.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA6B;AAC7B,sDAAwD;AAExD,iCAAwE;AAUjE,MAAM,GAAG,GAAG,KAAK,EAAE,OAAuB,EAAE,SAAuB,OAAE,EAAwB,EAAE;IACpG,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAEnH,MAAM,KAAK,GAAG,IAAI,cAAS,EAAE,CAAA;IAC7B,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAClG,IAAI,aAAa,GAAG,EAAE,CAAA;IACtB,IAAI,cAAc,CAAA;IAClB,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;QAC1B,aAAa,GAAG,OAAO,CAAC,KAAK,CAAA;QAC7B,cAAc,GAAG,KAAK,CAAC,KAAK,CAAA;QAG5B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACnC,CAAC;SAAM,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;QACjC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,cAAc,GAAG,KAAK,CAAC,IAAI,CAAA;IAC7B,CAAC;SAAM,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QAC9B,aAAa,GAAG,OAAO,CAAC,KAAK,CAAA;QAC7B,cAAc,GAAG,KAAK,CAAC,KAAK,CAAA;IAC9B,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,MAAM,CAAC,GAAG,YAAY,CAAC;SACvB,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,CAAC,GAAG,cAAc,OAAO,CAAC;SAC/B,KAAK,EAAE,CAAA;IAEV,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAC/D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACjC,IACE,UAAU,IAAI,OAAO;QACrB,CAAC,MAAM,KAAK,uBAAU,CAAC,QAAQ,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,kBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACpG,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AA3CY,QAAA,GAAG,OA2Cf"}
|
|
@@ -4,7 +4,7 @@ exports.hasValidResetPassword = void 0;
|
|
|
4
4
|
const db_1 = require("../../db");
|
|
5
5
|
const hasValidResetPassword = (options, client = db_1.DB) => {
|
|
6
6
|
if (!('userUuid' in options))
|
|
7
|
-
throw new Error(`missingParams, ${options}`);
|
|
7
|
+
throw new Error(`missingParams, ${JSON.stringify(options)}`);
|
|
8
8
|
const { userUuid } = options;
|
|
9
9
|
const table = new db_1.TableUserResetPassword();
|
|
10
10
|
const expiredCondition = `date_created < NOW() - INTERVAL '168 HOURS'`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasValidResetPassword.js","sourceRoot":"","sources":["../../../src/repository/userResetPassword/hasValidResetPassword.ts"],"names":[],"mappings":";;;AAAA,iCAAqF;AAE9E,MAAM,qBAAqB,GAAG,CAAC,OAA6B,EAAE,SAAuB,OAAE,EAAoB,EAAE;IAClH,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"hasValidResetPassword.js","sourceRoot":"","sources":["../../../src/repository/userResetPassword/hasValidResetPassword.ts"],"names":[],"mappings":";;;AAAA,iCAAqF;AAE9E,MAAM,qBAAqB,GAAG,CAAC,OAA6B,EAAE,SAAuB,OAAE,EAAoB,EAAE;IAClH,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC1F,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAC5B,MAAM,KAAK,GAAG,IAAI,2BAAsB,EAAE,CAAA;IAE1C,MAAM,gBAAgB,GAAG,6CAA6C,CAAA;IACtE,MAAM,GAAG,GAAG,IAAI,qBAAgB,EAAE;SAC/B,MAAM,CAAC,wBAAwB,CAAC;SAChC,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,iBAAiB,gBAAgB,EAAE,CAAC;SAC3D,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAA;AACrE,CAAC,CAAA;AAbY,QAAA,qBAAqB,yBAajC"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.start = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_http_1 = __importDefault(require("node:http"));
|
|
8
8
|
const terminus_1 = require("@godaddy/terminus");
|
|
9
9
|
const db_1 = require("../../db");
|
|
10
10
|
const log_1 = require("../../log");
|
|
@@ -15,7 +15,7 @@ const logger = new log_1.Logger('Arena server');
|
|
|
15
15
|
const start = async (app) => {
|
|
16
16
|
logger.info(`server starting`);
|
|
17
17
|
const port = processEnv_1.ProcessEnv.arenaPort;
|
|
18
|
-
const server =
|
|
18
|
+
const server = node_http_1.default.createServer(app.express);
|
|
19
19
|
(0, terminus_1.createTerminus)(server, {
|
|
20
20
|
healthChecks: {
|
|
21
21
|
'/healthcheck': async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/arenaServer/start.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/arenaServer/start.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAwC;AACxC,gDAAkD;AAElD,iCAA6B;AAC7B,mCAAkC;AAClC,iDAA6C;AAC7C,+CAAiD;AAEjD,iCAAmC;AAEnC,MAAM,MAAM,GAAW,IAAI,YAAM,CAAC,cAAc,CAAC,CAAA;AAE1C,MAAM,KAAK,GAAG,KAAK,EAAE,GAAa,EAAmB,EAAE;IAC5D,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,uBAAU,CAAC,SAAS,CAAA;IAEjC,MAAM,MAAM,GAAW,mBAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAErD,IAAA,yBAAc,EAAC,MAAM,EAAE;QACrB,YAAY,EAAE;YACZ,cAAc,EAAE,KAAK,IAAI,EAAE;gBACzB,MAAM,OAAE,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;YAC9C,CAAC;SACF;QACD,UAAU,EAAV,iBAAU;KACX,CAAC,CAAA;IAMF,MAAM,2BAAe,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAEvC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,WAAW,GAAG,GAAG,EAAE;YAKvB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAEvC,MAAM,CAAC,IAAI,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAA;YAE3D,OAAO,CAAC,MAAM,CAAC,CAAA;QACjB,CAAC,CAAA;QAED,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YAE/C,MAAM,CAAC,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;YAE/C,MAAM,CAAC,KAAK,CAAC,CAAA;QACf,CAAC,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;QAErC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AA/CY,QAAA,KAAK,SA+CjB"}
|
|
@@ -7,7 +7,7 @@ const types_1 = require("../../repository/info/types");
|
|
|
7
7
|
const defaultVersion = '2.0.0';
|
|
8
8
|
const upsert = async (item) => {
|
|
9
9
|
const oldItem = await info_1.InfoRepository.getByKey(item.key);
|
|
10
|
-
if (oldItem
|
|
10
|
+
if (oldItem?.value === item.value) {
|
|
11
11
|
return oldItem;
|
|
12
12
|
}
|
|
13
13
|
return info_1.InfoRepository.upsert(item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/info/index.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,gDAAsD;AACtD,uDAAmE;AAEnE,MAAM,cAAc,GAAG,OAAO,CAAA;AAE9B,MAAM,MAAM,GAAG,KAAK,EAAE,IAAc,EAAqB,EAAE;IACzD,MAAM,OAAO,GAAG,MAAM,qBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/info/index.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,gDAAsD;AACtD,uDAAmE;AAEnE,MAAM,cAAc,GAAG,OAAO,CAAA;AAE9B,MAAM,MAAM,GAAG,KAAK,EAAE,IAAc,EAAqB,EAAE;IACzD,MAAM,OAAO,GAAG,MAAM,qBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,IAAI,OAAO,EAAE,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,OAAO,qBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,KAAK,IAAqB,EAAE,CAC7C,CAAC,MAAM,qBAAc,CAAC,QAAQ,CAAC,mBAAW,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,IAAI,cAAc,CAAA;AAElF,MAAM,aAAa,GAAG,KAAK,IAAuB,EAAE,CAClD,MAAM,CAAC,EAAE,GAAG,EAAE,mBAAW,CAAC,UAAU,EAAE,KAAK,EAAE,uBAAU,CAAC,kBAAkB,EAAE,CAAC,CAAA;AAOlE,QAAA,iBAAiB,GAAgB;IAC5C,UAAU;IACV,aAAa;CACd,CAAA"}
|
|
@@ -2,7 +2,7 @@ import type { Node as ArenaNode, NodeDefEntity } from '@openforis/arena-core';
|
|
|
2
2
|
import type { SurveyDocRenderer } from './SurveyDocRenderer';
|
|
3
3
|
import type { PrintOrientation, RenderContext, SurveyDocOptions, SurveyDocSection } from './types';
|
|
4
4
|
declare class SectionBuilder<T> {
|
|
5
|
-
private sections;
|
|
5
|
+
private readonly sections;
|
|
6
6
|
private current;
|
|
7
7
|
constructor(initial: PrintOrientation);
|
|
8
8
|
push(...els: T[]): void;
|
|
@@ -73,7 +73,8 @@ const computeGridDimensions = (layoutChildren) => {
|
|
|
73
73
|
}
|
|
74
74
|
return { maxX, maxY };
|
|
75
75
|
};
|
|
76
|
-
const renderGridCellContent = async (
|
|
76
|
+
const renderGridCellContent = async (params) => {
|
|
77
|
+
const { renderer, nodeDef, item, context, depth, parentEntityNode, maxX, walkOptions } = params;
|
|
77
78
|
if (arena_core_1.NodeDefs.isEntity(nodeDef)) {
|
|
78
79
|
return (0, exports.walkEntityDef)(renderer, nodeDef, context, depth + 1, parentEntityNode, undefined, walkOptions);
|
|
79
80
|
}
|
|
@@ -116,7 +117,16 @@ const walkEntityChildrenGrid = async (renderer, entityDef, context, depth, paren
|
|
|
116
117
|
const h = item.h ?? 1;
|
|
117
118
|
markSpannedCells(skip, x, y, w, h);
|
|
118
119
|
pending.push({
|
|
119
|
-
promise: renderGridCellContent(
|
|
120
|
+
promise: renderGridCellContent({
|
|
121
|
+
renderer,
|
|
122
|
+
nodeDef,
|
|
123
|
+
item,
|
|
124
|
+
context,
|
|
125
|
+
depth,
|
|
126
|
+
parentEntityNode,
|
|
127
|
+
maxX,
|
|
128
|
+
walkOptions: gridCellWalkOptions,
|
|
129
|
+
}),
|
|
120
130
|
colSpan: w > 1 ? w : undefined,
|
|
121
131
|
rowSpan: h > 1 ? h : undefined,
|
|
122
132
|
});
|
|
@@ -132,7 +142,7 @@ const isChildEntityOnOwnPage = (cycle, parentEntityDef, childEntityDef) => {
|
|
|
132
142
|
return Boolean(childPageUuid && childPageUuid !== parentPageUuid);
|
|
133
143
|
};
|
|
134
144
|
const walkEntityChildrenDefault = async (renderer, entityDef, context, depth, parentEntityNode, walkOptions) => {
|
|
135
|
-
const { survey, cycle
|
|
145
|
+
const { survey, cycle } = context;
|
|
136
146
|
const parentEntity = entityDef;
|
|
137
147
|
const children = arena_core_1.Surveys.getNodeDefChildrenSorted({
|
|
138
148
|
survey,
|
|
@@ -143,25 +153,24 @@ const walkEntityChildrenDefault = async (renderer, entityDef, context, depth, pa
|
|
|
143
153
|
});
|
|
144
154
|
const result = [];
|
|
145
155
|
for (const child of children) {
|
|
146
|
-
|
|
147
|
-
if (isChildEntityOnOwnPage(cycle, parentEntity, child))
|
|
148
|
-
continue;
|
|
149
|
-
appendElements(result, await (0, exports.walkEntityDef)(renderer, child, context, depth + 1, parentEntityNode, undefined, walkOptions), walkOptions);
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
if (arena_core_1.NodeDefs.isHidden(child))
|
|
153
|
-
continue;
|
|
154
|
-
let childNode;
|
|
155
|
-
if (record && parentEntityNode) {
|
|
156
|
-
childNode = arena_core_1.Records.getChildren(parentEntityNode, child.uuid)(record)[0];
|
|
157
|
-
}
|
|
158
|
-
if (record && childNode && !isNodeRelevantAndVisible(record, childNode))
|
|
159
|
-
continue;
|
|
160
|
-
appendElements(result, await renderer.renderAttribute({ nodeDef: child, context, depth, node: childNode }), walkOptions);
|
|
161
|
-
}
|
|
156
|
+
appendElements(result, await walkDefaultChild(renderer, parentEntity, child, context, depth, parentEntityNode, walkOptions), walkOptions);
|
|
162
157
|
}
|
|
163
158
|
return result;
|
|
164
159
|
};
|
|
160
|
+
const walkDefaultChild = async (renderer, parentEntity, child, context, depth, parentEntityNode, walkOptions) => {
|
|
161
|
+
const { cycle, record } = context;
|
|
162
|
+
if (arena_core_1.NodeDefs.isEntity(child)) {
|
|
163
|
+
if (isChildEntityOnOwnPage(cycle, parentEntity, child))
|
|
164
|
+
return [];
|
|
165
|
+
return (0, exports.walkEntityDef)(renderer, child, context, depth + 1, parentEntityNode, undefined, walkOptions);
|
|
166
|
+
}
|
|
167
|
+
if (arena_core_1.NodeDefs.isHidden(child))
|
|
168
|
+
return [];
|
|
169
|
+
const childNode = record && parentEntityNode ? arena_core_1.Records.getChildren(parentEntityNode, child.uuid)(record)[0] : undefined;
|
|
170
|
+
if (record && childNode && !isNodeRelevantAndVisible(record, childNode))
|
|
171
|
+
return [];
|
|
172
|
+
return renderer.renderAttribute({ nodeDef: child, context, depth, node: childNode });
|
|
173
|
+
};
|
|
165
174
|
const walkEntityAsTable = (renderer, entityDef, context, parentEntityNode) => {
|
|
166
175
|
const { survey, lang, cycle, record } = context;
|
|
167
176
|
const attrDefs = arena_core_1.Surveys.getNodeDefChildrenSorted({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SurveyDocWalker.js","sourceRoot":"","sources":["../../../../src/service/survey/docExport/SurveyDocWalker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SurveyDocWalker.js","sourceRoot":"","sources":["../../../../src/service/survey/docExport/SurveyDocWalker.ts"],"names":[],"mappings":";;;AACA,sDAAwF;AAExF,qCAAmE;AACnE,yDAAuF;AAMvF,MAAM,cAAc;IACD,QAAQ,GAA0B,EAAE,CAAA;IAC7C,OAAO,CAAqB;IAEpC,YAAY,OAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACvD,CAAC;IAED,IAAI,CAAC,GAAG,GAAQ;QACd,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;IACpC,CAAC;IAED,iBAAiB,CAAC,IAAsB;QACtC,IAAI,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW;YAAE,OAAM;QAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACtE,IAAI,CAAC,OAAO,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACpD,CAAC;IAGD,qBAAqB;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACtE,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AAQD,MAAM,cAAc,GAAG,CAAI,MAAW,EAAE,QAAa,EAAE,WAA4B,EAAQ,EAAE;IAC3F,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAM;IACjC,IAAI,WAAW,EAAE,cAAc,EAAE,CAAC;QAChC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC,CAAA;AAGD,MAAM,qBAAqB,GAAG,CAAI,WAA4B,EAA8B,EAAE;IAC5F,IAAI,CAAC,WAAW,EAAE,cAAc;QAAE,OAAO,WAAW,CAAA;IACpD,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAA;IAChE,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAID,MAAM,wBAAwB,GAAG,CAAC,MAAmB,EAAE,IAAe,EAAW,EAAE,CACjF,oBAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,oBAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AAMvF,MAAM,SAAS,GAAG,CAChB,cAA4C,EAC5C,cAAoD,EACpD,IAAY,EACZ,IAAY,EACmB,EAAE;IACjC,MAAM,IAAI,GAAkC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC1G,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,OAAO;YAAE,SAAQ;QACtB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC1C,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,IAAiB,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAQ,EAAE;IAC/F,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC;QAC9B,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC;YAC9B,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;gBAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAA;QACvD,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAID,MAAM,qBAAqB,GAAG,CAAC,cAA4C,EAAkC,EAAE;IAC7G,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC7C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC/C,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,KAAK,EAAK,MASvC,EAAgB,EAAE;IACjB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;IAC/F,IAAI,qBAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAA,qBAAa,EAClB,QAAQ,EACR,OAAwB,EACxB,OAAO,EACP,KAAK,GAAG,CAAC,EACT,gBAAgB,EAChB,SAAS,EACT,WAAW,CACZ,CAAA;IACH,CAAC;IACD,IAAI,qBAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAA;IACzC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,MAAM,SAAS,GACb,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC,oBAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACzG,IAAI,MAAM,IAAI,SAAS,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,SAAS,CAAC;QAAE,OAAO,EAAE,CAAA;IAClF,OAAO,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAA;AACvF,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,KAAK,EAClC,QAA8B,EAC9B,SAAwB,EACxB,OAAsB,EACtB,KAAa,EACb,gBAA4B,EAC5B,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IACjC,MAAM,cAAc,GAAG,qBAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,CAAiC,CAAA;IAEnG,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CACvC,oBAAO,CAAC,wBAAwB,CAAC;QAC/B,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,KAAK;QACL,eAAe,EAAE,KAAK;QACtB,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CACjC,CAAA;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAA;IAC5D,MAAM,IAAI,GAAG,SAAS,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAClE,MAAM,IAAI,GAAgB,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IAIzF,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAA;IAC9D,MAAM,QAAQ,GAAsB,EAAE,CAAA;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAkB,EAAE,CAAA;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAAE,SAAQ;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;gBAC9C,SAAQ;YACV,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YAC9B,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;YACrB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;YACrB,gBAAgB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,qBAAqB,CAAC;oBAC7B,QAAQ;oBACR,OAAO;oBACP,IAAI;oBACJ,OAAO;oBACP,KAAK;oBACL,gBAAgB;oBAChB,IAAI;oBACJ,WAAW,EAAE,mBAAmB;iBACjC,CAAC;gBACF,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9B,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;aAC/B,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QACjE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;IACtH,CAAC;IAED,OAAO,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;AACjD,CAAC,CAAA;AAID,MAAM,sBAAsB,GAAG,CAC7B,KAAa,EACb,eAA8B,EAC9B,cAA6B,EACpB,EAAE;IACX,MAAM,cAAc,GAAG,qBAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAA;IACnE,MAAM,aAAa,GAAG,qBAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,CAAA;IACjE,OAAO,OAAO,CAAC,aAAa,IAAI,aAAa,KAAK,cAAc,CAAC,CAAA;AACnE,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,KAAK,EACrC,QAA8B,EAC9B,SAA+B,EAC/B,OAAsB,EACtB,KAAa,EACb,gBAA4B,EAC5B,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IACjC,MAAM,YAAY,GAAG,SAA0B,CAAA;IAC/C,MAAM,QAAQ,GAAG,oBAAO,CAAC,wBAAwB,CAAC;QAChD,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,KAAK;QACL,eAAe,EAAE,KAAK;QACtB,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAA;IACF,MAAM,MAAM,GAAQ,EAAE,CAAA;IACtB,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,cAAc,CACZ,MAAM,EACN,MAAM,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAC,EACpG,WAAW,CACZ,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC5B,QAA8B,EAC9B,YAA2B,EAC3B,KAA2B,EAC3B,OAAsB,EACtB,KAAa,EACb,gBAA4B,EAC5B,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IACjC,IAAI,qBAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,IAAI,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAsB,CAAC;YAAE,OAAO,EAAE,CAAA;QAClF,OAAO,IAAA,qBAAa,EAAC,QAAQ,EAAE,KAAsB,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;IACtH,CAAC;IACD,IAAI,qBAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACvC,MAAM,SAAS,GACb,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC,oBAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACvG,IAAI,MAAM,IAAI,SAAS,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,SAAS,CAAC;QAAE,OAAO,EAAE,CAAA;IAClF,OAAO,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;AACtF,CAAC,CAAA;AAID,MAAM,iBAAiB,GAAG,CACxB,QAA8B,EAC9B,SAAwB,EACxB,OAAsB,EACtB,gBAA4B,EACvB,EAAE;IACP,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC/C,MAAM,QAAQ,GAAG,oBAAO,CAAC,wBAAwB,CAAC;QAChD,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,KAAK;QACL,eAAe,EAAE,KAAK;QACtB,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IAExE,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAK,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAEzD,IAAI,IAAI,GAAe,EAAE,CAAA;IACzB,IAAI,MAAM,IAAI,gBAAgB,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,oBAAO,CAAC,WAAW,CACrC,gBAAgB,EAChB,SAAS,CAAC,IAAI,CACf,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QAClE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACpC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACvB,MAAM,QAAQ,GAAG,oBAAO,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;gBACzE,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,wBAAe,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACpE,CAAC,CAAC,CACH,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAClD,CAAC,CAAA;AAIM,MAAM,kBAAkB,GAAG,KAAK,EACrC,QAA8B,EAC9B,SAAwB,EACxB,OAAsB,EACtB,KAAa,EACb,gBAA4B,EAC5B,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IACjC,MAAM,SAAS,GAAG,oBAAO,CAAC,wBAAwB,CAAC;QACjD,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,KAAK;QACL,eAAe,EAAE,KAAK;QACtB,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,qBAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAA;IAC9D,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,qBAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAAoB,CAAC,KAAK,eAAe,CACtF,CAAA;IAEpB,MAAM,cAAc,GAAG,qBAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAA;IACnE,MAAM,MAAM,GACV,cAAc,CAAC,MAAM,GAAG,CAAC;QACvB,CAAC,CAAC,MAAM,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAC;QAClG,CAAC,CAAC,MAAM,yBAAyB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAA;IAEzG,IAAI,WAAW,EAAE,sBAAsB,KAAK,KAAK,EAAE,CAAC;QAClD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,eAAe,GAAG,WAAW,EAAE,eAAe,IAAI,4CAAyB,CAAA;IACjF,IAAI,WAAW,EAAE,cAAc,EAAE,CAAC;QAChC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;IAC5C,CAAC;IACD,KAAK,MAAM,cAAc,IAAI,mBAAmB,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,IAAA,0CAAuB,EAAC,cAAc,EAAE,eAAe,CAAC,CAAA;QACjF,WAAW,EAAE,cAAc,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;QAChE,MAAM,aAAa,GAAG,MAAM,IAAA,qBAAa,EACvC,QAAQ,EACR,cAAc,EACd,OAAO,EACP,KAAK,GAAG,CAAC,EACT,gBAAgB,EAChB,IAAI,EACJ,WAAW,CACZ,CAAA;QACD,IAAI,WAAW,EAAE,cAAc,EAAE,CAAC;YAChC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAA;QACnD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IACD,IAAI,WAAW,EAAE,cAAc,EAAE,CAAC;QAChC,OAAO,EAAE,CAAA;IACX,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAzDY,QAAA,kBAAkB,sBAyD9B;AAID,MAAM,eAAe,GAAG,KAAK,EAC3B,QAA8B,EAC9B,WAAwB,EACxB,SAAwB,EACxB,OAAsB,EACtB,KAAa,EACb,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;IAChH,MAAM,MAAM,GAAQ,EAAE,CAAA;IACtB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;QACtC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,cAAc,CACZ,MAAM,EACN,QAAQ,CAAC,2BAA2B,CAAC,GAAG,IAAA,cAAK,EAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,EAC9F,WAAW,CACZ,CAAA;QACH,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9G,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAIM,MAAM,aAAa,GAAG,KAAK,EAChC,QAA8B,EAC9B,SAAwB,EACxB,OAAsB,EACtB,KAAa,EACb,gBAA4B,EAC5B,UAAoB,EACpB,WAA4B,EACd,EAAE;IAChB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,MAAM,MAAM,GAAG,qBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,qBAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAEhE,MAAM,WAAW,GACf,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC,oBAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEjG,IAAI,CAAC,MAAM,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpH,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,MAAM,GAAQ,EAAE,CAAA;IAEtB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,aAAa,GAAG,WAAW,EAAE,cAAc,EAAE,qBAAqB,EAAE,IAAI,KAAK,CAAA;QACnF,MAAM,SAAS,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC,UAAU,IAAI,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAA;QAChF,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,IAAA,cAAK,EAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,CAAA;IACrH,CAAC;IAED,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;QAChC,cAAc,CAAC,MAAM,EAAE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,WAAW,CAAC,CAAA;IACxG,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;QACxG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;QAChH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9G,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AA1CY,QAAA,aAAa,iBA0CzB;AAID,MAAM,wBAAwB,GAAG,CAC/B,OAAyB,EACzB,OAAsB,EAC+B,EAAE;IACvD,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAAA;IACjD,IAAI,CAAC,aAAa,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;IACrF,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAC/D,CAAC;IACD,MAAM,SAAS,GAAG,oBAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;IAC3E,MAAM,UAAU,GAAG,oBAAO,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;IAChE,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,IAAI,CAAC,qBAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IACD,IAAI,UAAU,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAA;IACnF,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,SAA0B,EAAE,UAAU,EAAE,CAAA;AAC9D,CAAC,CAAA;AAEM,MAAM,UAAU,GAAG,KAAK,EAC7B,OAAyB,EACzB,QAA8B,EACoC,EAAE;IACpE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACtD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,oBAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,oBAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,oBAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACpG,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAA;IAClF,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,IAAI,4CAAyB,CAAA;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,MAAM,CAAA;IAEjD,MAAM,UAAU,GAAG,oBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAE1C,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QAClC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC5E,MAAM,WAAW,GAAG,IAAA,0CAAuB,EAAC,SAAS,EAAE,eAAe,CAAC,CAAA;QACvE,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC1C,MAAM,QAAQ,GAAQ;YACpB,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,CAAC;YAC3C,GAAG,CAAC,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE;gBACxE,sBAAsB,EAAE,KAAK;gBAC7B,eAAe;aAChB,CAAC,CAAC;SACJ,CAAA;QACD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAA;IAC9D,CAAC;IAED,MAAM,WAAW,GAAG,oBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,iBAAiB,GAAG,oBAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,oBAAO,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,oBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,MAAM,eAAe,GAAG,IAAA,0CAAuB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IACzE,MAAM,cAAc,GAAG,IAAI,cAAc,CAAI,eAAe,CAAC,CAAA;IAC7D,MAAM,WAAW,GAAmB,EAAE,cAAc,EAAE,eAAe,EAAE,CAAA;IAEvE,cAAc,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,IAAI,UAAU,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAC5F,IAAI,iBAAiB,EAAE,CAAC;QACtB,cAAc,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAA;IACpE,CAAC;IACD,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAE9G,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,CAAA;AAC1D,CAAC,CAAA;AA1CY,QAAA,UAAU,cA0CtB"}
|
package/dist/thread/thread.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Thread = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_worker_threads_1 = require("node:worker_threads");
|
|
5
5
|
const log_1 = require("../log");
|
|
6
6
|
const workerMessage_1 = require("./workerMessage");
|
|
7
7
|
class Thread {
|
|
@@ -9,14 +9,14 @@ class Thread {
|
|
|
9
9
|
data;
|
|
10
10
|
constructor() {
|
|
11
11
|
this.logger = new log_1.Logger(this.constructor.name);
|
|
12
|
-
this.data =
|
|
13
|
-
if (!
|
|
14
|
-
|
|
12
|
+
this.data = node_worker_threads_1.workerData;
|
|
13
|
+
if (!node_worker_threads_1.isMainThread && node_worker_threads_1.parentPort) {
|
|
14
|
+
node_worker_threads_1.parentPort.on('message', this.messageHandler.bind(this));
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
postMessage(msg) {
|
|
18
|
-
if (
|
|
19
|
-
|
|
18
|
+
if (node_worker_threads_1.parentPort) {
|
|
19
|
+
node_worker_threads_1.parentPort.postMessage(msg);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
async messageHandler(msg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/thread/thread.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/thread/thread.ts"],"names":[],"mappings":";;;AAAA,6DAA0E;AAE1E,gCAA+B;AAC/B,mDAAsF;AAEtF,MAAsB,MAAM;IACP,MAAM,CAAQ;IACxB,IAAI,CAAG;IAEhB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,IAAI,GAAG,gCAAU,CAAA;QAEtB,IAAI,CAAC,kCAAY,IAAI,gCAAU,EAAE,CAAC;YAChC,gCAAU,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC1D,CAAC;IACH,CAAC;IAMS,WAAW,CAAC,GAAoC;QACxD,IAAI,gCAAU,EAAE,CAAC;YACf,gCAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QAG7B,CAAC;IACH,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,GAAc;QAC3C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QAC3B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAC9B,IAAI,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,iCAAiB,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;CAOF;AAxCD,wBAwCC"}
|
package/dist/thread/worker.d.ts
CHANGED
package/dist/thread/worker.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Worker = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_worker_threads_1 = require("node:worker_threads");
|
|
5
5
|
const log_1 = require("../log");
|
|
6
|
-
class Worker extends
|
|
6
|
+
class Worker extends node_worker_threads_1.Worker {
|
|
7
7
|
logger;
|
|
8
8
|
constructor(filename, workerData) {
|
|
9
9
|
super(filename, { workerData });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/thread/worker.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/thread/worker.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AAEvD,gCAA+B;AAE/B,MAAa,MAAiB,SAAQ,4BAAO;IAC1B,MAAM,CAAQ;IAE/B,YAAY,QAAgB,EAAE,UAAc;QAC1C,KAAK,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,YAAM,CAAC,uBAAuB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,EAAE,CAAC,KAAsB,EAAE,QAAuC;QAChE,IAAI,KAAK,KAAK,MAAM;YAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAetD,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;CACF;AA1BD,wBA0BC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Server } from 'http';
|
|
1
|
+
import { Server } from 'node:http';
|
|
2
2
|
import { ArenaApp } from '../server';
|
|
3
3
|
export declare class WebSocketServer {
|
|
4
|
-
private static logger;
|
|
5
|
-
private static socketsById;
|
|
6
|
-
private static socketIdsByUserUuid;
|
|
4
|
+
private static readonly logger;
|
|
5
|
+
private static readonly socketsById;
|
|
6
|
+
private static readonly socketIdsByUserUuid;
|
|
7
7
|
private static heartbeatInterval;
|
|
8
8
|
private static ttlSweepInterval;
|
|
9
9
|
private static readonly verifyAuthToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/webSocket/server.ts"],"names":[],"mappings":";;;AACA,yCAA0D;AAE1D,sDAAgH;AAEhH,8CAA4E;AAC5E,8CAAyD;AACzD,gCAA+B;AAE/B,mCAAwC;AAGxC,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACzB,2CAAiB,CAAA;IACjB,uCAAa,CAAA;AACf,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAGD,MAAM,qBAAqB,GAAG,MAAM,CAAA;AAEpC,MAAM,qBAAqB,GAAG,MAAM,CAAA;AAGpC,MAAM,+BAA+B,GAAG,CAAC,GAAG,qBAAqB,CAAA;AACjE,MAAM,mBAAmB,GAAG,4BAA4B,CAAA;AAExD,MAAa,eAAe;IAClB,MAAM,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/webSocket/server.ts"],"names":[],"mappings":"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"}
|