32 enhance writing data

.gitignore

@@ -1,3 +1,5 @@
+data/
+
 # Logs
 logs
 *.log

.vscode/launch.json

@@ -1,21 +1,15 @@
 {
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Debug server.ts",
-			"skipFiles": [
-				"<node_internals>/**"
-			],
-			"program": "${workspaceFolder}\\src\\app.ts",
-			"preLaunchTask": "tsc: build - tsconfig.json",
-			"outFiles": [
-				"${workspaceFolder}/dist/**/*.js"
-			]
-		}
-	]
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug TypeScript",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}\\src\\app.ts",
+            "preLaunchTask": "build"
+        }
+    ]
 }

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "npx tsc -p tsconfig.json",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$tsc"
+        }
+    ]
+}

nodemon.json

@@ -2,5 +2,8 @@
   "watch": ["src"],
   "ext": ".ts",
   "ignore": [],
-  "exec": "tsc && node dist/app.js"
+  "exec": "tsc && node dist/app.js",
+  "events": {
+    "start": "clear"
+  }
 }

package.json

@@ -18,6 +18,7 @@
     "@jest/globals": "^29.7.0",
     "@tsconfig/node20": "^20.1.2",
     "@types/bcrypt": "^5.0.2",
+    "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.21",
     "@types/hpp": "^0.2.5",
     "@types/jest": "^29.5.11",
@@ -35,8 +36,10 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "chalk": "^4.1.2",
     "express": "^4.18.2",
     "express-validator": "^7.0.1",
+    "helmet": "^7.1.0",
     "hpp": "^0.2.3",
     "module-alias": "^2.2.3"
   },

src/app.ts

@@ -1,17 +1,28 @@
 require('module-alias/register');
 import { config } from 'dotenv';
 import express from 'express';
+import helmet from 'helmet';
 import hpp from 'hpp';
 import cache from './cache';
 import * as error from "./error";
 import writeRouter from '@src/controller/write';
 import path  from 'path';
 import logger from '@src/scripts/logger';
 
-
 // configurations
 config();
 const app = express();
+app.use(
+  helmet({
+    contentSecurityPolicy: {
+      directives: {
+        "default-src": "'self'",        
+        "img-src": "*"
+      },
+    },
+  }),
+);
+
 app.use(hpp());
 app.use(cache);
 
@@ -30,5 +41,5 @@ app.use(error.handler);
 
 // init server
 app.listen(80, () => {
-  logger.log(`Server running //localhost:80`); 
+  logger.log(`Server running //localhost:80, ENV: ${process.env.NODE_ENV}`, true); 
 });

src/controller/write.ts

@@ -1,30 +1,37 @@
 import express, { Request, Response, NextFunction } from 'express';
 import { entry } from '@src/models/entry';
 import { validationResult } from 'express-validator';
+import { create as createError } from '@src/error'; 
+
 
 // example call: /write?user=xx&lat=00.000&lon=00.000&timestamp=1704063600000&hdop=0.0&altitude=0.000&speed=0.000&heading=000.0
-function errorChecking (req:Request, res:Response, next:NextFunction) {
+async function errorChecking (req:Request, res:Response, next:NextFunction) {
   const errors = validationResult(req);
   if (!errors.isEmpty()) {
     const errorAsJson = { errors: errors.array()};
-    const errorAsString = new Error(JSON.stringify(errorAsJson));
+    const errorAsString = JSON.stringify(errorAsJson);
     const hasKeyErrors =  errors.array().some(error => error.msg.includes("Key"));
 
-    res.status(hasKeyErrors ? 403 : 422); // send forbidden or unprocessable content
-    return next(errorAsString);
+    // send forbidden or unprocessable content
+    return createError(res, hasKeyErrors ? 403 : 422, errorAsString, next)
   }
 
   if (req.method == "HEAD") {
     res.status(200).end();
     return;
   }
 
-  // Regular Save logic from here
-
-    //entry.create(req, res);
-    //const test = process.env.TEST;
-   // res.send(req.query);
-
+  // Regular Save logic from here    
+  await entry.create(req, res, next);
+
+  if (!res.locals.error) { 
+    res.send(req.query);
+  } else { 
+    /* at this point error handling already happend,
+    *  or the request has already been send
+    *  therefor there is no need for it again (only middleware to follow at this point) */
+    next();
+  }
 }