Merge pull request #233 from yuque/feat/partition-cookie

feat: 兼容partition cookie
yuque · Jan 3, 2024 · 0fbcec9 · 0fbcec9
2 parents ffa2fb4 + 1c8c8e6
commit 0fbcec9
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 62 deletions.
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "yuque-chrome-extension",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "语雀浏览器插件",
   "private": true,
   "releaseNotes": [
-    "[优化] 增加保存失败的提示",
-    "[修复] 修复插件导致特殊网页卡住问题",
-    "[修复] 语雀文档剪藏列表丢失情况"
+    "[特性] 支持全文剪藏",
+    "[优化] 优化插件性能",
+    "[修复] 修复上传图片失败的异常处理"
   ],
   "repository": {
     "type": "git",

diff --git a/src/background/core/httpClient.ts b/src/background/core/httpClient.ts
@@ -127,11 +127,11 @@ export default class HttpClient {
   private async handlePrepareRequestParams(url: string, _config: IRequestConfig, _option?: IRequestOptions) {
     const headers = await this.prepareHeaders();
     const config: RequestInit = {
+      ..._config,
       headers: {
         ...headers,
         ..._config.headers,
       },
-      ..._config,
     };
     let queryString = '';
     if (_option?.isFileUpload) {

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -24,6 +24,7 @@ chromeExtension.runtime.onInstalled.addListener(async details => {
 
   createContextMenu();
   updateDynamicRules();
+  updateYuqueCookieRule();
 
   if (details.reason === 'install') {
     chromeExtension.tabs.create({
@@ -95,37 +96,72 @@ chromeExtension.storage.local.onChanged.addListener(res => {
 });
 
 function updateDynamicRules() {
-  const rules = [
-    {
-      id: 1,
-      action: {
-        type: chromeExtension.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
-        requestHeaders: [
-          {
-            header: 'Referer',
-            operation: chromeExtension.declarativeNetRequest.HeaderOperation.SET,
-            value: YUQUE_DOMAIN,
-          },
-          {
-            header: 'Origin',
-            operation: chromeExtension.declarativeNetRequest.HeaderOperation.SET,
-            value: YUQUE_DOMAIN,
-          },
-        ],
-      },
-      condition: {
-        domains: [chromeExtension.runtime.id],
-        urlFilter: `${YUQUE_DOMAIN}/api/upload/attach`,
-        resourceTypes: [chromeExtension.declarativeNetRequest.ResourceType.XMLHTTPREQUEST],
+  chromeExtension.declarativeNetRequest.updateDynamicRules({
+    removeRuleIds: [1],
+    addRules: [
+      {
+        id: 1,
+        action: {
+          type: chromeExtension.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
+          requestHeaders: [
+            {
+              header: 'Referer',
+              operation: chromeExtension.declarativeNetRequest.HeaderOperation.SET,
+              value: YUQUE_DOMAIN,
+            },
+            {
+              header: 'Origin',
+              operation: chromeExtension.declarativeNetRequest.HeaderOperation.SET,
+              value: YUQUE_DOMAIN,
+            },
+          ],
+        },
+        condition: {
+          domains: [chromeExtension.runtime.id],
+          urlFilter: `${YUQUE_DOMAIN}/api/upload/attach`,
+          resourceTypes: [chromeExtension.declarativeNetRequest.ResourceType.XMLHTTPREQUEST],
+        },
       },
-    },
-  ];
-
-  chromeExtension.declarativeNetRequest.getDynamicRules(previousRules => {
-    const previousRuleIds = previousRules.map(rule => rule.id);
-    chromeExtension.declarativeNetRequest.updateDynamicRules({
-      removeRuleIds: previousRuleIds,
-      addRules: rules,
-    });
+    ],
   });
 }
+
+const updateYuqueCookieRule = async () => {
+  // 通用 cookie
+  const normalCookie = await chromeExtension.cookies.getAll({ url: YUQUE_DOMAIN });
+  // 分区 cookie
+  const partitionCookie = await chromeExtension.cookies.getAll({ partitionKey: { topLevelSite: 'https://yuque.com' } });
+  const cookieArray = normalCookie.concat(partitionCookie || []).map(item => {
+    return `${item.name}=${item.value}`;
+  });
+  chromeExtension.declarativeNetRequest.updateDynamicRules({
+    removeRuleIds: [2],
+    addRules: [
+      {
+        id: 2,
+        action: {
+          type: chromeExtension.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
+          requestHeaders: [
+            {
+              header: 'Cookie',
+              operation: chromeExtension.declarativeNetRequest.HeaderOperation.SET,
+              value: cookieArray.join(';'),
+            },
+          ],
+        },
+        condition: {
+          domains: [chromeExtension.runtime.id],
+          urlFilter: `${YUQUE_DOMAIN}`,
+          resourceTypes: [chromeExtension.declarativeNetRequest.ResourceType.XMLHTTPREQUEST],
+        },
+      },
+    ],
+  });
+};
+
+chromeExtension.cookies.onChanged.addListener(async res => {
+  if (!res.cookie.domain.includes('yuque.com') || res.removed) {
+    return;
+  }
+  updateYuqueCookieRule();
+});
diff --git a/src/core/bridge/background/user.ts b/src/core/bridge/background/user.ts
@@ -8,36 +8,28 @@ export function createUserBridge(impl: ICallBridgeImpl) {
     user: {
       async login(): Promise<IUser | null> {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateUser,
-            { type: OperateUserEnum.login },
-            res => {
-              resolve(res || null);
-            },
-          );
+          impl(BackgroundEvents.OperateUser, { type: OperateUserEnum.login }, res => {
+            resolve(res || null);
+          });
         });
       },
       async getUserShortCut(): Promise<IShortcutMap> {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateUser,
-            { type: OperateUserEnum.getUserShortCut },
-            res => {
-              try {
-                const map: IShortcutMap = {};
-                for (const item of res) {
-                  if (item.name === '_execute_action') {
-                    map.openSidePanel = item.shortcut;
-                  } else {
-                    map[item.name as keyof IShortcutMap] = item.shortcut;
-                  }
+          impl(BackgroundEvents.OperateUser, { type: OperateUserEnum.getUserShortCut }, res => {
+            try {
+              const map: IShortcutMap = {};
+              for (const item of res) {
+                if (item.name === '_execute_action') {
+                  map.openSidePanel = item.shortcut;
+                } else {
+                  map[item.name as keyof IShortcutMap] = item.shortcut;
                 }
-                resolve(map);
-              } catch (error) {
-                resolve({});
               }
-            },
-          );
+              resolve(map);
+            } catch (error) {
+              resolve({});
+            }
+          });
         });
       },
     },

diff --git a/src/core/webProxy/mine.ts b/src/core/webProxy/mine.ts
@@ -76,7 +76,7 @@ export function createMineProxy() {
             },
           },
           res => {
-            resolve(res.data.data);
+            resolve(res?.data?.data);
           },
         );
       });

diff --git a/src/pages/sidePanel/app.tsx b/src/pages/sidePanel/app.tsx
@@ -60,7 +60,7 @@ function App() {
             STORAGE_KEYS.CURRENT_ACCOUNT,
           );
           const user = await webProxy.mine.getUserInfo();
-          if (user.id !== info.id) {
+          if (user?.id !== info?.id) {
             await storage.remove(STORAGE_KEYS.CURRENT_ACCOUNT);
           }
           Tracert.start({