@stamhoofd/backend 2.114.1 → 2.115.1

package/index.ts

@@ -1,5 +1,6 @@
 import backendEnv from '@stamhoofd/backend-env';
 
+process.title = 'stamhoofd-api';
 backendEnv.load({ service: 'api' }).catch((error) => {
     console.error('Failed to load environment:', error);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.114.1",
+    "version": "2.115.1",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -19,6 +19,7 @@
     "license": "UNLICENCED",
     "scripts": {
         "dev": "wait-on ../../shared/middleware/dist/index.js && concurrently -r 'yarn -s build --watch --preserveWatchOutput' \"yarn -s dev:watch\"",
+        "dev:full": "yarn -s dev",
         "dev:watch": "wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --delay 2000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM",
         "dev:backend": "yarn -s dev",
         "build": "rm -rf ./dist/src/migrations && rm -rf ./dist/src/seeds && yarn -s copy-assets && tsc -b",
@@ -54,14 +55,14 @@
         "@simonbackx/simple-encoding": "2.23.1",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.114.1",
-        "@stamhoofd/backend-middleware": "2.114.1",
-        "@stamhoofd/email": "2.114.1",
-        "@stamhoofd/models": "2.114.1",
-        "@stamhoofd/queues": "2.114.1",
-        "@stamhoofd/sql": "2.114.1",
-        "@stamhoofd/structures": "2.114.1",
-        "@stamhoofd/utility": "2.114.1",
+        "@stamhoofd/backend-i18n": "2.115.1",
+        "@stamhoofd/backend-middleware": "2.115.1",
+        "@stamhoofd/email": "2.115.1",
+        "@stamhoofd/models": "2.115.1",
+        "@stamhoofd/queues": "2.115.1",
+        "@stamhoofd/sql": "2.115.1",
+        "@stamhoofd/structures": "2.115.1",
+        "@stamhoofd/utility": "2.115.1",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -79,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0394c203f4133023b2a813d96554ea8b4a0a73d8"
+    "gitHead": "4b692d62820d095e00524e3c0214e8f73a69506e"
 }

package/src/boot.ts

@@ -10,17 +10,19 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { startCrons, stopCrons, waitForCrons } from '@stamhoofd/crons';
 import { Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { resumeEmails } from './helpers/EmailResumer';
-import { GlobalHelper } from './helpers/GlobalHelper';
-import { SetupStepUpdater } from './helpers/SetupStepUpdater';
-import { ContextMiddleware } from './middleware/ContextMiddleware';
-import { AuditLogService } from './services/AuditLogService';
-import { BalanceItemService } from './services/BalanceItemService';
-import { DocumentService } from './services/DocumentService';
-import { FileSignService } from './services/FileSignService';
-import { PlatformMembershipService } from './services/PlatformMembershipService';
-import { UitpasService } from './services/uitpas/UitpasService';
-import { UniqueUserService } from './services/UniqueUserService';
+import { resumeEmails } from './helpers/EmailResumer.js';
+import { GlobalHelper } from './helpers/GlobalHelper.js';
+import { SetupStepUpdater } from './helpers/SetupStepUpdater.js';
+import { ContextMiddleware } from './middleware/ContextMiddleware.js';
+import { AuditLogService } from './services/AuditLogService.js';
+import { BalanceItemService } from './services/BalanceItemService.js';
+import { DocumentService } from './services/DocumentService.js';
+import { FileSignService } from './services/FileSignService.js';
+import { PlatformMembershipService } from './services/PlatformMembershipService.js';
+import { UitpasService } from './services/uitpas/UitpasService.js';
+import { UniqueUserService } from './services/UniqueUserService.js';
+import { CpuService } from './services/CpuService.js';
+import { SQLLogger } from '@stamhoofd/sql';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -88,6 +90,7 @@ export const boot = async (options: { killProcess: boolean }) => {
     await router.loadAllEndpoints(__dirname + '/endpoints/organization/webshops');
     await router.loadAllEndpoints(__dirname + '/endpoints/organization/shared');
     await router.loadAllEndpoints(__dirname + '/endpoints/organization/shared/*');
+    await router.loadAllEndpoints(__dirname + '/endpoints/system');
 
     router.endpoints.push(new CORSPreflightEndpoint());
 
@@ -123,16 +126,16 @@ export const boot = async (options: { killProcess: boolean }) => {
     productionLog('Loading loaders...');
 
     // Register Excel loaders
-    await import('./excel-loaders');
+    await import('./excel-loaders/index.js');
 
     // Register Email Recipient loaders
-    await import('./email-recipient-loaders/members');
-    await import('./email-recipient-loaders/registrations');
-    await import('./email-recipient-loaders/orders');
-    await import('./email-recipient-loaders/receivable-balances');
-    await import('./excel-loaders/registrations');
-    await import('./email-recipient-loaders/documents');
-    await import ('./email-recipient-loaders/payments');
+    await import('./email-recipient-loaders/members.js');
+    await import('./email-recipient-loaders/registrations.js');
+    await import('./email-recipient-loaders/orders.js');
+    await import('./email-recipient-loaders/receivable-balances.js');
+    await import('./excel-loaders/registrations.js');
+    await import('./email-recipient-loaders/documents.js');
+    await import ('./email-recipient-loaders/payments.js');
 
     productionLog('Opening port...');
     routerServer.listen(STAMHOOFD.PORT ?? 9090);
@@ -142,6 +145,14 @@ export const boot = async (options: { killProcess: boolean }) => {
 
     resumeEmails().catch(console.error);
 
+    if (STAMHOOFD.environment !== 'development' && STAMHOOFD.environment !== 'test') {
+        CpuService.startMonitoring();
+    }
+    else if (STAMHOOFD.environment === 'development') {
+        SQLLogger.slowQueryThresholdMs = 200;
+        SQLLogger.explainAllAndLogInefficient = true;
+    }
+
     if (routerServer.server) {
         // Default timeout is a bit too short
         routerServer.server.timeout = 61000;
@@ -235,7 +246,7 @@ export const boot = async (options: { killProcess: boolean }) => {
     }
 
     // Register crons
-    await import('./crons');
+    await import('./crons.js');
 
     AuditLogService.listen();
     PlatformMembershipService.listen();

package/src/email-recipient-loaders/documents.ts

@@ -47,20 +47,7 @@ async function fetch(query: LimitedFilteredRequest) {
 async function count(request: LimitedFilteredRequest) {
     const query = await GetDocumentsEndpoint.buildQuery(request);
     const uniqueMemberIds = await query.count(SQL.distinct(SQL.column('memberId')));
-
-    if (uniqueMemberIds > 100 || uniqueMemberIds === 0) {
-        return uniqueMemberIds; // rough estimate
-    }
-    // do full count
-    request.limit = 100;
-    let count = 0;
-    let req: LimitedFilteredRequest | null = request;
-    while (req) {
-        const result = await fetch(request);
-        count += result.results.length;
-        req = result.next ?? null;
-    }
-    return count;
+    return uniqueMemberIds;
 };
 
 Email.recipientLoaders.set(EmailRecipientFilterType.Documents, { fetch, count });