feat: support iCloud in China

src/iCloudClient.ts

@@ -1,16 +1,25 @@
+import { getBrowserStorageValue, COUNTRY_KEYS } from './storage';
+
 export class UnsuccessfulRequestError extends Error {}
 
 type ServiceName = 'premiummailsettings';
 
+type Country = 'default' | 'CN'
+
 class ICloudClient {
   public webservices?: Record<ServiceName, { url: string; status: string }>;
+  private country: Country
 
   constructor(webservices?: ICloudClient['webservices']) {
     this.webservices = webservices;
+    this.country = 'default'
   }
 
   static get setupUrl() {
-    return 'https://setup.icloud.com/setup/ws/1';
+    return {
+      default: 'https://setup.icloud.com/setup/ws/1',
+      CN: 'https://setup.icloud.com.cn/setup/ws/1'
+    }
   }
 
   public async request(
@@ -47,6 +56,7 @@ class ICloudClient {
 
   public async isAuthenticated(): Promise<boolean> {
     try {
+      this.country = await getBrowserStorageValue<Country>(COUNTRY_KEYS) || 'default'
       await this.validateToken();
       return true;
     } catch {
@@ -57,7 +67,7 @@ class ICloudClient {
   public async validateToken(): Promise<void> {
     const { webservices } = (await this.request(
       'POST',
-      `${ICloudClient.setupUrl}/validate`
+      `${ICloudClient.setupUrl[this.country]}/validate`
     )) as {
       webservices: ICloudClient['webservices'];
     };
@@ -71,7 +81,7 @@ class ICloudClient {
     options: { trust: boolean } = { trust: false }
   ): Promise<void> {
     const { trust } = options;
-    await this.request('POST', `${ICloudClient.setupUrl}/logout`, {
+    await this.request('POST', `${ICloudClient.setupUrl[this.country]}/logout`, {
       data: {
         trustBrowsers: trust,
         allBrowsers: trust,

src/manifest.json

@@ -32,7 +32,10 @@
     "webRequest",
     "notifications"
   ],
-  "host_permissions": ["https://*.icloud.com/*"],
+  "host_permissions": [
+    "https://*.icloud.com/*",
+    "https://*.icloud.com.cn/*"
+  ],
   "icons": {
     "16": "icon-16.png",
     "32": "icon-32.png",

src/pages/Background/index.ts

@@ -3,6 +3,7 @@ import {
   getBrowserStorageValue,
   POPUP_STATE_STORAGE_KEYS,
   OPTIONS_STORAGE_KEYS,
+  COUNTRY_KEYS,
   setBrowserStorageValue,
 } from '../../storage';
 import ICloudClient, { PremiumMailSettings } from '../../iCloudClient';
@@ -259,20 +260,27 @@ browser.contextMenus.onClicked.addListener(async (info, tab) => {
 // as enabled.
 browser.webRequest.onResponseStarted.addListener(
   async (details: browser.WebRequest.OnResponseStartedDetailsType) => {
-    const { statusCode } = details;
+    const { statusCode, url } = details;
     if (statusCode < 200 && statusCode > 299) {
       console.debug('Request failed', details);
       return;
     }
 
+    const country = Object.entries(ICloudClient.setupUrl).find((entries) => url.startsWith(`${entries[1]}/accountLogin`))?.[0];
+    await setBrowserStorageValue(COUNTRY_KEYS, country);
+
     const client = new ICloudClient();
+
     const isAuthenticated = await client.isAuthenticated();
     if (isAuthenticated) {
       performAuthSideEffects();
     }
   },
   {
-    urls: [`${ICloudClient.setupUrl}/accountLogin*`],
+    urls: [
+      `${ICloudClient.setupUrl.default}/accountLogin*`,
+      `${ICloudClient.setupUrl.CN}/accountLogin*`
+    ],
   },
   []
 );
@@ -290,7 +298,10 @@ browser.webRequest.onResponseStarted.addListener(
     performDeauthSideEffects();
   },
   {
-    urls: [`${ICloudClient.setupUrl}/logout*`],
+    urls: [
+      `${ICloudClient.setupUrl.default}/logout*`,
+      `${ICloudClient.setupUrl.CN}/logout*`,
+    ],
   },
   []
 );

src/rules.json

@@ -22,5 +22,29 @@
       "resourceTypes": ["xmlhttprequest"],
       "excludedInitiatorDomains": ["apple.com", "icloud.com"]
     }
+  },
+  {
+    "id": 2,
+    "priority": 1,
+    "action": {
+      "type": "modifyHeaders",
+      "requestHeaders": [
+        {
+          "header": "Origin",
+          "operation": "set",
+          "value": "https://www.icloud.com.cn"
+        },
+        {
+          "header": "Referer",
+          "operation": "set",
+          "value": "https://www.icloud.com.cn/"
+        }
+      ]
+    },
+    "condition": {
+      "urlFilter": "|https://*.icloud.com.cn/*",
+      "resourceTypes": ["xmlhttprequest"],
+      "excludedInitiatorDomains": ["apple.com", "icloud.com.cn"]
+    }
   }
 ]

src/storage.ts

@@ -2,6 +2,7 @@ import browser from 'webextension-polyfill';
 
 export const POPUP_STATE_STORAGE_KEYS = ['iCloudHmePopupState'];
 export const OPTIONS_STORAGE_KEYS = ['iCloudHmeOptions'];
+export const COUNTRY_KEYS = ['country'];
 
 export async function getBrowserStorageValue<T>(
   keys: string[]

src/webRequestUtils.ts

@@ -3,7 +3,7 @@ import ICloudClient from './iCloudClient';
 
 export const setupBlockingWebRequestListeners = () => {
   browser.webRequest.onBeforeSendHeaders.addListener(
-    ({ requestHeaders, documentUrl, originUrl, initiator }) => {
+    ({ requestHeaders, documentUrl, originUrl, initiator, url, }) => {
       const initiatedByTheExtension = [documentUrl, originUrl, initiator].some(
         (url) =>
           url?.includes(browser.runtime.id) ||
@@ -20,19 +20,26 @@ export const setupBlockingWebRequestListeners = () => {
           (header) => !['referer', 'origin'].includes(header.name.toLowerCase())
         ) || [];
 
+      const suffix = url.match(/icloud.com(\.\w+)/)?.[1] || '';
+
       modifiedHeaders.push({
         name: 'Referer',
-        value: 'https://www.icloud.com/',
+        value: `https://www.icloud.com${suffix}/`,
       });
       modifiedHeaders.push({
         name: 'Origin',
-        value: 'https://www.icloud.com',
+        value: `https://www.icloud.com${suffix}`,
       });
 
       return { requestHeaders: modifiedHeaders };
     },
     {
-      urls: [`${ICloudClient.setupUrl}/*`, 'https://*.icloud.com/v*/hme/*'],
+      urls: [
+        `${ICloudClient.setupUrl.default}/*`,
+        `${ICloudClient.setupUrl.CN}/*`,
+         'https://*.icloud.com/v*/hme/*',
+         'https://*.icloud.com.cn/v*/hme/*',
+      ],
     },
     ['requestHeaders', 'blocking']
   );