chore: clean blob (#3528)

packages/dashboard/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@dimensiondev/holoflows-kit": "0.8.0-20210317064617-6c4792c",
-    "@dimensiondev/kit": "=0.0.0-20210630024153-886532b",
+    "@dimensiondev/kit": "=0.0.0-20210630045432-e05621c",
     "@masknet/icons": "workspace:*",
     "@masknet/plugin-example": "workspace:*",
     "@masknet/plugin-infra": "workspace:*",

packages/dashboard/src/components/FileUpload/index.tsx

@@ -2,7 +2,7 @@ import { MaskColorVar } from '@masknet/theme'
 import { makeStyles, Typography } from '@material-ui/core'
 import { useEffect, useState } from 'react'
 import { File as FileIcon } from '@masknet/icons'
-import { toText } from '@dimensiondev/kit'
+import { blobToText } from '@dimensiondev/kit'
 
 const useStyles = makeStyles(() => ({
     root: {
@@ -52,7 +52,7 @@ export default function FileUpload({ width, height, readAsText, onChange }: File
     useEffect(() => {
         if (file) {
             if (readAsText) {
-                toText(file).then((result) => onChange(file, result))
+                blobToText(file).then((result) => onChange(file, result))
             } else {
                 onChange(file)
             }

packages/maskbook/package.json

@@ -9,7 +9,7 @@
     "@balancer-labs/sor": "^1.0.0",
     "@dimensiondev/common-protocols": "1.6.0-20201027083702-d0ae6e2",
     "@dimensiondev/holoflows-kit": "0.8.0-20210317064617-6c4792c",
-    "@dimensiondev/kit": "=0.0.0-20210630024153-886532b",
+    "@dimensiondev/kit": "=0.0.0-20210630045432-e05621c",
     "@dimensiondev/metamask-extension-provider": "3.0.6-20210519045409-1835d4d",
     "@dimensiondev/stego-js": "=0.11.1-20201027083223-8ab41be",
     "@dimensiondev/uniswap-sdk": "=3.0.4-20210619092641-a270dc0",

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

@@ -1,4 +1,4 @@
-import { decodeArrayBuffer } from '@dimensiondev/kit'
+import { blobToArrayBuffer, decodeArrayBuffer } from '@dimensiondev/kit'
 import { GrayscaleAlgorithm } from '@dimensiondev/stego-js/esm/grayscale'
 import Services from '../../extension/service'
 import { ImageTemplateTypes, ImagePayloadURLs } from '../../resources/image-payload'
@@ -7,7 +7,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((x) => x.arrayBuffer())
+    const blankImage = await downloadUrl(ImagePayloadURLs[template]).then(blobToArrayBuffer)
     const secretImage = new Uint8Array(
         decodeArrayBuffer(
             await Services.Steganography.encodeImage(new Uint8Array(blankImage), {

packages/maskbook/src/database/helpers/avatar.ts

@@ -3,7 +3,7 @@ import { queryAvatarDB, isAvatarOutdatedDB, storeAvatarDB } from '../avatar'
 import { memoizePromise } from '../../utils/memoize'
 import { MaskMessage } from '../../utils/messages'
 import { downloadUrl } from '../../utils/utils'
-import { toDataURL } from '@dimensiondev/kit'
+import { blobToArrayBuffer, blobToDataURL } from '@dimensiondev/kit'
 
 /**
  * Get a (cached) blob url for an identifier.
@@ -13,7 +13,7 @@ export const queryAvatarDataURL = memoizePromise(
     async function (identifier: ProfileIdentifier | GroupIdentifier): Promise<string | undefined> {
         const buffer = await queryAvatarDB(identifier)
         if (!buffer) throw new Error('Avatar not found')
-        return toDataURL(new Blob([buffer], { type: 'image/png' }))
+        return blobToDataURL(new Blob([buffer], { type: 'image/png' }))
     },
     (id) => id.toText(),
 )
@@ -35,7 +35,7 @@ export async function storeAvatar(
         if (typeof avatar === 'string') {
             if (avatar.startsWith('http') === false) return
             if (force || (await isAvatarOutdatedDB(identifier, 'lastUpdateTime'))) {
-                await storeAvatarDB(identifier, await (await downloadUrl(avatar)).arrayBuffer())
+                await storeAvatarDB(identifier, await blobToArrayBuffer(await downloadUrl(avatar)))
             }
             // else do nothing
         } else {

packages/maskbook/src/extension/background-script/SteganographyService.ts

@@ -5,10 +5,10 @@ import type { EncodeOptions, DecodeOptions } from '@dimensiondev/stego-js/cjs/st
 import { downloadUrl } from '../../utils/utils'
 import { memoizePromise } from '../../utils/memoize'
 import { getDimension } from '../../utils/image'
-import { decodeArrayBuffer, encodeArrayBuffer } from '../../utils/type-transform/String-ArrayBuffer'
-
+import { decodeArrayBuffer, encodeArrayBuffer, blobToArrayBuffer } from '@dimensiondev/kit'
 import { assertEnvironment, Environment } from '@dimensiondev/holoflows-kit'
 import type { ImageTemplateTypes } from '../../resources/image-payload'
+
 assertEnvironment(Environment.ManifestBackground)
 
 type Mask = 'v1' | 'v2' | 'v4' | 'transparent'
@@ -62,7 +62,7 @@ const images: Record<Mask, string> = {
     v4: new URL('./SteganographyResources/mask-v4.png', import.meta.url).toString(),
     transparent: new URL('./SteganographyResources/mask-transparent.png', import.meta.url).toString(),
 }
-const getMaskBuf = memoizePromise(async (type: Mask) => (await downloadUrl(images[type])).arrayBuffer(), void 0)
+const getMaskBuf = memoizePromise(async (type: Mask) => blobToArrayBuffer(await downloadUrl(images[type])), void 0)
 
 type EncodeImageOptions = {
     template?: ImageTemplateTypes
@@ -99,5 +99,5 @@ export async function decodeImage(buf: string | ArrayBuffer, options: DecodeImag
 }
 
 export async function decodeImageUrl(url: string, options: DecodeImageOptions) {
-    return decodeImage(await (await downloadUrl(url)).arrayBuffer(), options)
+    return decodeImage(await blobToArrayBuffer(await downloadUrl(url)), options)
 }

packages/maskbook/src/extension/options-page/DashboardComponents/RestoreFromBackupBox.tsx

@@ -4,7 +4,7 @@ import { makeStyles } from '@material-ui/core'
 import { useI18N } from '../../../utils'
 import { useStylesExtends } from '../../../components/custom-ui-helper'
 import { RestoreBox } from './RestoreBox'
-import { toText } from '@dimensiondev/kit'
+import { blobToText } from '@dimensiondev/kit'
 
 const useStyles = makeStyles((theme) => ({
     root: {
@@ -37,7 +37,7 @@ export function RestoreFromBackupBox(props: RestoreFromBackupBoxProps) {
     // invoke callback
     useEffect(() => {
         if (file) {
-            toText(file).then((result) => props.onChange?.(file, result))
+            blobToText(file).then((result) => props.onChange?.(file, result))
         }
     }, [file, props.onChange])
 

packages/maskbook/src/extension/options-page/DashboardComponents/RestoreFromQRCodeImageBox.tsx

@@ -5,7 +5,7 @@ import { useI18N } from '../../../utils'
 import { RestoreBox } from './RestoreBox'
 import { useStylesExtends } from '../../../components/custom-ui-helper'
 import { QRCodeImageScanner } from './QRCodeImageScanner'
-import { toDataURL } from '@dimensiondev/kit'
+import { blobToDataURL } from '@dimensiondev/kit'
 
 const useStyles = makeStyles((theme) => ({
     root: {
@@ -59,7 +59,7 @@ export function RestoreFromQRCodeImageBox(props: RestoreFromQRCodeImageBoxProps)
     // read file as data URL
     useEffect(() => {
         if (file) {
-            toDataURL(file).then(setDataURL, () => setDataURL(''))
+            blobToDataURL(file).then(setDataURL, () => setDataURL(''))
         } else {
             setDataURL('')
         }

packages/maskbook/src/plugins/FileService/SNSAdaptor/components/Upload.tsx

@@ -1,5 +1,5 @@
 import { Attachment } from '@dimensiondev/common-protocols'
-import { encodeArrayBuffer } from '@dimensiondev/kit'
+import { blobToArrayBuffer, encodeArrayBuffer } from '@dimensiondev/kit'
 import { Checkbox, FormControlLabel, Link, makeStyles, Typography } from '@material-ui/core'
 import { isNil } from 'lodash-es'
 import { useState } from 'react'
@@ -64,7 +64,7 @@ export const Upload: React.FC = () => {
         if (encrypted) {
             key = makeFileKey()
         }
-        const block = new Uint8Array(await file.arrayBuffer())
+        const block = new Uint8Array(await blobToArrayBuffer(file))
         const checksum = encodeArrayBuffer(await Attachment.checksum(block))
         const item = await PluginFileServiceRPC.getFileInfo(checksum)
         if (isNil(item)) {

packages/maskbook/src/polyfill/web-apis/worker.ts

@@ -1,3 +1 @@
-import './implementation/Blob.prototype.arrayBuffer'
-import './implementation/File.prototype.arrayBuffer'
 import './implementation/EventTarget.constructor'

packages/maskbook/src/utils/utils.ts

@@ -41,7 +41,7 @@ export function dispatchCustomEvents<T extends keyof CustomEvents>(
  * @param image
  */
 export async function pasteImageToActiveElements(image: File | Blob): Promise<void> {
-    const bytes = new Uint8Array(await image.arrayBuffer())
+    const bytes = new Uint8Array(await blobToArrayBuffer(image))
     dispatchCustomEvents(document.activeElement, 'paste', { type: 'image', value: Array.from(bytes) })
 }
 
@@ -167,6 +167,7 @@ export function addUint8Array(a: ArrayBuffer, b: ArrayBuffer) {
 }
 
 import Services from '../extension/service'
+import { blobToArrayBuffer } from '@dimensiondev/kit'
 export { parseURL } from '@masknet/shared'
 /**
  * !!!! Please use the Promise constructor if possible

packages/shared/package.json

@@ -4,7 +4,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@dimensiondev/holoflows-kit": "0.8.0-20210317064617-6c4792c",
-    "@dimensiondev/kit": "=0.0.0-20210624142900-972fd05",
+    "@dimensiondev/kit": "=0.0.0-20210630045432-e05621c",
     "@masknet/web3-shared": "workspace:*",
     "@servie/events": "^3.0.0",
     "anchorme": "^2.1.2",

packages/web3-shared/package.json

@@ -3,7 +3,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@dimensiondev/kit": "=0.0.0-20210624142900-972fd05",
+    "@dimensiondev/kit": "=0.0.0-20210630045432-e05621c",
     "@masknet/constants": "workspace:*",
     "@masknet/contracts": "workspace:*",
     "bignumber.js": "9.0.1",