@conecli/cone-render 0.10.1-shop-beta.11 → 0.10.1-shop-beta.13

package/dist/service/http/colorSign.dynamic.ts

@@ -0,0 +1 @@
+import global from '../../common'
  public fmInfo: {
    eid?: string
    fp?: string
    jsToken?: string
    sdkToken?: string
  } 
  constructor() {
    this.fmInfo = {}
  }
  
  async getFmInfo() {
    return this.fmInfo;
  }
  
  paramsSign(data) {
    return Promise.resolve(data)
  }

package/dist/service/http/http.ts

@@ -1 +1 @@
-import Taro, { RequestTask } from '@tarojs/taro'
  jsonHeader = 'application/json;charset=utf-8',
  formDataHeader = 'application/x-www-form-urlencoded',
  public fmInfo: {
    eid?: string
    fp?: string
    jsToken?: string
    sdkToken?: string
  } 
  public api: ServiceInterFace.HttpApi
  constructor() {
    this._init()
    this.api = api
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  
  get(
    url: string,
    data: any = null,
    otherOptions = {},
  ): Promise<Taro.request.SuccessCallbackResult<any>> {
    return this.request({ url, data, method: 'GET', ...otherOptions })
  }
  
  post(
    url: string,
    data: any = null,
    otherOptions = {},
  ): Promise<Taro.request.SuccessCallbackResult<any>> {
    return this.request({ url, data, method: 'POST', ...otherOptions })
  }
  
  async request({
    url,
    method = 'POST',
    timeout = 7000,
    isColorVerify = false,
    ...otherOptions
  }): Promise<Taro.request.SuccessCallbackResult<any>> {
    const { header: otherHeader, ...otherOpts } = otherOptions
    const header = {
      'content-type':
        method === 'POST'
          ? RequestHeaderContentType.formDataHeader
          : RequestHeaderContentType.jsonHeader,
      ...otherHeader,
    }
    const getReqData = otherOptions.data
    if (url === this.api.apiFunc && typeof getReqData === 'object') {
      const { functionId } = getReqData
      console.log('获取当前是否需要color加固', isColorVerify, functionId)
      if (isColorVerify) {
        const { h5st } = await colorSign.paramsSign(getReqData)
        h5st && (getReqData.h5st = encodeURI(h5st))
        console.log(`${functionId}的apiReq_h5st===>：${h5st}`)
      }
      const { jsToken } = await colorSign.getFmInfo()
      jsToken && (getReqData['x-api-eid-token'] = jsToken)
    }
    const param: any = {
      url,
      method,
      timeout,
      header,
      credentials: 'include',
      ...otherOpts,
    }
    const requestTask = Taro.request(param)
    const requestTimeoutPromise =
      new Promise<ServiceInterFace.RequestPromiseRes>((resolve) => {
        setTimeout(() => {
          resolve({
            statusCode: 500,
            resTimeoutState: true,
            errMsg: 'request timeout',
          })
        }, timeout)
      })
    return Promise.race([requestTask, requestTimeoutPromise]).then(
      (res: any) => {
        if (res && res.statusCode === 500 && res.resTimeoutState) {
          console.warn('request 请求超时 url:' + url)
          requestTask.abort && requestTask.abort()
        }
        return res
      },
    )
  }
+import Taro from '@tarojs/taro'
  jsonHeader = 'application/json;charset=utf-8',
  formDataHeader = 'application/x-www-form-urlencoded',
  public fmInfo: {
    eid?: string
    fp?: string
    jsToken?: string
    sdkToken?: string
  } 
  public api: ServiceInterFace.HttpApi
  constructor() {
    this._init()
    this.api = api
  }
  _init(): void {
    !isDynamic && httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  
  get(
    url: string,
    data: any = null,
    otherOptions = {},
  ): Promise<Taro.request.SuccessCallbackResult<any>> {
    return this.request({ url, data, method: 'GET', ...otherOptions })
  }
  
  post(
    url: string,
    data: any = null,
    otherOptions = {},
  ): Promise<Taro.request.SuccessCallbackResult<any>> {
    return this.request({ url, data, method: 'POST', ...otherOptions })
  }
  
  async request({
    url,
    method = 'POST',
    timeout = 7000,
    isColorVerify = false,
    ...otherOptions
  }): Promise<Taro.request.SuccessCallbackResult<any>> {
    const { header: otherHeader, ...otherOpts } = otherOptions
    const header = {
      'content-type':
        method === 'POST'
          ? RequestHeaderContentType.formDataHeader
          : RequestHeaderContentType.jsonHeader,
      ...otherHeader,
    }
    const getReqData = otherOptions.data
    if (url === this.api.apiFunc && typeof getReqData === 'object') {
      const { functionId } = getReqData
      console.log('获取当前是否需要color加固', isColorVerify, functionId)
      if (isColorVerify) {
        const { h5st } = await colorSign.paramsSign(getReqData)
        h5st && (getReqData.h5st = encodeURI(h5st))
        console.log(`${functionId}的apiReq_h5st===>：${h5st}`)
      }
      const { jsToken } = await colorSign.getFmInfo()
      jsToken && (getReqData['x-api-eid-token'] = jsToken)
    }
    const param: any = {
      url,
      method,
      timeout,
      header,
      credentials: 'include',
      ...otherOpts,
    }
    const requestTask = Taro.request(param)
    const requestTimeoutPromise =
      new Promise<ServiceInterFace.RequestPromiseRes>((resolve) => {
        setTimeout(() => {
          resolve({
            statusCode: 500,
            resTimeoutState: true,
            errMsg: 'request timeout',
          })
        }, timeout)
      })
    return Promise.race([requestTask, requestTimeoutPromise]).then(
      (res: any) => {
        if (res && res.statusCode === 500 && res.resTimeoutState) {
          console.warn('request 请求超时 url:' + url)
          requestTask.abort && requestTask.abort()
        }
        return res
      },
    )
  }