@jetlinks-web/core 1.0.9 → 2.0.1

package/index.ts

@@ -1 +1 @@
-export * from './src'
+export * from './src/axios'

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "1.0.9",
+  "version": "2.0.1",
   "description": "",
   "main": "index.ts",
   "module": "index.ts",
-  "keywords": [],
+  "keywords": [
+    "@jetlinks-web"
+  ],
   "files": [
     "src",
     "index.ts"
@@ -13,24 +15,16 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "lodash-es": "^4.17.21",
-    "axios": "^1.4.0",
-    "rxjs": "^7.8.1",
-    "@jetlinks-web/constants": "^1.0.1",
-    "@jetlinks-web/types": "^1.0.1",
-    "@jetlinks-web/router": "^1.0.7",
-    "@jetlinks-web/utils": "^1.0.5"
-  },
-  "devDependencies": {
-    "@types/lodash-es": "^4.17.7",
-    "@types/node": "^20.2.5",
-    "jetlinks-ui-components": "^1.0.34-16"
+    "axios": "^1.7.4",
+    "@jetlinks-web/constants": "^1.0.2",
+    "@jetlinks-web/types": "^1.0.2",
+    "@jetlinks-web/utils": "^1.0.8"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {
-    "clean": "pnpm rimraf node_modules && pnpm rimraf dist && pnpm rimraf .turbo"
+    "clean": "pnpm rimraf .turbo"
   }
 }

package/src/axios.ts

@@ -0,0 +1,211 @@
+import { TOKEN_KEY, BASE_API } from '@jetlinks-web/constants'
+import { getToken } from '@jetlinks-web/utils'
+import axios from 'axios'
+import type {
+  AxiosInstance,
+  AxiosResponse,
+  AxiosError,
+  InternalAxiosRequestConfig,
+} from 'axios'
+import type { AxiosResponseRewrite } from '@jetlinks-web/types'
+import {isFunction, isObject} from 'lodash-es'
+
+interface Options {
+
+  tokenExpiration: () => void
+  filter_url?: Array<string>
+  code?: number
+  codeKey?: string
+  timeout?: number
+  handleRequest?: () => void
+  /**
+   * response处理函数
+   * @param response AxiosResponse实例
+   */
+  handleResponse?: (response: AxiosResponse) => void
+  /**
+   * 错误处理函数
+   * @param msg 错误消息
+   * @param status 错误code
+   * @param error 错误实例
+   */
+  handleError?: (msg: string, status: string | number, error: AxiosError<any>) => void
+  requestOptions?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig | Record<string, any>
+
+}
+
+let instance: AxiosInstance
+
+let _options: Options = {
+  filter_url: [],
+  code: 200,
+  codeKey: 'status',
+  timeout: 1000 * 15,
+  handleRequest: undefined,
+  handleResponse: undefined,
+  handleError: undefined,
+  requestOptions: (config) => ({}),
+  tokenExpiration: () => {},
+
+}
+
+const handleRequest = (config: InternalAxiosRequestConfig) => {
+  const token = getToken()
+
+  // 没有token，并且该接口需要token校验
+  if (!token && !_options.filter_url?.some((url) => config.url?.includes(url))) {
+    // 跳转登录页
+    _options.tokenExpiration?.()
+    return config
+  }
+
+  config.headers[TOKEN_KEY] = token
+
+  if (_options.requestOptions && isFunction(_options.requestOptions)) {
+    const extraOptions = _options.requestOptions(config)
+    if (extraOptions && isObject(extraOptions)) {
+      for (const key in extraOptions) {
+        config[key] = extraOptions[key]
+      }
+    }
+  }
+
+
+  return config
+}
+
+const handleResponse = (response: AxiosResponse) => {
+
+  if (_options.handleResponse && isFunction(_options.handleResponse)) {
+    return _options.handleResponse(response)
+  }
+
+  if (response.data instanceof ArrayBuffer) {
+    return response
+  }
+
+  const status = response.data[_options.codeKey || 'status']
+
+// 增加业务接口处理成功判断方式，只需要判断返回参数包含：success为true
+  if (
+    typeof response.data === 'object' &&
+    typeof response.data.success === 'undefined'
+  ) {
+    response.data.success = status === _options.code
+  }
+
+  return response.data
+}
+
+const errorHandler = (err: AxiosError<any>) => {
+  let description = 'Error'
+  let _status: string | number = 0
+  if (err.response) {
+    const {data, status} = err.response
+    _status = status
+    switch (status) {
+      case 400:
+      case 403:
+      case 500:
+        description = (`${data?.message}`).substring(0, 90)
+        break;
+      case 401:
+        description = '用户未登录'
+        _options.tokenExpiration?.()
+        break;
+      default:
+        break;
+    }
+  } else if (err.response === undefined) {
+    description = err.message.includes('timeout') ? '接口响应超时' : err.message
+    _status = 'timeout'
+  }
+
+  if (_options.handleError && isFunction(_options.handleError)) {
+    _options.handleError(description, _status, err)
+  }
+
+  return Promise.reject(err)
+}
+
+export const crateAxios = (options: Options) => {
+  if (options) {
+    _options = Object.assign(_options, options)
+  }
+
+  instance = axios.create({
+    withCredentials: false,
+    timeout: _options.timeout,
+    baseURL: BASE_API
+  })
+
+  instance.interceptors.request.use(
+    handleRequest,
+    errorHandler
+  )
+
+  instance.interceptors.response.use(
+    handleResponse,
+    errorHandler
+  )
+}
+
+export const post = <T = any>(url: string, data: any = undefined, ext?: any) => {
+  return (instance<any, AxiosResponseRewrite<T>>({
+    method: 'POST',
+    url,
+    data,
+    ...ext,
+  }))
+}
+
+export const get = <T = any>(url: string, params: any = undefined, ext?: any) => {
+  return instance<any, AxiosResponseRewrite<T>>({
+    method: 'GET',
+    url,
+    params,
+    ...ext,
+  })
+}
+
+export const put = <T = any>(url: string, data: any = undefined, ext?: any) => {
+  return instance<any, AxiosResponseRewrite<T>>({
+    method: 'PUT',
+    url,
+    data,
+    ...ext,
+  })
+}
+
+export const patch = <T = any>(url: string, data: any = undefined, ext?: any) => {
+  return instance<any, AxiosResponseRewrite<T>>({
+    method: 'patch',
+    url,
+    data,
+    ...ext,
+  })
+}
+
+export const remove = <T = any>(url: string, params: any = undefined, ext?: any) => {
+  return instance<any, AxiosResponseRewrite<T>>({
+    method: 'DELETE',
+    url,
+    params,
+    ...ext,
+  })
+}
+
+export const getStream = (url: string, params?: any, ext?: any) => {
+  return get(url, params, { responseType: 'arraybuffer', ...ext })
+}
+
+export const postStream = (url: string, data: any, ext?: any) => {
+  return post(url, data, { responseType: 'arraybuffer', ...ext })
+}
+
+export const request = {
+  post, get, put, patch, remove, getStream, postStream
+}
+
+
+

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './request'
-export * from './websocket'

package/src/request/axios.ts

@@ -1,203 +0,0 @@
-import { TOKEN_KEY, BASE_API } from '@jetlinks-web/constants'
-import { getToken, removeToken } from '@jetlinks-web/utils'
-import axios from 'axios'
-import type {
-  AxiosRequestConfig,
-  AxiosInstance,
-  AxiosResponse,
-  AxiosError,
-  InternalAxiosRequestConfig,
-} from 'axios'
-import { notification as Notification } from 'jetlinks-ui-components'
-import { isFunction, merge } from 'lodash-es'
-import type { AxiosResponseRewrite } from '@jetlinks-web/types'
-import { context } from './context'
-
-export interface ContextOptions {
-  filterUrl?: string[]
-  handleRequest?: (
-    config: InternalAxiosRequestConfig,
-  ) => InternalAxiosRequestConfig
-  handleResponse?: (response: AxiosResponse) => AxiosResponse
-  errorHandler?: (error: AxiosError) => void
-
-  loginInvalid?: () => void
-}
-
-export interface CreateAxiosOptions extends AxiosRequestConfig, ContextOptions {}
-
-const SUCCESS_CODE = 200 // 成功代码
-
-export class Axios {
-  private axiosInstance: AxiosInstance
-  private readonly options: CreateAxiosOptions
-
-  constructor(options: CreateAxiosOptions) {
-    this.options = merge(context, options)
-    this.axiosInstance = axios.create({
-      withCredentials: false,
-      timeout: 1000 * 15,
-      baseURL: BASE_API
-    })
-    this.axiosInstance.interceptors.request.use(
-      this.request.bind(this),
-      this.errorHandler.bind(this)
-    )
-    this.axiosInstance.interceptors.response.use(
-      this.response.bind(this),
-      this.errorHandler.bind(this),
-    )
-  }
-
-  jumpLogin() {
-    removeToken()
-    this.options.loginInvalid?.()
-  }
-
-  request(config: InternalAxiosRequestConfig) {
-    const token = getToken()
-    const filterUrl = this.options.filterUrl // 不需要token校验接口
-    // 没有token，并且该接口需要token校验
-    if (!token && !filterUrl?.some((url) => config.url?.includes(url))) {
-      // 跳转登录页
-      this.jumpLogin()
-      return config
-    }
-
-    config.headers[TOKEN_KEY] = token
-
-    if (this.options.handleRequest && isFunction(this.options.handleRequest)) {
-      config = this.options.handleRequest(config)
-    }
-
-    return config
-  }
-
-  response(response: AxiosResponse) {
-    if (
-      this.options.handleResponse &&
-      isFunction(this.options.handleResponse)
-    ) { // 自定义处理
-      return this.options.handleResponse(response)
-    }
-
-    if (response.data instanceof ArrayBuffer) {
-      return response
-    }
-
-    const { status } = response.data
-
-    // 增加业务接口处理成功判断方式，只需要判断返回参数包含：success为true
-    if (
-      typeof response.data === 'object' &&
-      typeof response.data.success === 'undefined'
-    ) {
-      response.data.success = status === SUCCESS_CODE
-    }
-
-    return response.data
-  }
-
-  errorHandler(err: AxiosError<any>) {
-    if (this.options.errorHandler && isFunction(this.options.errorHandler)) {
-      this.options.errorHandler(err)
-    }
-
-    if (err.response) {
-      const { data, status } = err.response
-      switch(status) {
-        case 400:
-        case 403:
-        case 500:
-          const description = (`${data?.message}`).substring(0, 90)
-          this.showNotification(description, status)
-          break;
-        case 401:
-          this.showNotification('用户未登录', status)
-          this.jumpLogin()
-          break;
-        default:
-          break;
-      }
-    } else if (err.response === undefined) {
-      const description = err.message.includes('timeout') ? '接口响应超时' : err.message
-      this.showNotification(description)
-    }
-
-    return Promise.reject(err)
-  }
-
-  post<T = any>(url: string, data: any = undefined, ext?: any) {
-    return (this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'POST',
-      url,
-      data,
-      ...ext,
-    }))
-  }
-
-  postParams<T = any>(url: string, data: any = undefined, params = {}, ext?: any) {
-    return this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'POST',
-      url,
-      data,
-      params,
-      ...ext,
-    })
-  }
-
-  get<T = any>(url: string, params: any = undefined, ext?: any) {
-    return this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'GET',
-      url,
-      params,
-      ...ext,
-    })
-  }
-
-  put<T = any>(url: string, data: any = undefined, ext?: any) {
-    return this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'PUT',
-      url,
-      data,
-      ...ext,
-    })
-  }
-
-  patch<T = any>(url: string, data: any = undefined, ext?: any) {
-    return this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'patch',
-      url,
-      data,
-      ...ext,
-    })
-  }
-
-  remove<T = any>(url: string, params: any = undefined, data?: any, ext?: any) {
-    return this.axiosInstance<any, AxiosResponseRewrite<T>>({
-      method: 'DELETE',
-      url,
-      params,
-      data,
-      ...ext,
-    })
-  }
-
-  getStream(url: string, params?: any) {
-    return this.get(url, params, { responseType: 'arraybuffer' })
-  }
-
-  postStream(url: string, data: any, params: any) {
-    return this.postParams(url, data, params, { responseType: 'arraybuffer' })
-  }
-
-   private showNotification(description, key?: string | number, show: boolean = true) {
-    if (show) {
-      Notification.error({
-        key,
-        description,
-        message: '',
-      })
-    }
-  }
-}

package/src/request/context.ts

@@ -1,12 +0,0 @@
-import { ContextOptions } from './axios'
-// 公用上下文
-export let context: ContextOptions = {
-    filterUrl: [],
-    handleRequest: undefined,
-    handleResponse: undefined,
-    errorHandler: undefined
-}
-
-export const initRequest = (func: () => ContextOptions) => {
-    context = func()
-}

package/src/request/index.ts

@@ -1,9 +0,0 @@
-import { Axios } from "./axios";
-import type { CreateAxiosOptions } from "./axios";
-export { initRequest } from './context'
-
-export const createAxios = (options?: Partial<CreateAxiosOptions>) => {
-    return new Axios(options)
-}
-
-export const request = createAxios()

package/src/websocket.ts

@@ -1,185 +0,0 @@
-import { notification } from 'jetlinks-ui-components'
-import { Observable } from 'rxjs'
-
-let webSocketUrl = ''
-let ws: WebSocket | null = null // websocket实例
-let subs = {} // 订阅
-const tempQueue: any[] = [] // 缓存消息队列
-
-type HeartCheckType = {
-  timeout: number,
-  timer: NodeJS.Timeout | null
-  reset: () => HeartCheckType
-  start: () => void
-}
-// 心跳
-const heartCheck: HeartCheckType  = {
-  timeout: 2 * 1000,
-  timer: null,
-  reset() {
-    if (this.timer) {
-      clearInterval(this.timer)
-    }
-    return this
-  },
-  start() {
-    this.timer = setInterval(() => {
-      if (ws) {
-        ws.send(JSON.stringify({ type: 'ping' }))
-      }
-    }, this.timeout)
-  }
-}
-
-// 重启
-const reconnect: {
-    timeout: number,
-    timer: NodeJS.Timeout | null
-    count: number,
-    lock: boolean,
-    reload: () => void
-    countAdd: () => void
-    getReconnectCount: () => number
-} = {
-  timeout: 5 * 1000, // 重启时长，1-10次，频率为5s， 11-20次， 频率为15s， 20+， 频率为30s
-  timer: null,
-  count: 0,
-  lock: false,
-  reload() {
-    this.timer && clearTimeout(this.timer)
-    const that = this
-    if (!this.lock) {
-      const count = this.getReconnectCount()
-      this.lock = true
-      this.timer = setTimeout(() => {
-        createWebSocket()
-        that.lock = false
-        that.countAdd()
-      }, that.timeout * count)
-    }
-  },
-  countAdd() {
-    this.count += 1
-  },
-  getReconnectCount() {
-    const count = this.count
-    if (count <=10) {
-      return 1
-    } else if (count > 10 && count <= 20) {
-      return 3
-    } else {
-      return 6
-    }
-  }
-}
-
-export const initWebSocket = (url: string) => {
-  webSocketUrl = url
-}
-
-function createWebSocket() {
-  if (!webSocketUrl) {
-    console.warn('websocket url 不能为空')
-    return
-  }
-
-  if (!ws) {
-    console.log(webSocketUrl)
-    ws = new WebSocket(webSocketUrl)
-
-    ws.onopen = () => {
-      heartCheck.reset().start()
-      reconnect.count = 0 // 重置重启次数
-      // 发送已缓存的消息
-      if (tempQueue.length) {
-        for (let i = tempQueue.length - 1; i >= 0; i--) {
-          ws!.send(tempQueue[i])
-          tempQueue.splice(i, 1)
-        }
-      }
-    }
-
-    ws.onerror = () => {
-      ws = null
-      reconnect.reload()
-
-    }
-
-    ws.onmessage = (msg: Record<string, any>) => {
-      const data = JSON.parse(msg.data)
-
-      if (data.type === 'error') {
-        notification.error({ key: 'error', message: data.message })
-      }
-
-      const requestItem = subs[data.requestId]
-      if (requestItem) {
-        if (data.type === 'complete') {
-          requestItem.forEach((item: Record<string, any>) => {
-            item.complete()
-          })
-        } else if (data.type === 'result') {
-          requestItem.forEach((item: Record<string, any>) => {
-            item.next(data)
-          })
-        }
-      }
-
-    }
-
-    ws.onclose = () => {
-      ws = null
-      reconnect.reload()
-    }
-
-  }
-  return ws
-}
-
-export const getWebSocket = (id: string, topic: string, parameter: Record<string, any> = {}) => new Observable(subscriber => {
-  if (!subs[id]) {
-    subs[id] = []
-  }
-
-  subs[id].push({
-    next(val: Record<string, any>) {
-      subscriber.next(val)
-    },
-    complete() {
-      subscriber.complete()
-    }
-  })
-
-  const msg = JSON.stringify({id, topic, parameter, type: 'sub'})
-  const thatWs = createWebSocket()
-  if (thatWs) {
-    if (thatWs.readyState === WebSocket.OPEN) {
-      thatWs.send(msg)
-    } else {
-      tempQueue.push(msg)
-    }
-  }
-
-  return () => {
-    const unsub = JSON.stringify({ id, type: 'unsub' })
-    delete subs[id]
-    thatWs?.send(unsub)
-  }
-})
-
-/**
- * 关闭 websocket
- */
-const closeWs = () => {
-  if (ws) {
-    ws.close()
-  }
-}
-
-window.onbeforeunload = function () {
-  closeWs()
-}
-
-export {
-  createWebSocket
-}