@mpxjs/api-proxy 2.8.28-beta.11 → 2.8.40-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.28-beta.11",
+  "version": "2.8.40-test",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -31,7 +31,7 @@
     "promise"
   ],
   "author": "httpsxiao",
-  "license": "Apache-2.0",
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/didi/mpx/issues"
   },
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "8c7fa579da9c3e71908eb9bfb5833a7d9477505d"
+  "gitHead": "8524f9b69ebcfb0667ebff2608cf6f675f14f141"
 }

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 { genFromMap, getEnvObj, noop } from './utils'
 
 const envObj = getEnvObj()
 
@@ -28,7 +28,9 @@ const blackList = [
   'getMenuButtonBoundingClientRect',
   'reportMonitor',
   'createOffscreenCanvas',
-  'reportEvent'
+  'reportEvent',
+  'connectSocket',
+  'base64ToArrayBuffer'
 ]
 
 function getMapFromList (list) {

package/src/common/js/utils.js

@@ -29,7 +29,6 @@ function changeOpts (options, updateOrRemoveOpt = {}, extraOpt = {}) {
   })
 
   opts = Object.assign({}, opts, extraOpt)
-
   return opts
 }
 
@@ -77,6 +76,31 @@ function getEnvObj () {
       return qa
     case 'dd':
       return dd
+    case 'web':
+      return {}
+  }
+}
+
+function getEnvStr () {
+  switch (__mpx_mode__) {
+    case 'wx':
+      return 'wx'
+    case 'ali':
+      return 'ali'
+    case 'swan':
+      return 'swan'
+    case 'qq':
+      return 'qq'
+    case 'tt':
+      return 'tt'
+    case 'jd':
+      return 'jd'
+    case 'qa':
+      return 'qa'
+    case 'dd':
+      return 'dd'
+    case 'web':
+      return 'web'
   }
 }
 
@@ -87,6 +111,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 () {
 }
@@ -105,7 +134,9 @@ export {
   handleSuccess,
   genFromMap,
   getEnvObj,
+  getEnvStr,
   error,
+  envError,
   warn,
   noop,
   makeMap,

package/src/common/js/web.js

@@ -15,8 +15,24 @@ function isTabBarPage (url, router) {
   return !!tabBarPagesMap[path.slice(1)]
 }
 
+/**
+ * Creates a new DOM element with the specified tag, attributes, and children.
+ *
+ * @param {string} tag - The tag name of the new element.
+ * @param {Object.<string, string>} [attrs={}] - An object containing the attributes to set on the new element.
+ * @param {Array.<HTMLElement>} [children=[]] - An array of child elements to append to the new element.
+ * @returns {HTMLElement} The newly created DOM element.
+ */
+function createDom (tag, attrs = {}, children = []) {
+  const dom = document.createElement(tag)
+  Object.keys(attrs).forEach(k => dom.setAttribute(k, attrs[k]))
+  children.length && children.forEach(child => dom.appendChild(child))
+  return dom
+}
+
 export {
   webHandleSuccess,
   webHandleFail,
+  createDom,
   isTabBarPage
 }

package/src/common/stylus/Preview.styl

@@ -0,0 +1,29 @@
+.__mpx_preview__
+  display none
+  width 100%
+  height 100%
+  background black
+  position fixed
+  top 0
+  left 0
+  z-index 1000
+  .__mpx_preview_tip__
+    position absolute
+    top 0
+    left 50%
+    transform translateX(-50%)
+    color white
+    font-size 48px
+    letter-spacing 0.3em
+  .__mpx_preview_images__
+    display flex
+    width 100%
+    height 100%
+    transition transform 0.3s ease-in-out
+    &>div
+      flex-shrink 0
+      width 100%
+      height 100%
+      background-position center
+      background-size contain
+      background-repeat no-repeat

package/src/index.js

@@ -1,77 +1,3 @@
-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
-    optimize = false // 内部一些实验优化的开关，外部用户慎用
-  } = 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,
-    optimize
-  })
-
-  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 from './install'
+export * from './platform'
+export default install

package/src/install.js

@@ -0,0 +1,56 @@
+import * as platformApi from './platform'
+import { getEnvObj, getEnvStr } 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 = {}, // 自定义转化规则
+    fallbackMap = {} // 对于不支持的API，允许配置一个映射表，接管不存在的API
+  } = options
+
+  let transedApi = {}
+  const envStr = getEnvStr()
+
+  if (__mpx_env__ === 'web') {
+    transedApi = platformApi
+  } else {
+    const envObj = getEnvObj()
+    Object.keys(envObj).concat(Object.keys(platformApi)).forEach((key) => {
+      transedApi[key] = platformApi[key] || envObj[key]
+    })
+  }
+
+  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 方法
+  })
+  if (custom[envStr]) {
+    Object.keys(custom[envStr])
+      .forEach(k => {
+        target[k] = (...args) => {
+          return custom[envStr][k].apply(target, args)
+        }
+      })
+  }
+  // Fallback Map option
+  Object.keys(fallbackMap)
+    .forEach(k => {
+      if (!target[k]) {
+        target[k] = fallbackMap[k]
+      }
+    })
+}

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

@@ -1,9 +1,8 @@
-import { ToPromise, webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail } from '../../../common/js'
 import '../../../common/stylus/ActionSheet.styl'
 
-export default class ActionSheet extends ToPromise {
+export default class ActionSheet {
   constructor () {
-    super()
     this.defaultOpts = {
       itemList: [],
       itemColor: '#000000',
@@ -64,7 +63,6 @@ export default class ActionSheet extends ToPromise {
           tapIndex: index
         }
         webHandleSuccess(res, opts.success, opts.complete)
-        this.toPromiseResolve(res)
       }
       list.appendChild(sheet)
     })
@@ -77,13 +75,10 @@ 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)
     }
 
     this.box.classList.add('show')
     this.actionSheet.classList.add('show')
-
-    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,16 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function canvasToTempFilePath (options = {}) {
+  handleSuccess(options, res => {
+    return changeOpts(
+      res,
+      { errMsg: 'canvasToTempFilePath:ok' }
+    )
+  })
+
+  my.canvasToTempFilePath(options)
+}
+
+export {
+  canvasToTempFilePath
+}

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/{web → platform}/api/create-intersection-observer/IntersectionObserver.js

@@ -97,16 +97,8 @@ class WebIntersectionObserver {
     nextTick(() => {
       const marginsTemp = margins || {}
       const { left = 0, right = 0, top = 0, bottom = 0 } = marginsTemp
-      this._root = document.querySelector('html')
-      const viewportWidth = window.innerWidth || document.documentElement.clientWidth
-      const viewportHeight = window.innerHeight || document.documentElement.clientHeight
-      const rootWidth = this._root.offsetWidth || 0
-      const rootHeight = this._root.offsetHeight || 0
-      if (rootHeight >= viewportHeight) {
-        this._rootMargin = `${top}px ${viewportWidth - rootWidth + right}px ${viewportHeight - rootHeight + bottom}px ${left}px`
-      } else {
-        this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
-      }
+      this._root = null
+      this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
       this._relativeInfo.push({ selector: null, margins })
     })
     return this

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/{web → platform}/api/create-selector-query/SelectQuery.js

@@ -75,7 +75,7 @@ class SelectQuery {
   }
 
   _handleFields (fields, el, selector) {
-    if (!el) return null
+    if (!el || (el && !el.getBoundingClientRect)) return null
     const { id, dataset, rect, size, scrollOffset, properties = [], computedStyle = [], node } = fields
     const { left, right, top, bottom, width, height } = el.getBoundingClientRect()
 
@@ -136,8 +136,16 @@ class SelectQuery {
       }
     }
     if (scrollOffset) {
-      res.scrollLeft = el.scrollLeft
-      res.scrollTop = el.scrollTop
+      if (el.isBScrollContainer) {
+        const bs = el?.__vue__?.bs
+        res.scrollLeft = -bs.x
+        res.scrollTop = -bs.y
+      } else {
+        res.scrollLeft = el.scrollLeft
+        res.scrollTop = el.scrollTop
+      }
+      res.scrollHeight = el.scrollHeight
+      res.scrollWidth = el.scrollWidth
     }
     properties.forEach(prop => {
       const attr = el.getAttribute(prop)