@protontech/drive-sdk 0.6.0 → 0.6.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.
- package/dist/diagnostic/diagnostic.d.ts +7 -4
- package/dist/diagnostic/diagnostic.js +16 -8
- package/dist/diagnostic/diagnostic.js.map +1 -1
- package/dist/diagnostic/index.d.ts +1 -1
- package/dist/diagnostic/index.js +9 -1
- package/dist/diagnostic/index.js.map +1 -1
- package/dist/diagnostic/interface.d.ts +24 -9
- package/dist/diagnostic/nodeUtils.d.ts +13 -0
- package/dist/diagnostic/nodeUtils.js +90 -0
- package/dist/diagnostic/nodeUtils.js.map +1 -0
- package/dist/diagnostic/sdkDiagnosticBase.d.ts +36 -0
- package/dist/diagnostic/sdkDiagnosticBase.js +305 -0
- package/dist/diagnostic/sdkDiagnosticBase.js.map +1 -0
- package/dist/diagnostic/sdkDiagnosticMain.d.ts +16 -0
- package/dist/diagnostic/sdkDiagnosticMain.js +79 -0
- package/dist/diagnostic/sdkDiagnosticMain.js.map +1 -0
- package/dist/diagnostic/sdkDiagnosticPhotos.d.ts +13 -0
- package/dist/diagnostic/sdkDiagnosticPhotos.js +65 -0
- package/dist/diagnostic/sdkDiagnosticPhotos.js.map +1 -0
- package/dist/internal/devices/interface.d.ts +1 -1
- package/dist/internal/devices/manager.js +1 -1
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/devices/manager.test.js +3 -3
- package/dist/internal/devices/manager.test.js.map +1 -1
- package/dist/internal/errors.d.ts +5 -0
- package/dist/internal/errors.js +23 -0
- package/dist/internal/errors.js.map +1 -1
- package/dist/internal/errors.test.js +53 -2
- package/dist/internal/errors.test.js.map +1 -1
- package/dist/internal/nodes/cryptoReporter.js +3 -0
- package/dist/internal/nodes/cryptoReporter.js.map +1 -1
- package/dist/internal/nodes/index.test.js +1 -1
- package/dist/internal/nodes/index.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +1 -1
- package/dist/internal/nodes/nodesAccess.d.ts +1 -1
- package/dist/internal/nodes/nodesAccess.js +4 -4
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +2 -2
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/photos/albums.js +1 -1
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +6 -0
- package/dist/internal/photos/apiService.js +16 -0
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/index.d.ts +1 -1
- package/dist/internal/photos/index.js +2 -2
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +4 -1
- package/dist/internal/photos/shares.d.ts +1 -1
- package/dist/internal/photos/shares.js +3 -3
- package/dist/internal/photos/shares.js.map +1 -1
- package/dist/internal/photos/timeline.d.ts +8 -1
- package/dist/internal/photos/timeline.js +36 -2
- package/dist/internal/photos/timeline.js.map +1 -1
- package/dist/internal/photos/timeline.test.d.ts +1 -0
- package/dist/internal/photos/timeline.test.js +99 -0
- package/dist/internal/photos/timeline.test.js.map +1 -0
- package/dist/internal/shares/cryptoService.js +3 -0
- package/dist/internal/shares/cryptoService.js.map +1 -1
- package/dist/internal/shares/manager.d.ts +1 -1
- package/dist/internal/shares/manager.js +4 -4
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/shares/manager.test.js +7 -7
- package/dist/internal/shares/manager.test.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +1 -1
- package/dist/internal/sharing/sharingAccess.js +1 -1
- package/dist/internal/sharing/sharingAccess.js.map +1 -1
- package/dist/internal/sharing/sharingAccess.test.js +1 -1
- package/dist/internal/sharing/sharingAccess.test.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.js +32 -14
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +46 -1
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/sharingPublic/cryptoReporter.js +3 -0
- package/dist/internal/sharingPublic/cryptoReporter.js.map +1 -1
- package/dist/internal/sharingPublic/index.d.ts +3 -0
- package/dist/internal/sharingPublic/index.js +3 -0
- package/dist/internal/sharingPublic/index.js.map +1 -1
- package/dist/internal/sharingPublic/shares.d.ts +1 -1
- package/dist/internal/sharingPublic/shares.js +1 -2
- package/dist/internal/sharingPublic/shares.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +19 -0
- package/dist/protonDrivePhotosClient.js +23 -1
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.d.ts +33 -1
- package/dist/protonDrivePublicLinkClient.js +51 -2
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/package.json +1 -1
- package/src/diagnostic/diagnostic.ts +27 -8
- package/src/diagnostic/index.ts +17 -2
- package/src/diagnostic/interface.ts +35 -9
- package/src/diagnostic/nodeUtils.ts +100 -0
- package/src/diagnostic/{sdkDiagnostic.ts → sdkDiagnosticBase.ts} +204 -204
- package/src/diagnostic/sdkDiagnosticMain.ts +95 -0
- package/src/diagnostic/sdkDiagnosticPhotos.ts +70 -0
- package/src/internal/devices/interface.ts +1 -1
- package/src/internal/devices/manager.test.ts +3 -3
- package/src/internal/devices/manager.ts +1 -1
- package/src/internal/errors.test.ts +62 -1
- package/src/internal/errors.ts +27 -0
- package/src/internal/nodes/cryptoReporter.ts +6 -5
- package/src/internal/nodes/index.test.ts +1 -1
- package/src/internal/nodes/interface.ts +1 -1
- package/src/internal/nodes/nodesAccess.test.ts +2 -2
- package/src/internal/nodes/nodesAccess.ts +5 -5
- package/src/internal/photos/albums.ts +1 -1
- package/src/internal/photos/apiService.ts +40 -0
- package/src/internal/photos/index.ts +9 -1
- package/src/internal/photos/interface.ts +4 -1
- package/src/internal/photos/shares.ts +3 -3
- package/src/internal/photos/timeline.test.ts +116 -0
- package/src/internal/photos/timeline.ts +47 -2
- package/src/internal/shares/cryptoService.ts +5 -1
- package/src/internal/shares/manager.test.ts +7 -7
- package/src/internal/shares/manager.ts +4 -4
- package/src/internal/sharing/interface.ts +1 -1
- package/src/internal/sharing/sharingAccess.test.ts +1 -1
- package/src/internal/sharing/sharingAccess.ts +1 -1
- package/src/internal/sharing/sharingManagement.test.ts +59 -1
- package/src/internal/sharing/sharingManagement.ts +33 -14
- package/src/internal/sharingPublic/cryptoReporter.ts +5 -1
- package/src/internal/sharingPublic/index.ts +3 -0
- package/src/internal/sharingPublic/shares.ts +1 -2
- package/src/protonDrivePhotosClient.ts +24 -1
- package/src/protonDrivePublicLinkClient.ts +77 -2
- package/dist/diagnostic/sdkDiagnostic.d.ts +0 -23
- package/dist/diagnostic/sdkDiagnostic.js +0 -320
- package/dist/diagnostic/sdkDiagnostic.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sdkDiagnosticBase.js","sourceRoot":"","sources":["../../src/diagnostic/sdkDiagnosticBase.ts"],"names":[],"mappings":";;;AAAA,4CAAsH;AAOtH,+EAA4E;AAC5E,2CAOqB;AAErB,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAOrC;;;GAGG;AACH,MAAa,iBAAiB;IAYd;IAXJ,OAAO,CAAgE;IAEvE,UAAU,CAA8B;IACxC,sBAAsB,CAA6B;IAEjD,UAAU,GAAuD,EAAE,CAAC;IACpE,cAAc,GAAY,KAAK,CAAC;IAChC,WAAW,GAAW,CAAC,CAAC;IACxB,YAAY,GAAW,CAAC,CAAC;IAEnC,YACY,SAAoB,EAC5B,OAAuE,EACvE,UAAuC;QAF/B,cAAS,GAAT,SAAS,CAAW;QAI5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;QAC5E,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QAEtB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3C,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACjC,CAAC;IAES,cAAc;QACpB,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC3C,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEO,cAAc;QAClB,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;SAClC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,CAAC,0BAA0B,CACvC,aAAqB,EACrB,QAAqB,EACrB,iBAAoC;QAEpC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,OAAO;QACX,CAAC;QAED,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC,CAAC;QAEpE,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/C,MAAM;oBACF,IAAI,EAAE,iCAAiC;oBACvC,YAAY,EAAE,IAAA,sCAA0B,EAAC,YAAY,CAAC;oBACtD,aAAa;iBAChB,CAAC;YACN,CAAC;QACL,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;YAEzF,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,MAAM;oBACF,IAAI,EAAE,oCAAoC;oBAC1C,GAAG,IAAA,0BAAc,EAAC,KAAK,CAAC;iBAC3B,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAES,KAAK,CAAC,CAAC,gBAAgB;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,MAAM,EAAE,CAAC;gBACT,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrD,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,wCAAwC;gBACxC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAC7D,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,UAAU,CAAC,IAAe,EAAE,iBAAoC;QAC3E,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,MAAM;gBACF,IAAI,EAAE,eAAe;gBACrB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;QAED,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAChH,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CACpB,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EACvD,MAAM,EACN,IAAI,EACJ,iBAAiB,CACpB,CAAC;QAEF,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,cAAc,EAAE,CAAC;YACjB,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC/F,CAAC;QAED,KAAK,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElE,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAC5C,KAAK,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACpC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAChC,KAAK,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;YACrC,IAAI,SAAS,KAAK,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;gBACpD,MAAM;oBACF,IAAI,EAAE,oCAAoC;oBAC1C,YAAY,EAAE,IAAA,sCAA0B,EAAC,iBAAiB,CAAC;oBAC3D,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,YAAY,CACvB,MAAc,EACd,UAAsC,EACtC,IAAe,EACf,iBAAoC;QAEpC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACb,MAAM;gBACF,IAAI,EAAE,mBAAmB;gBACzB,UAAU;gBACV,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa;gBACzC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK;gBACzB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;QAED,IAAI,iBAAiB,EAAE,eAAe,EAAE,CAAC;YACrC,IAAI,aAAa,GACb,OAAO,iBAAiB,CAAC,eAAe,KAAK,QAAQ;gBACjD,CAAC,CAAC,iBAAiB,CAAC,eAAe;gBACnC,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAExD,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;gBAChC,aAAa,GAAG,IAAI,CAAC;YACzB,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;YACpE,IAAI,aAAa,KAAK,SAAS,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;gBACzD,MAAM;oBACF,IAAI,EAAE,oCAAoC;oBAC1C,YAAY,EAAE,IAAA,sCAA0B,EAAC,iBAAiB,CAAC;oBAC3D,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,4BAA4B,CACvC,IAAe,EACf,iBAAoC;QAEpC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,kBAAkB,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,IAAI,CAAC;QAE/D,MAAM,WAAW,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,CAAC;QACzD,MAAM,kBAAkB,GAAG,cAAc,EAAE,WAAW,CAAC;QAEvD,IAAI,WAAW,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACtD,MAAM;gBACF,IAAI,EAAE,2BAA2B;gBACjC,KAAK,EAAE,MAAM;gBACb,KAAK,EAAE,WAAW;gBAClB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;QAED,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM;gBACF,IAAI,EAAE,mCAAmC;gBACzC,YAAY,EAAE,MAAM;gBACpB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;QAED,IAAI,iBAAiB,EAAE,CAAC;YACpB,MAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC;YACpD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;YAElE,MAAM,SAAS,GAAG,YAAY,KAAK,SAAS,IAAI,WAAW,KAAK,YAAY,CAAC;YAC7E,MAAM,gBAAgB,GAAG,mBAAmB,KAAK,SAAS,IAAI,kBAAkB,KAAK,mBAAmB,CAAC;YAEzG,IAAI,SAAS,IAAI,gBAAgB,EAAE,CAAC;gBAChC,MAAM;oBACF,IAAI,EAAE,oCAAoC;oBAC1C,WAAW;oBACX,kBAAkB;oBAClB,YAAY,EAAE,IAAA,sCAA0B,EAAC,iBAAiB,CAAC;oBAC3D,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,iBAAiB,CAAC,IAAe;QAC5C,IAAI,IAAA,uBAAW,EAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO;QACX,CAAC;QAED,IAAI,UAA0B,CAAC;QAC/B,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,qBAAqB,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG;gBACvE,KAAK;aACR,CAAC;YACF,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,MAAM;oBACF,IAAI,EAAE,wBAAwB;oBAC9B,KAAK,EAAE,IAAI,KAAK,CAAC,cAAc,CAAC;oBAChC,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,wBAAwB;gBAC9B,KAAK;gBACL,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,aAAa,CAAC,IAAe;QACxC,IAAI,IAAA,uBAAW,EAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO;QACX,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM;gBACF,IAAI,EAAE,+BAA+B;gBACrC,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;YACF,OAAO;QACX,CAAC;QAED,IAAI,UAA0B,CAAC;QAC/B,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,qBAAqB,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG;gBACvE,KAAK;aACR,CAAC;YACF,OAAO;QACX,CAAC;QAED,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC;QACxD,MAAM,kBAAkB,GAAG,UAAU,CAAC,qBAAqB,EAAE,CAAC;QAE9D,MAAM,2BAA2B,GAAG,IAAI,yDAA2B,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;QAE5E,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAE9B,MAAM,YAAY,GAAG,2BAA2B,CAAC,YAAY,CAAC;YAC9D,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,mBAAmB,CAAC;YAC5E,IAAI,WAAW,KAAK,YAAY,IAAI,kBAAkB,KAAK,mBAAmB,EAAE,CAAC;gBAC7E,MAAM;oBACF,IAAI,EAAE,yBAAyB;oBAC/B,WAAW;oBACX,YAAY;oBACZ,kBAAkB;oBAClB,mBAAmB;oBACnB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,wBAAwB;gBAC9B,KAAK;gBACL,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;aAC1B,CAAC;QACN,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,gBAAgB,CAAC,IAAe;QAC3C,IAAI,IAAA,uBAAW,EAAC,IAAI,CAAC,KAAK,oBAAQ,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO;QACX,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAE1D,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,yBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YAEvG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM;oBACF,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,qBAAqB,OAAO,GAAG;oBACrC,KAAK,EAAE,IAAI,KAAK,CAAC,qBAAqB,CAAC;iBAC1C,CAAC;YACN,CAAC;YACD,6EAA6E;YAC7E,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,uBAAuB,EAAE,CAAC;gBAC/D,MAAM;oBACF,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;oBACtB,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,qBAAqB,OAAO,GAAG;gBACrC,KAAK;aACR,CAAC;QACN,CAAC;IACL,CAAC;CACJ;AA7VD,8CA6VC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { MaybeNode } from '../interface';
|
|
2
|
+
import { ProtonDriveClient } from '../protonDriveClient';
|
|
3
|
+
import { DiagnosticOptions, DiagnosticProgressCallback, DiagnosticResult, ExpectedTreeNode } from './interface';
|
|
4
|
+
import { SDKDiagnosticBase } from './sdkDiagnosticBase';
|
|
5
|
+
/**
|
|
6
|
+
* Diagnostic tool that uses the main Drive SDK to traverse and verify
|
|
7
|
+
* the integrity of the node tree.
|
|
8
|
+
*/
|
|
9
|
+
export declare class SDKDiagnosticMain extends SDKDiagnosticBase {
|
|
10
|
+
private protonDriveClient;
|
|
11
|
+
constructor(protonDriveClient: ProtonDriveClient, options?: Pick<DiagnosticOptions, 'verifyContent' | 'verifyThumbnails'>, onProgress?: DiagnosticProgressCallback);
|
|
12
|
+
verifyMyFiles(expectedStructure?: ExpectedTreeNode): AsyncGenerator<DiagnosticResult>;
|
|
13
|
+
verifyNodeTree(node: MaybeNode, expectedStructure?: ExpectedTreeNode): AsyncGenerator<DiagnosticResult>;
|
|
14
|
+
private loadNodeTree;
|
|
15
|
+
private loadNodeTreeRecursively;
|
|
16
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SDKDiagnosticMain = void 0;
|
|
4
|
+
const interface_1 = require("../interface");
|
|
5
|
+
const zipGenerators_1 = require("./zipGenerators");
|
|
6
|
+
const nodeUtils_1 = require("./nodeUtils");
|
|
7
|
+
const sdkDiagnosticBase_1 = require("./sdkDiagnosticBase");
|
|
8
|
+
/**
|
|
9
|
+
* Diagnostic tool that uses the main Drive SDK to traverse and verify
|
|
10
|
+
* the integrity of the node tree.
|
|
11
|
+
*/
|
|
12
|
+
class SDKDiagnosticMain extends sdkDiagnosticBase_1.SDKDiagnosticBase {
|
|
13
|
+
protonDriveClient;
|
|
14
|
+
constructor(protonDriveClient, options, onProgress) {
|
|
15
|
+
super(protonDriveClient, options, onProgress);
|
|
16
|
+
this.protonDriveClient = protonDriveClient;
|
|
17
|
+
this.protonDriveClient = protonDriveClient;
|
|
18
|
+
}
|
|
19
|
+
async *verifyMyFiles(expectedStructure) {
|
|
20
|
+
let myFilesRootFolder;
|
|
21
|
+
try {
|
|
22
|
+
myFilesRootFolder = await this.protonDriveClient.getMyFilesRootFolder();
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
yield {
|
|
26
|
+
type: 'fatal_error',
|
|
27
|
+
message: `Error getting my files root folder`,
|
|
28
|
+
error,
|
|
29
|
+
};
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
yield* this.verifyNodeTree(myFilesRootFolder, expectedStructure);
|
|
33
|
+
}
|
|
34
|
+
async *verifyNodeTree(node, expectedStructure) {
|
|
35
|
+
this.startProgress();
|
|
36
|
+
this.nodesQueue.push({ node, expected: expectedStructure });
|
|
37
|
+
this.loadedNodes++;
|
|
38
|
+
yield* (0, zipGenerators_1.zipGenerators)(this.loadNodeTree(node, expectedStructure), this.verifyNodesQueue());
|
|
39
|
+
this.finishProgress();
|
|
40
|
+
}
|
|
41
|
+
async *loadNodeTree(parentNode, expectedStructure) {
|
|
42
|
+
const isFolder = (0, nodeUtils_1.getNodeType)(parentNode) === interface_1.NodeType.Folder;
|
|
43
|
+
if (isFolder) {
|
|
44
|
+
yield* this.loadNodeTreeRecursively(parentNode, expectedStructure);
|
|
45
|
+
}
|
|
46
|
+
this.allNodesLoaded = true;
|
|
47
|
+
}
|
|
48
|
+
async *loadNodeTreeRecursively(parentNode, expectedStructure) {
|
|
49
|
+
const parentNodeUid = parentNode.ok ? parentNode.value.uid : parentNode.error.uid;
|
|
50
|
+
const children = [];
|
|
51
|
+
try {
|
|
52
|
+
for await (const child of this.protonDriveClient.iterateFolderChildren(parentNode)) {
|
|
53
|
+
children.push(child);
|
|
54
|
+
this.nodesQueue.push({
|
|
55
|
+
node: child,
|
|
56
|
+
expected: (0, nodeUtils_1.getTreeNodeChildByNodeName)(expectedStructure, (0, nodeUtils_1.getNodeName)(child)),
|
|
57
|
+
});
|
|
58
|
+
this.loadedNodes++;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
yield {
|
|
63
|
+
type: 'sdk_error',
|
|
64
|
+
call: `iterateFolderChildren(${parentNodeUid})`,
|
|
65
|
+
error,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
if (expectedStructure) {
|
|
69
|
+
yield* this.verifyExpectedNodeChildren(parentNodeUid, children, expectedStructure);
|
|
70
|
+
}
|
|
71
|
+
for (const child of children) {
|
|
72
|
+
if ((0, nodeUtils_1.getNodeType)(child) === interface_1.NodeType.Folder) {
|
|
73
|
+
yield* this.loadNodeTreeRecursively(child, (0, nodeUtils_1.getTreeNodeChildByNodeName)(expectedStructure, (0, nodeUtils_1.getNodeName)(child)));
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
exports.SDKDiagnosticMain = SDKDiagnosticMain;
|
|
79
|
+
//# sourceMappingURL=sdkDiagnosticMain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sdkDiagnosticMain.js","sourceRoot":"","sources":["../../src/diagnostic/sdkDiagnosticMain.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ProtonDrivePhotosClient } from '../protonDrivePhotosClient';
|
|
2
|
+
import { DiagnosticOptions, DiagnosticProgressCallback, DiagnosticResult, ExpectedTreeNode } from './interface';
|
|
3
|
+
import { SDKDiagnosticBase } from './sdkDiagnosticBase';
|
|
4
|
+
/**
|
|
5
|
+
* Diagnostic tool that uses the Photos SDK to traverse and verify
|
|
6
|
+
* the integrity of the Photos in the timeline.
|
|
7
|
+
*/
|
|
8
|
+
export declare class SDKDiagnosticPhotos extends SDKDiagnosticBase {
|
|
9
|
+
private protonDrivePhotosClient;
|
|
10
|
+
constructor(protonDrivePhotosClient: ProtonDrivePhotosClient, options?: Pick<DiagnosticOptions, 'verifyContent' | 'verifyThumbnails'>, onProgress?: DiagnosticProgressCallback);
|
|
11
|
+
verifyTimeline(expectedStructure?: ExpectedTreeNode): AsyncGenerator<DiagnosticResult>;
|
|
12
|
+
private loadTimeline;
|
|
13
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SDKDiagnosticPhotos = void 0;
|
|
4
|
+
const zipGenerators_1 = require("./zipGenerators");
|
|
5
|
+
const nodeUtils_1 = require("./nodeUtils");
|
|
6
|
+
const sdkDiagnosticBase_1 = require("./sdkDiagnosticBase");
|
|
7
|
+
/**
|
|
8
|
+
* Diagnostic tool that uses the Photos SDK to traverse and verify
|
|
9
|
+
* the integrity of the Photos in the timeline.
|
|
10
|
+
*/
|
|
11
|
+
class SDKDiagnosticPhotos extends sdkDiagnosticBase_1.SDKDiagnosticBase {
|
|
12
|
+
protonDrivePhotosClient;
|
|
13
|
+
constructor(protonDrivePhotosClient, options, onProgress) {
|
|
14
|
+
super(protonDrivePhotosClient, options, onProgress);
|
|
15
|
+
this.protonDrivePhotosClient = protonDrivePhotosClient;
|
|
16
|
+
this.protonDrivePhotosClient = protonDrivePhotosClient;
|
|
17
|
+
}
|
|
18
|
+
async *verifyTimeline(expectedStructure) {
|
|
19
|
+
this.startProgress();
|
|
20
|
+
yield* (0, zipGenerators_1.zipGenerators)(this.loadTimeline(expectedStructure), this.verifyNodesQueue());
|
|
21
|
+
this.finishProgress();
|
|
22
|
+
}
|
|
23
|
+
async *loadTimeline(expectedStructure) {
|
|
24
|
+
let nodeUids = [];
|
|
25
|
+
try {
|
|
26
|
+
const results = await Array.fromAsync(this.protonDrivePhotosClient.iterateTimeline());
|
|
27
|
+
nodeUids = results.map((result) => result.nodeUid);
|
|
28
|
+
this.loadedNodes = nodeUids.length;
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
yield {
|
|
32
|
+
type: 'sdk_error',
|
|
33
|
+
call: `iterateTimeline()`,
|
|
34
|
+
error,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
const photos = [];
|
|
38
|
+
try {
|
|
39
|
+
for await (const maybeMissingNode of this.protonDrivePhotosClient.iterateNodes(nodeUids)) {
|
|
40
|
+
if (!maybeMissingNode.ok && 'missingUid' in maybeMissingNode.error) {
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
const maybeNode = maybeMissingNode;
|
|
44
|
+
photos.push(maybeNode);
|
|
45
|
+
this.nodesQueue.push({
|
|
46
|
+
node: maybeNode,
|
|
47
|
+
expected: (0, nodeUtils_1.getTreeNodeChildByNodeName)(expectedStructure, (0, nodeUtils_1.getNodeName)(maybeNode)),
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
yield {
|
|
53
|
+
type: 'sdk_error',
|
|
54
|
+
call: `iterateNodes(...)`,
|
|
55
|
+
error,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
if (expectedStructure) {
|
|
59
|
+
yield* this.verifyExpectedNodeChildren('photo-timeline', photos, expectedStructure);
|
|
60
|
+
}
|
|
61
|
+
this.allNodesLoaded = true;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.SDKDiagnosticPhotos = SDKDiagnosticPhotos;
|
|
65
|
+
//# sourceMappingURL=sdkDiagnosticPhotos.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sdkDiagnosticPhotos.js","sourceRoot":"","sources":["../../src/diagnostic/sdkDiagnosticPhotos.ts"],"names":[],"mappings":";;;AAGA,mDAAgD;AAChD,2CAAsE;AACtE,2DAAwD;AAExD;;;GAGG;AACH,MAAa,mBAAoB,SAAQ,qCAAiB;IAE1C;IADZ,YACY,uBAAgD,EACxD,OAAuE,EACvE,UAAuC;QAEvC,KAAK,CAAC,uBAAuB,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAJ5C,4BAAuB,GAAvB,uBAAuB,CAAyB;QAKxD,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,CAAC,cAAc,CAAC,iBAAoC;QACtD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,KAAK,CAAC,CAAC,IAAA,6BAAa,EAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,CAAC,YAAY,CAAC,iBAAoC;QAC5D,IAAI,QAAQ,GAAa,EAAE,CAAC;QAC5B,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,uBAAuB,CAAC,eAAe,EAAE,CAAC,CAAC;YACtF,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;QACvC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,mBAAmB;gBACzB,KAAK;aACR,CAAC;QACN,CAAC;QAED,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,IAAI,CAAC;YACD,IAAI,KAAK,EAAE,MAAM,gBAAgB,IAAI,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvF,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,YAAY,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;oBACjE,SAAS;gBACb,CAAC;gBACD,MAAM,SAAS,GAAG,gBAA6B,CAAC;gBAEhD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,IAAA,sCAA0B,EAAC,iBAAiB,EAAE,IAAA,uBAAW,EAAC,SAAS,CAAC,CAAC;iBAClF,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,MAAM;gBACF,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,mBAAmB;gBACzB,KAAK;aACR,CAAC;QACN,CAAC;QAED,IAAI,iBAAiB,EAAE,CAAC;YACpB,KAAK,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACxF,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/B,CAAC;CACJ;AA1DD,kDA0DC"}
|
|
@@ -45,7 +45,7 @@ class DevicesManager {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
async createDevice(name, deviceType) {
|
|
48
|
-
const { volumeId } = await this.sharesService.
|
|
48
|
+
const { volumeId } = await this.sharesService.getRootIDs();
|
|
49
49
|
const { address, shareKey, node } = await this.cryptoService.createDevice(name);
|
|
50
50
|
const device = await this.apiService.createDevice({
|
|
51
51
|
volumeId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/devices/manager.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAA+C;AAC/C,+CAAuE;AAKvE,MAAa,cAAc;IAEX;IACA;IACA;IACA;IACA;IACA;IANZ,YACY,MAAc,EACd,UAA6B,EAC7B,aAAmC,EACnC,aAA4B,EAC5B,YAA0B,EAC1B,sBAA8C;QAL9C,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAmB;QAC7B,kBAAa,GAAb,aAAa,CAAsB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAEtD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,CAAC,cAAc,CAAC,MAAoB;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA0B,CAAC;QAC1D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;YAClG,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBACvB,SAAS;YACb,CAAC;YAED,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM;oBACF,GAAG,MAAM;oBACT,IAAI,EAAE,IAAI,CAAC,IAAI;iBAClB,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,UAAsB;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/devices/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ describe('DevicesManager', () => {
|
|
|
27
27
|
};
|
|
28
28
|
// @ts-expect-error No need to implement all methods for mocking
|
|
29
29
|
sharesService = {
|
|
30
|
-
|
|
30
|
+
getRootIDs: jest.fn(),
|
|
31
31
|
};
|
|
32
32
|
// @ts-expect-error No need to implement all methods for mocking
|
|
33
33
|
nodesService = {};
|
|
@@ -61,11 +61,11 @@ describe('DevicesManager', () => {
|
|
|
61
61
|
type: deviceType,
|
|
62
62
|
shareId: 'shareid',
|
|
63
63
|
};
|
|
64
|
-
sharesService.
|
|
64
|
+
sharesService.getRootIDs.mockResolvedValue({ volumeId });
|
|
65
65
|
cryptoService.createDevice.mockResolvedValue({ address, shareKey, node });
|
|
66
66
|
apiService.createDevice.mockResolvedValue(createdDevice);
|
|
67
67
|
const result = await manager.createDevice(name, deviceType);
|
|
68
|
-
expect(sharesService.
|
|
68
|
+
expect(sharesService.getRootIDs).toHaveBeenCalled();
|
|
69
69
|
expect(cryptoService.createDevice).toHaveBeenCalledWith(name);
|
|
70
70
|
expect(apiService.createDevice).toHaveBeenCalledWith({ volumeId, type: deviceType }, {
|
|
71
71
|
addressId: address.addressId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/devices/manager.test.ts"],"names":[],"mappings":";;AAAA,+CAA6D;AAC7D,yCAA+C;AAC/C,+CAAmD;AAInD,uCAA2C;AAE3C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,MAAc,CAAC;IACnB,IAAI,UAA0C,CAAC;IAC/C,IAAI,aAAgD,CAAC;IACrD,IAAI,aAAyC,CAAC;IAC9C,IAAI,YAAuC,CAAC;IAC5C,IAAI,sBAA2D,CAAC;IAChE,IAAI,OAAuB,CAAC;IAE5B,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,GAAG,IAAA,sBAAa,GAAE,CAAC;QACzB,gEAAgE;QAChE,UAAU,GAAG;YACT,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;YACvB,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;YACrB,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC/B,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;SAC1B,CAAC;QACF,gEAAgE;QAChE,aAAa,GAAG;YACZ,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;SAC1B,CAAC;QACF,gEAAgE;QAChE,aAAa,GAAG;YACZ,
|
|
1
|
+
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/devices/manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,3 +4,8 @@ export declare function getErrorMessage(error: unknown): string;
|
|
|
4
4
|
* @param signatureType - Must be translated before calling this function.
|
|
5
5
|
*/
|
|
6
6
|
export declare function getVerificationMessage(verified: VERIFICATION_STATUS, verificationErrors?: Error[], signatureType?: string, notAvailableVerificationKeys?: boolean): string;
|
|
7
|
+
/**
|
|
8
|
+
* Returns true if the error is not an application error (it is for example
|
|
9
|
+
* a network error failing to fetch keys) and can be ignored for telemetry.
|
|
10
|
+
*/
|
|
11
|
+
export declare function isNotApplicationError(error?: unknown): boolean;
|
package/dist/internal/errors.js
CHANGED
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getErrorMessage = getErrorMessage;
|
|
4
4
|
exports.getVerificationMessage = getVerificationMessage;
|
|
5
|
+
exports.isNotApplicationError = isNotApplicationError;
|
|
5
6
|
const ttag_1 = require("ttag");
|
|
6
7
|
const crypto_1 = require("../crypto");
|
|
8
|
+
const errors_1 = require("../errors");
|
|
7
9
|
function getErrorMessage(error) {
|
|
8
10
|
return error instanceof Error ? error.message : (0, ttag_1.c)('Error').t `Unknown error`;
|
|
9
11
|
}
|
|
@@ -29,4 +31,25 @@ function getVerificationMessage(verified, verificationErrors, signatureType, not
|
|
|
29
31
|
? (0, ttag_1.c)('Error').t `Signature verification for ${signatureType} failed`
|
|
30
32
|
: (0, ttag_1.c)('Error').t `Signature verification failed`;
|
|
31
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Returns true if the error is not an application error (it is for example
|
|
36
|
+
* a network error failing to fetch keys) and can be ignored for telemetry.
|
|
37
|
+
*/
|
|
38
|
+
function isNotApplicationError(error) {
|
|
39
|
+
// SDK errors.
|
|
40
|
+
if (error instanceof errors_1.AbortError ||
|
|
41
|
+
error instanceof errors_1.ValidationError ||
|
|
42
|
+
error instanceof errors_1.RateLimitedError ||
|
|
43
|
+
error instanceof errors_1.ConnectionError) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
// General errors that can come from the SDK dependencies (notably Account
|
|
47
|
+
// dependency which loads the keys for the crypto services).
|
|
48
|
+
if (error instanceof Error) {
|
|
49
|
+
if (error.name === 'AbortError' || error.name === 'OfflineError' || error.name === 'TimeoutError') {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
32
55
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/internal/errors.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/internal/errors.ts"],"names":[],"mappings":";;AAKA,0CAEC;AAKD,wDA0BC;AAMD,sDAoBC;AAhED,+BAAyB;AAEzB,sCAAgD;AAChD,sCAA2F;AAE3F,SAAgB,eAAe,CAAC,KAAc;IAC1C,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,eAAe,CAAC;AAChF,CAAC;AAED;;GAEG;AACH,SAAgB,sBAAsB,CAClC,QAA6B,EAC7B,kBAA4B,EAC5B,aAAsB,EACtB,4BAA4B,GAAG,KAAK;IAEpC,IAAI,QAAQ,KAAK,4BAAmB,CAAC,UAAU,EAAE,CAAC;QAC9C,OAAO,aAAa,CAAC,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,yBAAyB,aAAa,EAAE,CAAC,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,mBAAmB,CAAC;IAClH,CAAC;IAED,IAAI,4BAA4B,EAAE,CAAC;QAC/B,OAAO,aAAa;YAChB,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,yBAAyB,aAAa,oBAAoB;YACxE,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,qCAAqC,CAAC;IAC5D,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACrB,MAAM,YAAY,GAAG,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,aAAa;YAChB,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,8BAA8B,aAAa,YAAY,YAAY,EAAE;YACnF,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,kCAAkC,YAAY,EAAE,CAAC;IACvE,CAAC;IAED,OAAO,aAAa;QAChB,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,8BAA8B,aAAa,SAAS;QAClE,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,+BAA+B,CAAC;AACtD,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,KAAe;IACjD,cAAc;IACd,IACI,KAAK,YAAY,mBAAU;QAC3B,KAAK,YAAY,wBAAe;QAChC,KAAK,YAAY,yBAAgB;QACjC,KAAK,YAAY,wBAAe,EAClC,CAAC;QACC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,0EAA0E;IAC1E,4DAA4D;IAC5D,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAChG,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const crypto_1 = require("../crypto");
|
|
4
|
-
const errors_1 = require("
|
|
4
|
+
const errors_1 = require("../errors");
|
|
5
|
+
const errors_2 = require("./errors");
|
|
5
6
|
describe('getVerificationMessage', () => {
|
|
6
7
|
const testCases = [
|
|
7
8
|
[crypto_1.VERIFICATION_STATUS.NOT_SIGNED, undefined, 'type', false, 'Missing signature for type'],
|
|
@@ -49,8 +50,58 @@ describe('getVerificationMessage', () => {
|
|
|
49
50
|
];
|
|
50
51
|
for (const [status, errors, type, notAvailable, expected] of testCases) {
|
|
51
52
|
it(`returns correct message for status ${status} with type ${type} and notAvailable ${notAvailable}`, () => {
|
|
52
|
-
expect((0,
|
|
53
|
+
expect((0, errors_2.getVerificationMessage)(status, errors, type, notAvailable)).toBe(expected);
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
56
|
});
|
|
57
|
+
describe('isNotApplicationError', () => {
|
|
58
|
+
describe('SDK errors that should be ignored', () => {
|
|
59
|
+
it('returns true for AbortError', () => {
|
|
60
|
+
const error = new errors_1.AbortError('Operation aborted');
|
|
61
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
62
|
+
});
|
|
63
|
+
it('returns true for ValidationError', () => {
|
|
64
|
+
const error = new errors_1.ValidationError('Validation failed');
|
|
65
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
66
|
+
});
|
|
67
|
+
it('returns true for RateLimitedError', () => {
|
|
68
|
+
const error = new errors_1.RateLimitedError('Rate limited');
|
|
69
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
70
|
+
});
|
|
71
|
+
it('returns true for ConnectionError', () => {
|
|
72
|
+
const error = new errors_1.ConnectionError('Connection failed');
|
|
73
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
describe('General errors with specific names that should be ignored', () => {
|
|
77
|
+
it('returns true for Error with name AbortError', () => {
|
|
78
|
+
const error = new Error('Aborted');
|
|
79
|
+
error.name = 'AbortError';
|
|
80
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
81
|
+
});
|
|
82
|
+
it('returns true for Error with name OfflineError', () => {
|
|
83
|
+
const error = new Error('Offline');
|
|
84
|
+
error.name = 'OfflineError';
|
|
85
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
it('returns true for Error with name TimeoutError', () => {
|
|
88
|
+
const error = new Error('Timeout');
|
|
89
|
+
error.name = 'TimeoutError';
|
|
90
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(true);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe('Errors that should not be ignored', () => {
|
|
94
|
+
it('returns false for regular Error', () => {
|
|
95
|
+
const error = new Error('Regular error');
|
|
96
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(false);
|
|
97
|
+
});
|
|
98
|
+
it('returns false for undefined', () => {
|
|
99
|
+
expect((0, errors_2.isNotApplicationError)(undefined)).toBe(false);
|
|
100
|
+
});
|
|
101
|
+
it('returns false for non-Error object', () => {
|
|
102
|
+
const error = { message: 'Not an error' };
|
|
103
|
+
expect((0, errors_2.isNotApplicationError)(error)).toBe(false);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
});
|
|
56
107
|
//# sourceMappingURL=errors.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../src/internal/errors.test.ts"],"names":[],"mappings":";;AAAA,sCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../src/internal/errors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoReporter.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoReporter.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,+CASyB;AACzB,
|
|
1
|
+
{"version":3,"file":"cryptoReporter.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ describe('nodesModules integration tests', () => {
|
|
|
43
43
|
driveCrypto = {};
|
|
44
44
|
// @ts-expect-error No need to implement all methods for mocking
|
|
45
45
|
sharesService = {
|
|
46
|
-
|
|
46
|
+
getRootIDs: jest.fn().mockResolvedValue({ volumeId: 'volumeId' }),
|
|
47
47
|
};
|
|
48
48
|
nodesModule = (0, index_1.initNodesModule)((0, telemetry_1.getMockTelemetry)(), apiService, driveEntitiesCache, driveCryptoCache, account, driveCrypto, sharesService, 'clientUid');
|
|
49
49
|
nodesCache = new cache_2.NodesCache((0, logger_1.getMockLogger)(), driveEntitiesCache);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/index.test.ts"],"names":[],"mappings":";;AAAA,+CAMyB;AAEzB,uCAA0C;AAC1C,qDAAyD;AAEzD,sCAA2C;AAC3C,kCAAsC;AAEtC,mCAA0C;AAC1C,mCAAqC;AACrC,+CAAmD;AAEnD,SAAS,YAAY,CAAC,GAAW,EAAE,SAAS,GAAG,eAAe,EAAE,SAAiC,EAAE;IAC/F,OAAO;QACH,GAAG;QACH,SAAS;QACT,UAAU,EAAE,sBAAU,CAAC,KAAK;QAC5B,IAAI,EAAE,oBAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,KAAK;QACf,gBAAgB,EAAE,KAAK;QACvB,YAAY,EAAE,IAAI,IAAI,EAAE;QACxB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,KAAK;QACd,GAAG,MAAM;KACK,CAAC;AACvB,CAAC;AAED,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC5C,IAAI,UAA2B,CAAC;IAChC,IAAI,kBAA4C,CAAC;IACjD,IAAI,gBAAwC,CAAC;IAC7C,IAAI,OAA2B,CAAC;IAChC,IAAI,WAAwB,CAAC;IAC7B,IAAI,aAA4B,CAAC;IACjC,IAAI,WAA+C,CAAC;IACpD,IAAI,UAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,gEAAgE;QAChE,UAAU,GAAG,EAAE,CAAC;QAChB,kBAAkB,GAAG,IAAI,mBAAW,EAAE,CAAC;QACvC,gBAAgB,GAAG,IAAI,mBAAW,EAAE,CAAC;QACrC,gEAAgE;QAChE,OAAO,GAAG,EAAE,CAAC;QACb,gEAAgE;QAChE,WAAW,GAAG,EAAE,CAAC;QACjB,gEAAgE;QAChE,aAAa,GAAG;YACZ,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,7 +138,7 @@ export interface DecryptedRevision extends Revision {
|
|
|
138
138
|
* Interface describing the dependencies to the shares module.
|
|
139
139
|
*/
|
|
140
140
|
export interface SharesService {
|
|
141
|
-
|
|
141
|
+
getRootIDs(): Promise<{
|
|
142
142
|
volumeId: string;
|
|
143
143
|
rootNodeId: string;
|
|
144
144
|
}>;
|
|
@@ -20,7 +20,7 @@ export declare class NodesAccess {
|
|
|
20
20
|
private shareService;
|
|
21
21
|
private logger;
|
|
22
22
|
private debouncer;
|
|
23
|
-
constructor(telemetry: ProtonDriveTelemetry, apiService: NodeAPIService, cache: NodesCache, cryptoCache: NodesCryptoCache, cryptoService: NodesCryptoService, shareService: Pick<SharesService, '
|
|
23
|
+
constructor(telemetry: ProtonDriveTelemetry, apiService: NodeAPIService, cache: NodesCache, cryptoCache: NodesCryptoCache, cryptoService: NodesCryptoService, shareService: Pick<SharesService, 'getRootIDs' | 'getSharePrivateKey' | 'getContextShareMemberEmailKey'>);
|
|
24
24
|
getVolumeRootFolder(): Promise<DecryptedNode>;
|
|
25
25
|
getNode(nodeUid: string): Promise<DecryptedNode>;
|
|
26
26
|
iterateFolderChildren(parentNodeUid: string, filterOptions?: FilterOptions, signal?: AbortSignal): AsyncGenerator<DecryptedNode>;
|
|
@@ -52,7 +52,7 @@ class NodesAccess {
|
|
|
52
52
|
this.debouncer = new debouncer_1.NodesDebouncer(this.telemetry);
|
|
53
53
|
}
|
|
54
54
|
async getVolumeRootFolder() {
|
|
55
|
-
const { volumeId, rootNodeId } = await this.shareService.
|
|
55
|
+
const { volumeId, rootNodeId } = await this.shareService.getRootIDs();
|
|
56
56
|
const nodeUid = (0, uids_1.makeNodeUid)(volumeId, rootNodeId);
|
|
57
57
|
return this.getNode(nodeUid);
|
|
58
58
|
}
|
|
@@ -121,7 +121,7 @@ class NodesAccess {
|
|
|
121
121
|
}
|
|
122
122
|
// Improvement requested: keep status of loaded trash and leverage cache.
|
|
123
123
|
async *iterateTrashedNodes(signal) {
|
|
124
|
-
const { volumeId } = await this.shareService.
|
|
124
|
+
const { volumeId } = await this.shareService.getRootIDs();
|
|
125
125
|
const batchLoading = new batchLoading_1.BatchLoading({
|
|
126
126
|
iterateItems: (nodeUids) => this.loadNodes(nodeUids, undefined, signal),
|
|
127
127
|
batchSize: BATCH_LOADING_SIZE,
|
|
@@ -195,7 +195,7 @@ class NodesAccess {
|
|
|
195
195
|
async loadNode(nodeUid) {
|
|
196
196
|
this.debouncer.loadingNode(nodeUid);
|
|
197
197
|
try {
|
|
198
|
-
const { volumeId: ownVolumeId } = await this.shareService.
|
|
198
|
+
const { volumeId: ownVolumeId } = await this.shareService.getRootIDs();
|
|
199
199
|
const encryptedNode = await this.apiService.getNode(nodeUid, ownVolumeId);
|
|
200
200
|
return this.decryptNode(encryptedNode);
|
|
201
201
|
}
|
|
@@ -214,7 +214,7 @@ class NodesAccess {
|
|
|
214
214
|
async *loadNodesWithMissingReport(nodeUids, filterOptions, signal) {
|
|
215
215
|
const returnedNodeUids = [];
|
|
216
216
|
const errors = [];
|
|
217
|
-
const { volumeId: ownVolumeId } = await this.shareService.
|
|
217
|
+
const { volumeId: ownVolumeId } = await this.shareService.getRootIDs();
|
|
218
218
|
const apiNodesIterator = this.apiService.iterateNodes(nodeUids, ownVolumeId, filterOptions, signal);
|
|
219
219
|
const debouncedNodeMapper = async (encryptedNode) => {
|
|
220
220
|
this.debouncer.loadingNode(encryptedNode.uid);
|