Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove webrtc from bundle

Browse Source
This commit is contained in:
Madeline 2022-09-21 14:41:21 +10:00
parent ebbb2653ee
commit f334cd6f0f
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundle/package.json
View File

@ -66,9 +66,8 @@
"@fosscord/api": "file:../api", "@fosscord/api": "file:../api",
"@fosscord/cdn": "file:../cdn", "@fosscord/cdn": "file:../cdn",
"@fosscord/gateway": "file:../gateway", "@fosscord/gateway": "file:../gateway",
"@fosscord/webrtc": "file:../webrtc", "@sentry/node": "^7.13.0",
"@sentry/node": "^6.16.1", "@sentry/tracing": "^7.13.0",
"@sentry/tracing": "^6.16.1",
"@yukikaze-bot/erlpack": "^1.0.1", "@yukikaze-bot/erlpack": "^1.0.1",
"ajv": "8.6.2", "ajv": "8.6.2",
"ajv-formats": "^2.1.1", "ajv-formats": "^2.1.1",

3
bundle/scripts/build.js
View File

@ -7,8 +7,7 @@ const { argv } = require("process");
var steps = 2, i = 0; var steps = 2, i = 0;
if (argv.includes("clean")) steps++; if (argv.includes("clean")) steps++;
if (argv.includes("copyonly")) 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"); const verbose = argv.includes("verbose") || argv.includes("v");
var copyRecursiveSync = function(src, dest) { var copyRecursiveSync = function(src, dest) {

10
bundle/src/Server.ts
View File

@ -4,7 +4,6 @@ process.on("uncaughtException", console.error);
import http from "http"; import http from "http";
import * as Api from "@fosscord/api"; import * as Api from "@fosscord/api";
import * as Gateway from "@fosscord/gateway"; import * as Gateway from "@fosscord/gateway";
import * as WebRTC from "@fosscord/webrtc";
import { CDNServer } from "@fosscord/cdn"; import { CDNServer } from "@fosscord/cdn";
import express from "express"; import express from "express";
import { green, bold, yellow } from "picocolors"; import { green, bold, yellow } from "picocolors";
@ -21,14 +20,13 @@ server.on("request", app);
const api = new Api.FosscordServer({ server, port, production, app }); const api = new Api.FosscordServer({ server, port, production, app });
const cdn = new CDNServer({ server, port, production, app }); const cdn = new CDNServer({ server, port, production, app });
const gateway = new Gateway.Server({ server, port, production }); 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 //this is what has been added for the /stop API route
process.on('SIGTERM', () => { process.on('SIGTERM', () => {
server.close(() => { 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 //this is what has been added for the /stop API route
async function main() { async function main() {
@ -89,7 +87,7 @@ async function main() {
app.use(Sentry.Handlers.tracingHandler()); 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) { if (Config.get().sentry.enabled) {
app.use(Sentry.Handlers.errorHandler()); app.use(Sentry.Handlers.errorHandler());

4
gateway/src/util/Constants.ts
View File

@ -1,4 +1,4 @@
import { VoiceOPCodes } from "@fosscord/webrtc"; // import { VoiceOPCodes } from "@fosscord/webrtc";
export enum OPCODES { export enum OPCODES {
Dispatch = 0, Dispatch = 0,
@ -45,7 +45,7 @@ export enum CLOSECODES {
} }
export interface Payload { export interface Payload {
op: OPCODES | VoiceOPCodes; op: OPCODES /* | VoiceOPCodes */;
d?: any; d?: any;
s?: number; s?: number;
t?: string; t?: string;

4
gateway/src/util/WebSocket.ts
View File

@ -1,7 +1,7 @@
import { Intents, Permissions } from "@fosscord/util"; import { Intents, Permissions } from "@fosscord/util";
import WS from "ws"; import WS from "ws";
import { Deflate, Inflate } from "fast-zlib"; import { Deflate, Inflate } from "fast-zlib";
import { Client } from "@fosscord/webrtc"; // import { Client } from "@fosscord/webrtc";
export interface WebSocket extends WS { export interface WebSocket extends WS {
version: number; version: number;
@ -22,5 +22,5 @@ export interface WebSocket extends WS {
events: Record<string, Function>; events: Record<string, Function>;
member_events: Record<string, Function>; member_events: Record<string, Function>;
listen_options: any; listen_options: any;
client?: Client; // client?: Client;
} }

4
gateway/tsconfig.json
View File

@ -77,8 +77,8 @@
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"@fosscord/gateway": ["src/index.ts"], "@fosscord/gateway": ["src/index.ts"],
"@fosscord/util": ["../util/src/index"], "@fosscord/util": ["../util/src/index"]
"@fosscord/webrtc": ["../webrtc/src/index"] // "@fosscord/webrtc": ["../webrtc/src/index"]
}, },
"plugins": [{ "transform": "@zerollup/ts-transform-paths" }] "plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
} }