fix: resolve compile errors for new config

Author: mrjvs

apps/juxt-api/package.json

@@ -7,7 +7,7 @@
 		"dev": "tsup --watch --onSuccess \"node --enable-source-maps dist/server.js\"",
 		"lint": "eslint .",
 		"lint:fix": "eslint . --fix",
-		"build": "npm run lint && tsup",
+		"build": "tsup && tsc --noEmit",
 		"start": "node --enable-source-maps dist/server.js",
 		"test": "ts-node test/test.ts"
 	},

apps/juxt-api/src/config.ts

@@ -7,7 +7,7 @@ const schema = z.object({
 	}).default({}),
 	accountServerAddress: z.string(),
 	aesKey: z.string(),
-	cdnUrl: z.string().url().transform(s => s.replace(/\/$/, '')),
+	cdnUrl: z.string().url().transform(s => s.replace(/\/$/g, '')),
 	mongoose: z.object({
 		uri: z.string(),
 		options: z.object({
@@ -28,12 +28,12 @@ const schema = z.object({
 		friends: z.object({
 			host: z.string(),
 			port: z.string(),
-			api_key: z.string().optional()
+			apiKey: z.string()
 		}),
 		account: z.object({
 			host: z.string(),
 			port: z.string(),
-			api_key: z.string().optional()
+			apiKey: z.string()
 		})
 	})
 });

apps/juxt-api/src/database.ts

@@ -19,7 +19,7 @@ const { mongoose: mongooseConfig } = config;
 let connection: mongoose.Connection;
 
 export async function connect(): Promise<void> {
-	await mongoose.connect(mongooseConfig.connection_string, mongooseConfig.options);
+	await mongoose.connect(mongooseConfig.uri, mongooseConfig.options);
 
 	connection = mongoose.connection;
 	connection.on('connected', () => {

apps/juxt-api/src/services/api/routes/friend_messages.ts

@@ -196,7 +196,7 @@ router.post('/', upload.none(), async function (request: express.Request, respon
 		is_app_jumpable: request.body.is_app_jumpable,
 		language_id: request.body.language_id,
 		mii: sender.mii.data,
-		mii_face_url: `${config.cdn_url}/mii/${sender.pid}/${miiFace}`,
+		mii_face_url: `${config.cdnUrl}/mii/${sender.pid}/${miiFace}`,
 		pid: request.pid,
 		platform_id: request.paramPack.platform_id,
 		region_id: request.paramPack.region_id,

apps/juxt-api/src/services/api/routes/posts.ts

@@ -365,7 +365,7 @@ async function newPost(request: express.Request, response: express.Response): Pr
 		is_app_jumpable: (jumpable) ? 1 : 0,
 		language_id: languageID,
 		mii: user.mii.data,
-		mii_face_url: `${config.cdn_url}/mii/${user.pid}/${miiFace}`,
+		mii_face_url: `${config.cdnUrl}/mii/${user.pid}/${miiFace}`,
 		pid: request.pid,
 		platform_id: platformID,
 		region_id: regionID,

apps/juxt-api/src/util.ts

@@ -17,10 +17,10 @@ import type { ParamPack } from '@/types/common/param-pack';
 import type { Token } from '@/types/common/token';
 
 // * nice-grpc doesn't export ChannelImplementation so this can't be typed
-const gRPCFriendsChannel = createChannel(`${config.grpc.friends.ip}:${config.grpc.friends.port}`);
+const gRPCFriendsChannel = createChannel(`${config.grpc.friends.host}:${config.grpc.friends.port}`);
 const gRPCFriendsClient = createClient(FriendsDefinition, gRPCFriendsChannel);
 
-const gRPCAccountChannel = createChannel(`${config.grpc.account.ip}:${config.grpc.account.port}`);
+const gRPCAccountChannel = createChannel(`${config.grpc.account.host}:${config.grpc.account.port}`);
 const gRPCAccountClient = createClient(AccountDefinition, gRPCAccountChannel);
 
 const s3 = new aws.S3({
@@ -80,7 +80,7 @@ export function decryptToken(token: Buffer): Buffer {
 	const expectedChecksum = token.readUint32BE();
 	const encryptedBody = token.subarray(4);
 
-	const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(config.aes_key, 'hex'), iv);
+	const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(config.aesKey, 'hex'), iv);
 
 	const decrypted = Buffer.concat([
 		decipher.update(encryptedBody),
@@ -166,7 +166,7 @@ export async function getUserFriendPIDs(pid: number): Promise<number[]> {
 		pid: pid
 	}, {
 		metadata: Metadata({
-			'X-API-Key': config.grpc.friends.api_key
+			'X-API-Key': config.grpc.friends.apiKey
 		})
 	});
 
@@ -178,7 +178,7 @@ export async function getUserFriendRequestsIncoming(pid: number): Promise<Friend
 		pid: pid
 	}, {
 		metadata: Metadata({
-			'X-API-Key': config.grpc.friends.api_key
+			'X-API-Key': config.grpc.friends.apiKey
 		})
 	});
 
@@ -190,7 +190,7 @@ export function getUserAccountData(pid: number): Promise<GetUserDataResponse> {
 		pid: pid
 	}, {
 		metadata: Metadata({
-			'X-API-Key': config.grpc.account.api_key
+			'X-API-Key': config.grpc.account.apiKey
 		})
 	});
 }

apps/juxt-api/tsconfig.json

@@ -6,6 +6,7 @@
 		"module": "ES2022",
 		"esModuleInterop": true,
 		"moduleResolution": "bundler",
+		"skipLibCheck": true,
 		"baseUrl": "src",
 		"outDir": "dist",
 		"allowJs": true,