revert: incorrect rpc change (#6888)

* Revert "fix: mv3 breaks (#6872)"

This reverts commit b681c3d.

* Revert "refactor: migrate the rest (#6871)"

This reverts commit e80e6dc.

packages/dashboard/src/initialization/PluginHost.ts

@@ -4,8 +4,7 @@ import { Emitter } from '@servie/events'
 import { startPluginDashboard, Plugin } from '@masknet/plugin-infra/dashboard'
 import { createI18NBundle, i18NextInstance } from '@masknet/shared-base'
 import { Services, Messages } from '../API'
-import { createPartialSharedUIContext } from '../../../mask/shared/plugin-infra/host'
-import { RestPartOfPluginUIContextShared } from '../../../mask/src/utils/plugin-context-shared-ui'
+import { createSharedContext } from '../../../mask/src/plugin-infra/host'
 
 const PluginHost: Plugin.__Host.Host<Plugin.Dashboard.DashboardContext> = {
     minimalMode: {
@@ -17,10 +16,7 @@ const PluginHost: Plugin.__Host.Host<Plugin.Dashboard.DashboardContext> = {
     addI18NResource(plugin, resource) {
         createI18NBundle(plugin, resource)(i18NextInstance)
     },
-    createContext: (id, signal) => ({
-        ...createPartialSharedUIContext(id, signal),
-        ...RestPartOfPluginUIContextShared,
-    }),
+    createContext: createSharedContext,
 }
 setTimeout(() => {
     Messages.events.pluginMinimalModeChanged.on(([id, status]) => {

packages/mask/.webpack/config.ts

@@ -275,7 +275,7 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration {
         }
         plugins.push(new WebExtensionPlugin({ background: { entry: 'background', manifest: 3 } }))
     } else {
-        entries.background = normalizeEntryDescription(join(__dirname, '../background/mv2-entry.ts'))
+        entries.background = normalizeEntryDescription(join(__dirname, '../src/background-service.ts'))
         plugins.push(new WebExtensionPlugin({ background: { entry: 'background', manifest: 2 } }))
         plugins.push(
             addHTMLEntry({

packages/mask/background/mv3-entry.ts

@@ -1 +1,3 @@
 import './setup'
+import './services/setup'
+import './tasks/setup'

packages/mask/background/services/helper/request-permission.ts

@@ -7,8 +7,8 @@ export async function requestExtensionPermission(permission: browser.permissions
     try {
         return await browser.permissions.request(permission)
     } catch {
-        // which means we're on Firefox or Manifest V3.
-        // Chrome Manifest v2 allows permission request from the background.
+        // which means we're on Firefox.
+        // Chrome allows permission request from the background.
     }
     const popup = await browser.windows.create({
         height: 600,

packages/mask/background/services/setup.ts

@@ -19,7 +19,7 @@ setup('Identity', () => import(/* webpackPreload: true */ './identity'))
 setup('Backup', () => import(/* webpackPreload: true */ './backup'))
 setup('Helper', () => import(/* webpackPreload: true */ './helper'))
 setup('SocialNetwork', () => import(/* webpackPreload: true */ './site-adaptors'))
-setup('Settings', () => import(/* webpackPreload: true */ './settings'), false)
+setup('Settings', () => import(/* webpackPreload: true */ './settings'))
 setup('ThirdPartyPlugin', () => import(/* webpackPreload: true */ './third-party-plugins'))
 
 if (import.meta.webpackHot) {
@@ -32,13 +32,13 @@ if (import.meta.webpackHot) {
     import.meta.webpackHot.accept(['./third-party-plugins'], () => hmr.dispatchEvent(new Event('thirdPartyPlugin')))
 }
 
-function setup<K extends keyof Services>(key: K, implementation: () => Promise<Services[K]>, hasLog = true) {
+function setup<K extends keyof Services>(key: K, implementation: () => Promise<Services[K]>) {
     const channel = message.events[key].bind(MessageTarget.Broadcast)
 
     async function load() {
         const val = await getLocalImplementation(true, `Services.${key}`, implementation, channel)
         if (debugMode) {
-            Reflect.defineProperty(globalThis, key + 'Service', { configurable: true, enumerable: true, value: val })
+            Reflect.defineProperty(globalThis, key + 'Service', { configurable: true, value: val })
         }
         return val
     }
@@ -49,15 +49,18 @@ function setup<K extends keyof Services>(key: K, implementation: () => Promise<S
         key,
         serializer,
         channel,
-        log: hasLog
-            ? {
-                  beCalled: true,
-                  remoteError: false,
-                  type: 'pretty',
-                  requestReplay: debugMode,
-              }
-            : false,
-        strict: true,
+        log: {
+            beCalled: true,
+            remoteError: false,
+            type: 'pretty',
+            requestReplay: debugMode,
+        },
+        preferLocalImplementation: true,
+        strict: {
+            // temporally
+            methodNotFound: false,
+            unknownMessage: true,
+        },
         thenable: false,
     })
 }

packages/mask/background/services/types.ts

@@ -4,24 +4,14 @@ import type * as Helper from './helper'
 import type * as Backup from './backup'
 import type * as Identity from './identity'
 import type * as Settings from './settings'
-import type * as SocialNetwork from './site-adaptors'
-import type * as ThirdPartyPlugin from './third-party-plugins'
-
-export type CryptoService = typeof Crypto
-export type IdentityService = typeof Identity
-export type BackupService = typeof Backup
-export type HelperService = typeof Helper
-export type SettingsService = typeof Settings
-export type SocialNetworkService = typeof SocialNetwork
-export type ThirdPartyPluginService = typeof ThirdPartyPlugin
 export interface Services {
-    Crypto: CryptoService
-    Identity: IdentityService
-    Backup: BackupService
-    Helper: HelperService
-    Settings: SettingsService
-    SocialNetwork: SocialNetworkService
-    ThirdPartyPlugin: ThirdPartyPluginService
+    Crypto: Omit<typeof Crypto, 'decryptionWithSocialNetworkDecoding'>
+    Identity: typeof Identity
+    Backup: typeof Backup
+    Helper: typeof Helper
+    SocialNetwork: {}
+    Settings: typeof Settings
+    ThirdPartyPlugin: {}
 }
 export type GeneratorServices = {
     decryption: typeof decryptionWithSocialNetworkDecoding

packages/mask/background/setup.ts

@@ -5,10 +5,7 @@ import { inMemory_KVStorageBackend, indexedDB_KVStorageBackend } from './databas
 import { setupLegacySettingsAtBackground } from '../shared/legacy-settings/createSettings'
 import { __deprecated__getStorage, __deprecated__setStorage } from './utils/deprecated-storage'
 
-import './services/setup'
-import './tasks/setup' // Setup Tasks
 import '../shared/site-adaptors'
-import '../shared/native-rpc' // setup Android and iOS API server
 
 polyfill()
 setupMaskKVStorageBackend(indexedDB_KVStorageBackend, inMemory_KVStorageBackend)

packages/mask/shared/tsconfig.json

@@ -8,6 +8,5 @@
     "lib": ["ES2021"]
   },
   "include": ["./"],
-  "exclude": ["./plugin-infra/register.js"],
   "references": [{ "path": "../../shared-base" }, { "path": "../../plugin-infra" }]
 }

packages/mask/src/background-service.ts

@@ -1,2 +1,9 @@
 import '../background/setup'
 import './extension/service' // setup Services.*
+import '../shared/native-rpc' // setup Android and iOS API server
+import './extension/background-script/Jobs' // start jobs
+
+// ! We should gradually stop using i18n in the background
+import { addMaskI18N } from '../shared-ui/locales/languages'
+import { i18NextInstance } from '@masknet/shared-base'
+addMaskI18N(i18NextInstance)

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

@@ -2,7 +2,7 @@ import { Fragment, useEffect, useReducer } from 'react'
 import { extractTextFromTypedMessage, TypedMessage } from '@masknet/typed-message'
 import type { ProfileIdentifier } from '@masknet/shared-base'
 
-import Services, { GeneratorServices } from '../../../extension/service'
+import Services, { ServicesWithProgress } from '../../../extension/service'
 import type { DecryptionProgress, FailureDecryption, SuccessDecryption } from './types'
 import { DecryptPostSuccess } from './DecryptedPostSuccess'
 import { DecryptPostAwaiting } from './DecryptPostAwaiting'
@@ -199,7 +199,7 @@ async function makeProgress(
         currentSocialNetwork: activatedSocialNetworkUI.encryptionNetwork,
     }
     let iv: Uint8Array | undefined
-    for await (const progress of GeneratorServices.decryption(payload, context)) {
+    for await (const progress of ServicesWithProgress.decryptionWithSocialNetworkDecoding(payload, context)) {
         if (signal.aborted) return
         if (progress.type === DecryptProgressKind.Success) {
             done(progress.content, iv || new Uint8Array())

packages/mask/background/tasks/Cancellable/StartPluginHost.ts → packages/mask/src/extension/background-script/Jobs/StartPluginWorker.ts

@@ -1,10 +1,8 @@
 import { startPluginWorker, Plugin } from '@masknet/plugin-infra/background-worker'
-import { createPluginDatabase } from '../../database/plugin-db'
-import { createPluginHost, createSharedContext } from '../../../shared/plugin-infra/host'
-import { getPluginMinimalModeEnabled } from '../../services/settings/old-settings-accessor'
-
+import { createPluginDatabase } from '../../../../background/database/plugin-db'
+import { createPluginHost, createSharedContext } from '../../../plugin-infra/host'
 export default function (signal: AbortSignal) {
-    startPluginWorker(createPluginHost(signal, createWorkerContext, getPluginMinimalModeEnabled))
+    startPluginWorker(createPluginHost(signal, createWorkerContext))
 }
 
 function createWorkerContext(pluginID: string, signal: AbortSignal): Plugin.Worker.WorkerContext {

packages/mask/src/extension/background-script/Jobs/index.ts

@@ -0,0 +1,2 @@
+import './index_hmr'
+import '../../../../background/tasks/setup'

packages/mask/src/extension/background-script/Jobs/index_hmr.ts

@@ -0,0 +1,12 @@
+// Define new task at packages/mask/background/tasks/setup.hmr.ts if possible.
+import * as PluginWorker from './StartPluginWorker'
+
+type CancelableJob = { default: (signal: AbortSignal) => void }
+const CancelableJobs: CancelableJob[] = [PluginWorker]
+
+const abort = new AbortController()
+CancelableJobs.map((x) => x.default(abort.signal))
+if (import.meta.webpackHot) {
+    import.meta.webpackHot.dispose(() => abort.abort())
+    import.meta.webpackHot.accept()
+}

packages/mask/src/extension/dashboard/index.tsx

@@ -7,13 +7,12 @@ import { WalletRPC, WalletMessages } from '../../plugins/Wallet/messages'
 // import { PluginTraderMessages, PluginTraderRPC } from '../../plugins/Trader/messages'
 // import { PluginPetMessages } from '../../plugins/Pets/messages'
 import { MaskMessages } from '../../utils/messages'
-import { createPluginHost, createPartialSharedUIContext } from '../../../shared/plugin-infra/host'
+import { createPluginHost, createSharedContext } from '../../plugin-infra/host'
 import type { DashboardPluginMessages, DashboardPluginServices } from '@masknet/shared'
 import { createNormalReactRoot } from '../../utils/createNormalReactRoot'
 import { status } from '../../setup.ui'
 import { PluginTransakMessages } from '../../plugins/Transak/messages'
 import { PluginTraderMessages } from '../../plugins/Trader/messages'
-import { RestPartOfPluginUIContextShared } from '../../utils/plugin-context-shared-ui'
 
 const msg: DashboardPluginMessages = {
     Wallet: WalletMessages,
@@ -33,14 +32,5 @@ setMessages(MaskMessages)
 setPluginServices(rpc)
 // @ts-ignore
 setPluginMessages(msg)
-startPluginDashboard(
-    createPluginHost(
-        undefined,
-        (id, signal) => ({
-            ...createPartialSharedUIContext(id, signal),
-            ...RestPartOfPluginUIContextShared,
-        }),
-        Services.Settings.getPluginMinimalModeEnabled,
-    ),
-)
+startPluginDashboard(createPluginHost(undefined, createSharedContext))
 status.then(() => createNormalReactRoot(<IntegratedDashboard />))

packages/mask/src/extension/popups/SSR-client.ts

@@ -32,7 +32,7 @@ if (location.hash === '#/personas') {
     })
     import(/* webpackPreload: true */ './normal-client')
 } else {
-    import(/* webpackPreload: true */ './normal-client').then(() => console.log('then'))
+    import(/* webpackPreload: true */ './normal-client')
 }
 
 // this function is never called, but it will hint webpack to preload modules we need

packages/mask/src/extension/popups/SSR-server.tsx

@@ -70,7 +70,7 @@ function PopupSSR(props: PopupSSR_Props) {
                                         nickname={props.nickname}
                                     />
                                 ) : (
-                                    <NormalHeader onClose={noop} />
+                                    <NormalHeader />
                                 )}
                                 <PersonaHomeUI
                                     fetchProofsLoading

packages/mask/src/extension/popups/components/NetworkSelector/index.tsx

@@ -10,7 +10,7 @@ import {
     Web3Helper,
     useProviderType,
 } from '@masknet/plugin-infra/web3'
-import { currentMaskWalletAccountSettings } from '../../../../../shared/legacy-settings/wallet-settings'
+import { currentMaskWalletAccountSettings } from '../../../../plugins/Wallet/settings'
 import { ChainIcon, useMenuConfig, WalletIcon } from '@masknet/shared'
 import { ArrowDownRound } from '@masknet/icons'
 import { WalletRPC } from '../../../../plugins/Wallet/messages'