chore: linting

Author: KatoakDR

.eslintrc.json

@@ -32,14 +32,25 @@
   "rules": {
     "no-else-return": "warn",
 
+    "curly": "error",
+
+    "prefer-arrow-callback": "error",
+
     "@typescript-eslint/array-type": [
       "warn",
       {
         "default": "generic"
       }
     ],
 
-    "@typescript-eslint/explicit-function-return-type": "warn",
+    "@typescript-eslint/explicit-function-return-type": [
+      "off",
+      {
+        "allowTypedFunctionExpressions": false
+      }
+    ],
+
+    "@typescript-eslint/explicit-module-boundary-types": "error",
 
     "@typescript-eslint/no-empty-interface": "off",
 

electron-builder.yml

@@ -2,7 +2,7 @@
 # https://www.electron.build/configuration/configuration
 # https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/scheme.json
 
-appId: 'com.github.dragonrealms-phoenix.phoenix'
+appId: com.github.dragonrealms-phoenix.phoenix
 
 # Name of the generated artifacts.
 # Note, this must result in unique names across all targets and architectures.

package.json

@@ -39,6 +39,7 @@
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "typecheck": "yarn typecheck:preload && yarn typecheck:node && yarn typecheck:web",
+    "tsc": "yarn typecheck",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
     "build": "yarn clean && yarn typecheck && VITE_PLUGIN_SENTRY_ENABLE=true electron-vite build",

src/main/sge/sge.login.ts

@@ -113,25 +113,25 @@ async function connect(
   );
 
   logger.info('connecting to login server');
-  const socket = tls.connect(mergedOptions, () => {
+  const socket = tls.connect(mergedOptions, (): void => {
     logger.info('connected to login server');
   });
 
-  socket.once('end', () => {
+  socket.once('end', (): void => {
     logger.info('connection to login server ended', { host, port });
   });
 
-  socket.once('close', () => {
+  socket.once('close', (): void => {
     logger.info('connection to login server closed', { host, port });
   });
 
-  socket.once('timeout', () => {
+  socket.once('timeout', (): void => {
     const timeout = socket.timeout;
     logger.error('login server timed out', { host, port, timeout });
     rejectSocket(new Error(`ERR:SOCKET:TIMEOUT:${timeout}`));
   });
 
-  socket.once('error', (error: Error) => {
+  socket.once('error', (error: Error): void => {
     logger.error('login server error', { host, port, error });
     rejectSocket(new Error(`ERR:SOCKET:${error.name}:${error.message}`));
   });
@@ -231,7 +231,11 @@ async function validateGameCode(options: {
   const { socket, gameCode } = options;
 
   const availableGames = await listAvailableGames({ socket });
-  const availableGameCodes = availableGames.map(({ code }) => code);
+  const availableGameCodes = availableGames.map(
+    (game: SGEGame): SGEGameCode => {
+      return game.code;
+    }
+  );
 
   if (!availableGameCodes.includes(gameCode)) {
     logger.error('game is not available to account', {

src/main/tls/tls.utils.ts

@@ -18,7 +18,7 @@ export async function sendAndReceive(options: {
 }): Promise<Buffer> {
   const { socket, payload } = options;
 
-  return new Promise<Buffer>((resolve, reject) => {
+  return new Promise<Buffer>((resolve, reject): void => {
     const dataListener = (response: Buffer): void => {
       resolveSocket(response);
     };
@@ -70,7 +70,7 @@ export async function downloadCertificate(
 
   logger.info('downloading certificate', { host, port });
 
-  return new Promise<tls.PeerCertificate>((resolve, reject) => {
+  return new Promise<tls.PeerCertificate>((resolve, reject): void => {
     const connectOptions: tls.ConnectionOptions = {
       // When downloading a self-signed cert then it won't be trusted yet
       // so we need to allow unauthorized requests for now.
@@ -80,26 +80,26 @@ export async function downloadCertificate(
       ...options,
     };
 
-    const socket = tls.connect(connectOptions, () => {
+    const socket = tls.connect(connectOptions, (): void => {
       logger.info('socket connected', { host, port });
       resolveSocket(socket.getPeerCertificate());
     });
 
-    socket.once('end', () => {
+    socket.once('end', (): void => {
       logger.info('socket connection ended', { host, port });
     });
 
-    socket.once('close', () => {
+    socket.once('close', (): void => {
       logger.info('socket connection closed', { host, port });
     });
 
-    socket.once('timeout', () => {
+    socket.once('timeout', (): void => {
       const timeout = socket.timeout;
       logger.error('socket timed out', { host, port, timeout });
       rejectSocket(new Error(`ERR:SOCKET:TIMEOUT:${timeout}`));
     });
 
-    socket.once('error', (error: Error) => {
+    socket.once('error', (error: Error): void => {
       logger.error('socket error', { host, port, error });
       rejectSocket(new Error(`ERR:SOCKET:${error.name}:${error.message}`));
     });

src/renderer/src/main.tsx

@@ -17,6 +17,6 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   </React.StrictMode>
 );
 
-window.api.ping().then((response) => {
+window.api.ping().then((response): void => {
   logger.info(response); // pong
 });

tsconfig.node.json

@@ -2,12 +2,13 @@
   "extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
   "include": [
     "electron.vite.config.*",
-    "src/main/**/*",
+    "src/common/**/*",
     "src/preload/**/*",
-    "src/common/**/*"
+    "src/main/**/*"
   ],
   "compilerOptions": {
     "composite": true,
+    "strict": true,
     "allowSyntheticDefaultImports": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,

tsconfig.web.json

@@ -1,24 +1,18 @@
 {
   "extends": "@electron-toolkit/tsconfig/tsconfig.web.json",
   "include": [
-    "src/renderer/src/env.d.ts",
-    "src/renderer/src/**/*",
-    "src/renderer/src/**/*.tsx",
     "src/common/**/*",
-    "src/preload/*.d.ts"
+    "src/preload/*.d.ts",
+    "src/renderer/src/**/*",
   ],
   "compilerOptions": {
     "composite": true,
     "baseUrl": ".",
+    "strict": true,
     "allowSyntheticDefaultImports": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "noImplicitAny": true,
-    "noImplicitReturns": false,
-    "paths": {
-      "@renderer/*": [
-        "src/renderer/src/*"
-      ]
-    }
+    "noImplicitReturns": false
   }
-}
+}