@vyr/service-rpc 0.0.25 → 0.0.27

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@vyr/service-rpc",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "vue": "3.5.22",
     "axios": "^1.7.4"
   },
   "files": [

package/src/RpcService.ts

@@ -1,12 +1,10 @@
-import axios from 'axios'
 import { Serialization, Listener } from '@vyr/engine'
 import { Service } from '@vyr/service'
 import { path, tokenKey, topic, Confirm, Message } from '@vyr/service-rpc-universal'
+import { request } from './request'
 
 interface RpcServiceConfig {
     token: string
-    notify: (msg: string) => void
-    confirm: (options: Partial<Confirm>, value?: string) => Promise<Confirm>
 }
 
 const _logout = () => {
@@ -17,10 +15,14 @@ const _logout = () => {
 }
 
 class RpcService extends Service {
+    static notify = (msg: string) => { }
+    static confirm = async (options: Partial<Confirm>, value?: string) => {
+        return options as Confirm
+    }
 
     static async login(name: string, password: string) {
         const data = new Message.rpc.login.RequestMessage(name, password)
-        const res = await axios.post<InstanceType<typeof Message['rpc']['login']['NoticeMessage']>>(Message.rpc.login.Method, data)
+        const res = await request.post<InstanceType<typeof Message['rpc']['login']['NoticeMessage']>>(Message.rpc.login.Method, data)
         window.localStorage.setItem(tokenKey, res.data.params.token)
 
         const location = new URL(window.location.href)
@@ -30,7 +32,7 @@ class RpcService extends Service {
 
     static async getUser() {
         const data = new Message.rpc.getUser.RequestMessage()
-        const res = await axios.get<InstanceType<typeof Message['rpc']['getUser']['NoticeMessage']>>(Message.rpc.getUser.Method, data)
+        const res = await request.get<InstanceType<typeof Message['rpc']['getUser']['NoticeMessage']>>(Message.rpc.getUser.Method, data)
         return res.data.params.user
     }
 
@@ -42,21 +44,19 @@ class RpcService extends Service {
     }
 
     private _listener = new Listener<{ [k: string]: (msg: Message) => void }>()
-    private confirm
     private socket: any
     private needTrigger = false
     private msgQueue: Message[] = []
 
     constructor(name: string, config: RpcServiceConfig) {
         super(name)
-        this.confirm = config.confirm
         const params = { path, extraHeaders: { authorization: 'Bearer ' + config.token }, autoConnect: false }
         //@ts-ignore
         this.socket = new window.io(location.href, params)
 
         this.socket.on(topic, (content: string) => {
             const msg = Serialization.parse(content) as Message
-            if (msg.message !== undefined) return config.notify(msg.message)
+            if (msg.message !== undefined) return RpcService.notify(msg.message)
             this._delayTrigger(msg)
         })
         this.socket.on('disconnect', () => {
@@ -67,7 +67,7 @@ class RpcService extends Service {
     }
 
     private _onConfirm = async (msg: InstanceType<typeof Message['rpc']['confirm']['NoticeMessage']>) => {
-        const result = await this.confirm(msg.params.config)
+        const result = await RpcService.confirm(msg.params.config)
         msg.params.config.value = result.value
         msg.params.config.success = result.success
         this.send(msg)

package/src/index.ts

@@ -1,3 +1,4 @@
 export * from '@vyr/service-rpc-universal'
 export * from './locale'
+export * from './request'
 export * from './RpcService'

package/src/locale/LanguageProvider.ts

@@ -1,12 +1,16 @@
 import { LanguageProvider } from '@vyr/locale'
 
 interface ZhCNLanguageProvider extends LanguageProvider {
-
+    'request.error.general': string
+    'request.error.401': string
 }
 
 const zhCnLanguageProvider: ZhCNLanguageProvider = {
     id: 'zh_CN',
     name: '@vyr/service-rpc',
+
+    'request.error.general': '服务错误，请稍后重试！',
+    'request.error.401': '无效的会话，或者会话已过期，请重新登录。'
 }
 
 export {

package/src/request/index.ts

@@ -0,0 +1,50 @@
+import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import { language } from '../locale';
+import { RpcService } from '../RpcService';
+
+const request = axios.create({
+  baseURL: '',
+})
+
+// 请求拦截器
+request.interceptors.request.use(
+  (config: InternalAxiosRequestConfig) => {
+    const token = RpcService.getToken()
+
+    if (token) {
+      config.headers['Authorization'] = 'Bearer ' + token;
+    }
+
+    // FormData数据去请求头Content-Type
+    if (config.data instanceof FormData) {
+      delete config.headers['Content-Type'];
+    }
+    return config;
+  },
+  (error: any) => {
+    return Promise.reject(error);
+  }
+);
+
+// 响应拦截器
+request.interceptors.response.use(
+  (response: AxiosResponse) => {
+    return response
+  },
+  (error: any) => {
+    let message = language.get('request.error.general')
+    const { response, status } = error;
+
+    if (status === 401) {
+      message = language.get('request.error.401')
+    } else if (response.data !== null && typeof response.data === 'object') {
+      if (response.data.message) message = response.data.message
+    }
+    RpcService.notify(message)
+    return Promise.reject(error);
+  }
+)
+
+export {
+  request
+}