@conecli/cone-render 0.8.33 → 0.8.35-beta.0

package/dist/service/bMallConst.ts

@@ -1 +1 @@
-import { isAndroidDevice } from '../utils'
  buId: '',
  console.log('getBMallUserInfo')
  if (!isApp('jdb')) {
    return null
  }
  if (bMallUserInfo) {
    return new Promise((resolve) => resolve(bMallUserInfo))
  }
  const requestTimeoutPromise = new Promise((resolve) => {
    setTimeout(() => {
      resolve({})
    }, 3000)
  })
  const userInfoPromise = new Promise((resolve) => {
    let result: any = {}
    try {
      if (isAndroidDevice) {
        result = JSON.parse(
          window.WebViewCommon && window.WebViewCommon.getUserInfo(),
        )
        bMallUserInfo = result
        commonParam.buId = result?.data?.buId
        resolve(result)
      } else {
        window.getUserInfoCallBack = null
        window.getUserInfoCallBack = function (callBackJson) {
          if (callBackJson) {
            result.data = JSON.parse(callBackJson)
            bMallUserInfo = result
            commonParam.buId = result?.data?.buId
            resolve(result)
          }
        }
        window?.webkit?.messageHandlers?.WebViewCommon?.postMessage({
          businessType: 'router://com.jd.jlstudio/getUserInfo', 
          params: {}, 
          callBackName: 'getUserInfoCallBack', 
          method: 'callRouterModuleWithParams',
        })
      }
    } catch (e) {
      resolve(result)
    }
  })
  return Promise.race([userInfoPromise, requestTimeoutPromise])
  process.env.NODE_ENV === 'development'
    ? {
        apolloId: '48ee955b0fb04d19b9f9fe8cb73d387f',
        apolloSecret: '0d9c76ee66b0487da4e17d3cf1d7af7a',
      }
    : {
        apolloId: '80c46fd06e4442998609d9f6a4ab96f0',
        apolloSecret: 'f36bef08bcba4683b409732095793fb2',
      }
  if (typeof window.crypto === 'object') {
    if (typeof (window.crypto as any).randomUUID === 'function') {
      return (window.crypto as any).randomUUID()
    }
    if (
      typeof (window.crypto as any).getRandomValues === 'function' &&
      typeof Uint8Array === 'function'
    ) {
      const callback = (c) => {
        const num = Number(c)
        return (
          num ^
          ((window.crypto as any).getRandomValues(new Uint8Array(1))[0] &
            (15 >> (num / 4)))
        ).toString(16)
      }
      return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, callback)
    }
  }
  let timestamp = new Date().getTime()
  let perforNow =
    (typeof window.performance !== 'undefined' &&
      window.performance.now &&
      window.performance.now() * 1000) ||
    0
  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
    let random = Math.random() * 16
    if (timestamp > 0) {
      random = (timestamp + random) % 16 | 0
      timestamp = Math.floor(timestamp / 16)
    } else {
      random = (perforNow + random) % 16 | 0
      perforNow = Math.floor(perforNow / 16)
    }
    return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16)
  })
  skuId,
  bMallTag = 1,
  num,
  skuUuid,
  ...otherGoodParams
  let buId = commonParam.buId
  if (!buId) {
    const useInfo: any = await getBMallUserInfo()
    buId = useInfo?.data?.buId
  }
  let params: any = {
    uniformBizInfo: {
      tenantId: 1024,
      ua: 1,
      buId: buId || 456,
      bMallTag: bMallTag,
    },
    commonParam: {
      pid: 100,
      verticalCode: 'cn_retail_bmall',
      ua: 1,
      language: 'zh',
    },
    operations: [{ TheSkus: [{ Id: skuId, num: num ?? 1 }] }],
    apolloId: APOLLO.apolloId,
    apolloSecret: APOLLO.apolloSecret,
    client: 'H5',
    verticalTag: 'cn_retail_bmall',
    carttype: bMallTag == 1 ? 21 : 22,
    bMallTag: bMallTag,
    traceId: getUuid(),
    noResponse: true,
  }
  if (skuUuid) {
    params.operations[0].TheSkus[0].skuUuid = skuUuid
  }
  if (otherGoodParams.buId) {
    const uniformBizInfo = {
      buId: otherGoodParams.buId,
    }
    params.operations[0].TheSkus[0].uniformBizInfo = uniformBizInfo
  }
  if (window?.siteTransResult?.gridInfoList) {
    params = {
      ...params,
      cartLocationList: [
        {
          gridInfos:
            window?.siteTransResult?.gridInfoList &&
            JSON.parse(window?.siteTransResult?.gridInfoList),
          areaIdSet:
            window?.siteTransResult?.area &&
            window?.siteTransResult?.area?.split('-'),
        },
      ],
    }
  }
  return params
+import { isAndroidDevice } from '../utils'
  buId: '',
  console.log('getBMallUserInfo')
  if (!(isApp('jdb') || isApp('jdjch'))) {
    return null
  }
  if (bMallUserInfo) {
    return new Promise((resolve) => resolve(bMallUserInfo))
  }
  const requestTimeoutPromise = new Promise((resolve) => {
    setTimeout(() => {
      resolve({})
    }, 3000)
  })
  const userInfoPromise = new Promise((resolve) => {
    let result: any = {}
    try {
      if(isApp('jdjch')) {
        const { user } = window['@jd/jdb-jssdk-b2b'] || {}
        user && user.getUserInfo().then((res) => {
          resolve(res?.data || {})
        })
      }else {
        if (isAndroidDevice) {
          result = JSON.parse(
            window.WebViewCommon && window.WebViewCommon.getUserInfo(),
          )
          bMallUserInfo = result
          commonParam.buId = result?.data?.buId
          resolve(result)
        } else {
          window.getUserInfoCallBack = null
          window.getUserInfoCallBack = function (callBackJson) {
            if (callBackJson) {
              result.data = JSON.parse(callBackJson)
              bMallUserInfo = result
              commonParam.buId = result?.data?.buId
              resolve(result)
            }
          }
          window?.webkit?.messageHandlers?.WebViewCommon?.postMessage({
            businessType: 'router://com.jd.jlstudio/getUserInfo', 
            params: {}, 
            callBackName: 'getUserInfoCallBack', 
            method: 'callRouterModuleWithParams',
          })
        }
      }
    } catch (e) {
      resolve(result)
    }
  })
  return Promise.race([userInfoPromise, requestTimeoutPromise])
  process.env.NODE_ENV === 'development'
    ? {
        apolloId: '48ee955b0fb04d19b9f9fe8cb73d387f',
        apolloSecret: '0d9c76ee66b0487da4e17d3cf1d7af7a',
      }
    : {
        apolloId: '80c46fd06e4442998609d9f6a4ab96f0',
        apolloSecret: 'f36bef08bcba4683b409732095793fb2',
      }
  if (typeof window.crypto === 'object') {
    if (typeof (window.crypto as any).randomUUID === 'function') {
      return (window.crypto as any).randomUUID()
    }
    if (
      typeof (window.crypto as any).getRandomValues === 'function' &&
      typeof Uint8Array === 'function'
    ) {
      const callback = (c) => {
        const num = Number(c)
        return (
          num ^
          ((window.crypto as any).getRandomValues(new Uint8Array(1))[0] &
            (15 >> (num / 4)))
        ).toString(16)
      }
      return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, callback)
    }
  }
  let timestamp = new Date().getTime()
  let perforNow =
    (typeof window.performance !== 'undefined' &&
      window.performance.now &&
      window.performance.now() * 1000) ||
    0
  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
    let random = Math.random() * 16
    if (timestamp > 0) {
      random = (timestamp + random) % 16 | 0
      timestamp = Math.floor(timestamp / 16)
    } else {
      random = (perforNow + random) % 16 | 0
      perforNow = Math.floor(perforNow / 16)
    }
    return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16)
  })
  skuId,
  bMallTag = 1,
  num,
  skuUuid,
  ...otherGoodParams
  let buId = commonParam.buId
  if (!buId) {
    const useInfo: any = await getBMallUserInfo()
    buId = useInfo?.data?.buId
  }
  let params: any = {
    uniformBizInfo: {
      tenantId: 1024,
      ua: 1,
      buId: buId || 456,
      bMallTag: bMallTag,
    },
    commonParam: {
      pid: 100,
      verticalCode: 'cn_retail_bmall',
      ua: 1,
      language: 'zh',
    },
    operations: [{ TheSkus: [{ Id: skuId, num: num ?? 1 }] }],
    apolloId: APOLLO.apolloId,
    apolloSecret: APOLLO.apolloSecret,
    client: 'H5',
    verticalTag: 'cn_retail_bmall',
    carttype: bMallTag == 1 ? 21 : 22,
    bMallTag: bMallTag,
    traceId: getUuid(),
    noResponse: true,
  }
  if (skuUuid) {
    params.operations[0].TheSkus[0].skuUuid = skuUuid
  }
  if (otherGoodParams.buId) {
    const uniformBizInfo = {
      buId: otherGoodParams.buId,
    }
    params.operations[0].TheSkus[0].uniformBizInfo = uniformBizInfo
  }
  if (window?.siteTransResult?.gridInfoList) {
    params = {
      ...params,
      cartLocationList: [
        {
          gridInfos:
            window?.siteTransResult?.gridInfoList &&
            JSON.parse(window?.siteTransResult?.gridInfoList),
          areaIdSet:
            window?.siteTransResult?.area &&
            window?.siteTransResult?.area?.split('-'),
        },
      ],
    }
  }
  return params

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] || {}
  PAGE_PV_PARAM: 'pagePvParam', 
  NATIVE_SCORLL_VIEW: 'nativeScrollControl', 
    OPEN: 'open',
  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
    }
  }
+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 { shopHomeExtendInfo } = options
    if(shopHomeExtendInfo) {
      Taro.eventCenter.trigger(TaroEventType.UPDATE_SHOP_HOME_EXTEND_DATA,shopHomeExtendInfo)
    }
 }
  window && window.scrollTo(0, 0);
 }
  PAGE_PV_PARAM: 'pagePvParam', 
  NATIVE_SCORLL_VIEW: 'nativeScrollControl', 
  NATIVE_PUSH_NATIVE_PAGE: 'pushNativePage', 
  UPDATE_NATIVE_DATA: 'updateNativeData', 
  H5_TO_SCROLL_TOP: 'h5ToScrollTop', 
    OPEN: 'open',
      newHomePage: true, 
            case Message_Type.UPDATE_NATIVE_DATA:
              console.log('接收到原生通知 UPDATE_NATIVE_DATA',messageData)
              console.log('接收到原生通知 UPDATE_NATIVE_DATA getSendJsonData',getSendJsonData)
              taroEventUpdateNativeData(getSendJsonData)
              break;
            case Message_Type.H5_TO_SCROLL_TOP:
              taroEventH5ToScrollTop()
  nativePageRegisterMessage(Message_Type.NATIVE_PUSH_NATIVE_PAGE, {
    data: params,
  })
  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/connectNativeJsBridge.weapp.ts

@@ -1 +1 @@
-import Taro from "@tarojs/taro";
+import Taro from "@tarojs/taro";

package/dist/utils/h5Utils.ts

@@ -1 +1 @@
-import {
    isApp,
    isIOS,
    getAppVersion,
    version,
    getUUID,
    getUrlQuery,
    assign,
    isString,
    isObject,
    serialize,
    isAndroid,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    parseQueryUrlString(window?.location?.href ?? ''),
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
    if (isJdApp) {
        isIosDevice
            ? e && e.stopPropagation()
            : androidDeviceStopNativeScrollEvent(state)
    }
    isJdApp &&
        isAndroidDevice &&
        window?.JdAndroid &&
        window?.JdAndroid.requestEvent(state)
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
    isH5 && ['/app/home', '/app/classify', '/member/shopcard'].includes(urlPathname)
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}
+import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid, versionCompare,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    parseQueryUrlString(window?.location?.href ?? ''),
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
    if (isJdApp) {
        isIosDevice
            ? e && e.stopPropagation()
            : androidDeviceStopNativeScrollEvent(state)
    }
    isJdApp &&
        isAndroidDevice &&
        window?.JdAndroid &&
        window?.JdAndroid.requestEvent(state)
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
    isH5 && ['/app/home', '/app/classify', '/member/shopcard'].includes(urlPathname)
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}