Add share dir feature and other fixes

.github/workflows/ci.yml

@@ -37,4 +37,6 @@ jobs:
       - name: test
         run: make i test
       - name: build
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
         run: make mac

.github/workflows/publish.yml

@@ -107,6 +107,8 @@ jobs:
       - name: test
         run: make i test
       - name: build
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
         run: make win64 win32
       - name: Upload Release Asset to Qiniu
         run: |
@@ -159,6 +161,8 @@ jobs:
       - name: test
         run: make i test
       - name: build
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
         run: make mac
       - name: Upload Release Asset to Qiniu
         run: |

Readme.md

@@ -162,6 +162,7 @@ kodo-browser/
     * `maxDownloadJobConcurrency`，最大下载任务并发数
 * `disable`，禁止某些功能；
     * `nonOwnedDomain`，非自有域名；
+* `baseShareUrl`，分享链接的基本 URL；
 
 例如以下配置将修改默认登录私有云指定服务端：
 

create-desktop-file.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+WORKING_DIR=$(pwd)
+THIS_PATH=$(readlink -f "$0")
+THIS_BASE_PATH=$(dirname "${THIS_PATH}")
+cd "$THIS_BASE_PATH"
+FULL_PATH=$(pwd)
+cd "${WORKING_DIR}"
+cat <<EOS > "kodo-browser.desktop"
+[Desktop Entry]
+Name=Kodo Browser
+Comment=Kodo Browser for Linux
+Exec="${FULL_PATH}/Kodo Browser" %U
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/kodobrowser
+Icon=${FULL_PATH}/resources/app/renderer/static/brand/qiniu.png
+Categories=Utility;Development;
+EOS
+chmod +x "Kodo Browser.desktop"

gulpfile.js

@@ -16,6 +16,7 @@ const ELECTRON_VERSION = "18.3.3";
 const ROOT = __dirname;
 // https://github.com/qiniu/kodo-browser/issues/135
 const WIN_NO_SANDBOX_NAME = "no-sandbox-shortcut.cmd";
+const LINUX_DESKTOP_FILE = "create-desktop-file.sh";
 const BRAND = `${ROOT}/src/renderer/static/brand`;
 const DIST = `${ROOT}/dist`;
 const TARGET = `${ROOT}/build`;
@@ -51,6 +52,13 @@ gulp.task("mac", done => {
     options.arch = "x64";
     options.icon = `${BRAND}/qiniu.icns`;
 
+    options.protocols = [{
+      name: 'com.qiniu.browser',
+      schemes: [
+        'kodo-browser'
+      ]
+    }];
+
     packager(options).then((paths) => {
       console.log("--done");
       done();
@@ -163,13 +171,18 @@ gulp.task("win32zip", done => {
 
 gulp.task("linux64", done => {
   console.log(`--package ${NAME}-linux-x64`);
+  const targetDir = `${TARGET}/${NAME}-linux-x64`;
 
-  plugins.run(`rm -rf ${TARGET}/${NAME}-linux-x64`).exec(() => {
+  plugins.run(`rm -rf ${targetDir}`).exec(() => {
     let options = Object.assign({}, packagerOptions);
     options.platform = "linux";
     options.arch = "x64";
 
     packager(options).then((paths) => {
+      fs.copyFileSync(
+        path.resolve(ROOT, `./${LINUX_DESKTOP_FILE}`),
+        path.resolve(targetDir, `./${LINUX_DESKTOP_FILE}`)
+      );
       console.log("--done");
       done();
     }, (errs) => {
@@ -190,13 +203,18 @@ gulp.task("linux64zip", done => {
 
 gulp.task("linux32", done => {
   console.log(`--package ${NAME}-linux-ia32`);
+  const targetDir = `${TARGET}/${NAME}-linux-ia32`;
 
-  plugins.run(`rm -rf ${TARGET}/${NAME}-linux-ia32`).exec(() => {
+  plugins.run(`rm -rf ${targetDir}`).exec(() => {
     let options = Object.assign({}, packagerOptions);
     options.platform = "linux";
     options.arch = "ia32";
 
     packager(options).then((paths) => {
+      fs.copyFileSync(
+        path.resolve(ROOT, `./${LINUX_DESKTOP_FILE}`),
+        path.resolve(targetDir, `./${LINUX_DESKTOP_FILE}`)
+      );
       console.log("--done");
       done();
     }, (errs) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kodo-browser",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "license": "Apache-2.0",
   "author": {
     "name": "Rong Zhou",
@@ -111,7 +111,7 @@
     "form-data": "^4.0.0",
     "js-base64": "^3.4.5",
     "js-md5": "^0.7.3",
-    "kodo-s3-adapter-sdk": "0.5.1",
+    "kodo-s3-adapter-sdk": "0.6.0",
     "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "mime": "^2.3.1",

src/common/const/str.ts

@@ -0,0 +1,5 @@
+export const ALPHABET_UPPERCASE = "abcdefghijklmnopqrstuvwxyz";
+export const ALPHABET_LOWERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+export const ALPHABET = ALPHABET_UPPERCASE + ALPHABET_LOWERCASE;
+export const DIGITS = "0123456789";
+export const ALPHANUMERIC = ALPHABET + DIGITS;

src/common/ipc-actions/deep-link.ts

@@ -0,0 +1,95 @@
+import {Sender} from "./types";
+
+export enum DeepLinkAction {
+  RendererReady = "RendererReady",
+  RendererClose = "RendererClose",
+  SignInWithShareLink = "SignInWithShareLink",
+  SignInWithShareSession = "SignInWithShareSession",
+  SignInDataInvalid = "SignInDataInvalid",
+}
+
+export interface DeepLinkSignInWithShareLinkMessage {
+  action: DeepLinkAction.SignInWithShareLink,
+  data: {
+    portalHost?: string,
+    shareId: string,
+    shareToken: string,
+    extractCode?: string,
+  },
+}
+
+export interface DeepLinkSignInWithShareSessionMessage {
+  action: DeepLinkAction.SignInWithShareSession,
+  data: {
+    accessKey: string,
+    accessSecret: string,
+    description?: string,
+
+    sessionToken: string,
+    bucketName: string,
+    bucketId: string,
+    regionS3Id: string,
+    endpoint: string,
+    prefix: string,
+    permission: 'READONLY' | 'READWRITE',
+    expires: string,
+  },
+}
+
+export interface DeepLinkSignInDataInvalidMessage {
+  action: DeepLinkAction.SignInDataInvalid,
+}
+
+export interface DeepLinkRendererReadyMessage {
+  action: DeepLinkAction.RendererReady,
+}
+
+export interface DeepLinkRendererCloseMessage {
+  action: DeepLinkAction.RendererClose,
+}
+
+export type DeepLinkMessage = DeepLinkSignInWithShareLinkMessage
+  | DeepLinkSignInWithShareSessionMessage
+  | DeepLinkSignInDataInvalidMessage
+  | DeepLinkRendererReadyMessage
+  | DeepLinkRendererCloseMessage;
+
+export class DeepLinkActionFns {
+  constructor(
+    private readonly sender: Sender<DeepLinkMessage>,
+    private readonly channel: string,
+  ) {
+  }
+
+  signInWithShareLink(data: DeepLinkSignInWithShareLinkMessage["data"]) {
+    this.sender.send(this.channel, {
+      action: DeepLinkAction.SignInWithShareLink,
+      data,
+    });
+  }
+
+  signInWithShareSession(data: DeepLinkSignInWithShareSessionMessage["data"]) {
+    this.sender.send(this.channel, {
+      action: DeepLinkAction.SignInWithShareSession,
+      data,
+    });
+  }
+
+  signInDataInvalid() {
+    this.sender.send(this.channel, {
+      action: DeepLinkAction.SignInDataInvalid,
+    });
+  }
+
+  rendererReady() {
+    this.sender.send(this.channel, {
+      action: DeepLinkAction.RendererReady,
+    });
+  }
+
+  rendererClose() {
+    this.sender.send(this.channel, {
+      action: DeepLinkAction.RendererClose,
+    });
+  }
+}

src/common/ipc-actions/download.ts

@@ -1,4 +1,3 @@
-import {IpcRenderer} from "electron";
 import {NatureLanguage} from "kodo-s3-adapter-sdk/dist/uplog";
 import {Domain} from "kodo-s3-adapter-sdk/dist/adapter";
 
@@ -7,6 +6,8 @@ import {Status} from "@common/models/job/types";
 import DownloadJob from "@common/models/job/download-job";
 import StorageClass from "@common/models/storage-class";
 
+import {Sender} from "./types";
+
 export interface RemoteObject {
     name: string,
     region: string,
@@ -70,7 +71,10 @@ export interface UpdateConfigMessage {
 export interface LoadPersistJobsMessage {
     action: DownloadAction.LoadPersistJobs,
     data: {
-        clientOptions: Pick<ClientOptionsSerialized, "accessKey" | "secretKey" | "ucUrl" | "regions">
+        clientOptions: Pick<
+          ClientOptionsSerialized,
+          "accessKey" | "secretKey" | "sessionToken" | "bucketNameId" | "ucUrl" | "regions"
+        >
         downloadOptions: Pick<DownloadOptions, "userNatureLanguage">,
     }
 }
@@ -207,104 +211,104 @@ export type DownloadReplyMessage = UpdateUiDataReplyMessage
 
 export class DownloadActionFns {
     constructor(
-        private readonly ipc: IpcRenderer,
+        private readonly sender: Sender<DownloadMessage>,
         private readonly channel: string,
     ) {
     }
 
     updateConfig(data: UpdateConfigMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.UpdateConfig,
             data: data,
         });
     }
 
     loadPersistJobs(data: LoadPersistJobsMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.LoadPersistJobs,
             data,
         })
     }
 
     addJobs(data: AddJobsMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.AddJobs,
             data,
         });
     }
 
     updateUiData(data: UpdateUiDataMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.UpdateUiData,
             data,
         });
     }
 
     waitJob(data: WaitJobMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.WaitJob,
             data,
         });
     }
 
     startJob(data: StartJobMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StartJob,
             data,
         });
     }
 
     stopJob(data: StopJobMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StopJob,
             data,
         });
     }
 
     removeJob(data: RemoveJobMessage["data"]) {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.RemoveJob,
             data,
         });
     }
 
     cleanUpJobs() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.CleanupJobs,
             data: {},
         });
     }
 
     startAllJobs() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StartAllJobs,
             data: {},
         });
     }
 
     stopAllJobs() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StopAllJobs,
             data: {},
         });
     }
 
     stopJobsByOffline() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StopJobsByOffline,
             data: {},
         });
     }
 
     startJobsByOnline() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.StartJobsByOnline,
             data: {},
         });
     }
 
     removeAllJobs() {
-        this.ipc.send(this.channel, {
+        this.sender.send(this.channel, {
             action: DownloadAction.RemoveAllJobs,
             data: {},
         });

src/common/ipc-actions/types.ts

@@ -0,0 +1,3 @@
+export interface Sender<T> {
+  send(channel: string, message: T): void,
+}