diff --git a/src/middlewares/auth.middleware.ts b/src/middlewares/auth.middleware.ts index 8d1d13a..3b4309a 100644 --- a/src/middlewares/auth.middleware.ts +++ b/src/middlewares/auth.middleware.ts @@ -10,7 +10,7 @@ interface Options { const testUser = { id: 19, - avaiblePWRequests: 999, + avaiblePWRequests: 645, pwRequestCount: 19, created: new Date(), } diff --git a/src/modules.json b/src/modules.json index 479ca8f..db709e4 100644 --- a/src/modules.json +++ b/src/modules.json @@ -31,7 +31,8 @@ "name": "api", "urls": [ "api.frylabs.net", - "localhost" + "localhost", + "superhedghog.frylabs.net" ] }, "main": { diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts index 16034b5..4a854d2 100644 --- a/src/modules/api/api.ts +++ b/src/modules/api/api.ts @@ -159,6 +159,12 @@ function GetApp(): ModuleType { }) } + submoduleDatas.forEach((data) => { + if (data.load) { + data.load() + } + }) + return { dailyAction: DailyAction, app: app, diff --git a/src/modules/api/submodules/userManagement.ts b/src/modules/api/submodules/userManagement.ts index bbd6eed..49808ca 100644 --- a/src/modules/api/submodules/userManagement.ts +++ b/src/modules/api/submodules/userManagement.ts @@ -43,15 +43,16 @@ function setup(data: SubmoduleData): any { const user: User = req.session.user res.json({ - result: 'success', + success: true, userCreated: user.created, - avaiblePWS: user.avaiblePWRequests, + availablePWS: user.avaiblePWRequests, requestedPWS: user.pwRequestCount, maxPWCount: maxPWCount, daysAfterUserGetsPWs: daysAfterUserGetsPWs, addPWPerDay: addPWPerDay, addPWCount: addPWCount, dayDiff: getDayDiff(user.created), + userCount: dbtools.TableInfo(userDB, 'users').dataCount, }) }) @@ -98,10 +99,17 @@ function setup(data: SubmoduleData): any { ) res.json({ - result: 'success', pw: pw, - requestedPWS: requestingUser.pwRequestCount + 1, - remaining: requestingUser.avaiblePWRequests - 1, + success: true, + userCreated: requestingUser.created, + availablePWS: requestingUser.avaiblePWRequests, + requestedPWS: requestingUser.pwRequestCount, + maxPWCount: maxPWCount, + daysAfterUserGetsPWs: daysAfterUserGetsPWs, + addPWPerDay: addPWPerDay, + addPWCount: addPWCount, + dayDiff: getDayDiff(requestingUser.created), + userCount: dbtools.TableInfo(userDB, 'users').dataCount, }) }) diff --git a/src/utils/workerPool.ts b/src/utils/workerPool.ts index ab51f14..aa4df3c 100644 --- a/src/utils/workerPool.ts +++ b/src/utils/workerPool.ts @@ -74,7 +74,7 @@ export function initWorkerPool(initData: any): void { }, } - const threadCount = process.env.NS_THREAD_COUNT || os.cpus().length - 1 + const threadCount = process.env.NS_THREAD_COUNT || os.cpus().length if (process.env.NS_THREAD_COUNT) { logger.Log( `Setting thread count from enviroment variable NS_THREAD_COUNT: '${threadCount}'`, diff --git a/submodules/qmining-page b/submodules/qmining-page index 1b3c07f..3739153 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit 1b3c07fce243220b629820f9e943fb449f8291c8 +Subproject commit 3739153e95c3f75c17422d89c5e229cb97cb4abe