@conecli/cone-render 0.8.25-beta.0 → 0.8.25

package/dist/api/index.ts

@@ -1 +1 @@
-import { protocol, isBetaServer, isH5 } from '../config/env'
    mobileLogin: `${protocol}//conecli.com`, 
+import { protocol, isBetaServer, isH5 } from '../config/env'
    mobileLogin: `${protocol}//plogin.m.jd.com`, 

package/dist/common/token/const.ts

@@ -1 +1 @@
-export const TokenPlatform = {
  TYPE_JDAPP: '01', 
  TYPE_WQ: '02', 
  TYPE_M: '03', 
  TYPE_OTHER: '-1', 
+export const TokenPlatform = {
  TYPE_JDAPP: '01', 
  TYPE_WQ: '02', 
  TYPE_M: '03', 
  TYPE_OTHER: '-1', 
  TYPE_ISVDEV: 'isvdev', 
  TYPE_ISV_PACK_SAMPLE: 'isvPackSample', 
  TYPE_ZXDESIGNER: 'zxdesigner', 
  TYPE_JSHOPX: 'jshopx', 
  TYPE_PAGES: 'pages', 

package/dist/common/token/index.h5.ts

@@ -1 +1 @@
-import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    console.log('isSDKM:', window?.page_data?.isSDKM)
    if (platform === TokenPlatform.TYPE_JDAPP) {
      import('./token.jd')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.isLogin) {
        proxy?.isLogin().then((data: boolean) => {
          resolve(data)
        })
      } else {
        resolve(false)
      }
    })
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.getIsvToken) {
        proxy?.getIsvToken().then((data: string) => {
          resolve(data)
        })
      } else {
        resolve('')
      }
    })
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.toLogin) {
        proxy?.toLogin(options)
        resolve(true)
      } else {
        resolve(false)
      }
    })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if ((isApp('wx') && isApp('mp')) || window?.page_data?.isSDKM) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
+import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      import('./token.jd')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.isLogin) {
        proxy?.isLogin().then((data: boolean) => {
          resolve(data)
        })
      } else {
        resolve(false)
      }
    })
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.getIsvToken) {
        proxy?.getIsvToken().then((data: string) => {
          resolve(data)
        })
      } else {
        resolve('')
      }
    })
  })
  return new Promise((resolve) => {
    loadTokenPromise.then((proxy: any) => {
      if (proxy?.toLogin) {
        proxy?.toLogin(options)
        resolve(true)
      } else {
        resolve(false)
      }
    })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''

package/dist/common/token/index.ts

@@ -1 +1 @@
-import { TokenPlatform } from './const'
  return new Promise((resolve) => {
    console.log('isLogin暂未实现')
    resolve(false)
  })
  return new Promise((resolve) => {
    console.log('getIsvToken暂未实现')
    resolve('')
  })
  return new Promise((resolve) => {
    console.log('toLogin暂未实现')
    resolve(false)
  })
  let platform = TokenPlatform.TYPE_OTHER
  return platform
+import { TokenPlatform } from './const'
  return new Promise((resolve) => {
    console.log('isLogin暂未实现')
    resolve(false)
  })
  return new Promise((resolve) => {
    console.log('getIsvToken暂未实现')
    resolve('')
  })
  return new Promise((resolve) => {
    console.log('toLogin暂未实现')
    resolve(false)
  })
  return TokenPlatform.TYPE_OTHER
  return ''
  return ''

package/dist/common/token/token.jd.ts

@@ -1 +1 @@
-console.log('load token.jd')
  return new Promise((resolve) => {
    if (jmfe) {
      jmfe.isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (jmfe) {
    jmfe.toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (jmfe) {
      jmfe.requestIsvToken(url).then(({ status, data, msg }) => {
        if (status === '0') {
          resolve(data || '')
        } else {
          resolve('')
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve('')
    }
  })
+console.log('load token.jd')
  return new Promise((resolve) => {
    if (jmfe) {
      jmfe.isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (jmfe) {
    jmfe.toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (jmfe) {
    console.log('registerCode:', code)
    jmfe.registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (jmfe) {
      jmfe
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })

package/dist/common/token/token.ts

@@ -1 +1 @@
-console.log('load token')
  return new Promise((resolve) => {
    console.log('isLogin暂未实现')
    resolve(false)
  })
  return new Promise((resolve) => {
    console.log('getIsvToken暂未实现')
    resolve('')
  })
  console.log('toLogin暂未实现')
+import { domain } from '../../api'
  return window?.page_data?.pageChannel || ''
  return new Promise((resolve) => {
    const channel = getPageChannel()
    if (
      channel === PageChannel.TYPE_ISVDEV ||
      channel === PageChannel.TYPE_ISV_PACK_SAMPLE
    ) {
      getIsvToken().then((token) => {
        console.log('isLogin token：' + token)
        if (token) {
          resolve(true)
        } else {
          resolve(false)
        }
      })
    } else {
      const isLogin: string = `${domain.mobileLogin}/cgi-bin/ml/islogin`
      fetchJsonp(isLogin)
        .then((response: any) => {
          return response.json()
        })
        .then((data) => {
          console.log('data:', data)
          if (data?.islogin === '1') {
            resolve(true)
          } else {
            resolve(false)
          }
        })
        .catch((e) => {
          console.log('fetchJsonp cgi-bin/ml/islogin error:', e.message)
          resolve(false)
        })
    }
  })
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      {},
    )
      .then((data: any) => {
        console.log('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve(data?.data?.token)
        } else {
          resolve('')
        }
      })
      .catch((e: { message: any }) => {
        console.log('fetchGateway isvObfuscator error:' + e.message)
        resolve('')
      })
  })
  const defaultParams = {
    appid: '100',
    returnurl: window.location.href,
  }
  const params = Object.assign({}, defaultParams, options)
  params.returnurl = encodeURIComponent(params.returnurl)
  const loginUrl = `${domain.mobileLogin}/user/login.action?${serialize(
    params,
  )}`
  console.log('loginUrl:', loginUrl)
  window.location.href = loginUrl

package/dist/common/token/token.wxapp.ts

@@ -1 +1 @@
-import cookie from '../../utils/jm-cookie'
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token')
    resolve(!!token)
  })
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token') || ''
    resolve(token)
  })
  const returnurl = options?.returnurl || window.location.href
  pinTokenRedirect(WXAPP_BIZ_KEY, returnurl)
  const url = `
  ${domain.wq}/pinbind/pintokenredirect?biz=${biz}&url=${encodeURIComponent(
    targetUrl,
  )}`
  console.log('pinTokenRedirect:', url)
  window.location.href = url
+import cookie from '../../utils/jm-cookie'
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token')
    resolve(!!token)
  })
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token') || ''
    resolve(token)
  })
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      { loginType: 1, loginWQBiz: WXAPP_BIZ_KEY },
    )
      .then((data: any) => {
        console.warn('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve(data?.data?.token)
        } else {
          resolve('')
        }
      })
      .catch((e: { message: any }) => {
        console.warn('fetchGateway isvObfuscator error:' + e.message)
        resolve('')
      })
  })
  const returnurl = options?.returnurl || window.location.href
  pinTokenRedirect(WXAPP_BIZ_KEY, returnurl)
  const url = `
  ${domain.wq}/pinbind/pintokenredirect?biz=${biz}&url=${encodeURIComponent(
    targetUrl,
  )}`
  console.log('pinTokenRedirect:', url)
  window.location.href = url

package/dist/open/api/index.ts

@@ -1 +1 @@
-import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  shopMember,
  userToken,
  TokenPlatform,
+import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  shopMember,
  userToken,
  TokenPlatform,

package/dist/open/api/userToken.ts

@@ -0,0 +1 @@
+import {
  getIsvToken,
  getPlatform,
  getSource,
  getPageChannel,
  const channel = getPageChannel()
  if (
    channel === PageChannel.TYPE_ZXDESIGNER ||
    channel === PageChannel.TYPE_JSHOPX
  ) {
    return true
  }
  return false

package/dist/service/fetchGateway.ts

@@ -0,0 +1 @@
+import { api } from '../api'
  clientVersion: '11.0.0',
  client: 'wh5',
  area: '1_72_2799_0',
  loginType: '2',
  uuid: UUID,
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(body),
    },
    clientParams,
    options,
  )
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
  )
  return http.post(api.apiFunc, params, requestOptions)

package/dist/service/fetchJsonp.ts

@@ -0,0 +1 @@
+const defaultOptions = {
  timeout: 5000,
  jsonpCallback: 'callback',
  return `jsonp_${Date.now()}_${Math.ceil(Math.random() * 100000)}`
  try {
    delete window[functionName]
  } catch (e) {
    window[functionName] = undefined
  }
  const script = document.getElementById(scriptId)
  document.getElementsByTagName('head')[0].removeChild(script)
  const timeout =
    
    options.timeout != null ? options.timeout : defaultOptions.timeout
  const jsonpCallback =
    
    options.jsonpCallback != null 
      ? options.jsonpCallback
      : defaultOptions.jsonpCallback
  let timeoutId: string | number | NodeJS.Timeout | undefined
  return new Promise((resolve, reject) => {
    const callbackFunction = generateCallbackFunction()
    window[callbackFunction] = function (response: any) {
      resolve({
        ok: true,
        json: function () {
          return Promise.resolve(response)
        },
      })
      if (timeoutId) clearTimeout(timeoutId)
      removeScript(jsonpCallback + '_' + callbackFunction)
      clearFunction(callbackFunction)
    }
    url += url.indexOf('?') === -1 ? '?' : '&'
    const jsonpScript = document.createElement('script')
    jsonpScript.setAttribute(
      'src',
      url + jsonpCallback + '=' + callbackFunction,
    )
    jsonpScript.id = jsonpCallback + '_' + callbackFunction
    document.getElementsByTagName('head')[0].appendChild(jsonpScript)
    timeoutId = setTimeout(() => {
      reject(new Error(`JSONP request to ${url} timed out`))
      clearFunction(callbackFunction)
      removeScript(jsonpCallback + '_' + callbackFunction)
    }, timeout)
  })

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
        }
    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
        }
    )
  }
+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: otherHeader, ...otherOpts } = otherOptions
    const header = {
      'content-type':
        method === 'POST'
          ? RequestHeaderContentType.formDataHeader
          : RequestHeaderContentType.jsonHeader,
      ...otherHeader,
    }
    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
      },
    )
  }

package/dist/service/http/httpInterceptors.jd.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
  const requestParams = chain.requestParams
  const { header } = requestParams
  const userInfo = global?.info?.userInfo
  console.log('获取用户信息', userInfo)
  if (userInfo) {
    header[
      'Cookie'
    ] = `pin=${userInfo.encodePin};ticket=${userInfo.ptkey};pt_pin=${userInfo.encodePin};pt_key=${userInfo.ptkey};${global.info.cookiesStr}`
  }
  return chain.proceed(requestParams).then((res) => {
    if (res.statusCode === HttpStatus.SUCCESS) {
      return res
    } else {
      return {
        statusCode: res.statusCode,
        msg: httpStatusMsg[res.statusCode] || defaultHttpStatusMsg,
      }
    }
  })

package/dist/service/http/httpInterceptors.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
  const requestParams = chain.requestParams
  return chain.proceed(requestParams).then((res) => {
    if (res.statusCode === HttpStatus.SUCCESS) {
      return res
    } else {
      return {
        statusCode: res.statusCode,
        msg: httpStatusMsg[res.statusCode] || defaultHttpStatusMsg,
      }
    }
  })

package/package.json

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