Bump to v2.3.2 (#192)

Author: lihsai0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kodo-browser",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "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.6.1",
+    "kodo-s3-adapter-sdk": "0.7.0",
     "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "mime": "^2.3.1",

src/common/ipc-actions/upload.ts

@@ -15,6 +15,7 @@ export interface DestInfo {
 }
 
 export interface UploadOptions {
+    accelerateUploading: boolean,
     isOverwrite: boolean,
     storageClassName: StorageClass["kodoName"],
     storageClasses: StorageClass[],
@@ -36,6 +37,7 @@ export enum UploadAction {
     StopJobsByOffline = "StopJobsByOffline",
     StartJobsByOnline = "StartJobsByOnline",
     RemoveAllJobs = "RemoveAllJobs",
+    ClearRegionsCache = "ClearRegionsCache",
 
     // common
     UpdateUiData = "UpdateUiData",
@@ -177,6 +179,11 @@ export interface RemoveAllJobsMessage {
     data?: {},
 }
 
+export interface ClearRegionsCacheMessage {
+    action: UploadAction.ClearRegionsCache,
+    data?: {},
+}
+
 export interface JobCompletedReplyMessage {
     action: UploadAction.JobCompleted,
     data: {
@@ -207,6 +214,7 @@ export type UploadMessage = UpdateConfigMessage
     | StopJobsByOfflineMessage
     | StartJobsByOnlineMessage
     | RemoveAllJobsMessage
+    | ClearRegionsCacheMessage
 
 export type UploadReplyMessage = UpdateUiDataReplyMessage
     | AddedJobsReplyMessage
@@ -318,4 +326,12 @@ export class UploadActionFns {
             data: {},
         });
     }
+
+    clearRegionsCache() {
+        // if only ucUrl and s3RegionId are provided,
+        // it will clear all regions cache
+        this.sender.send(this.channel, {
+            action: UploadAction.ClearRegionsCache,
+        });
+    }
 }

src/common/models/job/upload-job.ts

@@ -27,6 +27,7 @@ interface RequiredOptions {
 }
 
 interface UploadOptions {
+    accelerateUploading: boolean,
     multipartUploadThreshold: number, // Bytes
     multipartUploadSize: number, // Bytes
     multipartUploadConcurrency: number,
@@ -65,6 +66,7 @@ export type Options = RequiredOptions & Partial<OptionalOptions>
 const DEFAULT_OPTIONS: OptionalOptions = {
     id: "",
 
+    accelerateUploading: false,
     multipartUploadThreshold: 10 * ByteSize.MB,
     multipartUploadSize: 4 * ByteSize.MB,
     multipartUploadConcurrency: 1,
@@ -100,6 +102,7 @@ type PersistInfo = {
     // But It's also a risk, if business logic changes. Because we may get errors
     // when restart job from break point with different backendMode.
     backendMode: RequiredOptions["clientOptions"]["backendMode"],
+    accelerateUploading: OptionalOptions["accelerateUploading"],
     prog: OptionalOptions["prog"],
     status: Exclude<OptionalOptions["status"], Status.Waiting | Status.Running>,
     message: OptionalOptions["message"],
@@ -137,6 +140,7 @@ export default class UploadJob extends TransferJob {
             prog: persistInfo.prog,
 
             clientOptions,
+            accelerateUploading: persistInfo.accelerateUploading,
             storageClasses: persistInfo.storageClasses,
 
             overwrite: persistInfo.overwrite,
@@ -162,6 +166,9 @@ export default class UploadJob extends TransferJob {
     protected readonly options: Readonly<RequiredOptions & OptionalOptions>
     private isForceOverwrite: boolean = false
 
+    // - for accelerate uploading
+    accelerateUploading: boolean = false
+
     // - for resume from break point -
     uploadedId: string
     uploadedParts: UploadedPart[]
@@ -174,6 +181,7 @@ export default class UploadJob extends TransferJob {
 
         this.options = lodash.merge({}, DEFAULT_OPTIONS, config);
 
+        this.accelerateUploading = this.options.accelerateUploading;
         this.uploadedId = this.options.uploadedId;
         this.uploadedParts = [
             ...this.options.uploadedParts,
@@ -193,6 +201,7 @@ export default class UploadJob extends TransferJob {
             ...super.uiData,
             from: this.options.from,
             to: this.options.to,
+            accelerateUploading: this.accelerateUploading,
         };
     }
 
@@ -276,6 +285,7 @@ export default class UploadJob extends TransferJob {
                 header: {
                     contentType: mime.getType(this.options.from.path),
                 },
+                accelerateUploading: this.accelerateUploading,
                 recovered: this.uploadedId && this.uploadedParts
                     ? {
                         uploadId: this.uploadedId,
@@ -419,6 +429,7 @@ export default class UploadJob extends TransferJob {
             overwrite: this.options.overwrite,
             storageClassName: this.options.storageClassName,
             backendMode: this.options.clientOptions.backendMode,
+            accelerateUploading: this.options.accelerateUploading,
 
             // real-time info
             prog: {
@@ -480,6 +491,12 @@ export default class UploadJob extends TransferJob {
             this.uploadedId = "";
             this.uploadedParts = [];
         }
+        // handle accelerate uploading is not available
+        if (err.toString().includes("transfer acceleration is not configured")) {
+            this.accelerateUploading = false;
+            await this.retry();
+            return;
+        }
 
         this._status = Status.Failed;
         this.message = err.toString();

src/common/qiniu/_mock-helpers_/data.ts

@@ -8,6 +8,7 @@ import { Region } from "kodo-s3-adapter-sdk";
 
 const mockDataOfRegionBase = {
     upUrls: [],
+    upAccUrls: [],
     ucUrls: [],
     rsUrls: [],
     rsfUrls: [],

src/main/index.ts

@@ -257,6 +257,9 @@ ipcMain.on("UploaderManager", (event, message) => {
         {
           cwd: root,
           silent: false,
+          execArgv: process.env.NODE_ENV === "development"
+            ? ["--inspect=9222"]
+            : [],
         },
     );
     forkedWorkers.set(processName, uploaderProcess);
@@ -294,6 +297,9 @@ ipcMain.on("DownloaderManager", (event, message) => {
         {
           cwd: root,
           silent: false,
+          execArgv: process.env.NODE_ENV === "development"
+            ? ["--inspect=9223"]
+            : [],
         },
     );
     forkedWorkers.set(processName, downloaderProcess);

src/main/kv-store/data-store.ts

@@ -45,9 +45,9 @@ export class DataStore<T> {
 
   constructor({
     workingDirectory,
-    thresholdDuration,
-    thresholdSize,
-    thresholdChangesSize,
+    thresholdDuration, // ms, trigger compact when thresholdDuration elapsed after last compact
+    thresholdSize, // trigger compact when memTable size exceeds thresholdSize
+    thresholdChangesSize, // trigger compact when memTable changes size exceeds thresholdChangesSize
 
     memTable,
     memTableReadOnly,

src/main/transfer-managers/upload-manager.test.ts

@@ -71,6 +71,7 @@ describe("test createUploadJobs", () => {
   };
 
   const MOCKED_UPLOAD_OPTIONS: UploadOptions = {
+    accelerateUploading: false,
     isOverwrite: true,
     storageClassName: "Standard",
     storageClasses: [

src/main/transfer-managers/upload-manager.ts

@@ -244,6 +244,7 @@ export default class UploadManager extends TransferManager<UploadJob, Config> {
             },
 
             clientOptions,
+            accelerateUploading: uploadOptions.accelerateUploading,
             storageClasses: uploadOptions.storageClasses,
 
             overwrite: uploadOptions.isOverwrite,

src/main/upload-worker.ts

@@ -1,4 +1,5 @@
 import {Region} from "kodo-s3-adapter-sdk";
+import {KodoHttpClient} from "kodo-s3-adapter-sdk/dist/kodo-http-client";
 
 import {
   AddedJobsReplyMessage,
@@ -139,6 +140,10 @@ process.on("message", (message: UploadMessage) => {
             uploadManager.removeAllJobs();
             break;
         }
+        case UploadAction.ClearRegionsCache: {
+            KodoHttpClient.clearCache();
+            break;
+        }
         default: {
             console.warn("Upload Manager received unknown action, message:", message);
         }

src/renderer/components/forms/change-storage-class-form.tsx

@@ -52,7 +52,7 @@ const ChangeStorageClassForm: React.FC<ChangeStorageClassFormProps> = ({
 
   useEffect(() => {
     reset({
-      storageClassKodoName: availableStorageClasses[0].kodoName,
+      storageClassKodoName: availableStorageClasses[0].kodoName ?? "Standard",
     });
   }, []);