@protontech/drive-sdk 0.12.0 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/crypto/driveCrypto.d.ts +1 -0
- package/dist/crypto/driveCrypto.js +1 -0
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/interface/featureFlags.d.ts +2 -1
- package/dist/interface/featureFlags.js +1 -0
- package/dist/interface/featureFlags.js.map +1 -1
- package/dist/interface/httpClient.d.ts +1 -0
- package/dist/interface/nodes.d.ts +7 -0
- package/dist/interface/nodes.js.map +1 -1
- package/dist/internal/apiService/apiService.d.ts +1 -0
- package/dist/internal/apiService/apiService.js +16 -7
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +24 -0
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +110 -101
- package/dist/internal/nodes/apiService.d.ts +4 -0
- package/dist/internal/nodes/apiService.js +4 -0
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +8 -0
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cryptoService.js +3 -0
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.d.ts +5 -5
- package/dist/internal/nodes/extendedAttributes.js +5 -14
- package/dist/internal/nodes/extendedAttributes.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.test.js +16 -22
- package/dist/internal/nodes/extendedAttributes.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +5 -0
- package/dist/internal/nodes/nodesManagement.d.ts +3 -3
- package/dist/internal/nodes/nodesManagement.js +7 -5
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/photos/albumsManager.js +1 -0
- package/dist/internal/photos/albumsManager.js.map +1 -1
- package/dist/internal/photos/nodes.d.ts +1 -1
- package/dist/internal/photos/nodes.js +2 -2
- package/dist/internal/photos/nodes.js.map +1 -1
- package/dist/internal/photos/upload.d.ts +5 -5
- package/dist/internal/photos/upload.js +8 -2
- package/dist/internal/photos/upload.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +1 -0
- package/dist/internal/upload/apiService.d.ts +45 -1
- package/dist/internal/upload/apiService.js +69 -1
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +4 -1
- package/dist/internal/upload/blockVerifier.js +5 -0
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +2 -2
- package/dist/internal/upload/cryptoService.js +1 -3
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +4 -3
- package/dist/internal/upload/fileUploader.js +17 -7
- package/dist/internal/upload/fileUploader.js.map +1 -1
- package/dist/internal/upload/index.d.ts +3 -3
- package/dist/internal/upload/index.js +17 -1
- package/dist/internal/upload/index.js.map +1 -1
- package/dist/internal/upload/index.test.d.ts +1 -0
- package/dist/internal/upload/index.test.js +71 -0
- package/dist/internal/upload/index.test.js.map +1 -0
- package/dist/internal/upload/interface.d.ts +2 -0
- package/dist/internal/upload/manager.d.ts +41 -2
- package/dist/internal/upload/manager.js +123 -42
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +267 -0
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/smallFileUploader.d.ts +83 -0
- package/dist/internal/upload/smallFileUploader.js +197 -0
- package/dist/internal/upload/smallFileUploader.js.map +1 -0
- package/dist/internal/upload/smallFileUploader.test.d.ts +1 -0
- package/dist/internal/upload/smallFileUploader.test.js +358 -0
- package/dist/internal/upload/smallFileUploader.test.js.map +1 -0
- package/dist/internal/upload/streamReader.d.ts +4 -0
- package/dist/internal/upload/streamReader.js +37 -0
- package/dist/internal/upload/streamReader.js.map +1 -0
- package/dist/internal/upload/streamReader.test.d.ts +1 -0
- package/dist/internal/upload/streamReader.test.js +90 -0
- package/dist/internal/upload/streamReader.test.js.map +1 -0
- package/dist/internal/upload/streamUploader.d.ts +6 -0
- package/dist/internal/upload/streamUploader.js +3 -3
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/telemetry.d.ts +3 -2
- package/dist/internal/upload/telemetry.js +3 -0
- package/dist/internal/upload/telemetry.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +1 -1
- package/dist/protonDrivePublicLinkClient.js +3 -1
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/dist/transformers.d.ts +1 -1
- package/dist/transformers.js +1 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +1 -1
- package/src/crypto/driveCrypto.ts +2 -0
- package/src/interface/featureFlags.ts +1 -0
- package/src/interface/httpClient.ts +1 -0
- package/src/interface/nodes.ts +7 -0
- package/src/internal/apiService/apiService.test.ts +30 -0
- package/src/internal/apiService/apiService.ts +23 -7
- package/src/internal/apiService/driveTypes.ts +110 -101
- package/src/internal/nodes/apiService.test.ts +9 -0
- package/src/internal/nodes/apiService.ts +4 -0
- package/src/internal/nodes/cryptoService.ts +11 -1
- package/src/internal/nodes/extendedAttributes.test.ts +25 -25
- package/src/internal/nodes/extendedAttributes.ts +10 -19
- package/src/internal/nodes/interface.ts +5 -0
- package/src/internal/nodes/nodesManagement.ts +8 -6
- package/src/internal/photos/albumsManager.ts +1 -0
- package/src/internal/photos/nodes.ts +2 -2
- package/src/internal/photos/upload.ts +23 -10
- package/src/internal/upload/apiService.ts +167 -2
- package/src/internal/upload/blockVerifier.ts +12 -0
- package/src/internal/upload/cryptoService.ts +10 -10
- package/src/internal/upload/fileUploader.ts +20 -7
- package/src/internal/upload/index.test.ts +99 -0
- package/src/internal/upload/index.ts +45 -4
- package/src/internal/upload/interface.ts +2 -0
- package/src/internal/upload/manager.test.ts +367 -1
- package/src/internal/upload/manager.ts +226 -76
- package/src/internal/upload/smallFileUploader.test.ts +491 -0
- package/src/internal/upload/smallFileUploader.ts +353 -0
- package/src/internal/upload/streamReader.test.ts +109 -0
- package/src/internal/upload/streamReader.ts +38 -0
- package/src/internal/upload/streamUploader.ts +1 -1
- package/src/internal/upload/telemetry.ts +5 -1
- package/src/protonDrivePhotosClient.ts +1 -1
- package/src/protonDrivePublicLinkClient.ts +2 -0
- package/src/transformers.ts +2 -0
|
@@ -44,10 +44,54 @@ export declare class UploadAPIService {
|
|
|
44
44
|
commitDraftRevision(draftNodeRevisionUid: string, options: {
|
|
45
45
|
armoredManifestSignature: string;
|
|
46
46
|
signatureEmail: string | AnonymousUser;
|
|
47
|
-
armoredExtendedAttributes
|
|
47
|
+
armoredExtendedAttributes: string;
|
|
48
48
|
}): Promise<void>;
|
|
49
49
|
deleteDraft(draftNodeUid: string): Promise<void>;
|
|
50
50
|
deleteDraftRevision(draftNodeRevisionUid: string): Promise<void>;
|
|
51
51
|
uploadBlock(url: string, token: string, block: Uint8Array<ArrayBuffer>, onProgress?: (uploadedBytes: number) => void, signal?: AbortSignal): Promise<void>;
|
|
52
52
|
isRevisionUploaded(nodeRevisionUid: string): Promise<boolean>;
|
|
53
|
+
uploadSmallFile(parentFolderUid: string, metadata: {
|
|
54
|
+
armoredEncryptedName: string;
|
|
55
|
+
hash: string;
|
|
56
|
+
mediaType: string;
|
|
57
|
+
armoredNodeKey: string;
|
|
58
|
+
armoredNodePassphrase: string;
|
|
59
|
+
armoredNodePassphraseSignature: string;
|
|
60
|
+
base64ContentKeyPacket: string;
|
|
61
|
+
armoredContentKeyPacketSignature: string;
|
|
62
|
+
armoredExtendedAttributes: string;
|
|
63
|
+
signatureEmail: string | AnonymousUser;
|
|
64
|
+
}, content: {
|
|
65
|
+
armoredManifestSignature: string;
|
|
66
|
+
block: {
|
|
67
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
68
|
+
armoredSignature: string;
|
|
69
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
70
|
+
} | undefined;
|
|
71
|
+
thumbnails: {
|
|
72
|
+
type: ThumbnailType;
|
|
73
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
74
|
+
}[];
|
|
75
|
+
}, signal?: AbortSignal): Promise<{
|
|
76
|
+
nodeUid: string;
|
|
77
|
+
nodeRevisionUid: string;
|
|
78
|
+
}>;
|
|
79
|
+
uploadSmallRevision(nodeUid: string, currentRevisionUid: string, metadata: {
|
|
80
|
+
signatureEmail: string | AnonymousUser | null;
|
|
81
|
+
armoredExtendedAttributes: string;
|
|
82
|
+
}, content: {
|
|
83
|
+
armoredManifestSignature: string;
|
|
84
|
+
block: {
|
|
85
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
86
|
+
armoredSignature: string;
|
|
87
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
88
|
+
} | undefined;
|
|
89
|
+
thumbnails: {
|
|
90
|
+
type: ThumbnailType;
|
|
91
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
92
|
+
}[];
|
|
93
|
+
}, signal?: AbortSignal): Promise<{
|
|
94
|
+
nodeUid: string;
|
|
95
|
+
nodeRevisionUid: string;
|
|
96
|
+
}>;
|
|
53
97
|
}
|
|
@@ -101,7 +101,7 @@ class UploadAPIService {
|
|
|
101
101
|
await this.apiService.put(`drive/v2/volumes/${volumeId}/files/${nodeId}/revisions/${revisionId}`, {
|
|
102
102
|
ManifestSignature: options.armoredManifestSignature,
|
|
103
103
|
SignatureAddress: options.signatureEmail,
|
|
104
|
-
XAttr: options.armoredExtendedAttributes
|
|
104
|
+
XAttr: options.armoredExtendedAttributes,
|
|
105
105
|
Photo: null, // Only used for photos in the Photo volume.
|
|
106
106
|
});
|
|
107
107
|
}
|
|
@@ -136,6 +136,74 @@ class UploadAPIService {
|
|
|
136
136
|
return (link.Link.State === 1 && // ACTIVE state
|
|
137
137
|
link.File?.ActiveRevision?.RevisionID === revisionId);
|
|
138
138
|
}
|
|
139
|
+
async uploadSmallFile(parentFolderUid, metadata, content, signal) {
|
|
140
|
+
const { volumeId, nodeId: parentNodeId } = (0, uids_1.splitNodeUid)(parentFolderUid);
|
|
141
|
+
const metadataPayload = {
|
|
142
|
+
ParentLinkID: parentNodeId,
|
|
143
|
+
Name: metadata.armoredEncryptedName,
|
|
144
|
+
NameHash: metadata.hash,
|
|
145
|
+
NodePassphrase: metadata.armoredNodePassphrase,
|
|
146
|
+
NodePassphraseSignature: metadata.armoredNodePassphraseSignature,
|
|
147
|
+
SignatureEmail: metadata.signatureEmail,
|
|
148
|
+
NodeKey: metadata.armoredNodeKey,
|
|
149
|
+
MIMEType: metadata.mediaType,
|
|
150
|
+
ContentKeyPacket: metadata.base64ContentKeyPacket,
|
|
151
|
+
ContentKeyPacketSignature: metadata.armoredContentKeyPacketSignature,
|
|
152
|
+
ManifestSignature: content.armoredManifestSignature,
|
|
153
|
+
ContentBlockEncSignature: content.block ? content.block.armoredSignature : null,
|
|
154
|
+
ContentBlockVerificationToken: content.block
|
|
155
|
+
? (0, crypto_1.uint8ArrayToBase64String)(content.block.verificationToken)
|
|
156
|
+
: null,
|
|
157
|
+
XAttr: metadata.armoredExtendedAttributes,
|
|
158
|
+
Photo: null, // TODO
|
|
159
|
+
};
|
|
160
|
+
const formData = new FormData();
|
|
161
|
+
formData.set('Metadata', new Blob([JSON.stringify(metadataPayload)], { type: 'application/json' }), 'Metadata');
|
|
162
|
+
if (content.block) {
|
|
163
|
+
formData.set('ContentBlock', new Blob([content.block.encryptedData]), 'ContentBlock');
|
|
164
|
+
}
|
|
165
|
+
for (const thumb of content.thumbnails) {
|
|
166
|
+
if (formData.get(`ThumbnailBlockType_${thumb.type}`)) {
|
|
167
|
+
throw new Error('Duplicate thumbnail types');
|
|
168
|
+
}
|
|
169
|
+
formData.set(`ThumbnailBlockType_${thumb.type}`, new Blob([thumb.encryptedData]), `ThumbnailBlockType_${thumb.type}`);
|
|
170
|
+
}
|
|
171
|
+
const result = await this.apiService.postFormData(`drive/v2/volumes/${volumeId}/files/small`, formData, signal);
|
|
172
|
+
return {
|
|
173
|
+
nodeUid: (0, uids_1.makeNodeUid)(volumeId, result.LinkID),
|
|
174
|
+
nodeRevisionUid: (0, uids_1.makeNodeRevisionUid)(volumeId, result.LinkID, result.RevisionID),
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
async uploadSmallRevision(nodeUid, currentRevisionUid, metadata, content, signal) {
|
|
178
|
+
const { volumeId, nodeId } = (0, uids_1.splitNodeUid)(nodeUid);
|
|
179
|
+
const { revisionId: currentRevisionId } = (0, uids_1.splitNodeRevisionUid)(currentRevisionUid);
|
|
180
|
+
const metadataPayload = {
|
|
181
|
+
CurrentRevisionID: currentRevisionId,
|
|
182
|
+
SignatureEmail: metadata.signatureEmail,
|
|
183
|
+
ManifestSignature: content.armoredManifestSignature,
|
|
184
|
+
ContentBlockEncSignature: content.block ? content.block.armoredSignature : null,
|
|
185
|
+
ContentBlockVerificationToken: content.block
|
|
186
|
+
? (0, crypto_1.uint8ArrayToBase64String)(content.block.verificationToken)
|
|
187
|
+
: null,
|
|
188
|
+
XAttr: metadata.armoredExtendedAttributes,
|
|
189
|
+
};
|
|
190
|
+
const formData = new FormData();
|
|
191
|
+
formData.set('Metadata', new Blob([JSON.stringify(metadataPayload)], { type: 'application/json' }), 'Metadata');
|
|
192
|
+
if (content.block) {
|
|
193
|
+
formData.set('ContentBlock', new Blob([content.block.encryptedData]), 'ContentBlock');
|
|
194
|
+
}
|
|
195
|
+
for (const thumb of content.thumbnails) {
|
|
196
|
+
if (formData.get(`ThumbnailBlockType_${thumb.type}`)) {
|
|
197
|
+
throw new Error('Duplicate thumbnail types');
|
|
198
|
+
}
|
|
199
|
+
formData.set(`ThumbnailBlockType_${thumb.type}`, new Blob([thumb.encryptedData]), `ThumbnailBlockType_${thumb.type}`);
|
|
200
|
+
}
|
|
201
|
+
const result = await this.apiService.postFormData(`drive/v2/volumes/${volumeId}/files/${nodeId}/revisions/small`, formData, signal);
|
|
202
|
+
return {
|
|
203
|
+
nodeUid: (0, uids_1.makeNodeUid)(volumeId, result.LinkID),
|
|
204
|
+
nodeRevisionUid: (0, uids_1.makeNodeRevisionUid)(volumeId, result.LinkID, result.RevisionID),
|
|
205
|
+
};
|
|
206
|
+
}
|
|
139
207
|
}
|
|
140
208
|
exports.UploadAPIService = UploadAPIService;
|
|
141
209
|
//# sourceMappingURL=apiService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAAkF;AAElF,8CAAoF;AACpF,kCAA+F;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { PrivateKey } from '../../crypto';
|
|
1
|
+
import { PrivateKey, SessionKey } from '../../crypto';
|
|
2
2
|
import { UploadAPIService } from './apiService';
|
|
3
3
|
import { UploadCryptoService } from './cryptoService';
|
|
4
|
+
export declare function verifyBlockWithContentKey(cryptoService: UploadCryptoService, contentKeyPacket: Uint8Array<ArrayBuffer>, contentKeyPacketSessionKey: SessionKey, encryptedBlock: Uint8Array<ArrayBuffer>): Promise<{
|
|
5
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
6
|
+
}>;
|
|
4
7
|
export declare class BlockVerifier {
|
|
5
8
|
private apiService;
|
|
6
9
|
private cryptoService;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BlockVerifier = void 0;
|
|
4
|
+
exports.verifyBlockWithContentKey = verifyBlockWithContentKey;
|
|
5
|
+
async function verifyBlockWithContentKey(cryptoService, contentKeyPacket, contentKeyPacketSessionKey, encryptedBlock) {
|
|
6
|
+
const verificationCode = contentKeyPacket.subarray(-32);
|
|
7
|
+
return cryptoService.verifyBlock(contentKeyPacketSessionKey, verificationCode, encryptedBlock);
|
|
8
|
+
}
|
|
4
9
|
class BlockVerifier {
|
|
5
10
|
apiService;
|
|
6
11
|
cryptoService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockVerifier.js","sourceRoot":"","sources":["../../../src/internal/upload/blockVerifier.ts"],"names":[],"mappings":";;;AAIA,MAAa,aAAa;IAKV;IACA;IACA;IACA;IAPJ,gBAAgB,CAA2B;IAC3C,0BAA0B,CAAc;IAEhD,YACY,UAA4B,EAC5B,aAAkC,EAClC,OAAmB,EACnB,oBAA4B;QAH5B,eAAU,GAAV,UAAU,CAAkB;QAC5B,kBAAa,GAAb,aAAa,CAAqB;QAClC,YAAO,GAAP,OAAO,CAAY;QACnB,yBAAoB,GAApB,oBAAoB,CAAQ;QAEpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,0BAA0B,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,6BAA6B,CACpF,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,sBAAsB,CAChC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,cAAuC;QAGrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CACjC,IAAI,CAAC,0BAA0B,EAC/B,IAAI,CAAC,gBAAgB,EACrB,cAAc,CACjB,CAAC;IACN,CAAC;CACJ;AArCD,sCAqCC"}
|
|
1
|
+
{"version":3,"file":"blockVerifier.js","sourceRoot":"","sources":["../../../src/internal/upload/blockVerifier.ts"],"names":[],"mappings":";;;AAIA,8DAUC;AAVM,KAAK,UAAU,yBAAyB,CAC3C,aAAkC,EAClC,gBAAyC,EACzC,0BAAsC,EACtC,cAAuC;IAIvC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACxD,OAAO,aAAa,CAAC,WAAW,CAAC,0BAA0B,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AACnG,CAAC;AAED,MAAa,aAAa;IAKV;IACA;IACA;IACA;IAPJ,gBAAgB,CAA2B;IAC3C,0BAA0B,CAAc;IAEhD,YACY,UAA4B,EAC5B,aAAkC,EAClC,OAAmB,EACnB,oBAA4B;QAH5B,eAAU,GAAV,UAAU,CAAkB;QAC5B,kBAAa,GAAb,aAAa,CAAqB;QAClC,YAAO,GAAP,OAAO,CAAY;QACnB,yBAAoB,GAApB,oBAAoB,CAAQ;QAEpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,0BAA0B,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,6BAA6B,CACpF,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,sBAAsB,CAChC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,cAAuC;QAGrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CACjC,IAAI,CAAC,0BAA0B,EAC/B,IAAI,CAAC,gBAAgB,EACrB,cAAc,CACjB,CAAC;IACN,CAAC;CACJ;AArCD,sCAqCC"}
|
|
@@ -20,10 +20,10 @@ export declare class UploadCryptoService {
|
|
|
20
20
|
encryptBlock(verifyBlock: (encryptedBlock: Uint8Array<ArrayBuffer>) => Promise<{
|
|
21
21
|
verificationToken: Uint8Array<ArrayBuffer>;
|
|
22
22
|
}>, nodeRevisionDraftKeys: NodeRevisionDraftKeys, block: Uint8Array<ArrayBuffer>, index: number): Promise<EncryptedBlock>;
|
|
23
|
-
commitFile(nodeRevisionDraftKeys: NodeRevisionDraftKeys, manifest: Uint8Array<ArrayBuffer>, extendedAttributes
|
|
23
|
+
commitFile(nodeRevisionDraftKeys: NodeRevisionDraftKeys, manifest: Uint8Array<ArrayBuffer>, extendedAttributes: string): Promise<{
|
|
24
24
|
armoredManifestSignature: string;
|
|
25
25
|
signatureEmail: string | AnonymousUser;
|
|
26
|
-
armoredExtendedAttributes
|
|
26
|
+
armoredExtendedAttributes: string;
|
|
27
27
|
}>;
|
|
28
28
|
getContentKeyPacketSessionKey(nodeKey: PrivateKey, base64ContentKeyPacket: string): Promise<SessionKey>;
|
|
29
29
|
verifyBlock(contentKeyPacketSessionKey: SessionKey, verificationCode: Uint8Array<ArrayBuffer>, encryptedData: Uint8Array<ArrayBuffer>): Promise<{
|
|
@@ -105,9 +105,7 @@ class UploadCryptoService {
|
|
|
105
105
|
}
|
|
106
106
|
async commitFile(nodeRevisionDraftKeys, manifest, extendedAttributes) {
|
|
107
107
|
const { armoredManifestSignature } = await this.driveCrypto.signManifest(manifest, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
108
|
-
const { armoredExtendedAttributes } = extendedAttributes
|
|
109
|
-
? await this.driveCrypto.encryptExtendedAttributes(extendedAttributes, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.signingKeys.contentSigningKey)
|
|
110
|
-
: { armoredExtendedAttributes: undefined };
|
|
108
|
+
const { armoredExtendedAttributes } = await this.driveCrypto.encryptExtendedAttributes(extendedAttributes, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
111
109
|
return {
|
|
112
110
|
armoredManifestSignature,
|
|
113
111
|
signatureEmail: nodeRevisionDraftKeys.signingKeys.email,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,9 @@ import { UploadTelemetry } from './telemetry';
|
|
|
12
12
|
* and initiate the upload process for a file object or a stream.
|
|
13
13
|
*
|
|
14
14
|
* This class is not meant to be used directly, but rather to be extended
|
|
15
|
-
* by `FileUploader`
|
|
15
|
+
* by `FileUploader`, `FileRevisionUploader`, or `SmallFileUploader`.
|
|
16
16
|
*/
|
|
17
|
-
declare abstract class Uploader {
|
|
17
|
+
export declare abstract class Uploader {
|
|
18
18
|
protected telemetry: UploadTelemetry;
|
|
19
19
|
protected apiService: UploadAPIService;
|
|
20
20
|
protected cryptoService: UploadCryptoService;
|
|
@@ -27,6 +27,8 @@ declare abstract class Uploader {
|
|
|
27
27
|
constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal?: AbortSignal | undefined);
|
|
28
28
|
uploadFromFile(fileObject: File, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
|
|
29
29
|
uploadFromStream(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
|
|
30
|
+
private assertNotStartedYet;
|
|
31
|
+
private assertUniqueThumbnailTypes;
|
|
30
32
|
protected startUpload(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
|
|
31
33
|
nodeRevisionUid: string;
|
|
32
34
|
nodeUid: string;
|
|
@@ -64,4 +66,3 @@ export declare class FileRevisionUploader extends Uploader {
|
|
|
64
66
|
}>;
|
|
65
67
|
protected deleteRevisionDraft(revisionDraft: NodeRevisionDraft): Promise<void>;
|
|
66
68
|
}
|
|
67
|
-
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FileRevisionUploader = exports.FileUploader = void 0;
|
|
3
|
+
exports.FileRevisionUploader = exports.FileUploader = exports.Uploader = void 0;
|
|
4
4
|
const blockVerifier_1 = require("./blockVerifier");
|
|
5
5
|
const controller_1 = require("./controller");
|
|
6
6
|
const streamUploader_1 = require("./streamUploader");
|
|
@@ -9,7 +9,7 @@ const streamUploader_1 = require("./streamUploader");
|
|
|
9
9
|
* and initiate the upload process for a file object or a stream.
|
|
10
10
|
*
|
|
11
11
|
* This class is not meant to be used directly, but rather to be extended
|
|
12
|
-
* by `FileUploader`
|
|
12
|
+
* by `FileUploader`, `FileRevisionUploader`, or `SmallFileUploader`.
|
|
13
13
|
*/
|
|
14
14
|
class Uploader {
|
|
15
15
|
telemetry;
|
|
@@ -45,9 +45,8 @@ class Uploader {
|
|
|
45
45
|
this.controller = new controller_1.UploadController(this.abortController.signal);
|
|
46
46
|
}
|
|
47
47
|
async uploadFromFile(fileObject, thumbnails, onProgress) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
48
|
+
this.assertNotStartedYet();
|
|
49
|
+
this.assertUniqueThumbnailTypes(thumbnails);
|
|
51
50
|
if (!this.metadata.mediaType) {
|
|
52
51
|
this.metadata.mediaType = fileObject.type;
|
|
53
52
|
}
|
|
@@ -61,11 +60,21 @@ class Uploader {
|
|
|
61
60
|
return this.controller;
|
|
62
61
|
}
|
|
63
62
|
async uploadFromStream(stream, thumbnails, onProgress) {
|
|
63
|
+
this.assertNotStartedYet();
|
|
64
|
+
this.assertUniqueThumbnailTypes(thumbnails);
|
|
65
|
+
this.controller.promise = this.startUpload(stream, thumbnails, onProgress);
|
|
66
|
+
return this.controller;
|
|
67
|
+
}
|
|
68
|
+
assertNotStartedYet() {
|
|
64
69
|
if (this.controller.promise) {
|
|
65
70
|
throw new Error(`Upload already started`);
|
|
66
71
|
}
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
}
|
|
73
|
+
assertUniqueThumbnailTypes(thumbnails) {
|
|
74
|
+
const uniqueThumbnailTypes = new Set(thumbnails.map(({ type }) => type));
|
|
75
|
+
if (uniqueThumbnailTypes.size !== thumbnails.length) {
|
|
76
|
+
throw new Error('Duplicate thumbnail types');
|
|
77
|
+
}
|
|
69
78
|
}
|
|
70
79
|
async startUpload(stream, thumbnails, onProgress) {
|
|
71
80
|
const uploader = await this.initStreamUploader();
|
|
@@ -85,6 +94,7 @@ class Uploader {
|
|
|
85
94
|
return new streamUploader_1.StreamUploader(this.telemetry, this.apiService, this.cryptoService, this.manager, blockVerifier, revisionDraft, this.metadata, onFinish, this.controller, this.abortController);
|
|
86
95
|
}
|
|
87
96
|
}
|
|
97
|
+
exports.Uploader = Uploader;
|
|
88
98
|
/**
|
|
89
99
|
* Uploader implementation for a new file.
|
|
90
100
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAChD,6CAAgD;AAIhD,qDAAkD;AAGlD;;;;;;GAMG;AACH,
|
|
1
|
+
{"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FeatureFlagProvider, ProtonDriveTelemetry, UploadMetadata } from '../../interface';
|
|
2
|
+
import type { FileUploader } from '../../interface';
|
|
2
3
|
import { DriveAPIService } from '../apiService';
|
|
3
4
|
import { DriveCrypto } from '../../crypto';
|
|
4
|
-
import { FileUploader, FileRevisionUploader } from './fileUploader';
|
|
5
5
|
import { NodesService, SharesService } from './interface';
|
|
6
6
|
/**
|
|
7
7
|
* Provides facade for the upload module.
|
|
@@ -10,7 +10,7 @@ import { NodesService, SharesService } from './interface';
|
|
|
10
10
|
* metadata generation, content upload, API communication, encryption,
|
|
11
11
|
* and verifications.
|
|
12
12
|
*/
|
|
13
|
-
export declare function initUploadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, sharesService: SharesService, nodesService: NodesService, featureFlagProvider: FeatureFlagProvider, clientUid?: string): {
|
|
13
|
+
export declare function initUploadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, sharesService: SharesService, nodesService: NodesService, featureFlagProvider: FeatureFlagProvider, clientUid?: string, allowSmallFileUpload?: boolean): {
|
|
14
14
|
getFileUploader: (parentFolderUid: string, name: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileUploader>;
|
|
15
|
-
getFileRevisionUploader: (nodeUid: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<
|
|
15
|
+
getFileRevisionUploader: (nodeUid: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileUploader>;
|
|
16
16
|
};
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initUploadModule = initUploadModule;
|
|
4
|
+
const interface_1 = require("../../interface");
|
|
4
5
|
const apiService_1 = require("./apiService");
|
|
5
6
|
const cryptoService_1 = require("./cryptoService");
|
|
6
7
|
const fileUploader_1 = require("./fileUploader");
|
|
7
8
|
const manager_1 = require("./manager");
|
|
8
9
|
const queue_1 = require("./queue");
|
|
10
|
+
const smallFileUploader_1 = require("./smallFileUploader");
|
|
9
11
|
const telemetry_1 = require("./telemetry");
|
|
12
|
+
const SMALL_FILE_SIZE_LIMIT = 128 * 1024; // 128 KiB
|
|
10
13
|
/**
|
|
11
14
|
* Provides facade for the upload module.
|
|
12
15
|
*
|
|
@@ -14,12 +17,19 @@ const telemetry_1 = require("./telemetry");
|
|
|
14
17
|
* metadata generation, content upload, API communication, encryption,
|
|
15
18
|
* and verifications.
|
|
16
19
|
*/
|
|
17
|
-
function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nodesService, featureFlagProvider, clientUid) {
|
|
20
|
+
function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nodesService, featureFlagProvider, clientUid, allowSmallFileUpload = true) {
|
|
18
21
|
const api = new apiService_1.UploadAPIService(apiService, clientUid);
|
|
19
22
|
const cryptoService = new cryptoService_1.UploadCryptoService(telemetry, driveCrypto, nodesService, featureFlagProvider);
|
|
20
23
|
const uploadTelemetry = new telemetry_1.UploadTelemetry(telemetry, sharesService);
|
|
21
24
|
const manager = new manager_1.UploadManager(telemetry, api, cryptoService, nodesService, clientUid);
|
|
22
25
|
const queue = new queue_1.UploadQueue();
|
|
26
|
+
async function useSmallFileUpload(metadata) {
|
|
27
|
+
const isEnabled = allowSmallFileUpload && (await featureFlagProvider.isEnabled(interface_1.FeatureFlags.DriveSmallFileUpload));
|
|
28
|
+
if (!isEnabled) {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
return metadata.expectedSize < SMALL_FILE_SIZE_LIMIT;
|
|
32
|
+
}
|
|
23
33
|
/**
|
|
24
34
|
* Returns a FileUploader instance that can be used to upload a file to
|
|
25
35
|
* a parent folder.
|
|
@@ -32,6 +42,9 @@ function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nod
|
|
|
32
42
|
const onFinish = () => {
|
|
33
43
|
queue.releaseCapacity(metadata.expectedSize);
|
|
34
44
|
};
|
|
45
|
+
if (await useSmallFileUpload(metadata)) {
|
|
46
|
+
return new smallFileUploader_1.SmallFileUploader(uploadTelemetry, api, cryptoService, manager, metadata, onFinish, signal, parentFolderUid, name);
|
|
47
|
+
}
|
|
35
48
|
return new fileUploader_1.FileUploader(uploadTelemetry, api, cryptoService, manager, parentFolderUid, name, metadata, onFinish, signal);
|
|
36
49
|
}
|
|
37
50
|
/**
|
|
@@ -46,6 +59,9 @@ function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nod
|
|
|
46
59
|
const onFinish = () => {
|
|
47
60
|
queue.releaseCapacity(metadata.expectedSize);
|
|
48
61
|
};
|
|
62
|
+
if (await useSmallFileUpload(metadata)) {
|
|
63
|
+
return new smallFileUploader_1.SmallFileRevisionUploader(uploadTelemetry, api, cryptoService, manager, metadata, onFinish, signal, nodeUid);
|
|
64
|
+
}
|
|
49
65
|
return new fileUploader_1.FileRevisionUploader(uploadTelemetry, api, cryptoService, manager, nodeUid, metadata, onFinish, signal);
|
|
50
66
|
}
|
|
51
67
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/upload/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/upload/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const telemetry_1 = require("../../tests/telemetry");
|
|
4
|
+
const fileUploader_1 = require("./fileUploader");
|
|
5
|
+
const index_1 = require("./index");
|
|
6
|
+
const smallFileUploader_1 = require("./smallFileUploader");
|
|
7
|
+
const SMALL_FILE_SIZE_LIMIT = 128 * 1024; // 128 KiB, must match index.ts
|
|
8
|
+
describe('initUploadModule - uploader selection', () => {
|
|
9
|
+
const parentFolderUid = 'parent-folder-uid';
|
|
10
|
+
const name = 'test-file.txt';
|
|
11
|
+
const nodeUid = 'node-uid';
|
|
12
|
+
let featureFlagProvider;
|
|
13
|
+
let uploadModule;
|
|
14
|
+
beforeEach(() => {
|
|
15
|
+
const apiService = {};
|
|
16
|
+
const driveCrypto = {};
|
|
17
|
+
const sharesService = {};
|
|
18
|
+
const nodesService = {};
|
|
19
|
+
featureFlagProvider = {
|
|
20
|
+
isEnabled: jest.fn().mockResolvedValue(true),
|
|
21
|
+
};
|
|
22
|
+
uploadModule = (0, index_1.initUploadModule)((0, telemetry_1.getMockTelemetry)(), apiService, driveCrypto, sharesService, nodesService, featureFlagProvider);
|
|
23
|
+
});
|
|
24
|
+
describe('getFileUploader', () => {
|
|
25
|
+
it('returns SmallFileUploader when feature flag is enabled and file size is below limit', async () => {
|
|
26
|
+
featureFlagProvider.isEnabled.mockResolvedValue(true);
|
|
27
|
+
const metadata = { expectedSize: 1, mediaType: 'text/plain' };
|
|
28
|
+
const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
|
|
29
|
+
expect(uploader).toBeInstanceOf(smallFileUploader_1.SmallFileUploader);
|
|
30
|
+
});
|
|
31
|
+
it('returns FileUploader when feature flag is enabled but file size exceeds limit', async () => {
|
|
32
|
+
featureFlagProvider.isEnabled.mockResolvedValue(true);
|
|
33
|
+
const metadata = {
|
|
34
|
+
expectedSize: SMALL_FILE_SIZE_LIMIT,
|
|
35
|
+
mediaType: 'text/plain',
|
|
36
|
+
};
|
|
37
|
+
const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
|
|
38
|
+
expect(uploader).toBeInstanceOf(fileUploader_1.FileUploader);
|
|
39
|
+
});
|
|
40
|
+
it('returns FileUploader when feature flag is disabled even for small file', async () => {
|
|
41
|
+
featureFlagProvider.isEnabled.mockResolvedValue(false);
|
|
42
|
+
const metadata = { expectedSize: 1, mediaType: 'text/plain' };
|
|
43
|
+
const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
|
|
44
|
+
expect(uploader).toBeInstanceOf(fileUploader_1.FileUploader);
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
describe('getFileRevisionUploader', () => {
|
|
48
|
+
it('returns SmallFileRevisionUploader when feature flag is enabled and file size is below limit', async () => {
|
|
49
|
+
featureFlagProvider.isEnabled.mockResolvedValue(true);
|
|
50
|
+
const metadata = { expectedSize: 1, mediaType: 'text/plain' };
|
|
51
|
+
const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
|
|
52
|
+
expect(uploader).toBeInstanceOf(smallFileUploader_1.SmallFileRevisionUploader);
|
|
53
|
+
});
|
|
54
|
+
it('returns FileRevisionUploader when feature flag is enabled but file size exceeds limit', async () => {
|
|
55
|
+
featureFlagProvider.isEnabled.mockResolvedValue(true);
|
|
56
|
+
const metadata = {
|
|
57
|
+
expectedSize: SMALL_FILE_SIZE_LIMIT + 1,
|
|
58
|
+
mediaType: 'text/plain',
|
|
59
|
+
};
|
|
60
|
+
const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
|
|
61
|
+
expect(uploader).toBeInstanceOf(fileUploader_1.FileRevisionUploader);
|
|
62
|
+
});
|
|
63
|
+
it('returns FileRevisionUploader when feature flag is disabled even for small file', async () => {
|
|
64
|
+
featureFlagProvider.isEnabled.mockResolvedValue(false);
|
|
65
|
+
const metadata = { expectedSize: 1, mediaType: 'text/plain' };
|
|
66
|
+
const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
|
|
67
|
+
expect(uploader).toBeInstanceOf(fileUploader_1.FileRevisionUploader);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
//# sourceMappingURL=index.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/internal/upload/index.test.ts"],"names":[],"mappings":";;AACA,qDAAyD;AACzD,iDAAoE;AACpE,mCAA2C;AAC3C,2DAAmF;AAEnF,MAAM,qBAAqB,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,+BAA+B;AAEzE,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACnD,MAAM,eAAe,GAAG,mBAAmB,CAAC;IAC5C,MAAM,IAAI,GAAG,eAAe,CAAC;IAC7B,MAAM,OAAO,GAAG,UAAU,CAAC;IAE3B,IAAI,mBAAqD,CAAC;IAC1D,IAAI,YAAiD,CAAC;IAEtD,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,mBAAmB,GAAG;YAClB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;SAC/C,CAAC;QAEF,YAAY,GAAG,IAAA,wBAAgB,EAC3B,IAAA,4BAAgB,GAAE,EAClB,UAAiB,EACjB,WAAkB,EAClB,aAAoB,EACpB,YAAmB,EACnB,mBAA0B,CAC7B,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;YACjG,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAmB,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;YAC9E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAErF,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,qCAAiB,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;YAC3F,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,qBAAqB;gBACnC,SAAS,EAAE,YAAY;aAC1B,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAErF,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,2BAAY,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACpF,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAEvD,MAAM,QAAQ,GAAmB,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;YAC9E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAErF,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,2BAAY,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,6FAA6F,EAAE,KAAK,IAAI,EAAE;YACzG,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAmB,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;YAC9E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAE/E,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,6CAAyB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uFAAuF,EAAE,KAAK,IAAI,EAAE;YACnG,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAmB;gBAC7B,YAAY,EAAE,qBAAqB,GAAG,CAAC;gBACvC,SAAS,EAAE,YAAY;aAC1B,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAE/E,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,mCAAoB,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;YAC5F,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAEvD,MAAM,QAAQ,GAAmB,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;YAC9E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAE/E,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,mCAAoB,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -35,6 +35,7 @@ export type NodeCrypto = {
|
|
|
35
35
|
};
|
|
36
36
|
contentKey: {
|
|
37
37
|
encrypted: {
|
|
38
|
+
contentKeyPacket: Uint8Array<ArrayBuffer>;
|
|
38
39
|
base64ContentKeyPacket: string;
|
|
39
40
|
armoredContentKeyPacketSignature: string;
|
|
40
41
|
};
|
|
@@ -89,6 +90,7 @@ export interface NodesService {
|
|
|
89
90
|
getNodeKeys(nodeUid: string): Promise<{
|
|
90
91
|
key: PrivateKey;
|
|
91
92
|
passphraseSessionKey: SessionKey;
|
|
93
|
+
contentKeyPacket?: Uint8Array<ArrayBuffer>;
|
|
92
94
|
contentKeyPacketSessionKey?: SessionKey;
|
|
93
95
|
hashKey?: Uint8Array<ArrayBuffer>;
|
|
94
96
|
}>;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PrivateKey, SessionKey } from '../../crypto';
|
|
2
|
+
import { Logger, ProtonDriveTelemetry, ThumbnailType, UploadMetadata } from '../../interface';
|
|
2
3
|
import { UploadAPIService } from './apiService';
|
|
3
4
|
import { UploadCryptoService } from './cryptoService';
|
|
4
|
-
import { NodeRevisionDraft, NodesService } from './interface';
|
|
5
|
+
import { NodeRevisionDraft, NodesService, NodeCrypto } from './interface';
|
|
5
6
|
/**
|
|
6
7
|
* UploadManager is responsible for creating and deleting draft nodes
|
|
7
8
|
* on the server. It handles the creation of draft nodes, including
|
|
@@ -15,7 +16,45 @@ export declare class UploadManager {
|
|
|
15
16
|
protected logger: Logger;
|
|
16
17
|
constructor(telemetry: ProtonDriveTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, nodesService: NodesService, clientUid: string | undefined);
|
|
17
18
|
createDraftNode(parentFolderUid: string, name: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
|
|
19
|
+
generateNewFileCrypto(parentFolderUid: string, name: string): Promise<NodeCrypto & {
|
|
20
|
+
parentHashKey: Uint8Array<ArrayBuffer>;
|
|
21
|
+
}>;
|
|
22
|
+
getExistingFileNodeCrypto(nodeUid: string): Promise<{
|
|
23
|
+
key: PrivateKey;
|
|
24
|
+
contentKeyPacket: Uint8Array<ArrayBuffer>;
|
|
25
|
+
contentKeyPacketSessionKey: SessionKey;
|
|
26
|
+
signingKeys: NodeCrypto['signingKeys'];
|
|
27
|
+
}>;
|
|
18
28
|
private createDraftOnAPI;
|
|
29
|
+
uploadFile(parentFolderUid: string, nodeCrypto: NodeCrypto, metadata: UploadMetadata, commitPayload: {
|
|
30
|
+
armoredManifestSignature: string;
|
|
31
|
+
armoredExtendedAttributes: string;
|
|
32
|
+
}, encryptedBlock: {
|
|
33
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
34
|
+
armoredSignature: string;
|
|
35
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
36
|
+
} | undefined, encryptedThumbnails: {
|
|
37
|
+
type: ThumbnailType;
|
|
38
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
39
|
+
}[], signal?: AbortSignal): Promise<{
|
|
40
|
+
nodeUid: string;
|
|
41
|
+
nodeRevisionUid: string;
|
|
42
|
+
}>;
|
|
43
|
+
uploadSmallRevision(nodeUid: string, nodeCrypto: Pick<NodeCrypto, 'signingKeys'>, commitPayload: {
|
|
44
|
+
armoredManifestSignature: string;
|
|
45
|
+
armoredExtendedAttributes: string;
|
|
46
|
+
}, encryptedBlock: {
|
|
47
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
48
|
+
armoredSignature: string;
|
|
49
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
50
|
+
} | undefined, encryptedThumbnails: {
|
|
51
|
+
type: ThumbnailType;
|
|
52
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
53
|
+
}[], signal?: AbortSignal): Promise<{
|
|
54
|
+
nodeUid: string;
|
|
55
|
+
nodeRevisionUid: string;
|
|
56
|
+
}>;
|
|
57
|
+
private handleConflictError;
|
|
19
58
|
deleteDraftNode(nodeUid: string): Promise<void>;
|
|
20
59
|
createDraftRevision(nodeUid: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
|
|
21
60
|
deleteDraftRevision(nodeRevisionUid: string): Promise<void>;
|