CardStorage services: types in interprocess communication

.eslintrc.js

@@ -24,6 +24,8 @@ module.exports = {
         }
     },
     rules: {
+        indent: "error",
+        semi: "error",
         "@typescript-eslint/ban-ts-comment": "warn",
         "no-async-promise-executor": "warn",
         "no-void": "off",

.github/workflows/pr-test.yaml

@@ -2,7 +2,7 @@ name: Electron test
 
 on:
   pull_request:
-    types: [opened, reopened, edited]
+    types: [opened, reopened, edited, synchronize]
     branches: ['main']
 
 jobs:

package.json

@@ -16,7 +16,7 @@
     "test:unit": "vue-cli-service test:unit",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
-    "postinstall": "cp -rf node_modules/eyelog/bin extraResources && electron-builder install-app-deps",
+    "postinstall": "(copy node_modules\\eyelog\\bin .\\extraResources\\bin\\ || cp -rf node_modules/eyelog/bin extraResources) && electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps"
   },
   "dependencies": {

src/CardsStorage/abstract.ts

@@ -3,29 +3,29 @@
 import { getMethods } from "@/utils/getMethods";
 
 export abstract class ICloudStorage {
-  static getMethods () {
-    return getMethods(class extends ICloudStorage {
+  static getMethods (): Array<keyof ICloudStorage> {
+    const mockImplementation = class extends ICloudStorage {
       getArgv (): Promise<string[]> {
         throw new Error("Method not implemented.");
       }
 
       downloadAndUnpack (url: string): Promise<void> {
         throw new Error("Method not implemented.");
       }
 
       getFiles (path: string): Promise<Directory | null> {
         throw new Error("Method not implemented.");
       }
 
       getConfigFile (path: string): ConfigFile | Promise<ConfigFile | null> | null {
         throw new Error("Method not implemented.");
       }
 
       getDefaultImage (path: string): Buffer | Promise<Uint8Array | null> | null {
         throw new Error("Method not implemented.");
       }
 
       getImage (path: string, entry: string): Buffer | Promise<Uint8Array | null> | null {
         throw new Error("Method not implemented.");
       }
 
@@ -80,30 +80,31 @@
       showItemInFolder (file: string): Promise<void> {
         throw new Error("Method not implemented.");
       }
-    });
+    };
+    return getMethods<ICloudStorage>(mockImplementation);
   }
 
-    abstract getFiles(path: string): Promise<(Directory | null)>;
-    abstract getConfigFile(path: string): ConfigFile | null | Promise<ConfigFile | null>;
-    abstract getDefaultImage(path: string): Buffer | null | Promise<Uint8Array | null>;
-    abstract getImage(path: string, entry: string): Buffer | null | Promise<Uint8Array | null>;
-    abstract getAudio(path: string, entry: string): Buffer | null | Promise<Uint8Array | null>;
-    abstract moveToTrash(path: string): Promise<void>;
-    abstract copyToTemp(path: string): Promise<string>;
-    abstract selectImage(path: string): Promise<string | null>;
-    abstract selectAudio(path: string): Promise<string | null>;
-    abstract createImageFromText(path: string, text: string): Promise<string | null>;
-    abstract createAudioFromText(path: string, text: string, voice: string): Promise<string | null>;
-    abstract defaultToTemp(file: string): string | Promise<string>;
-    abstract saveSet(path: string, location: string, config: ConfigFile): Promise<void>
-    abstract moveSet(file: string, location: string): Promise<string>;
-
-    abstract mkdir(file: string): Promise<void>
-    abstract rmdir(file: string): Promise<void>
-
-    abstract downloadAndUnpack(url: string): Promise<void>
-
-    abstract showItemInFolder(file: string): Promise<void>;
-
-    abstract getArgv(): Promise<string[]>
+  abstract getFiles(path: string): Promise<(Directory | null)>;
+  abstract getConfigFile(path: string): ConfigFile | null | Promise<ConfigFile | null>;
+  abstract getDefaultImage(path: string): Buffer | null | Promise<Uint8Array | null>;
+  abstract getImage(path: string, entry: string): Buffer | null | Promise<Uint8Array | null>;
+  abstract getAudio(path: string, entry: string): Buffer | null | Promise<Uint8Array | null>;
+  abstract moveToTrash(path: string): Promise<void>;
+  abstract copyToTemp(path: string): Promise<string>;
+  abstract selectImage(path: string): Promise<string | null>;
+  abstract selectAudio(path: string): Promise<string | null>;
+  abstract createImageFromText(path: string, text: string): Promise<string | null>;
+  abstract createAudioFromText(path: string, text: string, voice: string): Promise<string | null>;
+  abstract defaultToTemp(file: string): string | Promise<string>;
+  abstract saveSet(path: string, location: string, config: ConfigFile): Promise<void>;
+  abstract moveSet(file: string, location: string): Promise<string>;
+
+  abstract mkdir(file: string): Promise<void>;
+  abstract rmdir(file: string): Promise<void>;
+
+  abstract downloadAndUnpack(url: string): Promise<void>;
+
+  abstract showItemInFolder(file: string): Promise<void>;
+
+  abstract getArgv(): Promise<string[]>;
 }

src/CardsStorage/backend/index.ts

@@ -14,7 +14,6 @@ import { get } from "https";
 import delay from "delay";
 import { createImageFromText } from "@/utils/ImageFromText";
 import { HOME_DIR } from "../constants";
-import { getMethods } from "@/utils/getMethods";
 
 const DEFAULT_SETS = join(__dirname, "./../extraResources/defaultSets");
 
@@ -24,12 +23,20 @@ export class CardsStorage extends ICloudStorage {
   constructor () {
     super();
     this.init();
-    const methods = ICloudStorage.getMethods();
+    const methods: Array<keyof ICloudStorage> = ICloudStorage.getMethods();
+    // binding dispatched events from the frontend-process
+    // to the corresponding handlers in the backend-process
+    // (backend-process has its own implementation of the same interface)
+    // ((you're looking at it rn btw))
     for (const method of methods) {
-      ipcMain.handle("storage:" + method, (_, ...args) => {
+      ipcMain.handle("storage:" + method, (_, ...args: any) => {
+        function tuple<T extends any[]> (...args: T): T {
+          return args;
+        }
         win = BrowserWindow.fromWebContents(_.sender);
-        // @ts-ignore
-        return this[method](...args);
+        const argsAsTuple = tuple<any>(...args);
+
+        return (this[method] as (...args: Array<string | ConfigFile>) => void)(...argsAsTuple);
       });
     }
   }

src/components/SetGridButton.vue

@@ -103,10 +103,9 @@ export default class SetGridButton extends Vue.with(Props) {
       const yOffset = (canvas.height - finalHeight) / 2;
 
       const ctx = canvas.getContext("2d");
-      // @ts-ignore
-      ctx.clearRect(0, 0, canvas.width, canvas.height);
-      // @ts-ignore
-      ctx.drawImage(img, xOffset, yOffset, finalWidth, finalHeight);
+
+      ctx?.clearRect(0, 0, canvas.width, canvas.height);
+      ctx?.drawImage(img, xOffset, yOffset, finalWidth, finalHeight);
     };
   }
 

src/tobii/pageWatch.ts

@@ -47,16 +47,14 @@ export class PageWatcher {
         return;
       }
 
-      this.exitWatch()
-      ;
+      this.exitWatch();
     });
     ipcRenderer.on("eye-click", (event, data) => {
       if (data?.id != this.elements.id) return;
 
       const element = this.elements.elements[data.elementIndex];
       if (data.count > 1) return;
-      this.clickWatch(element, true)
-      ;
+      this.clickWatch(element, true);
     });
 
     window.addEventListener("keydown", (event) => {

src/utils/getMethods.ts

@@ -1,4 +1,6 @@
 
-export function getMethods<T> (cls: new (...args: any[]) => T): string[] {
-  return Object.getOwnPropertyNames(cls.prototype).filter(c => c !== "constructor");
+export function getMethods<T> (cls: new (...args: any[]) => T): Array<keyof T> {
+  return Object.getOwnPropertyNames(cls.prototype)
+    .filter(protoProp => typeof cls.prototype[protoProp as keyof T] === "function" &&
+      protoProp !== "constructor") as Array<keyof T>;
 }