@takentrade/takentrade-libs 1.2.53 → 1.2.54

package/dist/rpc/index.d.ts

@@ -8,19 +8,20 @@ export interface TakeNTradeRPCError {
     errors: string[];
     timestamp: string;
 }
-export interface TakeNTradeRPCResponse<V> {
-    status: 'success';
+export interface TakeNTradeRPCSuccess<T> {
+    status: 'success' | 'error';
     message: string;
-    data: V;
+    data?: T;
+    timestamp: string;
 }
 export declare class TakeNTradeRpc {
     /**
      * Wraps a promise returned by an RPC request handler.
      * @param promise - A Promise resolving to the response value.
      * @param ctx - Optional NatsContext object.
-     * @param successMessage - Custom success message for the response.
+     * @param successMessage - Optional success message
      */
-    static handleRequest<V>(promise: Promise<V>, ctx?: NatsContext, successMessage?: string): Promise<TakeNTradeRPCResponse<V> | RpcException>;
+    static handleRequest<V>(promise: Promise<V>, ctx?: NatsContext, successMessage?: string): Promise<TakeNTradeRPCSuccess<V> | RpcException>;
     /**
      * Handles errors from an RPC request handler and returns a TakeNTradeRPCError wrapped in RpcException.
      * @param err - Error to be handled.
@@ -31,19 +32,18 @@ export declare class TakeNTradeRpc {
     /**
      * Handles NATS request response.
      * @param obs - An instance of an Observable.
+     * @param successMessage - Optional success message
      */
-    static withReply<V>(obs: Observable<TakeNTradeRPCResponse<V> | {
-        error: TakeNTradeRPCError;
-    }>): Promise<V>;
+    static withReply<V>(obs: Observable<V>, successMessage?: string): Promise<TakeNTradeRPCSuccess<V>>;
 }
 export declare class TakeNTradeRpcV2 {
     /**
      * Wraps a promise returned by an RPC request handler.
      * @param promise - A Promise resolving to the response value.
      * @param ctx - Optional NatsContext object.
-     * @param successMessage - Custom success message for the response.
+     * @param successMessage - Optional success message
      */
-    static handleRequest<V>(promise: Promise<V>, ctx?: NatsContext, successMessage?: string): Promise<TakeNTradeRPCResponse<V> | TakeNTradeRPCError>;
+    static handleRequest<V>(promise: Promise<V>, ctx?: NatsContext, successMessage?: string): Promise<TakeNTradeRPCSuccess<V> | TakeNTradeRPCError>;
     /**
      * Handles errors from an RPC request handler and returns a TakeNTradeRPCError.
      * @param err - Error to be handled.
@@ -54,8 +54,7 @@ export declare class TakeNTradeRpcV2 {
     /**
      * Handles NATS request response.
      * @param obs - An instance of an Observable.
+     * @param successMessage - Optional success message
      */
-    static withReply<V>(obs: Observable<TakeNTradeRPCResponse<V> | {
-        error: TakeNTradeRPCError;
-    }>): Promise<V>;
+    static withReply<V>(obs: Observable<V>, successMessage?: string): Promise<TakeNTradeRPCSuccess<V>>;
 }

package/dist/rpc/index.js

@@ -21,21 +21,26 @@ class TakeNTradeRpcUtils {
     static isErrorResponse(result) {
         return typeof result === 'object' && result !== null && 'error' in result;
     }
+    // New method to format successful responses
+    static formatSuccessResponse(data, message = 'Operation successful') {
+        return {
+            status: 'success',
+            message,
+            data,
+            timestamp: new Date().toISOString(),
+        };
+    }
 }
 class TakeNTradeRpc {
     /**
      * Wraps a promise returned by an RPC request handler.
      * @param promise - A Promise resolving to the response value.
      * @param ctx - Optional NatsContext object.
-     * @param successMessage - Custom success message for the response.
+     * @param successMessage - Optional success message
      */
     static async handleRequest(promise, ctx, successMessage = 'Operation successful') {
         return promise
-            .then((value) => ({
-            status: 'success',
-            message: successMessage,
-            data: value,
-        }))
+            .then((value) => TakeNTradeRpcUtils.formatSuccessResponse(value, successMessage))
             .catch((err) => this.catch(err, ctx));
     }
     /**
@@ -63,8 +68,9 @@ class TakeNTradeRpc {
     /**
      * Handles NATS request response.
      * @param obs - An instance of an Observable.
+     * @param successMessage - Optional success message
      */
-    static async withReply(obs) {
+    static async withReply(obs, successMessage = 'Operation successful') {
         const result = await new Promise((resolve, reject) => {
             obs.subscribe({
                 next: (value) => resolve(value),
@@ -77,7 +83,7 @@ class TakeNTradeRpc {
                 cause: result.error.errors,
             });
         }
-        return result.data;
+        return TakeNTradeRpcUtils.formatSuccessResponse(result, successMessage);
     }
 }
 exports.TakeNTradeRpc = TakeNTradeRpc;
@@ -86,15 +92,11 @@ class TakeNTradeRpcV2 {
      * Wraps a promise returned by an RPC request handler.
      * @param promise - A Promise resolving to the response value.
      * @param ctx - Optional NatsContext object.
-     * @param successMessage - Custom success message for the response.
+     * @param successMessage - Optional success message
      */
     static async handleRequest(promise, ctx, successMessage = 'Operation successful') {
         return promise
-            .then((value) => ({
-            status: 'success',
-            message: successMessage,
-            data: value,
-        }))
+            .then((value) => TakeNTradeRpcUtils.formatSuccessResponse(value, successMessage))
             .catch((err) => this.catch(err, ctx));
     }
     /**
@@ -121,8 +123,9 @@ class TakeNTradeRpcV2 {
     /**
      * Handles NATS request response.
      * @param obs - An instance of an Observable.
+     * @param successMessage - Optional success message
      */
-    static async withReply(obs) {
+    static async withReply(obs, successMessage = 'Operation successful') {
         const result = await new Promise((resolve, reject) => {
             obs.subscribe({
                 next: (value) => resolve(value),
@@ -135,7 +138,7 @@ class TakeNTradeRpcV2 {
                 cause: result.error.errors,
             });
         }
-        return result.data;
+        return TakeNTradeRpcUtils.formatSuccessResponse(result, successMessage);
     }
 }
 exports.TakeNTradeRpcV2 = TakeNTradeRpcV2;