1.2.10

Author: OpportunityLiu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 1.2.10
+
+-   修复标签翻译异常 (#144)
+
 ## 1.2.9
 
 -   标签自动完成支持收藏搜索和添加标签

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ehsyringe",
     "displayName": "EhSyringe",
-    "version": "1.2.9",
+    "version": "1.2.10",
     "description": "E 站注射器，将中文翻译注入到 E 站体内。",
     "author": "EhTagTranslation",
     "main": "syringe.js",
@@ -34,7 +34,7 @@
         "copy-webpack-plugin": "^5.1.1",
         "css-loader": "^3.5.3",
         "cssnano": "^4.1.10",
-        "eslint": "^6.8.0",
+        "eslint": "^7.0.0",
         "eslint-config-prettier": "^6.11.0",
         "eslint-plugin-prettier": "^3.1.3",
         "file-loader": "^6.0.0",

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

@@ -8,7 +8,7 @@ import { dateDiff } from '../../tool/tool';
 // 1 day
 const autoCheckInterval = 1000 * 60 * 60 * 24;
 
-export const autoUpdateInit = async () => {
+export const autoUpdateInit = async (): Promise<void> => {
     const conf = await config.get();
     if (!conf.autoUpdate) return;
     logger.log('自动更新');

src/plugin/syringe/syringe.ts

@@ -7,7 +7,7 @@ import { logger } from '../../tool/log';
 import './syringe.less';
 
 (function (): void {
-    const tagClear = () => {
+    const tagClear = (): void => {
         window.localStorage.removeItem('tag-list');
         window.localStorage.removeItem('tag-replace-data');
         window.localStorage.removeItem('tag-update-time');
@@ -35,7 +35,7 @@ function isText(node: Node): node is Text {
 }
 
 class Syringe {
-    tagReplace: TagReplace = {};
+    tagReplace?: TagReplace;
     pendingTags: Node[] = [];
     documentEnd = false;
     readonly skipNode: Set<string> = new Set(['TITLE', 'LINK', 'META', 'HEAD', 'SCRIPT', 'BR', 'HR', 'STYLE', 'MARK']);
@@ -55,7 +55,8 @@ class Syringe {
         window.document.addEventListener('DOMContentLoaded', (e) => {
             this.documentEnd = true;
         });
-        this.setBodyClass(document.querySelector('body')!);
+        const body = document.querySelector('body');
+        if (body) this.setBodyClass(body);
         this.observer = new MutationObserver((mutations) =>
             mutations.forEach((mutation) =>
                 mutation.addedNodes.forEach((node1) => {
@@ -84,14 +85,15 @@ class Syringe {
                 .then((data) => {
                     this.tagReplace = data as TagReplace;
                     timer.end();
-                    this.pendingTags.forEach((t) => this.translateTagImpl(t));
+                    const pendingTags = this.pendingTags;
                     this.pendingTags = [];
+                    pendingTags.forEach((t) => this.translateTagImpl(t));
                 })
                 .catch(logger.error);
         }
     }
 
-    setBodyClass(node: HTMLBodyElement) {
+    setBodyClass(node: HTMLBodyElement): void {
         if (!node) return;
         node.classList.add(!location.host.includes('exhentai') ? 'eh' : 'ex');
         if (!this.conf.showIcon) {

src/plugin/tag-tip/tag-tip.ts

@@ -28,20 +28,22 @@ class TagTip {
                 map(() => this.inputElement.value),
                 // distinctUntilChanged()
             )
-            .subscribe(this.search);
+            .subscribe((s) => {
+                this.search(s).catch(logger.error);
+            });
 
-        fromEvent<KeyboardEvent>(this.inputElement, 'keydown').subscribe(this.keydown);
+        fromEvent<KeyboardEvent>(this.inputElement, 'keydown').subscribe((e) => this.keydown(e));
 
         fromEvent<MouseEvent>(this.autoCompleteList, 'click').subscribe((e) => {
             this.inputElement.focus();
             e.preventDefault();
             e.stopPropagation();
         });
 
-        fromEvent(this.inputElement, 'focus').subscribe(this.setListPosition);
+        fromEvent(this.inputElement, 'focus').subscribe(() => this.setListPosition());
 
-        fromEvent(window, 'resize').subscribe(this.setListPosition);
-        fromEvent(window, 'scroll').subscribe(this.setListPosition);
+        fromEvent(window, 'resize').subscribe(() => this.setListPosition());
+        fromEvent(window, 'scroll').subscribe(() => this.setListPosition());
 
         fromEvent(document, 'click').subscribe(() => {
             this.autoCompleteList.innerHTML = '';
@@ -50,7 +52,7 @@ class TagTip {
         document.body.insertBefore(this.autoCompleteList, null);
     }
 
-    readonly search = async (value: string) => {
+    async search(value: string): Promise<void> {
         // todo: 增加自定义分隔符
         value = this.inputElement.value = value.replace(/  +/gm, ' ');
         const values = value.match(/(\S+:".+?"|".+?"|\S+:\S+|\S+)/gim) ?? [];
@@ -81,9 +83,9 @@ class TagTip {
             this.autoCompleteList.insertBefore(this.tagElementItem(tag), null);
         });
         this.selectedIndex = -1;
-    };
+    }
 
-    readonly keydown = (e: KeyboardEvent) => {
+    keydown(e: KeyboardEvent): void {
         if (e.code === 'ArrowUp' || e.code === 'ArrowDown') {
             if (e.code === 'ArrowUp') {
                 this.selectedIndex--;
@@ -114,16 +116,16 @@ class TagTip {
                 e.stopPropagation();
             }
         }
-    };
+    }
 
-    readonly setListPosition = () => {
+    setListPosition(): void {
         const rect = this.inputElement.getBoundingClientRect();
         this.autoCompleteList.style.left = `${rect.left}px`;
         this.autoCompleteList.style.top = `${rect.bottom}px`;
         this.autoCompleteList.style.minWidth = `${rect.width}px`;
-    };
+    }
 
-    readonly tagElementItem = (suggestion: Suggestion): HTMLDivElement => {
+    tagElementItem(suggestion: Suggestion): HTMLDivElement {
         const tag = suggestion.tag;
         const item = document.createElement('div');
         const cnName = document.createElement('span');
@@ -150,15 +152,15 @@ class TagTip {
             this.autoCompleteList.innerHTML = '';
         };
         return item;
-    };
+    }
 }
 
-export const tagTipInit = async () => {
+export async function tagTipInit(): Promise<TagTip | undefined> {
     const conf = await config.get();
     if (!conf.tagTip) return;
     logger.log('标签提示');
 
     const searchInput: HTMLInputElement | null = document.querySelector('#f_search, #newtagfield, [name=f_search]');
     if (!searchInput) return;
     return new TagTip(searchInput);
-};
+}

src/popup/popup.ts

@@ -1,4 +1,4 @@
-import { html, nothing, render, svg } from 'lit-html';
+import { html, nothing, render, svg, SVGTemplateResult, TemplateResult } from 'lit-html';
 import { browser } from 'webextension-polyfill-ts';
 
 import { background } from '../background';
@@ -30,9 +30,11 @@ interface PopupState {
 
 class Popup {
     constructor() {
-        window.addEventListener('click', (ev) => this.openLink(ev));
+        window.addEventListener('click', (ev) => {
+            this.openLink(ev).catch(logger.error);
+        });
         this._update();
-        this.getVersion().catch(logger.error);
+        this.getVersion();
         this.checkVersion().catch(logger.error);
         this.loadConfig().catch(logger.error);
         browser.management
@@ -41,8 +43,10 @@ class Popup {
                 this.state.extensionVersion = `${data.version}`;
             })
             .catch(logger.error);
-        const downloadStatusSub = background.updater.downloadStatus.subscribe((data) => this.downloadStatus(data));
-        window.addEventListener('unload', (_) => {
+        const downloadStatusSub = background.updater.downloadStatus.subscribe((data) => {
+            this.downloadStatus(data).catch(logger.error);
+        });
+        window.addEventListener('unload', () => {
             downloadStatusSub.unsubscribe();
         });
     }
@@ -86,12 +90,12 @@ class Popup {
         [0, 0],
     ];
 
-    async loadConfig() {
+    async loadConfig(): Promise<void> {
         this.configOriginal = await config.get();
         this.state.configValue = { ...this.configOriginal };
     }
 
-    testAnimation() {
+    testAnimation(): void {
         const a = this.testAnimationList[this.testAnimationIndex];
         this.testAnimationIndex++;
         if (!this.testAnimationList[this.testAnimationIndex]) {
@@ -101,7 +105,7 @@ class Popup {
         this.state.progress = a[1];
     }
 
-    async getVersion() {
+    getVersion(): void {
         const sha = background.tagDatabase.sha.value;
         const releaseLink = background.tagDatabase.releaseLink.value;
         const updateTime = background.tagDatabase.updateTime.value;
@@ -111,7 +115,7 @@ class Popup {
         this.state.updateTimeFull = updateTime?.toLocaleString() ?? 'N/A';
     }
 
-    async checkVersion() {
+    async checkVersion(): Promise<void> {
         this.state.versionInfo = '检查中...';
         const data = await background.updater.checkVersion();
         logger.log('Release Data', data);
@@ -150,7 +154,7 @@ class Popup {
             this.state.progress = 100;
             this.state.animationState = 2;
             this.state.updateButtonDisabled = false;
-            await this.getVersion();
+            this.getVersion();
             await this.checkVersion();
 
             await sleep(500);
@@ -161,12 +165,12 @@ class Popup {
         }
     }
 
-    private updateButtonClick = async () => {
+    private async updateButtonClick(): Promise<void> {
         this.state.updateButtonDisabled = true;
         await background.updater.update();
-    };
+    }
 
-    _logoTemplate(progress = 0) {
+    _logoTemplate(progress = 0): SVGTemplateResult {
         const PushRodStyle = `transform: translate(${(progress / 400) * 70}px, 0)`;
         const EnemaStyle = `transform: scaleX(${progress / 100})`;
 
@@ -233,7 +237,7 @@ class Popup {
   </svg>`;
     }
 
-    changeConfigValue(key: string, value: any) {
+    changeConfigValue(key: string, value: any): void {
         if (key === 'introduceImageLevel') {
             this.state.configValue = {
                 ...this.state.configValue,
@@ -251,20 +255,20 @@ class Popup {
         return !keys.every((key) => (this.configOriginal as any)[key] === (this.state.configValue as any)[key]);
     }
 
-    async saveConfig() {
+    async saveConfig(): Promise<void> {
         await config.set(this.state.configValue);
         await this.loadConfig();
         await sleep(200);
+        window.close();
         const tabs = await browser.tabs.query({ active: true });
         if (tabs?.length) {
             const ehtabs = tabs.filter((v) => v.url && /(\/\/|\.)(e-|ex)hentai\.org/i.test(v.url));
             logger.log('Reload tabs', ehtabs);
-            ehtabs.forEach((v) => browser.tabs.reload(v.id).catch(logger.error));
+            await Promise.all(ehtabs.map((v) => browser.tabs.reload(v.id)));
         }
-        window.close();
     }
 
-    _settingPanelTemplate() {
+    _settingPanelTemplate(): TemplateResult {
         const state = this.state;
 
         const checkboxList: Array<{ key: string; name: string }> = [
@@ -355,7 +359,7 @@ class Popup {
         `;
     }
 
-    _template() {
+    _template(): TemplateResult {
         const state = this.state;
         return html` <div class="popup-root ${state.showSettingPanel ? 'hide' : ''}">
                 <div class="head-buttons">
@@ -428,7 +432,7 @@ class Popup {
             ${state.configValue ? this._settingPanelTemplate() : nothing}`;
     }
 
-    _update() {
+    _update(): void {
         render(this._template(), document.body);
     }
 }

src/tool/config-manage.ts

@@ -16,7 +16,7 @@ export interface ConfigData {
 class ConfigManage {
     constructor() {
         /* 有可能会有性能问题, 开的页面多了不知道会是什么效果*/
-        chrome.storage.onChanged.addListener(async (changes) => {
+        chrome.storage.onChanged.addListener((changes) => {
             logger.log('插件存储改变', changes);
             if ('config' in changes && changes.config.newValue) {
                 save('config', changes.config.newValue);
@@ -71,7 +71,6 @@ class ConfigManage {
         const defaultValue = this.defaultValue as any;
         const input = { ...data } as any;
         for (const key in defaultValue) {
-            if (!defaultValue.hasOwnProperty(key)) continue;
             if (typeof input[key] === 'undefined') {
                 input[key] = defaultValue[key];
             }