@mpxjs/api-proxy 2.9.13 → 2.9.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.13",
+  "version": "2.9.14",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "2c67b32fe01ff15fc1b728f91b4b5652244c2f35"
+  "gitHead": "e8ab845a544d2db0619a6a7d6c04d9d384d1a6ca"
 }

package/src/common/js/index.js

@@ -1,3 +1,2 @@
-export * from './ToPromise'
 export * from './web'
 export * from './utils'

package/src/{mini → common/js}/promisify.js

@@ -1,4 +1,4 @@
-import { genFromMap, getEnvObj, noop } from '../common/js'
+import { getEnvObj, noop } from './utils'
 
 const envObj = getEnvObj()
 
@@ -29,7 +29,9 @@ const blackList = [
   'getMenuButtonBoundingClientRect',
   'reportMonitor',
   'createOffscreenCanvas',
-  'reportEvent'
+  'reportEvent',
+  'connectSocket',
+  'base64ToArrayBuffer'
 ]
 
 function getMapFromList (list) {
@@ -46,7 +48,6 @@ function promisify (listObj, whiteList, customBlackList) {
   const result = {}
   const whiteListMap = getMapFromList(whiteList)
   const blackListMap = getMapFromList(blackList.concat(customBlackList))
-  const fromMap = genFromMap()
 
   function promisifyFilter (key) {
     if (whiteListMap && whiteListMap[key] !== undefined) {
@@ -68,7 +69,7 @@ function promisify (listObj, whiteList, customBlackList) {
 
     result[key] = function (...args) {
       if (promisifyFilter(key)) {
-        if (!args[0] || fromMap[args[0]]) {
+        if (!args[0]) {
           args.unshift({ success: noop, fail: noop })
         }
         const obj = args[0]

package/src/common/js/utils.js

@@ -29,7 +29,6 @@ function changeOpts (options, updateOrRemoveOpt = {}, extraOpt = {}) {
   })
 
   opts = Object.assign({}, opts, extraOpt)
-
   return opts
 }
 
@@ -50,15 +49,6 @@ const handleSuccess = (opts, getOptions = noop, thisObj) => {
   }
 }
 
-function genFromMap () {
-  const result = {}
-  const platforms = ['wx', 'ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd']
-  platforms.forEach((platform) => {
-    result[`__mpx_src_mode_${platform}__`] = platform
-  })
-  return result
-}
-
 function getEnvObj () {
   switch (__mpx_mode__) {
     case 'wx':
@@ -77,6 +67,8 @@ function getEnvObj () {
       return qa
     case 'dd':
       return dd
+    case 'web':
+      return {}
   }
 }
 
@@ -87,6 +79,11 @@ function warn (msg) {
 function error (msg) {
   console.error && console.error(`[@mpxjs/api-proxy error]:\n ${msg}`)
 }
+function envError (method) {
+  return () => {
+    console.error && console.error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
+  }
+}
 
 function noop () {
 }
@@ -106,9 +103,9 @@ function throwSSRWarning (info) {
 export {
   changeOpts,
   handleSuccess,
-  genFromMap,
   getEnvObj,
   error,
+  envError,
   warn,
   noop,
   makeMap,

package/src/index.js

@@ -1,75 +1,5 @@
-import transformApi from './mini/transform'
-import promisify from './mini/promisify'
-
-export default function install (target, options = {}) {
-  const {
-    usePromise = false, // 是否转为 promise 格式
-    whiteList = [], // 强制变成 promise 格式的 api
-    blackList = [], // 强制不变成 promise 格式的 api
-    platform = {},
-    exclude = ['shareImageMessage'], // 强制不进行代理的api，临时fix微信分享朋友圈白屏
-    custom = {}, // 自定义转化规则
-    fallbackMap = {} // 对于不支持的API，允许配置一个映射表，接管不存在的API
-  } = options
-
-  let { from = '', to = '' } = platform
-  /* eslint-disable camelcase, no-undef */
-  if (typeof __mpx_src_mode__ !== 'undefined') {
-    if (from && from !== __mpx_src_mode__) {
-      console.warn && console.warn('the platform from field inconsistent with the current environment value\n')
-    }
-    from = `__mpx_src_mode_${__mpx_src_mode__}__`
-  } else {
-    if (!from) {
-      from = 'wx'
-      console.warn && console.warn('the platform from field is empty, wx will be used by default\n')
-    }
-    from = `__mpx_src_mode_${from}__`
-  }
-
-  if (typeof __mpx_mode__ !== 'undefined') {
-    to = __mpx_mode__
-  } else if (!to) {
-    console.warn && console.warn('the platform to field is empty, ali will be used by default\n')
-    to = 'wx'
-  }
-  /* eslint-enable */
-
-  const transedApi = transformApi({
-    exclude,
-    from,
-    to,
-    custom
-  })
-
-  const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}
-  const allApi = Object.assign({}, transedApi, promisedApi)
-
-  Object.keys(allApi).forEach(api => {
-    try {
-      if (typeof allApi[api] !== 'function') {
-        target[api] = allApi[api]
-        return
-      }
-
-      target[api] = (...args) => {
-        return allApi[api].apply(target, args)
-      }
-    } catch (e) {
-    } // 支付宝不支持重写 call 方法
-  })
-
-  // Fallback Map option
-  Object.keys(fallbackMap)
-    .forEach(k => {
-      if (!target[k]) {
-        target[k] = fallbackMap[k]
-      }
-    })
-}
-
-export function getProxy (options = {}) {
-  const apiProxy = {}
-  install(apiProxy, options)
-  return apiProxy
-}
+import install, { getProxy } from './install'
+import promisify from './common/js/promisify'
+export * from './platform'
+export { getProxy, promisify }
+export default install

package/src/install.js

@@ -0,0 +1,22 @@
+import * as platformApi from './platform'
+import { getEnvObj } from './common/js'
+import promisify from './common/js/promisify'
+
+export default function install (target, options = {}) {
+  const {
+    usePromise = false, // 是否转为 promise 格式
+    whiteList = [], // 强制变成 promise 格式的 api
+    blackList = [], // 强制不变成 promise 格式的 api
+    custom = {} // 自定义转化规则
+  } = options
+  const envObj = getEnvObj()
+  const transedApi = Object.assign({}, envObj, platformApi)
+  const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}
+  Object.assign(target, transedApi, promisedApi, custom[__mpx_mode__])
+}
+
+export function getProxy (options = {}) {
+  const apiProxy = {}
+  install(apiProxy, options)
+  return apiProxy
+}

package/src/{web → platform}/api/action-sheet/ActionSheet.js

@@ -1,9 +1,9 @@
-import { ToPromise, webHandleSuccess, webHandleFail, createDom, bindTap, getRootElement } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, createDom, bindTap, getRootElement } from '../../../common/js'
 import '../../../common/stylus/ActionSheet.styl'
 
-export default class ActionSheet extends ToPromise {
+export default class ActionSheet {
   constructor () {
-    super()
+    // super()
     this.defaultOpts = {
       itemList: [],
       itemColor: '#000000',
@@ -45,7 +45,7 @@ export default class ActionSheet extends ToPromise {
           tapIndex: index
         }
         webHandleSuccess(res, opts.success, opts.complete)
-        this.toPromiseResolve(res)
+        // this.toPromiseResolve(res)
       }))
       list.appendChild(sheet)
     })
@@ -58,7 +58,7 @@ export default class ActionSheet extends ToPromise {
       this.hide()
       const err = { errMsg: 'showActionSheet:fail cancel' }
       webHandleFail(err, opts.fail, opts.complete)
-      !opts.fail && this.toPromiseReject(err)
+      // !opts.fail && this.toPromiseReject(err)
     }))
     // make transition next frame
     this.actionSheet.classList.add('show')
@@ -67,7 +67,7 @@ export default class ActionSheet extends ToPromise {
       this.box.classList.add('show')
     }, 17)
 
-    return this.toPromiseInitPromise()
+    // return this.toPromiseInitPromise()
   }
 
   hide () {

package/src/platform/api/action-sheet/index.ali.js

@@ -0,0 +1,28 @@
+import { changeOpts, noop } from '../../../common/js'
+function showActionSheet (options = {}) {
+  const opts = changeOpts(options, {
+    itemList: 'items'
+  })
+
+  const cacheSuc = opts.success || noop
+  const cacheFail = opts.fail || noop
+
+  opts.success = function (res) {
+    const sucRes = changeOpts(res, {
+      index: 'tapIndex'
+    })
+    if (sucRes.tapIndex === -1) {
+      cacheFail.call(this, {
+        errMsg: 'showActionSheet:fail cancel'
+      })
+    } else {
+      cacheSuc.call(this, sucRes)
+    }
+  }
+
+  my.showActionSheet(opts)
+}
+
+export {
+  showActionSheet
+}

package/src/platform/api/action-sheet/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const showActionSheet = ENV_OBJ.showActionSheet || envError('showActionSheet')
+
+export {
+  showActionSheet
+}

package/src/platform/api/add-phone-contact/index.ali.js

@@ -0,0 +1,13 @@
+import { changeOpts } from '../../../common/js'
+
+function addPhoneContact (options = {}) {
+  const opts = changeOpts(options, {
+    weChatNumber: 'alipayAccount'
+  })
+
+  my.addPhoneContact(opts)
+}
+
+export {
+  addPhoneContact
+}

package/src/platform/api/add-phone-contact/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const addPhoneContact = ENV_OBJ.addPhoneContact || envError('addPhoneContact')
+
+export {
+  addPhoneContact
+}

package/src/platform/api/animation/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createAnimation = ENV_OBJ.createAnimation || envError('createAnimation')
+
+export {
+  createAnimation
+}

package/src/platform/api/app/index.js

@@ -0,0 +1,24 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const onError = ENV_OBJ.onError || envError('onError')
+
+const offError = ENV_OBJ.offError || envError('offError')
+
+const onAppShow = ENV_OBJ.onAppShow || envError('onAppShow')
+
+const offAppShow = ENV_OBJ.offAppShow || envError('offAppShow')
+
+const onAppHide = ENV_OBJ.onAppHide || envError('onAppHide')
+
+const offAppHide = ENV_OBJ.offAppHide || envError('offAppHide')
+
+export {
+  onAppShow,
+  onAppHide,
+  offAppShow,
+  offAppHide,
+  onError,
+  offError
+}

package/src/platform/api/audio/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createInnerAudioContext = ENV_OBJ.createInnerAudioContext || envError('createInnerAudioContext')
+
+export {
+  createInnerAudioContext
+}

package/src/platform/api/base/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const base64ToArrayBuffer = ENV_OBJ.base64ToArrayBuffer || envError('base64ToArrayBuffer')
+
+const arrayBufferToBase64 = ENV_OBJ.arrayBufferToBase64 || envError('arrayBufferToBase64')
+
+export {
+  base64ToArrayBuffer,
+  arrayBufferToBase64
+}

package/src/platform/api/ble-connection/index.ali.js

@@ -0,0 +1,17 @@
+function closeBLEConnection (options = {}) {
+  my.disconnectBLEDevice(options)
+}
+
+function createBLEConnection (options = {}) {
+  my.connectBLEDevice(options)
+}
+
+function onBLEConnectionStateChange (callback) {
+  my.onBLEConnectionStateChanged(callback)
+}
+
+export {
+  closeBLEConnection,
+  createBLEConnection,
+  onBLEConnectionStateChange
+}

package/src/platform/api/ble-connection/index.js

@@ -0,0 +1,15 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const closeBLEConnection = ENV_OBJ.closeBLEConnection || envError('closeBLEConnection')
+
+const createBLEConnection = ENV_OBJ.createBLEConnection || envError('createBLEConnection')
+
+const onBLEConnectionStateChange = ENV_OBJ.onBLEConnectionStateChange || envError('onBLEConnectionStateChange')
+
+export {
+  closeBLEConnection,
+  createBLEConnection,
+  onBLEConnectionStateChange
+}

package/src/platform/api/canvas/index.ali.js

@@ -0,0 +1,20 @@
+import { changeOpts, envError, handleSuccess } from '../../../common/js'
+
+function canvasToTempFilePath (options = {}) {
+  handleSuccess(options, res => {
+    return changeOpts(
+      res,
+      { errMsg: 'canvasToTempFilePath:ok' }
+    )
+  })
+
+  my.canvasToTempFilePath(options)
+}
+const createCanvasContext = envError('createCanvasContext')
+const canvasGetImageData = envError('canvasGetImageData')
+
+export {
+  createCanvasContext,
+  canvasToTempFilePath,
+  canvasGetImageData
+}

package/src/platform/api/canvas/index.js

@@ -0,0 +1,15 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createCanvasContext = ENV_OBJ.createCanvasContext || envError('createCanvasContext')
+
+const canvasToTempFilePath = ENV_OBJ.canvasToTempFilePath || envError('canvasToTempFilePath')
+
+const canvasGetImageData = ENV_OBJ.canvasGetImageData || envError('canvasGetImageData')
+
+export {
+  createCanvasContext,
+  canvasToTempFilePath,
+  canvasGetImageData
+}

package/src/platform/api/check-session/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const checkSession = ENV_OBJ.checkSession || envError('checkSession')
+
+export {
+  checkSession
+}

package/src/platform/api/clipboard-data/index.ali.js

@@ -0,0 +1,30 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function setClipboardData (options = {}) {
+  const opts = changeOpts(options, {
+    data: 'text'
+  })
+  handleSuccess(opts, res => {
+    return changeOpts(res, {
+      success: ''
+    }, {
+      errMsg: 'setClipboardData:ok'
+    })
+  })
+  my.setClipboard(opts)
+}
+
+function getClipboardData (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { text: 'data' })
+  })
+
+  my.getClipboard(opts)
+}
+
+export {
+  setClipboardData,
+  getClipboardData
+}

package/src/platform/api/clipboard-data/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const setClipboardData = ENV_OBJ.setClipboardData || envError('setClipboardData')
+
+const getClipboardData = ENV_OBJ.getClipboardData || envError('getClipboardData')
+
+export {
+  setClipboardData,
+  getClipboardData
+}

package/src/platform/api/create-intersection-observer/index.ali.js

@@ -0,0 +1,7 @@
+function createIntersectionObserver (component, options = {}) {
+  return my.createIntersectionObserver(options)
+}
+
+export {
+  createIntersectionObserver
+}

package/src/platform/api/create-intersection-observer/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createIntersectionObserver = ENV_OBJ.createIntersectionObserver || envError('createIntersectionObserver')
+
+export {
+  createIntersectionObserver
+}

package/src/platform/api/create-selector-query/index.ali.js

@@ -0,0 +1,35 @@
+import { noop } from '../../../common/js'
+
+function createSelectorQuery (options = {}) {
+  const selectorQuery = my.createSelectorQuery(options)
+  const proxyMethods = ['boundingClientRect', 'scrollOffset']
+  const cbs = []
+  proxyMethods.forEach((name) => {
+    const originalMethod = selectorQuery[name]
+    selectorQuery[name] = function (cb = noop) {
+      cbs.push(cb)
+      return originalMethod.call(this)
+    }
+  })
+
+  const originalExec = selectorQuery.exec
+  selectorQuery.exec = function (originalCb = noop) {
+    const cb = function (results) {
+      results.forEach((item, index) => {
+        cbs[index] && cbs[index](item)
+      })
+      originalCb(results)
+    }
+    return originalExec.call(this, cb)
+  }
+
+  selectorQuery.in = function () {
+    return this
+  }
+
+  return selectorQuery
+}
+
+export {
+  createSelectorQuery
+}

package/src/platform/api/create-selector-query/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createSelectorQuery = ENV_OBJ.createSelectorQuery || envError('createSelectorQuery')
+
+export {
+  createSelectorQuery
+}

package/src/{web → platform}/api/device/network/getNetworkType.js

@@ -1,6 +1,6 @@
 import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../../common/js'
 
-export function getNetworkType ({ success, fail = () => {}, complete = () => {} }) {
+export function getNetworkType ({ success, fail = () => {}, complete = () => {} } = {}) {
   if (!isBrowser) {
     throwSSRWarning('getNetworkType API is running in non browser environments')
     return

package/src/platform/api/device/network/index.js

@@ -0,0 +1,15 @@
+import { getEnvObj, envError } from '../../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const getNetworkType = ENV_OBJ.getNetworkType || envError('getNetworkType')
+
+const onNetworkStatusChange = ENV_OBJ.onNetworkStatusChange || envError('onNetworkStatusChange')
+
+const offNetworkStatusChange = ENV_OBJ.offNetworkStatusChange || envError('offNetworkStatusChange')
+
+export {
+  getNetworkType,
+  onNetworkStatusChange,
+  offNetworkStatusChange
+}

package/src/platform/api/file/index.ali.js

@@ -0,0 +1,35 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function downloadFile (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { apFilePath: 'tempFilePath' })
+  })
+
+  return my.downloadFile(opts)
+}
+
+function uploadFile (options = {}) {
+  const opts = changeOpts(options, { name: 'fileName' })
+
+  return my.uploadFile(opts)
+}
+
+function saveFile (options = {}) {
+  const opts = changeOpts(options, {
+    tempFilePath: 'apFilePath'
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { apFilePath: 'savedFilePath' })
+  })
+
+  my.saveFile(opts)
+}
+
+export {
+  downloadFile,
+  uploadFile,
+  saveFile
+}

package/src/platform/api/file/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const downloadFile = ENV_OBJ.downloadFile || envError('downloadFile')
+
+const uploadFile = ENV_OBJ.uploadFile || envError('uploadFile')
+
+export {
+  downloadFile,
+  uploadFile
+}

package/src/platform/api/get-user-info/index.ali.js

@@ -0,0 +1,18 @@
+import { warn } from '../../../common/js'
+
+const TIPS_NAME = '支付宝环境 mpx'
+
+function getUserInfo (options = {}) {
+  if (options.withCredentials === true) {
+    warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 使用 withCredentials 参数中获取等敏感信息`)
+  }
+  if (options.lang) {
+    warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 中使用 lang 参数`)
+  }
+
+  my.getOpenUserInfo(options)
+}
+
+export {
+  getUserInfo
+}