diff options
| -rw-r--r-- | api/scripts/generate_schema.js | 2 | ||||
| -rw-r--r-- | bundle/src/Server.ts | 16 | ||||
| -rw-r--r-- | gateway/package.json | 2 | ||||
| -rw-r--r-- | gateway/src/Server.ts | 15 | ||||
| -rw-r--r-- | gateway/src/events/Connection.ts | 7 | ||||
| -rw-r--r-- | gateway/src/util/Heartbeat.ts (renamed from gateway/src/util/setHeartbeat.ts) | 0 | ||||
| -rw-r--r-- | gateway/src/util/WebSocket.ts | 1 | ||||
| -rw-r--r-- | gateway/src/util/index.ts | 2 | ||||
| -rw-r--r-- | gateway/tsconfig.json | 3 |
9 files changed, 36 insertions, 12 deletions
diff --git a/api/scripts/generate_schema.js b/api/scripts/generate_schema.js index 6bc35fe8..c12f6b1a 100644 --- a/api/scripts/generate_schema.js +++ b/api/scripts/generate_schema.js @@ -58,7 +58,7 @@ function main() { modify(definitions); - fs.writeFileSync(schemaPath, JSON.stringify(definitions, null, 4).replace(/ "additionalProperties": ?false,?/g, "")); + fs.writeFileSync(schemaPath, JSON.stringify(definitions, null, 4)); } main(); diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index 62764e8e..3a56ee2e 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -38,9 +38,23 @@ async function main() { '${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}', endpointPrivate: `ws://localhost:${port}`, ...(!Config.get().gateway.endpointPublic && { - endpointPublic: `http://localhost:${port}`, + endpointPublic: `ws://localhost:${port}`, }), }, + // regions: { + // default: "fosscord", + // useDefaultAsOptimal: true, + // available: [ + // { + // id: "fosscord", + // name: "Fosscord", + // endpoint: "127.0.0.1:3001", + // vip: false, + // custom: false, + // deprecated: false, + // }, + // ], + // }, } as any); await Promise.all([api.start(), cdn.start(), gateway.start()]); diff --git a/gateway/package.json b/gateway/package.json index d0292925..863d7f4e 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -4,7 +4,7 @@ "description": "", "main": "dist/index.js", "scripts": { - "postinstall": "ts-patch install -s", + "postinstall": "npx ts-patch install -s", "test": "echo \"Error: no test specified\" && exit 1", "start": "npm run build && node dist/start.js", "build": "npx tsc -b .", diff --git a/gateway/src/Server.ts b/gateway/src/Server.ts index 944174c7..b4e92a75 100644 --- a/gateway/src/Server.ts +++ b/gateway/src/Server.ts @@ -1,7 +1,7 @@ import "missing-native-js-functions"; import dotenv from "dotenv"; dotenv.config(); -import { closeDatabase, Config, initDatabase, initEvent, RabbitMQ } from "@fosscord/util"; +import { closeDatabase, Config, initDatabase, initEvent } from "@fosscord/util"; import { Server as WebSocketServer } from "ws"; import { Connection } from "./events/Connection"; import http from "http"; @@ -12,15 +12,24 @@ export class Server { public server: http.Server; public production: boolean; - constructor({ port, server, production }: { port: number; server?: http.Server; production?: boolean }) { + constructor({ + port, + server, + production, + }: { + port: number; + server?: http.Server; + production?: boolean; + }) { this.port = port; this.production = production || false; if (server) this.server = server; - else + else { this.server = http.createServer(function (req, res) { res.writeHead(200).end("Online"); }); + } this.server.on("upgrade", (request, socket, head) => { console.log("socket requests upgrade", request.url); diff --git a/gateway/src/events/Connection.ts b/gateway/src/events/Connection.ts index 85f92b77..f84f9d9b 100644 --- a/gateway/src/events/Connection.ts +++ b/gateway/src/events/Connection.ts @@ -35,8 +35,11 @@ export async function Connection( // @ts-ignore socket.encoding = searchParams.get("encoding") || "json"; if (!["json", "etf"].includes(socket.encoding)) { - if (socket.encoding === "etf" && erlpack) - throw new Error("Erlpack is not installed: 'npm i -D erlpack'"); + if (socket.encoding === "etf" && erlpack) { + throw new Error( + "Erlpack is not installed: 'npm i @yukikaze-bot/erlpack'" + ); + } return socket.close(CLOSECODES.Decode_error); } diff --git a/gateway/src/util/setHeartbeat.ts b/gateway/src/util/Heartbeat.ts index f6871cfe..f6871cfe 100644 --- a/gateway/src/util/setHeartbeat.ts +++ b/gateway/src/util/Heartbeat.ts diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts index b80265a7..49626b2a 100644 --- a/gateway/src/util/WebSocket.ts +++ b/gateway/src/util/WebSocket.ts @@ -1,7 +1,6 @@ import { Intents, Permissions } from "@fosscord/util"; import WS from "ws"; import { Deflate } from "zlib"; -import { Channel } from "amqplib"; export interface WebSocket extends WS { version: number; diff --git a/gateway/src/util/index.ts b/gateway/src/util/index.ts index 27af5813..0be5ecee 100644 --- a/gateway/src/util/index.ts +++ b/gateway/src/util/index.ts @@ -1,5 +1,5 @@ export * from "./Constants"; export * from "./Send"; export * from "./SessionUtils"; -export * from "./setHeartbeat"; +export * from "./Heartbeat"; export * from "./WebSocket"; diff --git a/gateway/tsconfig.json b/gateway/tsconfig.json index dd066383..7143c8a3 100644 --- a/gateway/tsconfig.json +++ b/gateway/tsconfig.json @@ -71,8 +71,7 @@ "baseUrl": ".", "paths": { "@fosscord/gateway": ["src/index"], - "@fosscord/gateway/*": ["src/*"], - "@fosscord/util/*": ["../util/src/*"] + "@fosscord/gateway/*": ["src/*"] }, "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] } |