cordo 2.0.2 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordo",
-  "version": "2.0.2",
+  "version": "2.2.0",
   "description": "A framework for handling complex discord api interactions",
   "exports": {
     ".": "./src/index.ts",
@@ -8,7 +8,7 @@
     "./components": "./src/components/index.ts",
     "./errors": "./src/errors/index.ts",
     "./functions": "./src/functions/index.ts",
-    "./http": "./src/http/index.ts"
+    "./plugin": "./src/plugin/index.ts"
   },
   "files": [
     "src/*",
@@ -33,11 +33,11 @@
   },
   "homepage": "https://github.com/Maanex/cordo#readme",
   "dependencies": {
+    "@types/bun": "^1.2.10",
     "axios": "^0.21.4",
     "defu": "^6.1.4",
     "discord-api-types": "^0.37.119",
     "discord-interactions": "^2.4.1",
-    "express": "^4.17.3",
     "type-fest": "^4.34.1"
   },
   "devDependencies": {
@@ -46,8 +46,11 @@
     "@types/node": "^17.0.8",
     "@typescript-eslint/eslint-plugin": "^4.28.3",
     "@typescript-eslint/parser": "^4.28.3",
+    "discord.js": "^14.18.0",
     "eslint": "^7.30.0",
     "eslint-config-maanex": "^1.1.2",
+    "express": "^4.17.3",
+    "hono": "^4.7.7",
     "reflect-metadata": "^0.1.13",
     "typescript": "^5.7.3"
   }

package/src/plugin/djs.ts

@@ -0,0 +1,18 @@
+import { Cordo } from '@core'
+import { Client, Events } from 'discord.js'
+
+
+export function useWithDiscordJs(client: Client) {
+  if (!client)
+    throw new Error('You must provide a discord.js client object');
+
+  client.on(Events.Raw, (event) => {
+    if (event.t === 'INTERACTION_CREATE')
+      Cordo.triggerInteraction(event.d)
+  })
+
+  setTimeout(() => {
+    if (client.listeners(Events.InteractionCreate).length)
+      console.warn('You are using both the Cordo and Discord.js interaction listeners. This may cause issues with your routes.')
+  }, 50)
+}

package/src/plugin/hono.ts

@@ -0,0 +1,34 @@
+import { verifyKey } from "discord-interactions"
+import { Cordo } from '@core'
+import { Hono } from "hono"
+
+
+export function useWithHono(clientPublicKey: string) {
+  if (!clientPublicKey)
+    throw new Error('You must specify a Discord client public key');
+
+  const app = new Hono()
+
+  app.post('/', async (c) => {
+    const signature = c.req.header('x-signature-ed25519')
+    const timestamp = c.req.header('x-signature-timestamp')
+    const bodyStream = c.req.raw.body
+    if (!signature || !timestamp || !bodyStream)
+      return c.text('Bad Request', 400)
+
+    const body = await Bun.readableStreamToArrayBuffer(bodyStream)
+    const isValid = verifyKey(body, signature, timestamp, clientPublicKey)
+    if (!isValid)
+      return c.text('Bad Request', 401)
+
+    const parsedBody = JSON.parse(Buffer.from(body).toString('utf-8'))
+    const { promise, resolve } = Promise.withResolvers<any>()
+    Cordo.triggerInteraction(parsedBody, {
+      httpCallback: (payload: any) => resolve(payload),
+    })
+
+    return c.json(await promise, 200)
+  })
+
+  return app
+}

package/src/plugin/index.ts

@@ -0,0 +1,4 @@
+
+export { useWithDiscordJs } from './djs'
+export { useWithExpress } from './express'
+export { useWithHono } from './hono'

package/tsconfig.json

@@ -30,7 +30,7 @@
       "@components/*": [ "./src/components/*" ],
       "@core": [ "./src/core/index.ts" ],
       "@core/*": [ "./src/core/*" ],
-      "@http/*": [ "./src/http/*" ],
+      "@plugin/*": [ "./src/plugin/*" ],
       "@lib/*": [ "./src/lib/*" ]
     }
   }

package/src/http/index.ts

@@ -1,2 +0,0 @@
-
-export { useWithExpress } from './express'