@protontech/drive-sdk 0.4.1 → 0.5.1

package/dist/internal/sharingPublic/session/interface.d.ts

@@ -1,8 +1,14 @@
+import { MemberRole } from '../../../interface';
 export type PublicLinkInfo = {
     srp: PublicLinkSrpInfo;
     isCustomPasswordProtected: boolean;
     isLegacy: boolean;
     vendorType: number;
+    directAccess?: {
+        nodeUid: string;
+        directRole: MemberRole;
+        publicRole: MemberRole;
+    };
 };
 export type PublicLinkSrpInfo = {
     version: number;
@@ -16,3 +22,14 @@ export type PublicLinkSrpAuth = {
     clientEphemeral: string;
     srpSession: string;
 };
+export type PublicLinkSession = {
+    serverProof: string;
+    sessionUid: string;
+    sessionAccessToken?: string;
+};
+export type EncryptedShareCrypto = {
+    base64UrlPasswordSalt: string;
+    armoredKey: string;
+    armoredPassphrase: string;
+    publicRole: MemberRole;
+};

package/dist/internal/sharingPublic/session/manager.d.ts

@@ -1,5 +1,5 @@
-import { ProtonDriveHTTPClient } from '../../../interface';
-import { SRPModule } from '../../../crypto';
+import { MemberRole, ProtonDriveHTTPClient, ProtonDriveTelemetry } from '../../../interface';
+import { DriveCrypto, PrivateKey, SRPModule } from '../../../crypto';
 import { DriveAPIService } from '../../apiService';
 import { SharingPublicSessionHttpClient } from './httpClient';
 /**
@@ -9,10 +9,11 @@ import { SharingPublicSessionHttpClient } from './httpClient';
  */
 export declare class SharingPublicSessionManager {
     private httpClient;
+    private driveCrypto;
     private srpModule;
     private api;
     private infosPerToken;
-    constructor(httpClient: ProtonDriveHTTPClient, apiService: DriveAPIService, srpModule: SRPModule);
+    constructor(telemetry: ProtonDriveTelemetry, httpClient: ProtonDriveHTTPClient, driveCrypto: DriveCrypto, srpModule: SRPModule, apiService: DriveAPIService);
     /**
      * Get the info for a public link.
      *
@@ -27,6 +28,11 @@ export declare class SharingPublicSessionManager {
         isCustomPasswordProtected: boolean;
         isLegacy: boolean;
         vendorType: number;
+        directAccess?: {
+            nodeUid: string;
+            directRole: MemberRole;
+            publicRole: MemberRole;
+        };
     }>;
     /**
      * Authenticate a public link session.
@@ -43,7 +49,9 @@ export declare class SharingPublicSessionManager {
      */
     auth(url: string, customPassword?: string): Promise<{
         token: string;
-        password: string;
         httpClient: SharingPublicSessionHttpClient;
+        shareKey: PrivateKey;
+        rootUid: string;
     }>;
+    private decryptShareKey;
 }

package/dist/internal/sharingPublic/session/manager.js

@@ -12,15 +12,18 @@ const url_1 = require("./url");
  */
 class SharingPublicSessionManager {
     httpClient;
+    driveCrypto;
     srpModule;
     api;
     infosPerToken = new Map();
-    constructor(httpClient, apiService, srpModule) {
+    constructor(telemetry, httpClient, driveCrypto, srpModule, apiService) {
         this.httpClient = httpClient;
+        this.driveCrypto = driveCrypto;
         this.srpModule = srpModule;
         this.httpClient = httpClient;
+        this.driveCrypto = driveCrypto;
         this.srpModule = srpModule;
-        this.api = new apiService_1.SharingPublicSessionAPIService(apiService);
+        this.api = new apiService_1.SharingPublicSessionAPIService(telemetry.getLogger('sharingPublicSession'), apiService);
     }
     /**
      * Get the info for a public link.
@@ -40,6 +43,7 @@ class SharingPublicSessionManager {
             isCustomPasswordProtected: info.isCustomPasswordProtected,
             isLegacy: info.isLegacy,
             vendorType: info.vendorType,
+            directAccess: info.directAccess,
         };
     }
     /**
@@ -63,13 +67,19 @@ class SharingPublicSessionManager {
         }
         const password = `${urlPassword}${customPassword || ''}`;
         const session = new session_1.SharingPublicLinkSession(this.api, this.srpModule, token, password);
-        await session.auth(info.srp);
+        const { encryptedShare, rootUid } = await session.auth(info.srp);
+        const shareKey = await this.decryptShareKey(encryptedShare, password);
         return {
             token,
-            password,
             httpClient: new httpClient_1.SharingPublicSessionHttpClient(this.httpClient, session),
+            shareKey,
+            rootUid,
         };
     }
+    async decryptShareKey(encryptedShare, password) {
+        const { key: shareKey } = await this.driveCrypto.decryptKeyWithSrpPassword(password, encryptedShare.base64UrlPasswordSalt, encryptedShare.armoredKey, encryptedShare.armoredPassphrase);
+        return shareKey;
+    }
 }
 exports.SharingPublicSessionManager = SharingPublicSessionManager;
 //# sourceMappingURL=manager.js.map

package/dist/internal/sharingPublic/session/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/manager.ts"],"names":[],"mappings":";;;AAGA,6CAA8D;AAC9D,6CAA8D;AAE9D,uCAAqD;AACrD,+BAAmD;AAEnD;;;;GAIG;AACH,MAAa,2BAA2B;IAMxB;IAEA;IAPJ,GAAG,CAAiC;IAEpC,aAAa,GAAgC,IAAI,GAAG,EAAE,CAAC;IAE/D,YACY,UAAiC,EACzC,UAA2B,EACnB,SAAoB;QAFpB,eAAU,GAAV,UAAU,CAAuB;QAEjC,cAAS,GAAT,SAAS,CAAW;QAE5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,IAAI,2CAA8B,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,OAAO,CAAC,GAAW;QAKrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEpC,OAAO;YACH,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,IAAI,CACN,GAAW,EACX,cAAuB;QAMvB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAEzE,IAAI,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,WAAW,GAAG,cAAc,IAAI,EAAE,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,kCAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxF,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7B,OAAO;YACH,KAAK;YACL,QAAQ;YACR,UAAU,EAAE,IAAI,2CAA8B,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;SAC3E,CAAC;IACN,CAAC;CACJ;AAlFD,kEAkFC"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/manager.ts"],"names":[],"mappings":";;;AAGA,6CAA8D;AAC9D,6CAA8D;AAE9D,uCAAqD;AACrD,+BAAmD;AAEnD;;;;GAIG;AACH,MAAa,2BAA2B;IAOxB;IACA;IACA;IARJ,GAAG,CAAiC;IAEpC,aAAa,GAAgC,IAAI,GAAG,EAAE,CAAC;IAE/D,YACI,SAA+B,EACvB,UAAiC,EACjC,WAAwB,EACxB,SAAoB,EAC5B,UAA2B;QAHnB,eAAU,GAAV,UAAU,CAAuB;QACjC,gBAAW,GAAX,WAAW,CAAa;QACxB,cAAS,GAAT,SAAS,CAAW;QAG5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,IAAI,2CAA8B,CAAC,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,UAAU,CAAC,CAAC;IAC3G,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,OAAO,CAAC,GAAW;QAUrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEpC,OAAO;YACH,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;SAClC,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,IAAI,CACN,GAAW,EACX,cAAuB;QAOvB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAEzE,IAAI,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,WAAW,GAAG,cAAc,IAAI,EAAE,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,kCAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAEtE,OAAO;YACH,KAAK;YACL,UAAU,EAAE,IAAI,2CAA8B,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;YACxE,QAAQ;YACR,OAAO;SACV,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,cAAoC,EAAE,QAAgB;QAChF,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,yBAAyB,CACtE,QAAQ,EACR,cAAc,CAAC,qBAAqB,EACpC,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,iBAAiB,CACnC,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAzGD,kEAyGC"}

package/dist/internal/sharingPublic/session/session.d.ts

@@ -1,6 +1,6 @@
-import { SRPModule } from "../../../crypto";
-import { SharingPublicSessionAPIService } from "./apiService";
-import { PublicLinkInfo, PublicLinkSrpInfo } from "./interface";
+import { SRPModule } from '../../../crypto';
+import { SharingPublicSessionAPIService } from './apiService';
+import { EncryptedShareCrypto, PublicLinkInfo, PublicLinkSrpInfo } from './interface';
 /**
  * Session for a public link.
  *
@@ -17,7 +17,10 @@ export declare class SharingPublicLinkSession {
     constructor(apiService: SharingPublicSessionAPIService, srpModule: SRPModule, token: string, password: string);
     reauth(): Promise<void>;
     init(): Promise<PublicLinkInfo>;
-    auth(srp: PublicLinkSrpInfo): Promise<void>;
+    auth(srp: PublicLinkSrpInfo): Promise<{
+        encryptedShare: EncryptedShareCrypto;
+        rootUid: string;
+    }>;
     /**
      * Get the session uid and access token.
      *

package/dist/internal/sharingPublic/session/session.js

@@ -38,11 +38,15 @@ class SharingPublicLinkSession {
             clientEphemeral,
             srpSession: srp.srpSession,
         });
-        if (auth.serverProof !== expectedServerProof) {
+        if (auth.session.serverProof !== expectedServerProof) {
             throw new Error('Invalid server proof');
         }
-        this.sessionUid = auth.sessionUid;
-        this.sessionAccessToken = auth.sessionAccessToken;
+        this.sessionUid = auth.session.sessionUid;
+        this.sessionAccessToken = auth.session.sessionAccessToken;
+        return {
+            encryptedShare: auth.encryptedShare,
+            rootUid: auth.rootUid,
+        };
     }
     /**
      * Get the session uid and access token.

package/dist/internal/sharingPublic/session/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/session.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,MAAa,wBAAwB;IAKrB;IACA;IACA;IACA;IAPJ,UAAU,CAAU;IACpB,kBAAkB,CAAU;IAEpC,YACY,UAA0C,EAC1C,SAAoB,EACpB,KAAa,EACb,QAAgB;QAHhB,eAAU,GAAV,UAAU,CAAgC;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAQ;QAExB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAsB;QAC7B,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CACrF,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,IAAI,EACR,IAAI,CAAC,QAAQ,CAChB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE;YACjE,WAAW;YACX,eAAe;YACf,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,WAAW,KAAK,mBAAmB,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACtD,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,WAAW,EAAE,IAAI,CAAC,kBAAkB;SACvC,CAAC;IACN,CAAC;CACJ;AAnED,4DAmEC"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/session.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,MAAa,wBAAwB;IAKrB;IACA;IACA;IACA;IAPJ,UAAU,CAAU;IACpB,kBAAkB,CAAU;IAEpC,YACY,UAA0C,EAC1C,SAAoB,EACpB,KAAa,EACb,QAAgB;QAHhB,eAAU,GAAV,UAAU,CAAgC;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAQ;QAExB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAsB;QAC7B,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CACrF,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,IAAI,EACR,IAAI,CAAC,QAAQ,CAChB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE;YACjE,WAAW;YACX,eAAe;YACf,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAE1D,OAAO;YACH,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAC;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,WAAW,EAAE,IAAI,CAAC,kBAAkB;SACvC,CAAC;IACN,CAAC;CACJ;AAxED,4DAwEC"}

package/dist/internal/sharingPublic/session/url.test.js

@@ -9,7 +9,7 @@ describe('getTokenAndPasswordFromUrl', () => {
             const result = (0, url_1.getTokenAndPasswordFromUrl)(url);
             expect(result).toEqual({
                 token: 'abc123',
-                password: 'def456'
+                password: 'def456',
             });
         });
         it('should handle URLs with different domains', () => {
@@ -17,7 +17,7 @@ describe('getTokenAndPasswordFromUrl', () => {
             const result = (0, url_1.getTokenAndPasswordFromUrl)(url);
             expect(result).toEqual({
                 token: 'mytoken',
-                password: 'mypassword'
+                password: 'mypassword',
             });
         });
         it('should handle URLs with query parameters', () => {
@@ -25,7 +25,7 @@ describe('getTokenAndPasswordFromUrl', () => {
             const result = (0, url_1.getTokenAndPasswordFromUrl)(url);
             expect(result).toEqual({
                 token: 'token123',
-                password: 'password456'
+                password: 'password456',
             });
         });
     });

package/dist/internal/sharingPublic/shares.d.ts

@@ -0,0 +1,27 @@
+import { PrivateKey } from '../../crypto';
+import { MetricVolumeType, ProtonDriveAccount } from '../../interface';
+/**
+ * Provides high-level actions for managing public link share.
+ *
+ * The public link share manager provides the same interface as the code share
+ * service so it can be used in the same way in various modules that use shares.
+ */
+export declare class SharingPublicSharesManager {
+    private account;
+    private publicShareKey;
+    private publicRootNodeUid;
+    constructor(account: ProtonDriveAccount, publicShareKey: PrivateKey, publicRootNodeUid: string);
+    getOwnVolumeIDs(): Promise<{
+        volumeId: string;
+        rootNodeId: string;
+        rootNodeUid: string;
+    }>;
+    getSharePrivateKey(): Promise<PrivateKey>;
+    getContextShareMemberEmailKey(): Promise<{
+        email: string;
+        addressId: string;
+        addressKey: PrivateKey;
+        addressKeyId: string;
+    }>;
+    getVolumeMetricContext(): Promise<MetricVolumeType>;
+}

package/dist/internal/sharingPublic/shares.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SharingPublicSharesManager = void 0;
+const interface_1 = require("../../interface");
+const uids_1 = require("../uids");
+/**
+ * Provides high-level actions for managing public link share.
+ *
+ * The public link share manager provides the same interface as the code share
+ * service so it can be used in the same way in various modules that use shares.
+ */
+class SharingPublicSharesManager {
+    account;
+    publicShareKey;
+    publicRootNodeUid;
+    constructor(account, publicShareKey, publicRootNodeUid) {
+        this.account = account;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
+        this.account = account;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
+    }
+    // TODO: Rename to getRootIDs everywhere.
+    async getOwnVolumeIDs() {
+        const { volumeId, nodeId: rootNodeId } = (0, uids_1.splitNodeUid)(this.publicRootNodeUid);
+        return { volumeId, rootNodeId, rootNodeUid: this.publicRootNodeUid };
+    }
+    async getSharePrivateKey() {
+        return this.publicShareKey;
+    }
+    async getContextShareMemberEmailKey() {
+        const address = await this.account.getOwnPrimaryAddress();
+        return {
+            email: address.email,
+            addressId: address.addressId,
+            addressKey: address.keys[address.primaryKeyIndex].key,
+            addressKeyId: address.keys[address.primaryKeyIndex].id,
+        };
+    }
+    async getVolumeMetricContext() {
+        return interface_1.MetricVolumeType.SharedPublic;
+    }
+}
+exports.SharingPublicSharesManager = SharingPublicSharesManager;
+//# sourceMappingURL=shares.js.map

package/dist/internal/sharingPublic/shares.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shares.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/shares.ts"],"names":[],"mappings":";;;AACA,+CAAuE;AACvE,kCAAuC;AAEvC;;;;;GAKG;AACH,MAAa,0BAA0B;IAEvB;IACA;IACA;IAHZ,YACY,OAA2B,EAC3B,cAA0B,EAC1B,iBAAyB;QAFzB,YAAO,GAAP,OAAO,CAAoB;QAC3B,mBAAc,GAAd,cAAc,CAAY;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAQ;QAEjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,eAAe;QACjB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9E,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,6BAA6B;QAM/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC1D,OAAO;YACH,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG;YACrD,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE;SACzD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,OAAO,4BAAgB,CAAC,YAAY,CAAC;IACzC,CAAC;CACJ;AAvCD,gEAuCC"}

package/dist/internal/upload/apiService.js

@@ -31,6 +31,15 @@ class UploadAPIService {
         };
     }
     async createDraft(parentNodeUid, node) {
+        // The client shouldn't send the clear text size of the file.
+        // The intented upload size is needed only for early validation that
+        // the file can fit in the remaining quota to avoid data transfer when
+        // the upload would be rejected. The backend will still validate
+        // the quota during block upload and revision commit.
+        const precision = 100_000; // bytes
+        const intendedUploadSize = node.intendedUploadSize && node.intendedUploadSize > precision
+            ? Math.floor(node.intendedUploadSize / precision) * precision
+            : null;
         const { volumeId, nodeId: parentNodeId } = (0, uids_1.splitNodeUid)(parentNodeUid);
         const result = await this.apiService.post(`drive/v2/volumes/${volumeId}/files`, {
             ParentLinkID: parentNodeId,
@@ -38,7 +47,7 @@ class UploadAPIService {
             Hash: node.hash,
             MIMEType: node.mediaType,
             ClientUID: this.clientUid || null,
-            IntendedUploadSize: node.intendedUploadSize || null,
+            IntendedUploadSize: intendedUploadSize,
             NodeKey: node.armoredNodeKey,
             NodePassphrase: node.armoredNodePassphrase,
             NodePassphraseSignature: node.armoredNodePassphraseSignature,

package/dist/internal/upload/apiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}

package/dist/internal/upload/controller.d.ts

@@ -1,8 +1,16 @@
 export declare class UploadController {
+    private signal?;
     private paused;
-    promise?: Promise<string>;
-    waitIfPaused(): Promise<void>;
+    promise?: Promise<{
+        nodeRevisionUid: string;
+        nodeUid: string;
+    }>;
+    constructor(signal?: AbortSignal | undefined);
+    waitWhilePaused(): Promise<void>;
     pause(): void;
     resume(): void;
-    completion(): Promise<string>;
+    completion(): Promise<{
+        nodeRevisionUid: string;
+        nodeUid: string;
+    }>;
 }

package/dist/internal/upload/controller.js

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadController = void 0;
+const errors_1 = require("../../errors");
 const wait_1 = require("../wait");
 class UploadController {
+    signal;
     paused = false;
     promise;
-    async waitIfPaused() {
-        await (0, wait_1.waitForCondition)(() => !this.paused);
+    constructor(signal) {
+        this.signal = signal;
+        this.signal = signal;
+    }
+    async waitWhilePaused() {
+        try {
+            await (0, wait_1.waitForCondition)(() => !this.paused, this.signal);
+        }
+        catch (error) {
+            if (error instanceof errors_1.AbortError) {
+                return;
+            }
+            throw error;
+        }
     }
     pause() {
         this.paused = true;

package/dist/internal/upload/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/internal/upload/controller.ts"],"names":[],"mappings":";;;AAAA,kCAA2C;AAE3C,MAAa,gBAAgB;IACjB,MAAM,GAAG,KAAK,CAAC;IAChB,OAAO,CAAmB;IAEjC,KAAK,CAAC,YAAY;QACd,MAAM,IAAA,uBAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;CACJ;AAtBD,4CAsBC"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/internal/upload/controller.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,kCAA2C;AAE3C,MAAa,gBAAgB;IAIL;IAHZ,MAAM,GAAG,KAAK,CAAC;IAChB,OAAO,CAAyD;IAEvE,YAAoB,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,IAAI,CAAC;YACD,MAAM,IAAA,uBAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;gBAC9B,OAAO;YACX,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;CACJ;AAjCD,4CAiCC"}

package/dist/internal/upload/fileUploader.d.ts

@@ -25,9 +25,12 @@ declare class Uploader {
     protected controller: UploadController;
     protected abortController: AbortController;
     constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal?: AbortSignal | undefined);
-    writeFile(fileObject: File, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
-    writeStream(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
-    protected startUpload(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<string>;
+    uploadFromFile(fileObject: File, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
+    uploadFromStream(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<UploadController>;
+    protected startUpload(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
+        nodeRevisionUid: string;
+        nodeUid: string;
+    }>;
     protected initStreamUploader(): Promise<StreamUploader>;
     protected newStreamUploader(blockVerifier: BlockVerifier, revisionDraft: NodeRevisionDraft, onFinish: (failure: boolean) => Promise<void>): Promise<StreamUploader>;
     protected createRevisionDraft(): Promise<{

package/dist/internal/upload/fileUploader.js

@@ -42,9 +42,9 @@ class Uploader {
                 this.abortController.abort();
             });
         }
-        this.controller = new controller_1.UploadController();
+        this.controller = new controller_1.UploadController(this.abortController.signal);
     }
-    async writeFile(fileObject, thumbnails, onProgress) {
+    async uploadFromFile(fileObject, thumbnails, onProgress) {
         if (this.controller.promise) {
             throw new Error(`Upload already started`);
         }
@@ -60,7 +60,7 @@ class Uploader {
         this.controller.promise = this.startUpload(fileObject.stream(), thumbnails, onProgress);
         return this.controller;
     }
-    async writeStream(stream, thumbnails, onProgress) {
+    async uploadFromStream(stream, thumbnails, onProgress) {
         if (this.controller.promise) {
             throw new Error(`Upload already started`);
         }
@@ -82,7 +82,7 @@ class Uploader {
         return this.newStreamUploader(blockVerifier, revisionDraft, onFinish);
     }
     async newStreamUploader(blockVerifier, revisionDraft, onFinish) {
-        return new streamUploader_1.StreamUploader(this.telemetry, this.apiService, this.cryptoService, this.manager, blockVerifier, revisionDraft, this.metadata, onFinish, this.signal);
+        return new streamUploader_1.StreamUploader(this.telemetry, this.apiService, this.cryptoService, this.manager, blockVerifier, revisionDraft, this.metadata, onFinish, this.controller, this.abortController);
     }
     async createRevisionDraft() {
         throw new Error('Not implemented');

package/dist/internal/upload/fileUploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":"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"}

package/dist/internal/upload/fileUploader.test.js

@@ -81,6 +81,7 @@ describe('FileUploader', () => {
         };
         revisionDraft = {
             nodeRevisionUid: 'revisionUid',
+            nodeUid: 'nodeUid',
             nodeKeys: {
                 signatureAddress: { addressId: 'addressId' },
             },
@@ -90,9 +91,12 @@ describe('FileUploader', () => {
         onFinish = jest.fn();
         abortController = new AbortController();
         uploader = new fileUploader_1.FileUploader(telemetry, apiService, cryptoService, uploadManager, 'parentFolderUid', 'name', metadata, onFinish, abortController.signal);
-        startUploadSpy = jest.spyOn(uploader, 'startUpload').mockReturnValue(Promise.resolve('revisionUid'));
+        startUploadSpy = jest.spyOn(uploader, 'startUpload').mockReturnValue(Promise.resolve({
+            nodeRevisionUid: 'revisionUid',
+            nodeUid: 'nodeUid'
+        }));
     });
-    describe('writeFile', () => {
+    describe('uploadFromFile', () => {
         // @ts-expect-error Ignore mocking File
         const file = {
             type: 'image/png',
@@ -103,36 +107,44 @@ describe('FileUploader', () => {
         const thumbnails = [];
         const onProgress = jest.fn();
         it('should set media type if not set', async () => {
-            await uploader.writeFile(file, thumbnails, onProgress);
+            await uploader.uploadFromFile(file, thumbnails, onProgress);
             expect(metadata.mediaType).toEqual('image/png');
             expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
         });
         it('should set expected size if not set', async () => {
-            await uploader.writeFile(file, thumbnails, onProgress);
+            await uploader.uploadFromFile(file, thumbnails, onProgress);
             expect(metadata.expectedSize).toEqual(file.size);
             expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
         });
         it('should set modification time if not set', async () => {
-            await uploader.writeFile(file, thumbnails, onProgress);
+            await uploader.uploadFromFile(file, thumbnails, onProgress);
             expect(metadata.modificationTime).toEqual(new Date(123456789));
             expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
         });
         it('should throw an error if upload already started', async () => {
-            await uploader.writeFile(file, thumbnails, onProgress);
-            await expect(uploader.writeFile(file, thumbnails, onProgress)).rejects.toThrow('Upload already started');
+            await uploader.uploadFromFile(file, thumbnails, onProgress);
+            await expect(uploader.uploadFromFile(file, thumbnails, onProgress)).rejects.toThrow('Upload already started');
         });
     });
-    describe('writeStream', () => {
+    describe('uploadFromStream', () => {
         const stream = new ReadableStream();
         const thumbnails = [];
         const onProgress = jest.fn();
         it('should start the upload process', async () => {
-            await uploader.writeStream(stream, thumbnails, onProgress);
+            await uploader.uploadFromStream(stream, thumbnails, onProgress);
             expect(startUploadSpy).toHaveBeenCalledWith(stream, thumbnails, onProgress);
         });
         it('should throw an error if upload already started', async () => {
-            await uploader.writeStream(stream, thumbnails, onProgress);
-            await expect(uploader.writeStream(stream, thumbnails, onProgress)).rejects.toThrow('Upload already started');
+            await uploader.uploadFromStream(stream, thumbnails, onProgress);
+            await expect(uploader.uploadFromStream(stream, thumbnails, onProgress)).rejects.toThrow('Upload already started');
+        });
+        it('should return correct nodeUid and nodeRevisionUid via controller completion', async () => {
+            const controller = await uploader.uploadFromStream(stream, thumbnails, onProgress);
+            const result = await controller.completion();
+            expect(result).toEqual({
+                nodeRevisionUid: 'revisionUid',
+                nodeUid: 'nodeUid'
+            });
         });
     });
 });

package/dist/internal/upload/fileUploader.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fileUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.test.ts"],"names":[],"mappings":"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"}

package/dist/internal/upload/streamUploader.d.ts

@@ -27,11 +27,11 @@ export declare class StreamUploader {
     protected revisionDraft: NodeRevisionDraft;
     protected metadata: UploadMetadata;
     protected onFinish: (failure: boolean) => Promise<void>;
-    protected signal?: AbortSignal | undefined;
+    protected uploadController: UploadController;
+    protected abortController: AbortController;
     protected logger: Logger;
     protected digests: UploadDigests;
     protected controller: UploadController;
-    protected abortController: AbortController;
     protected encryptedThumbnails: Map<ThumbnailType, EncryptedThumbnail>;
     protected encryptedBlocks: Map<number, EncryptedBlock>;
     protected encryptionFinished: boolean;
@@ -45,8 +45,12 @@ export declare class StreamUploader {
     protected uploadedBlocks: ({
         index: number;
     } & EncryptedBlockMetadata)[];
-    constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, uploadManager: UploadManager, blockVerifier: BlockVerifier, revisionDraft: NodeRevisionDraft, metadata: UploadMetadata, onFinish: (failure: boolean) => Promise<void>, signal?: AbortSignal | undefined);
-    start(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<string>;
+    protected error: unknown | undefined;
+    constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, uploadManager: UploadManager, blockVerifier: BlockVerifier, revisionDraft: NodeRevisionDraft, metadata: UploadMetadata, onFinish: (failure: boolean) => Promise<void>, uploadController: UploadController, abortController: AbortController);
+    start(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
+        nodeRevisionUid: string;
+        nodeUid: string;
+    }>;
     private encryptAndUploadBlocks;
     protected commitFile(thumbnails: Thumbnail[]): Promise<void>;
     private encryptThumbnails;
@@ -69,4 +73,5 @@ export declare class StreamUploader {
     protected get uploadedBlockSizes(): number[];
     protected get manifest(): Uint8Array;
     private abortUpload;
+    private get isUploadAborted();
 }