chore: upgrade dimension/kit

package.json

@@ -19,7 +19,7 @@
     "spellcheck": "cspell lint --no-must-find-files"
   },
   "dependencies": {
-    "@dimensiondev/kit": "0.0.0-20211215044858-27d964f",
+    "@dimensiondev/kit": "0.0.0-20220223101101-4e6f3b9",
     "@emotion/cache": "^11.7.1",
     "@emotion/react": "^11.7.1",
     "@emotion/serialize": "^1.0.2",

packages/dashboard/src/components/Restore/RestoreFromMnemonic.tsx

@@ -8,11 +8,12 @@ import { MaskAlert } from '../MaskAlert'
 import { ButtonContainer } from '../RegisterFrame/ButtonContainer'
 import { Services } from '../../API'
 import { PersonaContext } from '../../pages/Personas/hooks/usePersonaContext'
-import { DashboardRoutes, delay } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
 import { useNavigate } from 'react-router-dom'
 import { useState } from 'react'
 import { SignUpRoutePath } from '../../pages/SignUp/routePath'
 import { LoadingButton } from '../LoadingButton'
+import { delay } from '@dimensiondev/kit'
 
 const useStyles = makeStyles()((theme) => ({
     error: {

packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx

@@ -10,8 +10,9 @@ import { PersonaContext } from '../../pages/Personas/hooks/usePersonaContext'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { z } from 'zod'
 import { useNavigate } from 'react-router-dom'
-import { DashboardRoutes, delay } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
 import { SignUpRoutePath } from '../../pages/SignUp/routePath'
+import { delay } from '@dimensiondev/kit'
 type FormInputs = {
     privateKey: string
 }

packages/dashboard/src/hooks/useCreatePersonaV2.ts

@@ -1,4 +1,4 @@
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { Messages, Services } from '../API'
 
 export function useCreatePersonaV2() {

packages/dashboard/src/pages/Personas/hooks/useCreatePersona.ts

@@ -1,6 +1,6 @@
 import { useAsyncFn } from 'react-use'
 import { Messages, Services } from '../../../API'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import type { AsyncFnReturn } from 'react-use/lib/useAsyncFn'
 
 export function useCreatePersona(): AsyncFnReturn<(nickName: string) => Promise<void>> {

packages/dashboard/src/pages/SignUp/steps/PersonaRecovery.tsx

@@ -1,14 +1,15 @@
 import { useCallback, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { useCustomSnackbar } from '@masknet/theme'
-import { DashboardRoutes, delay } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
 import { useDashboardI18N } from '../../../locales'
 import { SignUpRoutePath } from '../routePath'
 import { Services } from '../../../API'
 import { PersonaNameUI } from './PersonaNameUI'
 import { useCreatePersonaByPrivateKey, useCreatePersonaV2 } from '../../../hooks/useCreatePersonaV2'
 import { PersonaContext } from '../../Personas/hooks/usePersonaContext'
 import { useAsync } from 'react-use'
+import { delay } from '@dimensiondev/kit'
 
 export const PersonaRecovery = () => {
     const t = useDashboardI18N()

packages/mask/background/database/avatar-cache/avatar.ts

@@ -1,8 +1,7 @@
 import { ProfileIdentifier } from '@masknet/shared-base'
 import { queryAvatarDB, isAvatarOutdatedDB, storeAvatarDB, IdentifierWithAvatar, createAvatarDBAccess } from './db'
-import { memoizePromise } from '../../../utils-pure'
 import { MaskMessages } from '../../../shared'
-import { blobToDataURL } from '@dimensiondev/kit'
+import { blobToDataURL, memoizePromise } from '@dimensiondev/kit'
 import { createTransaction } from '../utils/openDB'
 
 /**

packages/mask/src/components/InjectedComponents/DecryptedPost/DecryptedPost.tsx

@@ -1,11 +1,5 @@
 import { Fragment, useEffect, useMemo, useReducer } from 'react'
-import {
-    delay,
-    makeTypedMessageTuple,
-    TypedMessageTuple,
-    type ProfileIdentifier,
-    type Payload,
-} from '@masknet/shared-base'
+import { makeTypedMessageTuple, TypedMessageTuple, type ProfileIdentifier, type Payload } from '@masknet/shared-base'
 import { or } from '@masknet/theme'
 
 import { ServicesWithProgress } from '../../../extension/service'
@@ -25,6 +19,7 @@ import {
     usePostInfo,
 } from '../../DataSource/usePostInfo'
 import { asyncIteratorWithResult } from '../../../utils/type-transform/asyncIteratorHelpers'
+import { delay } from '@dimensiondev/kit'
 
 function progressReducer(
     state: { key: string; progress: SuccessDecryption | FailureDecryption | DecryptionProgress }[],

packages/mask/src/components/InjectedComponents/SteganographyTextPayload.ts

@@ -1,4 +1,3 @@
-import { blobToArrayBuffer } from '@dimensiondev/kit'
 import { GrayscaleAlgorithm, type ImageTemplateTypes } from '@masknet/encryption'
 import Services from '../../extension/service'
 import { ImagePayloadURLs } from '../../resources/image-payload'
@@ -7,7 +6,7 @@ import { downloadUrl } from '../../utils/utils'
 
 export async function SteganographyTextPayload(template: ImageTemplateTypes, text: string) {
     const pass = activatedSocialNetworkUI.configuration.steganography?.password?.() || 'mask'
-    const blankImage = await downloadUrl(ImagePayloadURLs[template]).then(blobToArrayBuffer)
+    const blankImage = await downloadUrl(ImagePayloadURLs[template]).then((x) => x.arrayBuffer())
     const secretImage = await Services.Crypto.steganographyEncodeImage(new Uint8Array(blankImage), {
         text,
         pass,

packages/mask/src/crypto/crypto-alpha-40.ts

@@ -3,8 +3,14 @@
  * @deprecated This version of payload is not in use.
  * Please goto Crypto alpha v38
  */
-import { encodeText, encodeArrayBuffer, decodeArrayBuffer, decodeText, concatArrayBuffer } from '@dimensiondev/kit'
-import { memoizePromise } from '../../utils-pure'
+import {
+    encodeText,
+    encodeArrayBuffer,
+    decodeArrayBuffer,
+    decodeText,
+    concatArrayBuffer,
+    memoizePromise,
+} from '@dimensiondev/kit'
 import { i18n } from '../../shared-ui/locales_legacy'
 import { CryptoWorker } from '../modules/workers'
 import { EC_Private_JsonWebKey, EC_Public_JsonWebKey, AESJsonWebKey, makeTypedMessageText } from '@masknet/shared-base'

packages/mask/src/extension/background-script/CryptoServices/decryptFrom.ts

@@ -1,10 +1,10 @@
 import * as Alpha40 from '../../../crypto/crypto-alpha-40'
 import * as Alpha39 from '../../../crypto/crypto-alpha-39'
-import { decodeArrayBuffer, decodeText, encodeArrayBuffer } from '@dimensiondev/kit'
+import { decodeArrayBuffer, decodeText, encodeArrayBuffer, delay, abortSignalTimeout } from '@dimensiondev/kit'
 import { deconstructPayload } from '../../../utils/type-transform/Payload'
 import { i18n } from '../../../../shared-ui/locales_legacy'
 import { queryPersonaRecord, queryLocalKey } from '../../../database'
-import { ProfileIdentifier, PostIVIdentifier, delay, EC_Public_CryptoKey } from '@masknet/shared-base'
+import { ProfileIdentifier, PostIVIdentifier, EC_Public_CryptoKey } from '@masknet/shared-base'
 import { PostRecord, queryPostDB, updatePostDB } from '../../../../background/database/post'
 import { getNetworkWorker, getNetworkWorkerUninitialized } from '../../../social-network/worker'
 import { cryptoProviderTable } from './cryptoProviderTable'
@@ -216,15 +216,12 @@ async function* decryptFromPayloadWithProgress_raw(
             if (result === null) return makeError(i18n.t('service_not_share_target'))
             aesKeyEncrypted.push(result)
         } else if (version === -39 || version === -38) {
-            const controller = new AbortController()
-            setTimeout(() => controller.abort(), 2000)
-
             const collector = GUN_queryPostKey_version39Or38(
                 version,
                 new Uint8Array(decodeArrayBuffer(iv)),
                 await minePublic,
                 authorNetworkWorker.val.gunNetworkHint,
-                controller.signal,
+                abortSignalTimeout(2000),
             )
             try {
                 for await (const key of collector) aesKeyEncrypted.push(key)

packages/mask/src/extension/background-script/CryptoServices/utils.ts

@@ -1,7 +1,7 @@
-import { blobToArrayBuffer, memoizePromise } from '@dimensiondev/kit'
+import { memoizePromise } from '@dimensiondev/kit'
 import { downloadUrl } from '../../../utils/utils'
 
 export const steganographyDownloadImage = memoizePromise(
-    async (url: string) => blobToArrayBuffer(await downloadUrl(url)),
+    async (url: string) => (await downloadUrl(url)).arrayBuffer(),
     void 0,
 )

packages/mask/src/extension/background-script/EthereumServices/provider.ts

@@ -1,5 +1,5 @@
 import { first } from 'lodash-unified'
-import { defer } from '@masknet/shared-base'
+import { defer } from '@dimensiondev/kit'
 import type { ChainId, NetworkType, ProviderType } from '@masknet/web3-shared-evm'
 import * as MaskWallet from './providers/MaskWallet'
 import * as MetaMask from './providers/MetaMask'

packages/mask/src/extension/background-script/EthereumServices/providers/Fortmatic.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3'
 import type { RequestArguments } from 'web3-core'
 import type { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers'
-import { defer } from '@masknet/shared-base'
+import { defer } from '@dimensiondev/kit'
 import { ChainId, EthereumMethodType } from '@masknet/web3-shared-evm'
 import { EVM_Messages } from '../../../../plugins/EVM/messages'
 import { resetAccount } from '../../../../plugins/Wallet/services'

packages/mask/src/extension/background-script/EthereumServices/providers/Injected.ts

@@ -1,5 +1,5 @@
 import { first } from 'lodash-unified'
-import { defer } from '@masknet/shared-base'
+import { defer } from '@dimensiondev/kit'
 import Web3 from 'web3'
 import type { RequestArguments } from 'web3-core'
 import type { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers'

packages/mask/src/extension/background-script/EthereumServices/providers/MetaMask.ts

@@ -3,7 +3,7 @@ import type { provider as Provider } from 'web3-core'
 import { first } from 'lodash-unified'
 import createMetaMaskProvider, { MetaMaskInpageProvider } from '@dimensiondev/metamask-extension-provider'
 import { ChainId, ProviderType } from '@masknet/web3-shared-evm'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { updateAccount } from '../../../../plugins/Wallet/services'
 import { currentChainIdSettings, currentProviderSettings } from '../../../../plugins/Wallet/settings'
 import { replaceRecentTransaction } from '../../../../plugins/Wallet/services/transaction/database'

packages/mask/src/extension/background-script/EthereumServices/request.ts

@@ -19,7 +19,7 @@ import {
 } from '../../../plugins/Wallet/settings'
 import { WalletRPC } from '../../../plugins/Wallet/messages'
 import { INTERNAL_nativeSend, INTERNAL_send } from './send'
-import { defer } from '@masknet/shared-base'
+import { defer } from '@dimensiondev/kit'
 import { hasNativeAPI, nativeAPI } from '../../../../shared/native-rpc'
 import { openPopupWindow } from '../HelperService'
 import Services from '../../service'

packages/mask/src/extension/background-script/HelperService/storage.ts

@@ -1,5 +1,5 @@
 import { merge } from 'lodash-unified'
-import { timeout } from '@masknet/shared-base'
+import { timeout } from '@dimensiondev/kit'
 
 /**
  * Make sure that the storage is used serially.

packages/mask/src/extension/background-script/IdentityService.ts

@@ -1,7 +1,7 @@
 import * as bip39 from 'bip39'
 import { validateMnemonic } from 'bip39'
 import { decode, encode } from '@msgpack/msgpack'
-import { blobToArrayBuffer, decodeArrayBuffer, decodeText, encodeArrayBuffer } from '@dimensiondev/kit'
+import { decodeArrayBuffer, decodeText, encodeArrayBuffer } from '@dimensiondev/kit'
 import {
     createPersonaByJsonWebKey,
     loginPersona,
@@ -373,7 +373,7 @@ export const updateCurrentPersonaAvatar = async (avatar: Blob) => {
     const identifier = await getCurrentPersonaIdentifier()
 
     if (identifier) {
-        await storeAvatar(identifier, await blobToArrayBuffer(avatar))
+        await storeAvatar(identifier, await avatar.arrayBuffer())
         MaskMessages.events.ownPersonaChanged.sendToAll(undefined)
     }
 }

packages/mask/src/extension/background-script/IdentityServices/sign.ts

@@ -9,9 +9,10 @@ import {
     ECDSASignature,
 } from 'ethereumjs-util'
 import { MaskMessages } from '../../../utils'
-import { delay, PersonaIdentifier, fromBase64URL, PopupRoutes } from '@masknet/shared-base'
+import { PersonaIdentifier, fromBase64URL, PopupRoutes } from '@masknet/shared-base'
 import { queryPersonasWithPrivateKey } from '../../../../background/database/persona/db'
 import { openPopupWindow } from '../HelperService'
+import { delay } from '@dimensiondev/kit'
 export interface SignRequest {
     /** Use that who to sign this message. */
     identifier?: string

packages/mask/src/extension/background-script/SocialNetworkService.ts

@@ -5,7 +5,8 @@ import { requestSNSAdaptorPermission } from '../../social-network/utils/permissi
 import { currentSetupGuideStatus } from '../../settings/settings'
 import stringify from 'json-stable-stringify'
 import { SetupGuideStep } from '../../components/InjectedComponents/SetupGuide'
-import { PersonaIdentifier, delay } from '@masknet/shared-base'
+import type { PersonaIdentifier } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 
 export async function getDefinedSocialNetworkUIs() {
     return [...definedSocialNetworkUIs.values()].map(({ networkIdentifier }) => {

packages/mask/src/extension/background-script/WelcomeService.ts

@@ -1,5 +1,5 @@
-import { encodeText } from '@dimensiondev/kit'
-import { delay, type DashboardRoutes, PopupRoutes } from '@masknet/shared-base'
+import { encodeText, delay } from '@dimensiondev/kit'
+import { type DashboardRoutes, PopupRoutes } from '@masknet/shared-base'
 import { recover_ECDH_256k1_KeyPair_ByMnemonicWord } from '../../utils/mnemonic-code'
 import { createPersonaByJsonWebKey } from '../../database'
 import { attachProfileDB, LinkedProfileDetails } from '../../../background/database/persona/db'

packages/mask/src/extension/background-script/WelcomeServices/generateBackupJSON.ts

@@ -9,14 +9,15 @@ import { queryPostsDB } from '../../../../background/database/post'
 import { PersonaRecordToJSONFormat } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/PersonaRecord'
 import { ProfileRecordToJSONFormat } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/ProfileRecord'
 import { PostRecordToJSONFormat } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/PostRecord'
-import { Identifier, PersonaIdentifier, ProfileIdentifier, timeout } from '@masknet/shared-base'
+import { Identifier, PersonaIdentifier, ProfileIdentifier } from '@masknet/shared-base'
 import { exportMnemonic, exportPrivateKey, getLegacyWallets, getWallets } from '../../../plugins/Wallet/services'
 import {
     LegacyWalletRecordToJSONFormat,
     WalletRecordToJSONFormat,
 } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/WalletRecord'
 import { activatedPluginsWorker } from '@masknet/plugin-infra'
 import { RelationRecordToJSONFormat } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/RelationRecord'
+import { timeout } from '@dimensiondev/kit'
 
 export type { BackupPreview } from '../../../utils/type-transform/BackupFormat/JSON/latest'
 export interface BackupOptions {

packages/mask/src/plugins/NextID/components/BindDialog.tsx

@@ -8,7 +8,7 @@ import type { Binding } from '../types'
 import { BindPanelUI } from './BindPanelUI'
 import { useAccount } from '@masknet/plugin-infra'
 import { useCustomSnackbar } from '@masknet/theme'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { useBindPayload } from '../hooks/useBindPayload'
 import { usePersonaSign } from '../hooks/usePersonaSign'
 import { useWalletSign } from '../hooks/useWalletSign'

packages/mask/src/plugins/NextID/components/UnbindDialog.tsx

@@ -9,7 +9,7 @@ import { useCustomSnackbar } from '@masknet/theme'
 import { usePersonaSign } from '../hooks/usePersonaSign'
 import { useWalletSign } from '../hooks/useWalletSign'
 import { useBindPayload } from '../hooks/useBindPayload'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { UnbindPanelUI } from './UnbindPanelUI'
 
 interface VerifyWalletDialogProps {

packages/mask/src/plugins/Pets/hooks/useNfts.ts

@@ -12,7 +12,7 @@ import {
 } from '@masknet/web3-shared-evm'
 import { Constant, transform } from '@masknet/web3-shared-evm/constants/utils'
 import { cloneDeep, findLastIndex } from 'lodash-unified'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import type { User, FilterContract } from '../types'
 import { Punk3D } from '../constants'
 

packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx

@@ -16,7 +16,7 @@ import {
     useWallet,
 } from '@masknet/web3-shared-evm'
 import { useRemoteControlledDialog } from '@masknet/shared'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { useGasConfig } from './hooks/useGasConfig'
 import type { Coin } from '../../types'
 import { TokenPanelType, TradeInfo } from '../../types'

packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'
 import { useAsyncRetry } from 'react-use'
 import { DialogContent } from '@mui/material'
 import { makeStyles, useStylesExtends } from '@masknet/theme'
-import { safeUnreachable } from '@dimensiondev/kit'
+import { safeUnreachable, delay } from '@dimensiondev/kit'
 import {
     ChainId,
     getChainDetailedCAIP,
@@ -13,7 +13,6 @@ import {
     resolveProviderName,
 } from '@masknet/web3-shared-evm'
 import { useRemoteControlledDialog } from '@masknet/shared'
-import { delay } from '@masknet/shared-base'
 import { InjectedDialog } from '../../../../components/shared/InjectedDialog'
 import { WalletMessages, WalletRPC } from '../../messages'
 import { ConnectionProgress } from './ConnectionProgress'

packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx

@@ -8,7 +8,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog'
 import { WalletMessages } from '../../Wallet/messages'
 import { useI18N } from '../../../utils'
 import { ERC20TokenList, ERC20TokenListProps, useRemoteControlledDialog } from '@masknet/shared'
-import { delay } from '@masknet/shared-base'
+import { delay } from '@dimensiondev/kit'
 import { MINDS_ID } from '../../../social-network-adaptor/minds.com/base'
 import { activatedSocialNetworkUI } from '../../../social-network'
 

packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx

@@ -5,12 +5,13 @@ import { makeStyles, useStylesExtends } from '@masknet/theme'
 import { isEnvironment, Environment } from '@dimensiondev/holoflows-kit'
 import { ProviderType, useWallets, useWallet, NetworkType } from '@masknet/web3-shared-evm'
 import { useRemoteControlledDialog } from '@masknet/shared'
-import { DashboardRoutes, delay } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
 import { useI18N } from '../../../utils'
 import { WalletMessages, WalletRPC } from '../messages'
 import { WalletInList } from '../../../components/shared/SelectWallet/WalletInList'
 import Services from '../../../extension/service'
 import { InjectedDialog } from '../../../components/shared/InjectedDialog'
+import { delay } from '@dimensiondev/kit'
 
 const useStyles = makeStyles()({
     content: {

packages/mask/src/settings/createSettings.ts

@@ -1,7 +1,7 @@
 import { ValueRef, isEnvironment, Environment } from '@dimensiondev/holoflows-kit'
 import Services from '../extension/service'
 import { MaskMessages } from '../utils/messages'
-import { defer } from '@masknet/shared-base'
+import { defer } from '@dimensiondev/kit'
 
 export interface SettingsTexts {
     primary: () => string

packages/mask/src/social-network-adaptor/facebook.com/automation/openComposeBox.ts

@@ -1,8 +1,8 @@
 import { LiveSelector } from '@dimensiondev/holoflows-kit'
 import { MaskMessages, CompositionRequest } from '../../../utils/messages'
 import { i18n } from '../../../../shared-ui/locales_legacy'
-import { untilDocumentReady } from '../../../utils/dom'
-import { makeTypedMessageText, TypedMessage, delay } from '@masknet/shared-base'
+import { makeTypedMessageText, TypedMessage } from '@masknet/shared-base'
+import { delay, waitDocumentReadyState } from '@dimensiondev/kit'
 
 const nativeComposeButtonSelector = () =>
     new LiveSelector()
@@ -38,7 +38,7 @@ export async function taskOpenComposeBoxFacebook(
     content: string | TypedMessage,
     options?: CompositionRequest['options'],
 ) {
-    await untilDocumentReady()
+    await waitDocumentReadyState('interactive')
     await delay(200)
 
     // active the compose dialog