feat: switch to graphql-subscriptions-continued for proper typing

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
         ports:
           - 6379:6379
       redis-cluster:
-        image: grokzen/redis-cluster:latest
+        image: grokzen/redis-cluster:7.0.10
         ports:
           - 7006:7000
           - 7001:7001

package.json

@@ -52,7 +52,7 @@
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.23.0",
     "graphql": "^15.7.2",
-    "graphql-subscriptions": "^2.0.0",
+    "graphql-subscriptions-continued": "^3.0.0",
     "ioredis": "^5.2.4",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",

src/redis-pubsub.ts

@@ -1,6 +1,5 @@
 import {Cluster, Redis, RedisOptions} from 'ioredis';
-import {PubSubEngine} from 'graphql-subscriptions';
-import {PubSubAsyncIterator} from './pubsub-async-iterator';
+import {PubSubEngine, PubSubAsyncIterableIterator} from 'graphql-subscriptions-continued';
 
 type RedisClient = Redis | Cluster;
 type OnMessage<T> = (message: T) => void;
@@ -19,9 +18,11 @@ export interface PubSubRedisOptions {
   pmessageEventName?: string;
 }
 
-export class RedisPubSub implements PubSubEngine {
+export class RedisPubSub extends PubSubEngine {
 
   constructor(options: PubSubRedisOptions = {}) {
+    super();
+
     const {
       triggerTransform,
       connection,
@@ -139,8 +140,8 @@ export class RedisPubSub implements PubSubEngine {
     delete this.subscriptionMap[subId];
   }
 
-  public asyncIterator<T>(triggers: string | string[], options?: unknown): AsyncIterator<T> {
-    return new PubSubAsyncIterator<T>(this, triggers, options);
+  public asyncIterator<T>(triggers: string | string[], options?: unknown) {
+    return new PubSubAsyncIterableIterator<T>(this, triggers, options);
   }
 
   public getSubscriber(): RedisClient {

src/test/integration-tests.ts

@@ -32,15 +32,15 @@ function buildSchema(iterator, patternIterator) {
       fields: {
         testSubscription: {
           type: GraphQLString,
-          subscribe: withFilter(() => iterator, () => true) as GraphQLFieldResolver<any, any, any>,
+          subscribe: withFilter(() => iterator, () => true),
           resolve: root => {
             return 'FIRST_EVENT';
           },
         },
 
         testPatternSubscription: {
           type: GraphQLString,
-          subscribe: withFilter(() => patternIterator, () => true) as GraphQLFieldResolver<any, any, any>,
+          subscribe: withFilter(() => patternIterator, () => true),
           resolve: root => {
             return 'SECOND_EVENT';
           },
@@ -148,5 +148,5 @@ describe('PubSubCluster', () => {
         pubsub.subscribe<{fire: boolean, from: string}>(eventKey, (data) => {
             expect(data).to.contains({ fired: true, from: 'cluster' });
         });
-    }).timeout(2000);
+    }).timeout(5000);
 });