@mpxjs/api-proxy 2.9.18 → 2.9.19-react.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.18",
+  "version": "2.9.19-react.0",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,12 @@
   "dependencies": {
     "axios": "^1.6.7"
   },
-  "gitHead": "ec6a5d714daf59eed0e5651aa4611a9f9383d233"
+  "peerDependencies": {
+    "@react-native-async-storage/async-storage": "^1.23.1",
+    "@react-native-clipboard/clipboard": "^1.14.0",
+    "@react-native-community/netinfo": "^11.2.1",
+    "react-native-device-info": "^10.13.2",
+    "react-native-safe-area-context": "^4.10.1"
+  },
+  "gitHead": "a09ab1b994eaf20b1772491709580fe75499e688"
 }

package/src/common/js/utils.js

@@ -14,6 +14,10 @@
  */
 const hasOwnProperty = Object.prototype.hasOwnProperty
 
+function type (n) {
+  return Object.prototype.toString.call(n).slice(8, -1)
+}
+
 function hasOwn (obj, key) {
   return hasOwnProperty.call(obj, key)
 }
@@ -68,6 +72,8 @@ function getEnvObj () {
     case 'dd':
       return dd
     case 'web':
+    case 'ios':
+    case 'android':
       return {}
   }
 }
@@ -95,6 +101,19 @@ function makeMap (arr) {
   }, {})
 }
 
+function defineUnsupportedProps (resObj, props) {
+  const defineProps = {}
+  props.forEach((item) => {
+    defineProps[item] = {
+      get () {
+        warn(`The ${item} attribute is not supported in ${__mpx_mode__} environment`)
+        return null
+      }
+    }
+  })
+  Object.defineProperties(resObj, defineProps)
+}
+
 const isBrowser = typeof window !== 'undefined'
 
 function throwSSRWarning (info) {
@@ -111,5 +130,7 @@ export {
   makeMap,
   isBrowser,
   hasOwn,
-  throwSSRWarning
+  throwSSRWarning,
+  type,
+  defineUnsupportedProps
 }

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

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

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

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

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

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

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

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

package/src/platform/api/clipboard-data/rnClipboard.js

@@ -0,0 +1,41 @@
+import Clipboard from '@react-native-clipboard/clipboard'
+import { webHandleSuccess, webHandleFail } from '../../../common/js/web'
+import { type } from '@mpxjs/utils'
+const setClipboardData = function (options) {
+  const { data, success, fail, complete } = options
+  if (!data || type(data) !== 'String') {
+    const errStr = !data ? 'parameter.data should be String instead of Undefined;' : `parameter.data should be String instead of ${type(data)};`
+    const result = {
+      errno: 1001,
+      errMsg: errStr
+    }
+    webHandleFail(result, fail, complete)
+    return
+  }
+  Clipboard.setString(data)
+  const result = {
+    errMsg: 'setClipboardData:ok'
+  }
+  webHandleSuccess(result, success, complete)
+}
+
+const getClipboardData = function (options) {
+  const { success, fail, complete } = options
+  Clipboard.getString().then((data) => {
+    const result = {
+      data,
+      errMsg: 'getClipboardData:ok'
+    }
+    webHandleSuccess(result, success, complete)
+  }).catch(() => {
+    const result = {
+      errMsg: 'setClipboardData:fail'
+    }
+    webHandleFail(result, fail, complete)
+  })
+}
+
+export {
+  setClipboardData,
+  getClipboardData
+}

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

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

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

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

package/src/platform/api/device/network/rnNetwork.js

@@ -0,0 +1,59 @@
+import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../../common/js'
+import NetInfo, { NetInfoStateType } from '@react-native-community/netinfo'
+
+let _unsubscribe = null
+const _callbacks = new Set()
+const getConnectionType = function (connectionInfo) {
+  let type = 'unknown'
+  if (connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
+    type = connectionInfo.details.cellularGeneration
+  } else if (connectionInfo.type === NetInfoStateType.wifi || connectionInfo.type === NetInfoStateType.none) {
+    type = connectionInfo.type
+  }
+  return type
+}
+
+const getNetworkType = function (options) {
+  const { success, fail, complete } = options
+  NetInfo.fetch().then((connectionInfo) => {
+    const result = {
+      networkType: getConnectionType(connectionInfo),
+      errMsg: 'getNetworkType:ok'
+    }
+    defineUnsupportedProps(result, ['signalStrength', 'hasSystemProxy'])
+    webHandleSuccess(result, success, complete)
+  }).catch((err) => {
+    const result = {
+      errMsg: err.message
+    }
+    webHandleFail(result, fail, complete)
+  })
+}
+
+const onNetworkStatusChange = function (callback) {
+  _callbacks.add(callback)
+  if (!_unsubscribe) {
+    _unsubscribe = NetInfo.addEventListener((connectionInfo) => {
+      _callbacks.forEach(cb => {
+        const { isConnected } = connectionInfo
+        // eslint-disable-next-line node/no-callback-literal
+        cb && cb({ isConnected, networkType: getConnectionType(connectionInfo) })
+      })
+    })
+  }
+}
+const offNetworkStatusChange = function (callback) {
+  if (callback && typeof callback === 'function') {
+    _callbacks.delete(callback)
+  } else if (callback === undefined) {
+    _callbacks.clear()
+    _unsubscribe && _unsubscribe()
+    _unsubscribe = null
+  }
+}
+
+export {
+  getNetworkType,
+  offNetworkStatusChange,
+  onNetworkStatusChange
+}

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

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

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

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

package/src/platform/api/make-phone-call/rnMakePhone.js

@@ -0,0 +1,27 @@
+import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { Linking } from 'react-native'
+
+const makePhoneCall = function (options) {
+  const {
+    phoneNumber = '',
+    success = null,
+    fail = null,
+    complete = null
+  } = options
+
+  Linking.openURL(`tel:${phoneNumber}`).then(() => {
+    const result = {
+      errMsg: 'makePhoneCall:ok'
+    }
+    webHandleSuccess(result, success, complete)
+  }).catch(() => {
+    const result = {
+      errMsg: 'makePhoneCall:fail cancel'
+    }
+    webHandleFail(result, fail, complete)
+  })
+}
+
+export {
+  makePhoneCall
+}

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

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

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

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

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

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
 import RequestTask from './RequestTask'
 
 function request (options = { url: '' }) {
@@ -69,6 +69,7 @@ function request (options = { url: '' }) {
       statusCode: res.status,
       header: res.headers
     }
+    defineUnsupportedProps(result, ['cookies', 'profile', 'exception'])
     webHandleSuccess(result, success, complete)
     return result
   }).catch(err => {

package/src/platform/api/socket/SocketTask.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, type } from '../../../common/js'
 
 const socketTasks = new Set()
 
@@ -41,7 +41,11 @@ class SocketTask {
 
   send (options) {
     const { data = '', success, fail, complete } = options
-
+    if (typeof data !== 'string' || type(data) !== 'ArrayBuffer') {
+      const res = { errMsg: 'sendSocketMessage:fail Unsupported data type' }
+      webHandleFail(res, fail, complete)
+      return
+    }
     if (this._socket.readyState === 1) {
       this._socket.send(data)
       const res = { errMsg: 'sendSocketMessage:ok' }
@@ -77,8 +81,14 @@ class SocketTask {
   }
 
   addListener (socket) {
-    socket.onOpen = event => { typeof this._openCb === 'function' && this._openCb(event) }
-    socket.onmessage = event => { typeof this._messageCb === 'function' && this._messageCb(event) }
+    socket.onopen = event => {
+      typeof this._openCb === 'function' && this._openCb(event)
+    }
+    socket.onmessage = event => {
+      typeof this._messageCb === 'function' && this._messageCb({
+        data: event.data
+      })
+    }
     socket.onerror = event => {
       socketTasks.delete(this._socket)
       typeof this._errorCb === 'function' && this._errorCb(event)
@@ -91,7 +101,7 @@ class SocketTask {
       if (this._closeData) {
         this._closeCb(event)
       } else {
-        this._closeCb({ code: 2000, reason: `${event}` })
+        this._closeCb({ code: event.code, reason: event.reason })
       }
     }
   }

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

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

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

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

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

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

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

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

package/src/platform/api/storage/rnStorage.js

@@ -0,0 +1,139 @@
+import AsyncStorage from '@react-native-async-storage/async-storage'
+import { envError, webHandleSuccess, webHandleFail, hasOwn, defineUnsupportedProps } from '../../../common/js'
+import { loop } from '@mpxjs/utils'
+function setStorage (options) {
+  const { key, data, success, fail, complete } = options
+  let obj = {}
+  if (typeof data === 'symbol') {
+    obj = { data: '' }
+  } else {
+    obj = { data }
+  }
+  AsyncStorage.setItem(key, JSON.stringify(obj), (err) => {
+    if (err) {
+      const result = {
+        errMsg: `setStorage:fail ${err}`
+      }
+      webHandleFail(result, fail, complete)
+      return
+    }
+    const result = {
+      errMsg: 'setStorage:ok'
+    }
+    webHandleSuccess(result, success, complete)
+  })
+}
+
+const setStorageSync = envError('setStorageSync')
+
+function getStorage (options) {
+  const { key, success, fail, complete } = options
+  if (!key) {
+    const result = {
+      errMsg: 'getStorage:fail parameter error: parameter.key should be String instead of Undefined;'
+    }
+    webHandleFail(result, fail, complete)
+    return
+  }
+  AsyncStorage.getItem(key, (err, res) => {
+    if (err || !res) {
+      const result = {
+        errMsg: `getStorage:fail ${err || 'data not found'}`
+      }
+      webHandleFail(result, fail, complete)
+      return
+    }
+    let item
+    let data = null
+    try {
+      item = JSON.parse(res)
+    } catch (e) {
+    }
+    if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+      data = item.data
+    }
+    const result = {
+      errMsg: 'getStorage:ok',
+      data
+    }
+    webHandleSuccess(result, success, complete)
+  })
+}
+
+const getStorageSync = envError('getStorageSync')
+
+function getStorageInfo (options) {
+  const { success, fail, complete } = options
+  AsyncStorage.getAllKeys((err, keys) => {
+    if (err) {
+      const result = {
+        errMsg: `getStorage:fail ${err}`
+      }
+      webHandleFail(result, fail, complete)
+      return
+    }
+    const result = {
+      keys,
+      errMsg: 'getStorageInfo:ok'
+    }
+    defineUnsupportedProps(result, ['currentSize', 'limitSize'])
+    webHandleSuccess(result, success, complete)
+  })
+}
+
+const getStorageInfoSync = envError('getStorageInfoSync')
+
+function removeStorage (options) {
+  const { key, success, fail, complete } = options
+  AsyncStorage.removeItem(key, (err) => {
+    if (err) {
+      const result = {
+        errMsg: `removeStorage:fail ${err}`
+      }
+      webHandleFail(result, fail, complete)
+      return
+    }
+    const result = {
+      errMsg: 'removeStorage:ok'
+    }
+    webHandleSuccess(result, success, complete)
+  })
+}
+
+function removeStorageSync (key) {
+  AsyncStorage.removeItem([key], loop)
+}
+
+function clearStorage (options) {
+  const { success, fail, complete } = options
+  AsyncStorage.clear((err) => {
+    if (err) {
+      const result = {
+        errMsg: `clearStorage:fail ${err}`
+      }
+      webHandleFail(result, fail, complete)
+      return
+    }
+    const result = {
+      errMsg: 'clearStorage:ok'
+    }
+    webHandleSuccess(result, success, complete)
+  })
+}
+
+function clearStorageSync () {
+  AsyncStorage.clear(loop)
+}
+
+export {
+  setStorage,
+  setStorageSync,
+  getStorage,
+  getStorageSync,
+  getStorageInfo,
+  getStorageInfoSync,
+  removeStorage,
+  removeStorageSync,
+  clearStorage,
+  clearStorageSync
+}

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

@@ -1,5 +1,5 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
-
+import { changeOpts, envError, handleSuccess, getEnvObj } from '../../../common/js'
+const ENV_OBJ = getEnvObj()
 function getSystemInfo (options = {}) {
   const opts = changeOpts(options)
 
@@ -32,7 +32,13 @@ function getSystemInfoSync () {
   return res
 }
 
+const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
+
+const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
+
 export {
   getSystemInfo,
-  getSystemInfoSync
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo
 }

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

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

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

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

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

@@ -6,7 +6,13 @@ const getSystemInfo = ENV_OBJ.getSystemInfo || envError('getSystemInfo')
 
 const getSystemInfoSync = ENV_OBJ.getSystemInfoSync || envError('getSystemInfoSync')
 
+const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
+
+const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
+
 export {
   getSystemInfo,
-  getSystemInfoSync
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo
 }

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

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning, webHandleSuccess } from '../../../common/js'
+import { envError, isBrowser, throwSSRWarning, webHandleSuccess } from '../../../common/js'
 
 function getSystemInfoSync () {
   if (!isBrowser) {
@@ -79,7 +79,13 @@ function getSystemInfo (options = {}) {
   webHandleSuccess(res, options.success, options.complete)
 }
 
+const getDeviceInfo = envError('getDeviceInfo')
+
+const getWindowInfo = envError('getWindowInfo')
+
 export {
   getSystemInfo,
-  getSystemInfoSync
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo
 }

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

@@ -0,0 +1,118 @@
+import DeviceInfo from 'react-native-device-info'
+import { Platform, PixelRatio, Dimensions, StatusBar } from 'react-native'
+import { initialWindowMetrics } from 'react-native-safe-area-context'
+import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
+
+const getWindowInfo = function () {
+  const dimensionsWindow = Dimensions.get('window')
+  const dimensionsScreen = Dimensions.get('screen')
+  const result = {
+    pixelRatio: PixelRatio.get(),
+    windowWidth: dimensionsWindow.width,
+    windowHeight: dimensionsWindow.height,
+    screenWidth: dimensionsScreen.width,
+    screenHeight: dimensionsScreen.height
+  }
+  defineUnsupportedProps(result, ['screenTop'])
+  return result
+}
+
+const getSystemInfoSync = function () {
+  const windowInfo = getWindowInfo()
+  const { screenWidth, screenHeight } = windowInfo
+  let safeArea = {}
+  let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
+  if (Platform.OS === 'android') {
+    top = StatusBar.currentHeight || 0
+  }
+  const iosRes = {}
+
+  try {
+    const width = Math.min(screenWidth, screenHeight)
+    const height = Math.max(screenWidth, screenHeight)
+    safeArea = {
+      left: 0,
+      right: width,
+      top,
+      bottom: height - bottom,
+      height: height - bottom - top,
+      width
+    }
+  } catch (error) {
+  }
+  const result = {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
+    statusBarHeight: top,
+    fontSizeSetting: PixelRatio.getFontScale(),
+    safeArea,
+    ...windowInfo,
+    ...iosRes
+  }
+  defineUnsupportedProps(result, [
+    'language',
+    'version',
+    'SDKVersion',
+    'benchmarkLevel',
+    'albumAuthorized',
+    'cameraAuthorized',
+    'locationAuthorized',
+    'microphoneAuthorized',
+    'notificationAuthorized',
+    'phoneCalendarAuthorized',
+    'host',
+    'enableDebug',
+    'notificationAlertAuthorized',
+    'notificationBadgeAuthorized',
+    'notificationSoundAuthorized',
+    'bluetoothEnabled',
+    'locationEnabled',
+    'wifiEnabled',
+    'locationReducedAccuracy',
+    'theme'
+  ])
+  return result
+}
+
+const getSystemInfo = function (options) {
+  const { success, fail, complete } = options
+  try {
+    const systemInfo = getSystemInfoSync()
+    Object.assign(systemInfo, {
+      errMsg: 'setStorage:ok'
+    })
+    webHandleSuccess(systemInfo, success, complete)
+  } catch (err) {
+    const result = {
+      errMsg: `getSystemInfo:fail ${err}`
+    }
+    webHandleFail(result, fail, complete)
+  }
+}
+
+const getDeviceInfo = function () {
+  const deviceInfo = {}
+  if (Platform.OS === 'android') {
+    const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
+    deviceInfo.deviceAbi = deviceAbi[0] || null
+  }
+  defineUnsupportedProps(deviceInfo, ['benchmarkLevel', 'abi', 'cpuType'])
+  Object.assign(deviceInfo, {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
+  })
+  return deviceInfo
+}
+
+export {
+  getSystemInfo,
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo
+}

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

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

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

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

package/src/platform/api/window/rnWindow.js

@@ -0,0 +1,44 @@
+import { Dimensions } from 'react-native'
+
+const callbacks = []
+let subscription
+const addListener = function () {
+  subscription = Dimensions.addEventListener(
+    'change',
+    ({ window }) => {
+      const result = {
+        size: {
+          windowWidth: window.width,
+          windowHeight: window.height
+        }
+      }
+      callbacks.forEach(cb => cb(result))
+    }
+  )
+}
+
+const removeListener = function () {
+  subscription && subscription.remove()
+}
+
+function onWindowResize (callback) {
+  if (callbacks.length === 0) {
+    addListener()
+  }
+  callbacks.push(callback)
+}
+
+function offWindowResize (callback) {
+  const index = callbacks.indexOf(callback)
+  if (index > -1) {
+    callbacks.splice(index, 1)
+  }
+  if (callbacks.length === 0) {
+    removeListener()
+  }
+}
+
+export {
+  onWindowResize,
+  offWindowResize
+}