style: run format

pd4d10 · Jul 25, 2024 · 87b781a · 87b781a
1 parent 444c059
commit 87b781a
Show file tree

Hide file tree

Showing 20 changed files with 94 additions and 154 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8" />

diff --git a/src/main/actions.ts b/src/main/actions.ts
@@ -1,14 +1,14 @@
-import { appSlice, type AppInfo } from "../reducers/app";
-import { sessionSlice, type PageInfo } from "../reducers/session";
-import { importByPlatform } from "./platforms";
-import type { State } from "./store";
 import type { ThunkDispatch } from "@reduxjs/toolkit";
 import { spawn } from "child_process";
 import { dialog } from "electron";
 import getPort from "get-port";
 import { chunk } from "lodash-es";
 import path from "node:path";
 import { v4 } from "uuid";
+import { type AppInfo, appSlice } from "../reducers/app";
+import { type PageInfo, sessionSlice } from "../reducers/session";
+import { importByPlatform } from "./platforms";
+import type { State } from "./store";
 
 type ThunkActionCreator<P1 = void, P2 = void> = (
   p1: P1,
@@ -33,9 +33,7 @@ export const init: ThunkActionCreator = () => async (dispatch, getState) => {
     const ports = sessions.flatMap((s) => [s.nodePort, s.windowPort]);
 
     const responses = await Promise.allSettled<PageInfo[]>(
-      ports.map((port) =>
-        fetch(`http://127.0.0.1:${port}/json`).then((res) => res.json()),
-      ),
+      ports.map((port) => fetch(`http://127.0.0.1:${port}/json`).then((res) => res.json())),
     );
     const pagess = chunk(
       responses.map((p) => (p.status === "fulfilled" ? p.value : [])),
@@ -81,17 +79,15 @@ export const debug: ThunkActionCreator<AppInfo> = (app) => async (dispatch) => {
     dispatch(sessionSlice.actions.removed(sessionId));
   });
 
-  const handleStdout =
-    (isError = false) =>
-    (chunk: Buffer) => {
-      // TODO: stderr colors
-      dispatch(
-        sessionSlice.actions.logAppended({
-          sessionId,
-          content: chunk.toString(),
-        }),
-      );
-    };
+  const handleStdout = (isError = false) => (chunk: Buffer) => {
+    // TODO: stderr colors
+    dispatch(
+      sessionSlice.actions.logAppended({
+        sessionId,
+        content: chunk.toString(),
+      }),
+    );
+  };
 
   if (sp.stdout) {
     sp.stdout.on("data", handleStdout());
@@ -101,7 +97,6 @@ export const debug: ThunkActionCreator<AppInfo> = (app) => async (dispatch) => {
   }
 };
 
-export const debugPath: ThunkActionCreator<string> =
-  (path) => async (dispatch) => {
-    // TODO:
-  };
+export const debugPath: ThunkActionCreator<string> = (path) => async (dispatch) => {
+  // TODO:
+};
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -1,17 +1,9 @@
+import { app, BrowserWindow, ipcMain, Menu, MenuItem, nativeImage, shell } from "electron";
+import path from "path";
 import type { AppInfo } from "../reducers/app";
 import { debug, debugPath, init } from "./actions";
 import { store } from "./store";
-import { setUpdater, setReporter } from "./utils";
-import {
-  app,
-  BrowserWindow,
-  Menu,
-  MenuItem,
-  shell,
-  nativeImage,
-  ipcMain,
-} from "electron";
-import path from "path";
+import { setReporter, setUpdater } from "./utils";
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require("electron-squirrel-startup")) {
@@ -26,10 +18,9 @@ const createWindow = () => {
     height: 768,
     titleBarStyle: "hidden",
     trafficLightPosition: { x: 14, y: 14 },
-    icon:
-      process.platform === "linux"
-        ? nativeImage.createFromDataURL(require("../../assets/icon.png"))
-        : undefined,
+    icon: process.platform === "linux"
+      ? nativeImage.createFromDataURL(require("../../assets/icon.png"))
+      : undefined,
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false, // for `require`

diff --git a/src/main/platforms/linux.ts b/src/main/platforms/linux.ts
@@ -1,11 +1,11 @@
-import { findExecPath } from "./linux/find-exec";
-import { findIconPath } from "./linux/find-icon";
-import type { AppReader } from "./utils";
 import fs from "fs";
 import ini from "ini";
 import os from "os";
 import path from "path";
 import { Result } from "ts-results";
+import { findExecPath } from "./linux/find-exec";
+import { findIconPath } from "./linux/find-icon";
+import type { AppReader } from "./utils";
 
 const userAppsDir = path.join(os.homedir(), ".local/share/applications");
 const sysAppsDir = "/usr/share/applications";
@@ -17,16 +17,16 @@ const readAppInfo = (desktopFile: string) =>
     });
     const entry = ini.parse(content)["Desktop Entry"] as
       | {
-          Name?: string;
-          Icon?: string;
-          Exec?: string;
-        }
+        Name?: string;
+        Icon?: string;
+        Exec?: string;
+      }
       | undefined;
 
     if (!entry?.Exec) throw new Error("Exec not found");
 
     let exePath = "";
-    if (entry.Exec.startsWith('"')) {
+    if (entry.Exec.startsWith("\"")) {
       exePath = entry.Exec.replace(/^"(.*)".*/, "$1");
     } else {
       // Remove arg
@@ -44,9 +44,9 @@ const readAppInfo = (desktopFile: string) =>
 
     if (
       !(
-        fs.existsSync(path.join(exePath, "../resources/electron.asar")) ||
-        fs.existsSync(path.join(exePath, "../LICENSE.electron.txt")) ||
-        fs.existsSync(path.join(exePath, "../chrome-sandbox"))
+        fs.existsSync(path.join(exePath, "../resources/electron.asar"))
+        || fs.existsSync(path.join(exePath, "../LICENSE.electron.txt"))
+        || fs.existsSync(path.join(exePath, "../chrome-sandbox"))
       )
     ) {
       throw new Error("resources/electron.asar not exists");

diff --git a/src/main/platforms/linux/find-exec.ts b/src/main/platforms/linux/find-exec.ts
@@ -1,10 +1,7 @@
 import fs from "fs";
 import path from "path";
 
-const pathDirs =
-  process.env.PATH?.split(path.delimiter)?.filter((dir) =>
-    fs.existsSync(dir),
-  ) || [];
+const pathDirs = process.env.PATH?.split(path.delimiter)?.filter((dir) => fs.existsSync(dir)) || [];
 
 export function findExecPath(command: string) {
   for (const pathDir of pathDirs) {

diff --git a/src/main/platforms/linux/find-icon.ts b/src/main/platforms/linux/find-icon.ts
@@ -18,21 +18,20 @@ const themeIconBases = (
   process.env.XDG_DATA_DIRS?.split(path.delimiter) || DEFAULT_XDG_DATA_DIRS
 )
   // If dir is not named with 'icons', append 'icons'
-  .map((dir) =>
-    path.basename(dir) === "icons" ? dir : path.join(dir, "icons"),
-  );
+  .map((dir) => path.basename(dir) === "icons" ? dir : path.join(dir, "icons"));
 
 const backwards_userIconBase = path.join(os.homedir(), ".icons");
 // for backwards compatibility
 if (
-  !themeIconBases.includes(backwards_userIconBase) &&
-  !themeIconBases.includes(backwards_userIconBase + "/")
+  !themeIconBases.includes(backwards_userIconBase)
+  && !themeIconBases.includes(backwards_userIconBase + "/")
 ) {
   themeIconBases.unshift(backwards_userIconBase);
 }
 
 const themeLeveledBase = [
-  /* 'xxx', */ // todo: get current theme
+  /* 'xxx', */
+  // todo: get current theme
   "hicolor",
   "Papirus",
   "default",
@@ -44,9 +43,7 @@ function initThemeLeveledNames() {
     if (!fs.existsSync(base)) return [];
 
     const files = fs.readdirSync(base);
-    return files.filter((name) =>
-      fs.statSync(path.join(base, name)).isDirectory(),
-    );
+    return files.filter((name) => fs.statSync(path.join(base, name)).isDirectory());
   }
 
   const themeNames = themeIconBases.map(findThemeNames).flat();
@@ -65,9 +62,7 @@ const themeSortedDirs = new Map<string, SizeDir[]>(
   themeLeveledNames.map((theme) => [
     theme,
     themeIconBases
-      .map((base) =>
-        iconDirSortBySize(findAllIconDirs(base, path.join(base, theme))),
-      )
+      .map((base) => iconDirSortBySize(findAllIconDirs(base, path.join(base, theme))))
       .flat(),
   ]),
 );

diff --git a/src/main/platforms/macos.ts b/src/main/platforms/macos.ts
@@ -1,8 +1,8 @@
-import type { AppReader } from "./utils";
 import fs from "fs";
 import path from "path";
 import plist from "simple-plist";
 import { Result } from "ts-results";
+import type { AppReader } from "./utils";
 
 interface MacosAppInfo {
   CFBundleIdentifier: string;

diff --git a/src/main/platforms/utils.ts b/src/main/platforms/utils.ts
@@ -1,5 +1,5 @@
-import type { AppInfo } from "../../reducers/app";
 import { Result } from "ts-results";
+import type { AppInfo } from "../../reducers/app";
 
 export interface AppReader {
   readAll(): Promise<Result<AppInfo[], Error>>;

diff --git a/src/main/platforms/win.ts b/src/main/platforms/win.ts
@@ -1,25 +1,24 @@
-import type { AppInfo } from "../../reducers/app";
-import type { AppReader } from "./utils";
 import fs from "fs";
 import path from "path";
 import {
+  enumerateKeys,
+  enumerateValues,
   HKEY,
-  type RegistryValue,
   type RegistryStringEntry,
+  type RegistryValue,
   RegistryValueType,
-  enumerateKeys,
-  enumerateValues,
 } from "registry-js";
 import { Result } from "ts-results";
+import type { AppInfo } from "../../reducers/app";
+import type { AppReader } from "./utils";
 
 async function getAppInfoByExePath(
   exePath: string,
   iconPath: string,
   values: readonly RegistryValue[],
 ): Promise<AppInfo> {
   const displayName = values.find(
-    (v): v is RegistryStringEntry =>
-      v && v.type === RegistryValueType.REG_SZ && v.name === "DisplayName",
+    (v): v is RegistryStringEntry => v && v.type === RegistryValueType.REG_SZ && v.name === "DisplayName",
   );
   let icon = "";
   if (iconPath) {
@@ -41,8 +40,7 @@ const getAppInfoFromRegeditItemValues = async (
 
   // Try to find executable path of Electron app
   const displayIcon = values.find(
-    (v): v is RegistryStringEntry =>
-      v && v.type === RegistryValueType.REG_SZ && v.name === "DisplayIcon",
+    (v): v is RegistryStringEntry => v && v.type === RegistryValueType.REG_SZ && v.name === "DisplayIcon",
   );
 
   if (displayIcon) {
@@ -60,8 +58,7 @@ const getAppInfoFromRegeditItemValues = async (
   let installDir = "";
 
   const installLocation = values.find(
-    (v): v is RegistryStringEntry =>
-      v && v.type === RegistryValueType.REG_SZ && v.name === "InstallLocation",
+    (v): v is RegistryStringEntry => v && v.type === RegistryValueType.REG_SZ && v.name === "InstallLocation",
   );
 
   if (installLocation && installLocation.data) {
@@ -91,8 +88,8 @@ const getAppInfoFromRegeditItemValues = async (
 
 function isElectronApp(installDir: string) {
   return (
-    fs.existsSync(path.join(installDir, "resources")) &&
-    [
+    fs.existsSync(path.join(installDir, "resources"))
+    && [
       "electron.asar",
       // https://github.com/pd4d10/debugtron/pull/26
       "default_app.asar",
@@ -108,8 +105,8 @@ async function findExeFile(dir: string) {
     const [exeFile] = files.filter((file) => {
       const lc = file.toLowerCase();
       return (
-        lc.endsWith(".exe") &&
-        !["uninstall", "update"].some((keyword) => lc.includes(keyword))
+        lc.endsWith(".exe")
+        && !["uninstall", "update"].some((keyword) => lc.includes(keyword))
       );
     });
     if (exeFile) return path.join(dir, exeFile);
@@ -120,9 +117,7 @@ export const adapter: AppReader = {
   readAll: () =>
     Result.wrapAsync(async () => {
       const enumRegeditItems = (key: HKEY, subkey: string) => {
-        return enumerateKeys(key, subkey).map((k) =>
-          enumerateValues(key, subkey + "\\" + k),
-        );
+        return enumerateKeys(key, subkey).map((k) => enumerateValues(key, subkey + "\\" + k));
       };
 
       const items = [
@@ -141,11 +136,7 @@ export const adapter: AppReader = {
       ];
 
       const results = await Promise.all(
-        items.map((itemValues) =>
-          Result.wrapAsync(async () =>
-            getAppInfoFromRegeditItemValues(itemValues),
-          ),
-        ),
+        items.map((itemValues) => Result.wrapAsync(async () => getAppInfoFromRegeditItemValues(itemValues))),
       );
 
       const apps = results.flatMap((app) => (app.ok ? [app.unwrap()] : []));
@@ -155,8 +146,9 @@ export const adapter: AppReader = {
 
   readByPath: (p: string) =>
     Result.wrapAsync(async () => {
-      if (path.extname(p).toLowerCase() === ".exe")
+      if (path.extname(p).toLowerCase() === ".exe") {
         throw new Error("should be suffixed with exe");
+      }
 
       return {
         id: p,

diff --git a/src/main/store.ts b/src/main/store.ts
@@ -1,7 +1,7 @@
-import { appSlice } from "../reducers/app";
-import { sessionSlice } from "../reducers/session";
 import { configureStore } from "@reduxjs/toolkit";
 import { stateSyncEnhancer } from "electron-redux/main";
+import { appSlice } from "../reducers/app";
+import { sessionSlice } from "../reducers/session";
 
 export const store = configureStore({
   reducer: {

diff --git a/src/main/utils.ts b/src/main/utils.ts
@@ -18,6 +18,6 @@ export async function setUpdater() {
     //   break
     // TODO: macOS: Make code sign work then use update-electron-app
     default:
-    // setUpdateNotification();
+      // setUpdateNotification();
   }
 }
diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
@@ -1,11 +1,11 @@
 import { sessionSlice } from "../reducers/session";
 import "./app.css";
-import { Header } from "./header";
-import { Session } from "./session";
 import { Colors } from "@blueprintjs/core";
 import React from "react";
 import { useSelector } from "react-redux";
 import { useMedia } from "react-use";
+import { Header } from "./header";
+import { Session } from "./session";
 
 export const App: React.FC = () => {
   const darkMode = useMedia("(prefers-color-scheme: dark)");
@@ -23,9 +23,7 @@ export const App: React.FC = () => {
     >
       <Header />
       <div style={{ flexGrow: 1, paddingLeft: 16, paddingRight: 16 }}>
-        {Object.entries(sessionStore).length ? (
-          <Session />
-        ) : (
+        {Object.entries(sessionStore).length ? <Session /> : (
           <div
             style={{
               fontSize: 24,