@rayondigital/nest-dapr 0.9.34 → 0.9.36

package/dist/dapr.loader.d.ts

@@ -6,6 +6,7 @@ import { NestActorManager } from './actors/nest-actor-manager';
 import { DaprContextService } from './dapr-context-service';
 import { DaprMetadataAccessor } from './dapr-metadata.accessor';
 import { DaprModuleOptions } from './dapr.module';
+import { DaprPubSubClient } from './pubsub/dapr-pubsub-client.service';
 export declare class DaprLoader implements OnApplicationBootstrap, OnApplicationShutdown {
     private readonly discoveryService;
     private readonly metadataScanner;
@@ -15,9 +16,10 @@ export declare class DaprLoader implements OnApplicationBootstrap, OnApplication
     private readonly daprActorClient;
     private readonly moduleRef;
     private readonly contextService;
+    private readonly pubSubClient;
     private readonly actorManager;
     private readonly logger;
-    constructor(discoveryService: DiscoveryService, metadataScanner: MetadataScanner, daprServer: DaprServer, daprMetadataAccessor: DaprMetadataAccessor, options: DaprModuleOptions, daprActorClient: DaprActorClient, moduleRef: ModuleRef, contextService: DaprContextService, actorManager: NestActorManager);
+    constructor(discoveryService: DiscoveryService, metadataScanner: MetadataScanner, daprServer: DaprServer, daprMetadataAccessor: DaprMetadataAccessor, options: DaprModuleOptions, daprActorClient: DaprActorClient, moduleRef: ModuleRef, contextService: DaprContextService, pubSubClient: DaprPubSubClient, actorManager: NestActorManager);
     onApplicationBootstrap(): Promise<void>;
     onApplicationShutdown(): Promise<void>;
     loadDaprHandlers(): void;

package/dist/dapr.loader.js

@@ -36,8 +36,9 @@ const nest_actor_manager_1 = require("./actors/nest-actor-manager");
 const dapr_context_service_1 = require("./dapr-context-service");
 const dapr_metadata_accessor_1 = require("./dapr-metadata.accessor");
 const dapr_module_1 = require("./dapr.module");
+const dapr_pubsub_client_service_1 = require("./pubsub/dapr-pubsub-client.service");
 let DaprLoader = DaprLoader_1 = class DaprLoader {
-    constructor(discoveryService, metadataScanner, daprServer, daprMetadataAccessor, options, daprActorClient, moduleRef, contextService, actorManager) {
+    constructor(discoveryService, metadataScanner, daprServer, daprMetadataAccessor, options, daprActorClient, moduleRef, contextService, pubSubClient, actorManager) {
         this.discoveryService = discoveryService;
         this.metadataScanner = metadataScanner;
         this.daprServer = daprServer;
@@ -46,11 +47,12 @@ let DaprLoader = DaprLoader_1 = class DaprLoader {
         this.daprActorClient = daprActorClient;
         this.moduleRef = moduleRef;
         this.contextService = contextService;
+        this.pubSubClient = pubSubClient;
         this.actorManager = actorManager;
         this.logger = new common_1.Logger(DaprLoader_1.name);
     }
     onApplicationBootstrap() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.options.disabled) {
                 this.logger.log('Dapr server is disabled');
@@ -63,12 +65,15 @@ let DaprLoader = DaprLoader_1 = class DaprLoader {
             if ((_c = (_b = (_a = this.options.clientOptions) === null || _a === void 0 ? void 0 : _a.actor) === null || _b === void 0 ? void 0 : _b.reentrancy) === null || _c === void 0 ? void 0 : _c.enabled) {
                 this.actorManager.setupReentrancy();
             }
+            if ((_d = this.options.pubsubOptions) === null || _d === void 0 ? void 0 : _d.defaultName) {
+                this.pubSubClient.setDefaultName(this.options.pubsubOptions.defaultName);
+            }
             if (this.options.actorOptions) {
-                this.daprActorClient.setAllowInternalCalls((_e = (_d = this.options.actorOptions) === null || _d === void 0 ? void 0 : _d.allowInternalCalls) !== null && _e !== void 0 ? _e : false);
-                this.daprActorClient.setPrefix((_g = (_f = this.options.actorOptions) === null || _f === void 0 ? void 0 : _f.prefix) !== null && _g !== void 0 ? _g : '', (_j = (_h = this.options.actorOptions) === null || _h === void 0 ? void 0 : _h.delimiter) !== null && _j !== void 0 ? _j : '-');
-                this.daprActorClient.setTypeNamePrefix((_l = (_k = this.options.actorOptions) === null || _k === void 0 ? void 0 : _k.typeNamePrefix) !== null && _l !== void 0 ? _l : '');
-                if ((_m = this.options.actorOptions) === null || _m === void 0 ? void 0 : _m.prefix) {
-                    this.logger.log(`Actors will be prefixed with ${(_p = (_o = this.options.actorOptions) === null || _o === void 0 ? void 0 : _o.prefix) !== null && _p !== void 0 ? _p : ''} and delimited with ${(_r = (_q = this.options.actorOptions) === null || _q === void 0 ? void 0 : _q.delimiter) !== null && _r !== void 0 ? _r : '-'}`);
+                this.daprActorClient.setAllowInternalCalls((_f = (_e = this.options.actorOptions) === null || _e === void 0 ? void 0 : _e.allowInternalCalls) !== null && _f !== void 0 ? _f : false);
+                this.daprActorClient.setPrefix((_h = (_g = this.options.actorOptions) === null || _g === void 0 ? void 0 : _g.prefix) !== null && _h !== void 0 ? _h : '', (_k = (_j = this.options.actorOptions) === null || _j === void 0 ? void 0 : _j.delimiter) !== null && _k !== void 0 ? _k : '-');
+                this.daprActorClient.setTypeNamePrefix((_m = (_l = this.options.actorOptions) === null || _l === void 0 ? void 0 : _l.typeNamePrefix) !== null && _m !== void 0 ? _m : '');
+                if ((_o = this.options.actorOptions) === null || _o === void 0 ? void 0 : _o.prefix) {
+                    this.logger.log(`Actors will be prefixed with ${(_q = (_p = this.options.actorOptions) === null || _p === void 0 ? void 0 : _p.prefix) !== null && _q !== void 0 ? _q : ''} and delimited with ${(_s = (_r = this.options.actorOptions) === null || _r === void 0 ? void 0 : _r.delimiter) !== null && _s !== void 0 ? _s : '-'}`);
                 }
             }
             yield this.daprServer.actor.init();
@@ -218,6 +223,7 @@ DaprLoader = DaprLoader_1 = __decorate([
         dapr_metadata_accessor_1.DaprMetadataAccessor, Object, dapr_actor_client_service_1.DaprActorClient,
         core_1.ModuleRef,
         dapr_context_service_1.DaprContextService,
+        dapr_pubsub_client_service_1.DaprPubSubClient,
         nest_actor_manager_1.NestActorManager])
 ], DaprLoader);
 exports.DaprLoader = DaprLoader;

package/dist/dapr.module.js

@@ -77,17 +77,10 @@ let DaprModule = DaprModule_1 = class DaprModule {
                 dapr_metadata_accessor_1.DaprMetadataAccessor,
                 dapr_context_service_1.DaprContextService,
                 dapr_actor_client_service_1.DaprActorClient,
-                {
-                    provide: dapr_pubsub_client_service_1.DaprPubSubClient,
-                    scope: common_1.Scope.DEFAULT,
-                    inject: [exports.DAPR_MODULE_OPTIONS_TOKEN, dapr_1.DaprClient],
-                    useFactory: (options, daprClient) => {
-                        return new dapr_pubsub_client_service_1.DaprPubSubClient(options, daprClient);
-                    },
-                },
+                dapr_pubsub_client_service_1.DaprPubSubClient,
                 core_1.Reflector,
             ],
-            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, exports.DAPR_MODULE_OPTIONS_TOKEN],
+            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, dapr_context_service_1.DaprContextService, actor_runtime_service_1.ActorRuntimeService, dapr_actor_client_service_1.DaprActorClient],
         };
     }
     static registerAsync(options) {
@@ -118,18 +111,11 @@ let DaprModule = DaprModule_1 = class DaprModule {
                 dapr_metadata_accessor_1.DaprMetadataAccessor,
                 dapr_context_service_1.DaprContextService,
                 dapr_actor_client_service_1.DaprActorClient,
-                {
-                    provide: dapr_pubsub_client_service_1.DaprPubSubClient,
-                    scope: common_1.Scope.DEFAULT,
-                    inject: [exports.DAPR_MODULE_OPTIONS_TOKEN, dapr_1.DaprClient],
-                    useFactory: (options, daprClient) => {
-                        return new dapr_pubsub_client_service_1.DaprPubSubClient(options, daprClient);
-                    },
-                },
+                dapr_pubsub_client_service_1.DaprPubSubClient,
                 core_1.Reflector,
                 ...(options.extraProviders || []),
             ],
-            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, exports.DAPR_MODULE_OPTIONS_TOKEN],
+            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, dapr_context_service_1.DaprContextService, actor_runtime_service_1.ActorRuntimeService, dapr_actor_client_service_1.DaprActorClient],
         };
     }
     static createAsyncProviders(options) {

package/dist/pubsub/dapr-pubsub-client.service.d.ts

@@ -1,28 +1,27 @@
 import { DaprClient } from '@dapr/dapr';
 import { OnApplicationShutdown } from '@nestjs/common';
-import { DaprModuleOptions } from '../dapr.module';
 import { PublishMessage } from './publish.message';
 export declare class DaprPubSubClient implements OnApplicationShutdown {
-    private readonly options;
     private readonly daprClient;
     private readonly logger;
-    private readonly defaultName;
-    private readonly buffer;
+    private defaultName;
     private subscription;
+    private readonly buffer;
     private readonly bufferSize;
     private readonly bufferTimeSpan;
     private onError;
-    constructor(options: DaprModuleOptions, daprClient: DaprClient);
+    constructor(daprClient: DaprClient);
+    setDefaultName(name: string): void;
     registerErrorHandler(handler: (messages: PublishMessage[], error: Error) => void): void;
     protected handleError(messages: PublishMessage[], error: Error): Promise<void>;
     onApplicationShutdown(signal?: string): Promise<void>;
     protected setupBufferSubscription(): void;
     protected publishBulkDirectly(messages: PublishMessage[]): Promise<void>;
-    protected publishDirectly(name: string, topic: string, payload: any, producerId?: string, metadata?: any, fireAndForget?: boolean): Promise<void>;
-    publish(name: string, producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any): Promise<void>;
-    publish(producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any): Promise<void>;
+    protected publishDirectly(name: string, topic: string, payload: any, producerId?: string, metadata?: any, fireAndForget?: boolean, contentType?: string): Promise<void>;
+    publish(name: string, producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any, contentType?: string): Promise<void>;
+    publish(producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any, contentType?: string): Promise<void>;
     publish(producerId: string, topic: string, payload: any): Promise<void>;
-    publishBulk(name: string, producerId: string, topic: string, payloads: any[], metadata?: any): Promise<void>;
-    publishBulk(producerId: string, topic: string, payloads: any[], metadata?: any): Promise<void>;
+    publishBulk(name: string, producerId: string, topic: string, payloads: any[], metadata?: any, contentType?: string): Promise<void>;
+    publishBulk(producerId: string, topic: string, payloads: any[], metadata?: any, contentType?: string): Promise<void>;
     publishBulk(producerId: string, topic: string, payloads: any[]): Promise<void>;
 }

package/dist/pubsub/dapr-pubsub-client.service.js

@@ -8,9 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -27,19 +24,19 @@ const dapr_1 = require("@dapr/dapr");
 const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const dapr_module_1 = require("../dapr.module");
 let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
-    constructor(options, daprClient) {
-        var _a, _b;
-        this.options = options;
+    constructor(daprClient) {
         this.daprClient = daprClient;
         this.logger = new common_1.Logger(DaprPubSubClient_1.name);
+        this.defaultName = 'pubsub';
         this.buffer = new rxjs_1.Subject();
         this.bufferSize = 10;
         this.bufferTimeSpan = 1000;
-        this.defaultName = (_b = (_a = this.options.pubsubOptions) === null || _a === void 0 ? void 0 : _a.defaultName) !== null && _b !== void 0 ? _b : 'pubsub';
         this.setupBufferSubscription();
     }
+    setDefaultName(name) {
+        this.defaultName = name;
+    }
     registerErrorHandler(handler) {
         this.onError = handler;
     }
@@ -87,10 +84,11 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
         }));
     }
     publishBulkDirectly(messages) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (messages.length === 1) {
                 const message = messages[0];
-                yield this.publishDirectly(message.name, message.topic, message.payload, message.producerId, message.metadata);
+                yield this.publishDirectly(message.name, message.topic, message.payload, message.producerId, message.metadata, false, message.contentType);
                 return;
             }
             const grouped = messages.reduce((acc, message) => {
@@ -105,11 +103,12 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
                 const [name, topic, producerId] = key.split(':');
                 const messages = grouped[key];
                 if (messages.length === 1) {
-                    yield this.publishDirectly(name, topic, messages[0].payload, producerId, messages[0].metadata);
+                    yield this.publishDirectly(name, topic, messages[0].payload, producerId, messages[0].metadata, false, messages[0].contentType);
                     continue;
                 }
                 try {
-                    yield this.daprClient.pubsub.publishBulk(name, topic, messages.map((m) => m.payload), producerId ? { metadata: { partitionKey: producerId } } : undefined);
+                    const contentType = (_a = messages[0].contentType) !== null && _a !== void 0 ? _a : 'application/json';
+                    yield this.daprClient.pubsub.publishBulk(name, topic, messages.map((m) => m.payload), producerId ? { metadata: { partitionKey: producerId }, contentType } : undefined);
                 }
                 catch (error) {
                     yield this.handleError(messages, error);
@@ -117,12 +116,16 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
             }
         });
     }
-    publishDirectly(name, topic, payload, producerId, metadata, fireAndForget = false) {
+    publishDirectly(name, topic, payload, producerId, metadata, fireAndForget = false, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (!name)
                     name = this.defaultName;
-                const options = {};
+                if (!contentType)
+                    contentType = 'application/json';
+                const options = {
+                    contentType,
+                };
                 if (metadata) {
                     options['metadata'] = metadata;
                 }
@@ -150,20 +153,23 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
             let payload;
             let buffer;
             let metadata;
-            if (args.length === 6) {
-                [name, producerId, topic, payload, buffer, metadata] = args;
+            let contentType;
+            if (args.length === 7) {
+                [name, producerId, topic, payload, buffer, metadata, contentType] = args;
             }
             else {
-                [producerId, topic, payload, buffer, metadata] = args;
+                [producerId, topic, payload, buffer, metadata, contentType] = args;
                 name = this.defaultName;
             }
             if (!name)
                 name = this.defaultName;
+            if (!contentType)
+                contentType = 'application/json';
             if (buffer === undefined || buffer) {
-                this.buffer.next({ name, producerId, topic, payload, metadata });
+                this.buffer.next({ name, producerId, topic, payload, metadata, contentType });
                 return;
             }
-            yield this.publishDirectly(name, topic, payload, producerId, true);
+            yield this.publishDirectly(name, topic, payload, producerId, metadata, true, contentType);
         });
     }
     publishBulk(...args) {
@@ -173,32 +179,34 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
             let topic;
             let payloads;
             let metadata;
-            if (args.length === 5) {
-                [name, producerId, topic, payloads, metadata] = args;
+            let contentType;
+            if (args.length === 6) {
+                [name, producerId, topic, payloads, metadata, contentType] = args;
             }
-            else if (args.length === 4) {
-                [producerId, topic, payloads, metadata] = args;
+            else if (args.length === 5) {
+                [producerId, topic, payloads, metadata, contentType] = args;
                 name = this.defaultName;
             }
-            else if (args.length === 3) {
+            else {
                 [producerId, topic, payloads] = args;
                 name = this.defaultName;
             }
             if (!name)
                 name = this.defaultName;
+            if (!contentType)
+                contentType = 'application/json';
             if (payloads.length === 1) {
-                yield this.publishDirectly(name, topic, payloads[0], producerId, metadata);
+                yield this.publishDirectly(name, topic, payloads[0], producerId, metadata, true, contentType);
                 return;
             }
             for (const payload of payloads) {
-                this.buffer.next({ name, producerId, topic, payload, metadata });
+                this.buffer.next({ name, producerId, topic, payload, metadata, contentType });
             }
         });
     }
 };
 DaprPubSubClient = DaprPubSubClient_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Inject)(dapr_module_1.DAPR_MODULE_OPTIONS_TOKEN)),
-    __metadata("design:paramtypes", [Object, dapr_1.DaprClient])
+    __metadata("design:paramtypes", [dapr_1.DaprClient])
 ], DaprPubSubClient);
 exports.DaprPubSubClient = DaprPubSubClient;

package/dist/pubsub/publish.message.d.ts

@@ -4,4 +4,5 @@ export interface PublishMessage {
     topic: string;
     payload: any;
     metadata?: any;
+    contentType?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.34",
+  "version": "0.9.36",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",