refactor: storage 抽为同构方案 & httpClient 重构支持流式 & configManager 抽离

.eslintrc.js

@@ -75,7 +75,7 @@ const tslintConfig = {
   },
   rules: {
     ...eslintConfig.rules,
-    'no-unused-vars': 1,
+    'no-unused-vars': 0,
     'no-undef': 'off',
     'no-use-before-define': 'off',
     '@typescript-eslint/no-use-before-define': 'off',

src/background/actionListener/index.ts

@@ -1,12 +1,11 @@
-import Chrome from '@/background/core/chromeExtension';
+import chromeExtension from '@/background/core/chromeExtension';
 import { BackgroundEvents } from '@/isomorphic/background';
 import { createStorageActionListener } from './storage';
 import { createUserActionListener } from './user';
 import { createClipActionListener } from './clip';
 import { createTabActionListener } from './tab';
 import { createSidePanelActionListener } from './sidePanel';
-import { createRequestActionListener } from './request';
-import { createManagerConfigActionListener } from './configManager';
+import HttpClient from '../core/httpClient';
 
 type SendResponse = (response: any) => void;
 
@@ -15,12 +14,12 @@ export interface RequestMessage<T> {
   data: T;
 }
 
-export const initBackGroundActionListener = () => {
-  Chrome.runtime.onMessage.addListener(
+export const initBackGroundActionListener = (httpClient: HttpClient) => {
+  chromeExtension.runtime.onMessage.addListener(
     (request: RequestMessage<any>, _sender: chrome.runtime.MessageSender, sendResponse: SendResponse) => {
       switch (request.action) {
         case BackgroundEvents.OperateUser: {
-          createUserActionListener(request, sendResponse, _sender);
+          createUserActionListener(request, sendResponse, _sender, httpClient);
           break;
         }
         case BackgroundEvents.OperateStorage: {
@@ -39,14 +38,6 @@ export const initBackGroundActionListener = () => {
           createSidePanelActionListener(request, sendResponse, _sender);
           break;
         }
-        case BackgroundEvents.OperateRequest: {
-          createRequestActionListener(request, sendResponse, _sender);
-          break;
-        }
-        case BackgroundEvents.OperateManagerConfig: {
-          createManagerConfigActionListener(request, sendResponse, _sender);
-          break;
-        }
         default: {
           break;
         }

src/background/actionListener/user.ts

@@ -1,10 +1,10 @@
 import { pick } from 'lodash';
-import Chrome from '@/background/core/chromeExtension';
+import chromeExtension from '@/background/core/chromeExtension';
 import { IOperateUserData, OperateUserEnum } from '@/isomorphic/background/user';
 import { IUser } from '@/isomorphic/interface';
 import { storage } from '@/isomorphic/storage';
-import requestFn from '@/background/core/request';
 import { STORAGE_KEYS, YUQUE_DOMAIN } from '@/config';
+import HttpClient from '../core/httpClient';
 import { RequestMessage } from './index';
 
 export const SERVER_URLS = {
@@ -15,7 +15,7 @@ export const SERVER_URLS = {
 
 const createLoginWindow = (): Promise<number> => {
   return new Promise(resolve => {
-    Chrome.windows.create(
+    chromeExtension.windows.create(
       {
         focused: true,
         width: 500,
@@ -32,7 +32,7 @@ const createLoginWindow = (): Promise<number> => {
 
 const waitForWindowLogined = (windowId: number) => {
   return new Promise<void>(resolve => {
-    Chrome.webRequest.onCompleted.addListener(
+    chromeExtension.webRequest.onCompleted.addListener(
       data => {
         if ([SERVER_URLS.DASHBOARD, SERVER_URLS.LOGIN].includes(data.url)) {
           if (data.statusCode === 200) {
@@ -50,26 +50,27 @@ const waitForWindowLogined = (windowId: number) => {
 
 const removeWindow = (windowId: number) => {
   return new Promise(resolve => {
-    Chrome.windows.remove(windowId, resolve);
+    chromeExtension.windows.remove(windowId, resolve);
   });
 };
 
 export async function createUserActionListener(
   request: RequestMessage<IOperateUserData>,
   callback: (params: any) => void,
   sender: chrome.runtime.MessageSender,
+  httpClient: HttpClient,
 ) {
   const { type } = request.data;
   switch (type) {
     case OperateUserEnum.login: {
       try {
-        await requestFn('/api/accounts/logout', {
+        await httpClient.handleRequest('/api/accounts/logout', {
           method: 'DELETE',
         });
         const windowId = await createLoginWindow();
         await waitForWindowLogined(windowId);
         await removeWindow(windowId);
-        const { data, status } = await requestFn('/api/mine', {
+        const { data, status } = await httpClient.handleRequest('/api/mine', {
           method: 'GET',
         });
         if (status === 200) {
@@ -89,7 +90,7 @@ export async function createUserActionListener(
       break;
     }
     case OperateUserEnum.getUserShortCut: {
-      const result = await Chrome.commands.getAll();
+      const result = await chromeExtension.commands.getAll();
       callback(result);
       break;
     }

src/background/core/chromeExtension.ts

@@ -1,3 +1,5 @@
+import { getMsgId } from '@/isomorphic/util';
+
 const chromeExtension = {
   action: chrome.action,
   cookies: chrome.cookies,
@@ -28,6 +30,14 @@ const chromeExtension = {
         }
       }
     },
+    async sendToContent(tab: chrome.tabs.Tab, type: string, data: any, id?: string) {
+      const params = {
+        type,
+        data,
+        id: id || getMsgId({ type }),
+      };
+      chrome.tabs.sendMessage(tab.id as number, params);
+    },
   },
   webRequest: chrome.webRequest,
   declarativeNetRequest: chrome.declarativeNetRequest,