Refactoring dowload and upgrade electron

gulpfile.js

@@ -11,7 +11,7 @@ const gulp = require("gulp"),
 const NAME = 'Kodo Browser';
 const KICK_NAME = 'kodo-browser';
 const VERSION = pkg.version;
-const ELECTRON_VERSION = "4.2.7";
+const ELECTRON_VERSION = "18.3.3";
 const ROOT = __dirname;
 const ICONS = `${ROOT}/src/renderer/icons`;
 const DIST = `${ROOT}/dist`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kodo-browser",
-  "version": "1.0.18",
+  "version": "1.0.19-alpha",
   "license": "Apache-2.0",
   "author": {
     "name": "Rong Zhou",
@@ -85,6 +85,7 @@
     "webpack-cli": "^4.9.0"
   },
   "dependencies": {
+    "@electron/remote": "^2.0.8",
     "@root/walk": "^1.1.0",
     "@uirouter/angularjs": "^1.0.20",
     "angular": "1.7.9",
@@ -97,14 +98,14 @@
     "codemirror": "^5.41.0",
     "csv-stringify": "^5.3.6",
     "downloads-folder": "1.0.3",
-    "electron": "^4.0",
+    "electron": "18.3.3",
     "events": "^2.0.0",
     "form-data": "^4.0.0",
     "jquery": "^3.5.1",
     "jquery.qrcode": "^1.0.3",
     "js-base64": "^3.4.5",
     "js-md5": "^0.7.3",
-    "kodo-s3-adapter-sdk": "0.2.30",
+    "kodo-s3-adapter-sdk": "0.2.31",
     "lodash": "^4.17.21",
     "mime": "^2.3.1",
     "moment": "^2.22.2",

src/common/ipc-actions/download.ts

@@ -0,0 +1,283 @@
+import {IpcRenderer} from "electron";
+import {NatureLanguage} from "kodo-s3-adapter-sdk/dist/uplog";
+import {Domain} from "kodo-s3-adapter-sdk/dist/adapter";
+
+import {ClientOptions} from "@common/qiniu";
+import {Status} from "@common/models/job/types";
+import DownloadJob from "@common/models/job/download-job";
+import StorageClass from "@common/models/storage-class";
+
+export interface RemoteObject {
+    name: string,
+    region: string,
+    bucket: string,
+    key: string,
+    size: number,
+    mtime: number,
+    isDirectory: boolean,
+    isFile: boolean,
+}
+
+export interface DownloadOptions {
+    region: string,
+    bucket: string,
+
+    domain?: Domain,
+
+    isOverwrite: boolean,
+    storageClasses: StorageClass[],
+    userNatureLanguage: NatureLanguage
+}
+
+export enum DownloadAction {
+    UpdateConfig = "UpdateConfig",
+    LoadPersistJobs = "LoadPersistJobs",
+    AddJobs = "AddJobs",
+    StopJob = "StopJob",
+    WaitJob = "WaitJob",
+    StartJob = "StartJob",
+    RemoveJob = "RemoveJob",
+    CleanupJobs = "CleanupJobs",
+    StartAllJobs = "StartAllJobs",
+    StopAllJobs = "StopAllJobs",
+    RemoveAllJobs = "RemoveAllJobs",
+
+    // common
+    UpdateUiData = "UpdateUiData",
+
+    // reply only
+    AddedJobs = "AddedJobs",
+    JobCompleted = "JobCompleted",
+}
+
+export interface UpdateConfigMessage {
+    action: DownloadAction.UpdateConfig,
+    data: Partial<{
+        resumable: boolean,
+        maxConcurrency: number,
+        multipartSize: number,
+        multipartThreshold: number,
+        speedLimit: number,
+        isDebug: boolean,
+        persistPath: string,
+
+        isOverwrite: boolean,
+    }>
+}
+
+export interface LoadPersistJobsMessage {
+    action: DownloadAction.LoadPersistJobs,
+    data: {
+        clientOptions: Pick<ClientOptions, "accessKey" | "secretKey" | "ucUrl" | "regions">
+        downloadOptions: Pick<DownloadOptions, "userNatureLanguage">,
+    }
+}
+
+export interface AddJobsMessage {
+    action: DownloadAction.AddJobs,
+    data: {
+        remoteObjects: RemoteObject[],
+        destPath: string,
+        downloadOptions: DownloadOptions,
+        clientOptions: ClientOptions,
+    }
+}
+
+export interface AddedJobsReplyMessage {
+    action: DownloadAction.AddedJobs,
+    data: {
+        remoteObjects: RemoteObject[],
+        destPath: string,
+    },
+}
+
+export interface UpdateUiDataMessage {
+    action: DownloadAction.UpdateUiData,
+    data: {
+        pageNum: number,
+        count: number,
+        query?: {
+            status?: Status,
+            name?: string,
+        },
+    },
+}
+
+export interface UpdateUiDataReplyMessage {
+    action: DownloadAction.UpdateUiData,
+    data: {
+        list: (DownloadJob["uiData"] | undefined)[],
+        total: number,
+        finished: number,
+        running: number,
+        failed: number,
+        stopped: number,
+    },
+}
+
+export interface StopJobMessage {
+    action: DownloadAction.StopJob,
+    data: {
+        jobId: string,
+    },
+}
+
+export interface WaitJobMessage {
+    action: DownloadAction.WaitJob,
+    data: {
+        jobId: string,
+    },
+}
+
+export interface StartJobMessage {
+    action: DownloadAction.StartJob,
+    data: {
+        jobId: string,
+        forceOverwrite?: boolean,
+    },
+}
+
+export interface RemoveJobMessage {
+    action: DownloadAction.RemoveJob,
+    data: {
+        jobId: string,
+    },
+}
+
+export interface CleanupJobMessage {
+    action: DownloadAction.CleanupJobs,
+    data?: {},
+}
+
+
+export interface StartAllJobsMessage {
+    action: DownloadAction.StartAllJobs,
+    data?: {},
+}
+
+export interface StopAllJobsMessage {
+    action: DownloadAction.StopAllJobs,
+    data?: {},
+}
+
+export interface RemoveAllJobsMessage {
+    action: DownloadAction.RemoveAllJobs,
+    data?: {},
+}
+
+export interface JobCompletedReplyMessage {
+    action: DownloadAction.JobCompleted,
+    data: {
+        jobsId: string,
+        jobUiData: DownloadJob["uiData"],
+    }
+}
+
+export type DownloadMessage = UpdateConfigMessage
+    | LoadPersistJobsMessage
+    | AddJobsMessage
+    | UpdateUiDataMessage
+    | StopJobMessage
+    | WaitJobMessage
+    | StartJobMessage
+    | RemoveJobMessage
+    | CleanupJobMessage
+    | StartAllJobsMessage
+    | StopAllJobsMessage
+    | RemoveAllJobsMessage
+
+export type DownloadReplyMessage = UpdateUiDataReplyMessage
+    | AddedJobsReplyMessage
+    | JobCompletedReplyMessage
+
+export class DownloadActionFns {
+    constructor(
+        private readonly ipc: IpcRenderer,
+        private readonly channel: string,
+    ) {
+    }
+
+    updateConfig(data: UpdateConfigMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.UpdateConfig,
+            data: data,
+        });
+    }
+
+    loadPersistJobs(data: LoadPersistJobsMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.LoadPersistJobs,
+            data,
+        })
+    }
+
+    addJobs(data: AddJobsMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.AddJobs,
+            data,
+        });
+    }
+
+    updateUiData(data: UpdateUiDataMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.UpdateUiData,
+            data,
+        });
+    }
+
+    waitJob(data: WaitJobMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.WaitJob,
+            data,
+        });
+    }
+
+    startJob(data: StartJobMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.StartJob,
+            data,
+        });
+    }
+
+    stopJob(data: StopJobMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.StopJob,
+            data,
+        });
+    }
+
+    removeJob(data: RemoveJobMessage["data"]) {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.RemoveJob,
+            data,
+        });
+    }
+
+    cleanUpJobs() {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.CleanupJobs,
+            data: {},
+        });
+    }
+
+    startAllJobs() {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.StartAllJobs,
+            data: {},
+        });
+    }
+
+    stopAllJobs() {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.StopAllJobs,
+            data: {},
+        });
+    }
+
+    removeAllJobs() {
+        this.ipc.send(this.channel, {
+            action: DownloadAction.RemoveAllJobs,
+            data: {},
+        });
+    }
+}