refactor: rename serverUrl to serviceUrl

shared/api/request.ts

@@ -3,9 +3,8 @@ import _get from 'lodash/get';
 import _isString from 'lodash/isString';
 import _isNil from 'lodash/isNil';
 import _isFunction from 'lodash/isFunction';
-import { config } from '../config';
 import { getErrorHook, tokenGetter } from '../manager/request';
-import { getServerUrl } from '../manager/server';
+import { getServiceUrl } from '../manager/service';
 
 export type CommonRequestResult<T> =
   | ({
@@ -23,7 +22,7 @@ class RequestError extends Error {}
  */
 export function createRequest() {
   const ins = axios.create({
-    baseURL: getServerUrl(),
+    baseURL: getServiceUrl(),
   });
 
   ins.interceptors.request.use(async (val) => {

shared/api/socket.ts

@@ -1,7 +1,6 @@
 import { io, Socket } from 'socket.io-client';
-import { config } from '../config';
 import _isNil from 'lodash/isNil';
-import { getServerUrl } from '../manager/server';
+import { getServiceUrl } from '../manager/service';
 
 let socket: Socket;
 
@@ -56,7 +55,7 @@ export function createSocket(token: string): Promise<AppSocket> {
   }
 
   return new Promise((resolve, reject) => {
-    socket = io(getServerUrl(), {
+    socket = io(getServiceUrl(), {
       transports: ['websocket'],
       auth: {
         token,

shared/index.tsx

@@ -26,7 +26,7 @@ export { useMountedState } from './hooks/useMountedState';
 // manager
 export { getStorage, setStorage, useStorage } from './manager/storage';
 export { setTokenGetter } from './manager/request';
-export { setServerUrl } from './manager/server';
+export { setServiceUrl } from './manager/service';
 
 // model
 export { loginWithEmail, registerWithEmail } from './model/user';

shared/manager/service.ts

@@ -3,7 +3,7 @@ import { buildRegFn } from './buildRegFn';
 /**
  * 获取服务器地址相关逻辑
  */
-export const [getServerUrl, setServerUrl] = buildRegFn<() => string>(
+export const [getServiceUrl, setServiceUrl] = buildRegFn<() => string>(
   'serverUrl',
   () => 'http://127.0.0.1:11000'
 );

web/src/init.tsx

@@ -1,6 +1,6 @@
 import {
   buildStorage,
-  setServerUrl,
+  setServiceUrl,
   setStorage,
   setTokenGetter,
 } from 'pawchat-shared';
@@ -13,8 +13,8 @@ setTokenGetter(async () => {
   return await getUserJWT();
 });
 
-if (window.localStorage.getItem('serverUrl')) {
-  setServerUrl(() => String(window.localStorage.getItem('serverUrl')));
-} else if (process.env.SERVER_URL) {
-  setServerUrl(() => String(process.env.SERVER_URL));
+if (window.localStorage.getItem('serviceUrl')) {
+  setServiceUrl(() => String(window.localStorage.getItem('serviceUrl')));
+} else if (process.env.SERVICE_URL) {
+  setServiceUrl(() => String(process.env.SERVICE_URL));
 }

web/webpack.config.ts

@@ -95,10 +95,8 @@ const config: Configuration = {
   },
   plugins: [
     new DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify(process.env.NODE_ENV),
-        SERVER_URL: JSON.stringify(process.env.SERVER_URL),
-      },
+      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+      'process.env.SERVICE_URL': JSON.stringify(process.env.SERVICE_URL),
     }),
     new HtmlWebpackPlugin({
       title: 'PawChat',