style: eslint changes

eslint.config.mjs

@@ -9,5 +9,12 @@ export default [
 				...globals.node
 			}
 		}
+	},
+	{
+		rules: {
+			// * Because mii-js is imported via GitHub, it will not be resolved by eslint
+			// TODO: Remove this rule when mii-js is published to npm
+			'import/no-unresolved': ['error', { ignore: ['mii-js'] }]
+		}
 	}
 ];

migrations/add-console-type-to-nex-account.js

@@ -31,4 +31,4 @@ database.connect().then(async function () {
 	console.log('Migrated accounts');
 
 	process.exit(0);
-});
+});

migrations/add-missing-friendcodes.js

@@ -11,7 +11,6 @@ database.connect().then(async function () {
 	});
 
 	for (const nexAccount of nexAccountsToBeChanged) {
-
 		if (!nexAccount.friend_code) {
 			const pid = nexAccount.pid;
 			const pidBuffer = Buffer.alloc(4);
@@ -33,4 +32,4 @@ database.connect().then(async function () {
 	console.log('Migrated accounts');
 
 	process.exit(0);
-});
+});

migrations/add-missing-server-aes-keys.js

@@ -10,7 +10,6 @@ database.connect().then(async function () {
 	});
 
 	for (const server of servers) {
-
 		if (!server.aes_key) {
 			server.aes_key = crypto.randomBytes(32).toString('hex');
 
@@ -21,4 +20,4 @@ database.connect().then(async function () {
 	console.log('Migrated accounts');
 
 	process.exit(0);
-});
+});

package.json

@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@hcaptcha/types": "^1.0.3",
-    "@pretendonetwork/eslint-config": "^0.0.7",
+    "@pretendonetwork/eslint-config": "^0.0.8",
     "@types/bcrypt": "^5.0.0",
     "@types/buffer-crc32": "^0.2.2",
     "@types/cors": "^2.8.13",
@@ -85,4 +85,4 @@
     "ndarray": "^1.0.19",
     "typescript": "^4.9.5"
   }
-}
+}

pnid-scrub.js

@@ -1,38 +1,41 @@
+const { confirm, input } = require('@inquirer/prompts');
 const { connect } = require('./dist/database');
 const { PNID } = require('./dist/models/pnid');
-const { confirm, input } = require('@inquirer/prompts');
 
 async function bootstrap() {
-    await connect();
-
-    const pnidName = await input({ message: 'What PNID do you want to delete?' });
-    const pnid = await PNID.findOne({ username:pnidName.trim() });
-    if (!pnid) {
-        console.log("Could not find PNID");
-        process.exit(1);
-    }
-
-    console.log('Before:', pnid);
-
-    if (pnid.deleted) {
-        console.log("PNID is already marked as deleted");
-        process.exit(1);
-    }
-
-    const confirmed = await confirm({ message: 'Do you want to delete this PNID',default: false });
-    if (!confirmed) {
-        console.log("Aborted");
-        process.exit(1);
-    }
-
-    await pnid.scrub();
-    await pnid.save();
-
-    console.log('After:', pnid);
-    if (pnid.deleted) console.log("SUCCESSFULLY DELETED");
-    else console.log("COULD NOT DELETE");
-
-    process.exit(0);
+	await connect();
+
+	const pnidName = await input({ message: 'What PNID do you want to delete?' });
+	const pnid = await PNID.findOne({ username: pnidName.trim() });
+	if (!pnid) {
+		console.log('Could not find PNID');
+		process.exit(1);
+	}
+
+	console.log('Before:', pnid);
+
+	if (pnid.deleted) {
+		console.log('PNID is already marked as deleted');
+		process.exit(1);
+	}
+
+	const confirmed = await confirm({ message: 'Do you want to delete this PNID', default: false });
+	if (!confirmed) {
+		console.log('Aborted');
+		process.exit(1);
+	}
+
+	await pnid.scrub();
+	await pnid.save();
+
+	console.log('After:', pnid);
+	if (pnid.deleted) {
+		console.log('SUCCESSFULLY DELETED');
+	} else {
+		console.log('COULD NOT DELETE');
+	}
+
+	process.exit(0);
 }
 
 bootstrap();

src/cache.ts

@@ -11,7 +11,7 @@ const LOCAL_CDN_BASE = `${__dirname}/../cdn`;
 export async function connect(): Promise<void> {
 	if (!disabledFeatures.redis) {
 		client = redis.createClient(config.redis.client);
-		client.on('error', (err) => console.log('Redis Client Error', err));
+		client.on('error', err => console.log('Redis Client Error', err));
 
 		await client.connect();
 	}
@@ -58,4 +58,4 @@ export async function getLocalCDNFile(name: string, encoding?: BufferEncoding):
 
 export async function setLocalCDNFile(name: string, value: Buffer): Promise<void> {
 	await setCachedFile(`local_cdn:${name}`, value);
-}
+}

src/config-manager.ts

@@ -1,9 +1,10 @@
 import fs from 'fs-extra';
-import mongoose from 'mongoose';
 import dotenv from 'dotenv';
 import isValidHostname from 'is-valid-hostname';
 import { LOG_INFO, LOG_WARN, LOG_ERROR, formatHostnames } from '@/logger';
-import { type Config, domainServices, optionalDomainServices } from '@/types/common/config';
+import { domainServices, optionalDomainServices } from '@/types/common/config';
+import type mongoose from 'mongoose';
+import type { Config } from '@/types/common/config';
 
 dotenv.config();
 
@@ -74,9 +75,9 @@ export const config: Config = {
 	grpc: {
 		master_api_keys: {
 			account: process.env.PN_ACT_CONFIG_GRPC_MASTER_API_KEY_ACCOUNT || '',
-			api: process.env.PN_ACT_CONFIG_GRPC_MASTER_API_KEY_API || '',
+			api: process.env.PN_ACT_CONFIG_GRPC_MASTER_API_KEY_API || ''
 		},
-		port: Number(process.env.PN_ACT_CONFIG_GRPC_PORT || ''),
+		port: Number(process.env.PN_ACT_CONFIG_GRPC_PORT || '')
 	},
 	server_environment: process.env.PN_ACT_CONFIG_SERVER_ENVIRONMENT || '',
 	datastore: {
@@ -90,7 +91,7 @@ export const config: Config = {
 		datastore: (process.env.PN_ACT_CONFIG_DOMAINS_DATASTORE || 'datastore.pretendo.cc').split(','),
 		local_cdn: (process.env.PN_ACT_CONFIG_DOMAINS_LOCAL_CDN || '').split(','),
 		nasc: (process.env.PN_ACT_CONFIG_DOMAINS_NASC || 'nasc.pretendo.cc').split(','),
-		nnas: (process.env.PN_ACT_CONFIG_DOMAINS_NNAS || 'c.account.pretendo.cc,account.pretendo.cc').split(','),
+		nnas: (process.env.PN_ACT_CONFIG_DOMAINS_NNAS || 'c.account.pretendo.cc,account.pretendo.cc').split(',')
 	}
 };
 
@@ -116,7 +117,11 @@ for (const service of domainServices) {
 	const uniqueDomains = [...new Set(config.domains[service])];
 
 	for (const domain of uniqueDomains) {
-		isValidHostname(domain) ? validDomains.push(domain) : invalidDomains.push(domain);
+		if (isValidHostname(domain)) {
+			validDomains.push(domain);
+		} else {
+			invalidDomains.push(domain);
+		}
 	}
 
 	if (validDomains.length === 0 && !optionalDomainServices.includes(service)) {
@@ -230,7 +235,7 @@ if (disabledFeatures.s3) {
 		if (disabledFeatures.redis) {
 			LOG_WARN('Both S3 and Redis are disabled. Large CDN files will use the in-memory cache, which may result in high memory use. Please enable S3 if you\'re running a production server.');
 		}
-	}	
+	}
 }
 
 if (!config.aes_key) {
@@ -270,4 +275,4 @@ if (!config.datastore.signature_secret) {
 if (!configValid) {
 	LOG_ERROR('Config is invalid. Exiting');
 	process.exit(0);
-}
+}

src/database.ts

@@ -6,13 +6,13 @@ import { PNID } from '@/models/pnid';
 import { Server } from '@/models/server';
 import { LOG_ERROR } from '@/logger';
 import { config } from '@/config-manager';
-import { HydratedPNIDDocument } from '@/types/mongoose/pnid';
-import { IDeviceAttribute } from '@/types/mongoose/device-attribute';
-import { HydratedServerDocument } from '@/types/mongoose/server';
-import { PNIDProfile } from '@/types/services/nnas/pnid-profile';
-import { ConnectionData } from '@/types/services/api/connection-data';
-import { ConnectionResponse } from '@/types/services/api/connection-response';
-import { DiscordConnectionData } from '@/types/services/api/discord-connection-data';
+import type { HydratedPNIDDocument } from '@/types/mongoose/pnid';
+import type { IDeviceAttribute } from '@/types/mongoose/device-attribute';
+import type { HydratedServerDocument } from '@/types/mongoose/server';
+import type { PNIDProfile } from '@/types/services/nnas/pnid-profile';
+import type { ConnectionData } from '@/types/services/api/connection-data';
+import type { ConnectionResponse } from '@/types/services/api/connection-response';
+import type { DiscordConnectionData } from '@/types/services/api/discord-connection-data';
 
 const connection_string = config.mongoose.connection_string;
 const options = config.mongoose.options;
@@ -202,7 +202,7 @@ export async function getPNIDProfileJSONByPID(pid: number): Promise<PNIDProfile
 				}
 			},
 			name: pnid.mii.name,
-			primary: pnid.mii.primary ? 'Y' : 'N',
+			primary: pnid.mii.primary ? 'Y' : 'N'
 		},
 		region: pnid.region,
 		tz_name: pnid.timezone.name,
@@ -221,7 +221,9 @@ export async function getServerByGameServerID(gameServerID: string, accessMode:
 
 	for (const mode of searchModes) {
 		const server = servers.find(s => s.access_mode === mode);
-		if (server) return server;
+		if (server) {
+			return server;
+		}
 	}
 
 	return null;
@@ -237,7 +239,9 @@ export async function getServerByTitleID(titleID: string, accessMode: string): P
 
 	for (const mode of searchModes) {
 		const server = servers.find(s => s.access_mode === mode);
-		if (server) return server;
+		if (server) {
+			return server;
+		}
 	}
 
 	return null;
@@ -253,7 +257,9 @@ export async function getServerByClientID(clientID: string, accessMode: string):
 
 	for (const mode of searchModes) {
 		const server = servers.find(s => s.access_mode === mode);
-		if (server) return server;
+		if (server) {
+			return server;
+		}
 	}
 
 	return null;
@@ -306,4 +312,4 @@ export async function removePNIDConnectionDiscord(pnid: HydratedPNIDDocument): P
 		app: 'api',
 		status: 200
 	};
-}
+}

src/logger.ts

@@ -48,4 +48,4 @@ export function LOG_INFO(input: string): void {
 
 export function formatHostnames(hostnames: string[]): string {
 	return hostnames.map(d => `'${d}'`).join(', ');
-}
+}

src/mailer.ts

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import nodemailer from 'nodemailer';
 import * as aws from '@aws-sdk/client-ses';
 import { config, disabledFeatures } from '@/config-manager';
-import { MailerOptions } from '@/types/common/mailer-options';
+import type { MailerOptions } from '@/types/common/mailer-options';
 
 const genericEmailTemplate = fs.readFileSync(path.join(__dirname, './assets/emails/genericTemplate.html'), 'utf8');
 const confirmationEmailTemplate = fs.readFileSync(path.join(__dirname, './assets/emails/confirmationTemplate.html'), 'utf8');
@@ -30,7 +30,7 @@ if (!disabledFeatures.email) {
 
 export async function sendMail(options: MailerOptions): Promise<void> {
 	if (!disabledFeatures.email) {
-		const { to, subject, username, paragraph, preview, text, link, confirmation  } = options;
+		const { to, subject, username, paragraph, preview, text, link, confirmation } = options;
 
 		let html = confirmation ? confirmationEmailTemplate : genericEmailTemplate;
 

src/middleware/api.ts

@@ -1,6 +1,6 @@
-import express from 'express';
 import { getValueFromHeaders } from '@/util';
 import { getPNIDByTokenAuth } from '@/database';
+import type express from 'express';
 
 async function APIMiddleware(request: express.Request, _response: express.Response, next: express.NextFunction): Promise<void> {
 	const authHeader = getValueFromHeaders(request.headers, 'authorization');
@@ -15,10 +15,10 @@ async function APIMiddleware(request: express.Request, _response: express.Respon
 
 		request.pnid = pnid;
 	} catch (error) {
-		// TODO - Log error
+		console.error('Failed to get PNID: ', error);
 	}
 
 	return next();
 }
 
-export default APIMiddleware;
+export default APIMiddleware;

src/middleware/cemu.ts

@@ -1,4 +1,4 @@
-import express from 'express';
+import type express from 'express';
 
 function CemuMiddleware(request: express.Request, _response: express.Response, next: express.NextFunction): void {
 	const subdomain = request.subdomains.reverse().join('.');
@@ -8,4 +8,4 @@ function CemuMiddleware(request: express.Request, _response: express.Response, n
 	return next();
 }
 
-export default CemuMiddleware;
+export default CemuMiddleware;

src/middleware/client-header.ts

@@ -1,12 +1,12 @@
-import express from 'express';
 import xmlbuilder from 'xmlbuilder';
 import { getValueFromHeaders } from '@/util';
+import type express from 'express';
 
 const VALID_CLIENT_ID_SECRET_PAIRS: Record<string, string> = {
 	// * 'Key' is the client ID, 'Value' is the client secret
-	'a2efa818a34fa16b8afbc8a74eba3eda': 'c91cdb5658bd4954ade78533a339cf9a', // * Possibly WiiU exclusive?
-	'daf6227853bcbdce3d75baee8332b': '3eff548eac636e2bf45bb7b375e7b6b0', // * Possibly 3DS exclusive?
-	'ea25c66c26b403376b4c5ed94ab9cdea': 'd137be62cb6a2b831cad8c013b92fb55', // * Possibly 3DS exclusive?
+	a2efa818a34fa16b8afbc8a74eba3eda: 'c91cdb5658bd4954ade78533a339cf9a', // * Possibly WiiU exclusive?
+	daf6227853bcbdce3d75baee8332b: '3eff548eac636e2bf45bb7b375e7b6b0', // * Possibly 3DS exclusive?
+	ea25c66c26b403376b4c5ed94ab9cdea: 'd137be62cb6a2b831cad8c013b92fb55' // * Possibly 3DS exclusive?
 };
 
 function nintendoClientHeaderCheck(request: express.Request, response: express.Response, next: express.NextFunction): void {
@@ -39,4 +39,4 @@ function nintendoClientHeaderCheck(request: express.Request, response: express.R
 	return next();
 }
 
-export default nintendoClientHeaderCheck;
+export default nintendoClientHeaderCheck;