Merge pull request #81 from tjmtmmnk/parameter

set parameter by streamer

Author: tjmtmmnk

.vscode/settings.json

@@ -1,12 +1,14 @@
 {
-    "typescript.tsdk": "./node_modules/typescript/lib",
-    "files.eol": "\n",
-    "json.schemas": [
-        {
-            "fileMatch": [
-                "/manifest.json"
-            ],
-            "url": "http://json.schemastore.org/chrome-manifest"
-        }
-    ]
-}
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "files.eol": "\n",
+  "json.schemas": [
+    {
+      "fileMatch": ["/manifest.json"],
+      "url": "http://json.schemastore.org/chrome-manifest"
+    }
+  ],
+  "editor.formatOnSave": true,
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+}

package-lock.json

@@ -21,6 +21,7 @@
     "@types/chrome": "0.0.154",
     "@types/jest": "27.0.1",
     "@types/kuromoji": "0.1.1",
+    "@types/md5": "2.3.1",
     "@types/react": "17.0.19",
     "@types/react-dom": "17.0.9",
     "@types/react-router-dom": "5.1.8",
@@ -31,6 +32,7 @@
     "glob": "7.1.7",
     "jest": "27.1.0",
     "kuromojin": "3.0.0",
+    "md5": "2.3.0",
     "path-browserify": "1.0.1",
     "prettier": "2.3.2",
     "react": "17.0.2",

package.json

@@ -28,7 +28,12 @@
     }
   ],
 
-  "permissions": ["activeTab", "storage"],
+  "background": {
+    "scripts": ["js/background.js"],
+    "persistent": false
+  },
+
+  "permissions": ["activeTab", "storage", "tabs"],
 
   "web_accessible_resources": ["kuromoji/dict/*", "js/worker.js"],
 

public/manifest.json

@@ -11,7 +11,7 @@ import {
   hideRepeatThrow,
   hideRepeatWords,
 } from "../moderate";
-import { IParameter } from "../config";
+import { IParameterV2 } from "../config";
 import { KuromojiToken } from "kuromojin";
 import { IKuromojiWorker } from "../kuromoji";
 
@@ -25,19 +25,19 @@ describe("moderate", () => {
     },
   };
 
-  const params: IParameter = {
-    repeat_throw_threshold: 2,
-    repeat_word_threshold: 2,
-    post_flood_threshold: 2,
-    length_threshold: 3,
-    look_chats: 10,
-    execution_interval: 1000,
-    ng_words: ["なう"],
-    is_show_reason: false,
-    is_activate_modekun: true,
-    consider_author_length: false,
-    consider_author_ngword: false,
-    is_hide_completely: false,
+  const params: IParameterV2 = {
+    repeatPostThreshold: 2,
+    repeatWordThreshold: 2,
+    postFrequencyThreshold: 2,
+    lengthThreshold: 3,
+    lookChats: 10,
+    executionInterval: 1000,
+    ngWords: ["なう"],
+    isShowReason: false,
+    isActivateModekun: true,
+    considerAuthorLength: false,
+    considerAuthorNgWord: false,
+    isHideCompletely: false,
   };
   describe("hideRepeatWords", () => {
     const chats: IChat[] = [
@@ -156,9 +156,9 @@ describe("moderate", () => {
           element: document.createElement("div"),
         },
       ];
-      const param: IParameter = {
+      const param: IParameterV2 = {
         ...params,
-        consider_author_ngword: true,
+        considerAuthorNgWord: true,
       };
       hideNgWords(param, chats);
       expect(chats[0].element.dataset.isHiddenByModekun).toBeFalsy();
@@ -260,10 +260,10 @@ describe("moderate", () => {
           element: document.createElement("div"),
         },
       ];
-      const param: IParameter = {
+      const param: IParameterV2 = {
         ...params,
-        length_threshold: 5,
-        consider_author_length: true,
+        lengthThreshold: 5,
+        considerAuthorLength: true,
       };
       hideByLength(param, chats);
       expect(chats[0].element.dataset.isHiddenByModekun).toBeTruthy();
@@ -291,10 +291,10 @@ describe("moderate", () => {
         element: document.createElement("div"),
       },
     ];
-    const param: IParameter = {
+    const param: IParameterV2 = {
       ...params,
-      repeat_throw_threshold: 2,
-      post_flood_threshold: 3,
+      repeatPostThreshold: 2,
+      postFrequencyThreshold: 3,
     };
     test("can hide by both filter", () => {
       hideRepeatThrow(param, chats);
@@ -317,9 +317,9 @@ describe("moderate", () => {
       expect(chat.element.style.display).not.toBe("none");
     });
     test("can hide with display none", () => {
-      const param: IParameter = {
+      const param: IParameterV2 = {
         ...params,
-        is_hide_completely: true,
+        isHideCompletely: true,
       };
       const chat: IChat = {
         key: "test1aaa",
@@ -332,9 +332,9 @@ describe("moderate", () => {
       expect(chat.element.style.display).toBe("none");
     });
     test("can hide associated elements with display none", () => {
-      const param: IParameter = {
+      const param: IParameterV2 = {
         ...params,
-        is_hide_completely: true,
+        isHideCompletely: true,
       };
       const chat: IChat = {
         key: "test1aaa",

src/__tests__/moderate.ts

@@ -2,6 +2,7 @@ import { selectSource } from "../source/source";
 import { Youtube } from "../source/youtube";
 import { Mildom } from "../source/mildom";
 import { Twitch } from "../source/twitch";
+import { Mock } from "../source/mock";
 
 describe("selectSource", () => {
   test("youtube", () => {
@@ -21,6 +22,6 @@ describe("selectSource", () => {
 
   test("none", () => {
     const source = selectSource("https://www.none.com");
-    expect(source).toBeNull();
+    expect(source).toEqual(Mock);
   });
 });

src/__tests__/source.ts

@@ -0,0 +1,35 @@
+import { defaultParamsV2, IParameterV2 } from "./config";
+import {
+  NetworkNode,
+  receiveRequest,
+  sendRequest,
+  sendRequestToContent,
+} from "./message";
+
+const sleep = async (ms: number) => {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+};
+
+export const getParam = async (from: NetworkNode): Promise<IParameterV2> => {
+  if (from === "POPUP") {
+    sendRequestToContent({
+      type: "UPDATE_PARAM_KEY",
+      from: from,
+      to: "CONTENT_SCRIPT",
+    });
+  }
+
+  /* XXX: assure order
+  1. update param key
+  2. get param by using updated param key
+   */
+  await sleep(500);
+
+  sendRequest({
+    type: "GET_PARAM",
+    from: from,
+    to: "BACKGROUND",
+  });
+  const res = await receiveRequest("RECEIVE_PARAM");
+  return res.data?.param ?? defaultParamsV2;
+};