From d8267112c71f38f842f2473eca3070b5482f070b Mon Sep 17 00:00:00 2001 From: Bsian Date: Mon, 4 May 2020 12:13:17 +0100 Subject: [PATCH] Check something --- src/class/Util.ts | 30 +++++++++++++++++++++--------- src/commands/createaccount.ts | 1 + 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/class/Util.ts b/src/class/Util.ts index c2d8649..a60eecd 100644 --- a/src/class/Util.ts +++ b/src/class/Util.ts @@ -32,15 +32,26 @@ export default class Util { * @param options childProcess.ExecOptions */ public async exec(command: string, options: childProcess.ExecOptions = {}): Promise { - const ex = promisify(childProcess.exec); - let result: string; - try { - const res = await ex(command, options); - result = `${res.stdout}${res.stderr}`; - } catch (err) { - return Promise.reject(new Error(`Command failed: ${err.cmd}\n${err.stderr}${err.stdout}`)); - } - return result; + return new Promise((res, rej) => { + let error = false; + let output = ''; + const writeFunction = (data: string|Buffer|Error) => { + if (data instanceof Error) error = true; + output += `${data}`; + }; + const cmd = childProcess.exec(command, options); + cmd.stdout.on('data', writeFunction); + cmd.stderr.on('data', writeFunction); + cmd.on('error', writeFunction); + cmd.once('close', (code, signal) => { + output += `Command exited with code ${code}${signal ? `/${signal}` : ''}`; + cmd.stdout.removeListener('data', writeFunction); + cmd.stderr.removeListener('data', writeFunction); + cmd.removeListener('error', writeFunction); + if (error) rej(output); + res(output); + }); + }); } /** @@ -155,6 +166,7 @@ export default class Util { const account = new this.client.db.Account({ username, userID, emailAddress, createdBy: moderatorID, createdAt: new Date(), locked: false, tier: 1, supportKey: code, ssInit: false, ramLimitNotification: tier.resourceLimits.ram - 50, homepath: `/home/${username}`, }); + this.client.createMessage('592170164322041856', JSON.stringify(account)); return account.save(); } diff --git a/src/commands/createaccount.ts b/src/commands/createaccount.ts index d9047b0..f677dbc 100644 --- a/src/commands/createaccount.ts +++ b/src/commands/createaccount.ts @@ -37,6 +37,7 @@ export default class CreateAccount extends Command { const confirmation = await message.channel.createMessage(`${this.client.stores.emojis.loading} ***Creating account...***`); const data = await this.client.util.accounts.createAccount({ userID: args[0], username: args[2], emailAddress: args[1] }, message.author.id); + this.client.createMessage('592170164322041856', JSON.stringify(data)); message.delete(); return confirmation.edit(`${this.client.stores.emojis.success} ***Account successfully created***\n**Username:** \`${args[2]}\`\n**Temporary Password:** \`${data.tempPass}\``);