hypha-rpc 0.20.38 → 0.20.40

package/dist/hypha-rpc-websocket.js

@@ -840,6 +840,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     clear_after_called,
     timer,
     local_workspace,
+    description,
   ) {
     let method_id = `${session_id}.${name}`;
     let encoded = {
@@ -850,6 +851,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         : this._client_id,
       _rmethod: method_id,
       _rpromise: false,
+      _rdoc: `callback: ${method_id}, context: (${description})`,
     };
 
     const self = this;
@@ -857,7 +859,9 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       try {
         callback.apply(null, Array.prototype.slice.call(arguments));
       } catch (error) {
-        console.error("Error in callback:", method_id, error);
+        console.error(
+          `Error in callback(${method_id}, ${description}): ${error}`,
+        );
       } finally {
         if (timer && timer.started) {
           timer.clear();
@@ -868,7 +872,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         }
       }
     };
-
+    wrapped_callback.__name__ = `callback(${method_id})`;
     return [encoded, wrapped_callback];
   }
 
@@ -879,6 +883,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     clear_after_called,
     timer,
     local_workspace,
+    description,
   ) {
     let store = this._get_session_store(session_id, true);
     (0,_utils__WEBPACK_IMPORTED_MODULE_0__.assert)(
@@ -888,13 +893,17 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     let encoded = {};
 
     if (timer && reject && this._method_timeout) {
-      encoded.heartbeat = await this._encode(
+      [encoded.heartbeat, store.heartbeat] = this._encode_callback(
+        "heartbeat",
         timer.reset.bind(timer),
         session_id,
+        false,
+        null,
         local_workspace,
+        // `heartbeat (${description})`,
       );
-      encoded.interval = this._method_timeout / 2;
       store.timer = timer;
+      encoded.interval = this._method_timeout / 2;
     } else {
       timer = null;
     }
@@ -906,6 +915,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       clear_after_called,
       timer,
       local_workspace,
+      `resolve (${description})`,
     );
     [encoded.reject, store.reject] = this._encode_callback(
       "reject",
@@ -914,6 +924,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       clear_after_called,
       timer,
       local_workspace,
+      `reject (${description})`,
     );
     return encoded;
   }
@@ -985,6 +996,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     }
     let method_id = encoded_method._rmethod;
     let with_promise = encoded_method._rpromise;
+    const description = `method: ${method_id}, docs: ${encoded_method._rdoc}`;
     const self = this;
 
     function remote_method() {
@@ -998,7 +1010,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         if (!store) {
           reject(
             new Error(
-              `Runtime Error: Failed to get session store ${local_session_id}`,
+              `Runtime Error: Failed to get session store ${local_session_id} (context: ${description})`,
             ),
           );
           return;
@@ -1058,7 +1070,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           timer = new Timer(
             self._method_timeout,
             reject,
-            [`Method call time out: ${method_name}`],
+            [`Method call time out: ${method_name}, context: ${description}`],
             method_name,
           );
           // By default, hypha will clear the session after the method is called
@@ -1077,6 +1089,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
             clear_after_called,
             timer,
             local_workspace,
+            description,
           );
         }
         // The message consists of two segments, the main message and extra data
@@ -1299,7 +1312,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           `Runtime Error: Invalid number of arguments for method ${method_name}, expected ${method.length} but got ${args.length}`,
         );
       }
-      // console.debug("Executing method: " + method_name);
+      // console.debug(`Executing method: ${method_name} (${data.method})`);
       if (data.promise) {
         const result = method.apply(null, args);
         if (result instanceof Promise) {