nmtjs 0.15.2 → 0.16.0-beta.1

package/dist/runtime/{pubsub → subscription}/redis.js

@@ -1,95 +1,118 @@
 import EventEmitter, { on } from 'node:events';
 import { isAbortError } from '@nmtjs/common';
-import { createFactoryInjectable, provision } from '@nmtjs/core';
-import { pubSubAdapter, storeConfig } from '../injectables.js';
+import { createFactoryInjectable } from '@nmtjs/core';
+import { storeConfig, subscriptionAdapter } from '../injectables.js';
 import { createStoreClient } from '../store/index.js';
-export class RedisPubSubAdapter {
+export class RedisSubscriptionAdapter {
     client;
     events = new EventEmitter();
     listeners = new Map();
+    logger;
     subscriberClient;
-    constructor(client) {
+    constructor(client, logger) {
         this.client = client;
+        this.logger = logger?.child({ component: RedisSubscriptionAdapter.name });
     }
     async initialize() {
+        this.logger?.debug('Initializing Redis adapter');
         // Create a dedicated subscriber client (Redis requires separate clients for pub/sub)
         this.subscriberClient = this.client.duplicate();
         // Set up message handler
         this.subscriberClient.on('message', (channel, message) => {
             try {
                 const parsed = JSON.parse(message);
+                this.logger?.trace({ channel }, 'Received Redis message');
                 this.events.emit(channel, parsed);
             }
-            catch { }
+            catch (error) {
+                this.logger?.warn({ channel, error }, 'Failed to parse Redis message');
+            }
         });
+        this.logger?.debug('Redis adapter initialized');
     }
     async dispose() {
+        this.logger?.debug('Disposing Redis adapter');
         if (this.subscriberClient) {
             await this.subscriberClient.quit();
             this.subscriberClient = undefined;
         }
+        this.logger?.debug('Redis adapter disposed');
     }
     async publish(channel, payload) {
+        this.logger?.trace({ channel }, 'Publishing Redis message');
         try {
             await this.client.publish(channel, JSON.stringify(payload));
+            this.logger?.trace({ channel }, 'Published Redis message');
             return true;
         }
-        catch {
+        catch (error) {
+            this.logger?.warn({ channel, error }, 'Failed to publish Redis message');
             return false;
         }
     }
     async *subscribe(channel, signal) {
         if (!this.subscriberClient) {
-            throw new Error('RedisPubSubAdapter not initialized');
+            throw new Error('RedisSubscriptionAdapter not initialized');
         }
+        this.logger?.debug({ channel }, 'Opening Redis channel listener');
         if (!this.listeners.has(channel)) {
             await this.subscriberClient.subscribe(channel);
             this.listeners.set(channel, 1);
+            this.logger?.debug({ channel, listeners: 1 }, 'Subscribed Redis channel');
         }
         else {
-            this.listeners.set(channel, this.listeners.get(channel) + 1);
+            const listeners = this.listeners.get(channel) + 1;
+            this.listeners.set(channel, listeners);
+            this.logger?.trace({ channel, listeners }, 'Reusing Redis channel listener');
         }
         try {
             signal?.throwIfAborted();
             for await (const [payload] of on(this.events, channel, { signal })) {
+                this.logger?.trace({ channel }, 'Delivering Redis message');
                 yield { channel, payload };
             }
         }
         catch (error) {
-            if (isAbortError(error))
+            if (isAbortError(error)) {
+                this.logger?.trace({ channel }, 'Redis channel listener aborted');
                 throw error;
+            }
+            this.logger?.warn({ channel, error }, 'Redis channel listener failed');
         }
         finally {
             const count = this.listeners.get(channel);
             if (count !== undefined) {
                 if (count > 1) {
-                    this.listeners.set(channel, count - 1);
+                    const listeners = count - 1;
+                    this.listeners.set(channel, listeners);
+                    this.logger?.trace({ channel, listeners }, 'Detached Redis channel listener');
                 }
                 else {
                     await this.subscriberClient?.unsubscribe(channel);
                     this.listeners.delete(channel);
+                    this.logger?.debug({ channel, listeners: 0 }, 'Unsubscribed Redis channel');
                 }
             }
         }
     }
 }
-export const RedisPubSubAdapterPlugin = () => {
+export const RedisSubscriptionAdapterPlugin = () => {
     return {
-        name: 'pubsub-redis-adapter',
+        name: 'redis-subscription-adapter',
         hooks: {
             'lifecycle:beforeInitialize': async (ctx) => {
                 const adapter = await ctx.container.resolve(createFactoryInjectable({
                     dependencies: { config: storeConfig },
                     factory: async ({ config }) => {
                         const connection = await createStoreClient(config);
-                        const adapter = new RedisPubSubAdapter(connection);
+                        const adapter = new RedisSubscriptionAdapter(connection, ctx.logger);
                         await adapter.initialize();
                         return { adapter, connection };
                     },
                     pick: ({ adapter }) => adapter,
                     dispose: ({ connection }) => connection.quit(),
                 }));
-                ctx.container.provide(pubSubAdapter, adapter);
+                ctx.container.provide(subscriptionAdapter, adapter);
             },
         },
     };

package/dist/runtime/subscription/redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/runtime/subscription/redis.ts"],"names":[],"mappings":"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"}

package/dist/runtime/workers/base.d.ts

@@ -2,12 +2,12 @@ import type { WorkerType } from '../enums.ts';
 import type { BaseRuntimeOptions } from '../runtime.ts';
 import type { ServerConfig } from '../server/config.ts';
 import { JobManager } from '../jobs/manager.ts';
-import { PubSubManager } from '../pubsub/manager.ts';
 import { BaseRuntime } from '../runtime.ts';
+import { SubscriptionManager } from '../subscription/manager.ts';
 export declare abstract class BaseWorkerRuntime extends BaseRuntime {
     readonly config: ServerConfig;
     readonly workerType: WorkerType;
-    pubsub: PubSubManager;
+    subscriptionManager: SubscriptionManager;
     jobManager?: JobManager;
     constructor(config: ServerConfig, options: BaseRuntimeOptions, workerType: WorkerType);
     initialize(): Promise<void>;

package/dist/runtime/workers/base.js

@@ -1,18 +1,18 @@
 import { CoreInjectables, provision } from '@nmtjs/core';
 import * as injectables from '../injectables.js';
 import { JobManager } from '../jobs/manager.js';
-import { PubSubManager } from '../pubsub/manager.js';
 import { BaseRuntime } from '../runtime.js';
+import { SubscriptionManager } from '../subscription/manager.js';
 export class BaseWorkerRuntime extends BaseRuntime {
     config;
     workerType;
-    pubsub;
+    subscriptionManager;
     jobManager;
     constructor(config, options, workerType) {
         super(options);
         this.config = config;
         this.workerType = workerType;
-        this.pubsub = new PubSubManager({
+        this.subscriptionManager = new SubscriptionManager({
             logger: this.logger,
             container: this.container,
         });
@@ -24,8 +24,8 @@ export class BaseWorkerRuntime extends BaseRuntime {
         const injections = [
             provision(CoreInjectables.logger, this.logger),
             provision(injectables.workerType, this.workerType),
-            provision(injectables.pubSubPublish, this.pubsub.publish.bind(this.pubsub)),
-            provision(injectables.pubSubSubscribe, this.pubsub.subscribe.bind(this.pubsub)),
+            provision(injectables.publish, this.subscriptionManager.publish.bind(this.subscriptionManager)),
+            provision(injectables.subscribe, this.subscriptionManager.subscribe.bind(this.subscriptionManager)),
         ];
         if (this.config.store) {
             injections.push(provision(injectables.storeConfig, this.config.store));

package/dist/runtime/workers/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/runtime/workers/base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAKxD,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,MAAM,OAAgB,iBAAkB,SAAQ,WAAW;IAK9C,MAAM;IAEN,UAAU;IANrB,MAAM,CAAe;IACrB,UAAU,CAAa;IAEvB,YACW,MAAoB,EAC7B,OAA2B,EAClB,UAAsB,EAC/B;QACA,KAAK,CAAC,OAAO,CAAC,CAAA;sBAJL,MAAM;0BAEN,UAAU;QAInB,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC;YAC9B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,EACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CACnE,CAAA;QACH,CAAC;IAAA,CACF;IAED,KAAK,CAAC,UAAU,GAAkB;QAChC,MAAM,UAAU,GAAgB;YAC9B,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YAC9C,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;YAClD,SAAS,CACP,WAAW,CAAC,aAAa,EACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CACtC;YACD,SAAS,CACP,WAAW,CAAC,eAAe,EAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CACxC;SACF,CAAA;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QACxE,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CACb,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAClE,CAAA;QACH,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;IAAA,CACzB;IAES,KAAK,CAAC,WAAW,GAAkB;QAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,CAAA;IAAA,CACpC;IAES,KAAK,CAAC,QAAQ,GAAkB;QACxC,MAAM,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,CAAA;IAAA,CACnC;CACF"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/runtime/workers/base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAKxD,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAEhE,MAAM,OAAgB,iBAAkB,SAAQ,WAAW;IAK9C,MAAM;IAEN,UAAU;IANrB,mBAAmB,CAAqB;IACxC,UAAU,CAAa;IAEvB,YACW,MAAoB,EAC7B,OAA2B,EAClB,UAAsB,EAC/B;QACA,KAAK,CAAC,OAAO,CAAC,CAAA;sBAJL,MAAM;0BAEN,UAAU;QAInB,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC;YACjD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,EACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CACnE,CAAA;QACH,CAAC;IAAA,CACF;IAED,KAAK,CAAC,UAAU,GAAkB;QAChC,MAAM,UAAU,GAAgB;YAC9B,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YAC9C,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;YAClD,SAAS,CACP,WAAW,CAAC,OAAO,EACnB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAChE;YACD,SAAS,CACP,WAAW,CAAC,SAAS,EACrB,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAClE;SACF,CAAA;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QACxE,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CACb,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAClE,CAAA;QACH,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;IAAA,CACzB;IAES,KAAK,CAAC,WAAW,GAAkB;QAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,CAAA;IAAA,CACpC;IAES,KAAK,CAAC,QAAQ,GAAkB;QACxC,MAAM,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,CAAA;IAAA,CACnC;CACF"}

package/package.json

@@ -47,16 +47,16 @@
     "oxc-resolver": "11.19.1",
     "prom-client": "git@github.com:siimon/prom-client.git#d4d2dcb366384833951e0116caca707b5f62aa5e",
     "vite": "8.0.1",
-    "@nmtjs/contract": "0.15.2",
-    "@nmtjs/gateway": "0.15.2",
-    "@nmtjs/http-transport": "0.15.2",
-    "@nmtjs/common": "0.15.2",
-    "@nmtjs/json-format": "0.15.2",
-    "@nmtjs/msgpack-format": "0.15.2",
-    "@nmtjs/protocol": "0.15.2",
-    "@nmtjs/type": "0.15.2",
-    "@nmtjs/core": "0.15.2",
-    "@nmtjs/ws-transport": "0.15.2"
+    "@nmtjs/common": "0.16.0-beta.1",
+    "@nmtjs/gateway": "0.16.0-beta.1",
+    "@nmtjs/http-transport": "0.16.0-beta.1",
+    "@nmtjs/contract": "0.16.0-beta.1",
+    "@nmtjs/json-format": "0.16.0-beta.1",
+    "@nmtjs/msgpack-format": "0.16.0-beta.1",
+    "@nmtjs/protocol": "0.16.0-beta.1",
+    "@nmtjs/core": "0.16.0-beta.1",
+    "@nmtjs/type": "0.16.0-beta.1",
+    "@nmtjs/ws-transport": "0.16.0-beta.1"
   },
   "devDependencies": {
     "@nmtjs/proxy": "1.0.0-beta.4",
@@ -79,7 +79,7 @@
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.15.2",
+  "version": "0.16.0-beta.1",
   "scripts": {
     "clean-build": "rm -rf ./dist"
   }

package/src/runtime/application/api/logging.ts

@@ -39,16 +39,32 @@ export const LoggingCallMiddleware = (
     errorLevel?: 'warn' | 'error' | 'fatal'
     includePayload?: boolean
     includeResponse?: boolean
-  } = { level: 'info', includePayload: true, includeResponse: true },
+    includeStreamChunks?: boolean
+  } = {},
 ) =>
   createMiddleware({
     dependencies: { logger: CoreInjectables.logger('RPC') },
     handle: async ({ logger }, call, next, payload) => {
-      const logFn = logger[options.level || 'info'].bind(logger)
-      const errorLogFn = logger[options.errorLevel || 'error'].bind(logger)
+      const {
+        includePayload,
+        includeResponse,
+        includeStreamChunks,
+        level,
+        errorLevel,
+      } = {
+        level: 'info' as const,
+        errorLevel: 'error' as const,
+        includePayload: true,
+        includeResponse: true,
+        includeStreamChunks: true,
+        ...options,
+      }
+
+      const logFn = logger[level].bind(logger)
+      const errorLogFn = logger[errorLevel].bind(logger)
 
       logFn(
-        options.includePayload
+        includePayload
           ? { procedure: call.procedure.contract.name, payload: payload }
           : { procedure: call.procedure.contract.name },
         'RPC call',
@@ -60,21 +76,31 @@ export const LoggingCallMiddleware = (
 
       try {
         const response = await next()
-        if (options.includeResponse) {
+        if (includeResponse) {
           if (isIterableProcedure) {
             logFn({ result: 'success', response: 'Stream' }, 'RPC response')
-            return async function* (...args: any[]) {
+          } else {
+            logFn({ result: 'success', response }, 'RPC response')
+          }
+        } else {
+          logFn({ result: 'success' }, 'RPC response')
+        }
+
+        if (isIterableProcedure && includeStreamChunks) {
+          return async function* (...args: any[]) {
+            try {
               for await (const chunk of response(...args)) {
                 logFn({ callId: call.callId, chunk }, 'RPC stream chunk')
                 yield chunk
               }
+              logFn({ callId: call.callId }, 'RPC stream end')
+            } catch (error) {
+              errorLogFn({ callId: call.callId, error }, 'RPC stream error')
+              throw error
             }
-          } else {
-            logFn({ result: 'success', response }, 'RPC response')
           }
-        } else {
-          logFn({ result: 'success' }, 'RPC response')
         }
+
         return response
       } catch (error) {
         errorLogFn({ error }, 'RPC error')

package/src/runtime/index.ts

@@ -9,8 +9,6 @@ export * from './jobs/router.ts'
 export * from './jobs/step.ts'
 export * from './jobs/types.ts'
 export * from './plugin.ts'
-export * from './pubsub/manager.ts'
-export * from './pubsub/redis.ts'
 export * from './runtime.ts'
 export * from './scheduler/index.ts'
 export * from './server/config.ts'
@@ -24,6 +22,8 @@ export * from './server/server.ts'
 export * from './server/types.ts'
 export * from './server/worker-pool.ts'
 export * from './store/index.ts'
+export * from './subscription/manager.ts'
+export * from './subscription/redis.ts'
 export * from './types.ts'
 export * from './workers/application.ts'
 export * from './workers/base.ts'

package/src/runtime/injectables.ts

@@ -3,26 +3,24 @@ import { createLazyInjectable, Scope } from '@nmtjs/core'
 import type { JobWorkerPool, WorkerType } from './enums.ts'
 import type { JobManagerInstance } from './jobs/manager.ts'
 import type { JobExecutionContext, SaveJobProgress } from './jobs/types.ts'
-import type {
-  PubSubAdapterType,
-  PubSubPublish,
-  PubSubSubscribe,
-} from './pubsub/manager.ts'
 import type { ServerStoreConfig } from './server/config.ts'
+import type {
+  PublishFn,
+  SubscribeFn,
+  SubscriptionAdapterType,
+} from './subscription/manager.ts'
 
-export const pubSubAdapter = createLazyInjectable<PubSubAdapterType>(
-  Scope.Global,
-  'PubSubAdapter',
-)
+export const subscriptionAdapter =
+  createLazyInjectable<SubscriptionAdapterType>(
+    Scope.Global,
+    'SubscriptionAdapter',
+  )
 
-export const pubSubPublish = createLazyInjectable<PubSubPublish>(
-  Scope.Global,
-  'PubSubPublish',
-)
+export const publish = createLazyInjectable<PublishFn>(Scope.Global, 'Publish')
 
-export const pubSubSubscribe = createLazyInjectable<PubSubSubscribe>(
+export const subscribe = createLazyInjectable<SubscribeFn>(
   Scope.Global,
-  'PubSubSubscribe',
+  'Subscribe',
 )
 
 export const jobManager = createLazyInjectable<JobManagerInstance>(
@@ -61,9 +59,9 @@ export const currentJobInfo = createLazyInjectable<JobExecutionContext>(
 )
 
 export const RuntimeInjectables = {
-  pubSubAdapter,
-  pubSubPublish,
-  pubSubSubscribe,
+  subscriptionAdapter,
+  publish,
+  subscribe,
   jobManager,
   storeConfig,
   workerType,

package/src/runtime/server/config.ts

@@ -6,8 +6,8 @@ import type { Applications } from 'nmtjs/runtime/types'
 import type { ApplicationConfig } from '../application/config.ts'
 import type { JobWorkerPool, StoreType } from '../enums.ts'
 import type { AnyJob } from '../jobs/job.ts'
-import type { PubSubAdapterType } from '../pubsub/manager.ts'
 import type { JobsSchedulerOptions } from '../scheduler/index.ts'
+import type { SubscriptionAdapterType } from '../subscription/manager.ts'
 import type { StoreTypeOptions } from '../types.ts'
 import { kServerConfig } from '../constants.ts'
 
@@ -86,7 +86,7 @@ export interface ServerConfigInit {
   }
   jobs?: ServerJobsConfig
   commands?: {}
-  pubsub?: { adapter: PubSubAdapterType }
+  subscription?: { adapter: SubscriptionAdapterType }
   deploymentId?: string
   metrics?: {
     /**
@@ -148,7 +148,7 @@ export interface ServerConfig {
     ui?: ServerJobsConfig['ui']
   }
   commands?: {}
-  pubsub: ServerConfigInit['pubsub']
+  subscription: ServerConfigInit['subscription']
   deploymentId: ServerConfigInit['deploymentId']
   metrics?: ServerConfigInit['metrics']
 }
@@ -161,7 +161,7 @@ export function defineServer(options: ServerConfigInit): ServerConfig {
     proxy,
     store,
     applications,
-    pubsub,
+    subscription,
     metrics,
   } = options
 
@@ -187,7 +187,7 @@ export function defineServer(options: ServerConfigInit): ServerConfig {
     proxy,
     store,
     applications,
-    pubsub,
+    subscription,
     jobs,
     metrics,
   } as const)