Fix various breaking bugs/implement QOL (#19)

* fix(IRouter): proper types

* feat(RoutingClientInitOptions): keys now uses generic type-guarded by string

* chore: update .npmignore

* feat(Cluster): let fetchGateway throw http error on failure

* fix(RoutingClient): properly use bindQueue in init

* fix(GatewayService): failures of connecting

* chore: bump version

libs/bitfield/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/bitfield/package.json

@@ -3,7 +3,7 @@
   "description": "Data structure for working with bitfields",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -26,7 +26,7 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/error": "workspace:^0.1.2",
+    "@cordis/error": "workspace:^0.1.5",
     "tslib": "^2.1.0"
   }
 }

libs/brokers/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/brokers/package.json

@@ -3,7 +3,7 @@
   "description": "Message broker library for the cordis micro-services, built for AMQP",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -27,8 +27,8 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/common": "workspace:^0.1.2",
-    "@cordis/error": "workspace:^0.1.2",
+    "@cordis/common": "workspace:^0.1.5",
+    "@cordis/error": "workspace:^0.1.5",
     "@msgpack/msgpack": "^2.4.0",
     "amqplib": "^0.6.0",
     "tslib": "^2.1.0"

libs/brokers/src/brokers/routing/RoutingClient.ts

@@ -4,7 +4,7 @@ import type * as amqp from 'amqplib';
 /**
  * Options for initializing the routing client
  */
-export interface RoutingClientInitOtions {
+export interface RoutingClientInitOtions<K extends string> {
   /**
    * Name of the exchange to use
    */
@@ -16,7 +16,7 @@ export interface RoutingClientInitOtions {
   /**
    * The routing keys you wish to subscribe to
    */
-  keys: string[];
+  keys: K[];
   /**
    * Queue to bind the packets to
    * @default queue Randomly generated queue by your AMQP server
@@ -59,13 +59,13 @@ export class RoutingClient<K extends string, T extends Record<K, any>> extends B
    * Initializes the client, binding the events you want to the queue
    * @param options Options used for this client
    */
-  public async init(options: RoutingClientInitOtions) {
+  public async init(options: RoutingClientInitOtions<K>) {
     const { name, topicBased = false, keys, queue: rawQueue = '' } = options;
 
     const exchange = await this.channel.assertExchange(name, topicBased ? 'topic' : 'direct', { durable: false }).then(d => d.exchange);
     const queue = await this.channel.assertQueue(rawQueue, { durable: true, exclusive: rawQueue === '' }).then(data => data.queue);
 
-    for (const key of keys) await this.channel.bindExchange(queue, exchange, key);
+    for (const key of keys) await this.channel.bindQueue(queue, exchange, key);
 
     await this.util.consumeQueue({
       queue,

libs/common/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/common/package.json

@@ -3,7 +3,7 @@
   "description": "Common things amongst the cordis infrastructure",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -27,7 +27,7 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/error": "workspace:^0.1.2",
+    "@cordis/error": "workspace:^0.1.5",
     "discord-api-types": "^0.12.1",
     "tslib": "^2.1.0"
   }

libs/error/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/error/package.json

@@ -3,7 +3,7 @@
   "description": "Package for creating error structures",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"

libs/gateway/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/gateway/package.json

@@ -4,7 +4,7 @@
   "description": "The cordis gateway to Discord",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -31,12 +31,12 @@
     "zlib-sync": "^0.1.7"
   },
   "dependencies": {
-    "@cordis/bitfield": "workspace:^0.1.2",
-    "@cordis/common": "workspace:^0.1.2",
-    "@cordis/error": "workspace:^0.1.2",
-    "@cordis/queue": "workspace:^0.1.2",
+    "@cordis/bitfield": "workspace:^0.1.5",
+    "@cordis/common": "workspace:^0.1.5",
+    "@cordis/error": "workspace:^0.1.5",
+    "@cordis/queue": "workspace:^0.1.5",
     "@cordis/redis-store": "workspace:^0.1.0",
-    "@cordis/rest": "workspace:^0.1.2",
+    "@cordis/rest": "workspace:^0.1.5",
     "@cordis/store": "workspace:^0.1.0",
     "common-tags": "^1.8.0",
     "discord-api-types": "^0.12.1",

libs/gateway/src/error.ts

@@ -5,7 +5,6 @@ import { WebsocketConnectionStatus } from './websocket/WebsocketConnection';
 export const CordisGatewayError = makeCordisError(
   Error,
   {
-    fetchGatewayFail: 'Failed to fetch /gateway/bot',
     tokenInvalid: 'The token you passed is invalid',
     invalidShard: 'An invalid shard was provided to Discord',
     shardingRequired: 'Sharding is required for this bot to connect.',

libs/gateway/src/websocket/Cluster.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events';
-import { CordisGatewayError } from '../error';
 import {
   WebsocketConnection,
   WebsocketConnectionStatus,
@@ -221,14 +220,10 @@ export class Cluster extends EventEmitter {
   public async fetchGateway(ignoreCache = false) {
     if (this._fetchGatewayCache && !ignoreCache) return this._fetchGatewayCache;
 
-    const data = await this.rest.get<RESTGetAPIGatewayBotResult>(Routes.gatewayBot()).catch(() => null);
+    const data = await this.rest.get<RESTGetAPIGatewayBotResult>(Routes.gatewayBot());
 
-    if (data) {
-      this._fetchGatewayCache = data;
-      return data;
-    }
-
-    throw new CordisGatewayError('fetchGatewayFail');
+    this._fetchGatewayCache = data;
+    return data;
   }
 
   /**
@@ -259,7 +254,7 @@ export class Cluster extends EventEmitter {
       }
     }
 
-    return Promise.allSettled(this.shards.map(shard => shard.connect()));
+    return Promise.all(this.shards.map(shard => shard.connect()));
   }
 
   /**
@@ -268,6 +263,6 @@ export class Cluster extends EventEmitter {
   public async destroy(options: WebsocketConnectionDestroyOptions = { fatal: true }) {
     this.user = null;
 
-    return Promise.allSettled(this.shards.map(shard => shard.destroy(options)));
+    return Promise.all(this.shards.map(shard => shard.destroy(options)));
   }
 }

libs/gateway/src/websocket/WebsocketConnection.ts

@@ -291,7 +291,7 @@ export class WebsocketConnection {
   }
 
   private _wrapReject(reject: (reason: any) => void) {
-    if (this._connectResolve) this.debug('UB: set another _connectReject without calling the previous one.');
+    if (this._connectReject) this.debug('UB: set another _connectReject without calling the previous one.');
     return (reason: any) => {
       this._connectReject = null;
       reject(reason);

libs/queue/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/queue/package.json

@@ -3,7 +3,7 @@
   "description": "Async queues for sequential operations",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"

libs/redis-store/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/redis-store/package.json

@@ -3,7 +3,7 @@
   "description": "Redis cache implementing the cordis Store",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -27,8 +27,8 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/error": "workspace:^0.1.2",
-    "@cordis/store": "workspace:^0.1.2",
+    "@cordis/error": "workspace:^0.1.5",
+    "@cordis/store": "workspace:^0.1.5",
     "tslib": "^2.1.0"
   }
 }

libs/rest/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/rest/package.json

@@ -4,7 +4,7 @@
   "description": "Cordis' REST utilities for the Discord API",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -29,8 +29,8 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/common": "workspace:^0.1.2",
-    "@cordis/error": "workspace:^0.1.2",
+    "@cordis/common": "workspace:^0.1.5",
+    "@cordis/error": "workspace:^0.1.5",
     "abort-controller": "^3.0.0",
     "form-data": "^3.0.1",
     "node-fetch": "^2.6.1",

libs/routers/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/routers/package.json

@@ -3,7 +3,7 @@
   "description": "Construct API paths using simple JavaScript property accessing and execute requests with method calls",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"

libs/routers/src/IRouter.ts

@@ -1,9 +1,9 @@
 import type { File, StringRecord } from '@cordis/rest';
 
 export type IRouter = {
-  get<T>(options?: { query?: StringRecord }): T;
-  delete<T>(options?: { data?: StringRecord; reason?: string }): T;
-  patch<T>(options: { data: StringRecord; reason?: string }): T;
-  put<T>(options: { data: StringRecord; reason?: string }): T;
-  post<T>(options: { data: StringRecord; reason?: string; files: File[] }): T;
+  get<T, Q extends StringRecord | string = StringRecord>(options?: { query?: Q }): T;
+  delete<T, D extends StringRecord = StringRecord>(options?: { data?: D; reason?: string }): T;
+  patch<T, D extends StringRecord>(options: { data: D; reason?: string }): T;
+  put<T, D extends StringRecord>(options: { data: D; reason?: string }): T;
+  post<T, D extends StringRecord>(options: { data: D; reason?: string; files?: File[] }): T;
 } & { [key: string]: IRouter };

libs/snowflake/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/snowflake/package.json

@@ -3,7 +3,7 @@
   "description": "Utility structure for dealing with Discord snowflakes",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"

libs/store/.npmignore

@@ -1,2 +1,2 @@
 **/*.test.*
-./src
+**/src/**

libs/store/package.json

@@ -3,7 +3,7 @@
   "description": "Map-based storage structure",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "lint": "eslint src --ext .ts",
     "build": "tsc"
@@ -26,7 +26,7 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "@cordis/error": "workspace:^0.1.2",
+    "@cordis/error": "workspace:^0.1.5",
     "tslib": "^2.1.0"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package",
   "name": "cordis",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "A modular, micros-service based Discord API wrapper",
   "scripts": {
     "lint": "pnpm recursive run lint --filter @cordis/*",