hypha-rpc 0.21.6 → 0.21.7

package/coverage/html/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-02-09T22:05:05.578Z
+                at 2026-02-10T15:43:31.611Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/dist/hypha-rpc-websocket.js

@@ -1201,9 +1201,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     // Track background tasks for proper cleanup
     this._background_tasks = new Set();
 
-    // Periodic session sweep for interface-object sessions (clear_after_called=false)
-    // that have no activity for a long time. Max age = 10 * method_timeout.
-    this._sessionMaxAge = (this._method_timeout || 30) * 10 * 1000;
+    // Periodic session sweep for stale sessions with no activity.
+    // Default: 10 minutes (matching Python).
+    this._sessionMaxAge = 10 * 60 * 1000;
     this._sessionSweepInterval = setInterval(() => {
       this._sweepStaleSessions();
     }, this._sessionMaxAge / 2);
@@ -2295,6 +2295,10 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     if (!this._services[service_id]) {
       throw new Error(`Service not found: ${service_id}`);
     }
+    // Auto-detect _rintf services (local-only, never registered with server)
+    if (service_id.startsWith("_rintf_")) {
+      notify = false;
+    }
     if (notify) {
       const manager = await this.get_manager_service({
         timeout: 10,
@@ -2356,12 +2360,10 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
         // Clean up the entire session when resolve/reject is called
         if (clear_after_called && self._object_store[session_id]) {
-          // For promise callbacks (resolve/reject), clean up the entire session
           if (name === "resolve" || name === "reject") {
             self._removeFromTargetIdIndex(session_id);
             delete self._object_store[session_id];
           } else {
-            // For other callbacks, just clean up this specific callback
             self._cleanup_session_if_needed(session_id, name);
           }
         }
@@ -2653,11 +2655,14 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     for (const key of Object.keys(this._object_store)) {
       if (key === "services" || key === "message_cache") continue;
       const session = this._object_store[key];
+      // Use last-activity time if available, fall back to creation time
+      const lastActivity =
+        session && (session._last_activity_at || session._created_at);
       if (
         session &&
         typeof session === "object" &&
-        session._created_at &&
-        now - session._created_at > this._sessionMaxAge
+        lastActivity &&
+        now - lastActivity > this._sessionMaxAge
       ) {
         // Only sweep sessions that have no timer (active timers mean they are in use)
         // and no active promise callbacks (resolve/reject mean the session is awaiting a response)
@@ -2983,25 +2988,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
               ],
               method_name,
             );
-            // By default, hypha will clear the session after the method is called
-            // However, if the args contains _rintf === true, we will not clear the session
-
-            // Helper function to recursively check for _rintf objects
-            function hasInterfaceObject(obj) {
-              if (!obj || typeof obj !== "object") return false;
-              if (obj._rintf === true) return true;
-              if (Array.isArray(obj)) {
-                return obj.some((item) => hasInterfaceObject(item));
-              }
-              if (obj.constructor === Object) {
-                return Object.values(obj).some((value) =>
-                  hasInterfaceObject(value),
-                );
-              }
-              return false;
-            }
-
-            let clear_after_called = !hasInterfaceObject(args);
+            let clear_after_called = true;
 
             const promiseData = await self._encode_promise(
               resolve,
@@ -3194,6 +3181,18 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
       try {
         method = indexObject(this._object_store, data["method"]);
+        // Update last-activity time for session GC
+        const methodParts = data["method"].split(".");
+        if (methodParts.length > 1) {
+          const topKey = methodParts[0];
+          if (topKey !== "services" && topKey !== "message_cache") {
+            // Skip system stores — they are not GC-managed sessions
+            const topSession = this._object_store[topKey];
+            if (topSession && typeof topSession === "object") {
+              topSession._last_activity_at = Date.now();
+            }
+          }
+        }
       } catch (e) {
         // Clean promise method detection - TYPE-BASED, not string-based
         if (this._is_promise_method_call(data["method"])) {
@@ -3310,7 +3309,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       }
 
       // Make sure the parent session is still open
-      if (local_parent) {
+      // Skip for service methods — services are persistent and don't
+      // depend on the originating session being alive.
+      if (local_parent && !data.method.startsWith("services.")) {
         // The parent session should be a session that generate the current method call
         (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
           this._get_session_store(local_parent, true) !== null,
@@ -3400,7 +3401,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       // Create the last level
       if (!store[levels[last_index]]) {
         store[levels[last_index]] = {};
-        store[levels[last_index]]._created_at = Date.now();
+        const now = Date.now();
+        store[levels[last_index]]._created_at = now;
+        store[levels[last_index]]._last_activity_at = now;
       }
       return store[levels[last_index]];
     } else {
@@ -3465,13 +3468,19 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       return bObject;
     }
 
-    if ((0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isGenerator)(aObject) || (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncGenerator)(aObject)) {
-      // Handle generator functions and generator objects
+    if (
+      (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isGenerator)(aObject) ||
+      (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncGenerator)(aObject) ||
+      (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncIterator)(aObject) ||
+      (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isSyncIterator)(aObject)
+    ) {
+      // Handle generator/iterator objects
       (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
         session_id && typeof session_id === "string",
         "Session ID is required for generator encoding",
       );
       const object_id = (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.randId)();
+      const close_id = object_id + ":close";
 
       // Get the session store
       const store = this._get_session_store(session_id, true);
@@ -3480,32 +3489,52 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         `Failed to create session store ${session_id} due to invalid parent`,
       );
 
-      // Check if it's an async generator
-      const isAsync = (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncGenerator)(aObject);
+      // Check if it's an async generator/iterator
+      const isAsync = (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncGenerator)(aObject) || (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.isAsyncIterator)(aObject);
 
-      // Define method to get next item from the generator
+      // Define method to get next item from the generator/iterator
       const nextItemMethod = async () => {
         if (isAsync) {
-          const iterator = aObject;
-          const result = await iterator.next();
+          const result = await aObject.next();
           if (result.done) {
             delete store[object_id];
+            delete store[close_id];
             return { _rtype: "stop_iteration" };
           }
           return result.value;
         } else {
-          const iterator = aObject;
-          const result = iterator.next();
+          const result = aObject.next();
           if (result.done) {
             delete store[object_id];
+            delete store[close_id];
             return { _rtype: "stop_iteration" };
           }
           return result.value;
         }
       };
 
-      // Store the next_item method in the session
+      // Define method to close/cleanup the generator/iterator early
+      const closeGeneratorMethod = async () => {
+        try {
+          if (typeof aObject.return === "function") {
+            if (isAsync) {
+              await aObject.return();
+            } else {
+              aObject.return();
+            }
+          }
+        } catch (e) {
+          // ignore close errors
+        } finally {
+          delete store[object_id];
+          delete store[close_id];
+        }
+        return true;
+      };
+
+      // Store both methods in the session
       store[object_id] = nextItemMethod;
+      store[close_id] = closeGeneratorMethod;
 
       // Create a method that will be used to fetch the next item from the generator
       bObject = {
@@ -3513,6 +3542,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         _rserver: this._server_base_url,
         _rtarget: this._client_id,
         _rmethod: `${session_id}.${object_id}`,
+        _rclose_method: `${session_id}.${close_id}`,
         _rpromise: "*",
         _rdoc: "Remote generator",
       };
@@ -3708,6 +3738,38 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       Array.isArray(aObject) ||
       aObject instanceof RemoteService
     ) {
+      // Auto-register _rintf objects as local services
+      if (
+        !isarray &&
+        aObject._rintf === true &&
+        Object.keys(aObject).some(
+          (k) => !k.startsWith("_") && typeof aObject[k] === "function",
+        )
+      ) {
+        const serviceId = `_rintf_${(0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.randId)()}`;
+        const serviceApi = { id: serviceId };
+        for (const k of Object.keys(aObject)) {
+          if (!k.startsWith("_") && typeof aObject[k] === "function") {
+            serviceApi[k] = aObject[k];
+          }
+        }
+        this.add_service(serviceApi, true);
+        // Store service_id back on the original object so the caller
+        // can later call rpc.unregister_service(serviceId) to clean up.
+        aObject._rintf_service_id = serviceId;
+        // Encode all values — callables are now annotated as service methods
+        bObject = {};
+        for (const key of Object.keys(aObject)) {
+          bObject[key] = await this._encode(
+            aObject[key],
+            session_id,
+            local_workspace,
+          );
+        }
+        bObject._rintf_service_id = serviceId;
+        return bObject;
+      }
+
       // Fast path: if all values are primitives, return as-is
       if (isarray) {
         if (_allPrimitivesArray(aObject)) return aObject;
@@ -3788,19 +3850,49 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           local_workspace,
         );
 
-        // Create an async generator proxy
+        // Create close method if available
+        let close_method = null;
+        if (aObject._rclose_method) {
+          const closeObj = {
+            _rtype: "method",
+            _rserver: aObject._rserver,
+            _rtarget: aObject._rtarget,
+            _rmethod: aObject._rclose_method,
+            _rpromise: "*",
+          };
+          close_method = this._generate_remote_method(
+            closeObj,
+            remote_parent,
+            local_parent,
+            remote_workspace,
+            local_workspace,
+          );
+        }
+
+        // Create an async generator proxy with cleanup support
         async function* asyncGeneratorProxy() {
-          while (true) {
-            try {
+          let completedNormally = false;
+          try {
+            while (true) {
               const next_item = await gen_method();
               // Check for StopIteration signal
               if (next_item && next_item._rtype === "stop_iteration") {
+                completedNormally = true;
                 break;
               }
               yield next_item;
-            } catch (error) {
-              console.error("Error in generator:", error);
-              throw error;
+            }
+          } catch (error) {
+            console.error("Error in generator:", error);
+            throw error;
+          } finally {
+            // If not completed normally, send close signal to clean up remote generator
+            if (!completedNormally && close_method) {
+              try {
+                await close_method();
+              } catch (e) {
+                // ignore close errors
+              }
             }
           }
         }
@@ -3982,7 +4074,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   dtypeToTypedArray: () => (/* binding */ dtypeToTypedArray),
 /* harmony export */   expandKwargs: () => (/* binding */ expandKwargs),
 /* harmony export */   isAsyncGenerator: () => (/* binding */ isAsyncGenerator),
+/* harmony export */   isAsyncIterator: () => (/* binding */ isAsyncIterator),
 /* harmony export */   isGenerator: () => (/* binding */ isGenerator),
+/* harmony export */   isSyncIterator: () => (/* binding */ isSyncIterator),
 /* harmony export */   loadRequirements: () => (/* binding */ loadRequirements),
 /* harmony export */   loadRequirementsInWebworker: () => (/* binding */ loadRequirementsInWebworker),
 /* harmony export */   loadRequirementsInWindow: () => (/* binding */ loadRequirementsInWindow),
@@ -4538,6 +4632,36 @@ function isAsyncGenerator(obj) {
   );
 }
 
+/**
+ * Check if an object is a custom async iterator (has Symbol.asyncIterator and next()) but not an async generator
+ * @param {any} obj - Object to check
+ * @returns {boolean} True if object is a custom async iterator
+ */
+function isAsyncIterator(obj) {
+  if (!obj || isAsyncGenerator(obj)) return false;
+  return (
+    typeof obj === "object" &&
+    Symbol.asyncIterator in Object(obj) &&
+    typeof obj.next === "function"
+  );
+}
+
+/**
+ * Check if an object is a custom sync iterator (has Symbol.iterator and next()) but not a generator
+ * @param {any} obj - Object to check
+ * @returns {boolean} True if object is a custom sync iterator
+ */
+function isSyncIterator(obj) {
+  if (!obj || isGenerator(obj)) return false;
+  return (
+    typeof obj === "object" &&
+    Symbol.iterator in Object(obj) &&
+    typeof obj.next === "function" &&
+    !Array.isArray(obj) &&
+    typeof obj !== "string"
+  );
+}
+
 
 /***/ }),