remove interval logging; make eslint ignore any files outside of src …

…or tests; add updateHandler unit test; remove unnecessary logging

.env.example

@@ -14,9 +14,6 @@ COOKIE=
 # Integer(number), define delay time to fetch to prevent rate limit
 DELAY=
 
-# Boolean, true will enable annoying "new interval starts" discord message
-INTERVAL_LOGGING=
-
 # Boolean, true will enable annoying "Error fetching, Might be rate limited or server is down" discord message
 ERROR_FETCHING_NOTIFICATION=
 

eslint.config.mjs

@@ -1,9 +1,8 @@
 import globals from "globals";
-import tseslint from "typescript-eslint";
 import tsPlugin from "@typescript-eslint/eslint-plugin";
 import tsParser from "@typescript-eslint/parser";
 import unusedImports from "eslint-plugin-unused-imports";
-export default tseslint.config(
+export default [
   {
     files: ["src/**/*.ts","tests/**/*.ts"],
     languageOptions: {
@@ -31,4 +30,7 @@ export default tseslint.config(
       "@typescript-eslint/no-explicit-any": "off"
     }
   },
-)
+  {
+    ignores: ["*","!src","!tests"]
+  }
+]

src/env/env.ts

@@ -19,7 +19,6 @@ const env = cleanEnv(process.env, {
   ADMIN_USER_ID: str(),
   COOKIE: str(),
   DELAY: num(),
-  INTERVAL_LOGGING: bool({ default: false }),
   ERROR_FETCHING_NOTIFICATION: bool({ default: false }),
   AUTO_DETERMINE_YEAR_AND_SEMESTER: bool(),
 })

src/server.ts

@@ -19,7 +19,8 @@ export const client = new Client({
 })
 
 export let adminDM: DMChannel
-let intervalId: NodeJS.Timeout
+export let intervalId: MutableWrapper<NodeJS.Timeout | undefined> =
+  new MutableWrapper(undefined)
 let commands: DiscordCommandHandler
 
 client.on('interactionCreate', async (interaction: Interaction) => {
@@ -60,7 +61,7 @@ client.on('ready', async () => {
   adminDM.send('server is up!')
 
   if (isSome(await updateHandler())) {
-    intervalId = setInterval(updateHandler, env.DELAY * 1000)
+    intervalId.value = setInterval(updateHandler, env.DELAY * 1000)
   }
 })
 
@@ -75,7 +76,3 @@ export async function start() {
   console.log('found commands', Object.keys(commands))
   client.login(env.DISCORD_TOKEN)
 }
-
-export function getIntervalId() {
-  return intervalId
-}

src/utils/fetchAndCatch.ts

@@ -32,7 +32,6 @@ export default async function fetchAndCatch(
     if (hasEncounteredError.value) {
       return option.none
     }
-    console.log(await response.text())
     hasEncounteredError.value = true
     await errorFetchingNotify(NotifyMessage.FetchingError)
     return option.none

src/utils/throwErrorToAdmin.ts

@@ -1,6 +1,6 @@
-import { adminDM, getIntervalId } from '../server'
+import { adminDM, intervalId } from '../server'
 
 export async function throwErrorToAdmin(msg: string) {
   await adminDM.send(msg)
-  clearInterval(getIntervalId())
+  clearInterval(intervalId.value)
 }

src/utils/updateHandler.ts

@@ -1,23 +1,18 @@
-import { TextChannel } from 'discord.js'
+import { DiscordAPIError, TextChannel } from 'discord.js'
 import db from '../database/database'
-import env from '../env/env'
 import { updateAll } from '../scraper/updateAll'
-import { client } from '../server'
-import formatDateToBangkok from './formatDateToBangkok'
+import { adminDM, client } from '../server'
 import { none, Option, some } from 'fp-ts/lib/Option'
 
 /**
  * @description update assignments and send message to all notification channels
  *  */
 export default async function updateHandler(): Promise<Option<boolean>> {
-  if (env.INTERVAL_LOGGING) {
-    console.log('new interval started at ' + formatDateToBangkok(new Date()))
-  }
   let messages: Array<string> = []
   try {
     messages = await updateAll()
   } catch (e) {
-    console.log(e)
+    console.trace(e)
     return none
   }
   if (messages.length == 0) {
@@ -26,11 +21,17 @@ export default async function updateHandler(): Promise<Option<boolean>> {
   const channels = await db.getAllChannels()
   for (const message of messages) {
     for await (const NotificationChannel of channels) {
-      const discordChannel = (await client.channels.fetch(
-        NotificationChannel.channelID
-      )) as TextChannel
-      // adminDM.send(message);
-      await discordChannel.send(message)
+      try {
+        const discordChannel = (await client.channels.fetch(
+          NotificationChannel.channelID
+        )) as TextChannel
+        await discordChannel.send(message)
+      } catch (err) {
+        console.trace(err)
+        if (!(err instanceof DiscordAPIError)) {
+          adminDM.send(JSON.stringify(err))
+        }
+      }
     }
   }
   return some(false)

tests/unit/updateHandler.unit.test.ts

@@ -0,0 +1,93 @@
+import db, { NotificationChannel } from '@/database/database'
+import { updateAll } from '@/scraper/updateAll'
+import { adminDM, client } from '@/server'
+import updateHandler from '@/utils/updateHandler'
+import { DiscordAPIError } from 'discord.js'
+
+jest.mock('@/server', () => {
+  return {
+    client: {
+      channels: {
+        fetch: jest.fn(),
+      },
+    },
+    adminDM: {
+      send: jest.fn(),
+    },
+  }
+})
+
+jest.mock('@/server')
+jest.mock('@/scraper/updateAll')
+jest.mock('@/database/database', () => {
+  return {
+    getAllChannels: jest.fn(),
+  }
+})
+
+describe('catch discord error', () => {
+  let channels: NotificationChannel[]
+  let error: any
+  let messages: string[]
+
+  beforeAll(() => {
+    ;(updateAll as jest.Mock).mockImplementation(() => {
+      return messages
+    })
+    ;(db.getAllChannels as jest.Mock).mockImplementation(() => {
+      return channels
+    })
+    ;(client.channels.fetch as jest.Mock).mockImplementation(() => {
+      throw error
+    })
+  })
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('discord error', async () => {
+    channels = [
+      {
+        guildID: '123',
+        channelID: '456',
+      },
+    ]
+
+    error = new DiscordAPIError(
+      {
+        code: 50001,
+        errors: {},
+        message: '',
+      },
+      50001,
+      403,
+      'GET',
+      '',
+      {}
+    )
+
+    messages = ['g']
+
+    await updateHandler()
+
+    expect(adminDM.send).toHaveBeenCalledTimes(0)
+  })
+
+  it('non-discord error', async () => {
+    channels = [
+      {
+        guildID: '123',
+        channelID: '456',
+      },
+    ]
+
+    error = 'gg'
+
+    messages = ['g']
+
+    await updateHandler()
+
+    expect(adminDM.send).toHaveBeenCalledTimes(1)
+  })
+})