summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-09-21 14:41:21 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-09-21 14:41:21 +1000
commitf334cd6f0fdb5d5efc6dfac642f0d34b9e78d888 (patch)
tree0ab9cabcf6ab195328e9da3178a5c748a6616f03
parentRandom webrtc crap (diff)
downloadserver-f334cd6f0fdb5d5efc6dfac642f0d34b9e78d888.tar.xz
Remove webrtc from bundle
-rw-r--r--bundle/package.json5
-rw-r--r--bundle/scripts/build.js3
-rw-r--r--bundle/src/Server.ts10
-rw-r--r--gateway/src/util/Constants.ts4
-rw-r--r--gateway/src/util/WebSocket.ts4
-rw-r--r--gateway/tsconfig.json4
6 files changed, 13 insertions, 17 deletions
diff --git a/bundle/package.json b/bundle/package.json

index 3eb49719..3c1f5a8c 100644 --- a/bundle/package.json +++ b/bundle/package.json
@@ -66,9 +66,8 @@ "@fosscord/api": "file:../api", "@fosscord/cdn": "file:../cdn", "@fosscord/gateway": "file:../gateway", - "@fosscord/webrtc": "file:../webrtc", - "@sentry/node": "^6.16.1", - "@sentry/tracing": "^6.16.1", + "@sentry/node": "^7.13.0", + "@sentry/tracing": "^7.13.0", "@yukikaze-bot/erlpack": "^1.0.1", "ajv": "8.6.2", "ajv-formats": "^2.1.1", diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js
index 06e01e2f..dfe7dfa1 100644 --- a/bundle/scripts/build.js +++ b/bundle/scripts/build.js
@@ -7,8 +7,7 @@ const { argv } = require("process"); var steps = 2, i = 0; if (argv.includes("clean")) steps++; if (argv.includes("copyonly")) steps--; -const dirs = ["api", "util", "cdn", "gateway", "bundle", "webrtc"]; - +const dirs = ["api", "util", "cdn", "gateway", "bundle"]; const verbose = argv.includes("verbose") || argv.includes("v"); var copyRecursiveSync = function(src, dest) { diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts
index 39a49b53..fa99cf07 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts
@@ -4,7 +4,6 @@ process.on("uncaughtException", console.error); import http from "http"; import * as Api from "@fosscord/api"; import * as Gateway from "@fosscord/gateway"; -import * as WebRTC from "@fosscord/webrtc"; import { CDNServer } from "@fosscord/cdn"; import express from "express"; import { green, bold, yellow } from "picocolors"; @@ -21,14 +20,13 @@ server.on("request", app); const api = new Api.FosscordServer({ server, port, production, app }); const cdn = new CDNServer({ server, port, production, app }); const gateway = new Gateway.Server({ server, port, production }); -const webrtc = new WebRTC.Server({ server, port, production }); //this is what has been added for the /stop API route process.on('SIGTERM', () => { server.close(() => { - console.log("Stop API has been successfully POSTed, SIGTERM sent") - }) -}) + console.log("Stop API has been successfully POSTed, SIGTERM sent"); + }); +}); //this is what has been added for the /stop API route async function main() { @@ -89,7 +87,7 @@ async function main() { app.use(Sentry.Handlers.tracingHandler()); } - await Promise.all([api.start(), cdn.start(), gateway.start(), webrtc.start()]); + await Promise.all([api.start(), cdn.start(), gateway.start()]); if (Config.get().sentry.enabled) { app.use(Sentry.Handlers.errorHandler()); diff --git a/gateway/src/util/Constants.ts b/gateway/src/util/Constants.ts
index 5441118b..ff9b5525 100644 --- a/gateway/src/util/Constants.ts +++ b/gateway/src/util/Constants.ts
@@ -1,4 +1,4 @@ -import { VoiceOPCodes } from "@fosscord/webrtc"; +// import { VoiceOPCodes } from "@fosscord/webrtc"; export enum OPCODES { Dispatch = 0, @@ -45,7 +45,7 @@ export enum CLOSECODES { } export interface Payload { - op: OPCODES | VoiceOPCodes; + op: OPCODES /* | VoiceOPCodes */; d?: any; s?: number; t?: string; diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts
index d549ec77..930fa78a 100644 --- a/gateway/src/util/WebSocket.ts +++ b/gateway/src/util/WebSocket.ts
@@ -1,7 +1,7 @@ import { Intents, Permissions } from "@fosscord/util"; import WS from "ws"; import { Deflate, Inflate } from "fast-zlib"; -import { Client } from "@fosscord/webrtc"; +// import { Client } from "@fosscord/webrtc"; export interface WebSocket extends WS { version: number; @@ -22,5 +22,5 @@ export interface WebSocket extends WS { events: Record<string, Function>; member_events: Record<string, Function>; listen_options: any; - client?: Client; + // client?: Client; } diff --git a/gateway/tsconfig.json b/gateway/tsconfig.json
index cc694102..e1508f89 100644 --- a/gateway/tsconfig.json +++ b/gateway/tsconfig.json
@@ -77,8 +77,8 @@ "baseUrl": ".", "paths": { "@fosscord/gateway": ["src/index.ts"], - "@fosscord/util": ["../util/src/index"], - "@fosscord/webrtc": ["../webrtc/src/index"] + "@fosscord/util": ["../util/src/index"] + // "@fosscord/webrtc": ["../webrtc/src/index"] }, "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] }