From 9e94e7195be835314b187e6eb0fa3b39418f5ccc Mon Sep 17 00:00:00 2001 From: DarkSky <25152247+darkskygit@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:02:29 +0800 Subject: [PATCH] fix: use absolute path in gql client (#5454) (#5462) --- packages/frontend/graphql/src/index.ts | 13 ++++++++++++- packages/frontend/workspace/src/affine/gql.ts | 4 ++-- packages/frontend/workspace/src/impl/cloud/blob.ts | 9 +-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/frontend/graphql/src/index.ts b/packages/frontend/graphql/src/index.ts index 68d129e002..cd1cdef895 100644 --- a/packages/frontend/graphql/src/index.ts +++ b/packages/frontend/graphql/src/index.ts @@ -2,4 +2,15 @@ export * from './fetcher'; export * from './graphql'; export * from './schema'; export * from './utils'; -import '@affine/env/global'; + +import { setupGlobal } from '@affine/env/global'; + +setupGlobal(); + +export function getBaseUrl(): string { + if (environment.isDesktop) { + return runtimeConfig.serverUrlPrefix; + } + const { protocol, hostname, port } = window.location; + return `${protocol}//${hostname}${port ? `:${port}` : ''}`; +} diff --git a/packages/frontend/workspace/src/affine/gql.ts b/packages/frontend/workspace/src/affine/gql.ts index bb5b5b2048..91daf7c8ca 100644 --- a/packages/frontend/workspace/src/affine/gql.ts +++ b/packages/frontend/workspace/src/affine/gql.ts @@ -7,7 +7,7 @@ import type { QueryVariables, RecursiveMaybeFields, } from '@affine/graphql'; -import { gqlFetcherFactory } from '@affine/graphql'; +import { getBaseUrl, gqlFetcherFactory } from '@affine/graphql'; import type { GraphQLError } from 'graphql'; import { useCallback, useMemo } from 'react'; import type { Key, SWRConfiguration, SWRResponse } from 'swr'; @@ -22,7 +22,7 @@ import useSWRMutation from 'swr/mutation'; setupGlobal(); -export const fetcher = gqlFetcherFactory('/graphql'); +export const fetcher = gqlFetcherFactory(getBaseUrl() + '/graphql'); /** * A `useSWR` wrapper for sending graphql queries diff --git a/packages/frontend/workspace/src/impl/cloud/blob.ts b/packages/frontend/workspace/src/impl/cloud/blob.ts index 20eb5f259a..601991a26c 100644 --- a/packages/frontend/workspace/src/impl/cloud/blob.ts +++ b/packages/frontend/workspace/src/impl/cloud/blob.ts @@ -2,6 +2,7 @@ import { checkBlobSizesQuery, deleteBlobMutation, fetchWithTraceReport, + getBaseUrl, listBlobsQuery, setBlobMutation, } from '@affine/graphql'; @@ -10,14 +11,6 @@ import { fetcher } from '../../affine/gql'; import type { BlobStorage } from '../../engine/blob'; import { bufferToBlob } from '../../utils/buffer-to-blob'; -function getBaseUrl(): string { - if (environment.isDesktop) { - return runtimeConfig.serverUrlPrefix; - } - const { protocol, hostname, port } = window.location; - return `${protocol}//${hostname}${port ? `:${port}` : ''}`; -} - export const createAffineCloudBlobStorage = ( workspaceId: string ): BlobStorage => {