diff --git a/DiscordClient.js b/DiscordClient.js
index 4645376..d9a16b3 100644
--- a/DiscordClient.js
+++ b/DiscordClient.js
@@ -18,9 +18,7 @@ class DiscordClient extends EventEmitter {
this.token = token;
this.gatewayUrl = gatewayUrl;
this.apiBase = apiBase;
- this.inflate = zlib.createInflate({
- chunkSize: 128 * 1024
- });
+ this.inflate = null;
this.ws = null;
this.intents = intents;
@@ -40,7 +38,7 @@ class DiscordClient extends EventEmitter {
this._heartbeatInterval = setInterval(() => {
if (!this.gotServerHeartbeatACK) {
- this.emit("error", "NO_HEARTBEAT_ACK");
+ this.ws.close(1000, "No heartbeat ACK.");
return;
}
this.gotServerHeartbeatACK = false;
@@ -196,6 +194,9 @@ class DiscordClient extends EventEmitter {
const ws = new WebSocket(this.gatewayUrl);
this.ws = ws;
+ this.inflate = zlib.createInflate({
+ chunkSize: 128 * 1024
+ });
// we decompressed the data, send it to the handler now
this.inflate.on("data", (message) => this._handleGatewayMessage(ws, message));
@@ -207,6 +208,7 @@ class DiscordClient extends EventEmitter {
ws.on("close", (code, reason) => {
reason = reason.toString();
+ this.emit("close", code, reason);
console.error(`DiscordClient: on \`close\`: disconnected from gateway: code \`${code}\`, reason \`${reason}\``);
})
}
diff --git a/WatchedGuild.js b/WatchedGuild.js
index 4f0960c..8cc549a 100644
--- a/WatchedGuild.js
+++ b/WatchedGuild.js
@@ -1,4 +1,5 @@
import { EventEmitter } from "events";
+import { wait } from "./common.js";
class WatchedGuild extends EventEmitter {
constructor() {
@@ -12,11 +13,26 @@ class WatchedGuild extends EventEmitter {
this.emit("pushed", e);
}
- holdForEvent() {
- return new Promise((resolve, reject) => {
- // potential memory leak here when too many promises are created and waiting
- this.once("pushed", (event) => {
- resolve(event);
+ holdForEvent(timeout) {
+ return new Promise((outerResolve, outerReject) => {
+ let handler;
+ Promise.race([
+ new Promise((resolve, reject) => {
+ // potential memory leak here when too many promises are created and waiting
+ handler = (event) => {
+ resolve(event);
+ };
+ this.once("pushed", handler);
+ }),
+ wait(timeout, true)
+ ]).then((result) => {
+ if (handler)
+ this.removeListener("pushed", handler);
+ outerResolve(result);
+ }).catch(() => {
+ if (handler)
+ this.removeListener("pushed", handler);
+ outerResolve(null);
});
});
}
diff --git a/common.js b/common.js
index 348a4c8..222640f 100644
--- a/common.js
+++ b/common.js
@@ -7,9 +7,9 @@ export const bot = new DiscordClient(discordToken, {
intents: 0 | (1 << 0) | (1 << 9) // GUILDS & GUILD_MESSAGES
});
-export function wait(time) {
+export function wait(time, shouldReject=false) {
return new Promise((resolve, reject) => {
- setTimeout(() => resolve(), time);
+ setTimeout(() => shouldReject ? reject() : resolve(), time);
});
}
@@ -21,3 +21,8 @@ bot.on("READY", () => {
guildMap.set(id, watchedGuild);
});
});
+
+bot.on("close", (code, reason) => {
+ console.log("bot: connection closed, reconnecting...");
+ bot.connect();
+});
diff --git a/frontend/.gitignore b/frontend/.gitignore
new file mode 100644
index 0000000..da93220
--- /dev/null
+++ b/frontend/.gitignore
@@ -0,0 +1,4 @@
+/node_modules/
+/public/build/
+
+.DS_Store
diff --git a/frontend/README.md b/frontend/README.md
new file mode 100644
index 0000000..8ca4fca
--- /dev/null
+++ b/frontend/README.md
@@ -0,0 +1,109 @@
+*Psst — looking for a more complete solution? Check out [SvelteKit](https://kit.svelte.dev), the official framework for building web applications of all sizes, with a beautiful development experience and flexible filesystem-based routing.*
+
+*Looking for a shareable component template instead? You can [use SvelteKit for that as well](https://kit.svelte.dev/docs#packaging) or the older [sveltejs/component-template](https://github.com/sveltejs/component-template)*
+
+---
+
+# svelte app
+
+This is a project template for [Svelte](https://svelte.dev) apps. It lives at https://github.com/sveltejs/template.
+
+To create a new project based on this template using [degit](https://github.com/Rich-Harris/degit):
+
+```bash
+npx degit sveltejs/template svelte-app
+cd svelte-app
+```
+
+*Note that you will need to have [Node.js](https://nodejs.org) installed.*
+
+
+## Get started
+
+Install the dependencies...
+
+```bash
+cd svelte-app
+npm install
+```
+
+...then start [Rollup](https://rollupjs.org):
+
+```bash
+npm run dev
+```
+
+Navigate to [localhost:8080](http://localhost:8080). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
+
+By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
+
+If you're using [Visual Studio Code](https://code.visualstudio.com/) we recommend installing the official extension [Svelte for VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). If you are using other editors you may need to install a plugin in order to get syntax highlighting and intellisense.
+
+## Building and running in production mode
+
+To create an optimised version of the app:
+
+```bash
+npm run build
+```
+
+You can run the newly built app with `npm run start`. This uses [sirv](https://github.com/lukeed/sirv), which is included in your package.json's `dependencies` so that the app will work when you deploy to platforms like [Heroku](https://heroku.com).
+
+
+## Single-page app mode
+
+By default, sirv will only respond to requests that match files in `public`. This is to maximise compatibility with static fileservers, allowing you to deploy your app anywhere.
+
+If you're building a single-page app (SPA) with multiple routes, sirv needs to be able to respond to requests for *any* path. You can make it so by editing the `"start"` command in package.json:
+
+```js
+"start": "sirv public --single"
+```
+
+## Using TypeScript
+
+This template comes with a script to set up a TypeScript development environment, you can run it immediately after cloning the template with:
+
+```bash
+node scripts/setupTypeScript.js
+```
+
+Or remove the script via:
+
+```bash
+rm scripts/setupTypeScript.js
+```
+
+If you want to use `baseUrl` or `path` aliases within your `tsconfig`, you need to set up `@rollup/plugin-alias` to tell Rollup to resolve the aliases. For more info, see [this StackOverflow question](https://stackoverflow.com/questions/63427935/setup-tsconfig-path-in-svelte).
+
+## Deploying to the web
+
+### With [Vercel](https://vercel.com)
+
+Install `vercel` if you haven't already:
+
+```bash
+npm install -g vercel
+```
+
+Then, from within your project folder:
+
+```bash
+cd public
+vercel deploy --name my-project
+```
+
+### With [surge](https://surge.sh/)
+
+Install `surge` if you haven't already:
+
+```bash
+npm install -g surge
+```
+
+Then, from within your project folder:
+
+```bash
+npm run build
+surge public my-project.surge.sh
+```
diff --git a/frontend/package.json b/frontend/package.json
new file mode 100644
index 0000000..1fbd8f5
--- /dev/null
+++ b/frontend/package.json
@@ -0,0 +1,23 @@
+{
+ "name": "svelte-app",
+ "version": "1.0.0",
+ "private": true,
+ "scripts": {
+ "build": "rollup -c",
+ "dev": "rollup -c -w",
+ "start": "sirv public --no-clear"
+ },
+ "devDependencies": {
+ "@rollup/plugin-commonjs": "^17.0.0",
+ "@rollup/plugin-node-resolve": "^11.0.0",
+ "rollup": "^2.3.4",
+ "rollup-plugin-css-only": "^3.1.0",
+ "rollup-plugin-livereload": "^2.0.0",
+ "rollup-plugin-svelte": "^7.0.0",
+ "rollup-plugin-terser": "^7.0.0",
+ "svelte": "^3.0.0"
+ },
+ "dependencies": {
+ "sirv-cli": "^2.0.0"
+ }
+}
diff --git a/frontend/public/global.css b/frontend/public/global.css
new file mode 100644
index 0000000..57308bc
--- /dev/null
+++ b/frontend/public/global.css
@@ -0,0 +1,132 @@
+:root {
+ --body-bg-color: #2e2e2e;
+ --accent-bg-color: #d4d3d3;
+ --accent-color: #949494;
+ --grayed-text-color: #949494;
+ --button-accent-color: #3d3d3d;
+ --selected-bg-color: #2e2e2e;
+ --hover-bg-color: #4d4d4d;
+ --card-border-radius: 1rem;
+ --button-border-radius: 0.5rem;
+}
+
+html, body {
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+body {
+ font-weight: 500;
+ font-family: "Noto Sans", "Liberation Sans", sans-serif;
+
+ background-color: var(--body-bg-color);
+ color: var(--accent-bg-color);
+ margin: 0;
+ padding: 8px;
+ box-sizing: border-box;
+}
+
+a {
+ color: rgb(0,100,200);
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a:visited {
+ color: rgb(0,80,160);
+}
+
+label {
+ display: block;
+}
+
+input, button, select, textarea {
+ font-family: inherit;
+ font-size: inherit;
+ -webkit-padding: 0.4em 0;
+ padding: 0.4em;
+ margin: 0 0 0.5em 0;
+ box-sizing: border-box;
+ border: 1px solid #ccc;
+ border-radius: 2px;
+}
+
+input:disabled {
+ color: #ccc;
+}
+
+button {
+ color: #333;
+ background-color: #f4f4f4;
+ outline: none;
+}
+
+button:disabled {
+ color: #999;
+}
+
+button:not(:disabled):active {
+ background-color: #ddd;
+}
+
+button:focus {
+ border-color: #666;
+}
+
+
+/* basic ui */
+
+.card {
+ padding: 8px;
+ color: #030303;
+ border-radius: var(--card-border-radius);
+ background: var(--accent-bg-color);
+}
+
+.full-card {
+ box-sizing: border-box;
+ padding: 18px;
+ width: 100%;
+ box-shadow: 0 0 28px 3px rgba(0, 0, 0, 0.40);
+}
+
+.separated-card {
+ margin: 28px auto;
+}
+
+.button {
+ display: block;
+ padding: 12px;
+ margin: 4px;
+ text-decoration: none;
+ outline: none;
+ background-color: var(--accent-bg-color);
+ border-radius: var(--button-border-radius);
+ font-size: 18px;
+ color: var(--button-accent-color);
+ cursor: pointer;
+ outline: none;
+}
+
+.button:hover:not(.button-selected) {
+ color: var(--accent-bg-color);
+ background-color: var(--hover-bg-color);
+}
+
+.button-selected {
+ color: var(--accent-bg-color);
+ background-color: var(--selected-bg-color);
+}
+
+.input {
+ display: block;
+ box-sizing: border-box;
+ border: none;
+ outline: none;
+ border-radius: var(--button-border-radius);
+ padding: 12px;
+}
\ No newline at end of file
diff --git a/frontend/public/index.html b/frontend/public/index.html
new file mode 100644
index 0000000..e3785ef
--- /dev/null
+++ b/frontend/public/index.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ App
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/rollup.config.js b/frontend/rollup.config.js
new file mode 100644
index 0000000..e8965ec
--- /dev/null
+++ b/frontend/rollup.config.js
@@ -0,0 +1,76 @@
+import svelte from 'rollup-plugin-svelte';
+import commonjs from '@rollup/plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import livereload from 'rollup-plugin-livereload';
+import { terser } from 'rollup-plugin-terser';
+import css from 'rollup-plugin-css-only';
+
+const production = !process.env.ROLLUP_WATCH;
+
+function serve() {
+ let server;
+
+ function toExit() {
+ if (server) server.kill(0);
+ }
+
+ return {
+ writeBundle() {
+ if (server) return;
+ server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+ stdio: ['ignore', 'inherit', 'inherit'],
+ shell: true
+ });
+
+ process.on('SIGTERM', toExit);
+ process.on('exit', toExit);
+ }
+ };
+}
+
+export default {
+ input: 'src/main.js',
+ output: {
+ sourcemap: true,
+ format: 'iife',
+ name: 'app',
+ file: 'public/build/bundle.js'
+ },
+ plugins: [
+ svelte({
+ compilerOptions: {
+ // enable run-time checks when not in production
+ dev: !production
+ }
+ }),
+ // we'll extract any component CSS out into
+ // a separate file - better for performance
+ css({ output: 'bundle.css' }),
+
+ // If you have external dependencies installed from
+ // npm, you'll most likely need these plugins. In
+ // some cases you'll need additional configuration -
+ // consult the documentation for details:
+ // https://github.com/rollup/plugins/tree/master/packages/commonjs
+ resolve({
+ browser: true,
+ dedupe: ['svelte']
+ }),
+ commonjs(),
+
+ // In dev mode, call `npm run start` once
+ // the bundle has been generated
+ !production && serve(),
+
+ // Watch the `public` directory and refresh the
+ // browser on changes when not in production
+ !production && livereload('public'),
+
+ // If we're building for production (npm run build
+ // instead of npm run dev), minify
+ production && terser()
+ ],
+ watch: {
+ clearScreen: false
+ }
+};
diff --git a/frontend/src/api/APIClient.js b/frontend/src/api/APIClient.js
new file mode 100644
index 0000000..337ee63
--- /dev/null
+++ b/frontend/src/api/APIClient.js
@@ -0,0 +1,60 @@
+class APIClient {
+ constructor(baseUrl, token) {
+ this.baseUrl = baseUrl;
+ this.token = token;
+ }
+
+ async getRequest(path) {
+ const res = await fetch(`${this.baseUrl}${path}`, {
+ headers: {
+ "Authorization": this.token
+ }
+ });
+ if (!res.ok)
+ throw new Error("APIClient.getRequest(): request failed with non-200 http code");
+ return (await res.json());
+ }
+
+ async postRequest(path, body) {
+ const res = await fetch(`${this.baseUrl}${path}`, {
+ method: "POST",
+ headers: {
+ "Authorization": this.token,
+ "content-type": "application/json"
+ },
+ body: JSON.stringify(body)
+ });
+ if (!res.ok)
+ throw new Error("APIClient.postRequest(): request failed with non-200 http code");
+ return (await res.json());
+ }
+
+ createPollingListener(guildId, callback, errorCallback) {
+ if (!errorCallback)
+ errorCallback = () => {};
+
+ let shouldContinue = true;
+
+ const poll = async () => {
+ this.getRequest(`/guilds/${guildId}/events/poll`)
+ .then((result) => {
+ if (result.event) {
+ callback(result);
+ }
+ if (shouldContinue) {
+ poll();
+ }
+ })
+ .catch(errorCallback);
+ };
+
+ return {
+ poll,
+ stop() {
+ shouldContinue = false
+ }
+ }
+ }
+}
+
+export default APIClient;
diff --git a/frontend/src/api/common.js b/frontend/src/api/common.js
new file mode 100644
index 0000000..e1a2225
--- /dev/null
+++ b/frontend/src/api/common.js
@@ -0,0 +1,3 @@
+import APIClient from "./APIClient";
+
+export const apiClient = new APIClient(`${location.origin}/api/v1`, localStorage.getItem("token"));
\ No newline at end of file
diff --git a/frontend/src/components/App.svelte b/frontend/src/components/App.svelte
new file mode 100644
index 0000000..5e463d3
--- /dev/null
+++ b/frontend/src/components/App.svelte
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Message.svelte b/frontend/src/components/Message.svelte
new file mode 100644
index 0000000..c30198a
--- /dev/null
+++ b/frontend/src/components/Message.svelte
@@ -0,0 +1,22 @@
+
+
+
+
+
+ {message.author.username}
+ {message.content}
+
diff --git a/frontend/src/components/MessageEntry.svelte b/frontend/src/components/MessageEntry.svelte
new file mode 100644
index 0000000..bd80bd5
--- /dev/null
+++ b/frontend/src/components/MessageEntry.svelte
@@ -0,0 +1,18 @@
+
+
+
\ No newline at end of file
diff --git a/frontend/src/components/MessageList.svelte b/frontend/src/components/MessageList.svelte
new file mode 100644
index 0000000..ab27a4b
--- /dev/null
+++ b/frontend/src/components/MessageList.svelte
@@ -0,0 +1,27 @@
+
+
+
+
+
+ {#each messages as message}
+
+ {/each}
+
+