zumito-framework 1.2.4 → 1.2.6

package/dist/ZumitoFramework.js

@@ -18,6 +18,7 @@ import path from 'path';
 import { EventManager } from './services/EventManager.js';
 import { CommandManager } from './services/CommandManager.js';
 import { ModuleManager } from './services/ModuleManager.js';
+import { ServiceContainer } from './services/ServiceContainer.js';
 // import better-logging
 betterLogging(console);
 /**
@@ -135,6 +136,9 @@ export class ZumitoFramework {
         if (settings.logLevel) {
             console.logLevel = settings.logLevel;
         }
+        // Register this class instance to service container
+        ServiceContainer.addService(ZumitoFramework, [], true, this);
+        ServiceContainer.addService(TranslationManager, [], true, this.translations);
         this.initialize()
             .then(() => {
             if (callback)
@@ -278,6 +282,7 @@ export class ZumitoFramework {
             intents: this.settings.discordClientOptions.intents,
         });
         this.client.login(this.settings.discordClientOptions.token);
+        ServiceContainer.addService(Client, [], true, this.client);
         await new Promise((resolve) => {
             this.client.on('ready', () => {
                 // Bot emoji

package/dist/definitions/commands/CommandParameters.d.ts

@@ -12,7 +12,13 @@ export interface CommandParameters {
     message?: Message;
     interaction?: CommandInteraction;
     args: Map<string, any>;
+    /**
+     * @deprecated The client should be obtained from `ServiceContainer.get(Client);`
+     */
     client: Client;
+    /**
+     * @deprecated The frameworkInstance should be obtained from `ServiceContainer.get(ZumitoFramework);`
+     */
     framework: ZumitoFramework;
     guildSettings?: any;
     trans: (key: string, params?: any) => string;

package/dist/index.d.ts

@@ -21,4 +21,5 @@ import { TranslationManager } from './services/TranslationManager.js';
 import { ZumitoFramework } from './ZumitoFramework.js';
 import * as discord from 'discord.js';
 import { EventParameters } from './definitions/parameters/EventParameters.js';
-export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, };
+import { ServiceContainer } from './services/ServiceContainer.js';
+export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, ServiceContainer };

package/dist/index.js

@@ -13,4 +13,7 @@ import { Translation } from './definitions/Translation.js';
 import { TranslationManager } from './services/TranslationManager.js';
 import { ZumitoFramework } from './ZumitoFramework.js';
 import * as discord from 'discord.js';
-export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, discord, };
+import { ServiceContainer } from './services/ServiceContainer.js';
+ServiceContainer.addService(TextFormatter, []);
+ServiceContainer.addService(EmojiFallback, []);
+export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, discord, ServiceContainer };

package/dist/services/ServiceContainer.d.ts

@@ -0,0 +1,8 @@
+declare class ServiceContainerManager {
+    private services;
+    addService(serviceClass: any, dependencies: string[], singleton?: boolean, instance?: any): void;
+    getService(serviceClass: any): any;
+    addInstance(serviceClass: any, instance: any): void;
+}
+export declare const ServiceContainer: ServiceContainerManager;
+export {};

package/dist/services/ServiceContainer.js

@@ -0,0 +1,29 @@
+class ServiceContainerManager {
+    services = new Map();
+    addService(serviceClass, dependencies, singleton = false, instance) {
+        this.services.set(serviceClass.name, {
+            class: serviceClass,
+            dependencies,
+            singleton,
+            instance
+        });
+    }
+    getService(serviceClass) {
+        const service = this.services.get(serviceClass.name);
+        if (!service)
+            throw new Error(`Service ${serviceClass.name} not found`);
+        if (service.singleton && service.instance)
+            return service.instance;
+        const dependencies = service.dependencies.map(dependency => this.getService(dependency));
+        const instance = new service.class(...dependencies);
+        if (service.singleton)
+            service.instance = instance;
+        return instance;
+    }
+    addInstance(serviceClass, instance) {
+        if (!this.services.has(serviceClass.name))
+            return;
+        this.services.get(serviceClass.name).instance = instance;
+    }
+}
+export const ServiceContainer = new ServiceContainerManager();

package/dist/services/StatusManager.d.ts

@@ -17,6 +17,7 @@ export declare class StatusManager {
      * @private
      */
     private delegateEvents;
+    initialize(): void;
     /**
      * Sets the status of the bot.
      * If no presence data is provided, the status will be set to next in the queue.

package/dist/services/StatusManager.js

@@ -18,12 +18,22 @@ export class StatusManager {
      * @private
      */
     delegateEvents() {
-        this.framework.client.on("ready", () => {
-            this.setStatus();
+        if (this.framework.client.isReady()) {
+            this.initialize();
+        }
+        else {
+            this.framework.client.on("ready", () => {
+                this.initialize();
+            });
+        }
+    }
+    initialize() {
+        this.setStatus();
+        if (this.options.updateInterval) {
             setInterval(() => {
                 this.setStatus();
             }, this.options.updateInterval);
-        });
+        }
     }
     /**
      * Sets the status of the bot.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",