Skip to content

Commit b2c92d1

Browse files
committed
most bugs fixed. You have to work now!
1 parent 4e33e66 commit b2c92d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+530
-3478
lines changed

package-lock.json

+486-107
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.1",
44
"description": "NodeJS Backend Structure.",
55
"main": "dist/index.js",
6-
"preview": true,
6+
"preview": false,
77
"homepage": "https://github.com/darkwaves-ofc/NodeJS-Backend-Structure",
88
"bugs": {
99
"url": "https://github.com/darkwaves-ofc/NodeJS-Backend-Structure/issues",
@@ -54,24 +54,24 @@
5454
"license": "MIT",
5555
"devDependencies": {
5656
"@types/amqplib": "^0.10.4",
57+
"@types/bcrypt": "^5.0.2",
5758
"@types/circular-json": "^0.4.0",
5859
"@types/cookie-parser": "^1.4.6",
5960
"@types/ejs": "^3.1.5",
61+
"@types/events": "^3.0.0",
6062
"@types/express": "^4.17.21",
6163
"@types/jsonwebtoken": "^9.0.5",
6264
"@types/node": "^20.10.6",
6365
"@types/randomcolor": "^0.5.9",
6466
"@types/ua-parser-js": "^0.7.39",
6567
"@types/uuid": "^9.0.7",
6668
"@types/ws": "^8.5.10",
67-
"eslint": "^8.56.0",
68-
"typescript": "^5.3.3",
69-
"@types/events": "^3.0.0",
7069
"discord.js": "^14.6.0",
70+
"eslint": "^8.56.0",
7171
"prettier": "^2.7.1",
7272
"tslint": "^6.1.3",
73-
"tslint-config-prettier": "^1.18.0"
74-
73+
"tslint-config-prettier": "^1.18.0",
74+
"typescript": "^5.3.3"
7575
},
7676
"dependencies": {
7777
"amqplib": "^0.10.3",

src/handlers/loadincomingEvents.ts

+23-13
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ interface Client {
1919
}
2020

2121
interface WebSocketPath {
22-
name: string;
23-
run: (client: Client, socket: Socket, request: any) => void;
22+
default: {
23+
name: string;
24+
run: (client: Client, socket: Socket, request: any) => void;
25+
};
2426
}
2527

2628
export = class WebSocketInitializer {
@@ -34,7 +36,7 @@ export = class WebSocketInitializer {
3436

3537
public async start() {
3638
this.client.wsevents = new EventEmitter().setMaxListeners(
37-
0,
39+
0
3840
) as EventEmitter;
3941

4042
const io = new socketIo.Server(this.client.server, {
@@ -68,27 +70,35 @@ export = class WebSocketInitializer {
6870
next();
6971
});
7072

71-
let versions = await new Promise<string[]>((resolve) => {
72-
readdir("./src/websocket", (err, files) => {
73-
resolve(files);
73+
let versions: string[] = []; // Ensure versions is initialized as an array
74+
try {
75+
versions = await new Promise<string[]>((resolve) => {
76+
readdir("./dist/websocket", (err, files) => {
77+
if (err) {
78+
console.error("Error reading directory:", err);
79+
resolve([]); // Resolve with an empty array if there's an error
80+
} else {
81+
resolve(files);
82+
}
83+
});
7484
});
75-
});
85+
} catch (error) {
86+
console.error("Error getting versions:", error);
87+
}
7688

7789
for (const version of versions) {
7890
const websocketFiles = await new Promise<string[]>((resolve, reject) => {
79-
readdir(`./src/websocket/${version}/`, (err, files) => {
91+
readdir(`./dist/websocket/${version}/`, (err, files) => {
8092
if (err) reject(err);
8193
resolve(files?.filter((f) => f.endsWith(".js")) || []);
8294
});
8395
});
8496

8597
for (const file of websocketFiles) {
8698
try {
87-
const path: WebSocketPath = require(
88-
`../websocket/${version}/${file}`,
89-
);
90-
if (path.name && typeof path.run === "function") {
91-
this.client.wspaths.set(`/${version}${path.name}`, path);
99+
const path: WebSocketPath = require(`../websocket/${version}/${file}`);
100+
if (path.default.name && typeof path.default.run === "function") {
101+
this.client.wspaths.set(`/${version}${path.default.name}`, path);
92102
} else {
93103
console.log(`Invalid module: ${file}`);
94104
}

src/handlers/loadroutes.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ export = class RoutesInitializer {
2626

2727
public async start() {
2828
let versions = await new Promise<string[]>((resolve) => {
29-
readdir("./src/routes", (err, files) => {
29+
readdir("./dist/routes", (err, files) => {
3030
resolve(files);
3131
});
3232
});
3333

3434
for (const version of versions) {
3535
const dirs = await new Promise<string[]>((resolve) => {
36-
readdir(`./src/routes/${version}/`, (err, dirs) => {
36+
readdir(`./dist/routes/${version}/`, (err, dirs) => {
3737
resolve(dirs);
3838
});
3939
});
4040

4141
for (const dir of dirs) {
4242
const webFiles = await new Promise<string[]>((resolve) => {
43-
readdir(`./src/routes/${version}/${dir}/`, (err, files) => {
43+
readdir(`./dist/routes/${version}/${dir}/`, (err, files) => {
4444
resolve(files?.filter((f) => f.endsWith(".js")) || []);
4545
});
4646
});

src/routes/v1/broadcast/delete.js

Whitespace-only changes.

src/routes/v1/broadcast/get.js

-58
This file was deleted.

src/routes/v1/dashboard/delete.js

-42
This file was deleted.

src/routes/v1/dashboard/get.js

-65
This file was deleted.

src/routes/v1/dashboard/patch.js

-67
This file was deleted.

0 commit comments

Comments
 (0)