refactor(app): use new request way to fetch system config

ourai · ourai · commit be915d0038d7 · 2025-03-26T22:25:19.000+08:00
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -28,9 +28,9 @@ import { SpeedInsights } from '@vercel/speed-insights/next';
 import { GoogleAnalytics } from '@/components/GoogleAnalytics';
 import { getAppConfig } from '@/utils/app';
 
+import { fetchConfig } from '#/domain/system/repository';
 import { nunito_sans } from '#/lib/font';
 import { siteConfig } from '#/lib/site';
-import { getConfigs } from '#/services/common';
 
 import ClientEntry from '../entry';
 import DefaultLayout from '../entry/layouts/default';
@@ -101,12 +101,12 @@ export const metadata = {
 };
 
 export default async function RootLayout({ children }: { children: React.ReactNode }) {
-  const configRes = await getConfigs();
+  const config = await fetchConfig();
 
   return (
     <html lang="en" data-theme="light" className={`${nunito_sans.className} light`} suppressHydrationWarning>
       <body>
-        <ClientEntry config={{ static: getAppConfig(), dynamic: configRes }}>
+        <ClientEntry config={{ static: getAppConfig(), dynamic: config }}>
           <DefaultLayout>{children}</DefaultLayout>
         </ClientEntry>
         <GoogleAnalytics />
diff --git a/src/domain/system/repository.ts b/src/domain/system/repository.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2024 OpenBuild
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import httpClient from '@/utils/http';
+
+function fetchConfig() {
+  return httpClient.get('/config', { cache: 'no-store' });
+}
+
+export { fetchConfig };
diff --git a/src/services/common.js b/src/services/common.js
@@ -32,12 +32,3 @@ export async function ownedNFTs(address) {
   const res = await get(`ts/v1/nft/general/tools/address/owned?address=${address}`);
   return res;
 }
-
-export async function getConfigs() {
-  const res = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}ts/v1/config`, { cache: 'no-store' });
-  if (!res.ok) {
-    return null;
-    // throw console.error('Failed to fetch data')
-  }
-  return res.json();
-}
diff --git a/src/shared/types/http.ts b/src/shared/types/http.ts
@@ -25,4 +25,13 @@ type ResponseResult<VT extends DataValue = DataValue> = {
   extra?: Record<string, DataValue>;
 };
 
-export type { ResponseResult };
+type RequestConfig = RequestInit & {
+  baseUrl?: string;
+  params?: Record<string, DataValue>;
+  isServer?: boolean;
+  type?: 'upload';
+};
+
+type ResponseInterceptor = (res: ResponseResult) => ResponseResult;
+
+export type { ResponseResult, RequestConfig, ResponseInterceptor };
diff --git a/src/shared/utils/http.ts b/src/shared/utils/http.ts
@@ -17,17 +17,10 @@
 import { isBoolean, isFunction, isPlainObject } from 'lodash';
 import { stringify } from 'qs';
 
-import type { DataValue, ResponseResult } from '../types';
+import type { DataValue, ResponseResult, RequestConfig, ResponseInterceptor } from '../types';
 
 import { isLogicalSuccess, request } from './request';
 
-type RequestConfig = {
-  params?: Record<string, DataValue>;
-  isServer?: boolean;
-};
-
-type ResponseInterceptor = (res: ResponseResult) => ResponseResult;
-
 interface IHttpClient {
   new (options: { baseUrl?: string }): {
     _setInterceptor: (interceptor: ResponseInterceptor) => void;
diff --git a/src/shared/utils/index.js b/src/shared/utils/index.js
@@ -94,5 +94,11 @@ export function HTMLDecode(text) {
   // return output;
 }
 
-export { isEmpty, isNumber, isInteger, isString, isFunction, isPlainObject, noop, get, cloneDeep, merge, capitalize, chunk, range } from 'lodash';
+export {
+  isEmpty, isNumber, isInteger, isString, isFunction, isPlainObject,
+  noop,
+  get, cloneDeep, merge, omit,
+  capitalize,
+  chunk, range,
+} from 'lodash';
 export { nanoid as generateRandomId } from 'nanoid';
diff --git a/src/shared/utils/request.js b/src/shared/utils/request.js
@@ -18,6 +18,7 @@ import { getServerSession } from 'next-auth';
 import { getSession } from 'next-auth/react';
 
 import { authOptions } from '../../lib/auth';
+import { omit } from './index';
 
 const DEFAULT_PARAMS = {
   mode: 'cors',
@@ -49,10 +50,12 @@ export function isLogicalSuccess(code) {
   return code >= 200 && code < 300;
 }
 
-export async function request(url, method, data, config) {
+export async function request(url, method, data, config = {}) {
+  const { isServer, type, baseUrl, ...others } = config;
+
   let session;
 
-  if (config?.isServer) {
+  if (isServer) {
     session = await getServerSession(authOptions);
   } else {
     session = await getSession();
@@ -66,16 +69,15 @@ export async function request(url, method, data, config) {
   if (method === 'POST') {
     sendBody = JSON.stringify(data);
   }
-  if (config && config.type === 'upload' && method === 'POST') {
+  if (type === 'upload' && method === 'POST') {
     sendBody = data;
   } else {
     headers['Content-Type'] = 'application/json';
   }
 
-  // console.log(process.env.NEXT_PUBLIC_API_BASE_URL, 'NEXT_PUBLIC_API_BASE_URL')
-
-  return await fetch(resolveRequestUrl(config && config.baseUrl, url), {
+  return await fetch(resolveRequestUrl(baseUrl, url), {
     ...DEFAULT_PARAMS,
+    ...omit(others, ['params']),
     headers,
     method,
     body: sendBody,
diff --git a/src/state/application/updater.js b/src/state/application/updater.js
@@ -30,7 +30,7 @@ export default function Updater({ datas }) {
   const isMobile = !useMediaQuery('(min-width: 768px)');
   const isNotLg = useMediaQuery('(min-width: 1024px)');
   const gc = useCallback(async () => {
-    if (datas?.configs?.code === 200) {
+    if (datas?.configs?.success) {
       dispatch(updateConfig(datas.configs.data.list));
     }
   }, [dispatch, datas]);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export default function Updater({ datas }) {`
`30`	`30`	`const isMobile = !useMediaQuery('(min-width: 768px)');`
`31`	`31`	`const isNotLg = useMediaQuery('(min-width: 1024px)');`
`32`	`32`	`const gc = useCallback(async () => {`
`33`		`- if (datas?.configs?.code === 200) {`
	`33`	`+ if (datas?.configs?.success) {`
`34`	`34`	`dispatch(updateConfig(datas.configs.data.list));`
`35`	`35`	`}`
`36`	`36`	`}, [dispatch, datas]);`