refactor: 重构ORPC客户端并统一导出路径
- 删除API入口文件中的导出内容 - 更新上下文类型为导入的Context类型并移除注释掉的旧类型定义。 - 添加空的 Context 类型定义以支持上下文类型,暂时忽略复杂度检查警告 - 创建支持服务端和客户端的统一ORPC客户端,基于请求头上下文和Fetch链接实现前后端一致的RPC调用。 - 重构客户端代码,将ORPC客户端初始化逻辑移至独立文件并统一导出,提升代码可维护性和模块化程度。 - 更新导入路径,将 orpc 从 '@/api' 改为 '@/lib/orpc/query-client'。
This commit is contained in:
@@ -1,2 +0,0 @@
|
|||||||
export { orpc } from './client'
|
|
||||||
export * from './types'
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
import { implement } from '@orpc/server'
|
import { implement } from '@orpc/server'
|
||||||
import { contract } from './contract'
|
import { contract } from './contract'
|
||||||
|
import type { Context } from './types'
|
||||||
|
|
||||||
// biome-ignore lint/complexity/noBannedTypes: 暂无 context
|
export const os = implement(contract).$context<Context>()
|
||||||
export type ORPCContext = {}
|
|
||||||
|
|
||||||
export const os = implement(contract).$context<ORPCContext>()
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import type {
|
|||||||
} from '@orpc/contract'
|
} from '@orpc/contract'
|
||||||
import type { contract } from './contract'
|
import type { contract } from './contract'
|
||||||
|
|
||||||
|
// biome-ignore lint/complexity/noBannedTypes: 暂无 context
|
||||||
|
export type Context = {}
|
||||||
export type Contract = typeof contract
|
export type Contract = typeof contract
|
||||||
export type RouterClient = ContractRouterClient<Contract>
|
export type RouterClient = ContractRouterClient<Contract>
|
||||||
export type RouterInputs = InferContractRouterInputs<Contract>
|
export type RouterInputs = InferContractRouterInputs<Contract>
|
||||||
|
|||||||
24
apps/server/src/lib/orpc/client.ts
Normal file
24
apps/server/src/lib/orpc/client.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { createORPCClient } from '@orpc/client'
|
||||||
|
import { RPCLink } from '@orpc/client/fetch'
|
||||||
|
import { createRouterClient } from '@orpc/server'
|
||||||
|
import { createIsomorphicFn } from '@tanstack/react-start'
|
||||||
|
import { getRequestHeaders } from '@tanstack/react-start/server'
|
||||||
|
import { router } from '@/api/routers'
|
||||||
|
import type { RouterClient } from '@/api/types'
|
||||||
|
|
||||||
|
const getORPCClient = createIsomorphicFn()
|
||||||
|
.server(() =>
|
||||||
|
createRouterClient(router, {
|
||||||
|
context: () => ({
|
||||||
|
headers: getRequestHeaders(),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.client(() => {
|
||||||
|
const link = new RPCLink({
|
||||||
|
url: `${window.location.origin}/api/rpc`,
|
||||||
|
})
|
||||||
|
return createORPCClient<RouterClient>(link)
|
||||||
|
})
|
||||||
|
|
||||||
|
export const client: RouterClient = getORPCClient()
|
||||||
@@ -1,28 +1,5 @@
|
|||||||
import { createORPCClient } from '@orpc/client'
|
|
||||||
import { RPCLink } from '@orpc/client/fetch'
|
|
||||||
import { createRouterClient } from '@orpc/server'
|
|
||||||
import { createTanstackQueryUtils } from '@orpc/tanstack-query'
|
import { createTanstackQueryUtils } from '@orpc/tanstack-query'
|
||||||
import { createIsomorphicFn } from '@tanstack/react-start'
|
import { client } from './client'
|
||||||
import { getRequestHeaders } from '@tanstack/react-start/server'
|
|
||||||
import { router } from './routers'
|
|
||||||
import type { RouterClient } from './types'
|
|
||||||
|
|
||||||
const getORPCClient = createIsomorphicFn()
|
|
||||||
.server(() =>
|
|
||||||
createRouterClient(router, {
|
|
||||||
context: () => ({
|
|
||||||
headers: getRequestHeaders(),
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.client(() => {
|
|
||||||
const link = new RPCLink({
|
|
||||||
url: `${window.location.origin}/api/rpc`,
|
|
||||||
})
|
|
||||||
return createORPCClient<RouterClient>(link)
|
|
||||||
})
|
|
||||||
|
|
||||||
const client: RouterClient = getORPCClient()
|
|
||||||
|
|
||||||
export const orpc = createTanstackQueryUtils(client, {
|
export const orpc = createTanstackQueryUtils(client, {
|
||||||
experimental_defaults: {
|
experimental_defaults: {
|
||||||
@@ -4,7 +4,7 @@ import { isTauri } from '@tauri-apps/api/core'
|
|||||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||||
import type { ChangeEventHandler, FormEventHandler } from 'react'
|
import type { ChangeEventHandler, FormEventHandler } from 'react'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { orpc } from '@/api'
|
import { orpc } from '@/lib/orpc/query-client'
|
||||||
|
|
||||||
export const Route = createFileRoute('/')({
|
export const Route = createFileRoute('/')({
|
||||||
component: Todos,
|
component: Todos,
|
||||||
|
|||||||
Reference in New Issue
Block a user