feat: 修改msg错误以及routerweb下没有在特定位置return,以及一些其他问题

Author: wangxiaokou

.agents/skills/mpx2rn/references/rn-api-reference.md

@@ -1730,7 +1730,7 @@ mpx.config.rnConfig.bluetoothPermission = () => {
 | `stopWifi` | 结束 Wi‑Fi 模块并清空列表监听；RN iOS 目标直接走 `fail`。 | RN Android 成功时为 `{ errMsg: 'stopWifi:ok' }`。 |
 | `getWifiList` | `startWifi` 就绪后扫描热点，通过 `onGetWifiList` 交付列表；RN iOS 目标直接走 `fail`。 | `success`：`{ errMsg: 'getWifiList:ok', errno: 0, errCode: 0 }`；热点列表不在此载荷中。 |
 | `onGetWifiList` | 注册接收热点列表的回调。 | `{ wifiList }`；每项含 `SSID`、`BSSID`、`frequency`、`signalStrength`。 |
-| `offGetWifiList` | 移除热点列表回调。 | 传入与注册时同一 `callback`；当前实现不支持省略参数清空全部。 |
+| `offGetWifiList` | 移除热点列表回调。 | 传入与注册时同一 `callback`；省略参数清空全部。 |
 | `getConnectedWifi` | 读取当前已连接 Wi‑Fi；支持 `partialInfo`，且需先 `startWifi` 成功就绪。 | `{ errMsg: 'getConnectedWifi:ok', wifi }`；`wifi` 含 `SSID`、`BSSID`、`signalStrength`、`frequency`。 |
 
 Wi-Fi API 的成功 `errMsg` 与微信文档保持一致，均以 `:ok` 结尾。

packages/api-proxy/__tests__/ali/set-navigation-bar.spec.js

@@ -0,0 +1,30 @@
+import { ENV_OBJ } from '../../src/common/js'
+import { setNavigationBarTitle } from '../../src/platform/api/set-navigation-bar/index.ali'
+
+jest.mock('../../src/common/js/index', () => {
+  const actual = jest.requireActual('../../src/common/js/index')
+  return Object.assign({}, actual, {
+    ENV_OBJ: {
+      canIUse: jest.fn(() => true),
+      setNavigationBarTitle: jest.fn()
+    }
+  })
+})
+
+describe('Ali setNavigationBarTitle', () => {
+  test('should normalize the success errMsg', () => {
+    const success = jest.fn()
+    ENV_OBJ.setNavigationBarTitle.mockImplementation(({ success }) => {
+      success({})
+    })
+
+    setNavigationBarTitle({
+      title: 'title',
+      success
+    })
+
+    expect(success).toHaveBeenCalledWith({
+      errMsg: 'setNavigationBarTitle:ok'
+    })
+  })
+})

packages/api-proxy/__tests__/rn/ble-connection.spec.js

@@ -109,4 +109,18 @@ describe('RN BLE connection APIs', () => {
     }))
     expect(BleManager.requestMTU).not.toHaveBeenCalled()
   })
+
+  test.each([false, 0, ''])('generic parameter check should reject invalid value %p', (value) => {
+    const fail = jest.fn()
+    const complete = jest.fn()
+
+    getBLEDeviceRSSI({ deviceId: value, fail, complete })
+
+    expect(fail).toHaveBeenCalledWith({
+      errMsg: 'getBLEDeviceRSSI:fail parameter error',
+      errno: 1509000
+    })
+    expect(complete).toHaveBeenCalled()
+    expect(BleManager.readRSSI).not.toHaveBeenCalled()
+  })
 })

packages/api-proxy/__tests__/rn/camera.spec.js

@@ -0,0 +1,32 @@
+import CameraContext from '../../src/platform/api/camera/rnCamera'
+
+describe('RN CameraContext', () => {
+  test('setZoom should invoke fail only when the native method throws', () => {
+    const cameraContext = new CameraContext()
+    const success = jest.fn()
+    const fail = jest.fn()
+    const complete = jest.fn()
+    cameraContext.camera = {
+      setZoom: jest.fn(() => {
+        throw new Error('set zoom failed')
+      })
+    }
+
+    cameraContext.setZoom({
+      zoom: 2,
+      success,
+      fail,
+      complete
+    })
+
+    expect(cameraContext.camera.setZoom).toHaveBeenCalledWith(2)
+    expect(success).not.toHaveBeenCalled()
+    expect(fail).toHaveBeenCalledWith({
+      errMsg: 'setZoom:fail set zoom failed'
+    })
+    expect(complete).toHaveBeenCalledTimes(1)
+    expect(complete).toHaveBeenCalledWith({
+      errMsg: 'setZoom:fail set zoom failed'
+    })
+  })
+})

packages/api-proxy/__tests__/rn/keyboard.spec.js

@@ -9,17 +9,20 @@ const mockAddListener = jest.fn(eventName => {
   return subscription
 })
 const mockRemoveAllListeners = jest.fn()
+const mockDismiss = jest.fn()
 
 jest.mock('react-native', () => ({
   Keyboard: {
     addListener: mockAddListener,
-    removeAllListeners: mockRemoveAllListeners
+    removeAllListeners: mockRemoveAllListeners,
+    dismiss: mockDismiss
   }
 }), { virtual: true })
 
 const {
   onKeyboardHeightChange,
-  offKeyboardHeightChange
+  offKeyboardHeightChange,
+  hideKeyboard
 } = require('../../src/platform/api/keyboard/index.ios')
 
 describe('RN keyboard', () => {
@@ -28,6 +31,7 @@ describe('RN keyboard', () => {
     mockSubscriptions.length = 0
     mockAddListener.mockClear()
     mockRemoveAllListeners.mockClear()
+    mockDismiss.mockReset()
   })
 
   it('should only remove owned subscriptions when called without callback', () => {
@@ -66,4 +70,23 @@ describe('RN keyboard', () => {
     // 首轮订阅释放后再次注册，需要重新创建两个底层订阅。
     expect(mockAddListener).toHaveBeenCalledTimes(4)
   })
+
+  it('should include the API name in the hideKeyboard fail errMsg', () => {
+    const fail = jest.fn()
+    const complete = jest.fn()
+    mockDismiss.mockImplementation(() => {
+      throw new Error('dismiss failed')
+    })
+
+    hideKeyboard({
+      fail,
+      complete
+    })
+
+    const result = {
+      errMsg: 'hideKeyboard:fail dismiss failed'
+    }
+    expect(fail).toHaveBeenCalledWith(result)
+    expect(complete).toHaveBeenCalledWith(result)
+  })
 })

packages/api-proxy/__tests__/rn/network.spec.js

@@ -14,16 +14,27 @@ jest.mock('@react-native-community/netinfo', () => ({
   }
 }), { virtual: true })
 
+jest.mock('../../src/common/js', () => ({
+  successHandle: jest.fn(),
+  failHandle: jest.fn(),
+  defineUnsupportedProps: jest.fn()
+}))
+
 const {
+  getNetworkType,
   offNetworkStatusChange,
   onNetworkStatusChange
 } = require('../../src/platform/api/device/network/rnNetwork')
+const NetInfo = require('@react-native-community/netinfo').default
+const { failHandle } = require('../../src/common/js')
 
 describe('RN network events', () => {
   beforeEach(() => {
     offNetworkStatusChange()
     mockAddEventListener.mockClear()
     mockUnsubscribe.mockClear()
+    NetInfo.fetch.mockReset()
+    failHandle.mockClear()
   })
 
   test('should clear callbacks and native subscription when callback is null', () => {
@@ -35,6 +46,19 @@ describe('RN network events', () => {
     expect(mockUnsubscribe).toHaveBeenCalledTimes(1)
   })
 
+  test('should release native subscription after the last callback is removed', () => {
+    const callbackA = jest.fn()
+    const callbackB = jest.fn()
+    onNetworkStatusChange(callbackA)
+    onNetworkStatusChange(callbackB)
+
+    offNetworkStatusChange(callbackA)
+    expect(mockUnsubscribe).not.toHaveBeenCalled()
+
+    offNetworkStatusChange(callbackB)
+    expect(mockUnsubscribe).toHaveBeenCalledTimes(1)
+  })
+
   test('should subscribe again after all callbacks are removed', () => {
     onNetworkStatusChange(jest.fn())
     offNetworkStatusChange()
@@ -44,4 +68,18 @@ describe('RN network events', () => {
 
     expect(mockAddEventListener).toHaveBeenCalledTimes(2)
   })
+
+  test('getNetworkType should include API name when fetching fails', async () => {
+    const fail = jest.fn()
+    const complete = jest.fn()
+    NetInfo.fetch.mockRejectedValue(new Error('fetch failed'))
+
+    getNetworkType({ fail, complete })
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(failHandle).toHaveBeenCalledWith({
+      errMsg: 'getNetworkType:fail fetch failed'
+    }, fail, complete)
+  })
 })

packages/api-proxy/__tests__/rn/storage.spec.js

@@ -1,7 +1,8 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import { removeStorageSync, clearStorageSync } from '../../src/platform/api/storage/rnStorage'
+import { getStorageInfo, removeStorageSync, clearStorageSync } from '../../src/platform/api/storage/rnStorage'
 
 jest.mock('@react-native-async-storage/async-storage', () => ({
+  getAllKeys: jest.fn(),
   removeItem: jest.fn(),
   clear: jest.fn()
 }), { virtual: true })
@@ -28,4 +29,22 @@ describe('RN storage APIs', () => {
     expect(AsyncStorage.removeItem).not.toHaveBeenCalled()
     expect(AsyncStorage.clear).not.toHaveBeenCalled()
   })
+
+  test('getStorageInfo should use the correct API name when it fails', () => {
+    const error = new Error('get keys failed')
+    const fail = jest.fn()
+    const complete = jest.fn()
+    AsyncStorage.getAllKeys.mockImplementation(callback => callback(error))
+
+    getStorageInfo({
+      fail,
+      complete
+    })
+
+    const result = {
+      errMsg: 'getStorageInfo:fail Error: get keys failed'
+    }
+    expect(fail).toHaveBeenCalledWith(result)
+    expect(complete).toHaveBeenCalledWith(result)
+  })
 })

packages/api-proxy/__tests__/rn/toast.spec.js

@@ -1,6 +1,12 @@
 import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
 import { showToast, showLoading } from '../../src/platform/api/toast/rnToast'
 
+jest.mock('react/jsx-runtime', () => ({
+  jsx: (type, props) => ({ type, props }),
+  jsxs: (type, props) => ({ type, props }),
+  Fragment: 'Fragment'
+}), { virtual: true })
+
 jest.mock('react-native', () => ({
   View: 'View',
   Text: 'Text',
@@ -17,7 +23,7 @@ jest.mock('react-native', () => ({
 jest.mock('@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index', () => ({
   add: jest.fn(),
   remove: jest.fn()
-}))
+}), { virtual: true })
 
 describe('RN toast APIs', () => {
   test.each([