@mpxjs/api-proxy 2.10.21 → 2.11.0

package/@types/index.d.ts

@@ -15,17 +15,12 @@ type AddParam<O, V extends (...args: any) => any> =
 
 type PickApiValue<T extends keyof WechatMiniprogram.Wx> = Pick<WechatMiniprogram.Wx, T>[T]
 
-interface GetLocationInterface extends WechatMiniprogram.GetLocationOption {
-  aliType?: number
-}
-
 interface RequestPaymentInterface extends WechatMiniprogram.RequestPaymentOption {
   tradeNO?: string
 }
 
 declare module '@mpxjs/core' {
   interface Mpx extends AddPromise<WechatMiniprogram.Wx> {
-    getLocation: AddParam<GetLocationInterface, PickApiValue<'getLocation'>>
     requestPayment: AddParam<RequestPaymentInterface, PickApiValue<'requestPayment'>>
   }
 }
@@ -34,6 +29,7 @@ export const getProxy: (...args: any) => void
 
 export const promisify: (listObj: object, whiteList?: string[], customBlackList?: string[]) => Record<string, any>
 
+export const getLocation: WechatMiniprogram.Wx['getLocation']
 export const showActionSheet: WechatMiniprogram.Wx['showActionSheet']
 export const addPhoneContact: WechatMiniprogram.Wx['addPhoneContact']
 export const onAppShow: WechatMiniprogram.Wx['onAppShow']
@@ -128,6 +124,8 @@ export const clearStorage: WechatMiniprogram.Wx['clearStorage']
 export const clearStorageSync: WechatMiniprogram.Wx['clearStorageSync']
 export const getSystemInfo: WechatMiniprogram.Wx['getSystemInfo']
 export const getSystemInfoSync: WechatMiniprogram.Wx['getSystemInfoSync']
+export const getDeviceInfo: WechatMiniprogram.Wx['getDeviceInfo']
+export const getLaunchOptionsSync: WechatMiniprogram.Wx['getLaunchOptionsSync']
 export const getWindowInfo: WechatMiniprogram.Wx['getWindowInfo']
 export const setTabBarItem: WechatMiniprogram.Wx['setTabBarItem']
 export const setTabBarStyle: WechatMiniprogram.Wx['setTabBarStyle']
@@ -159,6 +157,10 @@ export const onLocationChange: WechatMiniprogram.Wx['onLocationChange']
 export const offLocationChange: WechatMiniprogram.Wx['offLocationChange']
 export const startLocationUpdate: WechatMiniprogram.Wx['startLocationUpdate']
 export const stopLocationUpdate: WechatMiniprogram.Wx['stopLocationUpdate']
+export const onKeyboardHeightChange: WechatMiniprogram.Wx['onKeyboardHeightChange']
+export const offKeyboardHeightChange: WechatMiniprogram.Wx['offKeyboardHeightChange']
+export const hideKeyboard: WechatMiniprogram.Wx['hideKeyboard']
+export const createCameraContext: WechatMiniprogram.Wx['createCameraContext']
 
 declare const install: (...args: any) => any
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.21",
+  "version": "2.11.0",
   "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.10.21",
+    "@mpxjs/utils": "^2.11.0",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
@@ -76,5 +76,5 @@
       "optional": true
     }
   },
-  "gitHead": "a2cbdad9f8dcc376f2098d217485525953b64cd9"
+  "gitHead": "14548ee8e1f00f6be64f848e4fbdab194d642bf6"
 }

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

@@ -10,9 +10,9 @@ let DiscoverPeripheralSubscription = null
 let updateStateSubscription = null
 let discovering = false
 let getDevices = [] // 记录已扫描的设备列表
-const deviceFoundCallbacks = []
+let deviceFoundCallback = null // 仅允许一个回调，重复添加会被覆盖
+let characteristicCallback = null // 仅允许一个回调，重复添加会被覆盖
 const onStateChangeCallbacks = []
-const characteristicCallbacks = []
 const onBLEConnectionStateCallbacks = []
 let characteristicSubscriptions = {}
 const connectedDevices = new Set()
@@ -56,7 +56,10 @@ const removeUpdateStateSubscription = function () {
     updateStateSubscription = null
   }
 }
-const commonFailHandler = function (errMsg, fail, complete) {
+const commonFailHandler = function (errMsg, fail, complete, reason) {
+  if (reason != null) {
+    errMsg = errMsg + ' ' + (reason.message != null ? reason.message : String(reason))
+  }
   const result = {
     errMsg
   }
@@ -80,12 +83,12 @@ function openBluetoothAdapter (options = {}) {
   // 先请求权限，再初始化蓝牙管理器
   bluetoothPermission().then((hasPermissions) => {
     if (!hasPermissions) {
-      commonFailHandler('openBluetoothAdapter:fail no permission', fail, complete)
+      commonFailHandler('openBluetoothAdapter:fail', fail, complete, 'no permission')
       return
     }
 
     if (bleManagerInitialized) {
-      commonFailHandler('openBluetoothAdapter:fail already opened', fail, complete)
+      commonFailHandler('openBluetoothAdapter:fail', fail, complete, 'already opened')
       return
     }
 
@@ -103,17 +106,17 @@ function openBluetoothAdapter (options = {}) {
             success(result)
             complete(result)
           } else {
-            commonFailHandler('openBluetoothAdapter:fail bluetooth not enabled', fail, complete)
+            commonFailHandler('openBluetoothAdapter:fail', fail, complete, 'bluetooth not enabled')
           }
         }).catch((error) => {
-          commonFailHandler('openBluetoothAdapter:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+          commonFailHandler('openBluetoothAdapter:fail', fail, complete, error)
         })
       }, 1000)
     }).catch((error) => {
-      commonFailHandler('openBluetoothAdapter:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+      commonFailHandler('openBluetoothAdapter:fail', fail, complete, error)
     })
-  }).catch(() => {
-    commonFailHandler('openBluetoothAdapter:fail no permission', fail, complete)
+  }).catch((error) => {
+    commonFailHandler('openBluetoothAdapter:fail', fail, complete, error)
   })
 }
 
@@ -150,9 +153,9 @@ function closeBluetoothAdapter (options = {}) {
       BleManager.disconnect(id).catch(() => {})
     })
     connectedDevices.clear()
-    deviceFoundCallbacks.length = 0
+    deviceFoundCallback = null
     onStateChangeCallbacks.length = 0
-    characteristicCallbacks.length = 0
+    characteristicCallback = null
     onBLEConnectionStateCallbacks.length = 0
     if (valueForCharacteristicSubscriptions) {
       valueForCharacteristicSubscriptions.remove()
@@ -194,7 +197,7 @@ function startBluetoothDevicesDiscovery (options = {}) {
   } = options
 
   if (!bleManagerInitialized) {
-    commonFailHandler('startBluetoothDevicesDiscovery:fail ble adapter hans\'t been opened or ble is unavailable.', fail, complete)
+    commonFailHandler('startBluetoothDevicesDiscovery:fail', fail, complete, 'ble adapter hans\'t been opened or ble is unavailable.')
     return
   }
   DiscoverPeripheralSubscription = BleManager.onDiscoverPeripheral((device) => {
@@ -219,13 +222,11 @@ function startBluetoothDevicesDiscovery (options = {}) {
         return
       }
     }
-    deviceFoundCallbacks.forEach(cb => {
-      if (type(cb) === 'Function') {
-        cb({
-          devices: [deviceInfo]
-        })
-      }
-    })
+    if (type(deviceFoundCallback) === 'Function') {
+      deviceFoundCallback({
+        devices: [deviceInfo]
+      })
+    }
     getDevices.push(deviceInfo)
     // 处理设备发现逻辑
   })
@@ -247,7 +248,7 @@ function startBluetoothDevicesDiscovery (options = {}) {
     success(result)
     complete(result)
   }).catch((error) => {
-    commonFailHandler('startBluetoothDevicesDiscovery:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+    commonFailHandler('startBluetoothDevicesDiscovery:fail', fail, complete, error)
   })
 }
 
@@ -256,7 +257,7 @@ function stopBluetoothDevicesDiscovery (options = {}) {
   const { success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
-    commonFailHandler('stopBluetoothDevicesDiscovery:fail ble adapter hans\'t been opened or ble is unavailable.', fail, complete)
+    commonFailHandler('stopBluetoothDevicesDiscovery:fail', fail, complete, 'ble adapter hans\'t been opened or ble is unavailable.')
     return
   }
   removeBluetoothDevicesDiscovery()
@@ -276,21 +277,20 @@ function stopBluetoothDevicesDiscovery (options = {}) {
     success(result)
     complete(result)
   }).catch((error) => {
-    commonFailHandler('stopBluetoothDevicesDiscovery:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+    commonFailHandler('stopBluetoothDevicesDiscovery:fail', fail, complete, error)
   })
 }
 
 function onBluetoothDeviceFound (callback) {
-  if (deviceFoundCallbacks.indexOf(callback) === -1) {
-    deviceFoundCallbacks.push(callback)
+  if (type(callback) !== 'Function') {
+    console.warn('onBluetoothDeviceFound: callback 应为函数，已忽略')
+    return
   }
+  deviceFoundCallback = callback // 只允许一个回调，重复添加被最新覆盖
 }
 
-function offBluetoothDeviceFound (callback) {
-  const index = deviceFoundCallbacks.indexOf(callback)
-  if (index > -1) {
-    deviceFoundCallbacks.splice(index, 1)
-  }
+function offBluetoothDeviceFound () {
+  deviceFoundCallback = null // 移除所有回调（当前仅有一个）
 }
 
 function getConnectedBluetoothDevices (options = {}) {
@@ -298,7 +298,7 @@ function getConnectedBluetoothDevices (options = {}) {
   const { services = [], success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
-    commonFailHandler('getConnectedBluetoothDevices:fail 请先调用 wx.openBluetoothAdapter 接口进行初始化操作', fail, complete)
+    commonFailHandler('getConnectedBluetoothDevices:fail', fail, complete, '请先调用 wx.openBluetoothAdapter 接口进行初始化操作')
     return
   }
 
@@ -314,7 +314,7 @@ function getConnectedBluetoothDevices (options = {}) {
     success(result)
     complete(result)
   }).catch((error) => {
-    commonFailHandler('getConnectedBluetoothDevices:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+    commonFailHandler('getConnectedBluetoothDevices:fail', fail, complete, error)
   })
 }
 
@@ -323,7 +323,7 @@ function getBluetoothAdapterState (options = {}) {
   const { success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
-    commonFailHandler('getBluetoothAdapterState:fail ble adapter need open first.', fail, complete)
+    commonFailHandler('getBluetoothAdapterState:fail', fail, complete, 'ble adapter need open first.')
     return
   }
 
@@ -336,7 +336,7 @@ function getBluetoothAdapterState (options = {}) {
     success(result)
     complete(result)
   }).catch((error) => {
-    commonFailHandler('getBluetoothAdapterState:fail ' + (typeof error === 'string' ? error : ''), fail, complete)
+    commonFailHandler('getBluetoothAdapterState:fail', fail, complete, error)
   })
 }
 function onDidUpdateState () {
@@ -366,6 +366,10 @@ function onDidUpdateState () {
 }
 
 function onBluetoothAdapterStateChange (callback) {
+  if (type(callback) !== 'Function') {
+    console.warn('onBluetoothAdapterStateChange: callback 应为函数，已忽略')
+    return
+  }
   if (!updateStateSubscription) {
     onDidUpdateState()
   }
@@ -374,12 +378,17 @@ function onBluetoothAdapterStateChange (callback) {
   }
 }
 
+// 注意：微信官方文档标识没有标识 API 不支持传入 callback 参数，但实际测试发现支持传入 callback 进行移除指定回调
 function offBluetoothAdapterStateChange (callback) {
-  const index = onStateChangeCallbacks.indexOf(callback)
-  if (index > -1) {
-    onStateChangeCallbacks.splice(index, 1)
+  if (callback == null) {
+    onStateChangeCallbacks.length = 0
+  } else {
+    const index = onStateChangeCallbacks.indexOf(callback)
+    if (index !== -1) {
+      onStateChangeCallbacks.splice(index, 1)
+    }
   }
-  if (deviceFoundCallbacks.length === 0) {
+  if (onStateChangeCallbacks.length === 0) {
     removeUpdateStateSubscription()
   }
 }
@@ -416,8 +425,8 @@ function writeBLECharacteristicValue (options = {}) {
   }
   let writeTypeValue = writeType
   if (!writeType) {
-    // 与小程序拉齐 iOS 未传值的情况优先 write，安卓优先 writeNoResponse 。
-    writeTypeValue = __mpx_mode__ === 'ios' ? 'write' : 'writeNoResponse'
+    // 与小程序拉齐：iOS / 鸿蒙未传值优先 write，安卓优先 writeNoResponse 。
+    writeTypeValue = (__mpx_mode__ === 'ios' || __mpx_mode__ === 'harmony') ? 'write' : 'writeNoResponse'
   }
   // 将ArrayBuffer转换为byte array
   const bytes = Array.from(new Uint8Array(value))
@@ -531,10 +540,15 @@ function notifyBLECharacteristicValueChange (options = {}) {
 
 let valueForCharacteristicSubscriptions = null
 function onBLECharacteristicValueChange (callback) {
+  if (type(callback) !== 'Function') {
+    console.warn('onBLECharacteristicValueChange: callback 应为函数，已忽略')
+    return
+  }
+  characteristicCallback = callback // 只允许一个回调，重复添加被最新覆盖
   const BleManager = require('react-native-ble-manager').default
-  if (characteristicCallbacks.length === 0) {
+  if (!valueForCharacteristicSubscriptions) {
     valueForCharacteristicSubscriptions = BleManager.onDidUpdateValueForCharacteristic((data) => {
-      // 将byte array转换为ArrayBuffer
+      if (type(characteristicCallback) !== 'Function') return
       const buffer = new ArrayBuffer(data.value.length)
       const view = new Uint8Array(buffer)
       data.value.forEach((byte, index) => {
@@ -546,24 +560,14 @@ function onBLECharacteristicValueChange (callback) {
         characteristicId: data.characteristic,
         value: buffer
       }
-      characteristicCallbacks.forEach(cb => {
-        if (type(cb) === 'Function') {
-          cb(result)
-        }
-      })
+      characteristicCallback(result)
     })
   }
-  if (characteristicCallbacks.indexOf(callback) === -1) {
-    characteristicCallbacks.push(callback)
-  }
 }
 
-function offBLECharacteristicValueChange (callback) {
-  const index = characteristicCallbacks.indexOf(callback)
-  if (index > -1) {
-    characteristicCallbacks.splice(index, 1)
-  }
-  if (characteristicCallbacks.length === 0 && valueForCharacteristicSubscriptions) {
+function offBLECharacteristicValueChange () {
+  characteristicCallback = null
+  if (valueForCharacteristicSubscriptions) {
     valueForCharacteristicSubscriptions.remove()
     valueForCharacteristicSubscriptions = null
   }
@@ -572,16 +576,16 @@ function offBLECharacteristicValueChange (callback) {
 function setBLEMTU (options = {}) {
   const BleManager = require('react-native-ble-manager').default
   const { deviceId, mtu, success = noop, fail = noop, complete = noop } = options
-  if (!mtu) {
-    commonFailHandler('setBLEMTU:fail parameter error: parameter.mtu should be Number instead of Undefined;', fail, complete)
+  if (!deviceId && !mtu) {
+    commonFailHandler('setBLEMTU:fail', fail, complete, 'parameter error: parameter.deviceId should be String instead of Undefined;parameter.mtu should be Number instead of Undefined;')
     return
   }
-  if (!deviceId) {
-    commonFailHandler('setBLEMTU:fail parameter error: parameter.deviceId should be String instead of Undefined;', fail, complete)
+  if (!mtu) {
+    commonFailHandler('setBLEMTU:fail', fail, complete, 'parameter error: parameter.mtu should be Number instead of Undefined;')
     return
   }
-  if (!deviceId && !mtu) {
-    commonFailHandler('setBLEMTU:fail parameter error: parameter.deviceId should be String instead of Undefined;parameter.mtu should be Number instead of Undefined;', fail, complete)
+  if (!deviceId) {
+    commonFailHandler('setBLEMTU:fail', fail, complete, 'parameter error: parameter.deviceId should be String instead of Undefined;')
     return
   }
 
@@ -815,6 +819,10 @@ function closeBLEConnection (options = {}) {
 }
 
 function onBLEConnectionStateChange (callback) {
+  if (type(callback) !== 'Function') {
+    console.warn('onBLEConnectionStateChange: callback 应为函数，已忽略')
+    return
+  }
   if (!updateStateSubscription) {
     onDidUpdateState()
   }
@@ -824,9 +832,13 @@ function onBLEConnectionStateChange (callback) {
 }
 
 function offBLEConnectionStateChange (callback) {
-  const index = onBLEConnectionStateCallbacks.indexOf(callback)
-  if (index !== -1) {
-    onBLEConnectionStateCallbacks.splice(index, 1)
+  if (callback == null) {
+    onBLEConnectionStateCallbacks.length = 0
+  } else {
+    const index = onBLEConnectionStateCallbacks.indexOf(callback)
+    if (index !== -1) {
+      onBLEConnectionStateCallbacks.splice(index, 1)
+    }
   }
   if (onBLEConnectionStateCallbacks.length === 0) {
     removeUpdateStateSubscription()

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

@@ -1,6 +1,14 @@
 import NodeRef from './rnNodesRef'
 import { warn, noop } from '@mpxjs/utils'
 
+const HOST_REF = '__mpxHost'
+
+function normalizeNodeRef (ref) {
+  if (!ref) return ref
+  if (ref.__selectRef) return ref.__selectRef(HOST_REF, 'node')
+  if (ref.getNodeInstance) return ref
+}
+
 export default class SelectorQuery {
   constructor () {
     this._component = null
@@ -34,7 +42,12 @@ export default class SelectorQuery {
       warn('SelectQuery.select don\'t support combinator selector, it only supports selector like #a or .a or .a.b now.')
       return new NodeRef([], this, !all)
     }
-    const refs = this._component && this._component.__selectRef(selector, 'node', all)
+    let refs = this._component && this._component.__selectRef(selector, 'all', all)
+    if (Array.isArray(refs)) {
+      refs = refs.map(normalizeNodeRef).filter(Boolean)
+    } else {
+      refs = normalizeNodeRef(refs)
+    }
     return new NodeRef(refs, this, !all)
   }