Strict mode

james-pre · james-pre · commit 4c6e0b59fb10 · 2024-10-05T22:34:03.000-05:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -32,6 +32,7 @@
 		"@typescript-eslint/adjacent-overload-signatures": "warn",
 		"@typescript-eslint/no-inferrable-types": "warn",
 		"@typescript-eslint/no-namespace": "off",
-		"@typescript-eslint/no-duplicate-enum-values": "off"
+		"@typescript-eslint/no-duplicate-enum-values": "off",
+		"@typescript-eslint/no-explicit-any": "warn"
 	}
 }
diff --git a/functions/account/create.ts b/functions/account/create.ts
@@ -14,12 +14,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 		let newUser: Account;
 		try {
 			newUser = await createAccount(body.username, body.email, body.password);
-		} catch (err) {
+		} catch (err: any) {
 			return parseError(err);
 		}
 
 		return response(StatusCodes.OK, newUser);
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/account/delete.ts b/functions/account/delete.ts
@@ -24,7 +24,7 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 		await deleteAccount(target.id, body.reason);
 
 		return response(StatusCodes.OK);
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/account/info.ts b/functions/account/info.ts
@@ -26,7 +26,7 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 
 		if (!body.multiple) {
 			checkParams(body, 'key', 'value');
-			const target = await getAccount(body.key, body.value);
+			const target = await getAccount(body.key!, body.value!);
 
 			await checkAuth({
 				auth: request,
@@ -52,12 +52,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 		}
 
 		checkParams(body, 'key', 'value');
-		const accounts = await getAccounts(body.key, body.value);
+		const accounts = await getAccounts(body.key!, body.value!);
 		return response(
 			StatusCodes.OK,
 			accounts.map(account => stripAccountInfo(account, body.access))
 		);
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/account/login.ts b/functions/account/login.ts
@@ -29,12 +29,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 		let token;
 		try {
 			token = await login(account.id);
-		} catch (err) {
+		} catch (err: any) {
 			return parseError(err);
 		}
 
 		return response(StatusCodes.OK, { ...stripAccountInfo(account), token });
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/account/logout.ts b/functions/account/logout.ts
@@ -23,12 +23,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 
 		try {
 			await logout(target.id, body.reason);
-		} catch (err) {
+		} catch (err: any) {
 			return parseError(err);
 		}
 
 		return response(StatusCodes.OK, true);
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/account/num.ts b/functions/account/num.ts
@@ -9,7 +9,7 @@ export async function onRequest({ env }: RequestContext) {
 	try {
 		setDB(env.DB);
 		return response(StatusCodes.OK, await getAccountNum(), false);
-	} catch (e) {
+	} catch (e: any) {
 		console.error(e);
 		return error(StatusCodes.INTERNAL_SERVER_ERROR, env.DEBUG && e?.message);
 	}
diff --git a/functions/account/update.ts b/functions/account/update.ts
@@ -3,7 +3,6 @@ import { AccountType, accountAttributes, stripAccountInfo, type FullAccount } fr
 import { setAccountAttribute, setDB } from '../../src/backend/api';
 import type { RequestContext } from '../../src/backend/context';
 import { checkAuth, checkBody, error, getAccountFromTokenOrID, parseError, response } from '../../src/backend/utils';
-import { Access } from '../../src/generic';
 
 export { onRequestOptions } from '../../src/backend/utils';
 
@@ -31,18 +30,18 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo
 		await checkAuth({
 			auth: request,
 			target,
-			allowIfSame: ['username', 'email'].includes(body.key),
-			requiredType: requiredTypeForChange[body.key],
+			allowIfSame: ['username', 'email'].includes(body.key!),
+			requiredType: requiredTypeForChange[body.key!],
 		});
 
 		try {
-			await setAccountAttribute(target.id, body.key, body.value, body.reason);
-		} catch (err) {
+			await setAccountAttribute(target.id, body.key!, body.value!, body.reason);
+		} catch (err: any) {
 			throw parseError(err);
 		}
 
 		return response(StatusCodes.OK, stripAccountInfo(target));
-	} catch (e) {
+	} catch (e: any) {
 		if (e instanceof Response) {
 			return e;
 		}
diff --git a/functions/index.ts b/functions/index.ts
@@ -11,7 +11,7 @@ export async function onRequest({ env }: RequestContext) {
 			debug: !!env.DEBUG,
 		};
 		return response(StatusCodes.OK, metadata, false);
-	} catch (e) {
+	} catch (e: any) {
 		console.error(e);
 		return error(StatusCodes.INTERNAL_SERVER_ERROR, env.DEBUG && e?.message);
 	}
diff --git a/functions/metadata.ts b/functions/metadata.ts
@@ -11,7 +11,7 @@ export async function onRequest({ env }: RequestContext) {
 			debug: !!env.DEBUG,
 		};
 		return response(StatusCodes.OK, metadata, false);
-	} catch (e) {
+	} catch (e: any) {
 		console.error(e);
 		return error(StatusCodes.INTERNAL_SERVER_ERROR, env.DEBUG && e?.message);
 	}
diff --git a/src/backend/api.ts b/src/backend/api.ts
@@ -47,7 +47,7 @@ export function sendMailToUser({ username, email }: { username: string; email?:
 }
 
 export async function getAccountNum(): Promise<number> {
-	return getDB().prepare('select count(1) as num from accounts').first<number>('num');
+	return (await getDB().prepare('select count(1) as num from accounts').first<number>('num'))!;
 }
 
 export async function getAccount(attr: string, value: string): Promise<FullAccount> {
@@ -170,8 +170,8 @@ export async function createAccount(username: string, email: string, rawPassword
 }
 
 export async function accountExists(id: string): Promise<boolean> {
-	const result = await getDB().prepare('select count(1) as num from accounts where id=?').bind(id).all();
-	return !!result[0].num;
+	const { results } = await getDB().prepare('select count(1) as num from accounts where id=?').bind(id).all();
+	return !!results[0].num;
 }
 
 export async function deleteAccount(id: string, reason?: string): Promise<FullAccount> {
@@ -188,7 +188,7 @@ export async function deleteAccount(id: string, reason?: string): Promise<FullAc
 		If you have any concerns please reach out to support@blankstorm.net.`
 	);
 
-	return getDB().prepare('delete from accounts where id=?').bind(id).first();
+	return (await getDB().prepare('delete from accounts where id=?').bind(id).first())!;
 }
 
 export async function login(id: string): Promise<string> {
@@ -197,8 +197,8 @@ export async function login(id: string): Promise<string> {
 	return token;
 }
 
-export function logout(id: string, reason?: string): Promise<boolean> {
-	return getDB().prepare('update accounts set token="" where id=?').bind(id).first();
+export async function logout(id: string, reason?: string): Promise<boolean> {
+	return (await getDB().prepare('update accounts set token="" where id=?').bind(id).first())!;
 }
 
 export async function generateSession(id: string): Promise<string> {
diff --git a/src/backend/utils.ts b/src/backend/utils.ts
@@ -20,7 +20,7 @@ export async function parseBody<V extends Record<string, FormDataEntryValue>>(re
 export function response<R>(status: StatusCodes = StatusCodes.OK, result?: R, error = false): Response {
 	const statusText: ReasonPhrases = ReasonPhrases[StatusCodes[status] as keyof typeof ReasonPhrases];
 
-	const body: APIResponse<R> = { status, statusText, result, error };
+	const body: APIResponse<R | undefined> = { status, statusText, result, error };
 	return new Response(JSON.stringify(body), {
 		status,
 		statusText,
@@ -55,7 +55,7 @@ export async function auth({
 	allowIfSame = false,
 	access = Access.PROTECTED,
 	debug = false,
-}: AuthorizationOptions): Promise<Response> {
+}: AuthorizationOptions): Promise<Response | void> {
 	try {
 		if (access == Access.PUBLIC) {
 			return;
@@ -67,7 +67,7 @@ export async function auth({
 			if (!auth.headers.has('Authorization')) {
 				return error(StatusCodes.UNAUTHORIZED, 'Missing authorization header');
 			}
-			auth = auth.headers.get('Authorization');
+			auth = auth.headers.get('Authorization')!;
 		}
 		if (auth.startsWith('Bearer ')) {
 			auth = auth.substring(7);
@@ -82,10 +82,10 @@ export async function auth({
 			return error(StatusCodes.UNAUTHORIZED, 'Invalid auth token');
 		}
 
-		if (authUser.type < Math.max(requiredType, +target?.type + 1) && (target?.id != authUser.id || !allowIfSame) && access < Access.PUBLIC) {
+		if (authUser.type < Math.max(requiredType, (target?.type || 0) + 1) && (target?.id != authUser.id || !allowIfSame) && access < Access.PUBLIC) {
 			return error(StatusCodes.FORBIDDEN, 'Permission denied');
 		}
-	} catch (e) {
+	} catch (e: any) {
 		return error(StatusCodes.INTERNAL_SERVER_ERROR, 'Authorization failed' + (debug && ': ' + e.message));
 	}
 }
@@ -131,11 +131,11 @@ export async function checkBody<const B>(request: CFRequest, ...params: (keyof B
 }
 
 export async function getAccountFromTokenOrID<const B extends { id?: string; token?: string }>(body: B): Promise<Account> {
-	if (!(body.id || body.token)) {
+	if (!(body.token || body.id)) {
 		throw error(StatusCodes.BAD_REQUEST, 'Missing id or token');
 	}
 
-	const targetUser = await getAccount(body.token ? 'token' : 'id', body.token || body.id);
+	const targetUser = await getAccount(body.token ? 'token' : 'id', (body.token || body.id)!);
 
 	if (!targetUser) {
 		throw error(StatusCodes.NOT_FOUND, 'Target user does not exist');
diff --git a/src/frontend/endpoints/account.ts b/src/frontend/endpoints/account.ts
@@ -20,7 +20,7 @@ function parseAccount<A extends Account>(result: AccountResult): A {
 		created: new Date(result?.created),
 		is_disabled: result?.is_disabled,
 	};
-	for (const maybe of ['token', 'session', 'email']) {
+	for (const maybe of ['token', 'session', 'email'] as const) {
 		if (maybe in result) {
 			parsed[maybe] = result[maybe];
 		}
diff --git a/src/utils.ts b/src/utils.ts
@@ -3,4 +3,5 @@
  */
 export type KeyValue<T> = {
 	[K in keyof T]: [K, T[K]];
-}[keyof T];
+}[keyof T] &
+	[unknown, unknown];
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,6 @@
 		"noEmit": true,
 		"esModuleInterop": true,
 		"allowJs": true,
-		"strictFunctionTypes": true,
+		"strict": true,
 	},
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"@typescript-eslint/adjacent-overload-signatures": "warn",`
`33`	`33`	`"@typescript-eslint/no-inferrable-types": "warn",`
`34`	`34`	`"@typescript-eslint/no-namespace": "off",`
`35`		`- "@typescript-eslint/no-duplicate-enum-values": "off"`
	`35`	`+ "@typescript-eslint/no-duplicate-enum-values": "off",`
	`36`	`+ "@typescript-eslint/no-explicit-any": "warn"`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo`
`14`	`14`	`let newUser: Account;`
`15`	`15`	`try {`
`16`	`16`	`newUser = await createAccount(body.username, body.email, body.password);`
`17`		`- } catch (err) {`
	`17`	`+ } catch (err: any) {`
`18`	`18`	`return parseError(err);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`return response(StatusCodes.OK, newUser);`
`22`		`- } catch (e) {`
	`22`	`+ } catch (e: any) {`
`23`	`23`	`if (e instanceof Response) {`
`24`	`24`	`return e;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo`
`24`	`24`	`await deleteAccount(target.id, body.reason);`
`25`	`25`
`26`	`26`	`return response(StatusCodes.OK);`
`27`		`- } catch (e) {`
	`27`	`+ } catch (e: any) {`
`28`	`28`	`if (e instanceof Response) {`
`29`	`29`	`return e;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo`
`29`	`29`	`let token;`
`30`	`30`	`try {`
`31`	`31`	`token = await login(account.id);`
`32`		`- } catch (err) {`
	`32`	`+ } catch (err: any) {`
`33`	`33`	`return parseError(err);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`return response(StatusCodes.OK, { ...stripAccountInfo(account), token });`
`37`		`- } catch (e) {`
	`37`	`+ } catch (e: any) {`
`38`	`38`	`if (e instanceof Response) {`
`39`	`39`	`return e;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ export async function onRequest({ env, request }: RequestContext): Promise<Respo`
`23`	`23`
`24`	`24`	`try {`
`25`	`25`	`await logout(target.id, body.reason);`
`26`		`- } catch (err) {`
	`26`	`+ } catch (err: any) {`
`27`	`27`	`return parseError(err);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`return response(StatusCodes.OK, true);`
`31`		`- } catch (e) {`
	`31`	`+ } catch (e: any) {`
`32`	`32`	`if (e instanceof Response) {`
`33`	`33`	`return e;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export async function onRequest({ env }: RequestContext) {`
`9`	`9`	`try {`
`10`	`10`	`setDB(env.DB);`
`11`	`11`	`return response(StatusCodes.OK, await getAccountNum(), false);`
`12`		`- } catch (e) {`
	`12`	`+ } catch (e: any) {`
`13`	`13`	`console.error(e);`
`14`	`14`	`return error(StatusCodes.INTERNAL_SERVER_ERROR, env.DEBUG && e?.message);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export async function onRequest({ env }: RequestContext) {`
`11`	`11`	`debug: !!env.DEBUG,`
`12`	`12`	`};`
`13`	`13`	`return response(StatusCodes.OK, metadata, false);`
`14`		`- } catch (e) {`
	`14`	`+ } catch (e: any) {`
`15`	`15`	`console.error(e);`
`16`	`16`	`return error(StatusCodes.INTERNAL_SERVER_ERROR, env.DEBUG && e?.message);`
`17`	`17`	`}`