feat: unified env

This commit is contained in:
DIYgod 2025-03-01 15:00:36 +08:00
parent d9e15de48e
commit fd81327913
No known key found for this signature in database
10 changed files with 18 additions and 103 deletions

View File

@ -1,11 +0,0 @@
import { createAtomHooks } from "@follow/utils"
import { atomWithStorage } from "jotai/utils"
import { JotaiPersistSyncStorage } from "../lib/jotai"
type Environment = "prod" | "dev" | "staging"
export const [, , useEnvironment, , getEnvironment, setEnvironment] = createAtomHooks(
atomWithStorage<Environment>("debug-env", "prod", JotaiPersistSyncStorage, {
getOnInit: true,
}),
)

View File

@ -1,17 +1,17 @@
/* eslint-disable no-console */
import type { AppType } from "@follow/shared"
import { env } from "@follow/shared/src/env"
import { FetchError, ofetch } from "ofetch"
import { userActions } from "../store/user/store"
import { getCookie } from "./auth"
import { getApiUrl } from "./env"
const { hc } = require("hono/dist/cjs/client/client") as typeof import("hono/client")
export const apiFetch = ofetch.create({
retry: false,
baseURL: getApiUrl(),
baseURL: env.VITE_API_URL,
onRequest: async (ctx) => {
const { options, request } = ctx
if (__DEV__) {
@ -47,7 +47,7 @@ export const apiFetch = ofetch.create({
},
})
export const apiClient = hc<AppType>(getApiUrl(), {
export const apiClient = hc<AppType>(env.VITE_API_URL, {
fetch: async (input: any, options = {}) =>
apiFetch(input.toString(), options).catch((err) => {
throw err

View File

@ -1,4 +1,5 @@
import { expoClient } from "@better-auth/expo/client"
import { env } from "@follow/shared/src/env"
import { useQuery } from "@tanstack/react-query"
import { twoFactorClient } from "better-auth/client/plugins"
import { createAuthClient } from "better-auth/react"
@ -6,7 +7,6 @@ import type * as better_call from "better-call"
import * as SecureStore from "expo-secure-store"
import { whoamiQueryKey } from "../store/user/hooks"
import { getApiUrl } from "./env"
import { queryClient } from "./query-client"
const storagePrefix = "follow_auth"
@ -14,7 +14,7 @@ export const cookieKey = `${storagePrefix}_cookie`
export const sessionTokenKey = "__Secure-better-auth.session_token"
const authClient = createAuthClient({
baseURL: `${getApiUrl()}/better-auth`,
baseURL: `${env.VITE_API_URL}/better-auth`,
plugins: [
twoFactorClient(),
{

View File

@ -1,12 +0,0 @@
import { getEnvironment } from "../atoms/env"
import { appEndpointMap } from "../constants/env"
export const getApiUrl = () => {
const env = getEnvironment()
return appEndpointMap[env].api
}
export const getWebUrl = () => {
const env = getEnvironment()
return appEndpointMap[env].web
}

View File

@ -1,9 +1,9 @@
import { env } from "@follow/shared/src/env"
import type { FC, PropsWithChildren } from "react"
import { useMemo } from "react"
import { Alert, Clipboard } from "react-native"
import { ContextMenu } from "@/src/components/ui/context-menu"
import { getWebUrl } from "@/src/lib/env"
import { toast } from "@/src/lib/toast"
import { getList } from "@/src/store/list/getters"
import { useIsOwnList } from "@/src/store/list/hooks"
@ -31,7 +31,7 @@ export const SubscriptionListItemContextMenu: FC<
const list = getList(id)
if (!list) return
toast.info("Link copied to clipboard")
Clipboard.setString(`${getWebUrl()}/share/lists/${list.id}`)
Clipboard.setString(`${env.VITE_WEB_URL}/share/lists/${list.id}`)
},
},
{

View File

@ -1,3 +1,4 @@
import { env } from "@follow/shared/src/env"
import { useLocalSearchParams } from "expo-router"
import { useMemo } from "react"
import { Share, useAnimatedValue, View } from "react-native"
@ -9,7 +10,6 @@ import { NavigationBlurEffectHeader } from "@/src/components/layouts/views/SafeN
import { UIBarButton } from "@/src/components/ui/button/UIBarButton"
import { TIMELINE_VIEW_SELECTOR_HEIGHT } from "@/src/constants/ui"
import { Share3CuteReIcon } from "@/src/icons/share_3_cute_re"
import { getWebUrl } from "@/src/lib/env"
import {
HomeLeftAction,
HomeSharedRightAction,
@ -101,8 +101,7 @@ function FeedShareAction({ params }: { params: any }) {
onPress={() => {
const feed = getFeed(feedId)
if (!feed) return
const webUrl = getWebUrl()
const url = `${webUrl}/share/feeds/${feedId}`
const url = `${env.VITE_WEB_URL}/share/feeds/${feedId}`
Share.share({
message: `Check out ${feed.title} on Follow: ${url}`,
title: feed.title!,

View File

@ -1 +0,0 @@
export const env = {}

View File

@ -1,67 +0,0 @@
import { createEnv } from "@t3-oss/env-core"
import { z } from "zod"
export const isDev =
"process" in globalThis ? process.env.NODE_ENV === "development" : import.meta.env.DEV
export const env = createEnv({
clientPrefix: "VITE_",
client: {
VITE_WEB_URL: z.string().url().default("https://app.follow.is"),
VITE_API_URL: z.string(),
VITE_DEV_PROXY: z.string().optional(),
VITE_SENTRY_DSN: z.string().optional(),
VITE_INBOXES_EMAIL: z.string().default("@follow.re"),
VITE_FIREBASE_CONFIG: z.string().optional(),
VITE_OPENPANEL_CLIENT_ID: z.string().optional(),
VITE_OPENPANEL_API_URL: z.string().url().optional(),
// For external, use api_url if you don't want to fill it in.
VITE_EXTERNAL_PROD_API_URL: z.string().optional(),
VITE_EXTERNAL_DEV_API_URL: z.string().optional(),
VITE_EXTERNAL_API_URL: z.string().optional(),
VITE_WEB_PROD_URL: z.string().optional(),
VITE_WEB_DEV_URL: z.string().optional(),
},
emptyStringAsUndefined: true,
runtimeEnv: getRuntimeEnv() as any,
skipValidation: "process" in globalThis ? process.env.VITEST === "true" : false,
})
function metaEnvIsEmpty() {
try {
return Object.keys(import.meta.env || {}).length === 0
} catch {
return true
}
}
function getRuntimeEnv() {
try {
if (metaEnvIsEmpty()) {
return process.env
}
return injectExternalEnv(import.meta.env)
} catch {
return process.env
}
}
declare const globalThis: any
function injectExternalEnv<T>(originEnv: T): T {
if (!("document" in globalThis)) {
return originEnv
}
const prefix = "__followEnv"
const env = globalThis[prefix]
if (!env) {
return originEnv
}
for (const key in env) {
originEnv[key as keyof T] = env[key]
}
return originEnv
}

View File

@ -1,4 +1,6 @@
export const appEndpointMap = {
const profile = "prod"
const appEndpointMap = {
prod: {
api: "https://api.follow.is",
web: "https://app.follow.is",
@ -12,3 +14,8 @@ export const appEndpointMap = {
web: "https://staging.follow.is",
},
}
export const env = {
VITE_WEB_URL: appEndpointMap[profile].web,
VITE_API_URL: appEndpointMap[profile].api,
}

View File

@ -1,4 +1,4 @@
import { env } from "./constants/env"
import { env } from "./env"
export const IMAGE_PROXY_URL = "https://webp.follow.is"