@globalart/nestcord 2.5.0-0 → 2.5.0-2

package/dist/sharding/src/listeners/listeners.module.d.ts

@@ -6,6 +6,8 @@ export declare class ShardingListenersModule implements OnModuleInit {
     private readonly metadataScanner;
     private readonly reflector;
     private readonly shardingManager;
+    private readonly logger;
     constructor(discoveryService: DiscoveryService, metadataScanner: MetadataScanner, reflector: Reflector, shardingManager: ShardingManager);
     onModuleInit(): void;
+    private registerBaseShardEvents;
 }

package/dist/sharding/src/listeners/listeners.module.js

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var ShardingListenersModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShardingListenersModule = void 0;
 const common_1 = require("@nestjs/common");
@@ -15,15 +16,17 @@ const core_1 = require("@nestjs/core");
 const discord_js_1 = require("discord.js");
 const decorators_1 = require("./decorators");
 const enums_1 = require("./enums");
-let ShardingListenersModule = class ShardingListenersModule {
+let ShardingListenersModule = ShardingListenersModule_1 = class ShardingListenersModule {
     constructor(discoveryService, metadataScanner, reflector, shardingManager) {
         this.discoveryService = discoveryService;
         this.metadataScanner = metadataScanner;
         this.reflector = reflector;
         this.shardingManager = shardingManager;
+        this.logger = new common_1.Logger(ShardingListenersModule_1.name);
     }
     onModuleInit() {
         var _a;
+        this.registerBaseShardEvents();
         const groupedListeners = new Map();
         const wrappers = this.discoveryService.getProviders().filter((wrapper) => {
             const { instance } = wrapper;
@@ -44,38 +47,44 @@ let ShardingListenersModule = class ShardingListenersModule {
                 groupedListeners.set(key, listeners);
             }
         }
-        for (const [key, listeners] of groupedListeners) {
-            const [event, host] = key.split(':');
-            if (host === enums_1.ShardingHostType.ShardingManager) {
-                /**
-                 * ShardingManager extends EventEmitter. Casting to EventEmitter lets us
-                 * register listeners with a dynamic event name without bypassing type safety —
-                 * EventEmitter.on(event: string) is the correct untyped surface for this.
-                 */
-                this.shardingManager.on(event, (...args) => {
-                    for (const listener of listeners) {
-                        listener.run(args);
-                    }
+        const allListeners = [...groupedListeners.values()].flat();
+        for (const listener of allListeners) {
+            if (listener.host === enums_1.ShardingHostType.ShardingManager) {
+                this.shardingManager[listener.type](listener.event, (...args) => {
+                    listener.run(...args);
                 });
             }
-            if (host === enums_1.ShardingHostType.Shard) {
-                /**
-                 * Shard also extends EventEmitter. We subscribe to shardCreate on the manager
-                 * so that every new Shard gets the same listener registered on it immediately.
-                 */
-                this.shardingManager.on('shardCreate', (shard) => {
-                    shard.on(event, (...args) => {
-                        for (const listener of listeners) {
-                            listener.run(args);
-                        }
+        }
+        this.shardingManager.on('shardCreate', (shard) => {
+            for (const listener of allListeners) {
+                if (listener.host === enums_1.ShardingHostType.Shard) {
+                    shard[listener.type](listener.event, (...args) => {
+                        listener.run(shard, ...args);
                     });
-                });
+                }
             }
-        }
+        });
+    }
+    registerBaseShardEvents() {
+        this.shardingManager.on('shardCreate', (shard) => {
+            shard.on('spawn', () => {
+                this.logger.log(`Shard: [${shard.id}] spawned`);
+            });
+            shard.on('ready', () => {
+                this.logger.log(`Shard: [${shard.id}] is ready`);
+            });
+            shard.on('death', () => {
+                this.logger.error(`Shard: [${shard.id}] is dead`);
+            });
+            shard.on('error', (err) => {
+                this.logger.error(`Error in shard: [${shard.id}]`, err);
+                shard.respawn();
+            });
+        });
     }
 };
 exports.ShardingListenersModule = ShardingListenersModule;
-exports.ShardingListenersModule = ShardingListenersModule = __decorate([
+exports.ShardingListenersModule = ShardingListenersModule = ShardingListenersModule_1 = __decorate([
     (0, common_1.Module)({
         imports: [core_1.DiscoveryModule],
     }),

package/dist/sharding/src/nestcord-sharding.module.d.ts

@@ -1,12 +1,12 @@
-import { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
+import { OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
 import { ShardingManager } from 'discord.js';
 import { NestCordShardingConfigurableModule } from './nestcord-sharding.module-definition';
 import { NestCordShardingModuleOptions } from './nestcord-sharding-options.interface';
-export declare class NestCordShardingModule extends NestCordShardingConfigurableModule implements OnModuleInit, OnApplicationShutdown {
+export declare class NestCordShardingModule extends NestCordShardingConfigurableModule implements OnApplicationBootstrap, OnApplicationShutdown {
     private readonly shardingManager;
     private readonly options;
     private readonly logger;
     constructor(shardingManager: ShardingManager, options: NestCordShardingModuleOptions);
-    onModuleInit(): Promise<void>;
+    onApplicationBootstrap(): Promise<void>;
     onApplicationShutdown(): void;
 }

package/dist/sharding/src/nestcord-sharding.module.js

@@ -37,7 +37,7 @@ let NestCordShardingModule = NestCordShardingModule_1 = class NestCordShardingMo
         this.options = options;
         this.logger = new common_1.Logger(NestCordShardingModule_1.name);
     }
-    onModuleInit() {
+    onApplicationBootstrap() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.options.autoSpawn === false) {
                 return;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@globalart/nestcord",
 	"description": "A module for creating Discord bots using NestJS, based on Discord.js",
-	"version": "2.5.0-0",
+	"version": "2.5.0-2",
 	"private": false,
 	"scripts": {
 		"build": "rimraf dist && tsc -p tsconfig.build.json",