Merge pull request #409 from na2na-p/chore/inject-store-driver

StoreDriverをClient外部から注入するようにした

src/features/config/internal/getConfig.func.spec.ts

@@ -16,11 +16,13 @@ describe('getConfig', () => {
     process.env['DISCORD_APP_TOKEN'] = 'test_token';
     process.env['BOT_NAME'] = 'test_bot';
     process.env['SET_COMMANDS_TARGET_SERVERS'] = 'server1,server2';
+    process.env['STORE_DRIVER'] = 'local';
 
     const expectedConfig = {
       DISCORD_APP_TOKEN: 'test_token',
       BOT_NAME: 'test_bot',
       SET_COMMANDS_TARGET_SERVERS: ['server1', 'server2'],
+      STORE_DRIVER: 'local',
     };
 
     expect(getConfig()).toEqual(expectedConfig);

src/features/config/internal/getConfig.func.ts

@@ -1,12 +1,21 @@
 import { createEnv } from '@t3-oss/env-core';
 import { z } from 'zod';
 
+import { STORE_TYPES } from '@/features/core/index.js';
+
+const storeDriverKeys: ReadonlyArray<string> = Object.values(STORE_TYPES);
+
 export const getConfig = () => {
   const envs = createEnv({
     server: {
       DISCORD_APP_TOKEN: z.string().min(1).readonly(),
       BOT_NAME: z.string().min(1).readonly(),
       SET_COMMANDS_TARGET_SERVERS: z.string().min(1).readonly(),
+      STORE_DRIVER: z
+        .string()
+        .min(1)
+        .refine(value => storeDriverKeys.includes(value))
+        .readonly(),
     } as const,
     runtimeEnv: process.env,
   });

src/features/core/internal/Client/internal/Client.class.ts

@@ -2,11 +2,7 @@ import { exit } from 'process';
 
 import type { CommandBase } from '@/features/commands/index.js';
 import type { getConfig } from '@/features/config/index.js';
-import {
-  getInMemoryStoreInstance,
-  type Store,
-  STORE_TYPES,
-} from '@/features/core/index.js';
+import { type Store } from '@/features/core/index.js';
 import type { ChatInputCommandInteraction } from '@/features/library/index.js';
 import {
   chalk,
@@ -23,7 +19,7 @@ export class Client extends DiscordJsClient {
   private interactionCommands: ReadonlyArray<CommandBase> = [];
   #store: Store;
 
-  constructor({ config, commands, storeDriver }: ClassConstructorArgs) {
+  constructor({ config, commands, StoreDriver }: ClassConstructorArgs) {
     super({
       intents: [
         GatewayIntentBits.Guilds,
@@ -33,21 +29,14 @@ export class Client extends DiscordJsClient {
       ],
     });
     this.#config = config;
+    this.#store = StoreDriver;
     try {
       this.login(this.#config.DISCORD_APP_TOKEN);
     } catch (error) {
       this.log(chalk.red('Failed to fetch the account'));
       exit(1);
     }
 
-    switch (storeDriver) {
-      case STORE_TYPES.IN_MEMORY:
-        this.#store = getInMemoryStoreInstance();
-        break;
-      default:
-        throw new Error('Invalid store driver');
-    }
-
     const commandsRegisteredResult = this.#installModules(commands);
 
     this.on('ready', client => {

src/features/core/internal/Client/internal/Client.types.ts

@@ -1,9 +1,9 @@
 import type { CommandBase } from '@/features/commands/index.js';
 import type { getConfig } from '@/features/config/index.js';
-import type { Store, STORE_TYPES } from '@/features/core/index.js';
+import type { Store } from '@/features/core/index.js';
 
 export type ClassConstructorArgs = {
   config: ReturnType<typeof getConfig>;
   commands: ReadonlyArray<new ({ store }: { store: Store }) => CommandBase>;
-  storeDriver: keyof typeof STORE_TYPES;
+  StoreDriver: Store;
 };

src/features/core/internal/Store/internal/Store.constants.ts

@@ -1,3 +1,4 @@
 export const STORE_TYPES = {
-  IN_MEMORY: 'IN_MEMORY',
+  IN_MEMORY: 'local',
+  REDIS: 'redis',
 } as const satisfies Record<string, string>;

src/index.ts

@@ -2,10 +2,26 @@ import 'dotenv/config';
 
 import { Ping, VoiceChannel, YouTube } from './features/commands/index.js';
 import { getConfig } from './features/config/index.js';
-import { Client, STORE_TYPES } from './features/core/index.js';
+import {
+  Client,
+  getInMemoryStoreInstance,
+  STORE_TYPES,
+} from './features/core/index.js';
+
+const config = getConfig();
+const storeDriver = (() => {
+  switch (config.STORE_DRIVER) {
+    case STORE_TYPES.IN_MEMORY:
+      return getInMemoryStoreInstance();
+    case STORE_TYPES.REDIS:
+      throw new Error('Not implemented yet');
+    default:
+      return getInMemoryStoreInstance();
+  }
+})();
 
 new Client({
-  config: getConfig(),
+  config,
   commands: [Ping, VoiceChannel, YouTube],
-  storeDriver: STORE_TYPES.IN_MEMORY,
+  StoreDriver: storeDriver,
 });