@power-bots/powerbotlibrary 0.1.0 → 0.2.0

package/README.md

@@ -11,10 +11,11 @@ npm install @power-bots/powerbotlibrary
 
 ## Usage
 ```typescript
-import { Bot } from "@power-bots/powerbotlibrary"
-import { db } from "@power-bots/powerbotlibrary" // If you want to use database
+import { bot } from "@power-bots/powerbotlibrary"
+import { knex } from "@power-bots/powerbotlibrary" // If you want to use database
 
-const bot = new Bot(__dirname)
+bot.setup(__dirname)
+bot.run()
 ```
 
 More documentation will be available soon.

package/dist/db.d.ts

@@ -1,2 +1,4 @@
-export declare const db: any;
-export declare function updateDatabase(dirname: any): void;
+import { Knex } from "knex";
+export declare let knex: Knex;
+export declare function setupDatabase(): Promise<void>;
+export declare function updateDatabase(): Promise<void>;

package/dist/db.js

@@ -1,31 +1,58 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.db = void 0;
+exports.knex = void 0;
+exports.setupDatabase = setupDatabase;
 exports.updateDatabase = updateDatabase;
-const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
-exports.db = new better_sqlite3_1.default('bot.db');
-exports.db.pragma('journal_mode = WAL');
-exports.db.defaultSafeIntegers();
-function updateDatabase(dirname) {
-    const userVersion = parseInt(exports.db.pragma('user_version', { simple: true }));
-    const migrateFolder = node_path_1.default.join(dirname, "migrate");
-    if (!node_fs_1.default.existsSync(migrateFolder))
-        return;
-    let updating = true;
-    let nextVersion = userVersion;
-    while (updating) {
-        nextVersion = nextVersion + 1;
-        const nextVersionFile = node_path_1.default.join(migrateFolder, `${nextVersion}.sql`);
-        if (!node_fs_1.default.existsSync(nextVersionFile)) {
-            updating = false;
-            break;
+const main_1 = require("./main");
+function setupDatabase() {
+    return __awaiter(this, void 0, void 0, function* () {
+        exports.knex = require("knex")({
+            client: 'better-sqlite3',
+            connection: {
+                filename: node_path_1.default.join(main_1.bot.dirname, '../bot.db')
+            },
+            useNullAsDefault: true,
+            pool: {
+                afterCreate: (conn, done) => {
+                    conn.pragma('journal_mode = WAL');
+                    done(null, conn);
+                }
+            }
+        });
+    });
+}
+function updateDatabase() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const userVersion = (yield exports.knex.raw("PRAGMA user_version;"))[0].user_version;
+        const migrateFolder = node_path_1.default.join(main_1.bot.dirname, "migrate");
+        if (!node_fs_1.default.existsSync(migrateFolder))
+            return;
+        let updating = true;
+        let nextVersion = userVersion;
+        const rawDb = yield exports.knex.client.acquireConnection();
+        while (updating) {
+            nextVersion = nextVersion + 1;
+            const nextVersionFile = node_path_1.default.join(migrateFolder, `${nextVersion}.sql`);
+            if (!node_fs_1.default.existsSync(nextVersionFile)) {
+                updating = false;
+                break;
+            }
+            yield rawDb.exec(node_fs_1.default.readFileSync(nextVersionFile, { encoding: "utf-8" }));
+            rawDb.pragma(`user_version = ${nextVersion}`);
         }
-        exports.db.exec(node_fs_1.default.readFileSync(nextVersionFile, { encoding: "utf-8" }));
-        exports.db.pragma(`user_version = ${nextVersion}`);
-    }
+    });
 }

package/dist/main.d.ts

@@ -1,11 +1,11 @@
-export { db } from "./db";
+export { knex } from "./db";
 export declare class Bot {
     log: any;
     client: any;
     commands: any;
     commandsArray: any;
     dirname: any;
-    setup(dirname: any): void;
-    run(): void;
+    setup(dirname: any): Promise<void>;
+    run(): Promise<void>;
 }
 export declare const bot: Bot;

package/dist/main.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bot = exports.Bot = exports.db = void 0;
+exports.bot = exports.Bot = exports.knex = void 0;
 // IMPORTS
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
@@ -22,118 +22,123 @@ const discord_js_1 = require("discord.js");
 const log_1 = require("./log");
 const db_1 = require("./db");
 var db_2 = require("./db");
-Object.defineProperty(exports, "db", { enumerable: true, get: function () { return db_2.db; } });
+Object.defineProperty(exports, "knex", { enumerable: true, get: function () { return db_2.knex; } });
 class Bot {
     setup(dirname) {
-        this.dirname = dirname;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.dirname = dirname;
+            yield (0, db_1.setupDatabase)();
+            yield (0, db_1.updateDatabase)();
+        });
     }
     run() {
-        if (!this.dirname) {
-            this.log.error(`Bot was not setup.`);
-            process.exit();
-        }
-        this.log = new log_1.Log();
-        (0, db_1.updateDatabase)(this.dirname);
-        this.log.info("Press Control+C to stop the bot");
-        // ENVIROMENT VARS
-        if (!node_fs_1.default.existsSync(".env")) {
-            this.log.error(`No .env file is in the directory. Please add one`);
-            process.exit();
-        }
-        ;
-        const botToken = process.env.DISCORD_TOKEN;
-        if (botToken == undefined) {
-            this.log.error(`The \"DISCORD_TOKEN\" wasn't found in the .env file.\nIt can be added with: \"DISCORD_TOKEN=mytokenhere\"`);
-            process.exit();
-        }
-        ;
-        // CREATE CLIENT
-        this.client = new discord_js_1.Client({ intents: [
-                discord_js_1.GatewayIntentBits.Guilds,
-                discord_js_1.GatewayIntentBits.GuildMessages,
-                discord_js_1.GatewayIntentBits.MessageContent
-            ] });
-        // IMPORT COMMANDS
-        this.commands = new discord_js_1.Collection();
-        this.commandsArray = [];
-        const foldersPath = node_path_1.default.join(this.dirname, 'commands');
-        if (node_fs_1.default.existsSync(foldersPath)) {
-            const commandFolders = node_fs_1.default.readdirSync(foldersPath);
-            for (const folder of commandFolders) {
-                const commandsPath = node_path_1.default.join(foldersPath, folder);
-                let commandFiles;
-                if (node_fs_1.default.statSync(commandsPath).isDirectory()) {
-                    commandFiles = node_fs_1.default.readdirSync(commandsPath).filter((file) => file.endsWith('.js'));
-                }
-                else {
-                    commandFiles = [""];
-                }
-                for (const file of commandFiles) {
-                    const filePath = node_path_1.default.join(commandsPath, file);
-                    const command = require(filePath);
-                    if ('data' in command && 'execute' in command) {
-                        this.commands.set(command.data.name, command);
-                        this.commandsArray.push(command.data.toJSON());
+        return __awaiter(this, void 0, void 0, function* () {
+            this.log = new log_1.Log();
+            if (!this.dirname) {
+                this.log.error(`Bot was not setup.`);
+                process.exit();
+            }
+            this.log.info("Press Control+C to stop the bot");
+            // ENVIROMENT VARS
+            if (!node_fs_1.default.existsSync(".env")) {
+                this.log.error(`No .env file is in the directory. Please add one`);
+                process.exit();
+            }
+            ;
+            const botToken = process.env.DISCORD_TOKEN;
+            if (botToken == undefined) {
+                this.log.error(`The \"DISCORD_TOKEN\" wasn't found in the .env file.\nIt can be added with: \"DISCORD_TOKEN=mytokenhere\"`);
+                process.exit();
+            }
+            ;
+            // CREATE CLIENT
+            this.client = new discord_js_1.Client({ intents: [
+                    discord_js_1.GatewayIntentBits.Guilds,
+                    discord_js_1.GatewayIntentBits.GuildMessages,
+                    discord_js_1.GatewayIntentBits.MessageContent
+                ] });
+            // IMPORT COMMANDS
+            this.commands = new discord_js_1.Collection();
+            this.commandsArray = [];
+            const foldersPath = node_path_1.default.join(this.dirname, 'commands');
+            if (node_fs_1.default.existsSync(foldersPath)) {
+                const commandFolders = node_fs_1.default.readdirSync(foldersPath);
+                for (const folder of commandFolders) {
+                    const commandsPath = node_path_1.default.join(foldersPath, folder);
+                    let commandFiles;
+                    if (node_fs_1.default.statSync(commandsPath).isDirectory()) {
+                        commandFiles = node_fs_1.default.readdirSync(commandsPath).filter((file) => file.endsWith('.js'));
                     }
                     else {
-                        this.log.warn(`The command at ${filePath} is missing a required "data" or "execute" property.`);
+                        commandFiles = [""];
+                    }
+                    for (const file of commandFiles) {
+                        const filePath = node_path_1.default.join(commandsPath, file);
+                        const command = require(filePath);
+                        if ('data' in command && 'execute' in command) {
+                            this.commands.set(command.data.name, command);
+                            this.commandsArray.push(command.data.toJSON());
+                        }
+                        else {
+                            this.log.warn(`The command at ${filePath} is missing a required "data" or "execute" property.`);
+                        }
+                        ;
                     }
                     ;
                 }
                 ;
             }
-            ;
-        }
-        // LOGIN CLIENT
-        this.client.once(discord_js_1.Events.ClientReady, (readyClient) => {
-            this.log.info(`Logged in as ${readyClient.user.tag}`);
-            // REGISTER COMMANDS
-            if (this.commandsArray.length === 0)
-                return;
-            const rest = new discord_js_1.REST().setToken(botToken);
-            (() => __awaiter(this, void 0, void 0, function* () {
+            // LOGIN CLIENT
+            this.client.once(discord_js_1.Events.ClientReady, (readyClient) => {
+                this.log.info(`Logged in as ${readyClient.user.tag}`);
+                // REGISTER COMMANDS
+                if (this.commandsArray.length === 0)
+                    return;
+                const rest = new discord_js_1.REST().setToken(botToken);
+                (() => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        this.log.info(`Started refreshing ${this.commandsArray.length} application (/) commands.`);
+                        const data = yield rest.put(discord_js_1.Routes.applicationCommands(readyClient.user.id), { body: this.commandsArray });
+                        this.log.info(`Successfully reloaded ${data.length} application (/) commands.`);
+                    }
+                    catch (error) {
+                        this.log.error(`${error}`);
+                    }
+                    ;
+                }))();
+            });
+            this.log.info("Logging in");
+            this.client.login(botToken);
+            // RECEIVE COMMANDS
+            this.client.on(discord_js_1.Events.InteractionCreate, (interaction) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.log.info(`Started refreshing ${this.commandsArray.length} application (/) commands.`);
-                    const data = yield rest.put(discord_js_1.Routes.applicationCommands(readyClient.user.id), { body: this.commandsArray });
-                    this.log.info(`Successfully reloaded ${data.length} application (/) commands.`);
+                    if (interaction.isChatInputCommand()) {
+                        const command = this.commands.get(interaction.commandName);
+                        if (!command) {
+                            this.log.error(`No command matching ${interaction.commandName} was found.`);
+                            return;
+                        }
+                        ;
+                        yield command.execute(interaction);
+                        return;
+                    }
+                    ;
                 }
                 catch (error) {
                     this.log.error(`${error}`);
-                }
-                ;
-            }))();
-        });
-        this.log.info("Logging in");
-        this.client.login(botToken);
-        // RECEIVE COMMANDS
-        this.client.on(discord_js_1.Events.InteractionCreate, (interaction) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (interaction.isChatInputCommand()) {
-                    const command = this.commands.get(interaction.commandName);
-                    if (!command) {
-                        this.log.error(`No command matching ${interaction.commandName} was found.`);
-                        return;
+                    const errorMessage = { content: 'There was an error while executing this command!', flags: [discord_js_1.MessageFlags.Ephemeral] };
+                    if (interaction.replied || interaction.deferred) {
+                        yield interaction.followUp(errorMessage);
+                    }
+                    else {
+                        yield interaction.reply(errorMessage);
                     }
                     ;
-                    yield command.execute(interaction);
-                    return;
                 }
                 ;
-            }
-            catch (error) {
-                this.log.error(`${error}`);
-                const errorMessage = { content: 'There was an error while executing this command!', flags: [discord_js_1.MessageFlags.Ephemeral] };
-                if (interaction.replied || interaction.deferred) {
-                    yield interaction.followUp(errorMessage);
-                }
-                else {
-                    yield interaction.reply(errorMessage);
-                }
-                ;
-            }
-            ;
-            return;
-        }));
+                return;
+            }));
+        });
     }
 }
 exports.Bot = Bot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@power-bots/powerbotlibrary",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
   "dependencies": {
@@ -9,6 +9,7 @@
     "better-sqlite3": "^11.10.0",
     "discord.js": "^14.19.3",
     "dotenv": "^16.5.0",
+    "knex": "^3.1.0",
     "typescript": "^5.8.3"
   },
   "files": [