Add: Rewrite db structure

GunmaRamens · Dec 3, 2023 · b616556 · b616556
1 parent da21cfb
commit b616556
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 39 deletions.
diff --git a/lib/class/Storage/browser.ts b/lib/class/Storage/browser.ts
@@ -17,11 +17,15 @@ export default class BrowserStorage<T> implements StorageTool<T> {
         await this.#item.set({ ...data, [key]: newdata });
     }
 
+    async getAll() {
+        return await this.#item.get();
+    }
+
     async get(value: keyof T) {
-        return (await this.#item.get())[value];
+        return (await this.getAll())[value];
     }
 
-    async set(value: T) {
+    async set(value: Partial<T>) {
         const data = await this.#item.get();
 
         await this.#item.set({ ...data, value });

diff --git a/lib/class/Storage/common.ts b/lib/class/Storage/common.ts
@@ -0,0 +1,28 @@
+import { WebsiteIds } from "@/data/websites";
+
+import BrowserStorage from "./browser";
+
+export interface UnivCommonConfig {
+    rainbow?: boolean;
+    dark?: boolean;
+}
+
+export type CommonConfig = Record<WebsiteIds, UnivCommonConfig>;
+
+export const CommonStorage = new (class {
+    #storage: BrowserStorage<CommonConfig>;
+    constructor() {
+        this.#storage = new BrowserStorage("common");
+    }
+
+    async get(id: WebsiteIds, key: keyof UnivCommonConfig) {
+        const isRainbowEnabled = (await this.#storage.get(id))[key];
+        return isRainbowEnabled;
+    }
+
+    async set(id: WebsiteIds, value: Partial<UnivCommonConfig>) {
+        const data = await this.#storage.getAll();
+
+        await this.#storage.set({ ...data, [id]: { ...data[id], ...value } });
+    }
+})();
diff --git a/lib/class/Storage/type.ts b/lib/class/Storage/type.ts
@@ -8,4 +8,5 @@ export type StorageKeys =
     | "installed"
     | "auto-2fa"
     | "quick-switch";
-export type StorageIds = WebsiteIds | "other";
+
+export type StorageIds = "common" | "other" | WebsiteIds;
diff --git a/lib/class/UnivWebsite/index.ts b/lib/class/UnivWebsite/index.ts
@@ -7,20 +7,15 @@ import { WebsiteIds } from "@/data/websites";
 import isTrue from "../../utils/isTrue";
 import { DarkApplicator, HiddenApplicator, RainbowApplicator } from "../ClassApplicator";
 import BrowserStorage from "../Storage/browser";
+import { CommonStorage } from "../Storage/common";
 import { OtherStorage } from "../Storage/other";
 import StorageTool from "../Storage/storage";
 
-export interface UnivConfig {
-    rainbow?: boolean;
-    dark?: boolean;
-}
-
 // UnivWebSiteはゲーミング化するウェブサイトを定義したクラス
 // 型変数とoptionsプロパティによって任意の情報を追加できる
-export class UnivWebsite<T = unknown, U extends UnivConfig = UnivConfig> {
+export class UnivWebsite<T = unknown, U = unknown> {
     // 基本情報
     id: WebsiteIds;
-
     storage: StorageTool<U>;
 
     // Applicator
@@ -50,19 +45,19 @@ export class UnivWebsite<T = unknown, U extends UnivConfig = UnivConfig> {
     }
 
     async initilizeWebsiteDb() {
-        await this.storage.set({
+        await CommonStorage.set(this.id, {
             rainbow: false,
             dark: false,
         });
     }
 
     async isRainbowEnabled() {
-        const isRainbowEnabled = await this.storage.get("rainbow");
+        const isRainbowEnabled = await CommonStorage.get(this.id, "rainbow");
         return isTrue(isRainbowEnabled);
     }
 
     async isDarkEnabled() {
-        const isDarkEnabled = await this.storage.get("dark");
+        const isDarkEnabled = await CommonStorage.get(this.id, "dark");
         return isTrue(isDarkEnabled);
     }
 
@@ -77,23 +72,23 @@ export class UnivWebsite<T = unknown, U extends UnivConfig = UnivConfig> {
             if (isRainbowEnabled) {
                 // CSSのためにHTML要素にデータ属性を追加
                 document.documentElement.dataset.gaming_gundai = "true";
-                this.storage.set({ rainbow: true });
+                CommonStorage.set(this.id, { rainbow: true });
                 this.rainbow.enable();
             } else {
                 // CSSのためにHTML要素にデータ属性を追加
                 document.documentElement.dataset.gaming_gundai = "false";
-                this.storage.set({ rainbow: false });
+                CommonStorage.set(this.id, { rainbow: false });
                 this.rainbow.disable();
             }
 
             const isDarkEnabled = await this.isDarkEnabled();
             if (isDarkEnabled) {
                 document.documentElement.dataset.gaming_gundai_dark = "true";
-                this.storage.set({ dark: true });
+                CommonStorage.set(this.id, { dark: true });
                 this.dark.enable();
             } else {
                 document.documentElement.dataset.gaming_gundai_dark = "false";
-                this.storage.set({ dark: false });
+                CommonStorage.set(this.id, { dark: false });
                 this.dark.disable();
             }
 
@@ -117,4 +112,4 @@ export class UnivWebsite<T = unknown, U extends UnivConfig = UnivConfig> {
     }
 }
 
-export class GundaiWebSite<T> extends UnivWebsite<T> {}
+export class GundaiWebSite<T = unknown, U = unknown> extends UnivWebsite<T, U> {}
diff --git a/lib/class/UnivWebsite/test.ts b/lib/class/UnivWebsite/test.ts
diff --git a/lib/components/ToggleWithStorage.tsx b/lib/components/ToggleWithStorage.tsx
@@ -5,8 +5,8 @@ import { Toggle } from "react-daisyui";
 import { ComponentColor } from "react-daisyui/dist/types";
 
 import { StorageTool } from "@/class";
+import { UnivCommonConfig as UnivConfig } from "@/class/Storage/common";
 import { OtherConfig, OtherStorage } from "@/class/Storage/other";
-import { UnivConfig } from "@/class/UnivWebsite";
 import IsTrue from "@/utils/isTrue";
 import { sendMsgToAllTab } from "@/utils/sendMsgToAllTab";