btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: response time for requests via extension has incorrect value (#2921)

Browse Source 
Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
This commit is contained in:
Jesvin Jose
2023-02-17 19:14:50 +05:30
committed by GitHub
parent 2545262fc2
commit 82c6f6f6bc
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/hoppscotch-common/src/components/http/Request.vue
View File

@@ -274,6 +274,10 @@ import { createShortcode } from "~/helpers/backend/mutations/Shortcode"
import { runMutation } from "~/helpers/backend/GQLClient" import { runMutation } from "~/helpers/backend/GQLClient"
import { UpdateRequestDocument } from "~/helpers/backend/graphql" import { UpdateRequestDocument } from "~/helpers/backend/graphql"
import { getPlatformSpecialKey as getSpecialKey } from "~/helpers/platformutils" import { getPlatformSpecialKey as getSpecialKey } from "~/helpers/platformutils"
import {
cancelRunningExtensionRequest,
hasExtensionInstalled,
} from "~/helpers/strategies/ExtensionStrategy"
const t = useI18n() const t = useI18n()
@@ -403,6 +407,9 @@ function isCURL(curl: string) {
const cancelRequest = () => { const cancelRequest = () => {
loading.value = false loading.value = false
if (hasExtensionInstalled()) {
cancelRunningExtensionRequest()
}
updateRESTResponse(null) updateRESTResponse(null)
} }

2
packages/hoppscotch-common/src/helpers/strategies/ExtensionStrategy.ts
View File

@@ -16,7 +16,7 @@ export const hasFirefoxExtensionInstalled = () =>
hasExtensionInstalled() && browserIsFirefox() hasExtensionInstalled() && browserIsFirefox()
export const cancelRunningExtensionRequest = () => { export const cancelRunningExtensionRequest = () => {
window.__POSTWOMAN_EXTENSION_HOOK__?.cancelRunningRequest() window.__POSTWOMAN_EXTENSION_HOOK__?.cancelRequest()
} }
export const defineSubscribableObject = <T extends object>(obj: T) => { export const defineSubscribableObject = <T extends object>(obj: T) => {

12
packages/hoppscotch-common/src/shims.d.ts vendored
View File

@@ -8,7 +8,7 @@ interface PWExtensionHook {
sendRequest: ( sendRequest: (
req: AxiosRequestConfig & { wantsBinary: boolean } req: AxiosRequestConfig & { wantsBinary: boolean }
) => Promise<NetworkResponse> ) => Promise<NetworkResponse>
cancelRunningRequest: () => void cancelRequest: () => void
} }
type HoppExtensionStatusHook = { type HoppExtensionStatusHook = {
@@ -18,17 +18,9 @@ type HoppExtensionStatusHook = {
} }
subscribe(prop: "status", func: (...args: any[]) => any): void subscribe(prop: "status", func: (...args: any[]) => any): void
} }
declare global { export declare global {
interface Window { interface Window {
__POSTWOMAN_EXTENSION_HOOK__: PWExtensionHook | undefined __POSTWOMAN_EXTENSION_HOOK__: PWExtensionHook | undefined
__HOPP_EXTENSION_STATUS_PROXY__: HoppExtensionStatusHook | undefined __HOPP_EXTENSION_STATUS_PROXY__: HoppExtensionStatusHook | undefined
} }
} }
// Vue builtins
declare module '*.vue' {
import type { DefineComponent } from 'vue'
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
const component: DefineComponent<{}, {}, any>
export default component
}