@conecli/cone-render 0.8.19-beta.1 → 0.8.19-beta.2

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"
  constructor() {
    this._init()
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  
  get(url: string, data: any = null, otherOptions = {}): Taro.RequestTask<any> {
    return this.request({url, data, method:"GET", ...otherOptions})
  }
  
  post(
    url: string,
    data: any = null,
    otherOptions = {}
  ): Taro.RequestTask<any> {
    return this.request({url, data, method:"POST", ...otherOptions})
  }
  
  request({url, method = "POST", timeout = 7000, ...otherOptions}): RequestTask<any> {
    const header = {
          "content-type": method === "POST" ? RequestHeaderContentType.formDataHeader : RequestHeaderContentType.jsonHeader
        }
    return Taro.request({
      url,
      method,
      timeout,
      header,
      credentials: 'include',
      ...otherOptions,
    })
  }
+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
    this.fmInfo = {}
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  
  get(url: string, data: any = null, otherOptions = {}): Taro.RequestTask<any> {
    return this.request({ url, data, method: 'GET', ...otherOptions })
  }
  
  post(
    url: string,
    data: any = null,
    otherOptions = {},
  ): Taro.RequestTask<any> {
    return this.request({ url, data, method: 'POST', ...otherOptions })
  }
  
  _getMobileJsToken(): Promise<{
    ok: boolean
    data?: any
    error?: any
  }> {
    return new Promise((resolve, reject) => {
      try {
        if (window?.getJsToken) {
          window.getJsToken(function (res) {
            console.log('JS token 获取结果：', res)
            resolve({
              ok: true,
              data: res,
            })
          }, 600)
        } else {
          reject({
            ok: false,
            error: '没有识别到getJsToken全局方法',
          })
        }
      } catch (e) {
        console.log('获取指纹JS token 异常', e)
        reject({
          ok: false,
          error: e,
        })
      }
    })
  }
  
  async _getFmInfo() {
    try {
      const { ok, data } = await this._getMobileJsToken()
      this.fmInfo = ok && data ? data : this.fmInfo
      return this.fmInfo
    } catch (e) {
      console.log('获取指纹信息异常', e)
      return this.fmInfo
    }
  }
  
  async request({
    url,
    method = 'POST',
    timeout = 7000,
    ...otherOptions
  }): RequestTask<any> {
    const header = {
      'content-type':
        method === 'POST'
          ? RequestHeaderContentType.formDataHeader
          : RequestHeaderContentType.jsonHeader,
    }
    const getReqData = otherOptions.data
    if (url === this.api.apiFunc && typeof getReqData === 'object') {
      const { jsToken } = await this._getFmInfo()
      jsToken && (getReqData['x-api-eid-token'] = jsToken)
    }
    const requestTask = Taro.request({
      url,
      method,
      timeout,
      header,
      credentials: 'include',
      ...otherOptions,
    })
    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.log('request 请求超时 url:' + url)
          requestTask.abort && requestTask.abort()
        }
        return res
      },
    )
  }

package/dist/service/requestServer.ts

@@ -0,0 +1 @@
+import Taro, { RequestTask } from '@tarojs/taro'
  SHOP_COLOR_APPID,
  JshopxColorFunctionIdList,
  PagesColorFunctionIdList,
  JSHOPX_COLOR_APPID,
  PAGES_COLOR_APPID,
  PAGES_DOMAIN,
  B2BColorFunctionIdList,
  B2B_COLOR_APPID,
  cookiesStr: '', 
  requestHeaderContentType: {
    jsonHeader: {
      'content-type': 'application/json;charset=utf-8',
    },
    formDataHeader: {
      'content-type': 'application/x-www-form-urlencoded',
    },
  },
  requestBaseParam: {
    data: null,
    header: {
      'content-type': 'application/json;charset=utf-8',
    },
  },
  timeOut: 7000,
  apiClientParams: {
    appid: SHOP_COLOR_APPID,
    clientVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
    client: isH5AndJdShopView ? (isIosDevice ? 'apple' : 'android') : 'wh5',
    area: '1_72_2799_0', 
    uuid: UUID,
  },
  public addressFetchInfo: {
    reqState: boolean
    promiseInstance: null | Promise<any>
  }
  public getPromotionConfig: {
    projectId: null | string | number
    pageId: null | string | number
  }
  public resInfo: ServiceInterFace.HttpRequestInfo
  public api: ServiceInterFace.HttpApi
  public isPageDomain: boolean
  constructor(opt) {
    this._init()
    this.addressFetchInfo = {
      reqState: false,
      promiseInstance: null,
    }
    this.getPromotionConfig = {
      projectId: null,
      pageId: null,
    }
    this._userAreaUpdateListen()
    this.resInfo = this._getResConfig(opt)
    this.api = api
    this.isPageDomain = window.location.hostname === PAGES_DOMAIN
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  _getResConfig(opt = {}): ServiceInterFace.HttpRequestInfo {
    return Object.assign({}, DefaultConfig, opt)
  }
  
  _userAreaUpdateListen() {
    Taro.eventCenter.on(TaroEventType.USER_AREA_UPDATE, (area) => {
      this.updateApiClientParamsResInfo({
        area,
      })
    })
  }
  updateApiClientParamsResInfo(opt = {}) {
    this.resInfo.apiClientParams = {
      ...this.resInfo.apiClientParams,
      ...opt,
    }
  }
  
  _paramsSign(data) {
    return Promise.resolve(data)
  }
  
  checkFunctionIdToReturnAppId(functionId) {
    if (JshopxColorFunctionIdList.includes(functionId)) {
      return JSHOPX_COLOR_APPID
    } else if (
      this.isPageDomain &&
      PagesColorFunctionIdList.includes(functionId)
    ) {
      return PAGES_COLOR_APPID
    } else if (B2BColorFunctionIdList.includes(functionId)) {
      return B2B_COLOR_APPID
    } else {
      return SHOP_COLOR_APPID
    }
  }
  
  gatewayReq(
    functionId: string,
    bodyParams = {},
    clientParams = {},
  ): Promise<any> {
    if (
      functionId === 'receiveShopCoupon' &&
      ((isH5 && window.isJingGouMiniViewState) || isWxMinAndWxapp)
    ) {
      clientParams = Object.assign(
        {},
        {
          loginType: '1',
          loginWQBiz: WXAPP_BIZ_KEY,
        },
        clientParams,
      )
    }
    const apiClientParams = Object.assign(
      {},
      this.resInfo.apiClientParams,
      clientParams,
    )
    apiClientParams.appid = this.checkFunctionIdToReturnAppId(functionId)
    const getReqData = {
      functionId: functionId,
      body: JSON.stringify(bodyParams),
      t: Date.now(),
      ...apiClientParams,
    }
    console.log(`gatewayReq:${this.api.apiFunc}`)
    return http
      .request({
        url: this.api.apiFunc,
        data: getReqData,
        method: 'GET',
      })
      .then((res: ServiceInterFace.RequestPromiseRes) => {
        const { statusCode, data } = res
        let changeRes: ServiceInterFace.RequestResponseFormatRes = {
          ok: true,
        }
        if (statusCode === 200 && data) {
          const resCode = Object.prototype.hasOwnProperty.call(res.data, 'code')
            ? Number(res.data.code)
            : -1
          const subCode = Object.prototype.hasOwnProperty.call(
            res.data,
            'subCode',
          )
            ? Number(res.data.subCode)
            : -1
          if (
            data.success === true ||
            data.isSuccess ||
            resCode === 0 ||
            resCode === 200 ||
            subCode === 0
          ) {
            changeRes = {
              result: Object.prototype.hasOwnProperty.call(data, 'result')
                ? data.result
                : Object.prototype.hasOwnProperty.call(data, 'data')
                ? data.data
                : data,
              code: data.code || 200,
              ok: true,
              source: data,
            }
            return changeRes
          } else {
            changeRes = {
              ...data,
              ok: false,
              statusCode: res.statusCode,
            }
            return changeRes
          }
        } else {
          changeRes = {
            ...data,
            ok: false,
            statusCode: res.statusCode,
          }
          return changeRes
        }
      })
      .catch((res) => {
        return {
          ...res,
          ok: false,
        } as ServiceInterFace.RequestResponseFormatRes
      })
  }
  
  async receiveCoupon(param = {}, clientParams) {
    return await this.gatewayReq(
      'receiveShopCoupon',
      {
        operation: '3',
        ...param,
      },
      clientParams,
    )
  }
  async bMallAddCart(params = {}) {
    return await this.gatewayReq('bmall_cartAdd', params, {
      client: 'H5',
    })
  }
  async bMallChangeCart(params = {}) {
    return await this.gatewayReq('bmall_cartChange', params, {
      client: 'H5',
    })
  }
  async bMallRemoveCart(params = {}) {
    return await this.gatewayReq(
      'bmall_cartRemove',
      params,
      {
        client: 'H5',
      },
    )
  }
  async bMallGetOmittedProduct(params = {}) {
    return await this.gatewayReq('bmall_getOmittedProduct', params, {
      client: 'H5',
    })
  }
  async bMallAddCartService({ skuId, bMallTag, num }) {
    const params = getParams({ skuId, bMallTag, num })
    return await this.addCart(params)
  }
  async bMallGetSkuNumService(bMallTag = 1) {
    const params = getParams({ bMallTag })
    delete params.operations
    return await this.getOmittedProduct(params)
  }
  async bMallRemoveCartService({ skuId, bMallTag, num, skuUuid }) {
    let params = getParams({ skuId, bMallTag, num, skuUuid })
    return await this.removeCart(params)
  }
  async bMallChangeCartService({ skuId, bMallTag, num, skuUuid }) {
    let params = getParams({ skuId, bMallTag, num, skuUuid })
    return await this.changeCart(params)
  }
  
  async bMallGetSkuNumApi(needRequest = false, bMallTag = 1) {
    if (!needRequest && window.bMallCartData) {
      return window.bMallCartData
    }
    const cartData = await this.getSkuNumService(bMallTag)
    let items
    if (cartData.ok && cartData.result) {
      items = cartData?.result?.items || {}
    }
    window.bMallCartData = items
    return items
  }
  
  async bMallCartHandle(goodItem, num) {
    try {
      const {
        skuUuid, 
        limitUpper, 
        limitLower, 
      } = goodItem
      let cartNum = Number(num)
      if (limitLower && cartNum && cartNum < limitLower) {
        cartNum = limitLower
      } else if (limitUpper && cartNum && cartNum > limitUpper) {
        cartNum = limitUpper
      }
      if (skuUuid && cartNum > 0) {
        return this.changeCartService({
          ...goodItem,
          skuUuid,
          num: cartNum,
        })
      } else if (!skuUuid && cartNum > 0) {
        return this.addCartService({ ...goodItem, num: cartNum })
      } else if (skuUuid && !cartNum) {
        return this.removeCartService({
          ...goodItem,
          skuUuid,
          num: cartNum,
        })
      } else {
        console.error('参数不全')
        return false
      }
    } catch (e) {
      console.error(e)
    }
  }

package/dist/utils/connectNativeJsBridge.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
+import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  const { displayHeight, offSetY } = res
  if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return
  
  if (isIosDevice) return res
  
  if (isAndroidDevice) {
    const deviceRatio = window.devicePixelRatio
    const cssDisplayHeight = Math.ceil(displayHeight / deviceRatio)
    const cssOffsetY = Math.ceil(offSetY / deviceRatio)
    return {
      displayHeight: cssDisplayHeight,
      offSetY: cssOffsetY
    }
  }

package/dist/utils/utils.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    pinStatus, 
    visitkey,
    unionid,
    skey,
    __jda, 
    __jdv,
    __wga,
    wxapp_type
  } = cookie
    pin,
    pinStatus,
    visitkey,
    unionid,
    skey,
    __jda,
    __jdv,
    __wga,
    wid,
    wq_skey,
    wq_uin,
    wq_auth_token,
    wxapp_scene,
    wq_unionid,
    wxapp_openid,
    wxapp_version,
    wxapp_type
        exceptionReportFn
        exceptionReportFn(
            `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
        )
 const isIsvContainer = (containerId, floorListData, containerListData) => {
    const objContainer = containerListData.find(item => item.containerId === containerId)
            (itemUid) => {
                const objectFloor = floorListData.find(floorItem => itemUid === floorItem.uid)
                return RemoteLoadFloorList.includes(objectFloor?.floorExtInfo?.moduleFlag)
            }
        )?? false
+import Taro from '@tarojs/taro'
    pin?: string
    visitkey?: string
    [key: string]: any
  }
    jdpin,
    pinStatus, 
    visitkey,
    unionid,
    skey,
    __jda, 
    __jdv,
    __wga,
    wxapp_type
  } = cookie
  const getUserCookieObj = {}
    jdpin,
    pinStatus,
    visitkey,
    unionid,
    skey,
    __jda,
    __jdv,
    __wga,
    wid,
    wq_skey,
    wq_uin,
    wq_auth_token,
    wxapp_scene,
    wq_unionid,
    wxapp_openid,
    wxapp_version,
    wxapp_type
      name = name === 'jdpin' ? 'pin' : name;
      name === 'pin' && (ret.push(`pt_pin=${encodeURIComponent(value)}`))
      ret.push(`${name}=${encodeURIComponent(value)}`)
      getUserCookieObj[name] = value
    }
    wqCookie: getUserCookieObj
        exceptionReportFn
        exceptionReportFn(
            `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
        )
 const isIsvContainer = (containerId, floorListData, containerListData) => {
    const objContainer = containerListData.find(item => item.containerId === containerId)
            (itemUid) => {
                const objectFloor = floorListData.find(floorItem => itemUid === floorItem.uid)
                return RemoteLoadFloorList.includes(objectFloor?.floorExtInfo?.moduleFlag)
            }
        )?? false

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@conecli/cone-render",
-	"version": "0.8.19-beta.1",
+	"version": "0.8.19-beta.2",
 	"private": false,
 	"files": [
 		"dist/"