diff --git a/package-lock.json b/package-lock.json
index 7315fbd6..b7bb7da6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.0",
+ "@fosscord/server-util": "^1.3.1",
"ajv": "^8.5.0",
"dotenv": "^8.2.0",
"jsonwebtoken": "^8.5.1",
@@ -31,9 +31,9 @@
}
},
"node_modules/@fosscord/server-util": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
- "integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.1.tgz",
+ "integrity": "sha512-NmrJ8HcZmOHyIUDMoQ+UnjoeMMi/HSbN2p/EMt1penTDSBvWcD8YS5m2NljuH0QxSmhuA2yLgSEpV1ydvJmOIw==",
"dependencies": {
"@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1",
@@ -2217,9 +2217,9 @@
},
"dependencies": {
"@fosscord/server-util": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
- "integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.1.tgz",
+ "integrity": "sha512-NmrJ8HcZmOHyIUDMoQ+UnjoeMMi/HSbN2p/EMt1penTDSBvWcD8YS5m2NljuH0QxSmhuA2yLgSEpV1ydvJmOIw==",
"requires": {
"@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1",
diff --git a/package.json b/package.json
index f45b0008..78fd3939 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"author": "Fosscord",
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.0",
+ "@fosscord/server-util": "^1.3.1",
"ajv": "^8.5.0",
"dotenv": "^8.2.0",
"jsonwebtoken": "^8.5.1",
diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index be805eda..0781afde 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -17,7 +17,7 @@ import { IdentifySchema } from "../schema/Identify";
import { Send } from "../util/Send";
import experiments from "./experiments.json";
import { check } from "./instanceOf";
-import { DefaultOptions, gatewayConfig } from "../util/Config";
+import * as Config from "../util/Config";
// TODO: bot sharding
// TODO: check priviliged intents
@@ -30,7 +30,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const identify: IdentifySchema = data.d;
try {
- const { jwtSecret } = (gatewayConfig.getAll() as DefaultOptions).security;
+ const { jwtSecret } = Config.gatewayConfig.getAll().security;
var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
} catch (error) {
console.error("invalid token", error);
diff --git a/src/util/Config.ts b/src/util/Config.ts
index 138e1c2f..8489888c 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -33,4 +33,4 @@ const ajv = new Ajv();
const validator = ajv.compile(schema);
const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
-export const gatewayConfig = new Config({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file
+export const gatewayConfig = new Config<DefaultOptions>({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file
|
