refactor(core): remove redundant type assertions in Subscription (#293)

* chore(core): remove redundant type assertions in Subscription logic
---------

Signed-off-by: Alberto Ricart <[email protected]>

Author: aricart

core/src/protocol.ts

@@ -299,7 +299,7 @@ export class Subscriptions {
   add(s: SubscriptionImpl): SubscriptionImpl {
     this.sidCounter++;
     s.sid = this.sidCounter;
-    this.subs.set(s.sid, s as SubscriptionImpl);
+    this.subs.set(s.sid, s);
     return s;
   }
 
@@ -705,7 +705,7 @@ export class ProtocolHandler implements Dispatcher<ParserEvent> {
       return;
     }
 
-    const sub = this.subscriptions.get(msg.sid) as SubscriptionImpl;
+    const sub = this.subscriptions.get(msg.sid);
     if (!sub) {
       return;
     }
@@ -1010,7 +1010,7 @@ export class ProtocolHandler implements Dispatcher<ParserEvent> {
   sendSubscriptions(): void {
     const cmds: string[] = [];
     this.subscriptions.all().forEach((s) => {
-      const sub = s as SubscriptionImpl;
+      const sub = s;
       if (sub.queue) {
         cmds.push(`SUB ${sub.subject} ${sub.queue} ${sub.sid}${CR_LF}`);
       } else {

core/tests/basics_test.ts

@@ -194,8 +194,8 @@ Deno.test("basics - subscriptions pass exact subject to cb", async () => {
 Deno.test("basics - subscribe returns Subscription", async () => {
   const { ns, nc } = await setup();
   const subj = createInbox();
-  const sub = nc.subscribe(subj) as SubscriptionImpl;
-  assertEquals(sub.sid, 1);
+  const sub = nc.subscribe(subj);
+  assertEquals(sub.getID(), 1);
   await cleanup(ns, nc);
 });
 

jetstream/src/consumer.ts

@@ -21,7 +21,6 @@ import type {
   QueuedIterator,
   Status,
   Subscription,
-  SubscriptionImpl,
 } from "@nats-io/nats-core/internal";
 import {
   backoff,
@@ -232,7 +231,7 @@ export class PullConsumerMessagesImpl extends QueuedIteratorImpl<JsMsg>
           : msg.subject === this.inbox;
 
         if (isProtocol) {
-          if (msg.subject !== (this.sub as SubscriptionImpl).subject) {
+          if (msg.subject !== this.sub.getSubject()) {
             // this is a stale message - was not sent to the current inbox
             return;
           }
@@ -437,7 +436,7 @@ export class PullConsumerMessagesImpl extends QueuedIteratorImpl<JsMsg>
 
     this.sub.closed.then(() => {
       // for ordered consumer we cannot break the iterator
-      if ((this.sub as SubscriptionImpl).draining) {
+      if (this.sub.isDraining()) {
         // @ts-ignore: we are pushing the pull fn
         this._push(() => {
           this.stop();

jetstream/src/pushconsumer.ts

@@ -44,7 +44,6 @@ import type {
   QueuedIterator,
   Status,
   Subscription,
-  SubscriptionImpl,
 } from "@nats-io/nats-core/internal";
 import { JetStreamStatus } from "./jserrors.ts";
 
@@ -293,7 +292,7 @@ export class PushConsumerMessagesImpl extends QueuedIteratorImpl<JsMsg>
           : msg.subject === subject;
 
         if (isProtocol) {
-          if (msg.subject !== (this.sub as SubscriptionImpl).subject) {
+          if (msg.subject !== this.sub.getSubject()) {
             // this is a stale message - was not sent to the current inbox
             return;
           }