[WL-910] arc refactor, continued

apps/wallet/android/link-assets-manifest.json

@@ -52,6 +52,10 @@
     {
       "path": "assets/fonts/Rubik-SemiBoldItalic.ttf",
       "sha1": "6a8ffebd4702be10b6e3fc980eace615b16634d9"
+    },
+    {
+      "path": "metacraft/injection.js",
+      "sha1": "f9d3a2e5e46cb50e09ccfb78dff5f8db8c6b803e"
     }
   ]
 }

apps/wallet/babel.config.js

@@ -14,6 +14,8 @@ module.exports = {
 					modals: './src/modals',
 					stacks: './src/stacks',
 					screens: './src/screens',
+					kernel: './browser/kernel',
+					bridge: './browser/bridge',
 					crypto: 'react-native-quick-crypto',
 					path: './vendor/path',
 					zlib: './vendor/zlib',
@@ -25,6 +27,6 @@ module.exports = {
 			},
 		],
 		['react-native-reanimated/plugin'],
-		'@babel/plugin-proposal-export-namespace-from',
+		['@babel/plugin-proposal-export-namespace-from'],
 	],
 };

apps/wallet/browser/bridge/reply.ts

@@ -1,9 +1,5 @@
-import {
-	Channels,
-	PopupType,
-	RequestType,
-	ResponseCode,
-} from '@walless/messaging';
+import { PopupType, RequestType, ResponseCode } from '@walless/core';
+import { Channels } from '@walless/messaging';
 
 import type { PayloadOptions, PopupPayload } from './utils';
 import { encryptedMessenger } from './utils';

apps/wallet/browser/bridge/request.ts

@@ -1,6 +1,6 @@
-import { Timeout } from '@walless/core';
+import { RequestType, Timeout } from '@walless/core';
 import type { PureMessagePayload } from '@walless/messaging';
-import { Channels, RequestType } from '@walless/messaging';
+import { Channels } from '@walless/messaging';
 import * as bs58 from 'bs58';
 
 import type { PopupPayload } from './utils';

apps/wallet/browser/bridge/utils.ts

@@ -2,7 +2,7 @@ import { logger } from '@walless/core';
 import type { PureMessagePayload } from '@walless/messaging';
 import { createEncryptionKeyVault, createMessenger } from '@walless/messaging';
 import type { SettingDocument } from '@walless/store';
-import { storage } from 'utils/storage';
+import { storage } from 'utils/storage/db';
 
 export interface PayloadOptions {
 	sourceRequestId: string;
@@ -13,7 +13,6 @@ export interface PayloadOptions {
 export type PopupPayload = PureMessagePayload & PayloadOptions;
 
 export const encryptionKeyVault = createEncryptionKeyVault(storage);
-
 export const encryptedMessenger = createMessenger(encryptionKeyVault);
 
 export const launchSignInTab = async () => {

apps/wallet/browser/bundler/manifest.json

@@ -8,9 +8,9 @@
     "extension_pages": "script-src 'self'; object-src 'self'; frame-ancestors 'none';"
   },
   "icons": {
-    "16": "app-icons/16.png",
-    "48": "app-icons/48.png",
-    "128": "app-icons/128.png"
+    "16": "favicon.png",
+    "48": "favicon.png",
+    "128": "favicon.png"
   },
   "action": {
     "default_popup": "popup.html",

apps/wallet/browser/content/injection.ts

@@ -1,5 +1,5 @@
 import { logger } from '@walless/core';
-import Walless from '@walless/sdk';
+import { Walless } from '@walless/sdk';
 import { initialize } from '@walless/wallet-standard';
 
 const configureWalletStandard = async (): Promise<void> => {

apps/wallet/browser/kernel/handlers/aptos.ts

@@ -1,4 +1,4 @@
-import { ResponseCode } from '@walless/messaging';
+import { ResponseCode } from '@walless/core';
 import { aptosHandler } from '@walless/network';
 import { Network, Provider } from 'aptos';
 

apps/wallet/browser/kernel/handlers/common.ts

@@ -1,16 +1,16 @@
-import type { ConnectOptions } from '@walless/core';
 import { Networks } from '@walless/core';
-import { ResponseCode } from '@walless/messaging';
+import { ResponseCode } from '@walless/core';
+import type { ConnectOptions } from '@walless/sdk';
 import type { PublicKeyDocument, TrustedDomainDocument } from '@walless/store';
 import { selectors } from '@walless/store';
+import { storage } from 'utils/storage/db';
 
 import {
 	addExtensionsById,
 	checkInstalledExtensionById,
 } from '../utils/helper';
 import { openPopup } from '../utils/popup';
 import { getRequestRecord, respond } from '../utils/requestPool';
-import { storage } from '../utils/storage';
 import type { HandleMethod } from '../utils/types';
 
 export const connect: HandleMethod<{ options?: ConnectOptions }> = async ({

apps/wallet/browser/kernel/handlers/kernel.ts

@@ -1,6 +1,5 @@
-import { Networks } from '@walless/core';
+import { Networks, PopupType, RequestType, ResponseCode } from '@walless/core';
 import type { MessengerCallback } from '@walless/messaging';
-import { PopupType, RequestType, ResponseCode } from '@walless/messaging';
 
 import { handle } from '../utils/handle';
 import {

apps/wallet/browser/kernel/handlers/solana.ts

@@ -1,5 +1,5 @@
 import { clusterApiUrl, Connection } from '@solana/web3.js';
-import { ResponseCode } from '@walless/messaging';
+import { ResponseCode } from '@walless/core';
 import { solanaHandler } from '@walless/network';
 import { environment } from 'utils/config';
 

apps/wallet/browser/kernel/handlers/sui.ts

@@ -1,5 +1,5 @@
 import { Connection, JsonRpcProvider } from '@mysten/sui.js';
-import { ResponseCode } from '@walless/messaging';
+import { ResponseCode } from '@walless/core';
 import { suiHandler } from '@walless/network';
 
 import { respond } from '../utils/requestPool';

apps/wallet/browser/kernel/handlers/tezos.ts

@@ -1,5 +1,5 @@
 import { TezosToolkit } from '@taquito/taquito';
-import { ResponseCode } from '@walless/messaging';
+import { ResponseCode } from '@walless/core';
 import { tezosHandler } from '@walless/network';
 
 import { respond } from '../utils/requestPool';

apps/wallet/browser/kernel/index.ts

@@ -1,15 +1,14 @@
 import { logger, runtime } from '@walless/core';
+import { configure } from '@walless/store';
+import { storage } from 'utils/storage/db';
 
 import { keepBackgroundAlive } from './utils/extension';
-import { initModules } from './utils/init';
 import { initializeMessaging } from './messaging';
 import { configurePWA } from './pwa';
 
 logger.info('Initializing kernel..');
 
-initModules().then(async () => {
-	await Promise.all([initializeMessaging()]);
-});
+configure(storage).then(initializeMessaging);
 
 if (runtime.isExtension) {
 	keepBackgroundAlive();

apps/wallet/browser/kernel/messaging/index.ext.ts

@@ -0,0 +1,84 @@
+import {
+	PopupType,
+	ResponseCode,
+	ResponseMessage,
+	runtime,
+} from '@walless/core';
+import type {
+	EncryptedMessage,
+	MessagePayload,
+	MessengerCallback,
+} from '@walless/messaging';
+import { decryptMessage } from '@walless/messaging';
+
+import { onKernelMessage } from '../handlers/kernel';
+import { respond } from '../utils/requestPool';
+
+import { encryptionKeyVault, initializeVaultKeys } from './shared';
+
+/* Manually forward/coordinate communication using chrome.runtime.port messaging,
+ * included encryption support */
+export const initializeMessaging = async (): Promise<void> => {
+	await initializeVaultKeys();
+
+	const callbackRegistry: Record<string, MessengerCallback> = {};
+
+	runtime.onConnect.addListener((port: chrome.runtime.Port) => {
+		const handleInComingMessage = async (
+			message: EncryptedMessage | MessagePayload,
+		) => {
+			const registeredCallback = callbackRegistry[port.name];
+			const isEncrypted = !!message?.iv;
+
+			if (registeredCallback) {
+				if (isEncrypted) {
+					const key = await encryptionKeyVault.get(port.name);
+					const decrypted = await decryptMessage(
+						message as EncryptedMessage,
+						key,
+					);
+					registeredCallback?.(decrypted, port);
+				} else {
+					registeredCallback?.(message as never, port);
+				}
+			}
+		};
+
+		const handleDisconnect = (port: chrome.runtime.Port) => {
+			if (port.name.includes('/')) {
+				const [id, requestId] = port.name.split('/');
+				if (id === PopupType.REQUEST_CONNECT_POPUP) {
+					try {
+						respond(requestId, ResponseCode.ERROR, {
+							error: ResponseMessage.REJECT_REQUEST_CONNECT,
+						});
+					} catch (error) {
+						return;
+					}
+				} else if (id === PopupType.SIGNATURE_POPUP) {
+					try {
+						respond(requestId, ResponseCode.ERROR, {
+							error: ResponseMessage.REJECT_COMMON_REQUEST,
+						});
+					} catch (error) {
+						return;
+					}
+				} else if (id === PopupType.REQUEST_INSTALL_LAYOUT_POPUP) {
+					try {
+						respond(requestId, ResponseCode.ERROR);
+					} catch (error) {
+						return;
+					}
+				}
+			}
+
+			port.onMessage.removeListener(handleInComingMessage);
+			port.onDisconnect.removeListener(handleDisconnect);
+		};
+
+		port.onMessage.addListener(handleInComingMessage);
+		port.onDisconnect.addListener(handleDisconnect);
+	});
+
+	callbackRegistry.kernel = onKernelMessage;
+};

apps/wallet/browser/kernel/messaging/index.ts

@@ -0,0 +1,10 @@
+import { createMessenger } from '@walless/messaging';
+
+import { onKernelMessage } from '../handlers/kernel';
+
+/* quite similar to Browser/PWA version,
+ * but Mobile messaging talk to itself, no encryption ever needed! */
+export const initializeMessaging = async (): Promise<void> => {
+	const messenger = createMessenger();
+	messenger.onMessage('kernel', onKernelMessage);
+};

apps/wallet/browser/kernel/messaging/index.web.ts

@@ -0,0 +1,13 @@
+import { createMessenger } from '@walless/messaging';
+
+import { onKernelMessage } from '../handlers/kernel';
+
+import { encryptionKeyVault, initializeVaultKeys } from './shared';
+
+/* Mostly use messaging module to communicate,
+ * support encrypted communication */
+export const initializeMessaging = async (): Promise<void> => {
+	await initializeVaultKeys();
+	const encryptedMessenger = createMessenger(encryptionKeyVault);
+	encryptedMessenger.onMessage('kernel', onKernelMessage);
+};