@mpxjs/api-proxy 2.9.67 → 2.9.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.67",
+  "version": "2.9.69",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.67",
+    "@mpxjs/utils": "^2.9.69",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
@@ -72,5 +72,5 @@
       "optional": true
     }
   },
-  "gitHead": "b23d3850c16543c5998811b8d1d8e6ee7988c0f8"
+  "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/route/index.ios.js

@@ -1,5 +1,6 @@
 import { successHandle, failHandle } from '../../../common/js'
 import { parseUrlQuery as parseUrl } from '@mpxjs/utils'
+import { nextTick } from '../next-tick'
 
 function getBasePath (navigation) {
   if (navigation) {
@@ -75,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

@@ -75,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/index.js

@@ -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/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
-}