- 修改样式

-   优化更新检查逻辑

Author: OpportunityLiu

.eslintrc.yml

@@ -7,7 +7,6 @@ plugins:
     - prettier
 extends:
     - eslint:recommended
-    - plugin:@typescript-eslint/eslint-recommended
     - plugin:@typescript-eslint/recommended
     - plugin:@typescript-eslint/recommended-requiring-type-checking
     - prettier
@@ -19,24 +18,26 @@ rules:
     '@typescript-eslint/explicit-function-return-type':
         - 2
         - allowExpressions: true
-    '@typescript-eslint/no-extra-non-null-assertion': [2]
     '@typescript-eslint/no-extraneous-class':
         - 1
         - allowWithDecorator: true
           allowStaticOnly: true
-    '@typescript-eslint/no-floating-promises': [1]
     '@typescript-eslint/no-parameter-properties':
         - 1
-        - allows:
-              - protected readonly
-              - private readonly
-              - public readonly
-              - readonly
+        - allows: [protected readonly, private readonly, public readonly, readonly]
     '@typescript-eslint/no-throw-literal': [2]
     'no-unused-vars': [0]
+    '@typescript-eslint/no-unused-vars':
+        - 1
+        - varsIgnorePattern: ^_
+          argsIgnorePattern: ^_
     '@typescript-eslint/prefer-for-of': [1]
     '@typescript-eslint/prefer-function-type': [1]
     '@typescript-eslint/prefer-nullish-coalescing': [1]
     '@typescript-eslint/prefer-optional-chain': [1]
-    no-void: [1]
+    '@typescript-eslint/ban-types':
+        - 1
+        - types:
+              object: false
+    no-void: [1, { allowAsStatement: true }]
     eqeqeq: [1, smart]

CHANGELOG.md

@@ -1,5 +1,10 @@
 # 更新日志
 
+## 1.3.1
+
+-   修改样式
+-   优化更新检查逻辑
+
 ## 1.3.0
 
 -   启动时自动检查扩展更新

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ehsyringe",
     "displayName": "EhSyringe",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "E 站注射器，将中文翻译注入到 E 站体内。",
     "author": "EhTagTranslation",
     "main": "syringe.js",

src/background/extension-updater.ts

@@ -1,7 +1,15 @@
 import { browser } from 'webextension-polyfill-ts';
 import { logger } from '../tool/log';
+import { chromeMessage } from '../tool/chrome-message';
+
+let checked = false;
+
+async function update(): Promise<void> {
+    if (checked) {
+        logger.log('检查插件更新', '跳过');
+        return;
+    }
 
-async function main(): Promise<void> {
     const info = await browser.management.getSelf();
     const response = await fetch('https://api.github.com/repos/EhTagTranslation/EhSyringe/releases/latest', {
         headers: {
@@ -27,6 +35,11 @@ async function main(): Promise<void> {
             }
         });
     }
+    checked = true;
+}
+
+function init(): void {
+    chromeMessage.listener('ext-update', () => update());
 }
 
-export const result = main();
+export const result = init();

src/background/updater.ts

@@ -31,13 +31,21 @@ class Updater {
 
     private loadLock = false;
 
+    private checked = false;
+
     constructor() {
         chromeMessage.listener('auto-update', async (force) => {
+            if (this.checked && !force) {
+                logger.log('自动更新', '跳过');
+                return false;
+            }
             const version = await this.checkVersion(true);
             if (version?.new && (version.new !== version.old || force)) {
                 await this.update();
+                logger.log('自动更新', '有新版本并更新');
                 return true;
             }
+            logger.log('自动更新', '没有新版本');
             return false;
         });
     }
@@ -112,6 +120,7 @@ class Updater {
             githubRelease: info,
             timestamp: new Date().getTime(),
         });
+        this.checked = true;
         return this.lastCheckData.value;
     }
 
@@ -148,7 +157,7 @@ class Updater {
                 const data = await downloadFile(url, undefined, (event) => {
                     if (event.lengthComputable) {
                         const percent = Math.floor((event.loaded / event.total) * 100);
-                        this.pushDownloadStatus({ info: percent + '%', progress: percent });
+                        this.pushDownloadStatus({ info: `${percent}%`, progress: percent });
                         badgeLoading.set(percent.toFixed(0), '#4A90E2', 1);
                     }
                 });

src/plugin/auto-update/auto-update.ts

@@ -1,26 +1,10 @@
-import { browser } from 'webextension-polyfill-ts';
-
 import { chromeMessage } from '../../tool/chrome-message';
 import { config } from '../../tool/config-manage';
-import { logger } from '../../tool/log';
-import { dateDiff } from '../../tool/tool';
-
-// 1 day
-const autoCheckInterval = 1000 * 60 * 60 * 24;
 
 export const autoUpdateInit = async (): Promise<void> => {
+    void chromeMessage.send('ext-update', undefined);
+
     const conf = await config.get();
     if (!conf.autoUpdate) return;
-    logger.log('自动更新');
-
-    const { lastCheckTime } = await browser.storage.local.get('lastCheckTime');
-
-    const time = new Date().getTime();
-    const needCheck = time - autoCheckInterval > (lastCheckTime || 0);
-    logger.log('上次自动更新检查', dateDiff(lastCheckTime), new Date(lastCheckTime), needCheck ? '开始检查' : '跳过');
-    if (needCheck) {
-        await browser.storage.local.set({ lastCheckTime: time });
-        const updated = await chromeMessage.send('auto-update', false);
-        logger.log('自动更新结束', updated ? '有新版本并更新' : '没有新版本');
-    }
+    void chromeMessage.send('auto-update', false);
 };

src/plugin/introduce/introduce.less

@@ -82,6 +82,13 @@ div#gd5 {
         &::-webkit-scrollbar {
             width: 2px;
         }
+        abbr[title] {
+            padding: 0 1px;
+            &::after {
+                content: ' (' attr(title) ')';
+                font-size: 90%;
+            }
+        }
     }
     .ehs-href {
         flex: none;

src/tool/chrome-message.ts

@@ -6,6 +6,7 @@ interface MessageMap {
     'get-taglist': [string | null, TagList | TagItem | undefined];
     'get-tagreplace': [string | null, TagReplace | string];
     'auto-update': [boolean, boolean];
+    'ext-update': [void, void];
     'suggest-tag': [
         {
             term: string;

src/tool/config-manage.ts

@@ -68,12 +68,10 @@ class ConfigManage {
         if (!data) {
             return { ...this.defaultValue };
         }
-        const defaultValue = this.defaultValue as any;
-        const input = { ...data } as any;
-        for (const key in defaultValue) {
-            if (typeof input[key] === 'undefined') {
-                input[key] = defaultValue[key];
-            }
+        const input = { ...data } as ConfigData;
+        for (const k in this.defaultValue) {
+            const key = k as keyof ConfigData;
+            ((input as unknown) as Record<string, unknown>)[key] = input[key] ?? this.defaultValue[key];
         }
         return input;
     }

src/tool/storage.ts

@@ -1,17 +1,17 @@
-const cacheRoot: { [key: string]: any } = {};
+const cacheRoot: Record<string, unknown> = {};
 
 function makeStorageKey(key: string): string {
     return `EhSyringe.${key}`;
 }
 
 export function load<T>(key: string): T | undefined {
     if (cacheRoot[key]) {
-        return cacheRoot[key];
+        return cacheRoot[key] as T;
     }
     const storageValue = window.localStorage.getItem(makeStorageKey(key));
     if (typeof storageValue === 'string') {
         try {
-            return (cacheRoot[key] = JSON.parse(storageValue));
+            return (cacheRoot[key] = JSON.parse(storageValue) as T);
         } catch {
             window.localStorage.removeItem(makeStorageKey(key));
         }

tsconfig.json

@@ -1,17 +1,16 @@
 {
     "include": ["src/*", "src/**/*"],
     "exclude": ["node_modules", "**/*.spec.ts"],
-    "typeRoots": ["node_modules/@types", "types"],
     "compilerOptions": {
-        "outDir": "./dist/",
-        "sourceMap": true,
-        "noImplicitAny": true,
-        "esModuleInterop": true,
         "module": "commonjs",
         "target": "es6",
         "jsx": "react",
+        "outDir": "./dist/",
+        "sourceMap": true,
+        "esModuleInterop": true,
         "allowJs": true,
         "strict": true,
+        "noImplicitReturns": true,
         "experimentalDecorators": true,
         "plugins": [
             {