feat: used as desktop's rabbyx.

RabbyHub · Dec 5, 2022 · 0847679 · 0847679
1 parent 6456873
commit 0847679
Show file tree

Hide file tree

Showing 37 changed files with 670 additions and 441 deletions.
diff --git a/build/paths.js b/build/paths.js
@@ -1,18 +1,26 @@
 const path = require('path');
 const fs = require('fs');
 
-const appRoot = fs.realpathSync(process.cwd());
+const appRoot = fs.realpathSync(path.resolve(__dirname, '..'));
+
+const desktopRepo = process.env.RABBY_DESKTOP_REPO || path.join(appRoot, '../RabbyDesktop');
+if (!fs.existsSync(desktopRepo)) {
+  console.log('RabbyDesktop repo not found at ' + desktopRepo);
+  desktopRepo = null;
+} else {
+  console.log('Using RabbyDesktop repo at ' + desktopRepo);
+};
 
 const rootResolve = path.resolve.bind(path, appRoot);
 
 module.exports = {
   root: appRoot,
   src: rootResolve('src'),
-  popupHtml: rootResolve('src/ui/popup.html'),
+  popupHtml: rootResolve('src/ui/popup.ejs'),
   notificationHtml: rootResolve('src/ui/notification.html'),
   indexHtml: rootResolve('src/ui/index.html'),
   backgroundHtml: rootResolve('src/background/background.html'),
-  dist: rootResolve('dist'),
+  dist: desktopRepo ? path.resolve(desktopRepo, './assets/chrome_exts/rabby') : rootResolve('dist'),
 
   rootResolve,
 }
diff --git a/build/webpack.common.config.js b/build/webpack.common.config.js
@@ -39,6 +39,11 @@ const config = {
             sideEffects: true,
             test: /[\\/]pageProvider[\\/]index.ts/,
             loader: 'ts-loader',
+            options: {
+              compilerOptions: {
+                outDir: paths.dist,
+              },
+            }
           },
           {
             test: /[\\/]ui[\\/]index.tsx/,
@@ -58,6 +63,7 @@ const config = {
                   }),
                   compilerOptions: {
                     module: 'es2015',
+                    outDir: paths.dist,
                   },
                 },
               },
@@ -96,6 +102,9 @@ const config = {
                   }),
                 ],
               }),
+              compilerOptions: {
+                outDir: paths.dist,
+              }
             },
           },
         ],
@@ -178,28 +187,28 @@ const config = {
     ],
   },
   plugins: [
-    new ESLintWebpackPlugin({
-      extensions: ['ts', 'tsx', 'js', 'jsx'],
-    }),
+    // new ESLintWebpackPlugin({
+    //   extensions: ['ts', 'tsx', 'js', 'jsx'],
+    // }),
     // new AntdDayjsWebpackPlugin(),
     new HtmlWebpackPlugin({
       inject: true,
       template: paths.popupHtml,
       chunks: ['ui'],
       filename: 'popup.html',
     }),
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.notificationHtml,
-      chunks: ['ui'],
-      filename: 'notification.html',
-    }),
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.indexHtml,
-      chunks: ['ui'],
-      filename: 'index.html',
-    }),
+    // new HtmlWebpackPlugin({
+    //   inject: true,
+    //   template: paths.notificationHtml,
+    //   chunks: ['ui'],
+    //   filename: 'notification.html',
+    // }),
+    // new HtmlWebpackPlugin({
+    //   inject: true,
+    //   template: paths.indexHtml,
+    //   chunks: ['ui'],
+    //   filename: 'index.html',
+    // }),
     new HtmlWebpackPlugin({
       inject: true,
       template: paths.backgroundHtml,

diff --git a/package.json b/package.json
@@ -4,12 +4,12 @@
   "description": "A browser plugin for DeFi users",
   "scripts": {
     "postinstall": "patch-package",
-    "clean": "mkdir -p dist && rm -rf dist/* && cp -r _raw/* dist",
+    "clean": "./scripts/clean-assets.sh",
     "make-vars": "node scripts/make-vars.js",
-    "build:dev": "npm run clean && npm run make-vars && TAILWIND_MODE=watch webpack --progress --env config=dev",
-    "build:pro": "npm run clean && npm run make-vars && webpack --progress --env config=pro",
-    "build:debug": "npm run clean && npm run make-vars && webpack --progress --env config=debug",
-    "build:sourcemap": "npm run clean && npm run make-vars && webpack --progress --env config=sourcemap",
+    "build:dev": "npm run clean && TAILWIND_MODE=watch webpack --progress --env config=dev",
+    "build:pro": "npm run clean && webpack --progress --env config=pro",
+    "build:debug": "npm run clean && webpack --progress --env config=debug",
+    "build:sourcemap": "npm run clean && webpack --progress --env config=sourcemap",
     "lint:fix": "eslint --fix --ext .js,.jsx,.ts,.tsx ./src",
     "test": "jest",
     "pub": "node build/release.js"

diff --git a/scripts/clean-assets.sh b/scripts/clean-assets.sh
@@ -0,0 +1,11 @@
+script_dir="$( cd "$( dirname "$0"  )" && pwd  )"
+project_dir=$(dirname "$script_dir")
+
+if [ -z $RABBY_DESKTOP_REPO ]; then
+    export RABBY_DESKTOP_REPO=$( cd "$project_dir/../RabbyDesktop" && pwd  )
+    echo "[clean-assets] RABBY_DESKTOP_REPO is not set, use default: $RABBY_DESKTOP_REPO"
+else
+    echo "[clean-assets] RABBY_DESKTOP_REPO is set to: $RABBY_DESKTOP_REPO"
+fi
+
+mkdir -p $RABBY_DESKTOP_REPO/assets/chrome_exts/rabby && rm -rf $RABBY_DESKTOP_REPO/assets/chrome_exts/rabby/* && cp -r _raw/* $RABBY_DESKTOP_REPO/assets/chrome_exts/rabby
diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -344,16 +344,16 @@ export class WalletController extends BaseController {
         Sentry.captureException(
           new Error(
             'postGasStationOrder failed, params: ' +
-              JSON.stringify({
-                userAddr: account.address,
-                fromChainId: others.chainServerId,
-                fromTxId: txId,
-                toChainId: toChainId,
-                toTokenAmount,
-                fromTokenId: others.tokenId,
-                fromTokenAmount: fromTokenAmount,
-                fromUsdValue,
-              })
+            JSON.stringify({
+              userAddr: account.address,
+              fromChainId: others.chainServerId,
+              fromTxId: txId,
+              toChainId: toChainId,
+              toTokenAmount,
+              fromTokenId: others.tokenId,
+              fromTokenAmount: fromTokenAmount,
+              fromUsdValue,
+            })
           )
         );
       }
@@ -500,11 +500,11 @@ export class WalletController extends BaseController {
       $ctx:
         needApprove && pay_token_id !== chain.nativeTokenAddress
           ? {
-              ga: {
-                ...$ctx?.ga,
-                source: 'approvalAndSwap|swap',
-              },
-            }
+            ga: {
+              ...$ctx?.ga,
+              source: 'approvalAndSwap|swap',
+            },
+          }
           : $ctx,
       method: 'eth_sendTransaction',
       params: [swapParam],
@@ -2279,18 +2279,18 @@ export class WalletController extends BaseController {
   }: {
     list: (
       | {
-          chainServerId: string;
-          contractId: string;
-          spender: string;
-          abi: 'ERC721' | 'ERC1155' | '';
-          tokenId: string | null | undefined;
-          isApprovedForAll: boolean;
-        }
+        chainServerId: string;
+        contractId: string;
+        spender: string;
+        abi: 'ERC721' | 'ERC1155' | '';
+        tokenId: string | null | undefined;
+        isApprovedForAll: boolean;
+      }
       | {
-          chainServerId: string;
-          id: string;
-          spender: string;
-        }
+        chainServerId: string;
+        id: string;
+        spender: string;
+      }
     )[];
   }) => {
     const queue = new PQueue({
@@ -2325,4 +2325,54 @@ export class WalletController extends BaseController {
   };
 }
 
-export default new WalletController();
+const walletController = new WalletController();
+
+export default walletController;
+
+window.rabbyDesktop.ipcRenderer.on('rabbyx-rpc-query', (payload) => {
+  if (!payload.rpcId) {
+    throw new Error('[rabbyx-rpc-query] rpcId is required');
+  }
+
+  switch (payload.method) {
+    case 'walletController.boot': {
+      const [password] = payload.params;
+      window.rabbyDesktop.ipcRenderer.sendMessage('rabbyx-rpc-respond', {
+        rpcId: payload.rpcId,
+        result: walletController.boot(password),
+      });
+      break;
+    }
+    case 'walletController.isBooted': {
+      window.rabbyDesktop.ipcRenderer.sendMessage('rabbyx-rpc-respond', {
+        rpcId: payload.rpcId,
+        result: walletController.isBooted(),
+      });
+      break;
+    }
+    case 'walletController.isUnlocked': {
+      window.rabbyDesktop.ipcRenderer.sendMessage('rabbyx-rpc-respond', {
+        rpcId: payload.rpcId,
+        result: walletController.isUnlocked(),
+      });
+      break;
+    }
+    case 'walletController.lockWallet': {
+      window.rabbyDesktop.ipcRenderer.sendMessage('rabbyx-rpc-respond', {
+        rpcId: payload.rpcId,
+        result: walletController.lockWallet(),
+      });
+      break;
+    }
+    case 'walletController.getConnectedSites': {
+      window.rabbyDesktop.ipcRenderer.sendMessage('rabbyx-rpc-respond', {
+        rpcId: payload.rpcId,
+        result: walletController.getConnectedSites(),
+      });
+      break;
+    }
+    default: {
+      throw new Error(`[rabbyx-rpc-query] method ${payload.method} is not supported`);
+    }
+  }
+});
diff --git a/src/background/desktop-inject/type.d.ts b/src/background/desktop-inject/type.d.ts
@@ -0,0 +1,30 @@
+interface Window {
+    rabbyDesktop: {
+        ipcRenderer: {
+            sendMessage<T extends string>(
+                channel: T,
+                ...args: any[]
+            ): void;
+            on: {
+                <T extends string>(
+                    channel: T,
+                    func: (...args: any[]) => void
+                ): (() => void) | undefined;
+                <T extends string>(
+                    channel: T,
+                    func: (event: any) => void
+                ): (() => void) | undefined;
+            };
+            once: {
+                <T extends string>(
+                    channel: T,
+                    func: (...args: any[]) => void
+                ): (() => void) | undefined;
+                <T extends string>(
+                    channel: T,
+                    func: (event: any) => void
+                ): (() => void) | undefined;
+            };
+        };
+    };
+}
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -1,3 +1,5 @@
+/// <reference path="desktop-inject/type.d.ts" />
+
 import { groupBy } from 'lodash';
 import 'reflect-metadata';
 import * as Sentry from '@sentry/browser';