fix: Fix Memory Leaks & other minor fixes

package.json

@@ -5,6 +5,7 @@
   "main": "dist/server.js",
   "scripts": {
     "lint": "npx eslint .",
+    "lint:fix": "npx eslint . --fix",
     "build": "npm run lint && npm run clean && npx tsc && npx tsc-alias",
     "clean": "rimraf ./dist",
     "start": "node --enable-source-maps ."
@@ -13,36 +14,37 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.395.0",
+    "@aws-sdk/client-s3": "^3.723.0",
     "@pretendonetwork/boss-crypto": "^1.0.0",
     "@pretendonetwork/grpc": "^1.0.6",
     "@typegoose/auto-increment": "^3.6.1",
     "boss-js": "github:PretendoNetwork/boss-js",
-    "cacache": "^18.0.0",
+    "cacache": "^18.0.4",
     "colors": "^1.4.0",
     "dicer": "^0.3.1",
     "dotenv": "^10.0.0",
-    "express": "^4.17.1",
-    "express-subdomain": "^1.0.5",
+    "express": "^4.21.2",
+    "express-subdomain": "^1.0.6",
     "fs-extra": "^11.2.0",
-    "moment": "^2.29.4",
-    "mongoose": "^7.4.3",
+    "moment": "^2.30.1",
+    "mongoose": "~7.6.1",
     "morgan": "^1.10.0",
-    "nice-grpc": "^2.1.5",
+    "nice-grpc": "^2.1.10",
     "xmlbuilder": "^15.1.1"
   },
   "devDependencies": {
+    "@smithy/types": "^4.0.0",
     "@types/dicer": "^0.2.4",
-    "@types/express": "^4.17.17",
-    "@types/fs-extra": "^11.0.1",
-    "@types/morgan": "^1.9.4",
-    "@types/node": "^20.5.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "axios": "^1.6.2",
-    "eslint": "^8.47.0",
-    "tsc-alias": "^1.8.7",
-    "typescript": "^5.1.6",
-    "xmlbuilder2": "^3.0.2"
+    "@types/express": "^4.17.21",
+    "@types/fs-extra": "^11.0.4",
+    "@types/morgan": "^1.9.9",
+    "@types/node": "^20.17.12",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "axios": "^1.7.9",
+    "eslint": "^8.57.1",
+    "tsc-alias": "^1.8.10",
+    "typescript": "~5.3.0",
+    "xmlbuilder2": "^3.1.1"
   }
 }

src/logger.ts

@@ -14,33 +14,41 @@ const streams = {
 	info: fs.createWriteStream(`${root}/logs/info.log`)
 } as const;
 
+function getCurrentTimestamp(): string {
+	const date = new Date();
+	const year = date.getFullYear();
+	const month = String(date.getMonth() + 1).padStart(2, '0'); // Months are 0-indexed
+	const day = String(date.getDate()).padStart(2, '0');
+	const hours = String(date.getHours()).padStart(2, '0');
+	const minutes = String(date.getMinutes()).padStart(2, '0');
+	const seconds = String(date.getSeconds()).padStart(2, '0');
+
+	return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
 export function LOG_SUCCESS(input: string): void {
-	const time = new Date();
-	input = `[${time.getHours()}:${time.getMinutes()}:${time.getSeconds()}] [SUCCESS]: ${input}`;
+	input = `[${getCurrentTimestamp()}] [SUCCESS]: ${input}`;
 	streams.success.write(`${input}\n`);
 
 	console.log(`${input}`.green.bold);
 }
 
 export function LOG_ERROR(input: string): void {
-	const time = new Date();
-	input = `[${time.getHours()}:${time.getMinutes()}:${time.getSeconds()}] [ERROR]: ${input}`;
+	input = `[${getCurrentTimestamp()}] [ERROR]: ${input}`;
 	streams.error.write(`${input}\n`);
 
-	console.log(`${input}`.red.bold);
+	console.error(`${input}`.red.bold);
 }
 
 export function LOG_WARN(input: string): void {
-	const time = new Date();
-	input = `[${time.getHours()}:${time.getMinutes()}:${time.getSeconds()}] [WARN]: ${input}`;
+	input = `[${getCurrentTimestamp()}] [WARN]: ${input}`;
 	streams.warn.write(`${input}\n`);
 
 	console.log(`${input}`.yellow.bold);
 }
 
 export function LOG_INFO(input: string): void {
-	const time = new Date();
-	input = `[${time.getHours()}:${time.getMinutes()}:${time.getSeconds()}] [INFO]: ${input}`;
+	input = `[${getCurrentTimestamp()}] [INFO]: ${input}`;
 	streams.info.write(`${input}\n`);
 
 	console.log(`${input}`.cyan.bold);

src/services/npdi.ts

@@ -1,23 +1,22 @@
 import path from 'node:path';
-import fs from 'fs-extra';
 import express from 'express';
 import subdomain from 'express-subdomain';
+import { fileErrCallback } from '@/util';
 
 const npdi = express.Router();
 
 npdi.get('/p01/data/1/:titleHash/:dataID/:fileHash', (request, response) => {
 	const { titleHash, fileHash } = request.params;
 	const contentPath = path.normalize(`${__dirname}/../../cdn/content/encrypted/${titleHash}/${fileHash}`);
 
-	if (fs.existsSync(contentPath)) {
-		response.set('Content-Type', 'applicatoin/octet-stream');
-		response.set('Content-Disposition', 'attachment');
-		response.set('Content-Transfer-Encoding', 'binary');
-		response.set('Content-Type', 'applicatoin/octet-stream');
-		response.sendFile(contentPath);
-	} else {
-		response.sendStatus(404);
-	}
+	response.sendFile(contentPath, {
+		headers: {
+			// The misspelling here is intentional, it's what the official server sets
+			'Content-Type': 'applicatoin/octet-stream',
+			'Content-Disposition': 'attachment',
+			'Content-Transfer-Encoding': 'binary',
+		}
+	}, fileErrCallback(response));
 });
 
 const router = express.Router();

src/services/npdl.ts

@@ -2,6 +2,8 @@ import express from 'express';
 import subdomain from 'express-subdomain';
 import { getTaskFile } from '@/database';
 import { getCDNFileStream } from '@/util';
+import { Stream } from 'node:stream';
+import { LOG_ERROR } from '@/logger';
 
 const npdl = express.Router();
 
@@ -37,7 +39,13 @@ npdl.get([
 	}
 
 	response.setHeader('Last-Modified', new Date(Number(file.updated)).toUTCString());
-	readStream.pipe(response);
+
+	Stream.pipeline(readStream, response, (err) => {
+		if (err) {
+			LOG_ERROR('Error with response stream: ' + err.message);
+			response.end();
+		}
+	});
 });
 
 const router = express.Router();

src/services/npts.ts

@@ -1,32 +1,30 @@
 import path from 'node:path';
-import fs from 'fs-extra';
 import express from 'express';
 import subdomain from 'express-subdomain';
+import { fileErrCallback } from '@/util';
 
 const npts = express.Router();
 
 npts.get('/p01/tasksheet/:id/:hash/:fileName', (request, response) => {
 	const { id, hash, fileName } = request.params;
 	const tasksheetPath = path.normalize(`${__dirname}/../../cdn/tasksheet/${id}/${hash}/${fileName}`);
 
-	if (fs.existsSync(tasksheetPath)) {
-		response.set('Content-Type', 'text/xml');
-		response.sendFile(tasksheetPath);
-	} else {
-		response.sendStatus(404);
-	}
+	response.sendFile(tasksheetPath, {
+		headers: {
+			'Content-Type': 'text/xml'
+		}
+	}, fileErrCallback(response));
 });
 
 npts.get('/p01/tasksheet/:id/:hash/:subfolder/:fileName', (request, response) => {
 	const { id, hash, subfolder, fileName } = request.params;
 	const tasksheetPath = path.normalize(`${__dirname}/../../cdn/tasksheet/${id}/${hash}/_subfolder/${subfolder}/${fileName}`);
 
-	if (fs.existsSync(tasksheetPath)) {
-		response.set('Content-Type', 'text/xml');
-		response.sendFile(tasksheetPath);
-	} else {
-		response.sendStatus(404);
-	}
+	response.sendFile(tasksheetPath, {
+		headers: {
+			'Content-Type': 'text/xml'
+		}
+	}, fileErrCallback(response));
 });
 
 const router = express.Router();

src/types/mongoose/cec-data.ts

@@ -13,6 +13,6 @@ export interface ICECDataMethods {}
 
 interface ICECDataQueryHelpers {}
 
-export interface CECDataModel extends Model<ICECData, ICECDataQueryHelpers, ICECDataMethods> {}
+export type CECDataModel = Model<ICECData, ICECDataQueryHelpers, ICECDataMethods>
 
 export type HydratedCECDataDocument = HydratedDocument<ICECData, ICECDataMethods>

src/types/mongoose/cec-slot.ts

@@ -10,6 +10,6 @@ export interface ICECSlotMethods {}
 
 interface ICECSlotQueryHelpers {}
 
-export interface CECSlotModel extends Model<ICECSlot, ICECSlotQueryHelpers, ICECSlotMethods> {}
+export type CECSlotModel = Model<ICECSlot, ICECSlotQueryHelpers, ICECSlotMethods>
 
 export type HydratedCECSlotDocument = HydratedDocument<ICECSlot, ICECSlotMethods>

src/types/mongoose/file.ts

@@ -26,6 +26,6 @@ export interface IFileMethods {}
 
 interface IFileQueryHelpers {}
 
-export interface FileModel extends Model<IFile, IFileQueryHelpers, IFileMethods> {}
+export type FileModel = Model<IFile, IFileQueryHelpers, IFileMethods>
 
 export type HydratedFileDocument = HydratedDocument<IFile, IFileMethods>

src/types/mongoose/task.ts

@@ -17,6 +17,6 @@ export interface ITaskMethods {}
 
 interface ITaskQueryHelpers {}
 
-export interface TaskModel extends Model<ITask, ITaskQueryHelpers, ITaskMethods> {}
+export type TaskModel = Model<ITask, ITaskQueryHelpers, ITaskMethods>
 
 export type HydratedTaskDocument = HydratedDocument<ITask, ITaskMethods>

src/util.ts

@@ -3,15 +3,18 @@ import path from 'node:path';
 import { Readable } from 'node:stream';
 import fs from 'fs-extra';
 import { createChannel, createClient, Metadata } from 'nice-grpc';
-import { GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
+import { GetObjectCommand, PutObjectCommand, S3, S3Client } from '@aws-sdk/client-s3';
 import { AccountClient, AccountDefinition } from '@pretendonetwork/grpc/account/account_service';
 import { FriendsClient, FriendsDefinition } from '@pretendonetwork/grpc/friends/friends_service';
 import { GetNEXDataResponse } from '@pretendonetwork/grpc/account/get_nex_data_rpc';
 import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { GetUserFriendPIDsResponse } from '@pretendonetwork/grpc/friends/get_user_friend_pids_rpc';
 import { config, disabledFeatures } from '@/config-manager';
+import { NodeJsClient } from '@smithy/types';
+import { Response } from 'express';
+import { LOG_ERROR } from '@/logger';
 
-let s3: S3;
+let s3: NodeJsClient<S3Client>;
 
 if (!disabledFeatures.s3) {
 	s3 = new S3({
@@ -57,6 +60,21 @@ const VALID_FILE_NOTIFY_CONDITIONS = [
 	'app', 'account'
 ];
 
+export function fileErrCallback(response: Response) {
+	return (err: NodeJS.ErrnoException): void => {
+		if (err) {
+			if (err.code === 'ENOENT') {
+				response.sendStatus(404);
+			} else {
+				if (!response.headersSent) {
+					response.status(500).send('Server Error');
+				}
+				LOG_ERROR('Error in sending file: ' + err.message);
+			}
+		}
+	};
+}
+
 export function md5(input: crypto.BinaryLike): string {
 	return crypto.createHash('md5').update(input).digest('hex');
 }
@@ -138,7 +156,7 @@ export async function getFriends(pid: number): Promise<GetUserFriendPIDsResponse
 	}
 }
 
-export async function getCDNFileStream(key: string): Promise<Readable | fs.ReadStream | null> {
+export async function getCDNFileStream(key: string): Promise<Readable | null> {
 	try {
 		if (disabledFeatures.s3) {
 			return await getLocalCDNFile(key);
@@ -152,7 +170,7 @@ export async function getCDNFileStream(key: string): Promise<Readable | fs.ReadS
 				return null;
 			}
 
-			return response.Body as Readable;
+			return response.Body;
 		}
 	} catch (error) {
 		return null;