@stamhoofd/redirecter 2.118.1 → 2.120.0

package/src/endpoints/RedirectEndpoint.ts

@@ -1,6 +1,6 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Country } from '@stamhoofd/structures';
-
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import { Country } from '@stamhoofd/types/Country';
 import { Geolocator } from '../classes/Geolocator.js';
 
 type Params = Record<string, never>;
@@ -8,25 +8,13 @@ type Body = undefined;
 type Query = undefined;
 type ResponseBody = string;
 
-function getRequestIP(request: Request): string {
-    let ipAddress = request.request?.socket.remoteAddress;
-    if (request.headers['x-real-ip'] && typeof request.headers['x-real-ip'] === 'string' && (ipAddress === '127.0.0.1' || ipAddress === '0.0.0.0')) {
-        ipAddress = request.headers['x-real-ip'];
-    }
-    if (!ipAddress) {
-        ipAddress = '?';
-    }
-
-    return ipAddress.split(':', 2)[0];
-}
-
 export class RedirectEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(_request: Request): [true, Params] | [false] {
         return [true, {}];
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const ip = getRequestIP(request.request);
+        const ip = request.request.getIP()
 
         const country = Geolocator.shared.getCountry(ip);
 
@@ -34,7 +22,7 @@ export class RedirectEndpoint extends Endpoint<Params, Query, Body, ResponseBody
 
         if (country === Country.Belgium) {
             const url = 'https://www.stamhoofd.be' + path;
-            const response = new Response($t(`3fb0eda2-63e8-422c-a19f-b36c36bea5eb`) + ' ' + url);
+            const response = new Response($t(`%G3`) + ' ' + url);
             response.status = 302;
             response.headers['Location'] = url;
 
@@ -44,7 +32,7 @@ export class RedirectEndpoint extends Endpoint<Params, Query, Body, ResponseBody
         }
 
         const url = 'https://www.stamhoofd.nl' + path;
-        const response = new Response($t(`3fb0eda2-63e8-422c-a19f-b36c36bea5eb`) + ' ' + url);
+        const response = new Response($t(`%G3`) + ' ' + url);
         response.status = 302;
         response.headers['Location'] = url;
 

package/{index.ts → src/index.ts}

@@ -5,7 +5,7 @@ backendEnv.load({ service: 'redirecter' }).catch((error) => {
     console.error('Failed to load environment:', error);
     process.exit(1);
 }).then(async () => {
-    await import('./src/boot.js');
+    await import('./boot.js');
 }).catch((error) => {
     console.error('Failed to start the API:', error);
     process.exit(1);

package/stamhoofd.d.ts

@@ -1,3 +1,5 @@
+import '../../../environment.d.ts';
+
 export {};
 
 /**

package/tests/vitest.global.setup.ts

@@ -0,0 +1,20 @@
+// first import nock
+import nock from 'nock';
+
+// prevent nock import from being removed on save
+console.log('Imported nock: ', !!nock);
+
+import { TestUtils } from '@stamhoofd/test-utils';
+
+
+// Set timezone!
+process.env.TZ = 'UTC';
+
+// Quick check
+if (new Date().getTimezoneOffset() !== 0) {
+    throw new Error('Process should always run in UTC timezone');
+}
+
+export async function setup() {
+    TestUtils.globalSetup();
+};

package/tests/vitest.setup.ts

@@ -0,0 +1,30 @@
+// first import nock
+
+import { Column } from '@simonbackx/simple-database';
+import { Request } from '@simonbackx/simple-endpoints';
+import { Version } from '@stamhoofd/structures';
+import { TestUtils } from '@stamhoofd/test-utils';
+
+Error.stackTraceLimit = 100;
+
+// Set version of saved structures
+Column.setJSONVersion(Version);
+
+// Automatically set endpoint default version to latest one (only in tests!)
+Request.defaultVersion = Version;
+
+// Set timezone!
+process.env.TZ = 'UTC';
+
+// Quick check
+if (new Date().getTimezoneOffset() !== 0) {
+    throw new Error('Process should always run in UTC timezone');
+}
+
+console.log = () => {};
+
+beforeAll(async () => {
+    // Override default $t handlers
+    TestUtils.loadEnvironment();
+});
+TestUtils.setup();

package/tsconfig.build.json

@@ -0,0 +1,15 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+        "rootDir": "./src",
+        "outDir": "dist"
+    },
+    "include": [
+        "./src",
+        "./stamhoofd.d.ts"
+    ],
+    "exclude": [
+        "./src/**/*.spec.ts", 
+        "./src/**/*.test.ts"
+    ]
+}

package/tsconfig.json

@@ -1,36 +1,12 @@
 {
-    "compilerOptions": {
-        "target": "es2022", // needs to be es2019 to support optional chaining. Node.js doesn't support optional chaining yet, so we need the transpiling
-        "module": "commonjs",
-        "jsx": "preserve",
-        "importHelpers": true,
-        "moduleResolution": "node",
-        "experimentalDecorators": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "sourceMap": true,
-        "strictNullChecks": true,
-        "declaration": true,
-        "declarationMap": true,
-        "outDir": "dist",
-        "lib": [
-            "es2022"
-        ],
-        "types": [
-            "node",
-            "jest",
-            "@stamhoofd/backend-i18n",
-        ]
-    },
-    "include": [
-        "src/**/*.ts",
-        "tests/**/*.ts",
-        "index.ts",
-        "migrations.ts",
-        "../../../*.d.ts",
-        "*.d.ts"
-    ],
-    "exclude": [
-        "node_modules"
+    "extends": "../../../tsconfig.base.json",
+    "files": [],
+    "references": [
+        {
+            "path": "./tsconfig.build.json"
+        },
+        {
+            "path": "./tsconfig.test.json"
+        }
     ]
 }

package/tsconfig.test.json

@@ -0,0 +1,17 @@
+{
+    "extends": "../../../tsconfig.test.json",
+    "compilerOptions": {
+        "rootDir": ".",
+        "outDir": "dist"
+    },
+    "references": [
+        { "path": "./tsconfig.build.json" }
+    ],
+    "include": [
+        "./stamhoofd.d.ts",
+        "../../../jest-extended.d.ts",
+        "./src/**/*.spec.ts", 
+        "./src/**/*.test.ts",
+        "./tests"
+    ]
+}

package/vitest.config.js

@@ -0,0 +1,13 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+    test: {
+        globalSetup: './tests/vitest.global.setup.ts',
+        setupFiles: ['./tests/vitest.setup.ts'],
+        watch: false,
+        globals: true,
+        root: import.meta.dirname,
+        isolate: true,
+        maxWorkers: 1, // For now we can't run parallel because all test files use the same database
+    },
+});

package/eslint.config.mjs

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