Merge pull request #400 from ulixee/reload

fix(client): reload should return a resource
ulixee · Dec 14, 2021 · c55f93e · c55f93e
2 parents 33f8061 + 83b80b5
commit c55f93e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/client/lib/Agent.ts b/client/lib/Agent.ts
@@ -373,7 +373,7 @@ export default class Agent extends AwaitedEventTarget<{ close: void }> {
     return this.activeTab.goForward(timeoutMs);
   }
 
-  public reload(timeoutMs?: number): Promise<void> {
+  public reload(timeoutMs?: number): Promise<Resource> {
     return this.activeTab.reload(timeoutMs);
   }
 

diff --git a/client/lib/CoreTab.ts b/client/lib/CoreTab.ts
@@ -103,7 +103,7 @@ export default class CoreTab implements IJsPathEventTarget {
     return await this.commandQueue.run('Tab.goForward', timeoutMs);
   }
 
-  public async reload(timeoutMs?: number): Promise<void> {
+  public async reload(timeoutMs?: number): Promise<IResourceMeta> {
     return await this.commandQueue.run('Tab.reload', timeoutMs);
   }
 

diff --git a/client/lib/FrozenTab.ts b/client/lib/FrozenTab.ts
@@ -121,9 +121,10 @@ export default class FrozenTab {
     return coreTab.goForward(timeoutMs);
   }
 
-  public async reload(timeoutMs?: number): Promise<void> {
+  public async reload(timeoutMs?: number): Promise<Resource> {
     const coreTab = await getCoreTab(this);
-    return coreTab.reload(timeoutMs);
+    const resource = await coreTab.reload(timeoutMs);
+    return createResource(Promise.resolve(coreTab), resource);
   }
 
   public async getJsValue<T>(path: string): Promise<T> {

diff --git a/client/lib/Tab.ts b/client/lib/Tab.ts
@@ -171,9 +171,10 @@ export default class Tab extends AwaitedEventTarget<IEventType> {
     return coreTab.goForward(timeoutMs);
   }
 
-  public async reload(timeoutMs?: number): Promise<void> {
+  public async reload(timeoutMs?: number): Promise<Resource> {
     const coreTab = await getCoreTab(this);
-    return coreTab.reload(timeoutMs);
+    const resource = await coreTab.reload(timeoutMs);
+    return createResource(Promise.resolve(coreTab), resource);
   }
 
   public async getJsValue<T>(path: string): Promise<T> {