feat: add discord interactions worker

packages/api/handlers/bot-join.ts

@@ -7,10 +7,13 @@ type URLParams = {
   clientID: string;
   permissions: number;
   guildID?: string;
+  scopes: string[];
 };
 
 const buildURL = (params: URLParams) => {
-  let url = `https://discord.com/api/oauth2/authorize?client_id=${params.clientID}&scope=bot&permissions=${params.permissions}`;
+  let url = `https://discord.com/api/oauth2/authorize?client_id=${
+    params.clientID
+  }&scope=${params.scopes.join('%20')}&permissions=${params.permissions}`;
 
   if (params.guildID) {
     url += `&guild_id=${params.guildID}&disable_guild_select=true`;
@@ -31,6 +34,7 @@ export const BotJoin = (request: Request): Response => {
       clientID: botClientID,
       permissions: 268435456,
       guildID,
+      scopes: ['bot', 'application.commands'],
     })
   );
 };

packages/api/handlers/get-picker-data.ts

@@ -1,7 +1,8 @@
 import { memberPassesAccessControl } from '@roleypoly/api/utils/access-control';
 import { accessControlViolation } from '@roleypoly/api/utils/responses';
 import { DiscordUser, GuildSlug, PresentableGuild, SessionData } from '@roleypoly/types';
-import { respond, withSession } from '../utils/api-tools';
+import { respond } from '@roleypoly/worker-utils';
+import { withSession } from '../utils/api-tools';
 import { getGuild, getGuildData, getGuildMember } from '../utils/guild';
 
 const fail = () => respond({ error: 'guild not found' }, { status: 404 });

packages/api/handlers/get-session.ts

@@ -1,5 +1,6 @@
 import { SessionData } from '@roleypoly/types';
-import { respond, withSession } from '../utils/api-tools';
+import { respond } from '@roleypoly/worker-utils';
+import { withSession } from '../utils/api-tools';
 
 export const GetSession = withSession((session?: SessionData) => (): Response => {
   const { user, guilds, sessionID } = session || {};

packages/api/handlers/get-slug.ts

@@ -1,5 +1,5 @@
 import { GuildSlug } from '@roleypoly/types';
-import { respond } from '../utils/api-tools';
+import { respond } from '@roleypoly/worker-utils';
 import { getGuild } from '../utils/guild';
 
 export const GetSlug = async (request: Request): Promise<Response> => {

packages/api/handlers/login-bounce.ts

@@ -1,5 +1,6 @@
 import { StateSession } from '@roleypoly/types';
-import { getQuery, isAllowedCallbackHost, setupStateSession } from '../utils/api-tools';
+import { getQuery } from '@roleypoly/worker-utils';
+import { isAllowedCallbackHost, setupStateSession } from '../utils/api-tools';
 import { Bounce } from '../utils/bounce';
 import { apiPublicURI, botClientID } from '../utils/config';
 

packages/api/handlers/login-callback.ts

@@ -5,25 +5,22 @@ import {
   SessionData,
   StateSession,
 } from '@roleypoly/types';
-import KSUID from 'ksuid';
 import {
   AuthType,
+  discordAPIBase,
   discordFetch,
+  userAgent,
+} from '@roleypoly/worker-utils';
+import KSUID from 'ksuid';
+import {
   formData,
   getStateSession,
   isAllowedCallbackHost,
   parsePermissions,
   resolveFailures,
-  userAgent,
 } from '../utils/api-tools';
 import { Bounce } from '../utils/bounce';
-import {
-  apiPublicURI,
-  botClientID,
-  botClientSecret,
-  discordAPIBase,
-  uiPublicURI,
-} from '../utils/config';
+import { apiPublicURI, botClientID, botClientSecret, uiPublicURI } from '../utils/config';
 import { Sessions } from '../utils/kv';
 
 const AuthErrorResponse = (extra?: string) =>

packages/api/handlers/revoke-session.ts

@@ -1,6 +1,7 @@
 import { SessionData } from '@roleypoly/types';
-import { formData, respond, userAgent, withSession } from '../utils/api-tools';
-import { botClientID, botClientSecret, discordAPIBase } from '../utils/config';
+import { discordAPIBase, respond, userAgent } from '@roleypoly/worker-utils';
+import { formData, withSession } from '../utils/api-tools';
+import { botClientID, botClientSecret } from '../utils/config';
 import { Sessions } from '../utils/kv';
 
 export const RevokeSession = withSession(

packages/api/handlers/update-roles.ts

@@ -10,8 +10,9 @@ import {
   SessionData,
   TransactionType,
 } from '@roleypoly/types';
+import { AuthType, discordFetch, respond } from '@roleypoly/worker-utils';
 import { difference, groupBy, keyBy, union } from 'lodash';
-import { AuthType, discordFetch, respond, withSession } from '../utils/api-tools';
+import { withSession } from '../utils/api-tools';
 import { botToken } from '../utils/config';
 import {
   getGuild,

packages/api/index.ts

@@ -1,3 +1,4 @@
+import { Router } from '@roleypoly/worker-utils/router';
 import { BotJoin } from './handlers/bot-join';
 import { ClearGuildCache } from './handlers/clear-guild-cache';
 import { GetPickerData } from './handlers/get-picker-data';
@@ -9,7 +10,6 @@ import { RevokeSession } from './handlers/revoke-session';
 import { SyncFromLegacy } from './handlers/sync-from-legacy';
 import { UpdateGuild } from './handlers/update-guild';
 import { UpdateRoles } from './handlers/update-roles';
-import { Router } from './router';
 import { respond } from './utils/api-tools';
 import { uiPublicURI } from './utils/config';
 

packages/api/package.json

@@ -11,6 +11,7 @@
     "@roleypoly/misc-utils": "*",
     "@roleypoly/types": "*",
     "@roleypoly/worker-emulator": "*",
+    "@roleypoly/worker-utils": "*",
     "@types/deep-equal": "^1.0.1",
     "deep-equal": "^2.0.5",
     "ksuid": "^2.0.0",

packages/api/router.ts

@@ -1,84 +0,0 @@
-import { addCORS } from './utils/api-tools';
-import { uiPublicURI } from './utils/config';
-
-export type Handler = (request: Request) => Promise<Response> | Response;
-
-type RoutingTree = {
-  [method: string]: {
-    [path: string]: Handler;
-  };
-};
-
-type Fallbacks = {
-  root: Handler;
-  404: Handler;
-  500: Handler;
-};
-
-export class Router {
-  private routingTree: RoutingTree = {};
-  private fallbacks: Fallbacks = {
-    root: this.respondToRoot,
-    404: this.notFound,
-    500: this.serverError,
-  };
-
-  private uiURL = new URL(uiPublicURI);
-
-  addFallback(which: keyof Fallbacks, handler: Handler) {
-    this.fallbacks[which] = handler;
-  }
-
-  add(method: string, rootPath: string, handler: Handler) {
-    const lowerMethod = method.toLowerCase();
-
-    if (!this.routingTree[lowerMethod]) {
-      this.routingTree[lowerMethod] = {};
-    }
-
-    this.routingTree[lowerMethod][rootPath] = handler;
-  }
-
-  async handle(request: Request): Promise<Response> {
-    const url = new URL(request.url);
-
-    if (url.pathname === '/' || url.pathname === '') {
-      return this.fallbacks.root(request);
-    }
-    const lowerMethod = request.method.toLowerCase();
-    const rootPath = url.pathname.split('/')[1];
-    const handler = this.routingTree[lowerMethod]?.[rootPath];
-
-    if (handler) {
-      try {
-        const response = await handler(request);
-        return response;
-      } catch (e) {
-        console.error(e);
-        return this.fallbacks[500](request);
-      }
-    }
-
-    if (lowerMethod === 'options') {
-      return new Response(null, addCORS({}));
-    }
-
-    return this.fallbacks[404](request);
-  }
-
-  private respondToRoot(): Response {
-    return new Response('Hi there!');
-  }
-
-  private notFound(): Response {
-    return new Response(JSON.stringify({ error: 'not_found' }), {
-      status: 404,
-    });
-  }
-
-  private serverError(): Response {
-    return new Response(JSON.stringify({ error: 'internal_server_error' }), {
-      status: 500,
-    });
-  }
-}

packages/api/utils/api-tools.ts

@@ -3,10 +3,10 @@ import {
   permissions as Permissions,
 } from '@roleypoly/misc-utils/hasPermission';
 import { SessionData, UserGuildPermissions } from '@roleypoly/types';
+import { Handler, WrappedKVNamespace } from '@roleypoly/worker-utils';
 import KSUID from 'ksuid';
-import { Handler } from '../router';
-import { allowedCallbackHosts, apiPublicURI, discordAPIBase, rootUsers } from './config';
-import { Sessions, WrappedKVNamespace } from './kv';
+import { allowedCallbackHosts, apiPublicURI, rootUsers } from './config';
+import { Sessions } from './kv';
 
 export const formData = (obj: Record<string, any>): string => {
   return Object.keys(obj)
@@ -14,18 +14,8 @@ export const formData = (obj: Record<string, any>): string => {
     .join('&');
 };
 
-export const addCORS = (init: ResponseInit = {}) => ({
-  ...init,
-  headers: {
-    ...(init.headers || {}),
-    'access-control-allow-origin': '*',
-    'access-control-allow-methods': '*',
-    'access-control-allow-headers': '*',
-  },
-});
-
 export const respond = (obj: Record<string, any>, init: ResponseInit = {}) =>
-  new Response(JSON.stringify(obj), addCORS(init));
+  new Response(JSON.stringify(obj), init);
 
 export const resolveFailures =
   (
@@ -70,44 +60,6 @@ export const getSessionID = (request: Request): { type: string; id: string } | n
   return { type, id };
 };
 
-export const userAgent =
-  'DiscordBot (https://github.com/roleypoly/roleypoly, git-main) (+https://roleypoly.com)';
-
-export enum AuthType {
-  Bearer = 'Bearer',
-  Bot = 'Bot',
-}
-
-export const discordFetch = async <T>(
-  url: string,
-  auth: string,
-  authType: AuthType = AuthType.Bearer,
-  init?: RequestInit
-): Promise<T | null> => {
-  const response = await fetch(discordAPIBase + url, {
-    ...(init || {}),
-    headers: {
-      ...(init?.headers || {}),
-      authorization: `${AuthType[authType]} ${auth}`,
-      'user-agent': userAgent,
-    },
-  });
-
-  if (response.status >= 400) {
-    console.error('discordFetch failed', {
-      url,
-      authType,
-      payload: await response.text(),
-    });
-  }
-
-  if (response.ok) {
-    return (await response.json()) as T;
-  } else {
-    return null;
-  }
-};
-
 export type CacheLayerOptions = {
   skipCachePull?: boolean;
 };
@@ -195,16 +147,6 @@ export const onlyRootUsers = (handler: Handler): Handler =>
     );
   });
 
-export const getQuery = (request: Request): { [x: string]: string } => {
-  const output: { [x: string]: string } = {};
-
-  for (let [key, value] of new URL(request.url).searchParams.entries()) {
-    output[key] = value;
-  }
-
-  return output;
-};
-
 export const isAllowedCallbackHost = (host: string): boolean => {
   return (
     host === apiPublicURI ||

packages/api/utils/audit-log.ts

@@ -1,4 +1,3 @@
-import { userAgent } from '@roleypoly/api/utils/api-tools';
 import { uiPublicURI } from '@roleypoly/api/utils/config';
 import {
   Category,
@@ -8,6 +7,7 @@ import {
   GuildSlug,
   WebhookValidationStatus,
 } from '@roleypoly/types';
+import { userAgent } from '@roleypoly/worker-utils';
 import deepEqual from 'deep-equal';
 import { sortBy, uniq } from 'lodash';
 

packages/api/utils/config.ts

@@ -13,5 +13,3 @@ export const apiPublicURI = safeURI(env('API_PUBLIC_URI'));
 export const rootUsers = list(env('ROOT_USERS'));
 export const allowedCallbackHosts = list(env('ALLOWED_CALLBACK_HOSTS'));
 export const importSharedKey = env('BOT_IMPORT_TOKEN');
-
-export const discordAPIBase = 'https://discordapp.com/api/v9';

packages/api/utils/guild.ts

@@ -1,4 +1,3 @@
-import { Handler } from '@roleypoly/api/router';
 import {
   lowPermissions,
   missingParameters,
@@ -18,14 +17,8 @@ import {
   SessionData,
   UserGuildPermissions,
 } from '@roleypoly/types';
-import {
-  AuthType,
-  cacheLayer,
-  CacheLayerOptions,
-  discordFetch,
-  isRoot,
-  withSession,
-} from './api-tools';
+import { AuthType, discordFetch, Handler } from '@roleypoly/worker-utils';
+import { cacheLayer, CacheLayerOptions, isRoot, withSession } from './api-tools';
 import { botClientID, botToken } from './config';
 import { GuildData, Guilds } from './kv';
 import { useRateLimiter } from './rate-limiting';

packages/api/utils/kv.ts

@@ -1,83 +1,4 @@
-export class WrappedKVNamespace {
-  constructor(private kvNamespace: KVNamespace) {}
-
-  async get<T>(key: string): Promise<T | null> {
-    const data = await this.kvNamespace.get(key, 'text');
-    if (!data) {
-      return null;
-    }
-
-    return JSON.parse(data) as T;
-  }
-
-  async put<T>(key: string, value: T, ttlSeconds?: number) {
-    await this.kvNamespace.put(key, JSON.stringify(value), {
-      expirationTtl: ttlSeconds,
-    });
-  }
-
-  list = this.kvNamespace.list;
-  getWithMetadata = this.kvNamespace.getWithMetadata;
-  delete = this.kvNamespace.delete;
-}
-
-class EmulatedKV implements KVNamespace {
-  constructor() {
-    console.warn('EmulatedKV used. Data will be lost.');
-  }
-
-  private data: Map<string, any> = new Map();
-
-  async get<T>(key: string): Promise<T | null> {
-    if (!this.data.has(key)) {
-      return null;
-    }
-
-    return this.data.get(key);
-  }
-
-  async getWithMetadata<T, Metadata = unknown>(
-    key: string
-  ): KVValueWithMetadata<T, Metadata> {
-    return {
-      value: await this.get<T>(key),
-      metadata: {} as Metadata,
-    };
-  }
-
-  async put(key: string, value: string | ReadableStream<any> | ArrayBuffer | FormData) {
-    this.data.set(key, value);
-  }
-
-  async delete(key: string) {
-    this.data.delete(key);
-  }
-
-  async list(options?: { prefix?: string; limit?: number; cursor?: string }): Promise<{
-    keys: { name: string; expiration?: number; metadata?: unknown }[];
-    list_complete: boolean;
-    cursor: string;
-  }> {
-    let keys: { name: string }[] = [];
-
-    for (let key of this.data.keys()) {
-      if (options?.prefix && !key.startsWith(options.prefix)) {
-        continue;
-      }
-
-      keys.push({ name: key });
-    }
-
-    return {
-      keys,
-      cursor: '0',
-      list_complete: true,
-    };
-  }
-}
-
-const kvOrLocal = (namespace: KVNamespace | null): KVNamespace =>
-  namespace || new EmulatedKV();
+import { kvOrLocal, WrappedKVNamespace } from '@roleypoly/worker-utils';
 
 const self = global as any as Record<string, any>;
 

packages/api/utils/responses.ts

@@ -1,4 +1,4 @@
-import { respond } from './api-tools';
+import { respond } from '@roleypoly/worker-utils';
 
 export const ok = () => respond({ ok: true });