@rayondigital/nest-dapr 0.9.47 → 0.9.49

package/dist/actors/nest-actor-manager.js

@@ -68,7 +68,7 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
     setupReentrancy() {
         ActorClientHTTP_1.default.prototype.invoke = function (actorType, actorId, methodName, body, reentrancyId) {
             return __awaiter(this, void 0, void 0, function* () {
-                const urlSafeId = encodeURIComponent(actorId.getId());
+                const urlSafeId = actorId.getURLSafeId();
                 const result = yield this.client.execute(`/actors/${actorType}/${urlSafeId}/method/${methodName}`, {
                     method: 'POST',
                     body,

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

@@ -17,12 +17,8 @@ export declare class DaprPubSubClient implements OnApplicationShutdown {
     onApplicationShutdown(signal?: string): Promise<void>;
     protected setupBufferSubscription(): void;
     protected publishBulkDirectly(messages: PublishMessage[]): Promise<void>;
-    protected publishDirectly(id: string, name: string, topic: string, payload: any, producerId?: string, metadata?: any, fireAndForget?: boolean, contentType?: string): Promise<boolean>;
-    publish(id: string, name: string, producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any, contentType?: string): Promise<boolean>;
-    publish(id: string, producerId: string, topic: string, payload: any, buffer: boolean, metadata?: any, contentType?: string): Promise<boolean>;
-    publish(id: string, producerId: string, topic: string, payload: any): Promise<boolean>;
-    publishBulk(name: string, producerId: string, topic: string, payloads: any[], metadata?: any, contentType?: string): Promise<boolean>;
-    publishBulk(producerId: string, topic: string, payloads: any[], metadata?: any, contentType?: string): Promise<boolean>;
-    publishBulk(producerId: string, topic: string, payloads: any[]): Promise<boolean>;
+    protected publishDirectly(pubSubName: string, topic: string, payload: any, producerId?: string, metadata?: any, fireAndForget?: boolean, contentType?: string): Promise<boolean>;
+    publish(pubSubName: string, producerId: string, topic: string, payload: any, buffer?: boolean, metadata?: any, contentType?: string): Promise<boolean>;
+    publishBulk(pubSubName: string, producerId: string, topic: string, payloads: any[], metadata?: any, contentType?: string): Promise<boolean>;
     private getMessageId;
 }

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

@@ -89,11 +89,11 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
         return __awaiter(this, void 0, void 0, function* () {
             if (messages.length === 1) {
                 const message = messages[0];
-                yield this.publishDirectly(message.id, message.name, message.topic, message.payload, message.producerId, message.metadata, false, message.contentType);
+                yield this.publishDirectly(message.pubSubName, message.topic, message.payload, message.producerId, message.metadata, false, message.contentType);
                 return;
             }
             const grouped = messages.reduce((acc, message) => {
-                const key = `${message.name}:${message.topic}:${message.producerId}`;
+                const key = `${message.pubSubName}:${message.topic}:${message.producerId}`;
                 if (!acc[key]) {
                     acc[key] = [];
                 }
@@ -101,23 +101,21 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
                 return acc;
             }, {});
             for (const key in grouped) {
-                const [name, topic, producerId] = key.split(':');
+                const [pubSubName, topic, producerId] = key.split(':');
                 const messages = grouped[key];
                 if (messages.length === 1) {
-                    yield this.publishDirectly(name, topic, messages[0].payload, producerId, messages[0].metadata, false, messages[0].contentType);
+                    yield this.publishDirectly(pubSubName, topic, messages[0].payload, producerId, messages[0].metadata, false, messages[0].contentType);
                     continue;
                 }
                 try {
                     const contentType = (_a = messages[0].contentType) !== null && _a !== void 0 ? _a : 'application/json';
-                    const response = yield this.daprClient.pubsub.publishBulk(name, topic, messages.map((m) => m.payload), producerId ? { metadata: { partitionKey: producerId }, contentType } : undefined);
+                    const response = yield this.daprClient.pubsub.publishBulk(pubSubName, topic, messages.map((m) => m.payload), producerId ? { metadata: { partitionKey: producerId }, contentType } : undefined);
                     if (response !== undefined && response.failedMessages && response.failedMessages.length > 0) {
                         const error = (_c = (_b = response.failedMessages[0]) === null || _b === void 0 ? void 0 : _b.error) !== null && _c !== void 0 ? _c : new Error('Unable to publish message');
-                        const failedMessages = response.failedMessages.map((m, i) => {
+                        const failedMessages = response.failedMessages.map((m) => {
                             var _a;
-                            const messageId = this.getMessageId(m.message.event, m.message.entryID);
                             return {
-                                id: messageId,
-                                name,
+                                pubSubName: pubSubName,
                                 topic,
                                 payload: m.message.event,
                                 metadata: m.message.metadata,
@@ -133,11 +131,11 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
             }
         });
     }
-    publishDirectly(id, name, topic, payload, producerId, metadata, fireAndForget = false, contentType) {
+    publishDirectly(pubSubName, topic, payload, producerId, metadata, fireAndForget = false, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (!name)
-                    name = this.defaultName;
+                if (!pubSubName)
+                    pubSubName = this.defaultName;
                 if (!contentType)
                     contentType = 'application/json';
                 const options = {
@@ -152,89 +150,55 @@ let DaprPubSubClient = DaprPubSubClient_1 = class DaprPubSubClient {
                 if (fireAndForget) {
                     setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                         try {
-                            const response = yield this.daprClient.pubsub.publish(name, topic, payload, options);
+                            const response = yield this.daprClient.pubsub.publish(pubSubName, topic, payload, options);
                             if (response !== undefined && response.error) {
                                 throw response.error;
                             }
                         }
                         catch (error) {
-                            yield this.handleError([{ id: id !== null && id !== void 0 ? id : (0, crypto_1.randomUUID)(), producerId, name, topic, payload, metadata }], error);
+                            yield this.handleError([{ producerId, pubSubName, topic, payload, metadata }], error);
                             return false;
                         }
                     }));
                     return true;
                 }
-                const response = yield this.daprClient.pubsub.publish(name, topic, payload, options);
+                const response = yield this.daprClient.pubsub.publish(pubSubName, topic, payload, options);
                 if (response !== undefined && response.error) {
                     throw response.error;
                 }
                 return true;
             }
             catch (error) {
-                yield this.handleError([{ id: id !== null && id !== void 0 ? id : (0, crypto_1.randomUUID)(), producerId, name, topic, payload, metadata }], error);
+                yield this.handleError([{ producerId, pubSubName, topic, payload, metadata }], error);
                 return false;
             }
         });
     }
-    publish(...args) {
+    publish(pubSubName, producerId, topic, payload, buffer = true, metadata, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
-            let id;
-            let name;
-            let producerId;
-            let topic;
-            let payload;
-            let buffer;
-            let metadata;
-            let contentType;
-            if (args.length === 8) {
-                [id, name, producerId, topic, payload, buffer, metadata, contentType] = args;
-            }
-            else {
-                [id, producerId, topic, payload, buffer, metadata, contentType] = args;
-                name = this.defaultName;
-            }
-            if (!name)
-                name = this.defaultName;
+            if (!pubSubName)
+                pubSubName = this.defaultName;
             if (!contentType)
                 contentType = 'application/json';
             if (buffer === undefined || buffer) {
-                this.buffer.next({ id: id !== null && id !== void 0 ? id : (0, crypto_1.randomUUID)(), name, producerId, topic, payload, metadata, contentType });
+                this.buffer.next({ pubSubName, producerId, topic, payload, metadata, contentType });
                 return;
             }
-            return yield this.publishDirectly(id !== null && id !== void 0 ? id : (0, crypto_1.randomUUID)(), name, topic, payload, producerId, metadata, true, contentType);
+            return yield this.publishDirectly(pubSubName, topic, payload, producerId, metadata, true, contentType);
         });
     }
-    publishBulk(...args) {
+    publishBulk(pubSubName, producerId, topic, payloads, metadata, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
-            let name;
-            let producerId;
-            let topic;
-            let payloads;
-            let metadata;
-            let contentType;
-            if (args.length === 6) {
-                [name, producerId, topic, payloads, metadata, contentType] = args;
-            }
-            else if (args.length === 5) {
-                [producerId, topic, payloads, metadata, contentType] = args;
-                name = this.defaultName;
-            }
-            else {
-                [producerId, topic, payloads] = args;
-                name = this.defaultName;
-            }
-            if (!name)
-                name = this.defaultName;
+            if (!pubSubName)
+                pubSubName = this.defaultName;
             if (!contentType)
                 contentType = 'application/json';
             if (payloads.length === 1) {
-                const messageId = this.getMessageId(payloads[0]);
-                return yield this.publishDirectly(messageId, name, topic, payloads[0], producerId, metadata, true, contentType);
+                return yield this.publishDirectly(pubSubName, topic, payloads[0], producerId, metadata, true, contentType);
             }
             for (const payload of payloads) {
                 this.buffer.next({
-                    id: this.getMessageId(payloads),
-                    name,
+                    pubSubName,
                     producerId,
                     topic,
                     payload,

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

@@ -1,6 +1,5 @@
 export interface PublishMessage {
-    id: string;
-    name: string;
+    pubSubName: string;
     producerId?: string;
     topic: string;
     payload: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.47",
+  "version": "0.9.49",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -29,7 +29,7 @@
     "eventemitter2": "^6.0.0"
   },
   "dependencies": {
-    "@dapr/dapr": "^3.2.0",
+    "@dapr/dapr": "^3.3.1",
     "async-lock": "^1.4.1"
   },
   "devDependencies": {