Optimize blob downloading

Use archive tokens when downloading blobs when possible Try to split requests by archive Closes #8069 Co-authored-by: ivk <ivk@tutao.de> Co-authored-by: BijinDev <bir@tutao.de>
tutao · Dec 19, 2024 · c9a2d5e · c9a2d5e
1 parent 41933f8
commit c9a2d5e
Show file tree

Hide file tree

Showing 16 changed files with 417 additions and 93 deletions.
diff --git a/schemas/storage.json b/schemas/storage.json
@@ -1,4 +1,15 @@
 {
 	"app": "storage",
-	"versions": []
+	"versions": [
+		{
+			"version": 10,
+			"changes": [
+				{
+					"name": "AddValue",
+					"sourceType": "BlobServerAccessInfo",
+					"info": "AddValue BlobServerAccessInfo/tokenKind/208."
+				}
+			]
+		}
+	]
 }
diff --git a/src/common/api/common/TutanotaConstants.ts b/src/common/api/common/TutanotaConstants.ts
@@ -1233,6 +1233,11 @@ export enum PublicKeyIdentifierType {
 	GROUP_ID = "1",
 }
 
+export enum BlobAccessTokenKind {
+	Archive = "0",
+	Instances = "1",
+}
+
 export function asPublicKeyIdentifier(maybe: NumberString): PublicKeyIdentifierType {
 	if (Object.values(PublicKeyIdentifierType).includes(maybe as PublicKeyIdentifierType)) {
 		return maybe as PublicKeyIdentifierType

diff --git a/src/common/api/entities/storage/ModelInfo.ts b/src/common/api/entities/storage/ModelInfo.ts
@@ -1,6 +1,6 @@
 const modelInfo = {
-	version: 9,
-	compatibleSince: 0,
+	version: 10,
+	compatibleSince: 10,
 }
 
 export default modelInfo
diff --git a/src/common/api/entities/storage/TypeModels.js b/src/common/api/entities/storage/TypeModels.js
@@ -57,7 +57,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobAccessTokenPostOut": {
 		"name": "BlobAccessTokenPostOut",
@@ -91,7 +91,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobArchiveRef": {
 		"name": "BlobArchiveRef",
@@ -152,7 +152,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobGetIn": {
 		"name": "BlobGetIn",
@@ -204,7 +204,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobId": {
 		"name": "BlobId",
@@ -236,7 +236,7 @@ export const typeModels = {
 		},
 		"associations": {},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobPostOut": {
 		"name": "BlobPostOut",
@@ -268,7 +268,7 @@ export const typeModels = {
 		},
 		"associations": {},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobReadData": {
 		"name": "BlobReadData",
@@ -320,7 +320,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobReferenceDeleteIn": {
 		"name": "BlobReferenceDeleteIn",
@@ -381,7 +381,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobReferencePutIn": {
 		"name": "BlobReferencePutIn",
@@ -442,7 +442,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobServerAccessInfo": {
 		"name": "BlobServerAccessInfo",
@@ -479,6 +479,15 @@ export const typeModels = {
 				"type": "Date",
 				"cardinality": "One",
 				"encrypted": false
+			},
+			"tokenKind": {
+				"final": false,
+				"name": "tokenKind",
+				"id": 208,
+				"since": 10,
+				"type": "Number",
+				"cardinality": "One",
+				"encrypted": false
 			}
 		},
 		"associations": {
@@ -494,7 +503,7 @@ export const typeModels = {
 			}
 		},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobServerUrl": {
 		"name": "BlobServerUrl",
@@ -526,7 +535,7 @@ export const typeModels = {
 		},
 		"associations": {},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"BlobWriteData": {
 		"name": "BlobWriteData",
@@ -558,7 +567,7 @@ export const typeModels = {
 		},
 		"associations": {},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	},
 	"InstanceId": {
 		"name": "InstanceId",
@@ -590,6 +599,6 @@ export const typeModels = {
 		},
 		"associations": {},
 		"app": "storage",
-		"version": "9"
+		"version": "10"
 	}
 }
diff --git a/src/common/api/entities/storage/TypeRefs.ts b/src/common/api/entities/storage/TypeRefs.ts
@@ -146,6 +146,7 @@ export type BlobServerAccessInfo = {
 	_id: Id;
 	blobAccessToken: string;
 	expires: Date;
+	tokenKind: NumberString;
 
 	servers: BlobServerUrl[];
 }