@stamhoofd/backend-backup 2.85.4 → 2.87.0

package/index.ts

@@ -1,112 +1,11 @@
 import backendEnv from '@stamhoofd/backend-env';
-backendEnv.load({ service: 'backup' });
 
-import { CORSPreflightEndpoint, Router, RouterServer } from '@simonbackx/simple-endpoints';
-import { CORSMiddleware, LogMiddleware } from '@stamhoofd/backend-middleware';
-import { loadLogger } from '@stamhoofd/logging';
-import { startCrons, stopCrons, waitForCrons } from '@stamhoofd/crons';
-import { cleanBackups } from './src/helpers/backup';
-
-process.on('unhandledRejection', (error: Error) => {
-    console.error('unhandledRejection');
-    console.error(error.message, error.stack);
+backendEnv.load({ service: 'backup' }).catch((error) => {
+    console.error('Failed to load environment:', error);
     process.exit(1);
-});
-
-// Set timezone!
-process.env.TZ = 'UTC';
-
-// Quick check
-if (new Date().getTimezoneOffset() !== 0) {
-    throw new Error('Process should always run in UTC timezone');
-}
-
-const start = async () => {
-    console.log('Started Backup.');
-    loadLogger();
-    const router = new Router();
-    await router.loadEndpoints(__dirname + '/src/endpoints');
-    router.endpoints.push(new CORSPreflightEndpoint());
-
-    const routerServer = new RouterServer(router);
-    routerServer.verbose = false;
-
-    // Send the app version along
-    routerServer.addRequestMiddleware(LogMiddleware);
-    routerServer.addResponseMiddleware(LogMiddleware);
-
-    // Add CORS headers
-    routerServer.addResponseMiddleware(CORSMiddleware);
-
-    routerServer.listen(STAMHOOFD.PORT ?? 9090);
-
-    if (routerServer.server) {
-        // Default timeout is a bit too short
-        routerServer.server.timeout = 15000;
-    }
-
-    if (STAMHOOFD.environment === 'development') {
-        return;
-    }
-
-    const shutdown = async () => {
-        console.log('Shutting down...');
-        // Disable keep alive
-        routerServer.defaultHeaders = Object.assign(routerServer.defaultHeaders, { Connection: 'close' });
-        if (routerServer.server) {
-            routerServer.server.headersTimeout = 5000;
-            routerServer.server.keepAliveTimeout = 1;
-        }
-
-        stopCrons();
-
-        if (STAMHOOFD.environment === 'development') {
-            setTimeout(() => {
-                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:');
-            console.error(err);
-        }
-
-        await waitForCrons();
-
-        // Should not be needed, but added for security as sometimes a promise hangs somewhere
-        process.exit(0);
-    };
-
-    process.on('SIGTERM', () => {
-        console.info('SIGTERM signal received.');
-        shutdown().catch((e) => {
-            console.error(e);
-            process.exit(1);
-        });
-    });
-
-    process.on('SIGINT', () => {
-        console.info('SIGINT signal received.');
-        shutdown().catch((e) => {
-            console.error(e);
-            process.exit(1);
-        });
-    });
-
-    // Register crons
-    await import('./src/crons');
-    startCrons();
-
-    // Clean backups on boot (bit faster to retrieve the timestamp of the last backup for the health endpoint)
-    await cleanBackups();
-};
-
-start().catch((error) => {
-    console.error('unhandledRejection', error);
+}).then(async () => {
+    await import('./src/boot');
+}).catch((error) => {
+    console.error('Failed to start the API:', error);
     process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend-backup",
-    "version": "2.85.4",
+    "version": "2.87.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -9,24 +9,24 @@
     },
     "license": "UNLICENCED",
     "scripts": {
-        "dev": "echo 'Waiting for shared backend packages...' && wait-on ../../shared/middleware/dist/index.js && echo 'Start building backend backup server' && concurrently -r 'yarn build --watch --preserveWatchOutput' \"wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --watch .env.json --delay 1000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM\"",
+        "dev": "wait-on ../../shared/middleware/dist/index.js && concurrently -r 'yarn -s build --watch --preserveWatchOutput' \"wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --watch .env.json --delay 1000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM\"",
         "build": "tsc -b",
-        "build:full": "yarn clear && yarn build",
+        "build:full": "yarn -s clear && yarn -s build",
         "clear": "rm -rf ./dist",
-        "start": "yarn build && node --enable-source-maps ./dist/index.js",
+        "start": "yarn -s build && node --enable-source-maps ./dist/index.js",
         "lint": "eslint"
     },
     "devDependencies": {
         "@types/formidable": "3.4.5",
         "@types/luxon": "3.4.2",
         "@types/mysql": "^2.15.20",
-        "@types/node": "^20.12"
+        "@types/node": "^22"
     },
     "dependencies": {
         "@aws-sdk/client-s3": "3.823.0",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "formidable": "3.5.1",
+        "formidable": "3.5.4",
         "luxon": "3.4.4",
         "mockdate": "^3.0.2",
         "mysql2": "^3.14.1"
@@ -34,5 +34,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ecceacc395d167a6761f1425e77cfc06a31fe8a9"
+    "gitHead": "372713e1e4b626d6b4ce4f3d148f14948528312e"
 }

package/src/boot.ts

@@ -0,0 +1,109 @@
+import { CORSPreflightEndpoint, Router, RouterServer } from '@simonbackx/simple-endpoints';
+import { CORSMiddleware, LogMiddleware } from '@stamhoofd/backend-middleware';
+import { loadLogger } from '@stamhoofd/logging';
+import { startCrons, stopCrons, waitForCrons } from '@stamhoofd/crons';
+import { cleanBackups } from './helpers/backup';
+
+process.on('unhandledRejection', (error: Error) => {
+    console.error('unhandledRejection');
+    console.error(error.message, error.stack);
+    process.exit(1);
+});
+
+// Set timezone!
+process.env.TZ = 'UTC';
+
+// Quick check
+if (new Date().getTimezoneOffset() !== 0) {
+    throw new Error('Process should always run in UTC timezone');
+}
+
+const start = async () => {
+    console.log('Started Backup.');
+    loadLogger();
+    const router = new Router();
+    await router.loadEndpoints(__dirname + '/endpoints');
+    router.endpoints.push(new CORSPreflightEndpoint());
+
+    const routerServer = new RouterServer(router);
+    routerServer.verbose = false;
+
+    // Send the app version along
+    routerServer.addRequestMiddleware(LogMiddleware);
+    routerServer.addResponseMiddleware(LogMiddleware);
+
+    // Add CORS headers
+    routerServer.addResponseMiddleware(CORSMiddleware);
+
+    routerServer.listen(STAMHOOFD.PORT ?? 9090);
+
+    if (routerServer.server) {
+        // Default timeout is a bit too short
+        routerServer.server.timeout = 15000;
+    }
+
+    if (STAMHOOFD.environment === 'development') {
+        return;
+    }
+
+    const shutdown = async () => {
+        console.log('Shutting down...');
+        // Disable keep alive
+        routerServer.defaultHeaders = Object.assign(routerServer.defaultHeaders, { Connection: 'close' });
+        if (routerServer.server) {
+            routerServer.server.headersTimeout = 5000;
+            routerServer.server.keepAliveTimeout = 1;
+        }
+
+        stopCrons();
+
+        if (STAMHOOFD.environment === 'development') {
+            setTimeout(() => {
+                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:');
+            console.error(err);
+        }
+
+        await waitForCrons();
+
+        // Should not be needed, but added for security as sometimes a promise hangs somewhere
+        process.exit(0);
+    };
+
+    process.on('SIGTERM', () => {
+        console.info('SIGTERM signal received.');
+        shutdown().catch((e) => {
+            console.error(e);
+            process.exit(1);
+        });
+    });
+
+    process.on('SIGINT', () => {
+        console.info('SIGINT signal received.');
+        shutdown().catch((e) => {
+            console.error(e);
+            process.exit(1);
+        });
+    });
+
+    // Register crons
+    await import('./crons');
+    startCrons();
+
+    // Clean backups on boot (bit faster to retrieve the timestamp of the last backup for the health endpoint)
+    await cleanBackups();
+};
+
+start().catch((error) => {
+    console.error('unhandledRejection', error);
+    process.exit(1);
+});

package/src/helpers/backup.ts

@@ -42,7 +42,7 @@ async function hashFile(path: string, algo = 'md5') {
     const hashFunc = createHash(algo); // you can also sha256, sha512 etc
 
     const contentStream = createReadStream(path);
-    const updateDone = new Promise((resolve, reject) => {
+    const updateDone = new Promise<void>((resolve, reject) => {
         contentStream.on('data', data => hashFunc.update(data));
         contentStream.on('close', resolve);
         contentStream.on('error', reject);