@rayondigital/nest-dapr 0.9.29 → 0.9.31

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,14 +127,17 @@ 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 {
                     const result = yield instance[methodKey].call(instance, data);
                     if (result && result in dapr_1.DaprPubSubStatusEnum) {
@@ -144,8 +147,8 @@ let DaprLoader = DaprLoader_1 = class DaprLoader {
                 }
                 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/dist/dapr.module.js

@@ -27,6 +27,7 @@ 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_loader_1 = require("./dapr.loader");
+const dapr_pubsub_client_service_1 = require("./pubsub/dapr-pubsub-client.service");
 exports.DAPR_MODULE_OPTIONS_TOKEN = 'DAPR_MODULE_OPTIONS_TOKEN';
 var DaprContextProvider;
 (function (DaprContextProvider) {
@@ -75,9 +76,18 @@ let DaprModule = DaprModule_1 = class DaprModule {
                 dapr_loader_1.DaprLoader,
                 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);
+                    },
+                },
                 core_1.Reflector,
             ],
-            exports: [dapr_1.DaprClient],
+            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, exports.DAPR_MODULE_OPTIONS_TOKEN],
         };
     }
     static registerAsync(options) {
@@ -107,10 +117,19 @@ let DaprModule = DaprModule_1 = class DaprModule {
                 dapr_loader_1.DaprLoader,
                 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);
+                    },
+                },
                 core_1.Reflector,
                 ...(options.extraProviders || []),
             ],
-            exports: [dapr_1.DaprClient],
+            exports: [dapr_1.DaprClient, dapr_pubsub_client_service_1.DaprPubSubClient, exports.DAPR_MODULE_OPTIONS_TOKEN],
         };
     }
     static createAsyncProviders(options) {

package/dist/index.d.ts

@@ -12,4 +12,5 @@ import { DaprMetadataAccessor } from './dapr-metadata.accessor';
 import { DaprPubSub, DaprPubSubMetadata } from './dapr-pubsub.decorator';
 import { DaprLoader } from './dapr.loader';
 import { DaprContextProvider, DaprModule } from './dapr.module';
-export { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA, DaprMetadataAccessor, DaprBindingMetadata, DaprBinding, DaprPubSubMetadata, DaprPubSub, DaprActorMetadata, State, DaprActor, DaprLoader, DaprModule, DaprActorClient, DaprContextService, DaprContextProvider, ActorRuntimeService, DaprClientCache, StatefulActor, StatefulActorOf, IState, };
+import { DaprPubSubClient } from './pubsub/dapr-pubsub-client.service';
+export { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA, DaprMetadataAccessor, DaprBindingMetadata, DaprBinding, DaprPubSubMetadata, DaprPubSub, DaprActorMetadata, State, DaprActor, DaprLoader, DaprModule, DaprActorClient, DaprContextService, DaprContextProvider, ActorRuntimeService, DaprPubSubClient, DaprClientCache, StatefulActor, StatefulActorOf, IState, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatefulActorOf = exports.StatefulActor = exports.DaprClientCache = exports.ActorRuntimeService = exports.DaprContextProvider = exports.DaprContextService = exports.DaprActorClient = exports.DaprModule = exports.DaprLoader = exports.DaprActor = exports.State = exports.DaprPubSub = exports.DaprBinding = exports.DaprMetadataAccessor = exports.DAPR_ACTOR_STATE_METADATA = exports.DAPR_ACTOR_METADATA = exports.DAPR_PUBSUB_METADATA = exports.DAPR_BINDING_METADATA = void 0;
+exports.StatefulActorOf = exports.StatefulActor = exports.DaprClientCache = exports.DaprPubSubClient = exports.ActorRuntimeService = exports.DaprContextProvider = exports.DaprContextService = exports.DaprActorClient = exports.DaprModule = exports.DaprLoader = exports.DaprActor = exports.State = exports.DaprPubSub = exports.DaprBinding = exports.DaprMetadataAccessor = exports.DAPR_ACTOR_STATE_METADATA = exports.DAPR_ACTOR_METADATA = exports.DAPR_PUBSUB_METADATA = exports.DAPR_BINDING_METADATA = void 0;
 const actor_runtime_service_1 = require("./actors/actor-runtime.service");
 Object.defineProperty(exports, "ActorRuntimeService", { enumerable: true, get: function () { return actor_runtime_service_1.ActorRuntimeService; } });
 const client_cache_1 = require("./actors/client-cache");
@@ -33,3 +33,5 @@ Object.defineProperty(exports, "DaprLoader", { enumerable: true, get: function (
 const dapr_module_1 = require("./dapr.module");
 Object.defineProperty(exports, "DaprContextProvider", { enumerable: true, get: function () { return dapr_module_1.DaprContextProvider; } });
 Object.defineProperty(exports, "DaprModule", { enumerable: true, get: function () { return dapr_module_1.DaprModule; } });
+const dapr_pubsub_client_service_1 = require("./pubsub/dapr-pubsub-client.service");
+Object.defineProperty(exports, "DaprPubSubClient", { enumerable: true, get: function () { return dapr_pubsub_client_service_1.DaprPubSubClient; } });

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

@@ -0,0 +1,20 @@
+import { DaprClient } from '@dapr/dapr';
+import { OnApplicationShutdown } from '@nestjs/common';
+import { DaprModuleOptions } from '../dapr.module';
+export declare class DaprPubSubClient implements OnApplicationShutdown {
+    private readonly options;
+    private readonly daprClient;
+    private readonly defaultName;
+    private readonly buffer;
+    private subscription;
+    private readonly bufferSize;
+    private readonly bufferTimeSpan;
+    constructor(options: DaprModuleOptions, daprClient: DaprClient);
+    onApplicationShutdown(signal?: string): Promise<void>;
+    private setupBufferSubscription;
+    private publishBulkDirectly;
+    private publishDirectly;
+    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>;
+    publish(producerId: string, topic: string, payload: any): Promise<void>;
+}

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

@@ -0,0 +1,152 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DaprPubSubClient = void 0;
+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 = class DaprPubSubClient {
+    constructor(options, daprClient) {
+        var _a, _b;
+        this.options = options;
+        this.daprClient = daprClient;
+        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();
+    }
+    onApplicationShutdown(signal) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.subscription.unsubscribe();
+            const flushPromise = new Promise((resolve, reject) => {
+                const messages = [];
+                this.buffer.pipe((0, rxjs_1.toArray)()).subscribe({
+                    next: (msgs) => messages.push(...msgs),
+                    error: reject,
+                    complete: () => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            yield this.publishBulkDirectly(messages);
+                            resolve();
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }),
+                });
+                this.buffer.complete();
+            });
+            yield flushPromise;
+        });
+    }
+    setupBufferSubscription() {
+        if (this.subscription) {
+            this.subscription.unsubscribe();
+        }
+        this.subscription = this.buffer
+            .pipe((0, operators_1.bufferTime)(this.bufferTimeSpan, null, this.bufferSize))
+            .subscribe((messages) => __awaiter(this, void 0, void 0, function* () {
+            if (messages.length > 0) {
+                yield this.publishBulkDirectly(messages);
+            }
+        }));
+    }
+    publishBulkDirectly(messages) {
+        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);
+                return;
+            }
+            const grouped = messages.reduce((acc, message) => {
+                const key = `${message.name}:${message.topic}:${message.producerId}`;
+                if (!acc[key]) {
+                    acc[key] = [];
+                }
+                acc[key].push(message);
+                return acc;
+            }, {});
+            for (const key in grouped) {
+                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);
+                    continue;
+                }
+                yield this.daprClient.pubsub.publishBulk(name, topic, messages.map((m) => m.payload), producerId ? { metadata: { partitionKey: producerId } } : undefined);
+            }
+        });
+    }
+    publishDirectly(name, topic, payload, producerId, metadata, fireAndForget = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!name)
+                name = this.defaultName;
+            const options = {};
+            if (metadata) {
+                options['metadata'] = metadata;
+            }
+            if (producerId) {
+                options['metadata'] = Object.assign({ partitionKey: producerId }, metadata);
+            }
+            if (fireAndForget) {
+                setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                    yield this.daprClient.pubsub.publish(name, topic, payload, options);
+                }));
+                return;
+            }
+            yield this.daprClient.pubsub.publish(name, topic, payload, options);
+        });
+    }
+    publish(...args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let name;
+            let producerId;
+            let topic;
+            let payload;
+            let buffer;
+            let metadata;
+            if (args.length === 6) {
+                [name, producerId, topic, payload, buffer, metadata] = args;
+            }
+            else {
+                [producerId, topic, payload, buffer, metadata] = args;
+                name = this.defaultName;
+            }
+            if (!name)
+                name = this.defaultName;
+            if (buffer === undefined || buffer) {
+                this.buffer.next({ name, producerId, topic, payload, metadata });
+                return;
+            }
+            yield this.publishDirectly(name, topic, payload, producerId, true);
+        });
+    }
+};
+DaprPubSubClient = __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])
+], DaprPubSubClient);
+exports.DaprPubSubClient = DaprPubSubClient;

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

@@ -0,0 +1,7 @@
+export interface PublishMessage {
+    name: string;
+    producerId?: string;
+    topic: string;
+    payload: any;
+    metadata?: any;
+}

package/dist/pubsub/publish.message.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.29",
+  "version": "0.9.31",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,7 +24,8 @@
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
-    "nestjs-cls": "^3.0.0"
+    "nestjs-cls": "^3.0.0",
+    "rxjs": "^7.1.0"
   },
   "devDependencies": {
     "@nestjs/platform-express": "^10.0.0",