♻️ add cookie ipc service

src/common/backend/services/youdao/service.ts

@@ -1,10 +1,11 @@
-import * as browser from '@web-clipper/chrome-promise';
 import { CompleteStatus, UnauthorizedError } from './../interface';
 import { DocumentService, Repository, CreateDocumentRequest } from '../../index';
 import axios, { AxiosInstance } from 'axios';
 import { stringify } from 'qs';
 import { generateUuid } from '@web-clipper/shared/lib/uuid';
 import localeService from '@/common/locales';
+import Container from 'typedi';
+import { ICookieService } from '@/service/common/cookie';
 
 interface YouDaoRepository {
   fileEntry: {
@@ -152,7 +153,7 @@ export default class YoudaoDocumentService implements DocumentService {
   };
 
   private getCSTK = async () => {
-    const cookie = await browser.cookies.get({
+    const cookie = await Container.get(ICookieService).get({
       url: 'https://note.youdao.com',
       name: 'YNOTE_CSTK',
     });

src/main/background.main.common.ts

@@ -1,4 +1,5 @@
 import 'regenerator-runtime/runtime';
 import 'reflect-metadata';
 import '@/service/tab/browser/background/tabService';
+import '@/service/cookie/background/cookieService';
 import '@/service/trackService';

src/main/background.main.ts

@@ -14,6 +14,8 @@ import { ITabService } from '@/service/common/tab';
 import { IChannelServer } from '@/service/common/ipc';
 import { BackgroundIPCServer } from '@/service/ipc/browser/background-main/ipcService';
 import { TabChannel } from '@/service/tab/common/tabIpc';
+import { ICookieService } from '@/service/common/cookie';
+import { CookieChannel } from '@/service/cookie/common/cookieIpc';
 
 const backgroundIPCServer: IChannelServer = new BackgroundIPCServer();
 
@@ -29,6 +31,8 @@ backgroundIPCServer.registerChannel(
   new WebRequestChannel(Container.get(IWebRequestService))
 );
 
+backgroundIPCServer.registerChannel('cookies', new CookieChannel(Container.get(ICookieService)));
+
 const contentScriptIPCClient = new PopupContentScriptIPCClient(Container.get(ITabService));
 const contentScriptChannel = contentScriptIPCClient.getChannel('contentScript');
 Container.set(IContentScriptService, new ContentScriptChannelClient(contentScriptChannel));

src/main/tool.main.ts

@@ -16,6 +16,8 @@ import '@/service/extension/browser/extensionService';
 import '@/service/extension/browser/extensionContainer';
 import { TabChannelClient } from '@/service/tab/common/tabIpc';
 import app from '@/pages/app';
+import { CookieChannelClient } from '@/service/cookie/common/cookieIpc';
+import { ICookieService } from '@/service/common/cookie';
 
 const ipcClient = new PopupIpcClient();
 
@@ -32,4 +34,7 @@ Container.set(IContentScriptService, new ContentScriptChannelClient(contentScrip
 const webRequestChannel = ipcClient.getChannel('webRequest');
 Container.set(IWebRequestService, new WebRequestChannelClient(webRequestChannel));
 
+const cookieChannel = ipcClient.getChannel('cookies');
+Container.set(ICookieService, new CookieChannelClient(cookieChannel));
+
 app();

src/service/common/cookie.ts

@@ -1,6 +1,7 @@
 import { Token } from 'typedi';
 
 export interface ICookieService {
+  get(details: chrome.cookies.Details): Promise<chrome.cookies.Cookie | null>;
   getAll(details: chrome.cookies.GetAllDetails): Promise<chrome.cookies.Cookie[]>;
   getAllCookieStores(): Promise<chrome.cookies.CookieStore[]>;
 }

src/service/cookie/background/cookieService.ts

@@ -0,0 +1,25 @@
+import { Service } from 'typedi';
+import { ICookieService } from '@/service/common/cookie';
+
+class ChromeCookieService implements ICookieService {
+  get(detail: chrome.cookies.Details): Promise<chrome.cookies.Cookie | null> {
+    return new Promise<chrome.cookies.Cookie | null>(r => {
+      chrome.cookies.get(detail, r);
+    });
+  }
+
+  getAll(detail: chrome.cookies.GetAllDetails): Promise<chrome.cookies.Cookie[]> {
+    return new Promise<chrome.cookies.Cookie[]>(r => {
+      chrome.cookies.getAll(detail, r);
+    });
+  }
+  getAllCookieStores(): Promise<chrome.cookies.CookieStore[]> {
+    return new Promise<chrome.cookies.CookieStore[]>(r => {
+      chrome.cookies.getAllCookieStores(cookieStores => {
+        r(cookieStores);
+      });
+    });
+  }
+}
+
+Service(ICookieService)(ChromeCookieService);

src/service/cookie/common/cookieIpc.ts

@@ -0,0 +1,40 @@
+import { IServerChannel, IChannel } from '@/service/common/ipc';
+import { ICookieService } from '@/service/common/cookie';
+
+export class CookieChannel implements IServerChannel {
+  constructor(private service: ICookieService) {}
+
+  call = async (
+    _context: chrome.runtime.Port['sender'],
+    command: string,
+    arg: any
+  ): Promise<any> => {
+    switch (command) {
+      case 'get':
+        return this.service.get(arg);
+      case 'getAll':
+        return this.service.getAll(arg);
+      case 'getAllCookieStores':
+        return this.service.getAllCookieStores();
+      default: {
+        throw new Error(`Call not found: ${command}`);
+      }
+    }
+  };
+}
+
+export class CookieChannelClient implements ICookieService {
+  constructor(private channel: IChannel) {}
+
+  get = async (detail: chrome.cookies.Details): Promise<chrome.cookies.Cookie | null> => {
+    return this.channel.call('get', detail);
+  };
+
+  getAll = async (detail: chrome.cookies.GetAllDetails): Promise<chrome.cookies.Cookie[]> => {
+    return this.channel.call('getAll', detail);
+  };
+
+  getAllCookieStores = async (): Promise<chrome.cookies.CookieStore[]> => {
+    return this.channel.call('getAllCookieStores');
+  };
+}