commit 34c8f417d0554dd56f9474ee24d707849bf9dd61 · dunkirk.sh/cachet

bun.lockb

This is a binary file and will not be displayed.

+1 -6

package.json

···

       7
       7
        
         },

     

       8
       8
        
         "dependencies": {

     

       9
       9
        
           "@elysiajs/swagger": "^1.1.6",

     

       10
       10
       -
           "@types/cron": "^2.4.3",

     

       11
       10
        
           "@types/node-cron": "^3.0.11",

     

       12
       12
       -
           "@types/pg": "^8.11.10",

     

       13
       13
       -
           "cron": "^3.3.1",

     

       14
       11
        
           "elysia": "latest",

     

       15
       15
       -
           "node-cron": "^3.0.3",

     

       16
       16
       -
           "pg": "^8.13.1",

     

       17
       17
       -
           "slack-edge": "^1.3.5"

     

       12
       12
       +
           "node-cron": "^3.0.3"

     

       18
       13
        
         },

     

       19
       14
        
         "devDependencies": {

     

       20
       15
        
           "bun-types": "latest"

+23 -37

src/index.ts

···

       1
       1
        
       import { Elysia, t } from "elysia";

     

       2
       2
        
       import { swagger } from "@elysiajs/swagger";

     

       3
       3
        
       import { version } from "../package.json";

     

       4
       4
       -
       import { SlackApp } from "slack-edge";

     

       5
       4
        
       import { SlackCache } from "./cache";

     

       5
       5
       +
       import { SlackWrapper } from "./slackWrapper";

     

       6
       6
       +
       import type { SlackUser } from "./slack";

     

       6
       7
        
       

     

       7
       7
       -
       if (!process.env.SLACK_BOT_TOKEN || !process.env.SLACK_SIGNING_SECRET) {

     

       8
       8
       -
         const missingEnvVars = [

     

       9
       9
       -
           !process.env.SLACK_BOT_TOKEN && "SLACK_BOT_TOKEN",

     

       10
       10
       -
           !process.env.SLACK_SIGNING_SECRET && "SLACK_SIGNING_SECRET",

     

       11
       11
       -
         ].filter(Boolean);

     

       12
       12
       -
       

     

       13
       13
       -
         throw new Error(

     

       14
       14
       -
           `Missing required environment variables: ${missingEnvVars.join(", ")}`,

     

       15
       15
       -
         );

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       18
       -
       const slackApp = new SlackApp({

     

       19
       19
       -
         env: {

     

       20
       20
       -
           SLACK_BOT_TOKEN: process.env.SLACK_BOT_TOKEN,

     

       21
       21
       -
           SLACK_SIGNING_SECRET: process.env.SLACK_SIGNING_SECRET,

     

       22
       22
       -
           SLACK_LOGGING_LEVEL: "INFO",

     

       23
       23
       -
         },

     

       24
       24
       -
         startLazyListenerAfterAck: true,

     

       25
       25
       -
       });

     

       8
       8
       +
       const slackApp = new SlackWrapper();

     

       26
       9
        
       

     

       27
       10
        
       const cache = new SlackCache(process.env.DATABASE_PATH ?? "./data/cachet.db");

     

       28
       11
        
       

     
···

       76
       59
        
         .get(

     

       77
       60
        
           "/health",

     

       78
       61
        
           async ({ error }) => {

     

       79
       79
       -
             const slackConnection = await slackApp.client.auth.test();

     

       62
       62
       +
             const slackConnection = await slackApp.testAuth();

     

       80
       63
        
       

     

       81
       64
        
             const databaseConnection = await cache.healthCheck();

     

       82
       65
        
       

     

       83
       83
       -
             if (!slackConnection.ok || !databaseConnection)

     

       66
       66
       +
             if (!slackConnection || !databaseConnection)

     

       84
       67
        
               return error(500, {

     

       85
       68
        
                 http: false,

     

       86
       86
       -
                 slack: slackConnection.ok,

     

       69
       69
       +
                 slack: slackConnection,

     

       87
       70
        
                 database: databaseConnection,

     

       88
       71
        
               });

     

       89
       72
        
       

     
···

       122
       105
        
       

     

       123
       106
        
             // if not found then check slack first

     

       124
       107
        
             if (!user) {

     

       125
       125
       -
               const slackUser = await slackApp.client.users.info({

     

       126
       126
       -
                 user: params.user,

     

       127
       127
       -
               });

     

       108
       108
       +
               let slackUser: SlackUser;

     

       109
       109
       +
               try {

     

       110
       110
       +
                 slackUser = await slackApp.getUserInfo(params.user);

     

       111
       111
       +
               } catch (e) {

     

       112
       112
       +
                 if (e instanceof Error && e.message === "user_not_found")

     

       113
       113
       +
                   return error(404, { message: "User not found" });

     

       128
       114
        
       

     

       129
       129
       -
               if (!slackUser.ok) return error(404, { message: "User not found" });

     

       130
       130
       -
       

     

       131
       131
       -
               if (!slackUser.user?.profile?.image_original || !slackUser.user.id)

     

       132
       132
       -
                 return error(404, { message: "User data malformed" });

     

       115
       115
       +
                 return error(500, {

     

       116
       116
       +
                   message: `Error fetching user from Slack: ${e}`,

     

       117
       117
       +
                 });

     

       118
       118
       +
               }

     

       133
       119
        
       

     

       134
       134
       -
               await cache.insertUser(

     

       135
       135
       -
                 slackUser.user.id,

     

       136
       136
       -
                 slackUser.user?.profile?.image_original,

     

       137
       137
       -
               );

     

       120
       120
       +
               await cache.insertUser(slackUser.id, slackUser.profile.image_original);

     

       138
       121
        
       

     

       139
       122
        
               return {

     

       140
       140
       -
                 id: slackUser.user.id,

     

       123
       123
       +
                 id: slackUser.id,

     

       141
       124
        
                 expiration: new Date().toISOString(),

     

       142
       142
       -
                 user: slackUser.user.id,

     

       143
       143
       -
                 image: slackUser.user.profile.image_original,

     

       125
       125
       +
                 user: slackUser.id,

     

       126
       126
       +
                 image: slackUser.profile.image_original,

     

       144
       127
        
               };

     

       145
       128
        
             }

     

       146
       129
        
       

     
···

       158
       141
        
             }),

     

       159
       142
        
             response: {

     

       160
       143
        
               404: t.Object({

     

       144
       144
       +
                 message: t.String(),

     

       145
       145
       +
               }),

     

       146
       146
       +
               500: t.Object({

     

       161
       147
        
                 message: t.String(),

     

       162
       148
        
               }),

     

       163
       149
        
               200: t.Object({