diff --git a/web/apps/auth/src/services/remote.ts b/web/apps/auth/src/services/remote.ts index e30b8d8f90..23cf643be8 100644 --- a/web/apps/auth/src/services/remote.ts +++ b/web/apps/auth/src/services/remote.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { apiURL } from "@/base/origins"; import { ensureString } from "@/utils/ensure"; diff --git a/web/apps/cast/src/services/render.ts b/web/apps/cast/src/services/render.ts index 1ba9aa502b..e7bb27654c 100644 --- a/web/apps/cast/src/services/render.ts +++ b/web/apps/cast/src/services/render.ts @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import { nameAndExtension } from "@/base/file"; import log from "@/base/log"; import { apiURL, customAPIOrigin } from "@/base/origins"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkPassword/setPassword.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkPassword/setPassword.tsx index ed33f8565a..0307d6e81f 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkPassword/setPassword.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkPassword/setPassword.tsx @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import SingleInputForm, { type SingleInputFormProps, } from "@ente/shared/components/SingleInputForm"; diff --git a/web/apps/photos/src/pages/shared-albums/index.tsx b/web/apps/photos/src/pages/shared-albums/index.tsx index 64cc325660..bd87a4922a 100644 --- a/web/apps/photos/src/pages/shared-albums/index.tsx +++ b/web/apps/photos/src/pages/shared-albums/index.tsx @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import downloadManager from "@/new/photos/services/download"; import { EnteFile } from "@/new/photos/types/file"; diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts index 8fbf668453..0558c7473f 100644 --- a/web/apps/photos/src/services/collectionService.ts +++ b/web/apps/photos/src/services/collectionService.ts @@ -1,5 +1,5 @@ +import { sharedCryptoWorker } from "@/base/crypto"; import { encryptMetadataJSON } from "@/base/crypto/ente"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import log from "@/base/log"; import { apiURL } from "@/base/origins"; import { ItemVisibility } from "@/media/file-metadata"; diff --git a/web/apps/photos/src/services/entityService.ts b/web/apps/photos/src/services/entityService.ts index 744606f64c..2516a185db 100644 --- a/web/apps/photos/src/services/entityService.ts +++ b/web/apps/photos/src/services/entityService.ts @@ -1,5 +1,5 @@ +import { sharedCryptoWorker } from "@/base/crypto"; import { decryptMetadataJSON } from "@/base/crypto/ente"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import log from "@/base/log"; import { apiURL } from "@/base/origins"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/apps/photos/src/services/publicCollectionService.ts b/web/apps/photos/src/services/publicCollectionService.ts index 0246f2cfcd..8b1a522954 100644 --- a/web/apps/photos/src/services/publicCollectionService.ts +++ b/web/apps/photos/src/services/publicCollectionService.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { apiURL } from "@/base/origins"; import { EncryptedEnteFile, EnteFile } from "@/new/photos/types/file"; diff --git a/web/apps/photos/src/services/upload/uploadManager.ts b/web/apps/photos/src/services/upload/uploadManager.ts index 0ceff98c06..4b9156685e 100644 --- a/web/apps/photos/src/services/upload/uploadManager.ts +++ b/web/apps/photos/src/services/upload/uploadManager.ts @@ -1,7 +1,5 @@ -import { - createComlinkCryptoWorker, - type CryptoWorker, -} from "@/base/crypto/worker"; +import { createComlinkCryptoWorker } from "@/base/crypto"; +import { type CryptoWorker } from "@/base/crypto/worker"; import { ensureElectron } from "@/base/electron"; import { lowercaseExtension, nameAndExtension } from "@/base/file"; import log from "@/base/log"; diff --git a/web/apps/photos/src/utils/crypto/index.ts b/web/apps/photos/src/utils/crypto/index.ts index 11410fc512..52ed93f36d 100644 --- a/web/apps/photos/src/utils/crypto/index.ts +++ b/web/apps/photos/src/utils/crypto/index.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import { getData, LS_KEYS } from "@ente/shared/storage/localStorage"; import { getActualKey } from "@ente/shared/user"; diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts index 26fca50be7..6ca064a92b 100644 --- a/web/apps/photos/src/utils/file/index.ts +++ b/web/apps/photos/src/utils/file/index.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { type Electron } from "@/base/types/ipc"; import { ItemVisibility } from "@/media/file-metadata"; diff --git a/web/apps/photos/src/utils/magicMetadata/index.ts b/web/apps/photos/src/utils/magicMetadata/index.ts index e405836a35..f07254b5df 100644 --- a/web/apps/photos/src/utils/magicMetadata/index.ts +++ b/web/apps/photos/src/utils/magicMetadata/index.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import { ItemVisibility } from "@/media/file-metadata"; import { EnteFile } from "@/new/photos/types/file"; import { MagicMetadataCore } from "@/new/photos/types/magicMetadata"; diff --git a/web/packages/accounts/pages/change-password.tsx b/web/packages/accounts/pages/change-password.tsx index 9d0c2b3f77..7523d0811a 100644 --- a/web/packages/accounts/pages/change-password.tsx +++ b/web/packages/accounts/pages/change-password.tsx @@ -13,7 +13,7 @@ import { } from "@/accounts/services/srp"; import type { UpdatedKey } from "@/accounts/types/user"; import { convertBase64ToBuffer, convertBufferToBase64 } from "@/accounts/utils"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import FormPaper from "@ente/shared/components/Form/FormPaper"; diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx index 02bf8e4054..53ebb07590 100644 --- a/web/packages/accounts/pages/credentials.tsx +++ b/web/packages/accounts/pages/credentials.tsx @@ -1,5 +1,5 @@ +import { sharedCryptoWorker } from "@/base/crypto"; import type { B64EncryptionResult } from "@/base/crypto/libsodium"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; diff --git a/web/packages/accounts/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx index 281f3152d2..4c39ae1eb6 100644 --- a/web/packages/accounts/pages/recover.tsx +++ b/web/packages/accounts/pages/recover.tsx @@ -1,6 +1,6 @@ import { sendOtt } from "@/accounts/api/user"; import { PAGES } from "@/accounts/constants/pages"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx index b9723bf0d9..2da68bbe10 100644 --- a/web/packages/accounts/pages/two-factor/recover.tsx +++ b/web/packages/accounts/pages/two-factor/recover.tsx @@ -5,8 +5,8 @@ import { } from "@/accounts/api/user"; import { PAGES } from "@/accounts/constants/pages"; import type { AccountsContextT } from "@/accounts/types/context"; +import { sharedCryptoWorker } from "@/base/crypto"; import type { B64EncryptionResult } from "@/base/crypto/libsodium"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.ts index 5da030fb54..901476a67b 100644 --- a/web/packages/accounts/services/passkey.ts +++ b/web/packages/accounts/services/passkey.ts @@ -1,6 +1,6 @@ import { clientPackageName, isDesktop } from "@/base/app"; +import { sharedCryptoWorker } from "@/base/crypto"; import { encryptToB64, generateEncryptionKey } from "@/base/crypto/libsodium"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import { clientPackageHeader, HTTPError } from "@/base/http"; import log from "@/base/log"; import { accountsAppOrigin, apiURL } from "@/base/origins"; diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts index 044a045ce9..c593556fc1 100644 --- a/web/packages/accounts/services/srp.ts +++ b/web/packages/accounts/services/srp.ts @@ -1,5 +1,5 @@ import type { UserVerificationResponse } from "@/accounts/types/user"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { generateLoginSubKey } from "@ente/shared/crypto/helpers"; import InMemoryStore, { MS_KEYS } from "@ente/shared/storage/InMemoryStore"; diff --git a/web/packages/accounts/utils/srp.ts b/web/packages/accounts/utils/srp.ts index 21d1fa4ad3..3f9a9d6efc 100644 --- a/web/packages/accounts/utils/srp.ts +++ b/web/packages/accounts/utils/srp.ts @@ -1,4 +1,4 @@ -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import { generateLoginSubKey } from "@ente/shared/crypto/helpers"; import type { KeyAttributes } from "@ente/shared/user/types"; import { generateSRPSetupAttributes } from "../services/srp"; diff --git a/web/packages/base/crypto/ente.ts b/web/packages/base/crypto/ente.ts index 7a761ab0c5..eaa8482eab 100644 --- a/web/packages/base/crypto/ente.ts +++ b/web/packages/base/crypto/ente.ts @@ -47,6 +47,7 @@ * recommendation though (in circumstances where we create more crypto workers * instead of using the shared one). */ +import { sharedCryptoWorker } from "."; import { assertionFailed } from "../assert"; import { inWorker } from "../env"; import * as ei from "./ente-impl"; @@ -56,7 +57,6 @@ import type { EncryptBytes, EncryptJSON, } from "./types"; -import { sharedCryptoWorker } from "./worker"; /** * Some of these functions have not yet been needed on the main thread, and for diff --git a/web/packages/base/crypto/worker/index.ts b/web/packages/base/crypto/index.ts similarity index 87% rename from web/packages/base/crypto/worker/index.ts rename to web/packages/base/crypto/index.ts index 2443080aaf..511cb3f9ab 100644 --- a/web/packages/base/crypto/worker/index.ts +++ b/web/packages/base/crypto/index.ts @@ -1,11 +1,6 @@ import { ComlinkWorker } from "@/base/worker/comlink-worker"; import type { CryptoWorker } from "./worker"; -/** - * Reexport the type for easier import in call sites. - */ -export { CryptoWorker } from "./worker"; - /** * Cached instance of the {@link ComlinkWorker} that wraps our web worker. */ diff --git a/web/packages/base/crypto/worker/worker.ts b/web/packages/base/crypto/worker.ts similarity index 98% rename from web/packages/base/crypto/worker/worker.ts rename to web/packages/base/crypto/worker.ts index df9b507f8c..32b62b327a 100644 --- a/web/packages/base/crypto/worker/worker.ts +++ b/web/packages/base/crypto/worker.ts @@ -1,7 +1,7 @@ import { expose } from "comlink"; import type { StateAddress } from "libsodium-wrappers"; -import * as ei from "../ente-impl"; -import * as libsodium from "../libsodium"; +import * as ei from "./ente-impl"; +import * as libsodium from "./libsodium"; /** * A web worker that exposes some of the functions defined in either the Ente diff --git a/web/packages/new/photos/services/download.ts b/web/packages/new/photos/services/download.ts index 9b54a10bae..a5b06c27cf 100644 --- a/web/packages/new/photos/services/download.ts +++ b/web/packages/new/photos/services/download.ts @@ -3,7 +3,8 @@ import { isDesktop } from "@/base/app"; import { blobCache, type BlobCache } from "@/base/blob-cache"; -import { type CryptoWorker, sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; +import { type CryptoWorker } from "@/base/crypto/worker"; import log from "@/base/log"; import { customAPIOrigin } from "@/base/origins"; import { FileType } from "@/media/file-type"; diff --git a/web/packages/shared/components/VerifyMasterPasswordForm.tsx b/web/packages/shared/components/VerifyMasterPasswordForm.tsx index c2f962c989..86eff40417 100644 --- a/web/packages/shared/components/VerifyMasterPasswordForm.tsx +++ b/web/packages/shared/components/VerifyMasterPasswordForm.tsx @@ -1,5 +1,5 @@ import type { SRPAttributes } from "@/accounts/types/srp"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { Input, type ButtonProps } from "@mui/material"; import { t } from "i18next"; diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts index 6b0acb7a35..c7165713ff 100644 --- a/web/packages/shared/crypto/helpers.ts +++ b/web/packages/shared/crypto/helpers.ts @@ -1,5 +1,5 @@ import { setRecoveryKey } from "@/accounts/api/user"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; +import { sharedCryptoWorker } from "@/base/crypto"; import log from "@/base/log"; import { LS_KEYS, diff --git a/web/packages/shared/user/index.ts b/web/packages/shared/user/index.ts index 69a9780b47..d23370f2c0 100644 --- a/web/packages/shared/user/index.ts +++ b/web/packages/shared/user/index.ts @@ -1,5 +1,5 @@ +import { sharedCryptoWorker } from "@/base/crypto"; import type { B64EncryptionResult } from "@/base/crypto/libsodium"; -import { sharedCryptoWorker } from "@/base/crypto/worker"; import { CustomError } from "@ente/shared/error"; import { getKey, SESSION_KEYS } from "@ente/shared/storage/sessionStorage";