chore: general cleanup (#86)

* chore: bump all deps

* style: update code style and ESLint config

* chore: bump to dapi v9

Author: didinele

.eslintrc.json

@@ -13,10 +13,11 @@
     "one-var": "off",
     "no-eq-null": "off",
     "no-useless-constructor": "off",
-    "no-negated-condition": "off",
-    "promise/prefer-await-to-then": "off",
-    "promise/prefer-await-to-callbacks": "off",
-    "radix": "off",
-    "no-multi-assign": "off"
+    "comma-dangle": "off",
+    "curly": [
+      "error",
+      "all"
+    ],
+    "no-redeclare": "off"
   }
 }

libs/bitfield/package.json

@@ -30,11 +30,11 @@
   },
   "homepage": "https://github.com/cordis-lib/cordis#readme",
   "devDependencies": {
-    "@types/node": "^14.14.44",
-    "typescript": "^4.2.4"
+    "@types/node": "^14.17.5",
+    "typescript": "^4.3.5"
   },
   "dependencies": {
     "@cordis/error": "workspace:^0.3.0",
-    "tslib": "^2.2.0"
+    "tslib": "^2.3.0"
   }
 }

libs/bitfield/src/index.test.ts

@@ -21,7 +21,9 @@ test('resolve bit value', () => {
 test('bitfield iterator', () => {
   const instance = makeTestBitfield(['first', 'second']);
   const output = [];
-  for (const flag of instance) output.push(flag);
+  for (const flag of instance) {
+    output.push(flag);
+  }
 
   expect(output).toStrictEqual(['first', 'second']);
 });

libs/bitfield/src/index.ts

@@ -60,16 +60,25 @@ export class BitField<T extends string> {
    * @param flags The flags to look for
    */
   public static resolve<T extends string>(bit: BitFieldResolvable<T>, flags: Record<T, bigint>): bigint {
-    if (typeof bit === 'bigint' && bit >= 0n) return bit;
-    if (bit instanceof BitField) return bit.bits;
+    if (typeof bit === 'bigint' && bit >= 0n) {
+      return bit;
+    }
+
+    if (bit instanceof BitField) {
+      return bit.bits;
+    }
 
     if (typeof bit === 'string') {
       const num = flags[bit];
       /* istanbul ignore else */
-      if (num) return num;
+      if (num) {
+        return num;
+      }
     }
 
-    if (Array.isArray(bit)) return bit.map(p => this.resolve(p, flags)).reduce((prev, p) => prev | p, 0n);
+    if (Array.isArray(bit)) {
+      return bit.map(p => this.resolve(p, flags)).reduce((prev, p) => prev | p, 0n);
+    }
 
     throw new BitfieldRangeError('bitfieldInvalid');
   }
@@ -150,7 +159,10 @@ export class BitField<T extends string> {
    * @param bit Bits to check for
    */
   public has(bit: BitFieldResolvable<T>): boolean {
-    if (Array.isArray(bit)) return bit.every(b => this.has(b));
+    if (Array.isArray(bit)) {
+      return bit.every(b => this.has(b));
+    }
+
     return (this.bits & this.resolve(bit)) !== 0n;
   }
 
@@ -160,7 +172,10 @@ export class BitField<T extends string> {
    * @returns An array of the missing bits
    */
   public missing(bit: BitFieldResolvable<T>) {
-    if (!Array.isArray(bit)) bit = new this.constructor(this.flags, bit).toArray();
+    if (!Array.isArray(bit)) {
+      bit = new this.constructor(this.flags, bit).toArray();
+    }
+
     return bit.filter(p => !this.has(p));
   }
 
@@ -170,10 +185,15 @@ export class BitField<T extends string> {
    */
   public add(...bits: BitFieldResolvable<T>[]) {
     let total = 0n;
-    for (const bit of bits) total |= this.resolve(bit);
+    for (const bit of bits) {
+      total |= this.resolve(bit);
+    }
 
     /* istanbul ignore if */
-    if (Object.isFrozen(this)) return new this.constructor(this.flags, this.bits | total);
+    if (Object.isFrozen(this)) {
+      return new this.constructor(this.flags, this.bits | total);
+    }
+
     this.bits |= total;
     return this;
   }
@@ -184,10 +204,15 @@ export class BitField<T extends string> {
    */
   public remove(...bits: BitFieldResolvable<T>[]) {
     let total = 0n;
-    for (const bit of bits) total |= this.resolve(bit);
+    for (const bit of bits) {
+      total |= this.resolve(bit);
+    }
 
     /* istanbul ignore if */
-    if (Object.isFrozen(this)) return new this.constructor(this.flags, this.bits & ~total);
+    if (Object.isFrozen(this)) {
+      return new this.constructor(this.flags, this.bits & ~total);
+    }
+
     this.bits &= ~total;
     return this;
   }
@@ -211,7 +236,10 @@ export class BitField<T extends string> {
    */
   public serialize(): Record<T, boolean> {
     const serialized: Record<string, boolean> = {};
-    for (const [flag, bit] of Object.entries(this.flags)) serialized[flag] = this.has(bit as bigint);
+    for (const [flag, bit] of Object.entries(this.flags)) {
+      serialized[flag] = this.has(bit as bigint);
+    }
+
     return serialized;
   }
 }

libs/brokers/package.json

@@ -31,14 +31,14 @@
   "homepage": "https://github.com/cordis-lib/cordis#readme",
   "devDependencies": {
     "@types/amqplib": "^0.5.17",
-    "@types/node": "^14.14.44",
-    "typescript": "^4.2.4"
+    "@types/node": "^14.17.5",
+    "typescript": "^4.3.5"
   },
   "dependencies": {
     "@cordis/common": "workspace:^0.3.0",
     "@cordis/error": "workspace:^0.3.0",
-    "@msgpack/msgpack": "^2.6.3",
+    "@msgpack/msgpack": "^2.7.0",
     "amqplib": "^0.6.0",
-    "tslib": "^2.2.0"
+    "tslib": "^2.3.0"
   }
 }

libs/brokers/src/brokers/Broker.ts

@@ -45,7 +45,8 @@ export class Broker extends EventEmitter {
    */
   public async destroy() {
     try {
-      for (const tag of this.consumers) await this.channel.cancel(tag);
+      const promises = [...this.consumers].map(tag => this.channel.cancel(tag));
+      await Promise.allSettled(promises);
     } catch {}
 
     this.consumers.clear();

libs/brokers/src/brokers/BrokerUtil.ts

@@ -113,7 +113,10 @@ export class BrokerUtil {
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       async msg => {
         /* istanbul ignore next */
-        if (!msg) return null;
+        if (!msg) {
+          return null;
+        }
+
         try {
           await cb(decode(msg.content) as T, msg);
         } catch (e) {
@@ -164,7 +167,9 @@ export class BrokerUtil {
     const { msg, ...content } = options;
 
     const missing = getMissingProps(msg.properties, ['correlationId', 'replyTo']);
-    if (missing.length) throw new CordisBrokerTypeError('missingProperties', missing);
+    if (missing.length) {
+      throw new CordisBrokerTypeError('missingProperties', missing);
+    }
 
     return this.sendToQueue({
       to: msg.properties.replyTo,

libs/brokers/src/brokers/pubsub/PubSubClient.ts

@@ -40,7 +40,9 @@ export class PubSubClient<T> extends Broker {
       : await this.channel.assertQueue(options.name, { durable: true }).then(d => d.queue);
 
     const queue = fanout ? await this.channel.assertQueue('', { exclusive: true }).then(d => d.queue) : name;
-    if (fanout) await this.channel.bindQueue(queue, name, '');
+    if (fanout) {
+      await this.channel.bindQueue(queue, name, '');
+    }
 
     await this.util.consumeQueue({
       queue,

libs/brokers/src/brokers/pubsub/PubSubServer.ts

@@ -47,7 +47,10 @@ export class PubSubServer<T> extends Broker {
    * @param options Message specific options
    */
   public publish(content: T, options?: amqp.Options.Publish) {
-    if (!this.name) throw new CordisBrokerError('brokerNotInit');
+    if (!this.name) {
+      throw new CordisBrokerError('brokerNotInit');
+    }
+
     return this.fanout
       ? this.util.sendToExchange({ to: this.name, content, key: '', options })
       : this.util.sendToQueue({ to: this.name, content, options });

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

@@ -78,7 +78,9 @@ export class RoutingClient<K extends string, T extends Record<K, any>> extends B
       queue,
       cb: (content: { type: K; data: T[K] }, { properties: { timestamp } }) => {
         // For whatever reason amqplib types all properties as any ONLY when recieving?
-        if ((timestamp as number) + maxMessageAge < Date.now()) return;
+        if ((timestamp as number) + maxMessageAge < Date.now()) {
+          return;
+        }
 
         this.emit(content.type, content.data);
       },