nmtjs 0.15.2 → 0.16.0-beta.1

package/dist/index.d.ts

@@ -27,9 +27,9 @@ export declare namespace neemata {
             rpcStreamAbortSignal: import("@nmtjs/core").DependencyOptional<import("@nmtjs/core").LazyInjectable<AbortSignal, import("@nmtjs/core").Scope.Call>>;
         }, import("@nmtjs/core").Scope.Global, AbortSignal>;
         createBlob: import("@nmtjs/core").LazyInjectable<(source: string | ArrayBuffer | Blob | File | import("stream").Readable | ReadableStream<any> | Uint8Array<ArrayBufferLike>, metadata?: import("@nmtjs/protocol").ProtocolBlobMetadata | undefined) => import("@nmtjs/protocol").ProtocolBlobInterface, import("@nmtjs/core").Scope.Call>;
-        pubSubAdapter: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubAdapterType, import("@nmtjs/core").Scope.Global>;
-        pubSubPublish: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubPublish, import("@nmtjs/core").Scope.Global>;
-        pubSubSubscribe: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubSubscribe, import("@nmtjs/core").Scope.Global>;
+        subscriptionAdapter: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").SubscriptionAdapterType, import("@nmtjs/core").Scope.Global>;
+        publish: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PublishFn, import("@nmtjs/core").Scope.Global>;
+        subscribe: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").SubscribeFn, import("@nmtjs/core").Scope.Global>;
         jobManager: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").JobManagerInstance, import("@nmtjs/core").Scope.Global>;
         storeConfig: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").ServerStoreConfig, import("@nmtjs/core").Scope.Global>;
         workerType: import("@nmtjs/core").LazyInjectable<import("./runtime/enums.ts").WorkerType, import("@nmtjs/core").Scope.Global>;
@@ -61,9 +61,9 @@ export declare namespace neemata {
             rpcStreamAbortSignal: import("@nmtjs/core").DependencyOptional<import("@nmtjs/core").LazyInjectable<AbortSignal, import("@nmtjs/core").Scope.Call>>;
         }, import("@nmtjs/core").Scope.Global, AbortSignal>;
         createBlob: import("@nmtjs/core").LazyInjectable<(source: string | ArrayBuffer | Blob | File | import("stream").Readable | ReadableStream<any> | Uint8Array<ArrayBufferLike>, metadata?: import("@nmtjs/protocol").ProtocolBlobMetadata | undefined) => import("@nmtjs/protocol").ProtocolBlobInterface, import("@nmtjs/core").Scope.Call>;
-        pubSubAdapter: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubAdapterType, import("@nmtjs/core").Scope.Global>;
-        pubSubPublish: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubPublish, import("@nmtjs/core").Scope.Global>;
-        pubSubSubscribe: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PubSubSubscribe, import("@nmtjs/core").Scope.Global>;
+        subscriptionAdapter: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").SubscriptionAdapterType, import("@nmtjs/core").Scope.Global>;
+        publish: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").PublishFn, import("@nmtjs/core").Scope.Global>;
+        subscribe: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").SubscribeFn, import("@nmtjs/core").Scope.Global>;
         jobManager: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").JobManagerInstance, import("@nmtjs/core").Scope.Global>;
         storeConfig: import("@nmtjs/core").LazyInjectable<import("./runtime/index.ts").ServerStoreConfig, import("@nmtjs/core").Scope.Global>;
         workerType: import("@nmtjs/core").LazyInjectable<import("./runtime/enums.ts").WorkerType, import("@nmtjs/core").Scope.Global>;

package/dist/runtime/application/api/logging.d.ts

@@ -11,6 +11,7 @@ export declare const LoggingCallMiddleware: (options?: {
     errorLevel?: "error" | "fatal" | "warn" | undefined;
     includePayload?: boolean | undefined;
     includeResponse?: boolean | undefined;
+    includeStreamChunks?: boolean | undefined;
 }) => import("./middlewares.ts").Middleware<{
     logger: import("@nmtjs/core").FactoryInjectable<import("pino").Logger, {
         logger: import("@nmtjs/core").LazyInjectable<import("pino").Logger, import("@nmtjs/core").Scope.Global>;

package/dist/runtime/application/api/logging.js

@@ -21,26 +21,28 @@ export const LoggingCallContextMiddleware = (cb = defaultContext) => createMiddl
         });
     },
 });
-export const LoggingCallMiddleware = (options = { level: 'info', includePayload: true, includeResponse: true }) => createMiddleware({
+export const LoggingCallMiddleware = (options = {}) => 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);
-        logFn(options.includePayload
+        const { includePayload, includeResponse, includeStreamChunks, level, errorLevel, } = {
+            level: 'info',
+            errorLevel: 'error',
+            includePayload: true,
+            includeResponse: true,
+            includeStreamChunks: true,
+            ...options,
+        };
+        const logFn = logger[level].bind(logger);
+        const errorLogFn = logger[errorLevel].bind(logger);
+        logFn(includePayload
             ? { procedure: call.procedure.contract.name, payload: payload }
             : { procedure: call.procedure.contract.name }, 'RPC call');
         const isIterableProcedure = IsStreamProcedureContract(call.procedure.contract);
         try {
             const response = await next();
-            if (options.includeResponse) {
+            if (includeResponse) {
                 if (isIterableProcedure) {
                     logFn({ result: 'success', response: 'Stream' }, 'RPC response');
-                    return async function* (...args) {
-                        for await (const chunk of response(...args)) {
-                            logFn({ callId: call.callId, chunk }, 'RPC stream chunk');
-                            yield chunk;
-                        }
-                    };
                 }
                 else {
                     logFn({ result: 'success', response }, 'RPC response');
@@ -49,6 +51,21 @@ export const LoggingCallMiddleware = (options = { level: 'info', includePayload:
             else {
                 logFn({ result: 'success' }, 'RPC response');
             }
+            if (isIterableProcedure && includeStreamChunks) {
+                return async function* (...args) {
+                    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;
+                    }
+                };
+            }
             return response;
         }
         catch (error) {

package/dist/runtime/application/api/logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../src/runtime/application/api/logging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../src/runtime/application/api/logging.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,cAAc,GAAG,CAAC,OAAuB,EAAE,OAAgB,EAAE,EAAE,CAAC;IACpE,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE;YACV,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE;YACzB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;YAC7B,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;YACvC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;YACrC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;SACtC;KACF,CAAA;AAAA,CACF,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,EAAE,GAG0B,cAAc,EAC1C,EAAE,CACF,gBAAgB,CAAC;IACf,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC9C,OAAO,kBAAkB,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;YACxD,OAAO,IAAI,EAAE,CAAA;QAAA,CACd,CAAC,CAAA;IAAA,CACH;CACF,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,OAAO,GAMH,EAAE,EACN,EAAE,CACF,gBAAgB,CAAC;IACf,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;IACvD,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;QACjD,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,KAAK,EACL,UAAU,GACX,GAAG;YACF,KAAK,EAAE,MAAe;YACtB,UAAU,EAAE,OAAgB;YAC5B,cAAc,EAAE,IAAI;YACpB,eAAe,EAAE,IAAI;YACrB,mBAAmB,EAAE,IAAI;YACzB,GAAG,OAAO;SACX,CAAA;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElD,KAAK,CACH,cAAc;YACZ,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE;YAC/D,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,EAC/C,UAAU,CACX,CAAA;QAED,MAAM,mBAAmB,GAAG,yBAAyB,CACnD,IAAI,CAAC,SAAS,CAAC,QAAQ,CACxB,CAAA;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAA;YAC7B,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,mBAAmB,EAAE,CAAC;oBACxB,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,cAAc,CAAC,CAAA;gBAClE,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,cAAc,CAAC,CAAA;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,cAAc,CAAC,CAAA;YAC9C,CAAC;YAED,IAAI,mBAAmB,IAAI,mBAAmB,EAAE,CAAC;gBAC/C,OAAO,KAAK,SAAS,CAAC,EAAE,GAAG,IAAW,EAAE;oBACtC,IAAI,CAAC;wBACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;4BAC5C,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,CAAC,CAAA;4BACzD,MAAM,KAAK,CAAA;wBACb,CAAC;wBACD,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAA;oBAClD,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,CAAC,CAAA;wBAC9D,MAAM,KAAK,CAAA;oBACb,CAAC;gBAAA,CACF,CAAA;YACH,CAAC;YAED,OAAO,QAAQ,CAAA;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,CAAA;YAClC,MAAM,KAAK,CAAA;QACb,CAAC;IAAA,CACF;CACF,CAAC,CAAA"}

package/dist/runtime/index.d.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/dist/runtime/index.js

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

package/dist/runtime/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA"}

package/dist/runtime/injectables.d.ts

@@ -2,11 +2,11 @@ import { 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';
-export declare const pubSubAdapter: import("@nmtjs/core").LazyInjectable<PubSubAdapterType, Scope.Global>;
-export declare const pubSubPublish: import("@nmtjs/core").LazyInjectable<PubSubPublish, Scope.Global>;
-export declare const pubSubSubscribe: import("@nmtjs/core").LazyInjectable<PubSubSubscribe, Scope.Global>;
+import type { PublishFn, SubscribeFn, SubscriptionAdapterType } from './subscription/manager.ts';
+export declare const subscriptionAdapter: import("@nmtjs/core").LazyInjectable<SubscriptionAdapterType, Scope.Global>;
+export declare const publish: import("@nmtjs/core").LazyInjectable<PublishFn, Scope.Global>;
+export declare const subscribe: import("@nmtjs/core").LazyInjectable<SubscribeFn, Scope.Global>;
 export declare const jobManager: import("@nmtjs/core").LazyInjectable<JobManagerInstance, Scope.Global>;
 export declare const storeConfig: import("@nmtjs/core").LazyInjectable<ServerStoreConfig, Scope.Global>;
 export declare const workerType: import("@nmtjs/core").LazyInjectable<WorkerType, Scope.Global>;
@@ -15,9 +15,9 @@ export declare const jobAbortSignal: import("@nmtjs/core").LazyInjectable<AbortS
 export declare const saveJobProgress: import("@nmtjs/core").LazyInjectable<SaveJobProgress, Scope.Global>;
 export declare const currentJobInfo: import("@nmtjs/core").LazyInjectable<JobExecutionContext, Scope.Global>;
 export declare const RuntimeInjectables: {
-    pubSubAdapter: import("@nmtjs/core").LazyInjectable<PubSubAdapterType, Scope.Global>;
-    pubSubPublish: import("@nmtjs/core").LazyInjectable<PubSubPublish, Scope.Global>;
-    pubSubSubscribe: import("@nmtjs/core").LazyInjectable<PubSubSubscribe, Scope.Global>;
+    subscriptionAdapter: import("@nmtjs/core").LazyInjectable<SubscriptionAdapterType, Scope.Global>;
+    publish: import("@nmtjs/core").LazyInjectable<PublishFn, Scope.Global>;
+    subscribe: import("@nmtjs/core").LazyInjectable<SubscribeFn, Scope.Global>;
     jobManager: import("@nmtjs/core").LazyInjectable<JobManagerInstance, Scope.Global>;
     storeConfig: import("@nmtjs/core").LazyInjectable<ServerStoreConfig, Scope.Global>;
     workerType: import("@nmtjs/core").LazyInjectable<WorkerType, Scope.Global>;

package/dist/runtime/injectables.js

@@ -1,7 +1,7 @@
 import { createLazyInjectable, Scope } from '@nmtjs/core';
-export const pubSubAdapter = createLazyInjectable(Scope.Global, 'PubSubAdapter');
-export const pubSubPublish = createLazyInjectable(Scope.Global, 'PubSubPublish');
-export const pubSubSubscribe = createLazyInjectable(Scope.Global, 'PubSubSubscribe');
+export const subscriptionAdapter = createLazyInjectable(Scope.Global, 'SubscriptionAdapter');
+export const publish = createLazyInjectable(Scope.Global, 'Publish');
+export const subscribe = createLazyInjectable(Scope.Global, 'Subscribe');
 export const jobManager = createLazyInjectable(Scope.Global, 'JobManager');
 export const storeConfig = createLazyInjectable(Scope.Global, 'StoreConfig');
 export const workerType = createLazyInjectable(Scope.Global, 'WorkerType');
@@ -10,9 +10,9 @@ export const jobAbortSignal = createLazyInjectable(Scope.Global, 'JobAbortSignal
 export const saveJobProgress = createLazyInjectable(Scope.Global, 'SaveJobProgress');
 export const currentJobInfo = createLazyInjectable(Scope.Global, 'CurrentJobInfo');
 export const RuntimeInjectables = {
-    pubSubAdapter,
-    pubSubPublish,
-    pubSubSubscribe,
+    subscriptionAdapter,
+    publish,
+    subscribe,
     jobManager,
     storeConfig,
     workerType,

package/dist/runtime/injectables.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectables.js","sourceRoot":"","sources":["../../src/runtime/injectables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAYzD,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAC/C,KAAK,CAAC,MAAM,EACZ,eAAe,CAChB,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAC/C,KAAK,CAAC,MAAM,EACZ,eAAe,CAChB,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CACjD,KAAK,CAAC,MAAM,EACZ,iBAAiB,CAClB,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAC5C,KAAK,CAAC,MAAM,EACZ,YAAY,CACb,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAC7C,KAAK,CAAC,MAAM,EACZ,aAAa,CACd,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAC5C,KAAK,CAAC,MAAM,EACZ,YAAY,CACb,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAC/C,KAAK,CAAC,MAAM,EACZ,eAAe,CAChB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAChD,KAAK,CAAC,MAAM,EACZ,gBAAgB,CACjB,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CACjD,KAAK,CAAC,MAAM,EACZ,iBAAiB,CAClB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAChD,KAAK,CAAC,MAAM,EACZ,gBAAgB,CACjB,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,aAAa;IACb,aAAa;IACb,eAAe;IACf,UAAU;IACV,WAAW;IACX,UAAU;IACV,aAAa;IACb,cAAc;IACd,eAAe;IACf,cAAc;CACf,CAAA"}
+{"version":3,"file":"injectables.js","sourceRoot":"","sources":["../../src/runtime/injectables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAYzD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,oBAAoB,CAClB,KAAK,CAAC,MAAM,EACZ,qBAAqB,CACtB,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,oBAAoB,CAAY,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,SAAS,GAAG,oBAAoB,CAC3C,KAAK,CAAC,MAAM,EACZ,WAAW,CACZ,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAC5C,KAAK,CAAC,MAAM,EACZ,YAAY,CACb,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAC7C,KAAK,CAAC,MAAM,EACZ,aAAa,CACd,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAC5C,KAAK,CAAC,MAAM,EACZ,YAAY,CACb,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAC/C,KAAK,CAAC,MAAM,EACZ,eAAe,CAChB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAChD,KAAK,CAAC,MAAM,EACZ,gBAAgB,CACjB,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CACjD,KAAK,CAAC,MAAM,EACZ,iBAAiB,CAClB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAChD,KAAK,CAAC,MAAM,EACZ,gBAAgB,CACjB,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,mBAAmB;IACnB,OAAO;IACP,SAAS;IACT,UAAU;IACV,WAAW;IACX,UAAU;IACV,aAAa;IACb,cAAc;IACd,eAAe;IACf,cAAc;CACf,CAAA"}

package/dist/runtime/server/config.d.ts

@@ -5,8 +5,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';
 export type ServerPoolOptions = {
@@ -82,8 +82,8 @@ export interface ServerConfigInit {
     };
     jobs?: ServerJobsConfig;
     commands?: {};
-    pubsub?: {
-        adapter: PubSubAdapterType;
+    subscription?: {
+        adapter: SubscriptionAdapterType;
     };
     deploymentId?: string;
     metrics?: {
@@ -144,7 +144,7 @@ export interface ServerConfig {
         ui?: ServerJobsConfig['ui'];
     };
     commands?: {};
-    pubsub: ServerConfigInit['pubsub'];
+    subscription: ServerConfigInit['subscription'];
     deploymentId: ServerConfigInit['deploymentId'];
     metrics?: ServerConfigInit['metrics'];
 }

package/dist/runtime/server/config.js

@@ -1,6 +1,6 @@
 import { kServerConfig } from '../constants.js';
 export function defineServer(options) {
-    const { deploymentId, logger, commands, proxy, store, applications, pubsub, metrics, } = options;
+    const { deploymentId, logger, commands, proxy, store, applications, subscription, metrics, } = options;
     let jobs;
     if (options.jobs) {
         const map = new Map();
@@ -23,7 +23,7 @@ export function defineServer(options) {
         proxy,
         store,
         applications,
-        pubsub,
+        subscription,
         jobs,
         metrics,
     });

package/dist/runtime/server/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/runtime/server/config.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAgJ/C,MAAM,UAAU,YAAY,CAAC,OAAyB,EAAgB;IACpE,MAAM,EACJ,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,EACL,YAAY,EACZ,MAAM,EACN,OAAO,GACR,GAAG,OAAO,CAAA;IAEX,IAAI,IAAsC,CAAA;IAC1C,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAA;QACrC,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACjE,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,IAAI,EAAE;YACzD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACxB,IAAI,GAAG;YACL,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK;YACzB,IAAI,EAAE,GAAG;YACT,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS;YACjC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;SACpB,CAAA;IACH,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,CAAC,aAAa,CAAC,EAAE,IAAI;QACrB,YAAY;QACZ,MAAM;QACN,QAAQ;QACR,KAAK;QACL,KAAK;QACL,YAAY;QACZ,MAAM;QACN,IAAI;QACJ,OAAO;KACC,CAAC,CAAA;AAAA,CACZ;AAED,MAAM,UAAU,cAAc,CAAC,KAAU,EAAyB;IAChE,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;AAAA,CACvC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/runtime/server/config.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAgJ/C,MAAM,UAAU,YAAY,CAAC,OAAyB,EAAgB;IACpE,MAAM,EACJ,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,OAAO,GACR,GAAG,OAAO,CAAA;IAEX,IAAI,IAAsC,CAAA;IAC1C,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAA;QACrC,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACjE,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,IAAI,EAAE;YACzD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACxB,IAAI,GAAG;YACL,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK;YACzB,IAAI,EAAE,GAAG;YACT,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS;YACjC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;SACpB,CAAA;IACH,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,CAAC,aAAa,CAAC,EAAE,IAAI;QACrB,YAAY;QACZ,MAAM;QACN,QAAQ;QACR,KAAK;QACL,KAAK;QACL,YAAY;QACZ,YAAY;QACZ,IAAI;QACJ,OAAO;KACC,CAAC,CAAA;AAAA,CACZ;AAED,MAAM,UAAU,cAAc,CAAC,KAAU,EAAyB;IAChE,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;AAAA,CACvC"}

package/dist/runtime/{pubsub → subscription}/manager.d.ts

@@ -2,22 +2,22 @@ import { Readable } from 'node:stream';
 import type { TAnyEventContract, TAnySubscriptionContract } from '@nmtjs/contract';
 import type { Container, Logger } from '@nmtjs/core';
 import type { t } from '@nmtjs/type';
-export type PubSubAdapterEvent = {
+export type SubscriptionAdapterEvent = {
     channel: string;
     payload: any;
 };
-export interface PubSubAdapterType {
+export interface SubscriptionAdapterType {
     publish(channel: string, payload: any): Promise<boolean>;
-    subscribe(channel: string, signal?: AbortSignal): AsyncGenerator<PubSubAdapterEvent>;
+    subscribe(channel: string, signal?: AbortSignal): AsyncGenerator<SubscriptionAdapterEvent>;
     initialize(): Promise<void>;
     dispose(): Promise<void>;
 }
-export type PubSubChannel = {
+export type SubscriptionChannel = {
     stream: Readable;
     subscription: TAnySubscriptionContract;
     event: TAnyEventContract;
 };
-export type PubSubSubscribe = <Contract extends TAnySubscriptionContract, Events extends {
+export type SubscribeFn = <Contract extends TAnySubscriptionContract, Events extends {
     [K in keyof Contract['events']]?: true;
 }>(subscription: Contract, events: Events, options: Contract['options'], signal?: AbortSignal) => Promise<Omit<Readable, typeof Symbol.asyncIterator> & {
     [Symbol.asyncIterator]: () => AsyncIterator<{} extends Events ? {
@@ -32,17 +32,18 @@ export type PubSubSubscribe = <Contract extends TAnySubscriptionContract, Events
         } : never;
     }[keyof Events]>;
 }>;
-export type PubSubPublish = <S extends TAnySubscriptionContract, E extends S['events'][keyof S['events']]>(event: E, options: S['options'], data: t.infer.decode.input<E['payload']>) => Promise<boolean>;
-export type PubSubManagerOptions = {
+export type PublishFn = <S extends TAnySubscriptionContract, E extends S['events'][keyof S['events']]>(event: E, options: S['options'], data: t.infer.decode.input<E['payload']>) => Promise<boolean>;
+export type SubscriptionManagerOptions = {
     logger: Logger;
     container: Container;
 };
-export declare class PubSubManager {
-    protected readonly options: PubSubManagerOptions;
-    readonly subscriptions: Map<string, PubSubChannel>;
-    constructor(options: PubSubManagerOptions);
-    protected get adapter(): Promise<PubSubAdapterType>;
-    subscribe: PubSubSubscribe;
-    publish: PubSubPublish;
+export declare class SubscriptionManager {
+    protected readonly options: SubscriptionManagerOptions;
+    readonly subscriptions: Map<string, SubscriptionChannel>;
+    protected readonly logger: Logger;
+    constructor(options: SubscriptionManagerOptions);
+    protected get adapter(): Promise<SubscriptionAdapterType>;
+    subscribe: SubscribeFn;
+    publish: PublishFn;
     private createEventStream;
 }

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

@@ -2,57 +2,101 @@ import assert from 'node:assert';
 import { createHash } from 'node:crypto';
 import { PassThrough, Readable } from 'node:stream';
 import { isAbortError } from '@nmtjs/common';
-import { pubSubAdapter } from '../injectables.js';
-export class PubSubManager {
+import { subscriptionAdapter } from '../injectables.js';
+export class SubscriptionManager {
     options;
     subscriptions = new Map();
+    logger;
     constructor(options) {
         this.options = options;
+        this.logger = options.logger.child({ component: SubscriptionManager.name });
     }
     get adapter() {
-        return this.options.container.resolve(pubSubAdapter);
+        return this.options.container.resolve(subscriptionAdapter);
     }
     subscribe = async (subscription, events, options, signal) => {
         const adapter = await this.adapter;
         const eventKeys = Object.keys(events).length === 0
             ? Object.keys(subscription.events)
             : Object.keys(events);
+        this.logger.debug({ subscription: subscription.name, eventCount: eventKeys.length }, 'Opening subscription');
         const streams = Array(eventKeys.length);
         for (const index in eventKeys) {
             const event = subscription.events[eventKeys[index]];
             const channel = getChannelName(event, options);
             if (this.subscriptions.has(channel)) {
                 streams[index] = this.subscriptions.get(channel).stream;
+                this.logger.trace({
+                    channel,
+                    event: event.name,
+                    activeChannels: this.subscriptions.size,
+                }, 'Reusing pubsub channel stream');
             }
             else {
                 const iterable = adapter.subscribe(channel, signal);
                 const stream = this.createEventStream(iterable);
-                stream.on('close', () => this.subscriptions.delete(channel));
+                stream.on('close', () => {
+                    this.subscriptions.delete(channel);
+                    this.logger.debug({
+                        channel,
+                        event: event.name,
+                        activeChannels: this.subscriptions.size,
+                    }, 'Pubsub channel stream closed');
+                });
+                stream.on('error', (error) => {
+                    this.logger.warn({ channel, event: event.name, error }, 'Pubsub channel stream failed');
+                });
                 streams[index] = stream;
                 this.subscriptions.set(channel, { subscription, event, stream });
+                this.logger.debug({
+                    channel,
+                    event: event.name,
+                    activeChannels: this.subscriptions.size,
+                }, 'Creating channel stream');
             }
         }
-        return mergeEventStreams(streams, signal);
+        const mergedStream = mergeEventStreams(streams, signal);
+        mergedStream.once('close', () => {
+            this.logger.debug({ subscription: subscription.name, eventCount: eventKeys.length }, 'Pubsub subscription stream closed');
+        });
+        mergedStream.once('error', (error) => {
+            this.logger.warn({
+                subscription: subscription.name,
+                eventCount: eventKeys.length,
+                error,
+            }, 'Pubsub subscription stream failed');
+        });
+        return mergedStream;
     };
     publish = async (event, options, data) => {
         const adapter = await this.adapter;
         const channel = getChannelName(event, options);
+        this.logger.trace({ channel, event: event.name }, 'Publishing pubsub event');
         try {
             const payload = event.payload.encode(data);
-            return await adapter.publish(channel, payload);
+            const published = await adapter.publish(channel, payload);
+            if (published) {
+                this.logger.trace({ channel, event: event.name }, 'Published pubsub event');
+            }
+            else {
+                this.logger.warn({ channel, event: event.name }, 'Pubsub adapter reported publish failure');
+            }
+            return published;
         }
         catch (error) {
-            this.options.logger.error(`Failed to publish event "${event.name}" on channel "${channel}": ${error.message}`);
-            return Promise.reject(error);
+            this.logger.error({ channel, event: event.name, error }, 'Failed to publish pubsub event');
+            throw error;
         }
     };
     createEventStream(iterable) {
         const { subscriptions } = this;
+        const logger = this.logger;
         return new Readable({
             objectMode: true,
             read() {
                 iterable.next().then(({ value, done }) => {
                     if (done) {
+                        logger.trace('Pubsub adapter stream ended');
                         this.push(null);
                     }
                     else {
@@ -61,18 +105,25 @@ export class PubSubManager {
                             const { event } = subscription;
                             try {
                                 const data = event.payload.decode(value.payload);
+                                logger.trace({ channel: value.channel, event: event.name }, 'Received event');
                                 this.push({ event: event.name, data });
                             }
                             catch (error) {
+                                logger.warn({ channel: value.channel, event: event.name, error }, 'Failed to decode pubsub event payload');
                                 this.destroy(error);
                             }
                         }
+                        else {
+                            logger.trace({ channel: value.channel }, 'Dropped pubsub event for inactive channel');
+                        }
                     }
                 }, (error) => {
                     if (isAbortError(error)) {
+                        logger.trace('Pubsub adapter stream aborted');
                         this.push(null);
                     }
                     else {
+                        logger.warn({ error }, 'Pubsub adapter stream failed');
                         this.destroy(error);
                     }
                 });

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

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

package/dist/runtime/{pubsub → subscription}/redis.d.ts

@@ -1,16 +1,18 @@
 import EventEmitter from 'node:events';
+import type { Logger } from '@nmtjs/core';
 import type { RuntimePlugin } from '../plugin.ts';
 import type { Store } from '../types.ts';
-import type { PubSubAdapterEvent, PubSubAdapterType } from './manager.ts';
-export declare class RedisPubSubAdapter implements PubSubAdapterType {
+import type { SubscriptionAdapterEvent, SubscriptionAdapterType } from './manager.ts';
+export declare class RedisSubscriptionAdapter implements SubscriptionAdapterType {
     protected readonly client: Store;
     protected readonly events: EventEmitter<[never]>;
     protected readonly listeners: Map<string, number>;
+    protected readonly logger?: Logger;
     protected subscriberClient?: Store;
-    constructor(client: Store);
+    constructor(client: Store, logger?: Logger);
     initialize(): Promise<void>;
     dispose(): Promise<void>;
     publish(channel: string, payload: any): Promise<boolean>;
-    subscribe(channel: string, signal?: AbortSignal): AsyncGenerator<PubSubAdapterEvent>;
+    subscribe(channel: string, signal?: AbortSignal): AsyncGenerator<SubscriptionAdapterEvent>;
 }
-export declare const RedisPubSubAdapterPlugin: () => RuntimePlugin;
+export declare const RedisSubscriptionAdapterPlugin: () => RuntimePlugin;