refactor: set default interceptor to "proxy" (#4051)

hoppscotch · May 10, 2024 · 38bc2c1 · 38bc2c1
1 parent 97644fa
commit 38bc2c1
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 46 deletions.
diff --git a/packages/hoppscotch-common/src/newstore/settings.ts b/packages/hoppscotch-common/src/newstore/settings.ts
@@ -1,9 +1,10 @@
-import { pluck, distinctUntilChanged } from "rxjs/operators"
 import { cloneDeep, defaultsDeep, has } from "lodash-es"
 import { Observable } from "rxjs"
-
-import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
+import { distinctUntilChanged, pluck } from "rxjs/operators"
+import { nextTick } from "vue"
+import { platform } from "~/platform"
 import type { KeysMatching } from "~/types/ts-utils"
+import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
 
 export const HoppBgColors = ["system", "light", "dark", "black"] as const
 
@@ -69,51 +70,63 @@ export type SettingsDef = {
  HAS_OPENED_SPOTLIGHT: boolean
 }
 
-export const getDefaultSettings = (): SettingsDef => ({
- syncCollections: true,
- syncHistory: true,
- syncEnvironments: true,
+export const getDefaultSettings = (): SettingsDef => {
+ const defaultSettings: SettingsDef = {
+ syncCollections: true,
+ syncHistory: true,
+ syncEnvironments: true,
+
+ WRAP_LINES: {
+ httpRequestBody: true,
+ httpResponseBody: true,
+ httpHeaders: true,
+ httpParams: true,
+ httpUrlEncoded: true,
+ httpPreRequest: true,
+ httpTest: true,
+ httpRequestVariables: true,
+ graphqlQuery: true,
+ graphqlResponseBody: true,
+ graphqlHeaders: false,
+ graphqlVariables: false,
+ graphqlSchema: true,
+ importCurl: true,
+ codeGen: true,
+ cookie: true,
+ },
 
- WRAP_LINES: {
- httpRequestBody: true,
- httpResponseBody: true,
- httpHeaders: true,
- httpParams: true,
- httpUrlEncoded: true,
- httpPreRequest: true,
- httpTest: true,
- httpRequestVariables: true,
- graphqlQuery: true,
- graphqlResponseBody: true,
- graphqlHeaders: false,
- graphqlVariables: false,
- graphqlSchema: true,
- importCurl: true,
- codeGen: true,
- cookie: true,
- },
+ CURRENT_INTERCEPTOR_ID: "",
+
+ // TODO: Interceptor related settings should move under the interceptor systems
+ PROXY_URL: "https://proxy.hoppscotch.io/",
+ URL_EXCLUDES: {
+ auth: true,
+ httpUser: true,
+ httpPassword: true,
+ bearerToken: true,
+ oauth2Token: true,
+ },
+ THEME_COLOR: "indigo",
+ BG_COLOR: "system",
+ TELEMETRY_ENABLED: true,
+ EXPAND_NAVIGATION: false,
+ SIDEBAR: true,
+ SIDEBAR_ON_LEFT: false,
+ COLUMN_LAYOUT: true,
+
+ HAS_OPENED_SPOTLIGHT: false,
+ }
 
- CURRENT_INTERCEPTOR_ID: "browser", // TODO: Allow the platform definition to take this place
+ // Wait for platform to initialize before setting CURRENT_INTERCEPTOR_ID
+ nextTick(() => {
+ applySetting(
+ "CURRENT_INTERCEPTOR_ID",
+ platform?.interceptors.default || "browser"
+ )
+ })
 
- // TODO: Interceptor related settings should move under the interceptor systems
- PROXY_URL: "https://proxy.hoppscotch.io/",
- URL_EXCLUDES: {
- auth: true,
- httpUser: true,
- httpPassword: true,
- bearerToken: true,
- oauth2Token: true,
- },
- THEME_COLOR: "indigo",
- BG_COLOR: "system",
- TELEMETRY_ENABLED: true,
- EXPAND_NAVIGATION: false,
- SIDEBAR: true,
- SIDEBAR_ON_LEFT: false,
- COLUMN_LAYOUT: true,
-
- HAS_OPENED_SPOTLIGHT: false,
-})
+ return defaultSettings
+}
 
 type ApplySettingPayload = {
  [K in keyof SettingsDef]: {

diff --git a/packages/hoppscotch-selfhost-web/src/main.ts b/packages/hoppscotch-selfhost-web/src/main.ts
@@ -26,7 +26,7 @@ createHoppApp("#app", {
  history: historyDef,
  },
  interceptors: {
- default: "browser",
+ default: "proxy",
  interceptors: [
  { type: "standalone", interceptor: browserInterceptor },
  { type: "standalone", interceptor: proxyInterceptor },