Fix reset error (#392)

* Fix reset error * allow calling start after reset
imjoy-team · Jul 19, 2022 · 4ae927f · 4ae927f
1 parent 212689e
commit 4ae927f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "imjoy-rpc",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "Remote procedure calls for ImJoy.",
   "module": "index.js",
   "scripts": {

diff --git a/javascript/src/hypha/rpc.js b/javascript/src/hypha/rpc.js
@@ -60,10 +60,14 @@ class Timer {
   }
 
   start() {
-    this._task = setTimeout(() => {
-      this._callback.apply(this, this._args);
-    }, this._timeout * 1000);
-    this.started = true;
+    if (this.started) {
+      this.reset();
+    } else {
+      this._task = setTimeout(() => {
+        this._callback.apply(this, this._args);
+      }, this._timeout * 1000);
+      this.started = true;
+    }
   }
 
   clear() {
@@ -77,9 +81,12 @@ class Timer {
   }
 
   reset() {
-    assert(this._task, `Timer (${this._label}) is not started`);
-    clearTimeout(this._task);
-    this.start();
+    if (!this._task) {
+      this.start();
+    } else {
+      clearTimeout(this._task);
+      this.start();
+    }
   }
 }
 

diff --git a/python/imjoy_rpc/VERSION b/python/imjoy_rpc/VERSION
@@ -1,3 +1,3 @@
 {
-    "version": "0.5.14"
+    "version": "0.5.15"
 }
diff --git a/python/imjoy_rpc/hypha/rpc.py b/python/imjoy_rpc/hypha/rpc.py
@@ -88,8 +88,11 @@ def __init__(self, timeout, callback, *args, label="timer", **kwargs):
 
     def start(self):
         """Start the timer."""
-        self._task = asyncio.ensure_future(self._job())
-        self.started = True
+        if not self.started:
+            self._task = asyncio.ensure_future(self._job())
+            self.started = True
+        else:
+            self.reset()
 
     async def _job(self):
         """Handle a job."""
@@ -109,9 +112,11 @@ def clear(self):
 
     def reset(self):
         """Reset the timer."""
-        assert self._task is not None, f"Timer ({self._label}) is not started"
-        self._task.cancel()
-        self._task = asyncio.ensure_future(self._job())
+        if self._task is None:
+            self.start()
+        else:
+            self._task.cancel()
+            self._task = asyncio.ensure_future(self._job())
 
 
 class RPC(MessageEmitter):