pw info response update, loading submodules

src/middlewares/auth.middleware.ts

@@ -10,7 +10,7 @@ interface Options {
 
 const testUser = {
   id: 19,
-  avaiblePWRequests: 999,
+  avaiblePWRequests: 645,
   pwRequestCount: 19,
   created: new Date(),
 }

src/modules.json

@@ -31,7 +31,8 @@
     "name": "api",
     "urls": [
       "api.frylabs.net",
-      "localhost"
+      "localhost",
+      "superhedghog.frylabs.net"
     ]
   },
   "main": {

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,

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,
+      success: true,
-      remaining: requestingUser.avaiblePWRequests - 1,
+      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,
     })
   })
 

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}'`,

submodules/qmining-page

@@ -1 +1 @@
-Subproject commit 1b3c07fce243220b629820f9e943fb449f8291c8
+Subproject commit 3739153e95c3f75c17422d89c5e229cb97cb4abe