Merge pull request #165 from caorushizi/feat/addForm

feat: ✨ 修改创建修改表单
caorushizi · May 26, 2024 · 1f838a9 · 1f838a9
2 parents 6fb7e94 + 0d0839f
commit 1f838a9
Show file tree

Hide file tree

Showing 19 changed files with 338 additions and 373 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -6,4 +6,9 @@ export default [
   { languageOptions: { globals: globals.browser } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
+  {
+    rules: {
+      "@typescript-eslint/no-explicit-any": "warn",
+    },
+  },
 ];
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -24,6 +24,7 @@
     "@eslint/js": "^9.3.0",
     "@types/electron-devtools-installer": "^2.2.5",
     "@types/fs-extra": "^11.0.4",
+    "@types/glob": "^8.1.0",
     "@types/gulp": "^4.0.17",
     "@types/lodash": "^4.17.4",
     "@types/mime-types": "^2.1.4",
@@ -40,6 +41,7 @@
     "esbuild": "^0.21.4",
     "esbuild-register": "^3.5.0",
     "eslint": "^9.3.0",
+    "glob": "^10.4.1",
     "globals": "^15.3.0",
     "gulp": "^5.0.0",
     "prebuild-install": "^7.1.2",

diff --git a/packages/main/scripts/index.ts b/packages/main/scripts/index.ts
@@ -65,7 +65,6 @@ async function watchTask() {
     })
     .on("error", (error) => {
       consola.error(error);
-      process.exit();
     });
   return Promise.resolve();
 }

diff --git a/packages/main/src/controller/DownloadController.ts b/packages/main/src/controller/DownloadController.ts
@@ -27,7 +27,7 @@ export default class DownloadController implements Controller {
     @inject(TYPES.MainWindow)
     private readonly mainWindow: MainWindow,
     @inject(TYPES.WebviewService)
-    private readonly webviewService: WebviewService,
+    private readonly webviewService: WebviewService
   ) {}
 
   @handle("show-download-dialog")
@@ -36,12 +36,12 @@ export default class DownloadController implements Controller {
     this.webviewService.sendToWindow(
       "show-download-dialog",
       data,
-      image.toDataURL(),
+      image.toDataURL()
     );
   }
 
   @handle("add-download-item")
-  async addDownloadItem(e: IpcMainEvent, video: DownloadItem) {
+  async addDownloadItem(e: IpcMainEvent, video: Omit<DownloadItem, "id">) {
     const item = await this.videoRepository.addVideo(video);
     // 这里向页面发送消息，通知页面更新
     this.mainWindow.send("download-item-notifier", item);
@@ -63,7 +63,7 @@ export default class DownloadController implements Controller {
   }
 
   @handle("download-now")
-  async downloadNow(e: IpcMainEvent, video: DownloadItem) {
+  async downloadNow(e: IpcMainEvent, video: Omit<DownloadItem, "id">) {
     // 添加下载项
     const item = await this.addDownloadItem(e, video);
     // 开始下载

diff --git a/packages/main/src/helper/utils.ts b/packages/main/src/helper/utils.ts
@@ -4,12 +4,11 @@ export async function sleep(second = 1): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, second * 1000));
 }
 
-export function formatHeaders(headersStr: string): string {
-  const headers: Record<string, any> | null = JSON.parse(headersStr);
+export function formatHeaders(headers: Record<string, string>): string {
   if (!headers) return "";
   const formatted = Object.entries(headers)
     .map(([key, value]) => `${key}:${value}`)
-    .join("|");
+    .join("\n");
   return formatted;
 }
 

diff --git a/packages/main/src/interfaces.ts b/packages/main/src/interfaces.ts
@@ -8,6 +8,8 @@ export interface DownloadItem {
   headers?: string;
   status?: DownloadStatus;
   isLive?: boolean;
+  numberOfEpisodes?: number;
+  teleplay?: boolean;
 }
 
 export enum DownloadFilter {

diff --git a/packages/main/src/preload.ts b/packages/main/src/preload.ts
@@ -23,7 +23,7 @@ const electronApi = {
     return ipcRenderer.invoke("get-favorites");
   },
   addFavorite(
-    favorite: Omit<Favorite, "id" | "createdDate" | "updatedDate">,
+    favorite: Omit<Favorite, "id" | "createdDate" | "updatedDate">
   ): Promise<Favorite> {
     return ipcRenderer.invoke("add-favorite", favorite);
   },
@@ -53,7 +53,7 @@ const electronApi = {
   },
   setAppStore(
     key: keyof AppStore,
-    val: AppStore[keyof AppStore],
+    val: AppStore[keyof AppStore]
   ): Promise<void> {
     return ipcRenderer.invoke("set-app-store", key, val);
   },
@@ -137,9 +137,6 @@ const electronApi = {
   setUserAgent(isMobile: boolean): Promise<void> {
     return ipcRenderer.invoke("webview-change-user-agent", isMobile);
   },
-  downloadItem(data: Omit<DownloadItem, "id">) {
-    return ipcRenderer.invoke("add-download-item", data);
-  },
   getDownloadLog(id: number): Promise<string> {
     return ipcRenderer.invoke("get-download-log", id);
   },

diff --git a/packages/main/src/services/SniffingHelperService.ts b/packages/main/src/services/SniffingHelperService.ts
@@ -3,15 +3,15 @@ import { DownloadType } from "../interfaces.ts";
 import { TYPES } from "../types.ts";
 import ElectronLogger from "../vendor/ElectronLogger.ts";
 import EventEmitter from "events";
-import { session } from "electron";
-import { PERSIST_WEBVIEW } from "../helper/index.ts";
-import { OnCompletedListenerDetails } from "electron/main";
+import { OnSendHeadersListenerDetails, session } from "electron";
+import { PERSIST_WEBVIEW, formatHeaders } from "../helper/index.ts";
 
 export interface SourceParams {
   url: string;
   documentURL: string;
   name: string;
   type: DownloadType;
+  headers?: string;
 }
 
 export interface SourceFilter {
@@ -49,7 +49,7 @@ export class SniffingHelper extends EventEmitter {
 
   constructor(
     @inject(TYPES.ElectronLogger)
-    private readonly logger: ElectronLogger,
+    private readonly logger: ElectronLogger
   ) {
     super();
   }
@@ -87,7 +87,7 @@ export class SniffingHelper extends EventEmitter {
 
   start() {
     const viewSession = session.fromPartition(PERSIST_WEBVIEW);
-    viewSession.webRequest.onCompleted(this.onCompleted);
+    viewSession.webRequest.onSendHeaders(this.onSendHeaders);
   }
 
   send = (item: SourceParams) => {
@@ -100,8 +100,8 @@ export class SniffingHelper extends EventEmitter {
     }
   };
 
-  private onCompleted = (details: OnCompletedListenerDetails): void => {
-    const { url } = details;
+  private onSendHeaders = (details: OnSendHeadersListenerDetails): void => {
+    const { url, requestHeaders } = details;
     const { title, url: documentURL } = this.pageInfo;
 
     listLoop: for (const filter of filterList) {
@@ -117,6 +117,7 @@ export class SniffingHelper extends EventEmitter {
             documentURL,
             name: title,
             type: filter.type,
+            headers: formatHeaders(requestHeaders),
           });
           break listLoop;
         }

diff --git a/packages/plugin/src/components/BilibiliButton.ts b/packages/plugin/src/components/BilibiliButton.ts
@@ -2,6 +2,7 @@ import { LitElement, html, css } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { BILIBILI_DOWNLOAD_BUTTON, showDownloadDialog } from "../helper";
 import $ from "jquery";
+import { DownloadType } from "../types";
 
 @customElement("bilibili-button")
 export class BilibiliButton extends LitElement {
@@ -39,7 +40,7 @@ export class BilibiliButton extends LitElement {
     const videoImage = $(BILIBILI_DOWNLOAD_BUTTON).eq(this.index);
     const url = videoImage.attr("href") || "";
     const name = videoImage.parent().find(".bili-video-card__info--tit").text();
-    showDownloadDialog([{ name, url, type: "bilibili" }]);
+    showDownloadDialog([{ name, url, type: DownloadType.bilibili }]);
   }
 
   render() {

diff --git a/packages/plugin/src/components/FloatButton.ts b/packages/plugin/src/components/FloatButton.ts
@@ -19,6 +19,7 @@ interface SourceData {
   documentURL: string;
   name: string;
   type: DownloadType;
+  headers?: string;
 }
 
 @customElement("float-button")
@@ -133,7 +134,7 @@ export class FloatButton extends LitElement {
 
   getPosition = (
     newLeft: number,
-    newTop: number,
+    newTop: number
   ): { left: number; top: number } => {
     if (!this.button) return { left: 0, top: 0 };
 
@@ -210,6 +211,8 @@ export class FloatButton extends LitElement {
 
 function init() {
   const floatButton = document.createElement("float-button");
+  floatButton.style.position = "fixed";
+  floatButton.style.zIndex = "9999999999999";
   document.body.appendChild(floatButton);
 
   // 向主进程发送插件准备好的消息

diff --git a/packages/plugin/src/helper/index.ts b/packages/plugin/src/helper/index.ts
@@ -1,4 +1,5 @@
 import { nanoid } from "nanoid";
+import { DownloadItem } from "../../../main/types/interfaces";
 
 const eventMap = new Map();
 
@@ -29,11 +30,7 @@ export interface Item {
   type: any;
 }
 
-export function downloadItem(item: Item) {
-  window.electron.downloadItem(item);
-}
-
-export function showDownloadDialog(item: Item[]) {
+export function showDownloadDialog(item: Omit<DownloadItem, "id">[]) {
   window.electron.showDownloadDialog(item);
 }
 

diff --git a/packages/renderer/package.json b/packages/renderer/package.json
@@ -44,8 +44,6 @@
     "@types/react-dom": "^18.3.0",
     "@types/react-redux": "^7.1.33",
     "@types/sort-by": "^1.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "7.10.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "eslint": "^9.3.0",
     "globals": "^15.3.0",