fix: sw issues

Author: sylingd

src/pages/background/api-handler.ts

@@ -3,7 +3,7 @@ import logger from '@/share/core/logger';
 import { APIs, TABLE_NAMES_ARR } from '@/share/core/constant';
 import { prefs } from '@/share/core/prefs';
 import emitter from '@/share/core/emitter';
-import rules from './core/rules';
+import * as rules from './core/rules';
 import { openURL } from './utils';
 import { getDatabase } from './core/db';
 
@@ -22,11 +22,11 @@ function execute(request: any) {
     case APIs.OPEN_URL:
       return openURL(request);
     case APIs.GET_RULES:
-      return Promise.resolve(rules.get(request.type, request.options));
+      return rules.waitLoad().then(() => rules.get(request.type, request.options));
     case APIs.SAVE_RULE:
-      return rules.save(request.rule);
+      return rules.waitLoad().then(() => rules.save(request.rule));
     case APIs.DELETE_RULE:
-      return rules.remove(request.type, request.id);
+      return rules.waitLoad().then(() => rules.remove(request.type, request.id));
     case APIs.SET_PREFS:
       return prefs.set(request.key, request.value);
     case APIs.UPDATE_CACHE:

src/pages/background/core/rules.ts

@@ -9,6 +9,8 @@ import { prefs } from '@/share/core/prefs';
 import emitter from '@/share/core/emitter';
 import { getDatabase } from './db';
 
+let isInit = false;
+
 const cache: { [key: string]: null | InitdRule[] } = {};
 TABLE_NAMES_ARR.forEach((t) => {
   cache[t] = null;
@@ -216,26 +218,33 @@ function init() {
     Promise.all(queue).then(() => {
       if (TABLE_NAMES_ARR.some((tableName) => cache[tableName] === null)) {
         init();
+      } else {
+        isInit = true;
+        emitter.emit(emitter.INNER_RULE_LOADED);
       }
     });
   });
 }
 
-if (MANIFEST_VER === 'v3' && typeof window === 'undefined') {
-  // this is service worker
-  addEventListener('activate', () => {
-    init();
+function waitLoad() {
+  return new Promise((resolve) => {
+    if (isInit) {
+      resolve(true);
+    } else {
+      emitter.once(emitter.INNER_RULE_LOADED, resolve);
+    }
   });
-} else {
-  init();
 }
 
-export default {
+init();
+
+export {
   get,
   getAll,
   filter,
   save,
   remove,
   updateCache,
   convertToBasicRule,
+  waitLoad,
 };

src/pages/background/index.ts

@@ -30,15 +30,7 @@ if (ENABLE_DNR) {
   });
 }
 
-if (MANIFEST_VER === 'v3' && typeof window === 'undefined') {
-  // this is service worker
-  addEventListener('activate', () => {
-    if (IS_DEV) {
-      console.log('service worker activated');
-    }
-    init();
-  });
-} else {
+init();
+if (MANIFEST_VER !== 'v3' && typeof window !== 'undefined') {
   window.IS_BACKGROUND = true;
-  init();
 }

src/pages/background/request-handler/dnr-handler.ts

@@ -5,7 +5,7 @@ import { prefs } from '@/share/core/prefs';
 import { detectRunner } from '@/share/core/rule-utils';
 import type { Rule, RULE_ACTION_OBJ } from '@/share/core/types';
 import { getVirtualKey } from '@/share/core/utils';
-import rules from '../core/rules';
+import { getAll } from '../core/rules';
 import type { DeclarativeNetRequest } from 'webextension-polyfill/namespaces/declarativeNetRequest';
 
 type DNRRule = DeclarativeNetRequest.Rule;
@@ -134,7 +134,7 @@ class DNRRequestHandler {
   }
 
   private async initRules() {
-    const v = Object.values(rules.getAll());
+    const v = Object.values(getAll());
 
     if (v.some((x) => x === null)) {
       // rule not ready

src/pages/background/request-handler/web-request-handler.ts

@@ -6,7 +6,7 @@ import logger from '@/share/core/logger';
 import type { Rule, RULE_ACTION_OBJ } from '@/share/core/types';
 import { TABLE_NAMES } from '@/share/core/constant';
 import { prefs } from '@/share/core/prefs';
-import rules from '../core/rules';
+import { get as getRules } from '../core/rules';
 
 // 最大修改8MB的Body
 const MAX_BODY_SIZE = 8 * 1024 * 1024;
@@ -141,7 +141,7 @@ class WebRequestHandler {
     }
     logger.debug(`handle before request ${e.url}`, e);
     // 可用：重定向，阻止加载
-    const rule = rules.get(TABLE_NAMES.request, { url: e.url, enable: true });
+    const rule = getRules(TABLE_NAMES.request, { url: e.url, enable: true });
     // Browser is starting up, pass all requests
     if (rule === null) {
       return;
@@ -201,7 +201,7 @@ class WebRequestHandler {
       return;
     }
     logger.debug(`handle before send ${e.url}`, e.requestHeaders);
-    const rule = rules.get(TABLE_NAMES.sendHeader, { url: e.url, enable: true });
+    const rule = getRules(TABLE_NAMES.sendHeader, { url: e.url, enable: true });
     // Browser is starting up, pass all requests
     if (rule === null) {
       return;
@@ -245,7 +245,7 @@ class WebRequestHandler {
       return;
     }
     logger.debug(`handle received ${e.url}`, e.responseHeaders);
-    const rule = rules.get(TABLE_NAMES.receiveHeader, { url: e.url, enable: true });
+    const rule = getRules(TABLE_NAMES.receiveHeader, { url: e.url, enable: true });
     // Browser is starting up, pass all requests
     if (rule) {
       this.modifyHeaders(e, REQUEST_TYPE.RESPONSE, rule, detail);
@@ -429,7 +429,7 @@ class WebRequestHandler {
       return;
     }
 
-    let rule = rules.get(TABLE_NAMES.receiveBody, { url: e.url, enable: true });
+    let rule = getRules(TABLE_NAMES.receiveBody, { url: e.url, enable: true });
     if (rule === null) {
       return;
     }

src/pages/options/sections/rules/edit/index.tsx

@@ -127,7 +127,7 @@ export default class Edit extends React.Component<EditProps, EditState> {
       // 初始化
       if (reInit || !this.initedRule) {
         try {
-          this.initedRule = initRule(this.state.rule);
+          this.initedRule = initRule(this.state.rule, true);
         } catch (e) {
           // 出错
           this.setState({
@@ -311,7 +311,7 @@ export default class Edit extends React.Component<EditProps, EditState> {
           {this.state.rule.matchType !== 'all' && (
             <Form.Input label={t('matchRule')} field="pattern" />
           )}
-          <Form.Input label={t('excludeRule')} field="exclude" />
+          <Form.Input label={t('excludeRule')} field="exclude" disabled={!ENABLE_WEB_REQUEST} />
           {/* Response body encoding */}
           {this.state.rule.ruleType === 'modifyReceiveBody' && (
             <Form.Select filter field="encoding" label={t('encoding')} optionList={ENCODING_LIST.map((x) => ({ label: x, value: x }))} />
@@ -322,7 +322,7 @@ export default class Edit extends React.Component<EditProps, EditState> {
             field="isFunction"
             options={[
               { label: t('exec_normal'), value: false },
-              { label: t('exec_function'), value: true },
+              { label: t('exec_function'), value: true, disabled: !ENABLE_EVAL },
             ]}
           />
           {/* Redirect */}

src/share/core/emitter.ts

@@ -8,6 +8,7 @@ class Emitter extends EventEmitter {
 
   EVENT_PREFS_UPDATE = 'b3';
   EVENT_PREFS_READY = 'b4';
+  INNER_RULE_LOADED = 'b5';
 
   INNER_RULE_UPDATE = 'c1';
   INNER_RULE_REMOVE = 'c2';

src/share/core/rule-utils.ts

@@ -13,11 +13,11 @@ export function detectRunner(rule: Rule): 'web_request' | 'dnr' {
   return 'dnr';
 }
 
-export function initRule(rule: Rule): InitdRule {
+export function initRule(rule: Rule, forceUseWebRequest = false): InitdRule {
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const initd: InitdRule = { ...rule } as InitdRule;
   initd._runner = detectRunner(rule);
-  if (initd._runner === 'web_request') {
+  if (initd._runner === 'web_request' || forceUseWebRequest) {
     if (initd.isFunction && ENABLE_EVAL) {
       // eslint-disable-next-line no-new-func
       initd._func = new Function('val', 'detail', initd.code) as any;