@protontech/drive-sdk 0.6.2 → 0.7.1

package/src/internal/apiService/errors.ts

@@ -30,7 +30,7 @@ export function apiErrorFactory({
         Code?: number;
         Error?: string;
         Details?: object;
-        exception?: string;
+        Exception?: string;
         message?: string;
         file?: string;
         line?: number;
@@ -43,9 +43,10 @@ export function apiErrorFactory({
         typedResult.Details,
     ];
 
-    const debug = typedResult.exception
+    const debug = typedResult.Exception
         ? {
-              exception: typedResult.exception,
+              details: typedResult.Details,
+              exception: typedResult.Exception,
               message: typedResult.message,
               file: typedResult.file,
               line: typedResult.line,
@@ -82,7 +83,7 @@ export function apiErrorFactory({
         case ErrorCode.INSUFFICIENT_BOOKMARKS_QUOTA:
             return new ValidationError(message, code, details);
         default:
-            return new APICodeError(message, code, debug);
+            return new APICodeError(message, code, debug || details);
     }
 }
 

package/src/internal/download/cryptoService.ts

@@ -27,7 +27,7 @@ export class DownloadCryptoService {
         nodeKey: { key: PrivateKey; contentKeyPacketSessionKey: SessionKey },
         revision: Revision,
     ): Promise<RevisionKeys> {
-        const verificationKeys = await this.getRevisionVerificationKeys(revision);
+        const verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey.key);
         return {
             ...nodeKey,
             verificationKeys,
@@ -90,23 +90,30 @@ export class DownloadCryptoService {
         allBlockHashes: Uint8Array[],
         armoredManifestSignature?: string,
     ): Promise<void> {
-        const verificationKeys = (await this.getRevisionVerificationKeys(revision)) || nodeKey;
+        const verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey);
         const hash = mergeUint8Arrays(allBlockHashes);
 
         if (!armoredManifestSignature) {
             throw new IntegrityError(c('Error').t`Missing integrity signature`);
         }
 
-        const { verified } = await this.driveCrypto.verifyManifest(hash, armoredManifestSignature, verificationKeys);
+        const { verified, verificationErrors } = await this.driveCrypto.verifyManifest(
+            hash,
+            armoredManifestSignature,
+            verificationKeys,
+        );
+
         if (verified !== VERIFICATION_STATUS.SIGNED_AND_VALID) {
-            throw new IntegrityError(c('Error').t`Data integrity check failed`);
+            throw new IntegrityError(c('Error').t`Data integrity check failed`, {
+                verificationErrors,
+            });
         }
     }
 
-    private async getRevisionVerificationKeys(revision: Revision): Promise<PublicKey[] | undefined> {
+    private async getRevisionVerificationKeys(revision: Revision, nodeKey: PrivateKey): Promise<PublicKey[]> {
         const signatureEmail = revision.contentAuthor.ok
             ? revision.contentAuthor.value
             : revision.contentAuthor.error.claimedAuthor;
-        return signatureEmail ? await this.account.getPublicKeys(signatureEmail) : undefined;
+        return signatureEmail ? await this.account.getPublicKeys(signatureEmail) : [nodeKey];
     }
 }

package/src/internal/download/fileDownloader.ts

@@ -42,6 +42,7 @@ export class FileDownloader {
         private revision: DecryptedRevision,
         private signal?: AbortSignal,
         private onFinish?: () => void,
+        private ignoreManifestVerification = false,
     ) {
         this.telemetry = telemetry;
         this.logger = telemetry.getLoggerForRevision(revision.uid);
@@ -51,6 +52,7 @@ export class FileDownloader {
         this.revision = revision;
         this.signal = signal;
         this.onFinish = onFinish;
+        this.ignoreManifestVerification = ignoreManifestVerification;
         this.controller = new DownloadController(this.signal);
     }
 
@@ -219,7 +221,7 @@ export class FileDownloader {
                 throw new Error(`Some blocks were not downloaded`);
             }
 
-            if (ignoreIntegrityErrors) {
+            if (ignoreIntegrityErrors || this.ignoreManifestVerification) {
                 this.logger.warn('Skipping manifest check');
             } else {
                 this.logger.debug(`Verifying manifest`);
@@ -237,7 +239,7 @@ export class FileDownloader {
         } catch (error: unknown) {
             this.logger.error(`Download failed`, error);
             void this.telemetry.downloadFailed(this.revision.uid, error, fileProgress, this.getClaimedSizeInBytes());
-            await writer.abort();
+            await writer.abort?.();
             throw error;
         } finally {
             this.logger.debug(`Download cleanup`);

package/src/internal/download/index.ts

@@ -21,6 +21,7 @@ export function initDownloadModule(
     sharesService: SharesService,
     nodesService: NodesService,
     revisionsService: RevisionsService,
+    ignoreManifestVerification = false,
 ) {
     const queue = new DownloadQueue();
     const api = new DownloadAPIService(apiService);
@@ -63,6 +64,7 @@ export function initDownloadModule(
             node.activeRevision.value,
             signal,
             onFinish,
+            ignoreManifestVerification,
         );
     }
 
@@ -102,6 +104,7 @@ export function initDownloadModule(
             revision,
             signal,
             onFinish,
+            ignoreManifestVerification,
         );
     }
 

package/src/internal/errors.ts

@@ -3,6 +3,10 @@ import { c } from 'ttag';
 import { VERIFICATION_STATUS } from '../crypto';
 import { AbortError, ConnectionError, RateLimitedError, ValidationError } from '../errors';
 
+export function createErrorFromUnknown(error: unknown): Error {
+    return error instanceof Error ? error : new Error(getErrorMessage(error), { cause: error });
+}
+
 export function getErrorMessage(error: unknown): string {
     return error instanceof Error ? error.message : c('Error').t`Unknown error`;
 }

package/src/internal/nodes/apiService.test.ts

@@ -65,6 +65,7 @@ function generateAPINode() {
             ParentLinkID: 'parentLinkId',
             NameHash: 'nameHash',
             CreateTime: 123456789,
+            ModifyTime: 1234567890,
             TrashTime: 0,
 
             Name: 'encName',
@@ -140,6 +141,7 @@ function generateNode() {
         uid: 'volumeId~linkId',
         parentUid: 'volumeId~parentLinkId',
         creationTime: new Date(123456789000),
+        modificationTime: new Date(1234567890000),
         trashTime: undefined,
 
         shareId: undefined,
@@ -577,8 +579,8 @@ describe('nodeAPIService', () => {
         });
     });
 
-    describe('deleteNodes', () => {
-        it('should delete nodes', async () => {
+    describe('deleteTrashedNodes', () => {
+        it('should delete trashed nodes', async () => {
             // @ts-expect-error Mocking for testing purposes
             apiMock.post = jest.fn(async () =>
                 Promise.resolve({
@@ -600,14 +602,14 @@ describe('nodeAPIService', () => {
                 }),
             );
 
-            const result = await Array.fromAsync(api.deleteNodes(['volumeId~nodeId1', 'volumeId~nodeId2']));
+            const result = await Array.fromAsync(api.deleteTrashedNodes(['volumeId~nodeId1', 'volumeId~nodeId2']));
             expect(result).toEqual([
                 { uid: 'volumeId~nodeId1', ok: true },
                 { uid: 'volumeId~nodeId2', ok: false, error: 'INSUFFICIENT_SCOPE' },
             ]);
         });
 
-        it('should delete nodes from multiple volumes', async () => {
+        it('should delete trashed nodes from multiple volumes', async () => {
             // @ts-expect-error Mocking for testing purposes
             apiMock.post = jest.fn(async (_, { LinkIDs }) =>
                 Promise.resolve({
@@ -620,7 +622,7 @@ describe('nodeAPIService', () => {
                 }),
             );
 
-            const result = await Array.fromAsync(api.deleteNodes(['volumeId1~nodeId1', 'volumeId2~nodeId2']));
+            const result = await Array.fromAsync(api.deleteTrashedNodes(['volumeId1~nodeId1', 'volumeId2~nodeId2']));
             expect(result).toEqual([
                 { uid: 'volumeId1~nodeId1', ok: true },
                 { uid: 'volumeId2~nodeId2', ok: true },