@mpxjs/api-proxy 2.9.66 → 2.9.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.66",
+  "version": "2.9.69",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,15 +37,13 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.65",
+    "@mpxjs/utils": "^2.9.69",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
     "@ant-design/react-native": "^5.1.3",
     "@react-native-async-storage/async-storage": "^1.23.1",
     "@react-native-community/netinfo": "^11.2.1",
-    "expo-brightness": "~11.8.0",
-    "expo-clipboard": "~6.0.3",
     "react-native-device-info": "^10.13.2",
     "react-native-get-location": "^4.0.1",
     "react-native-haptic-feedback": "^2.3.3",
@@ -55,9 +53,6 @@
     "@react-native-async-storage/async-storage": {
       "optional": true
     },
-    "expo-clipboard": {
-      "optional": true
-    },
     "@react-native-community/netinfo": {
       "optional": true
     },
@@ -73,12 +68,9 @@
     "@ant-design/react-native": {
       "optional": true
     },
-    "expo-brightness": {
-      "optional": true
-    },
     "react-native-haptic-feedback": {
       "optional": true
     }
   },
-  "gitHead": "ff9eb06a3be28538870823cebf813ed56f39bbd7"
+  "gitHead": "e23c51acc4c2ffdd31fcc6c27aae1aed42d1ade2"
 }

package/src/platform/api/next-tick/index.ios.js

@@ -1 +1,7 @@
-export * from './index.ali'
+function nextTick (fn) {
+  Promise.resolve().then(fn)
+}
+
+export {
+  nextTick
+}

package/src/platform/api/request/index.web.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 import RequestTask from './RequestTask'
+import { serialize, buildUrl } from '@mpxjs/utils'
 
 function request (options = { url: '' }) {
   const CancelToken = axios.CancelToken
@@ -8,6 +9,7 @@ function request (options = { url: '' }) {
   const requestTask = new RequestTask(source.cancel)
 
   let {
+    url,
     data = {},
     method = 'GET',
     dataType = 'json',
@@ -18,8 +20,11 @@ function request (options = { url: '' }) {
     fail = null,
     complete = null
   } = options
-
   method = method.toUpperCase()
+  if (method === 'GET') {
+    url = buildUrl(url, data)
+    data = {}
+  }
 
   if (
     method === 'POST' &&
@@ -27,9 +32,7 @@ function request (options = { url: '' }) {
     (header['Content-Type'] === 'application/x-www-form-urlencoded' ||
       header['content-type'] === 'application/x-www-form-urlencoded')
   ) {
-    data = Object.keys(data).reduce((pre, curKey) => {
-      return `${pre}&${encodeURIComponent(curKey)}=${encodeURIComponent(data[curKey])}`
-    }, '').slice(1)
+    data = serialize(data)
   }
 
   /**
@@ -58,7 +61,7 @@ function request (options = { url: '' }) {
    */
   const rOptions = Object.assign(options, {
     method,
-    url: options.url,
+    url,
     data,
     headers: header,
     responseType,

package/src/platform/api/route/index.ios.js

@@ -1,20 +1,6 @@
 import { successHandle, failHandle } from '../../../common/js'
-import { parseQuery } from '@mpxjs/utils'
-
-function parseUrl (url) {
-  let path = url
-  let query = ''
-  const queryIndex = url.indexOf('?')
-  if (queryIndex >= 0) {
-    path = url.slice(0, queryIndex)
-    query = url.slice(queryIndex)
-  }
-  const queryObj = parseQuery(query || '?')
-  return {
-    path,
-    queryObj
-  }
-}
+import { parseUrlQuery as parseUrl } from '@mpxjs/utils'
+import { nextTick } from '../next-tick'
 
 function getBasePath (navigation) {
   if (navigation) {
@@ -90,14 +76,23 @@ function navigateBack (options = {}) {
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
   if (navigation && navigationHelper) {
-    navigation.pop(options.delta || 1)
-    navigationHelper.lastSuccessCallback = () => {
-      const res = { errMsg: 'navigateBack:ok' }
-      successHandle(res, options.success, options.complete)
-    }
-    navigationHelper.lastFailCallback = (msg) => {
-      const res = { errMsg: `navigateBack:fail ${msg}` }
-      failHandle(res, options.fail, options.complete)
+    const delta = options.delta || 1
+    const routeLength = navigation.getState().routes.length
+    if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
+      nextTick(() => {
+        const res = { errMsg: 'navigateBack:ok' }
+        successHandle(res, options.success, options.complete)
+      })
+    } else {
+      navigation.pop(delta)
+      navigationHelper.lastSuccessCallback = () => {
+        const res = { errMsg: 'navigateBack:ok' }
+        successHandle(res, options.success, options.complete)
+      }
+      navigationHelper.lastFailCallback = (msg) => {
+        const res = { errMsg: `navigateBack:fail ${msg}` }
+        failHandle(res, options.fail, options.complete)
+      }
     }
   }
 }

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

@@ -40,9 +40,15 @@ const getDeviceInfo = function () {
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -8,9 +8,15 @@ const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

package/src/platform/api/system/index.web.js

@@ -1,10 +1,6 @@
-import { envError, isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
-function getSystemInfoSync () {
-  if (!isBrowser) {
-    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
-    return
-  }
+const getDeviceInfo = function () {
   const ua = navigator.userAgent.split('(')[1]?.split(')')[0] || ''
   const phones = new Map([
     ['iPhone', /iPhone|iPad|iPod|iOS/i],
@@ -37,20 +33,57 @@ function getSystemInfoSync () {
   } else {
     system = `Android ${ua.replace(/^.*Android ([\d.]+);.*$/, '$1')}`
   }
-
   return {
-    brand: brand,
+    abi: null,
+    deviceAbi: null,
+    benchmarkLevel: null,
+    brand,
     model: brand,
+    system,
+    platform: navigator.platform,
+    cpuType: null,
+    memorySize: null
+  }
+}
+
+const getWindowInfo = function () {
+  return {
     pixelRatio: window.devicePixelRatio,
     screenWidth: window.screen.width,
     screenHeight: window.screen.height,
     windowWidth: document.documentElement.clientWidth,
     windowHeight: document.documentElement.clientHeight,
     statusBarHeight: null,
+    safeArea: null,
+    screenTop: null
+  }
+}
+
+function getSystemInfoSync () {
+  if (!isBrowser) {
+    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
+    return
+  }
+
+  const {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  } = getWindowInfo()
+  const {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  } = getDeviceInfo()
+  const result = Object.assign({
     language: navigator.language,
     version: null,
-    system,
-    platform: navigator.platform,
     fontSizeSetting: null,
     SDKVersion: null,
     benchmarkLevel: null,
@@ -64,9 +97,23 @@ function getSystemInfoSync () {
     notificationSoundAuthorized: null,
     bluetoothEnabled: null,
     locationEnabled: null,
-    wifiEnabled: null,
-    safeArea: null
-  }
+    wifiEnabled: null
+  }, {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  }, {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  })
+  return result
 }
 
 function getSystemInfo (options = {}) {
@@ -79,13 +126,27 @@ function getSystemInfo (options = {}) {
   successHandle(res, options.success, options.complete)
 }
 
-const getDeviceInfo = envError('getDeviceInfo')
+const getEnterOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getEnterOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
-const getWindowInfo = envError('getWindowInfo')
+const getLaunchOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

package/src/platform/api/system/rnSystem.js

@@ -1,48 +1,7 @@
 import DeviceInfo from 'react-native-device-info'
-import { Platform, PixelRatio, Dimensions, StatusBar } from 'react-native'
-import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { successHandle, failHandle, defineUnsupportedProps, getFocusedNavigation } from '../../../common/js'
-
-const getWindowInfo = function () {
-  const dimensionsScreen = Dimensions.get('screen')
-  const navigation = getFocusedNavigation()
-  const insets = {
-    ...initialWindowMetrics?.insets,
-    ...navigation?.insets
-  }
-  let safeArea = {}
-  let { top = 0, bottom = 0, left = 0, right = 0 } = insets
-  if (Platform.OS === 'android') {
-    top = StatusBar.currentHeight || 0
-  }
-  const screenHeight = dimensionsScreen.height
-  const screenWidth = dimensionsScreen.width
-  const layout = navigation?.layout || {}
-  const layoutHeight = layout.height || 0
-  const layoutWidth = layout.width || 0
-  const windowHeight = layoutHeight || screenHeight
-  try {
-    safeArea = {
-      left,
-      right: screenWidth - right,
-      top,
-      bottom: screenHeight - bottom,
-      height: screenHeight - top - bottom,
-      width: screenWidth - left - right
-    }
-  } catch (error) {
-  }
-  const result = {
-    pixelRatio: PixelRatio.get(),
-    windowWidth: layoutWidth || screenWidth,
-    windowHeight, // 取不到layout的时候有个兜底
-    screenWidth: screenWidth,
-    screenHeight: screenHeight,
-    screenTop: screenHeight - windowHeight,
-    safeArea
-  }
-  return result
-}
+import { PixelRatio } from 'react-native'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+import { getWindowInfo } from './rnWindowInfo'
 
 const getSystemInfoSync = function () {
   const windowInfo = getWindowInfo()
@@ -101,7 +60,7 @@ const getSystemInfo = function (options = {}) {
 
 const getDeviceInfo = function () {
   const deviceInfo = {}
-  if (Platform.OS === 'android') {
+  if (__mpx_mode__ === 'android') {
     const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
     deviceInfo.deviceAbi = deviceAbi[0] || null
   }
@@ -116,9 +75,26 @@ const getDeviceInfo = function () {
   return deviceInfo
 }
 
+const getLaunchOptionsSync = function () {
+  const options = global.__mpxEnterOptions || {}
+  const { path, scene, query } = options
+  return {
+    path,
+    scene,
+    query
+  }
+}
+
+const getEnterOptionsSync = function () {
+  const result = getLaunchOptionsSync()
+  return result
+}
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

package/src/platform/api/system/rnWindowInfo.js

@@ -0,0 +1,42 @@
+import { PixelRatio, Dimensions } from 'react-native'
+import { initialWindowMetrics } from 'react-native-safe-area-context'
+import { getFocusedNavigation } from '../../../common/js'
+
+const getWindowInfo = function () {
+  const dimensionsScreen = Dimensions.get('screen')
+  const navigation = getFocusedNavigation()
+  const insets = Object.assign(initialWindowMetrics?.insets, navigation?.insets)
+  let safeArea = {}
+  const { top = 0, bottom = 0, left = 0, right = 0 } = insets
+  const screenHeight = dimensionsScreen.height
+  const screenWidth = dimensionsScreen.width
+  const layout = navigation?.layout || {}
+  const layoutHeight = layout.height || 0
+  const layoutWidth = layout.width || 0
+  const windowHeight = layoutHeight || screenHeight
+  try {
+    safeArea = {
+      left,
+      right: screenWidth - right,
+      top,
+      bottom: screenHeight - bottom,
+      height: screenHeight - top - bottom,
+      width: screenWidth - left - right
+    }
+  } catch (error) {
+  }
+  const result = {
+    pixelRatio: PixelRatio.get(),
+    windowWidth: layoutWidth || screenWidth,
+    windowHeight, // 取不到layout的时候有个兜底
+    screenWidth: screenWidth,
+    screenHeight: screenHeight,
+    screenTop: screenHeight - windowHeight,
+    safeArea
+  }
+  return result
+}
+
+export {
+  getWindowInfo
+}

package/src/platform/index.js

@@ -26,7 +26,7 @@ export * from './api/canvas'
 export * from './api/check-session'
 
 // setClipboardData, getClipboardData
-export * from './api/clipboard-data'
+// export * from './api/clipboard-data'
 
 // createIntersectionObserver
 export * from './api/create-intersection-observer'
@@ -77,7 +77,7 @@ export * from './api/route'
 export * from './api/scan-code'
 
 // setScreenBrightness, getScreenBrightness
-export * from './api/screen-brightness'
+// export * from './api/screen-brightness'
 
 // setNavigationBarTitle, setNavigationBarColor
 export * from './api/set-navigation-bar'
@@ -105,9 +105,6 @@ export * from './api/video'
 // onWindowResize, offWindowResize
 export * from './api/window'
 
-// getEnterOptionsSync
-export * from './api/lifecycle'
-
 // getLocation, openLocation, chooseLocation
 export * from './api/location'
 

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

@@ -1 +0,0 @@
-export * from './rnActionSheet'

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

@@ -1 +0,0 @@
-export * from './index.ios'

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

@@ -1 +0,0 @@
-export * from './index.web'

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

@@ -1 +0,0 @@
-export * from './index.web'

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

@@ -1 +0,0 @@
-export * from './rnClipboard'

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

@@ -1 +0,0 @@
-export * from './index.ios'

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

@@ -1 +0,0 @@
-export * from './rnNetwork'

package/src/platform/api/keyboard/index.android.js

@@ -1 +0,0 @@
-export * from './index'

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

@@ -1,9 +0,0 @@
-import { ENV_OBJ } from '../../../common/js'
-
-function getEnterOptionsSync () {
-  return ENV_OBJ.getEnterOptionsSync()
-}
-
-export {
-  getEnterOptionsSync
-}

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

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

package/src/platform/api/lifecycle/index.web.js

@@ -1,12 +0,0 @@
-import { isBrowser, throwSSRWarning } from '../../../common/js'
-function getEnterOptionsSync () {
-  if (!isBrowser) {
-    throwSSRWarning('getEnterOptionsSync API is running in non browser environments')
-    return
-  }
-  return global.__mpxEnterOptions || {}
-}
-
-export {
-  getEnterOptionsSync
-}

package/src/platform/api/location/index.android.js

@@ -1 +0,0 @@
-export * from './index.ios'

package/src/platform/api/make-phone-call/index.android.js

@@ -1 +0,0 @@
-export * from './rnMakePhone'

package/src/platform/api/modal/index.android.js

@@ -1 +0,0 @@
-export * from './rnModal'

package/src/platform/api/next-tick/index.android.js

@@ -1 +0,0 @@
-export * from './index.ali'

package/src/platform/api/request/index.android.js

@@ -1 +0,0 @@
-export * from './index.web'

package/src/platform/api/route/index.android.js

@@ -1 +0,0 @@
-export * from './index.ios'

package/src/platform/api/screen-brightness/index.android.js

@@ -1 +0,0 @@
-export * from './rnScreenBrightness'

package/src/platform/api/set-navigation-bar/index.android.js

@@ -1 +0,0 @@
-export * from './index.ios'

package/src/platform/api/socket/index.android.js

@@ -1 +0,0 @@
-export * from './index.web'

package/src/platform/api/storage/index.android.js

@@ -1 +0,0 @@
-export * from './rnStorage'

package/src/platform/api/system/index.android.js

@@ -1 +0,0 @@
-export * from './rnSystem'

package/src/platform/api/toast/index.android.js

@@ -1 +0,0 @@
-export * from './rnToast'

package/src/platform/api/vibrate/index.android.js

@@ -1 +0,0 @@
-export * from './index.ios'

package/src/platform/api/window/index.android.js

@@ -1 +0,0 @@
-export * from './rnWindow'