@openforis/arena-server 2.5.3 → 2.6.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/dist/api/auth/login.js +11 -8
- package/dist/api/auth/login.js.map +1 -1
- package/dist/api/middleware/auth.d.ts +7 -7
- package/dist/api/middleware/auth.js +3 -3
- package/dist/api/middleware/auth.js.map +1 -1
- package/dist/api/user2FAAuth/index.js +4 -4
- package/dist/api/user2FAAuth/index.js.map +1 -1
- package/dist/clusterBus/clusterLock.js +1 -1
- package/dist/clusterBus/clusterLock.js.map +1 -1
- package/dist/db/db.js +2 -3
- package/dist/db/db.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/fileStorage/s3Storage.js +9 -7
- package/dist/fileStorage/s3Storage.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 +4 -5
- package/dist/job/tests/testJobs.js.map +1 -1
- package/dist/log/logFileS3Upload.js +4 -4
- package/dist/log/logFileS3Upload.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 +2 -2
- package/dist/repository/dataQuery/read.js.map +1 -1
- package/dist/repository/dataQuery/update.js +1 -1
- package/dist/repository/dataQuery/update.js.map +1 -1
- package/dist/repository/info/read.js +1 -1
- package/dist/repository/info/read.js.map +1 -1
- package/dist/repository/message/read.js +1 -1
- package/dist/repository/message/read.js.map +1 -1
- package/dist/repository/nodeDef/read.js +1 -1
- package/dist/repository/nodeDef/read.js.map +1 -1
- package/dist/repository/record/get.js +5 -5
- package/dist/repository/record/get.js.map +1 -1
- package/dist/repository/survey/get.js +1 -1
- package/dist/repository/survey/get.js.map +1 -1
- package/dist/repository/survey/getAllIds.js +1 -1
- package/dist/repository/survey/getAllIds.js.map +1 -1
- package/dist/repository/survey/getAllIdsAndAppVersions.js +1 -1
- package/dist/repository/survey/getAllIdsAndAppVersions.js.map +1 -1
- package/dist/repository/user/get.js +1 -1
- package/dist/repository/user/get.js.map +1 -1
- package/dist/repository/user/updateUserPrefs.js +1 -1
- package/dist/repository/user/updateUserPrefs.js.map +1 -1
- package/dist/repository/user2FADevice/getByDeviceUuid.js +1 -1
- package/dist/repository/user2FADevice/getByDeviceUuid.js.map +1 -1
- package/dist/repository/user2FADevice/getByUserUuid.js +2 -2
- package/dist/repository/user2FADevice/getByUserUuid.js.map +1 -1
- package/dist/repository/user2FADevice/insert.js +1 -1
- package/dist/repository/user2FADevice/insert.js.map +1 -1
- package/dist/repository/user2FADevice/update.js +1 -1
- package/dist/repository/user2FADevice/update.js.map +1 -1
- package/dist/repository/userRefreshToken/getByUuid.js +1 -1
- package/dist/repository/userRefreshToken/getByUuid.js.map +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js.map +1 -1
- package/dist/repository/userTempAuthToken/deleteByTokenHash.js +1 -1
- package/dist/repository/userTempAuthToken/deleteByTokenHash.js.map +1 -1
- package/dist/repository/userTempAuthToken/getByTokenHash.js +1 -1
- package/dist/repository/userTempAuthToken/getByTokenHash.js.map +1 -1
- package/dist/repository/userTempAuthToken/getByUserUuid.js +1 -1
- package/dist/repository/userTempAuthToken/getByUserUuid.js.map +1 -1
- package/dist/repository/userTempAuthToken/insert.js +1 -1
- package/dist/repository/userTempAuthToken/insert.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 +41 -24
- package/dist/service/survey/docExport/SurveyDocWalker.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderBoolean.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderBoolean.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCode.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCode.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCoordinate.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderCoordinate.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderDate.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderDate.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderFormHeader.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderFormHeader.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderGeo.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderGeo.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderNumber.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderNumber.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTaxon.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTaxon.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderText.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderText.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTime.js +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/renderTime.js.map +1 -1
- package/dist/service/survey/docxExport/renderers/attribute/types.d.ts +1 -1
- package/dist/service/user2FA/user2FAService.js +2 -2
- package/dist/service/user2FA/user2FAService.js.map +1 -1
- package/dist/service/userAuthToken/index.js +2 -2
- package/dist/service/userAuthToken/index.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 +5 -5
- package/dist/webSocket/server.js.map +1 -1
- package/package.json +1 -1
|
@@ -103,7 +103,7 @@ const findAndConsumeBackupCode = async (codes, token) => {
|
|
|
103
103
|
}
|
|
104
104
|
return { matched: false };
|
|
105
105
|
};
|
|
106
|
-
const generateSecret =
|
|
106
|
+
const generateSecret = (options) => {
|
|
107
107
|
const { userEmail, deviceName } = options;
|
|
108
108
|
const secret = (0, otplib_1.generateSecret)();
|
|
109
109
|
const accountName = `${deviceName} - ${userEmail}`;
|
|
@@ -137,7 +137,7 @@ const to2FADeviceForClient = (device) => {
|
|
|
137
137
|
};
|
|
138
138
|
const addDevice = async (options) => {
|
|
139
139
|
const { userUuid, userEmail, deviceName, client = db_1.DB } = options;
|
|
140
|
-
const { secret, otpAuthUrl } =
|
|
140
|
+
const { secret, otpAuthUrl } = generateSecret({ userEmail, deviceName });
|
|
141
141
|
const backupCodes = generateBackupCodes();
|
|
142
142
|
const backupCodesHashed = hashBackupCodes(backupCodes);
|
|
143
143
|
const encryptedSecret = encryptSecret(secret);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user2FAService.js","sourceRoot":"","sources":["../../../src/service/user2FA/user2FAService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"user2FAService.js","sourceRoot":"","sources":["../../../src/service/user2FA/user2FAService.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,10 +74,10 @@ exports.UserAuthTokenServiceServer = {
|
|
|
74
74
|
const { userUuid } = options;
|
|
75
75
|
return repository_1.UserRefreshTokenRepository.revokeAll({ userUuid });
|
|
76
76
|
},
|
|
77
|
-
|
|
77
|
+
rotateTokens(options, dbClient = db_1.DB) {
|
|
78
78
|
const { refreshToken, refreshTokenProps } = options;
|
|
79
79
|
if (!refreshToken) {
|
|
80
|
-
return null;
|
|
80
|
+
return Promise.resolve(null);
|
|
81
81
|
}
|
|
82
82
|
return dbClient.tx(async (t) => {
|
|
83
83
|
const tokenRecord = await verifyAndFetchRefreshTokenRecord({ refreshToken, userAuthTokenService: this, t });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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"}
|
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;QAC7B,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;AAtCD,wBAsCC"}
|
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;AAbD,wBAaC"}
|
|
@@ -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;
|
|
@@ -12,7 +12,7 @@ export declare class WebSocketServer {
|
|
|
12
12
|
static notifySocket(socketId: string, eventType: string, message: any): boolean;
|
|
13
13
|
static notifyUser(userUuid: string, eventType: string, message: any): void;
|
|
14
14
|
static isSocketConnected(socketId: string): Promise<boolean>;
|
|
15
|
-
private static onClusterEvent;
|
|
15
|
+
private static readonly onClusterEvent;
|
|
16
16
|
private static addSocket;
|
|
17
17
|
private static deleteSocket;
|
|
18
18
|
private static startMaintenanceTasks;
|
|
@@ -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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"}
|