Use fs async

Author: catplvsplus

src/Kirin/classes/APIClient.ts

@@ -1,5 +1,4 @@
 import { RequestHandler, RequestHandlerOptions } from './RequestHandler.js';
-import { existsSync, lstatSync, mkdirSync, readdirSync } from 'fs';
 import express, { Express, Request, Response } from 'express';
 import { SocketEvents } from '../types/SocketEvents.js';
 import { Server as SocketServer } from 'socket.io';
@@ -10,8 +9,10 @@ import { Logger } from 'fallout-utility';
 import { Kirin } from '../../Kirin.js';
 import bodyParser from 'body-parser';
 import { fileURLToPath } from 'url';
+import { existsSync } from 'fs';
 import path from 'path';
 import cors from 'cors';
+import { mkdir, readdir, stat } from 'fs/promises';
 
 export class APIClient<Ready extends boolean = boolean> {
     private _express: Express = express();
@@ -66,9 +67,9 @@ export class APIClient<Ready extends boolean = boolean> {
     }
 
     public async loadRoutes(): Promise<void> {
-        if (!existsSync(this.routesDir)) mkdirSync(this.routesDir);
+        if (!existsSync(this.routesDir)) await mkdir(this.routesDir);
 
-        const files = readdirSync(this.routesDir).map(f => path.join(this.routesDir, f)).filter(f => f.endsWith('.js') && lstatSync(f).isFile());
+        const files = await Promise.all((await readdir(this.routesDir)).map(f => path.join(this.routesDir, f)).filter(async f => f.endsWith('.js') && (await stat(f)).isFile()));
 
         for (const file of files) {
             try {

src/Kirin/classes/Server.ts

@@ -1,14 +1,14 @@
 import { APIButtonComponentBase, BaseMessageOptions, ButtonBuilder, ButtonStyle, ChannelType, ComponentType, Guild, GuildTextBasedChannel, If, Message, PermissionResolvable, PermissionsBitField, StageChannel, inlineCode, mergeDefault } from 'discord.js';
 import { Logger, recursiveObjectReplaceValues, PartialDeep } from 'fallout-utility';
 import { resolveFromCachedManager } from '../utils/managers.js';
-import { readFileSync, rmSync, writeFileSync } from 'fs';
 import { PingData, pingServer } from '../utils/ping.js';
 import { ChildProcess, spawn } from 'child_process';
 import { ServerManager } from './ServerManager.js';
 import { Kirin } from '../../Kirin.js';
 import { randomBytes } from 'crypto';
 import { cli } from 'reciple';
 import path from 'path';
+import { readFile, rm, writeFile } from 'fs/promises';
 
 export type ServerDataWithIdStatus = ServerData & { id: string; status: ServerStatus; };
 
@@ -156,7 +156,6 @@ export class Server<Ready extends boolean = boolean> {
             detached: !this.server.killOnBotStop,
             killSignal: this.server.killSignal || 'SIGINT',
             env: process.env,
-            // shell: true,
             stdio: []
         });
 
@@ -256,7 +255,7 @@ export class Server<Ready extends boolean = boolean> {
 
         this._deleted = true;
 
-        if (deleteJsonFile && this.file) rmSync(this.file, { force: true, recursive: true });
+        if (deleteJsonFile && this.file) await rm(this.file, { force: true, recursive: true });
     }
 
     public async update(options: PartialDeep<ServerData>): Promise<this> {
@@ -279,7 +278,7 @@ export class Server<Ready extends boolean = boolean> {
         if (isFetch) await this.fetch();
         if (!oldOptions.messageId && newOptions.messageId && this.channel) await this.createMessage({ deleteOld: true });
 
-        this.saveJson();
+        await this.saveJson();
 
         return this;
     }
@@ -302,7 +301,7 @@ export class Server<Ready extends boolean = boolean> {
             this.options.channelId = channel?.id;
         }
 
-        this.saveJson();
+        await this.saveJson();
     }
 
     public async ping(): Promise<PingData> {
@@ -321,12 +320,12 @@ export class Server<Ready extends boolean = boolean> {
         return newPing;
     }
 
-    public saveJson(file?: string | null): void {
+    public async saveJson(file?: string | null): Promise<void> {
         file = file ?? this.file;
         if (!file) throw new Error('No file path specified');
         if (!this.file) this.options.file = file;
 
-        writeFileSync(file, JSON.stringify(this.toJSON(true), null, 2));
+        await writeFile(file, JSON.stringify(this.toJSON(true), null, 2));
     }
 
     public isFetched(): this is Server<true> {
@@ -381,7 +380,7 @@ export class Server<Ready extends boolean = boolean> {
             if (cached) return cached;
         }
 
-        const serverJson: ServerData = JSON.parse(readFileSync(file, 'utf-8'));
+        const serverJson: ServerData = JSON.parse(await readFile(file, 'utf-8'));
         const server: Server = new Server(serverJson, kirin);
 
         serverJson.file = file;

src/Kirin/routes/create.ts

@@ -1,8 +1,8 @@
 import { Server, ServerData } from '../classes/Server.js';
-import { mkdirSync, rmSync, writeFileSync } from 'fs';
 import { APIClient } from '../classes/APIClient.js';
 import crypto from 'crypto';
 import path from 'path';
+import { mkdir, rm, writeFile } from 'fs/promises';
 
 export default (api: APIClient) => {
     const apiPath = api.apiPath + '/servers';
@@ -17,13 +17,13 @@ export default (api: APIClient) => {
 
                 const file = path.join(api.kirin.serversDir, crypto.randomBytes(10).toString('base64url') + '.json');
 
-                mkdirSync(api.kirin.serversDir, { recursive: true });
-                writeFileSync(file, JSON.stringify(data, null, 2));
+                await mkdir(api.kirin.serversDir, { recursive: true });
+                await writeFile(file, JSON.stringify(data, null, 2));
 
                 const server = await Server.from(file, api.kirin, true).catch(() => null);
 
                 if (!server) {
-                    rmSync(file, { force: true });
+                    await rm(file, { force: true });
                     return requestHandler.sendAPIErrorResponse(400, { error: 'ServerCreateFailed', message: 'Unable to resolve server data' });
                 }
 

src/KirinAdmin.ts

@@ -1,13 +1,13 @@
-import { APIModalInteractionResponseCallbackData, ButtonStyle, ChatInputCommandInteraction, ComponentType, EmbedBuilder, Message, TextInputBuilder, TextInputStyle } from 'discord.js';
+import { APIModalInteractionResponseCallbackData, ButtonStyle, ChatInputCommandInteraction, ComponentType, EmbedBuilder, Message, TextInputBuilder, TextInputStyle, codeBlock } from 'discord.js';
 import { AnyCommandBuilder, AnyCommandData, RecipleClient, RecipleModuleScript, SlashCommandBuilder, cli } from 'reciple';
 import { recursiveObjectReplaceValues } from 'fallout-utility';
 import { Server, ServerData } from './Kirin/classes/Server.js';
 import { serverOption } from './Kirin/utils/commandOption.js';
 import { commandHalt } from './Kirin/utils/commandHalt.js';
-import { mkdirSync, rmSync, writeFileSync } from 'fs';
 import kirin, { Kirin } from './Kirin.js';
 import { randomBytes } from 'crypto';
 import path from 'path';
+import { mkdir, rm, writeFile } from 'fs/promises';
 
 export class KirinAdmin implements RecipleModuleScript {
     readonly versions: string = '^7';
@@ -155,8 +155,8 @@ export class KirinAdmin implements RecipleModuleScript {
                 command: 'java',
                 cwd: modalInteraction.fields.getTextInputValue('cwd'),
                 jar: modalInteraction.fields.getTextInputValue('jar'),
-                args: modalInteraction.fields.getTextInputValue('args').split(/(\s+)/).filter(Boolean),
-                serverArgs: modalInteraction.fields.getTextInputValue('serverArgs').split(/(\s+)/).filter(Boolean),
+                args: modalInteraction.fields.getTextInputValue('args').split(/(\s+)/).filter(v => v.trim()),
+                serverArgs: modalInteraction.fields.getTextInputValue('serverArgs').split(/(\s+)/).filter(v => v.trim()),
                 killOnBotStop: false,
                 killSignal: 'SIGINT'
             },
@@ -201,14 +201,21 @@ export class KirinAdmin implements RecipleModuleScript {
 
         const file = path.join(this.kirin.serversDir, randomBytes(10).toString('base64url') + '.json');
 
-        mkdirSync(this.kirin.serversDir, { recursive: true });
-        writeFileSync(file, JSON.stringify(serverData, null, 2));
+        await mkdir(this.kirin.serversDir, { recursive: true });
+        await writeFile(file, JSON.stringify(serverData, null, 2));
 
-        const server = await Server.from(file, this.kirin, true).catch(() => null);
+        let err: any;
+
+        const server = await Server.from(file, this.kirin, true).catch(error => {
+            err = error;
+        });
 
         if (!server) {
+            this.kirin.logger?.err(err);
+            await interaction.editReply(`An error occured while creating server!\n${codeBlock(String(err))}`);
             await message?.delete().catch(() => {});
-            rmSync(file, { force: true });
+            await rm(file, { force: true });
+            return;
         }
 
         await modalInteraction.editReply('Server created!');