refactor(WebsocketShard): gateway events (#88)

* refactor(WebsocketConnection): change disconnecting/reconnecting into destroy

* chore: bump dapi types

Author: didinele

libs/common/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@cordis/error": "workspace:^0.3.0",
-    "discord-api-types": "^0.20.1",
+    "discord-api-types": "^0.20.2",
     "tslib": "^2.3.0"
   }
 }

libs/gateway/package.json

@@ -44,7 +44,7 @@
     "@cordis/queue": "workspace:^0.3.0",
     "@cordis/rest": "workspace:^0.3.0",
     "common-tags": "^1.8.0",
-    "discord-api-types": "^0.20.1",
+    "discord-api-types": "^0.20.2",
     "tslib": "^2.3.0",
     "ws": "^7.5.3"
   }

libs/gateway/src/websocket/Cluster.ts

@@ -46,15 +46,10 @@ export interface Cluster {
    */
   on(event: 'open', listener: (id: string | number) => any): this;
   /**
-   * Fired when one of the shards begins reconnecting
+   * Fired when one of the shards is destroyed
    * @event
    */
-  on(event: 'reconnecting', listener: (id: string | number) => any): this;
-  /**
-   * Fired when one of the shards begins disconnecting
-   * @event
-   */
-  on(event: 'disconnecting', listener: (id: string | number) => any): this;
+  on(event: 'destroy', listener: (reconnecting: boolean, fatal: boolean, id: string | number) => any): this;
   /**
    * Provides information useful for debugging
    * @event
@@ -76,19 +71,23 @@ export interface Cluster {
   on(event: 'dispatch', listener: (data: GatewayDispatchPayload, id: string | number) => any): this;
 
   /** @internal */
-  once(event: 'open' | 'reconnecting' | 'disconnecting', listener: (id: string | number) => any): this;
+  once(event: 'open', listener: (id: string | number) => any): this;
   /** @internal */
   once(event: 'debug' | 'error', listener: (info: any, id: string | number) => any): this;
   /** @internal */
+  once(event: 'destroy', listener: (reconnecting: boolean, fatal: boolean, id: string | number) => any): this;
+  /** @internal */
   once(event: 'ready', listener: () => any): this;
   /** @internal */
   once(event: 'dispatch', listener: (data: GatewayDispatchPayload, id: string | number) => any): this;
 
   /** @internal */
-  emit(event: 'open' | 'reconnecting' | 'disconnecting', id: string | number): boolean;
+  emit(event: 'open', id: string | number): boolean;
   /** @internal */
   emit(event: 'debug' | 'error', info: any, id: string | number): boolean;
   /** @internal */
+  emit(event: 'destroy', reconnecting: boolean, fatal: boolean, id: string | number): boolean;
+  /** @internal */
   emit(event: 'ready'): boolean;
   /** @internal */
   emit(event: 'dispatch', data: GatewayDispatchPayload, id: string | number): boolean;

libs/gateway/src/websocket/WebsocketConnection.ts

@@ -394,7 +394,7 @@ export class WebsocketConnection {
         code     : ${code}
     `);
 
-    this.cluster.emit(reconnect ? 'reconnecting' : 'disconnecting', this.id);
+    this.cluster.emit('destroy', reconnect, fatal, this.id);
     this.status = WebsocketConnectionStatus.disconnecting;
 
     if (!reason) {

libs/rest/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@types/node": "^14.17.5",
     "@types/node-fetch": "^2.5.11",
-    "discord-api-types": "^0.20.1",
+    "discord-api-types": "^0.20.2",
     "fetch-blob": "^2.1.2",
     "typescript": "^4.3.5"
   },

libs/util/package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "@cordis/error": "workspace:^0.3.0",
     "@cordis/rest": "workspace:^0.3.0",
-    "discord-api-types": "^0.20.1",
+    "discord-api-types": "^0.20.2",
     "tslib": "^2.3.0"
   }
 }

pnpm-lock.yaml

@@ -16,8 +16,12 @@ const main = async () => {
   const cluster = new Cluster(config.auth, config.ws);
 
   cluster
-    .on('disconnecting', id => console.log(`[DISCONNECTING]: Shard id ${id}`))
-    .on('reconnecting', id => console.log(`[RECONNECTING]: Shard id ${id}`))
+    .on('destroy', (reconnecting, fatal, id) => {
+      console.log(`[DESTROYED]: Shard id ${id}; Fatal: ${fatal}; Reconnecting: ${reconnecting}`);
+      if (!reconnecting) {
+        process.exit(1);
+      }
+    })
     .on('open', id => console.log(`[CONNECTION OPEN]: Shard id ${id}`))
     .on('error', (err, id) => console.error(`[SHARD ERROR]: Shard id ${id}`, err))
     .on('ready', () => console.log('[READY]: All shards have fully connected'))