@rayondigital/nest-dapr 0.9.28 → 0.9.30

package/dist/dapr-pubsub.decorator.d.ts

@@ -3,4 +3,4 @@ export interface DaprPubSubMetadata {
     topicName: string;
     route?: string;
 }
-export declare const DaprPubSub: (name: string, topicName: string, route?: string) => MethodDecorator;
+export declare const DaprPubSub: (options: DaprPubSubMetadata) => MethodDecorator;

package/dist/dapr-pubsub.decorator.js

@@ -3,9 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DaprPubSub = void 0;
 const common_1 = require("@nestjs/common");
 const constants_1 = require("./constants");
-const DaprPubSub = (name, topicName, route) => (0, common_1.SetMetadata)(constants_1.DAPR_PUBSUB_METADATA, {
-    name,
-    topicName,
-    route,
-});
+const DaprPubSub = (options) => (0, common_1.SetMetadata)(constants_1.DAPR_PUBSUB_METADATA, options);
 exports.DaprPubSub = DaprPubSub;

package/dist/dapr.loader.js

@@ -127,22 +127,28 @@ let DaprLoader = DaprLoader_1 = class DaprLoader {
         }));
     }
     subscribeToDaprPubSubEventIfListener(instance, methodKey) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const daprPubSubMetadata = this.daprMetadataAccessor.getDaprPubSubHandlerMetadata(instance[methodKey]);
             if (!daprPubSubMetadata) {
                 return;
             }
-            const { name, topicName, route } = daprPubSubMetadata;
+            const name = (_a = daprPubSubMetadata.name) !== null && _a !== void 0 ? _a : (_b = this.options.pubsubOptions) === null || _b === void 0 ? void 0 : _b.defaultName;
+            const { topicName, route } = daprPubSubMetadata;
             this.logger.log(`Subscribing to Dapr: ${name}, Topic: ${topicName}${route ? ' on route ' + route : ''}`);
             yield this.daprServer.pubsub.subscribe(name, topicName, (data) => __awaiter(this, void 0, void 0, function* () {
+                var _c, _d;
                 try {
-                    yield instance[methodKey].call(instance, data);
+                    const result = yield instance[methodKey].call(instance, data);
+                    if (result && result in dapr_1.DaprPubSubStatusEnum) {
+                        return result;
+                    }
                     return dapr_1.DaprPubSubStatusEnum.SUCCESS;
                 }
                 catch (err) {
                     this.logger.error(err, `Error in pubsub handler ${topicName}`);
-                    if (this.options.onPubSubError) {
-                        const response = this.options.onPubSubError(name, topicName, err);
+                    if ((_c = this.options.pubsubOptions) === null || _c === void 0 ? void 0 : _c.onError) {
+                        const response = (_d = this.options.pubsubOptions) === null || _d === void 0 ? void 0 : _d.onError(name, topicName, err);
                         if (response == dapr_1.DaprPubSubStatusEnum.RETRY) {
                             this.logger.log(`Retrying pubsub handler ${topicName} operation`);
                         }

package/dist/dapr.module.d.ts

@@ -7,8 +7,8 @@ export interface DaprModuleOptions {
     serverPort?: string;
     communicationProtocol?: CommunicationProtocolEnum;
     clientOptions?: DaprClientOptions;
-    onPubSubError?: (name: string, topicName: string, error: any) => DaprPubSubStatusEnum;
     actorOptions?: DaprModuleActorOptions;
+    pubsubOptions?: DaprModulePubSubOptions;
     disabled?: boolean;
     contextProvider?: DaprContextProvider;
     catchErrors?: boolean;
@@ -19,6 +19,10 @@ export interface DaprModuleActorOptions {
     typeNamePrefix?: string;
     allowInternalCalls?: boolean;
 }
+export interface DaprModulePubSubOptions {
+    defaultName?: string;
+    onError?: (name: string, topicName: string, error: any) => DaprPubSubStatusEnum;
+}
 export declare enum DaprContextProvider {
     None = "none",
     ALS = "als",

package/package.json

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