@stamhoofd/backend 2.39.1 → 2.40.1

package/eslint.config.mjs

@@ -0,0 +1,5 @@
+import stamhoofdEslint from 'eslint-plugin-stamhoofd';
+
+export default [
+    ...stamhoofdEslint.configs.backend,
+];

package/index.ts

@@ -1,19 +1,21 @@
-require('@stamhoofd/backend-env').load()
-import { Column, Database, Migration } from "@simonbackx/simple-database";
-import { CORSPreflightEndpoint, Router, RouterServer } from "@simonbackx/simple-endpoints";
-import { I18n } from "@stamhoofd/backend-i18n";
-import { CORSMiddleware, LogMiddleware, VersionMiddleware } from "@stamhoofd/backend-middleware";
-import { Email } from "@stamhoofd/email";
-import { loadLogger } from "@stamhoofd/logging";
+import backendEnv from '@stamhoofd/backend-env';
+backendEnv.load();
+
+import { Column, Database, Migration } from '@simonbackx/simple-database';
+import { CORSPreflightEndpoint, Router, RouterServer } from '@simonbackx/simple-endpoints';
+import { I18n } from '@stamhoofd/backend-i18n';
+import { CORSMiddleware, LogMiddleware, VersionMiddleware } from '@stamhoofd/backend-middleware';
+import { Email } from '@stamhoofd/email';
+import { loadLogger } from '@stamhoofd/logging';
 import { Version } from '@stamhoofd/structures';
-import { sleep } from "@stamhoofd/utility";
+import { sleep } from '@stamhoofd/utility';
 
 import { areCronsRunning, crons, stopCronScheduling } from './src/crons';
-import { resumeEmails } from "./src/helpers/EmailResumer";
-import { ContextMiddleware } from "./src/middleware/ContextMiddleware";
+import { resumeEmails } from './src/helpers/EmailResumer';
+import { ContextMiddleware } from './src/middleware/ContextMiddleware';
 
-process.on("unhandledRejection", (error: Error) => {
-    console.error("unhandledRejection");
+process.on('unhandledRejection', (error: Error) => {
+    console.error('unhandledRejection');
     console.error(error.message, error.stack);
     process.exit(1);
 });
@@ -22,63 +24,64 @@ process.on("unhandledRejection", (error: Error) => {
 Column.setJSONVersion(Version);
 
 // Set timezone!
-process.env.TZ = "UTC";
+process.env.TZ = 'UTC';
 
 // Quick check
-if (new Date().getTimezoneOffset() != 0) {
-    throw new Error("Process should always run in UTC timezone");
+if (new Date().getTimezoneOffset() !== 0) {
+    throw new Error('Process should always run in UTC timezone');
 }
 
 const seeds = async () => {
     try {
         // Internal
-        await Migration.runAll(__dirname + "/src/seeds");
-    } catch (e) {
-        console.error("Failed to run seeds:")
-        console.error(e)
+        await Migration.runAll(__dirname + '/src/seeds');
+    }
+    catch (e) {
+        console.error('Failed to run seeds:');
+        console.error(e);
     }
 };
 
 const start = async () => {
-    console.log('Running server at v' + Version)
+    console.log('Running server at v' + Version);
     loadLogger();
-    await I18n.load()
+    await I18n.load();
     const router = new Router();
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/global/*");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/admin/*");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/auth");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/organization/dashboard/*");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/organization/registration");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/organization/webshops");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/organization/shared");
-    await router.loadAllEndpoints(__dirname + "/src/endpoints/organization/shared/*");
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/global/*');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/admin/*');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/auth');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/organization/dashboard/*');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/organization/registration');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/organization/webshops');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/organization/shared');
+    await router.loadAllEndpoints(__dirname + '/src/endpoints/organization/shared/*');
 
-    router.endpoints.push(new CORSPreflightEndpoint())
+    router.endpoints.push(new CORSPreflightEndpoint());
 
     const routerServer = new RouterServer(router);
-    routerServer.verbose = false
-    
+    routerServer.verbose = false;
+
     // Log requests and errors
-    routerServer.addRequestMiddleware(LogMiddleware)
-    routerServer.addResponseMiddleware(LogMiddleware)
+    routerServer.addRequestMiddleware(LogMiddleware);
+    routerServer.addResponseMiddleware(LogMiddleware);
 
     // Contexts
-    routerServer.addRequestMiddleware(ContextMiddleware)
+    routerServer.addRequestMiddleware(ContextMiddleware);
 
     // Add version headers and minimum version
     const versionMiddleware = new VersionMiddleware({
         latestVersions: {
             android: STAMHOOFD.LATEST_ANDROID_VERSION,
             ios: STAMHOOFD.LATEST_IOS_VERSION,
-            web: Version
+            web: Version,
         },
-        minimumVersion: 331
-    })
-    routerServer.addRequestMiddleware(versionMiddleware)
-    routerServer.addResponseMiddleware(versionMiddleware)
+        minimumVersion: 331,
+    });
+    routerServer.addRequestMiddleware(versionMiddleware);
+    routerServer.addResponseMiddleware(versionMiddleware);
 
     // Add CORS headers
-    routerServer.addResponseMiddleware(CORSMiddleware)
+    routerServer.addResponseMiddleware(CORSMiddleware);
 
     // Register Excel loaders
     await import('./src/excel-loaders/members');
@@ -99,60 +102,64 @@ const start = async () => {
     let shuttingDown = false;
     const shutdown = async () => {
         if (shuttingDown) {
-            return
+            return;
         }
-        shuttingDown = true
-        console.log("Shutting down...")
+        shuttingDown = true;
+        console.log('Shutting down...');
         // Disable keep alive
-        routerServer.defaultHeaders = Object.assign(routerServer.defaultHeaders, { 'Connection': 'close' })
+        routerServer.defaultHeaders = Object.assign(routerServer.defaultHeaders, { Connection: 'close' });
         if (routerServer.server) {
             routerServer.server.headersTimeout = 5000;
             routerServer.server.keepAliveTimeout = 1;
         }
-        
+
         stopCronScheduling();
-        clearInterval(cronInterval)
+        clearInterval(cronInterval);
 
         if (STAMHOOFD.environment === 'development') {
             setTimeout(() => {
-                console.error("Forcing exit after 5 seconds")
+                console.error('Forcing exit after 5 seconds');
                 process.exit(1);
             }, 5000);
         }
 
         try {
-            await routerServer.close()
-            console.log("HTTP server stopped");
-        } catch (err) {
-            console.error("Failed to stop HTTP server:");
+            await routerServer.close();
+            console.log('HTTP server stopped');
+        }
+        catch (err) {
+            console.error('Failed to stop HTTP server:');
             console.error(err);
         }
 
         try {
             while (areCronsRunning()) {
-                console.log("Crons are still running. Waiting 2 seconds...")
-                await sleep(2000)
+                console.log('Crons are still running. Waiting 2 seconds...');
+                await sleep(2000);
             }
-        } catch (err) {
-            console.error("Failed to wait for crons to finish:");
+        }
+        catch (err) {
+            console.error('Failed to wait for crons to finish:');
             console.error(err);
         }
 
         try {
             while (Email.currentQueue.length > 0) {
-                console.log("Emails still in queue. Waiting 2 seconds...")
-                await sleep(2000)
+                console.log('Emails still in queue. Waiting 2 seconds...');
+                await sleep(2000);
             }
-        } catch (err) {
-            console.error("Failed to wait for emails to finish:");
+        }
+        catch (err) {
+            console.error('Failed to wait for emails to finish:');
             console.error(err);
         }
 
         try {
-            await Database.end()
-            console.log("MySQL connections closed");
-        } catch (err) {
-            console.error("Failed to close MySQL connection:")
+            await Database.end();
+            console.log('MySQL connections closed');
+        }
+        catch (err) {
+            console.error('Failed to close MySQL connection:');
             console.error(err);
         }
 
@@ -160,30 +167,30 @@ const start = async () => {
         process.exit(0);
     };
 
-    process.on("SIGTERM", () => {
-        console.info("SIGTERM signal received.");
+    process.on('SIGTERM', () => {
+        console.info('SIGTERM signal received.');
         shutdown().catch((e) => {
-            console.error(e)
+            console.error(e);
             process.exit(1);
         });
     });
 
-    process.on("SIGINT", () => {
-        console.info("SIGINT signal received.");
+    process.on('SIGINT', () => {
+        console.info('SIGINT signal received.');
         shutdown().catch((e) => {
-            console.error(e)
+            console.error(e);
             process.exit(1);
         });
     });
 
     const cronInterval = setInterval(() => {
-        crons().catch(console.error)
+        crons().catch(console.error);
     }, 5 * 60 * 1000);
-    crons().catch(console.error)
+    crons().catch(console.error);
     seeds().catch(console.error);
 };
 
-start().catch(error => {
-    console.error("unhandledRejection", error);
+start().catch((error) => {
+    console.error('unhandledRejection', error);
     process.exit(1);
 });

package/jest.config.cjs

@@ -0,0 +1,10 @@
+module.exports = {
+    roots: ['<rootDir>/dist'],
+    testEnvironment: 'node',
+    setupFilesAfterEnv: [
+        'jest-extended/all',
+        './dist/tests/jest.setup.js',
+    ],
+    globalSetup: './dist/tests/jest.global.setup.js',
+    // verbose: true,
+};

package/migrations.ts

@@ -1,31 +1,33 @@
-require('@stamhoofd/backend-env').load()
-import { Column, Migration } from "@simonbackx/simple-database";
-import { Version } from "@stamhoofd/structures";
-import path from "path";
+import backendEnv from '@stamhoofd/backend-env';
+backendEnv.load();
+
+import { Column, Migration } from '@simonbackx/simple-database';
+import { Version } from '@stamhoofd/structures';
+import path from 'path';
 
 Column.setJSONVersion(Version);
-process.env.TZ = "UTC";
+process.env.TZ = 'UTC';
 
-const emailPath = require.resolve("@stamhoofd/email")
-const modelsPath = require.resolve("@stamhoofd/models")
+const emailPath = require.resolve('@stamhoofd/email');
+const modelsPath = require.resolve('@stamhoofd/models');
 
 // Validate UTC timezone
-if (new Date().getTimezoneOffset() != 0) {
-    throw new Error("Process should always run in UTC timezone");
+if (new Date().getTimezoneOffset() !== 0) {
+    throw new Error('Process should always run in UTC timezone');
 }
 
 const start = async () => {
     // External migrations
-    await Migration.runAll(path.dirname(modelsPath) + "/migrations");
-    await Migration.runAll(path.dirname(emailPath) + "/migrations");
+    await Migration.runAll(path.dirname(modelsPath) + '/migrations');
+    await Migration.runAll(path.dirname(emailPath) + '/migrations');
 
     // Internal
-    await Migration.runAll(__dirname + "/src/migrations");
+    await Migration.runAll(__dirname + '/src/migrations');
 };
 
 start()
-    .catch(error => {
-        console.error("unhandledRejection", error);
+    .catch((error) => {
+        console.error('unhandledRejection', error);
         process.exit(1);
     })
     .finally(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.39.1",
+    "version": "2.40.1",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -18,7 +18,7 @@
         "test": "jest --runInBand",
         "test:reset": "yarn build:full && jest --runInBand",
         "migrations": "yarn build:full && node ./dist/migrations.js",
-        "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
+        "lint": "eslint"
     },
     "devDependencies": {
         "@types/cookie": "^0.5.1",
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.39.1",
-        "@stamhoofd/backend-middleware": "2.39.1",
-        "@stamhoofd/email": "2.39.1",
-        "@stamhoofd/models": "2.39.1",
-        "@stamhoofd/queues": "2.39.1",
-        "@stamhoofd/sql": "2.39.1",
-        "@stamhoofd/structures": "2.39.1",
-        "@stamhoofd/utility": "2.39.1",
+        "@stamhoofd/backend-i18n": "2.40.1",
+        "@stamhoofd/backend-middleware": "2.40.1",
+        "@stamhoofd/email": "2.40.1",
+        "@stamhoofd/models": "2.40.1",
+        "@stamhoofd/queues": "2.40.1",
+        "@stamhoofd/sql": "2.40.1",
+        "@stamhoofd/structures": "2.40.1",
+        "@stamhoofd/utility": "2.40.1",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "13df02459d27104c9bf92ff3d905920cf81276c4"
+    "gitHead": "31eb933097eb608655f755de9df912c21a420963"
 }

package/src/crons/clear-excel-cache.test.ts

@@ -1,75 +1,73 @@
-import { Dirent } from "fs";
-import fs from "fs/promises";
-import { clearExcelCacheHelper } from "./clear-excel-cache";
+import { Dirent } from 'fs';
+import fs from 'fs/promises';
+import { clearExcelCacheHelper } from './clear-excel-cache';
 
 const testPath = '/Users/user/project/backend/app/api/.cache';
-jest.mock("fs/promises");
-const fsMock =  jest.mocked(fs, true)
-
-
-describe("clearExcelCacheHelper", () => {
+jest.mock('fs/promises');
+const fsMock = jest.mocked(fs, true);
 
+describe('clearExcelCacheHelper', () => {
     it('should only run between 3 and 6 AM', async () => {
-        //#region arrange
+        // #region arrange
         const shouldFail = [
-            new Date(2024,1,1,0,0),
-            new Date(2024,1,1,2,50),
-            new Date(2024,1,1,2,59, 59, 999),
-            new Date(2024,1,1,6,0)
-        ]
+            new Date(2024, 1, 1, 0, 0),
+            new Date(2024, 1, 1, 2, 50),
+            new Date(2024, 1, 1, 2, 59, 59, 999),
+            new Date(2024, 1, 1, 6, 0),
+        ];
 
         const shouldPass = [
-            new Date(2024,1,1,3,0),
-            new Date(2024,1,1,3,55),
-            new Date(2024,1,1,5,59, 59, 999)
-        ]
+            new Date(2024, 1, 1, 3, 0),
+            new Date(2024, 1, 1, 3, 55),
+            new Date(2024, 1, 1, 5, 59, 59, 999),
+        ];
 
         fsMock.readdir.mockReturnValue(Promise.resolve([]));
-        //#endregion
+        // #endregion
 
-        //#region act and assert
-        for(const date of shouldFail) {
+        // #region act and assert
+        for (const date of shouldFail) {
             const didClear = await clearExcelCacheHelper({
                 lastExcelClear: null,
                 now: date,
                 cachePath: testPath,
-                environment: 'production'
-            })
+                environment: 'production',
+            });
 
             expect(didClear).toBeFalse();
         }
 
-        for(const date of shouldPass) {
+        for (const date of shouldPass) {
             const didClear = await clearExcelCacheHelper({
                 lastExcelClear: null,
                 now: date,
                 cachePath: testPath,
-                environment: 'production'
-            })
+                environment: 'production',
+            });
 
             expect(didClear).toBeTrue();
         }
-        //#endregion
-    })
+        // #endregion
+    });
 
     it('should only run once each day', async () => {
-        //#region arrange
-        const firstTry  = new Date(2024,1,1,3,0);
-        const secondTry = new Date(2024,1,1,3,5);
-        const thirdTry  = new Date(2024,1,2,3,0);
-        const fourthTry  = new Date(2024,1,2,3,5);
+        // #region arrange
+        const firstTry = new Date(2024, 1, 1, 3, 0);
+        const secondTry = new Date(2024, 1, 1, 3, 5);
+        const thirdTry = new Date(2024, 1, 2, 3, 0);
+        const fourthTry = new Date(2024, 1, 2, 3, 5);
 
         fsMock.readdir.mockReturnValue(Promise.resolve([]));
-        //#endregion
+        // #endregion
 
-        //#region act and assert
+        // #region act and assert
 
         // second try, should fail because 5 min earlier the cache was cleared
         const didClearSecondTry = await clearExcelCacheHelper({
             lastExcelClear: firstTry.getTime(),
             now: secondTry,
             cachePath: testPath,
-            environment: 'production'
+            environment: 'production',
         });
 
         expect(didClearSecondTry).toBeFalse();
@@ -79,7 +77,7 @@ describe("clearExcelCacheHelper", () => {
             lastExcelClear: secondTry.getTime(),
             now: thirdTry,
             cachePath: testPath,
-            environment: 'production'
+            environment: 'production',
         });
 
         expect(didClearThirdTry).toBeTrue();
@@ -89,16 +87,16 @@ describe("clearExcelCacheHelper", () => {
             lastExcelClear: thirdTry.getTime(),
             now: fourthTry,
             cachePath: testPath,
-            environment: 'production'
+            environment: 'production',
         });
 
         expect(didClearFourthTry).toBeFalse();
-        //#endregion
-    })
+        // #endregion
+    });
 
     it('should delete old cache only', async () => {
-        //#region arrange
-        const now = new Date(2024,0,5,3,5);
+        // #region arrange
+        const now = new Date(2024, 0, 5, 3, 5);
 
         const dir1 = new Dirent();
         dir1.name = '2024-01-01';
@@ -128,25 +126,25 @@ describe("clearExcelCacheHelper", () => {
 
         const directories = [dir1, dir2, dir3, dir4, dir5, dir6, dir7];
 
-        directories.forEach(dir => {
+        directories.forEach((dir) => {
             dir.parentPath = testPath;
             dir.isDirectory = () => true;
-        })
+        });
 
         fsMock.readdir.mockReturnValue(Promise.resolve([...directories, file1]));
-        //#endregion
+        // #endregion
 
         // act
         await clearExcelCacheHelper({
             lastExcelClear: null,
             now,
             cachePath: testPath,
-            environment: 'production'
+            environment: 'production',
         });
 
         // assert
         expect(fsMock.rm).toHaveBeenCalledTimes(2);
-        expect(fsMock.rm).toHaveBeenCalledWith("/Users/user/project/backend/app/api/.cache/2024-01-01", { recursive: true, force: true });
-        expect(fsMock.rm).toHaveBeenCalledWith("/Users/user/project/backend/app/api/.cache/2024-01-02",{ recursive: true, force: true });
-    })
-})
+        expect(fsMock.rm).toHaveBeenCalledWith('/Users/user/project/backend/app/api/.cache/2024-01-01', { recursive: true, force: true });
+        expect(fsMock.rm).toHaveBeenCalledWith('/Users/user/project/backend/app/api/.cache/2024-01-02', { recursive: true, force: true });
+    });
+});

package/src/crons/clear-excel-cache.ts

@@ -1,4 +1,4 @@
-import fs from "fs/promises";
+import fs from 'fs/promises';
 
 const msIn22Hours = 79200000;
 let lastExcelClear: number | null = null;
@@ -10,29 +10,28 @@ export async function clearExcelCache() {
         lastExcelClear,
         now,
         cachePath: STAMHOOFD.CACHE_PATH,
-        environment: STAMHOOFD.environment
+        environment: STAMHOOFD.environment,
     });
 
-    if(didClear) {
+    if (didClear) {
         lastExcelClear = now.getTime();
     }
 }
 
-export async function clearExcelCacheHelper
-({lastExcelClear, now, cachePath, environment}: {lastExcelClear: number | null, now: Date, cachePath: string, environment: "production" | "development" | "staging" | "test"}): Promise<boolean> {
-    if (environment === "development") {
+export async function clearExcelCacheHelper({ lastExcelClear, now, cachePath, environment }: { lastExcelClear: number | null; now: Date; cachePath: string; environment: 'production' | 'development' | 'staging' | 'test' }): Promise<boolean> {
+    if (environment === 'development') {
         return false;
     }
 
     const hour = now.getHours();
 
     // between 3 and 6 AM
-    if(hour < 3 || hour > 5) {
+    if (hour < 3 || hour > 5) {
         return false;
     }
 
     // only run once each day
-    if(lastExcelClear !== null && lastExcelClear + msIn22Hours > now.getTime()) {
+    if (lastExcelClear !== null && lastExcelClear + msIn22Hours > now.getTime()) {
         return false;
     }
 
@@ -42,9 +41,9 @@ export async function clearExcelCacheHelper
 
     const maxDaysInCache = 2;
 
-    const dateLimit = new Date(currentYear, currentMonth, currentDay - maxDaysInCache, 0,0,0,0);
+    const dateLimit = new Date(currentYear, currentMonth, currentDay - maxDaysInCache, 0, 0, 0, 0);
 
-    const files = await fs.readdir(cachePath, {withFileTypes: true});
+    const files = await fs.readdir(cachePath, { withFileTypes: true });
 
     for (const file of files) {
         if (file.isDirectory()) {
@@ -52,12 +51,13 @@ export async function clearExcelCacheHelper
                 const date = getDateFromDirectoryName(file.name);
                 const shouldDelete = date < dateLimit;
 
-                if(shouldDelete) {
+                if (shouldDelete) {
                     const path = file.parentPath + '/' + file.name;
-                    await fs.rm(path, { recursive: true, force: true })
-                    console.log("Removed", path)
+                    await fs.rm(path, { recursive: true, force: true });
+                    console.log('Removed', path);
                 }
-            } catch(error) {
+            }
+            catch (error) {
                 console.error(error);
             }
         }
@@ -69,22 +69,22 @@ export async function clearExcelCacheHelper
 function getDateFromDirectoryName(file: string): Date {
     const parts = file.split('-');
 
-    if (parts.length != 3) {
+    if (parts.length !== 3) {
         throw new Error(`Invalid directory ${file} in cache.`);
     }
 
     const year = parseInt(parts[0]);
-    if(isNaN(year)) {
+    if (isNaN(year)) {
         throw new Error(`Year is NAN for directory ${file} in cache.`);
     }
 
     const month = parseInt(parts[1]);
-    if(isNaN(month)) {
+    if (isNaN(month)) {
         throw new Error(`Month is NAN for directory ${file} in cache.`);
     }
 
     const day = parseInt(parts[2]);
-    if(isNaN(day)) {
+    if (isNaN(day)) {
         throw new Error(`Day is NAN for directory ${file} in cache.`);
     }
 

package/src/crons/setup-steps.ts

@@ -1,7 +1,7 @@
-import { SetupStepUpdater } from "../helpers/SetupStepsUpdater";
+import { SetupStepUpdater } from '@stamhoofd/models';
 
 export async function updateSetupSteps() {
-    if (STAMHOOFD.userMode !== "platform") {
+    if (STAMHOOFD.userMode !== 'platform') {
         return;
     }