@protontech/drive-sdk 0.5.0 → 0.5.1

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.
Files changed (151) hide show
  1. package/dist/diagnostic/{sdkDiagnosticFull.d.ts → diagnostic.d.ts} +5 -4
  2. package/dist/diagnostic/{sdkDiagnosticFull.js → diagnostic.js} +13 -10
  3. package/dist/diagnostic/diagnostic.js.map +1 -0
  4. package/dist/diagnostic/index.js +2 -4
  5. package/dist/diagnostic/index.js.map +1 -1
  6. package/dist/diagnostic/interface.d.ts +22 -1
  7. package/dist/diagnostic/sdkDiagnostic.d.ts +3 -2
  8. package/dist/diagnostic/sdkDiagnostic.js +79 -7
  9. package/dist/diagnostic/sdkDiagnostic.js.map +1 -1
  10. package/dist/interface/index.d.ts +1 -1
  11. package/dist/interface/index.js.map +1 -1
  12. package/dist/interface/nodes.d.ts +9 -0
  13. package/dist/interface/telemetry.d.ts +4 -1
  14. package/dist/interface/telemetry.js.map +1 -1
  15. package/dist/internal/apiService/driveTypes.d.ts +2571 -2356
  16. package/dist/internal/download/controller.d.ts +2 -0
  17. package/dist/internal/download/controller.js +15 -1
  18. package/dist/internal/download/controller.js.map +1 -1
  19. package/dist/internal/download/fileDownloader.js +6 -1
  20. package/dist/internal/download/fileDownloader.js.map +1 -1
  21. package/dist/internal/nodes/apiService.js +27 -12
  22. package/dist/internal/nodes/apiService.js.map +1 -1
  23. package/dist/internal/nodes/apiService.test.js +60 -2
  24. package/dist/internal/nodes/apiService.test.js.map +1 -1
  25. package/dist/internal/nodes/debouncer.d.ts +3 -2
  26. package/dist/internal/nodes/debouncer.js +16 -4
  27. package/dist/internal/nodes/debouncer.js.map +1 -1
  28. package/dist/internal/nodes/debouncer.test.js +20 -12
  29. package/dist/internal/nodes/debouncer.test.js.map +1 -1
  30. package/dist/internal/nodes/extendedAttributes.js +2 -2
  31. package/dist/internal/nodes/extendedAttributes.js.map +1 -1
  32. package/dist/internal/nodes/index.js +1 -1
  33. package/dist/internal/nodes/index.js.map +1 -1
  34. package/dist/internal/nodes/nodesAccess.d.ts +5 -4
  35. package/dist/internal/nodes/nodesAccess.js +6 -5
  36. package/dist/internal/nodes/nodesAccess.js.map +1 -1
  37. package/dist/internal/nodes/nodesAccess.test.js +17 -5
  38. package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
  39. package/dist/internal/nodes/nodesManagement.d.ts +2 -2
  40. package/dist/internal/nodes/nodesManagement.js +5 -3
  41. package/dist/internal/nodes/nodesManagement.js.map +1 -1
  42. package/dist/internal/nodes/nodesManagement.test.js +3 -1
  43. package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
  44. package/dist/internal/photos/apiService.js +9 -20
  45. package/dist/internal/photos/apiService.js.map +1 -1
  46. package/dist/internal/photos/upload.js +7 -1
  47. package/dist/internal/photos/upload.js.map +1 -1
  48. package/dist/internal/sharing/apiService.d.ts +1 -1
  49. package/dist/internal/sharing/apiService.js +2 -2
  50. package/dist/internal/sharing/apiService.js.map +1 -1
  51. package/dist/internal/sharing/sharingManagement.d.ts +4 -1
  52. package/dist/internal/sharing/sharingManagement.js +7 -4
  53. package/dist/internal/sharing/sharingManagement.js.map +1 -1
  54. package/dist/internal/sharingPublic/apiService.d.ts +8 -10
  55. package/dist/internal/sharingPublic/apiService.js +9 -63
  56. package/dist/internal/sharingPublic/apiService.js.map +1 -1
  57. package/dist/internal/sharingPublic/index.d.ts +3 -3
  58. package/dist/internal/sharingPublic/index.js +5 -11
  59. package/dist/internal/sharingPublic/index.js.map +1 -1
  60. package/dist/internal/sharingPublic/nodes.d.ts +13 -8
  61. package/dist/internal/sharingPublic/nodes.js +20 -2
  62. package/dist/internal/sharingPublic/nodes.js.map +1 -1
  63. package/dist/internal/sharingPublic/session/apiService.d.ts +7 -5
  64. package/dist/internal/sharingPublic/session/apiService.js +25 -4
  65. package/dist/internal/sharingPublic/session/apiService.js.map +1 -1
  66. package/dist/internal/sharingPublic/session/interface.d.ts +17 -0
  67. package/dist/internal/sharingPublic/session/manager.d.ts +12 -4
  68. package/dist/internal/sharingPublic/session/manager.js +14 -4
  69. package/dist/internal/sharingPublic/session/manager.js.map +1 -1
  70. package/dist/internal/sharingPublic/session/session.d.ts +5 -2
  71. package/dist/internal/sharingPublic/session/session.js +7 -3
  72. package/dist/internal/sharingPublic/session/session.js.map +1 -1
  73. package/dist/internal/sharingPublic/shares.d.ts +3 -10
  74. package/dist/internal/sharingPublic/shares.js +10 -33
  75. package/dist/internal/sharingPublic/shares.js.map +1 -1
  76. package/dist/internal/upload/controller.d.ts +3 -1
  77. package/dist/internal/upload/controller.js +16 -2
  78. package/dist/internal/upload/controller.js.map +1 -1
  79. package/dist/internal/upload/fileUploader.js +2 -2
  80. package/dist/internal/upload/fileUploader.js.map +1 -1
  81. package/dist/internal/upload/streamUploader.d.ts +4 -3
  82. package/dist/internal/upload/streamUploader.js +61 -18
  83. package/dist/internal/upload/streamUploader.js.map +1 -1
  84. package/dist/internal/upload/streamUploader.test.js +38 -12
  85. package/dist/internal/upload/streamUploader.test.js.map +1 -1
  86. package/dist/protonDriveClient.d.ts +8 -3
  87. package/dist/protonDriveClient.js +7 -6
  88. package/dist/protonDriveClient.js.map +1 -1
  89. package/dist/protonDrivePublicLinkClient.d.ts +4 -3
  90. package/dist/protonDrivePublicLinkClient.js +2 -2
  91. package/dist/protonDrivePublicLinkClient.js.map +1 -1
  92. package/dist/tests/telemetry.d.ts +4 -2
  93. package/dist/tests/telemetry.js +3 -1
  94. package/dist/tests/telemetry.js.map +1 -1
  95. package/dist/transformers.d.ts +3 -2
  96. package/dist/transformers.js +6 -0
  97. package/dist/transformers.js.map +1 -1
  98. package/package.json +1 -1
  99. package/src/diagnostic/{sdkDiagnosticFull.ts → diagnostic.ts} +10 -6
  100. package/src/diagnostic/index.ts +3 -5
  101. package/src/diagnostic/interface.ts +39 -0
  102. package/src/diagnostic/sdkDiagnostic.ts +110 -9
  103. package/src/interface/index.ts +1 -0
  104. package/src/interface/nodes.ts +3 -0
  105. package/src/interface/telemetry.ts +5 -0
  106. package/src/internal/apiService/driveTypes.ts +2698 -2529
  107. package/src/internal/download/controller.ts +13 -1
  108. package/src/internal/download/fileDownloader.ts +8 -1
  109. package/src/internal/nodes/apiService.test.ts +64 -0
  110. package/src/internal/nodes/apiService.ts +38 -17
  111. package/src/internal/nodes/debouncer.test.ts +25 -13
  112. package/src/internal/nodes/debouncer.ts +20 -4
  113. package/src/internal/nodes/extendedAttributes.ts +2 -2
  114. package/src/internal/nodes/index.ts +1 -8
  115. package/src/internal/nodes/nodesAccess.test.ts +17 -5
  116. package/src/internal/nodes/nodesAccess.ts +15 -5
  117. package/src/internal/nodes/nodesManagement.test.ts +3 -1
  118. package/src/internal/nodes/nodesManagement.ts +11 -5
  119. package/src/internal/photos/apiService.ts +12 -29
  120. package/src/internal/photos/upload.ts +19 -1
  121. package/src/internal/sharing/apiService.ts +2 -2
  122. package/src/internal/sharing/sharingManagement.ts +7 -4
  123. package/src/internal/sharingPublic/apiService.ts +23 -77
  124. package/src/internal/sharingPublic/index.ts +11 -10
  125. package/src/internal/sharingPublic/nodes.ts +33 -11
  126. package/src/internal/sharingPublic/session/apiService.ts +31 -9
  127. package/src/internal/sharingPublic/session/interface.ts +20 -0
  128. package/src/internal/sharingPublic/session/manager.ts +31 -8
  129. package/src/internal/sharingPublic/session/session.ts +10 -5
  130. package/src/internal/sharingPublic/shares.ts +7 -43
  131. package/src/internal/upload/controller.ts +16 -4
  132. package/src/internal/upload/fileUploader.ts +2 -2
  133. package/src/internal/upload/streamUploader.test.ts +46 -14
  134. package/src/internal/upload/streamUploader.ts +74 -21
  135. package/src/protonDriveClient.ts +25 -7
  136. package/src/protonDrivePublicLinkClient.ts +7 -4
  137. package/src/tests/telemetry.ts +6 -3
  138. package/src/transformers.ts +8 -0
  139. package/dist/diagnostic/sdkDiagnosticFull.js.map +0 -1
  140. package/dist/internal/sharingPublic/cryptoCache.d.ts +0 -15
  141. package/dist/internal/sharingPublic/cryptoCache.js +0 -44
  142. package/dist/internal/sharingPublic/cryptoCache.js.map +0 -1
  143. package/dist/internal/sharingPublic/cryptoService.d.ts +0 -8
  144. package/dist/internal/sharingPublic/cryptoService.js +0 -19
  145. package/dist/internal/sharingPublic/cryptoService.js.map +0 -1
  146. package/dist/internal/sharingPublic/interface.d.ts +0 -5
  147. package/dist/internal/sharingPublic/interface.js +0 -3
  148. package/dist/internal/sharingPublic/interface.js.map +0 -1
  149. package/src/internal/sharingPublic/cryptoCache.ts +0 -45
  150. package/src/internal/sharingPublic/cryptoService.ts +0 -22
  151. package/src/internal/sharingPublic/interface.ts +0 -5
@@ -1,5 +1,6 @@
1
+ import { Logger } from '../../../interface';
1
2
  import { DriveAPIService } from '../../apiService';
2
- import { PublicLinkInfo, PublicLinkSrpAuth } from './interface';
3
+ import { PublicLinkInfo, PublicLinkSrpAuth, PublicLinkSession, EncryptedShareCrypto } from './interface';
3
4
  /**
4
5
  * Provides API communication for managing public link session (not data).
5
6
  *
@@ -7,8 +8,9 @@ import { PublicLinkInfo, PublicLinkSrpAuth } from './interface';
7
8
  * and vice versa. It should not contain any business logic.
8
9
  */
9
10
  export declare class SharingPublicSessionAPIService {
11
+ private logger;
10
12
  private apiService;
11
- constructor(apiService: DriveAPIService);
13
+ constructor(logger: Logger, apiService: DriveAPIService);
12
14
  /**
13
15
  * Start a SRP handshake for public link session.
14
16
  */
@@ -21,8 +23,8 @@ export declare class SharingPublicSessionAPIService {
21
23
  * the session is newly created.
22
24
  */
23
25
  authPublicLinkSession(token: string, srp: PublicLinkSrpAuth): Promise<{
24
- serverProof: string;
25
- sessionUid: string;
26
- sessionAccessToken?: string;
26
+ session: PublicLinkSession;
27
+ encryptedShare: EncryptedShareCrypto;
28
+ rootUid: string;
27
29
  }>;
28
30
  }
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SharingPublicSessionAPIService = void 0;
4
+ const apiService_1 = require("../../apiService");
5
+ const uids_1 = require("../../uids");
4
6
  /**
5
7
  * Provides API communication for managing public link session (not data).
6
8
  *
@@ -8,9 +10,12 @@ exports.SharingPublicSessionAPIService = void 0;
8
10
  * and vice versa. It should not contain any business logic.
9
11
  */
10
12
  class SharingPublicSessionAPIService {
13
+ logger;
11
14
  apiService;
12
- constructor(apiService) {
15
+ constructor(logger, apiService) {
16
+ this.logger = logger;
13
17
  this.apiService = apiService;
18
+ this.logger = logger;
14
19
  this.apiService = apiService;
15
20
  }
16
21
  /**
@@ -29,6 +34,13 @@ class SharingPublicSessionAPIService {
29
34
  isCustomPasswordProtected: (response.Flags & 1) === 1,
30
35
  isLegacy: response.Flags === 0 || response.Flags === 1,
31
36
  vendorType: response.VendorType,
37
+ directAccess: response.DirectAccess
38
+ ? {
39
+ nodeUid: (0, uids_1.makeNodeUid)(response.DirectAccess.VolumeID, response.DirectAccess.LinkID),
40
+ directRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.DirectAccess.DirectPermissions),
41
+ publicRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.DirectAccess.PublicPermissions),
42
+ }
43
+ : undefined,
32
44
  };
33
45
  }
34
46
  /**
@@ -45,9 +57,18 @@ class SharingPublicSessionAPIService {
45
57
  SRPSession: srp.srpSession,
46
58
  });
47
59
  return {
48
- serverProof: response.ServerProof,
49
- sessionUid: response.UID,
50
- sessionAccessToken: response.AccessToken,
60
+ session: {
61
+ serverProof: response.ServerProof,
62
+ sessionUid: response.UID,
63
+ sessionAccessToken: response.AccessToken,
64
+ },
65
+ encryptedShare: {
66
+ base64UrlPasswordSalt: response.Share.SharePasswordSalt,
67
+ armoredKey: response.Share.ShareKey,
68
+ armoredPassphrase: response.Share.SharePassphrase,
69
+ publicRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.Share.PublicPermissions),
70
+ },
71
+ rootUid: (0, uids_1.makeNodeUid)(response.Share.VolumeID, response.Share.LinkID),
51
72
  };
52
73
  }
53
74
  }
@@ -1 +1 @@
1
- {"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/apiService.ts"],"names":[],"mappings":";;;AAaA;;;;;GAKG;AACH,MAAa,8BAA8B;IACnB;IAApB,YAAoB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAC3C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,cAAc,KAAK,OAAO,CAAC,CAAC;QAClG,OAAO;YACH,GAAG,EAAE;gBACD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,IAAI,EAAE,QAAQ,CAAC,eAAe;gBAC9B,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC;YACD,yBAAyB,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACrD,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;SAClC,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CACvB,KAAa,EACb,GAAsB;QAMtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,cAAc,KAAK,OAAO,EAC1B;YACI,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CACJ,CAAC;QAEF,OAAO;YACH,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,UAAU,EAAE,QAAQ,CAAC,GAAG;YACxB,kBAAkB,EAAE,QAAQ,CAAC,WAAW;SAC3C,CAAC;IACN,CAAC;CACJ;AAtDD,wEAsDC"}
1
+ {"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/apiService.ts"],"names":[],"mappings":";;;AACA,iDAAwF;AACxF,qCAAyC;AAazC;;;;;GAKG;AACH,MAAa,8BAA8B;IAE3B;IACA;IAFZ,YACY,MAAc,EACd,UAA2B;QAD3B,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAiB;QAEnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,cAAc,KAAK,OAAO,CAAC,CAAC;QAClG,OAAO;YACH,GAAG,EAAE;gBACD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,IAAI,EAAE,QAAQ,CAAC,eAAe;gBAC9B,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC;YACD,yBAAyB,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACrD,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,YAAY,EAAE,QAAQ,CAAC,YAAY;gBAC/B,CAAC,CAAC;oBACI,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC;oBAClF,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;oBACzF,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;iBAC5F;gBACH,CAAC,CAAC,SAAS;SAClB,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CACvB,KAAa,EACb,GAAsB;QAMtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,cAAc,KAAK,OAAO,EAC1B;YACI,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CACJ,CAAC;QAEF,OAAO;YACH,OAAO,EAAE;gBACL,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,UAAU,EAAE,QAAQ,CAAC,GAAG;gBACxB,kBAAkB,EAAE,QAAQ,CAAC,WAAW;aAC3C;YACD,cAAc,EAAE;gBACZ,qBAAqB,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB;gBACvD,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ;gBACnC,iBAAiB,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe;gBACjD,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;aACrF;YACD,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;SACvE,CAAC;IACN,CAAC;CACJ;AA1ED,wEA0EC"}
@@ -1,8 +1,14 @@
1
+ import { MemberRole } from '../../../interface';
1
2
  export type PublicLinkInfo = {
2
3
  srp: PublicLinkSrpInfo;
3
4
  isCustomPasswordProtected: boolean;
4
5
  isLegacy: boolean;
5
6
  vendorType: number;
7
+ directAccess?: {
8
+ nodeUid: string;
9
+ directRole: MemberRole;
10
+ publicRole: MemberRole;
11
+ };
6
12
  };
7
13
  export type PublicLinkSrpInfo = {
8
14
  version: number;
@@ -16,3 +22,14 @@ export type PublicLinkSrpAuth = {
16
22
  clientEphemeral: string;
17
23
  srpSession: string;
18
24
  };
25
+ export type PublicLinkSession = {
26
+ serverProof: string;
27
+ sessionUid: string;
28
+ sessionAccessToken?: string;
29
+ };
30
+ export type EncryptedShareCrypto = {
31
+ base64UrlPasswordSalt: string;
32
+ armoredKey: string;
33
+ armoredPassphrase: string;
34
+ publicRole: MemberRole;
35
+ };
@@ -1,5 +1,5 @@
1
- import { ProtonDriveHTTPClient } from '../../../interface';
2
- import { SRPModule } from '../../../crypto';
1
+ import { MemberRole, ProtonDriveHTTPClient, ProtonDriveTelemetry } from '../../../interface';
2
+ import { DriveCrypto, PrivateKey, SRPModule } from '../../../crypto';
3
3
  import { DriveAPIService } from '../../apiService';
4
4
  import { SharingPublicSessionHttpClient } from './httpClient';
5
5
  /**
@@ -9,10 +9,11 @@ import { SharingPublicSessionHttpClient } from './httpClient';
9
9
  */
10
10
  export declare class SharingPublicSessionManager {
11
11
  private httpClient;
12
+ private driveCrypto;
12
13
  private srpModule;
13
14
  private api;
14
15
  private infosPerToken;
15
- constructor(httpClient: ProtonDriveHTTPClient, apiService: DriveAPIService, srpModule: SRPModule);
16
+ constructor(telemetry: ProtonDriveTelemetry, httpClient: ProtonDriveHTTPClient, driveCrypto: DriveCrypto, srpModule: SRPModule, apiService: DriveAPIService);
16
17
  /**
17
18
  * Get the info for a public link.
18
19
  *
@@ -27,6 +28,11 @@ export declare class SharingPublicSessionManager {
27
28
  isCustomPasswordProtected: boolean;
28
29
  isLegacy: boolean;
29
30
  vendorType: number;
31
+ directAccess?: {
32
+ nodeUid: string;
33
+ directRole: MemberRole;
34
+ publicRole: MemberRole;
35
+ };
30
36
  }>;
31
37
  /**
32
38
  * Authenticate a public link session.
@@ -43,7 +49,9 @@ export declare class SharingPublicSessionManager {
43
49
  */
44
50
  auth(url: string, customPassword?: string): Promise<{
45
51
  token: string;
46
- password: string;
47
52
  httpClient: SharingPublicSessionHttpClient;
53
+ shareKey: PrivateKey;
54
+ rootUid: string;
48
55
  }>;
56
+ private decryptShareKey;
49
57
  }
@@ -12,15 +12,18 @@ const url_1 = require("./url");
12
12
  */
13
13
  class SharingPublicSessionManager {
14
14
  httpClient;
15
+ driveCrypto;
15
16
  srpModule;
16
17
  api;
17
18
  infosPerToken = new Map();
18
- constructor(httpClient, apiService, srpModule) {
19
+ constructor(telemetry, httpClient, driveCrypto, srpModule, apiService) {
19
20
  this.httpClient = httpClient;
21
+ this.driveCrypto = driveCrypto;
20
22
  this.srpModule = srpModule;
21
23
  this.httpClient = httpClient;
24
+ this.driveCrypto = driveCrypto;
22
25
  this.srpModule = srpModule;
23
- this.api = new apiService_1.SharingPublicSessionAPIService(apiService);
26
+ this.api = new apiService_1.SharingPublicSessionAPIService(telemetry.getLogger('sharingPublicSession'), apiService);
24
27
  }
25
28
  /**
26
29
  * Get the info for a public link.
@@ -40,6 +43,7 @@ class SharingPublicSessionManager {
40
43
  isCustomPasswordProtected: info.isCustomPasswordProtected,
41
44
  isLegacy: info.isLegacy,
42
45
  vendorType: info.vendorType,
46
+ directAccess: info.directAccess,
43
47
  };
44
48
  }
45
49
  /**
@@ -63,13 +67,19 @@ class SharingPublicSessionManager {
63
67
  }
64
68
  const password = `${urlPassword}${customPassword || ''}`;
65
69
  const session = new session_1.SharingPublicLinkSession(this.api, this.srpModule, token, password);
66
- await session.auth(info.srp);
70
+ const { encryptedShare, rootUid } = await session.auth(info.srp);
71
+ const shareKey = await this.decryptShareKey(encryptedShare, password);
67
72
  return {
68
73
  token,
69
- password,
70
74
  httpClient: new httpClient_1.SharingPublicSessionHttpClient(this.httpClient, session),
75
+ shareKey,
76
+ rootUid,
71
77
  };
72
78
  }
79
+ async decryptShareKey(encryptedShare, password) {
80
+ const { key: shareKey } = await this.driveCrypto.decryptKeyWithSrpPassword(password, encryptedShare.base64UrlPasswordSalt, encryptedShare.armoredKey, encryptedShare.armoredPassphrase);
81
+ return shareKey;
82
+ }
73
83
  }
74
84
  exports.SharingPublicSessionManager = SharingPublicSessionManager;
75
85
  //# sourceMappingURL=manager.js.map
@@ -1 +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"}
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;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"}
@@ -1,6 +1,6 @@
1
1
  import { SRPModule } from '../../../crypto';
2
2
  import { SharingPublicSessionAPIService } from './apiService';
3
- import { PublicLinkInfo, PublicLinkSrpInfo } from './interface';
3
+ import { EncryptedShareCrypto, PublicLinkInfo, PublicLinkSrpInfo } from './interface';
4
4
  /**
5
5
  * Session for a public link.
6
6
  *
@@ -17,7 +17,10 @@ export declare class SharingPublicLinkSession {
17
17
  constructor(apiService: SharingPublicSessionAPIService, srpModule: SRPModule, token: string, password: string);
18
18
  reauth(): Promise<void>;
19
19
  init(): Promise<PublicLinkInfo>;
20
- auth(srp: PublicLinkSrpInfo): Promise<void>;
20
+ auth(srp: PublicLinkSrpInfo): Promise<{
21
+ encryptedShare: EncryptedShareCrypto;
22
+ rootUid: string;
23
+ }>;
21
24
  /**
22
25
  * Get the session uid and access token.
23
26
  *
@@ -38,11 +38,15 @@ class SharingPublicLinkSession {
38
38
  clientEphemeral,
39
39
  srpSession: srp.srpSession,
40
40
  });
41
- if (auth.serverProof !== expectedServerProof) {
41
+ if (auth.session.serverProof !== expectedServerProof) {
42
42
  throw new Error('Invalid server proof');
43
43
  }
44
- this.sessionUid = auth.sessionUid;
45
- this.sessionAccessToken = auth.sessionAccessToken;
44
+ this.sessionUid = auth.session.sessionUid;
45
+ this.sessionAccessToken = auth.session.sessionAccessToken;
46
+ return {
47
+ encryptedShare: auth.encryptedShare,
48
+ rootUid: auth.rootUid,
49
+ };
46
50
  }
47
51
  /**
48
52
  * Get the session uid and access token.
@@ -1 +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"}
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,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"}
@@ -1,8 +1,5 @@
1
1
  import { PrivateKey } from '../../crypto';
2
2
  import { MetricVolumeType, ProtonDriveAccount } from '../../interface';
3
- import { SharingPublicAPIService } from './apiService';
4
- import { SharingPublicCryptoCache } from './cryptoCache';
5
- import { SharingPublicCryptoService } from './cryptoService';
6
3
  /**
7
4
  * Provides high-level actions for managing public link share.
8
5
  *
@@ -10,20 +7,16 @@ import { SharingPublicCryptoService } from './cryptoService';
10
7
  * service so it can be used in the same way in various modules that use shares.
11
8
  */
12
9
  export declare class SharingPublicSharesManager {
13
- private apiService;
14
- private cryptoCache;
15
- private cryptoService;
16
10
  private account;
17
- private token;
18
- private promisePublicLinkRoot?;
19
- constructor(apiService: SharingPublicAPIService, cryptoCache: SharingPublicCryptoCache, cryptoService: SharingPublicCryptoService, account: ProtonDriveAccount, token: string);
11
+ private publicShareKey;
12
+ private publicRootNodeUid;
13
+ constructor(account: ProtonDriveAccount, publicShareKey: PrivateKey, publicRootNodeUid: string);
20
14
  getOwnVolumeIDs(): Promise<{
21
15
  volumeId: string;
22
16
  rootNodeId: string;
23
17
  rootNodeUid: string;
24
18
  }>;
25
19
  getSharePrivateKey(): Promise<PrivateKey>;
26
- private getPublicLinkRoot;
27
20
  getContextShareMemberEmailKey(): Promise<{
28
21
  email: string;
29
22
  addressId: string;
@@ -10,47 +10,24 @@ const uids_1 = require("../uids");
10
10
  * service so it can be used in the same way in various modules that use shares.
11
11
  */
12
12
  class SharingPublicSharesManager {
13
- apiService;
14
- cryptoCache;
15
- cryptoService;
16
13
  account;
17
- token;
18
- promisePublicLinkRoot;
19
- constructor(apiService, cryptoCache, cryptoService, account, token) {
20
- this.apiService = apiService;
21
- this.cryptoCache = cryptoCache;
22
- this.cryptoService = cryptoService;
14
+ publicShareKey;
15
+ publicRootNodeUid;
16
+ constructor(account, publicShareKey, publicRootNodeUid) {
23
17
  this.account = account;
24
- this.token = token;
25
- this.apiService = apiService;
26
- this.cryptoCache = cryptoCache;
27
- this.cryptoService = cryptoService;
18
+ this.publicShareKey = publicShareKey;
19
+ this.publicRootNodeUid = publicRootNodeUid;
28
20
  this.account = account;
29
- this.token = token;
21
+ this.publicShareKey = publicShareKey;
22
+ this.publicRootNodeUid = publicRootNodeUid;
30
23
  }
31
24
  // TODO: Rename to getRootIDs everywhere.
32
25
  async getOwnVolumeIDs() {
33
- const { rootIds } = await this.getPublicLinkRoot();
34
- return rootIds;
26
+ const { volumeId, nodeId: rootNodeId } = (0, uids_1.splitNodeUid)(this.publicRootNodeUid);
27
+ return { volumeId, rootNodeId, rootNodeUid: this.publicRootNodeUid };
35
28
  }
36
29
  async getSharePrivateKey() {
37
- const { shareKey } = await this.getPublicLinkRoot();
38
- return shareKey;
39
- }
40
- async getPublicLinkRoot() {
41
- if (!this.promisePublicLinkRoot) {
42
- this.promisePublicLinkRoot = (async () => {
43
- const { encryptedNode, encryptedShare } = await this.apiService.getPublicLinkRoot(this.token);
44
- const { volumeId, nodeId: rootNodeId } = (0, uids_1.splitNodeUid)(encryptedNode.uid);
45
- const shareKey = await this.cryptoService.decryptPublicLinkShareKey(encryptedShare);
46
- await this.cryptoCache.setShareKey(shareKey);
47
- return {
48
- rootIds: { volumeId, rootNodeId, rootNodeUid: encryptedNode.uid },
49
- shareKey,
50
- };
51
- })();
52
- }
53
- return this.promisePublicLinkRoot;
30
+ return this.publicShareKey;
54
31
  }
55
32
  async getContextShareMemberEmailKey() {
56
33
  const address = await this.account.getOwnPrimaryAddress();
@@ -1 +1 @@
1
- {"version":3,"file":"shares.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/shares.ts"],"names":[],"mappings":";;;AACA,+CAAuE;AACvE,kCAAuC;AAKvC;;;;;GAKG;AACH,MAAa,0BAA0B;IAOvB;IACA;IACA;IACA;IACA;IAVJ,qBAAqB,CAG1B;IAEH,YACY,UAAmC,EACnC,WAAqC,EACrC,aAAyC,EACzC,OAA2B,EAC3B,KAAa;QAJb,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAA0B;QACrC,kBAAa,GAAb,aAAa,CAA4B;QACzC,YAAO,GAAP,OAAO,CAAoB;QAC3B,UAAK,GAAL,KAAK,CAAQ;QAErB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,eAAe;QACjB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACpD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAI3B,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9B,IAAI,CAAC,qBAAqB,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAE9F,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,mBAAY,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEzE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAE7C,OAAO;oBACH,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,CAAC,GAAG,EAAE;oBACjE,QAAQ;iBACX,CAAC;YACN,CAAC,CAAC,EAAE,CAAC;QACT,CAAC;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,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;AAxED,gEAwEC"}
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"}
@@ -1,10 +1,12 @@
1
1
  export declare class UploadController {
2
+ private signal?;
2
3
  private paused;
3
4
  promise?: Promise<{
4
5
  nodeRevisionUid: string;
5
6
  nodeUid: string;
6
7
  }>;
7
- waitIfPaused(): Promise<void>;
8
+ constructor(signal?: AbortSignal | undefined);
9
+ waitWhilePaused(): Promise<void>;
8
10
  pause(): void;
9
11
  resume(): void;
10
12
  completion(): Promise<{
@@ -1,12 +1,26 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.UploadController = void 0;
4
+ const errors_1 = require("../../errors");
4
5
  const wait_1 = require("../wait");
5
6
  class UploadController {
7
+ signal;
6
8
  paused = false;
7
9
  promise;
8
- async waitIfPaused() {
9
- await (0, wait_1.waitForCondition)(() => !this.paused);
10
+ constructor(signal) {
11
+ this.signal = signal;
12
+ this.signal = signal;
13
+ }
14
+ async waitWhilePaused() {
15
+ try {
16
+ await (0, wait_1.waitForCondition)(() => !this.paused, this.signal);
17
+ }
18
+ catch (error) {
19
+ if (error instanceof errors_1.AbortError) {
20
+ return;
21
+ }
22
+ throw error;
23
+ }
10
24
  }
11
25
  pause() {
12
26
  this.paused = true;
@@ -1 +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,CAAyD;IAEvE,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"}
1
+ {"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"}
@@ -42,7 +42,7 @@ class Uploader {
42
42
  this.abortController.abort();
43
43
  });
44
44
  }
45
- this.controller = new controller_1.UploadController();
45
+ this.controller = new controller_1.UploadController(this.abortController.signal);
46
46
  }
47
47
  async uploadFromFile(fileObject, thumbnails, onProgress) {
48
48
  if (this.controller.promise) {
@@ -82,7 +82,7 @@ class Uploader {
82
82
  return this.newStreamUploader(blockVerifier, revisionDraft, onFinish);
83
83
  }
84
84
  async newStreamUploader(blockVerifier, revisionDraft, onFinish) {
85
- return new streamUploader_1.StreamUploader(this.telemetry, this.apiService, this.cryptoService, this.manager, blockVerifier, revisionDraft, this.metadata, onFinish, this.controller, this.signal);
85
+ return new streamUploader_1.StreamUploader(this.telemetry, this.apiService, this.cryptoService, this.manager, blockVerifier, revisionDraft, this.metadata, onFinish, this.controller, this.abortController);
86
86
  }
87
87
  async createRevisionDraft() {
88
88
  throw new Error('Not implemented');
@@ -1 +1 @@
1
- {"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.ts"],"names":[],"mappings":"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"}
@@ -28,11 +28,10 @@ export declare class StreamUploader {
28
28
  protected metadata: UploadMetadata;
29
29
  protected onFinish: (failure: boolean) => Promise<void>;
30
30
  protected uploadController: UploadController;
31
- protected signal?: AbortSignal | undefined;
31
+ protected abortController: AbortController;
32
32
  protected logger: Logger;
33
33
  protected digests: UploadDigests;
34
34
  protected controller: UploadController;
35
- protected abortController: AbortController;
36
35
  protected encryptedThumbnails: Map<ThumbnailType, EncryptedThumbnail>;
37
36
  protected encryptedBlocks: Map<number, EncryptedBlock>;
38
37
  protected encryptionFinished: boolean;
@@ -46,7 +45,8 @@ export declare class StreamUploader {
46
45
  protected uploadedBlocks: ({
47
46
  index: number;
48
47
  } & EncryptedBlockMetadata)[];
49
- constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, uploadManager: UploadManager, blockVerifier: BlockVerifier, revisionDraft: NodeRevisionDraft, metadata: UploadMetadata, onFinish: (failure: boolean) => Promise<void>, uploadController: UploadController, signal?: AbortSignal | undefined);
48
+ protected error: unknown | undefined;
49
+ constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, uploadManager: UploadManager, blockVerifier: BlockVerifier, revisionDraft: NodeRevisionDraft, metadata: UploadMetadata, onFinish: (failure: boolean) => Promise<void>, uploadController: UploadController, abortController: AbortController);
50
50
  start(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
51
51
  nodeRevisionUid: string;
52
52
  nodeUid: string;
@@ -73,4 +73,5 @@ export declare class StreamUploader {
73
73
  protected get uploadedBlockSizes(): number[];
74
74
  protected get manifest(): Uint8Array;
75
75
  private abortUpload;
76
+ private get isUploadAborted();
76
77
  }