hypha-rpc 0.20.77 → 0.20.79

package/dist/hypha-rpc-websocket.js

@@ -966,7 +966,23 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     config.workspace =
       config.workspace || this._local_workspace || this._connection.workspace;
     const skipContext = config.require_context;
-    const serviceSchema = _get_schema(service, null, skipContext);
+    const excludeKeys = [
+      "id",
+      "config",
+      "name",
+      "description",
+      "type",
+      "docs",
+      "app_id",
+      "service_schema",
+    ];
+    const filteredService = {};
+    for (const key of Object.keys(service)) {
+      if (!excludeKeys.includes(key)) {
+        filteredService[key] = service[key];
+      }
+    }
+    const serviceSchema = _get_schema(filteredService, null, skipContext);
     const serviceInfo = {
       config: config,
       id: `${config.workspace}/${this._client_id}:${service["id"]}`,
@@ -1645,10 +1661,26 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           // I.e. the session id won't be passed for promises themselves
           main_message["session"] = local_session_id;
           let method_name = `${target_id}:${method_id}`;
+
+          // Create a timer that gets reset by heartbeat
+          // Methods can run indefinitely as long as heartbeat keeps resetting the timer
+          // IMPORTANT: When timeout occurs, we must clean up the session to prevent memory leaks
+          const timeoutCallback = function (error_msg) {
+            // First reject the promise
+            reject(error_msg);
+            // Then clean up the entire session to stop all callbacks
+            if (self._object_store[local_session_id]) {
+              delete self._object_store[local_session_id];
+              console.debug(
+                `Cleaned up session ${local_session_id} after timeout`,
+              );
+            }
+          };
+
           timer = new Timer(
             self._method_timeout,
-            reject,
-            [`Method call time out: ${method_name}, context: ${description}`],
+            timeoutCallback,
+            [`Method call timed out: ${method_name}, context: ${description}`],
             method_name,
           );
           // By default, hypha will clear the session after the method is called
@@ -1705,8 +1737,8 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
             ._emit_message(message_package)
             .then(function () {
               if (timer) {
-                // If resolved successfully, reset the timer
-                timer.reset();
+                // Start the timer after message is sent successfully
+                timer.start();
               }
             })
             .catch(function (err) {
@@ -1727,8 +1759,8 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
             ._send_chunks(message_package, target_id, remote_parent)
             .then(function () {
               if (timer) {
-                // If resolved successfully, reset the timer
-                timer.reset();
+                // Start the timer after message is sent successfully
+                timer.start();
               }
             })
             .catch(function (err) {
@@ -1990,10 +2022,10 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           }
         }
         args.push(data.ctx);
-        (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
-          args.length === method.length,
-          `Runtime Error: Invalid number of arguments for method ${method_name}, expected ${method.length} but got ${args.length}`,
-        );
+        // assert(
+        //   args.length === method.length,
+        //   `Runtime Error: Invalid number of arguments for method ${method_name}, expected ${method.length} but got ${args.length}`,
+        // );
       }
       // console.debug(`Executing method: ${method_name} (${data.method})`);
       if (data.promise) {
@@ -5656,6 +5688,7 @@ class WebsocketRPCConnection {
     timeout = 60,
     WebSocketClass = null,
     token_refresh_interval = 2 * 60 * 60,
+    additional_headers = null,
   ) {
     (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.assert)(server_url && client_id, "server_url and client_id are required");
     this._server_url = server_url;
@@ -5678,6 +5711,7 @@ class WebsocketRPCConnection {
     this._refresh_token_task = null;
     this._last_message = null; // Store the last sent message
     this._reconnect_timeouts = new Set(); // Track reconnection timeouts
+    this._additional_headers = additional_headers;
   }
 
   /**
@@ -6116,10 +6150,12 @@ async function login(config) {
   const timeout = config.login_timeout || 60;
   const callback = config.login_callback;
   const profile = config.profile;
+  const additional_headers = config.additional_headers;
 
   const server = await connectToServer({
     name: "initial login client",
     server_url: config.server_url,
+    additional_headers: additional_headers,
   });
   try {
     const svc = await server.getService(service_id);
@@ -6222,6 +6258,8 @@ async function connectToServer(config) {
     config.reconnection_token,
     config.method_timeout || 60,
     config.WebSocketClass,
+    config.token_refresh_interval,
+    config.additional_headers,
   );
   const connection_info = await connection.open();
   (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_1__.assert)(