@rayondigital/nest-dapr 0.9.54 → 0.9.55

package/dist/actors/nest-actor-manager.d.ts

@@ -6,6 +6,8 @@ export declare class NestActorManager {
     setup(moduleRef: ModuleRef, options: DaprModuleOptions, onActivateFn?: (actorId: ActorId, instance: AbstractActor) => Promise<void>): void;
     setupReentrancy(options: DaprModuleOptions): void;
     setupCSLWrapper(options: DaprModuleOptions, contextService: DaprContextService, invokeWrapperFn?: (actorId: ActorId, methodName: string, data: any, method: (actorId: ActorId, methodName: string, data: any) => Promise<any>) => Promise<any>): void;
+    private patchToSupportSerializableError;
+    private patchDeactivate;
     private resolveDependencies;
     private static extractContext;
 }

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

@@ -23,9 +23,13 @@ exports.NestActorManager = void 0;
 const crypto_1 = require("crypto");
 const ActorClientHTTP_1 = __importDefault(require("@dapr/dapr/actors/client/ActorClient/ActorClientHTTP"));
 const ActorManager_1 = __importDefault(require("@dapr/dapr/actors/runtime/ActorManager"));
+const ActorRuntime_1 = __importDefault(require("@dapr/dapr/actors/runtime/ActorRuntime"));
+const HttpStatusCode_enum_1 = __importDefault(require("@dapr/dapr/enum/HttpStatusCode.enum"));
+const actor_1 = __importDefault(require("@dapr/dapr/implementation/Server/HTTPServer/actor"));
 const common_1 = require("@nestjs/common");
 const instance_wrapper_1 = require("@nestjs/core/injector/instance-wrapper");
 const dapr_context_service_1 = require("../dapr-context-service");
+const serializable_error_1 = require("./serializable-error");
 let NestActorManager = NestActorManager_1 = class NestActorManager {
     setup(moduleRef, options, onActivateFn) {
         var _a, _b;
@@ -59,28 +63,8 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
                 return instance;
             });
         };
-        const originalDeactivateActor = ActorManager_1.default.prototype.deactivateActor;
-        ActorManager_1.default.prototype.deactivateActor = function (actorId) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!this.actors.has(actorId.getId())) {
-                        return;
-                    }
-                    yield originalDeactivateActor.bind(this)(actorId);
-                    if (isLoggingEnabled) {
-                        const actorTypeName = this.actorCls.name;
-                        common_1.Logger.verbose(`Deactivating actor ${actorId}`, actorTypeName);
-                    }
-                }
-                catch (error) {
-                    common_1.Logger.error(`Error deactivating actor ${actorId}`);
-                    common_1.Logger.error(error);
-                    if (error.stack) {
-                        common_1.Logger.error(error.stack);
-                    }
-                }
-            });
-        };
+        this.patchDeactivate(options);
+        this.patchToSupportSerializableError(options);
     }
     setupReentrancy(options) {
         ActorClientHTTP_1.default.prototype.invoke = function (actorType, actorId, methodName, body, reentrancyId) {
@@ -152,6 +136,61 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
             });
         };
     }
+    patchToSupportSerializableError(options) {
+        const originalHandlerMethod = actor_1.default.prototype.handlerMethod;
+        if (!originalHandlerMethod)
+            return;
+        actor_1.default.prototype.handlerMethod = function (req, res) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
+                const { actorTypeName, actorId, methodName } = req.params;
+                const body = req.body;
+                const dataSerialized = this.serializer.serialize(body);
+                try {
+                    const result = yield ActorRuntime_1.default.getInstance(this.client.daprClient).invoke(actorTypeName, actorId, methodName, dataSerialized);
+                    res.statusCode = HttpStatusCode_enum_1.default.OK;
+                    return this.handleResult(res, result);
+                }
+                catch (error) {
+                    if (error instanceof serializable_error_1.SerializableError) {
+                        error.statusCode = (_a = error.statusCode) !== null && _a !== void 0 ? _a : HttpStatusCode_enum_1.default.BAD_REQUEST;
+                    }
+                    else if (error instanceof Error) {
+                        res.statusCode = HttpStatusCode_enum_1.default.INTERNAL_SERVER_ERROR;
+                    }
+                    return this.handleResult(res, error);
+                }
+            });
+        };
+    }
+    patchDeactivate(options) {
+        var _a, _b;
+        const isLoggingEnabled = (_b = (_a = options === null || options === void 0 ? void 0 : options.logging) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : true;
+        const originalDeactivateActor = ActorManager_1.default.prototype.deactivateActor;
+        if (!originalDeactivateActor)
+            return;
+        ActorManager_1.default.prototype.deactivateActor = function (actorId) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!this.actors.has(actorId.getId())) {
+                        return;
+                    }
+                    yield originalDeactivateActor.bind(this)(actorId);
+                    if (isLoggingEnabled) {
+                        const actorTypeName = this.actorCls.name;
+                        common_1.Logger.verbose(`Deactivating actor ${actorId}`, actorTypeName);
+                    }
+                }
+                catch (error) {
+                    common_1.Logger.error(`Error deactivating actor ${actorId}`);
+                    common_1.Logger.error(error);
+                    if (error.stack) {
+                        common_1.Logger.error(error.stack);
+                    }
+                }
+            });
+        };
+    }
     resolveDependencies(moduleRef, instance) {
         return __awaiter(this, void 0, void 0, function* () {
             const type = instance.constructor;

package/dist/actors/serializable-error.d.ts

@@ -0,0 +1,9 @@
+export declare class SerializableError extends Error {
+    statusCode: number;
+    constructor(message: string, statusCode?: number);
+    toJSON(): {
+        name: string;
+        message: string;
+        statusCode: number;
+    };
+}

package/dist/actors/serializable-error.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SerializableError = void 0;
+class SerializableError extends Error {
+    constructor(message, statusCode = 400) {
+        super(message);
+        this.statusCode = statusCode;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            statusCode: this.statusCode,
+        };
+    }
+}
+exports.SerializableError = SerializableError;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { ActorRuntimeService } from './actors/actor-runtime.service';
 import { DaprClientCache } from './actors/client-cache';
 import { DaprActorClient } from './actors/dapr-actor-client.service';
+import { SerializableError } from './actors/serializable-error';
 import { StatefulActorOf } from './actors/stateful-actor-of';
 import { IState, StatefulActor } from './actors/stateful.actor';
 import { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA } from './constants';
@@ -14,4 +15,4 @@ import { DaprPubSub, DaprPubSubMetadata } from './dapr-pubsub.decorator';
 import { DaprLoader } from './dapr.loader';
 import { DaprContextProvider, DaprModule } from './dapr.module';
 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, DaprEventEmitter, StatefulActor, StatefulActorOf, IState, };
+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, DaprEventEmitter, StatefulActor, StatefulActorOf, IState, SerializableError, };

package/dist/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatefulActorOf = exports.StatefulActor = exports.DaprEventEmitter = 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;
+exports.SerializableError = exports.StatefulActorOf = exports.StatefulActor = exports.DaprEventEmitter = 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");
 Object.defineProperty(exports, "DaprClientCache", { enumerable: true, get: function () { return client_cache_1.DaprClientCache; } });
 const dapr_actor_client_service_1 = require("./actors/dapr-actor-client.service");
 Object.defineProperty(exports, "DaprActorClient", { enumerable: true, get: function () { return dapr_actor_client_service_1.DaprActorClient; } });
+const serializable_error_1 = require("./actors/serializable-error");
+Object.defineProperty(exports, "SerializableError", { enumerable: true, get: function () { return serializable_error_1.SerializableError; } });
 const stateful_actor_of_1 = require("./actors/stateful-actor-of");
 Object.defineProperty(exports, "StatefulActorOf", { enumerable: true, get: function () { return stateful_actor_of_1.StatefulActorOf; } });
 const stateful_actor_1 = require("./actors/stateful.actor");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.54",
+  "version": "0.9.55",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,7 +24,7 @@
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
-    "nestjs-cls": "^3.0.0",
+    "nestjs-cls": "^3.4.0",
     "rxjs": "^7.1.0",
     "eventemitter2": "^6.0.0"
   },
@@ -51,7 +51,7 @@
     "typescript": "^4.7.4"
   },
   "optionalDependencies": {
-    "nestjs-cls": "^3.6.0"
+    "nestjs-cls": "^3.4.0"
   },
   "publishConfig": {
     "access": "public",