refactor: redux reducer and actions

Author: pd4d10

forge.config.js

@@ -16,7 +16,7 @@ module.exports = {
       name: "@electron-forge/plugin-vite",
       config: {
         build: [
-          { entry: "src/main.ts", config: "vite.main.config.mjs" },
+          { entry: "src/main/main.ts", config: "vite.main.config.mjs" },
           {
             entry: "src/preload.ts",
             config: "vite.preload.config.mjs",

package.json

@@ -22,7 +22,6 @@
     ]
   },
   "dependencies": {
-    "electron-redux": "2.0.0-alpha.9",
     "electron-squirrel-startup": "^1.0.0",
     "registry-js": "^1.16.0",
     "simple-plist": "^1.3.1",
@@ -54,6 +53,7 @@
     "@typescript-eslint/parser": "^7.8.0",
     "electron": "^30.0.2",
     "electron-devtools-installer": "^3.2.0",
+    "electron-redux": "2.0.0-alpha.9",
     "electron-update-notification": "^0.1.0",
     "eslint": "^9.1.1",
     "eslint-define-config": "^2.1.0",
@@ -72,6 +72,7 @@
     "react-redux": "^9.1.2",
     "react-use": "^17.5.0",
     "redux-logger": "^3.0.6",
+    "ts-pattern": "^5.1.1",
     "ts-results": "^3.3.0",
     "typescript": "^5.4.5",
     "universal-analytics": "^0.5.3",

src/global.d.ts

@@ -0,0 +1,89 @@
+import type { AppInfo, PageInfo, ThunkActionCreator } from "../reducer";
+import { importByPlatform } from "./platforms";
+import { spawn } from "child_process";
+import { dialog } from "electron";
+import getPort from "get-port";
+import path from "node:path";
+import { v4 } from "uuid";
+
+export const init: ThunkActionCreator = () => async (dispatch, getState) => {
+  // first load
+  const { adapter } = await importByPlatform();
+  const apps = await adapter.readAll();
+
+  if (!apps.ok) throw new Error("Failed to read apps");
+  dispatch({
+    type: "app/loaded",
+    payload: apps.unwrap(),
+  });
+
+  // timer
+  setInterval(async () => {
+    const { session } = getState();
+    const sessions = Object.values(session);
+    const ports = sessions.flatMap((s) => [s.nodePort, s.windowPort]);
+
+    const payloads = await Promise.allSettled<PageInfo>(
+      ports.map((port) =>
+        fetch(`http://127.0.0.1:${port}/json`).then((res) => res.json()),
+      ),
+    );
+    const pages = payloads.flatMap((p) =>
+      p.status === "fulfilled" ? p.value : [],
+    );
+    console.log(ports, pages);
+  }, 3000);
+};
+
+export const debug: ThunkActionCreator<AppInfo> = (app) => async (dispatch) => {
+  const nodePort = await getPort();
+  const windowPort = await getPort();
+
+  const sp = spawn(
+    app.exePath,
+    [`--inspect=${nodePort}`, `--remote-debugging-port=${windowPort}`],
+    {
+      cwd: process.platform === "win32" ? path.dirname(app.exePath) : "/",
+    },
+  );
+
+  const sessionId = v4();
+  dispatch({
+    type: "session/added",
+    payload: { sessionId, appId: app.id, nodePort, windowPort },
+  });
+
+  sp.on("error", (err) => {
+    dialog.showErrorBox(`Error: ${app.name}`, err.message);
+  });
+  sp.on("close", () => {
+    // console.log(`child process exited with code ${code}`)
+    dispatch({ type: "session/removed", payload: sessionId });
+  });
+
+  const handleStdout =
+    (isError = false) =>
+    (chunk: Buffer) => {
+      // TODO: stderr colors
+      console.log(isError);
+      dispatch({
+        type: "session/logAppended",
+        payload: {
+          sessionId,
+          content: chunk.toString(),
+        },
+      });
+    };
+
+  if (sp.stdout) {
+    sp.stdout.on("data", handleStdout());
+  }
+  if (sp.stderr) {
+    sp.stderr.on("data", handleStdout(true));
+  }
+};
+
+export const debugPath: ThunkActionCreator<string> =
+  (path) => async (dispatch) => {
+    // TODO:
+  };

src/main/actions.ts

@@ -1,18 +1,20 @@
-import { setUpdater, setReporter } from "./main/utils";
-import { reducers } from "./reducers";
-import { appSlice } from "./reducers/app";
-import { configureStore } from "@reduxjs/toolkit";
+import { reducer, type AppInfo } from "../reducer";
+import { debug, debugPath, init } from "./actions";
+import { setUpdater, setReporter } from "./utils";
+import { applyMiddleware, legacy_createStore } from "@reduxjs/toolkit";
 import {
   app,
   BrowserWindow,
   Menu,
   MenuItem,
   shell,
   nativeImage,
+  ipcMain,
 } from "electron";
-import { stateSyncEnhancer } from "electron-redux/main";
+import { composeWithStateSync } from "electron-redux/main";
 import path from "path";
-import { logger } from "redux-logger";
+import logger from "redux-logger";
+import { thunk } from "redux-thunk";
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require("electron-squirrel-startup")) {
@@ -59,12 +61,19 @@ const gotTheLock = app.requestSingleInstanceLock();
 if (!gotTheLock) {
   app.quit();
 } else {
-  const store = configureStore({
-    reducer: reducers,
-    middleware: (getDefault) => getDefault().concat(logger),
-    enhancers: (getDefault) => getDefault().concat(stateSyncEnhancer()),
-  });
-  store.dispatch(appSlice.actions.read(null));
+  const store = legacy_createStore(
+    reducer,
+    composeWithStateSync(
+      applyMiddleware(
+        //logger,
+        thunk,
+      ),
+    ),
+  );
+  store.dispatch(
+    // @ts-ignore
+    init(),
+  );
 
   app.on("second-instance", () => {
     if (mainWindow) {
@@ -111,9 +120,23 @@ if (!gotTheLock) {
       );
     }
 
-    // ipcMain.on("dispatch-from-renderer", () => {
-
-    // })
+    ipcMain.on("debug", (e, appInfo: AppInfo) => {
+      store.dispatch(
+        // @ts-ignore
+        debug(appInfo),
+      );
+    });
+    ipcMain.on("debug-path", (e, path: string) => {
+      store.dispatch(
+        // @ts-ignore
+        debugPath(path),
+      );
+    });
+    ipcMain.on("open-window", (e, url: string) => {
+      const win = new BrowserWindow();
+      // console.log(url)
+      win.loadURL(url);
+    });
 
     setUpdater();
     createWindow();

src/main.ts src/main/main.tssrc/main.ts renamed to src/main/main.ts

@@ -1,11 +1,11 @@
 export function importByPlatform() {
   switch (process.platform) {
-    case "win32":
-      return import("../platforms/win");
+    // case "win32":
+    //   return import("../platforms/win");
     case "darwin":
-      return import("../platforms/macos");
+      return import("./macos");
     case "linux":
-      return import("../platforms/linux");
+      return import("./linux");
     default:
       throw new Error("platform not supported");
   }

src/platforms/index.ts src/main/platforms/index.tssrc/platforms/index.ts renamed to src/main/platforms/index.ts

@@ -72,9 +72,10 @@ export const adapter: AppReader = {
       if (!isElectronBased) throw new Error("Not an electron app");
 
       const info = await readPlistFile(path.join(p, "Contents/Info.plist"));
-      const icon = await readIcnsAsImageUri(
-        path.join(p, "Contents/Resources", info.CFBundleIconFile),
-      );
+      // const icon = await readIcnsAsImageUri(
+      //   path.join(p, "Contents/Resources", info.CFBundleIconFile),
+      // );
+      const icon = "";
 
       return {
         id: info.CFBundleIdentifier,

src/platforms/linux.ts src/main/platforms/linux.tssrc/platforms/linux.ts renamed to src/main/platforms/linux.ts

@@ -1,4 +1,4 @@
-import type { AppInfo } from "../reducers/app";
+import type { AppInfo } from "../../reducer";
 import { Result } from "ts-results";
 
 export interface AppReader {