@tarojs/taro-rn 4.0.0-beta.78 → 4.0.0-beta.79

package/src/__tests__/websocket.test.ts

@@ -0,0 +1,170 @@
+import { WebSocket, Server } from 'mock-socket'
+import * as connectSocket from '../lib/connectSocket'
+
+const Taro = Object.assign({}, connectSocket)
+
+describe('websocket', () => {
+  beforeEach(() => {
+    // @ts-ignore
+    global.WebSocket = WebSocket
+  })
+
+  test('url should be string', () => {
+    const success = jest.fn()
+    const fail = jest.fn()
+    const complete = jest.fn()
+
+    expect.assertions(6)
+
+    return Taro.connectSocket({
+      // @ts-ignore
+      url: {},
+      success,
+      fail,
+      complete
+    }).catch(err => {
+      const expectErrMsg = 'connectSocket:fail parameter error: parameter.url should be String'
+      expect(success.mock.calls.length).toBe(0)
+      expect(fail.mock.calls.length).toBe(1)
+      expect(fail.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
+      expect(complete.mock.calls.length).toBe(1)
+      expect(complete.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
+      expect(err.errMsg).toMatch(expectErrMsg)
+    })
+  })
+
+  test('should not keep more than 2 connection', async () => {
+    const success = jest.fn()
+    const fail = jest.fn()
+    const complete = jest.fn()
+
+    expect.assertions(8)
+
+    const socketTaskOne = await Taro.connectSocket({ url: 'wss://localhost:8080', success })
+    expect(success.mock.calls[0][0])
+      .toEqual({ socketTaskId: 1, socketTask: socketTaskOne, errMsg: 'connectSocket:ok' })
+
+    const socketTaskTwo = await Taro.connectSocket({ url: 'wss://localhost:8090', success })
+    expect(success.mock.calls[1][0])
+      .toEqual({ socketTaskId: 2, socketTask: socketTaskTwo, errMsg: 'connectSocket:ok' })
+
+    await Taro.connectSocket({
+      url: 'wss://localhost:9080',
+      success,
+      complete,
+      fail
+    }).catch(err => {
+      const expectErrMsg = '同时最多发起 2 个 socket 请求，更多请参考文档。'
+      expect(success.mock.calls.length).toBe(2)
+      expect(fail.mock.calls.length).toBe(1)
+      expect(fail.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
+      expect(complete.mock.calls.length).toBe(1)
+      expect(complete.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
+      expect(err.errMsg).toMatch(expectErrMsg)
+    })
+
+    socketTaskOne.close({})
+    socketTaskTwo.close({})
+  })
+
+  test('connection关闭的时候会重置总的socketTask数量', async () => {
+    const success = jest.fn()
+    const fail = jest.fn()
+    const complete = jest.fn()
+
+    expect.assertions(7)
+
+    const socketTaskOne = await Taro.connectSocket({ url: 'wss://localhost:8080', success })
+    expect(success.mock.calls.length).toBe(1)
+    socketTaskOne.close({})
+
+    const socketTaskTwo = await Taro.connectSocket({ url: 'wss://localhost:8090', success })
+    expect(success.mock.calls.length).toBe(2)
+
+    const socketTaskThree = await Taro.connectSocket({
+      url: 'wss://localhost:9080',
+      success,
+      complete,
+      fail
+    })
+    expect(success.mock.calls.length).toBe(3)
+    expect(fail.mock.calls.length).toBe(0)
+    expect(complete.mock.calls.length).toBe(1)
+    expect(success.mock.calls[2][0])
+      .toEqual(expect.objectContaining({
+        socketTask: socketTaskThree,
+        errMsg: 'connectSocket:ok'
+      }))
+    expect(complete.mock.calls[0][0])
+      .toEqual(expect.objectContaining({
+        socketTask: socketTaskThree,
+        errMsg: 'connectSocket:ok'
+      }))
+
+    socketTaskTwo.close({})
+    socketTaskThree.close({})
+  })
+  // @ts-ignore
+  test('should work basically', (done) => {
+    const fakeURL = 'wss://localhost:8080'
+    const mockServer = new Server(fakeURL)
+    const connected = jest.fn()
+    const success = jest.fn()
+    const complete = jest.fn()
+    const msg = 'hey gay!'
+    const msg2 = 'hey gay!gay!'
+
+    expect.assertions(11)
+
+    mockServer.on('connection', connected)
+
+    mockServer.on('message', message => {
+      expect(message).toMatch(msg)
+      mockServer.send(msg2)
+    })
+
+    Taro.connectSocket({
+      url: fakeURL,
+      success,
+      complete
+    }).then(socketTask => {
+
+      const socketTaskSend = jest.spyOn(socketTask.ws, 'send')
+      const socketTaskClose = jest.spyOn(socketTask.ws, 'close')
+      const closeCode = 100
+      const closeReason = 'hey'
+  
+      socketTask.onOpen(() => {
+        socketTask.send({
+          data: msg,
+          success: (res) => {
+            expect(socketTaskSend).toHaveBeenCalled()
+            expect(res.errMsg).toMatch('sendSocketMessage:ok')
+          },
+        })
+      })
+  
+      socketTask.onMessage(res => {
+        expect(res.data).toMatch(msg2)
+        socketTask.close({
+          code: closeCode,
+          reason: closeReason,
+          success: (res) => {
+            expect(socketTaskClose).toHaveBeenCalled()
+            expect(res.errMsg).toMatch('sendSocketMessage:ok')
+          },
+        })
+      })
+  
+      socketTask.onClose(({ code, reason }) => {
+        const expectMsg = 'connectSocket:ok'
+        expect(connected.mock.calls.length).toBe(1)
+        expect(success.mock.calls[0][0].errMsg).toMatch(expectMsg)
+        expect(complete.mock.calls[0][0].errMsg).toMatch(expectMsg)
+        expect(code).toBe(closeCode)
+        expect(reason).toBe(closeReason)
+        done()
+      })
+    })
+  })
+})

package/src/api/index.ts

@@ -1,44 +1,44 @@
 export {
   Current,
+  getCurrentInstance,
+  useDidShow,
+  useDidHide,
+  useLoad,
+  useReady,
+  useUnload,
+  useLaunch,
+  usePageNotFound,
+  useRouter,
+  usePullDownRefresh,
+  useReachBottom,
+  usePageScroll,
+  useTabItemTap,
+  useResize,
   eventCenter,
   Events,
-  getApp,
-  getCurrentInstance,
-  getCurrentPages,
-  hideNavigationBarLoading,
-  hideTabBar,
-  hideTabBarRedDot,
-  navigateBack,
   navigateTo,
-  pageScrollTo,
-  pxTransform,
   redirectTo,
+  navigateBack,
+  switchTab,
   reLaunch,
-  removeTabBarBadge,
-  setBackgroundColor,
-  setBackgroundTextStyle,
-  setNavigationBarColor,
-  setNavigationBarTitle,
+  showTabBar,
+  hideTabBar,
+  showTabBarRedDot,
+  hideTabBarRedDot,
   setTabBarBadge,
+  removeTabBarBadge,
   setTabBarItem,
-  setTabBarStyle,
+  setNavigationBarTitle,
+  setNavigationBarColor,
   showNavigationBarLoading,
-  showTabBar,
-  showTabBarRedDot,
+  hideNavigationBarLoading,
+  setTabBarStyle,
+  getApp,
+  pxTransform,
   startPullDownRefresh,
   stopPullDownRefresh,
-  switchTab,
-  useDidHide,
-  useDidShow,
-  useLaunch,
-  useLoad,
-  usePageNotFound,
-  usePageScroll,
-  usePullDownRefresh,
-  useReachBottom,
-  useReady,
-  useResize,
-  useRouter,
-  useTabItemTap,
-  useUnload
+  pageScrollTo,
+  setBackgroundColor,
+  setBackgroundTextStyle,
+  getCurrentPages
 } from '@tarojs/runtime-rn'

package/src/lib/ENV_TYPE/index.ts

@@ -9,4 +9,4 @@ export const ENV_TYPE = {
   RN: 'RN',
   HARMONY: 'HARMONY',
   QUICKAPP: 'QUICKAPP'
-}
+}

package/src/lib/Mask.tsx

@@ -1,7 +1,7 @@
-import { ViewPropTypes } from 'deprecated-react-native-prop-types'
-import PropTypes from 'prop-types'
 import React from 'react'
+import PropTypes from 'prop-types'
 import { StyleSheet, TouchableWithoutFeedback, View } from 'react-native'
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
 
 const styles = StyleSheet.create({
   mask: {

package/src/lib/Popup.tsx

@@ -1,8 +1,8 @@
-import { ViewPropTypes } from 'deprecated-react-native-prop-types'
-import PropTypes from 'prop-types'
 import React, { Component } from 'react'
-import { Animated, Dimensions, Easing, Modal, StyleSheet, View } from 'react-native'
 
+import PropTypes from 'prop-types'
+import { Modal, View, StyleSheet, Dimensions, Animated, Easing } from 'react-native'
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
 import { Mask } from './Mask'
 
 const { width, height } = Dimensions.get('window')
@@ -17,7 +17,7 @@ const styles = StyleSheet.create({
 })
 
 interface Props {
-  visible?: boolean
+  visible?: boolean;
 }
 
 class Popup extends Component<any, any> {
@@ -53,11 +53,9 @@ class Popup extends Component<any, any> {
       }).start(() => this.setState({ visible: false }))
     }
   }
-
   componentWillUnmount (): void {
-    this.timer && clearTimeout(this.timer)
+    this.timer && clearTimeout(this.timer);
   }
-
   handleLayout (): void {
     this.timer = setTimeout(() => {
       this.popup?.measure((_x, _y, _w, h) => {
@@ -71,7 +69,7 @@ class Popup extends Component<any, any> {
           }).start()
         })
       })
-    },) // 处理鸿蒙系统handleLayout 回调 this.popup为空的情况
+    },); // 处理鸿蒙系统handleLayout 回调 this.popup为空的情况
   }
 
   render (): JSX.Element {

package/src/lib/StyleSheet.ts

@@ -1,4 +1,4 @@
-import { Platform, StyleSheet } from 'react-native'
+import { StyleSheet, Platform } from 'react-native'
 
 interface Styles {
   [propName: string]: any

package/src/lib/accelerometer.ts

@@ -1,5 +1,4 @@
 import { Accelerometer } from 'expo-sensors'
-
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
@@ -69,8 +68,8 @@ function stopAccelerometer(opts: Taro.stopAccelerometer.Option = {}): Promise<Ta
 }
 
 export {
-  offAccelerometerChange,
   onAccelerometerChange,
+  offAccelerometerChange,
   startAccelerometer,
   stopAccelerometer
 }

package/src/lib/arrayBufferToBase64/index.ts

@@ -3,4 +3,4 @@ import { fromByteArray } from 'base64-js'
 export function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string {
   const buffer = new Uint8Array(arrayBuffer)
   return fromByteArray(buffer)
-}
+}

package/src/lib/base64ToArrayBuffer/index.ts

@@ -2,4 +2,4 @@ import { toByteArray } from 'base64-js'
 
 export function base64ToArrayBuffer(base64: string): ArrayBuffer {
   return toByteArray(base64)
-}
+}

package/src/lib/chooseMedia/index.ts

@@ -12,4 +12,4 @@ export function chooseMedia (opts: Taro.chooseMedia.Option): Promise<any> {
   } else {
     return _chooseMedia(opts, MEDIA_TYPE.All)
   }
-}
+}

package/src/lib/clearStorage/index.ts

@@ -1,5 +1,4 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-
 import { errorHandler, successHandler } from '../../utils'
 
 export async function clearStorage(option: Taro.clearStorage.Option = {}): Promise<TaroGeneral.CallbackResult> {

package/src/lib/clearStorageSync/index.ts

@@ -1 +1 @@
-export { clearStorageSync } from '../unsupportedApi'
+export { clearStorageSync } from '../unsupportedApi'

package/src/lib/compressImage/index.ts

@@ -1,6 +1,5 @@
 import ImageResizer, { ResizeFormat } from '@bam.tech/react-native-image-resizer'
 import { Image } from 'react-native'
-
 import { errorHandler, successHandler } from '../../utils'
 
 /**

package/src/lib/connectSocket/socketTask.ts

@@ -1,11 +1,13 @@
-class SocketTask {
-  ws: WebSocket
-  _destroyWhenClose: () => void
+interface SocketTask {
+  ws: WebSocket;
+  _destroyWhenClose: () => void;
   closeDetail: {
-    code: number
-    reason: string
-  }
+    code: number;
+    reason: string;
+  };
+}
 
+class SocketTask {
   constructor (url: string, protocols: string[] | undefined) {
     if (protocols) {
       // eslint-disable-next-line no-undef
@@ -103,7 +105,7 @@ class SocketTask {
   onError (func?: Taro.SocketTask.OnErrorCallback): void {
     this.ws.onerror = () => {
       func && func({
-        errMsg: 'There was an error with your websocket.',
+        errMsg: "There was an error with your websocket.",
       })
     }
   }

package/src/lib/createCameraContext/index.ts

@@ -1,7 +1,5 @@
-import { Camera } from 'expo-camera'
-
 import { errorHandler, successHandler } from '../../utils'
-
+import { requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
 const globalAny: any = global
 
 class CameraContext {
@@ -16,8 +14,8 @@ class CameraContext {
    * 开始录像
    */
   startRecord = (option: Taro.CameraContext.StartRecordOption) => {
-    Promise.all([Camera.requestCameraPermissionsAsync(), Camera.requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
-      if (cameraPermission.granted && microphonePermission.granted) {
+    Promise.all([requestCameraPermissionsAsync(), requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
+      if(cameraPermission.granted && microphonePermission.granted) {
         this.cameraRef?.recordAsync().then((res) => {
           const { uri } = res
           const result = {
@@ -78,7 +76,7 @@ class CameraContext {
         break
     }
     try {
-      const { granted } = await Camera.requestCameraPermissionsAsync()
+      const { granted } = await requestCameraPermissionsAsync()
       if (granted) {
         if (this.cameraRef?.takePictureAsync) {
           const { uri } = await this.cameraRef.takePictureAsync({ quality: _quality })

package/src/lib/createInnerAudioContext/index.ts

@@ -1,5 +1,4 @@
 import { Audio } from 'expo-av'
-
 import { isUrl } from '../../utils'
 
 /**

package/src/lib/createSelectorQuery/index.ts

@@ -1 +1 @@
-export { createSelectorQuery } from '../unsupportedApi'
+export { createSelectorQuery } from '../unsupportedApi'

package/src/lib/deviceMotion.ts

@@ -1,7 +1,6 @@
 import Taro from '@tarojs/taro'
 import { DeviceMotion } from 'expo-sensors'
-
-import { createCallbackManager, errorHandler, successHandler } from '../utils'
+import { createCallbackManager, successHandler, errorHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
 let _listener: any
@@ -45,7 +44,7 @@ function startDeviceMotionListening (object: Taro.startDeviceMotionListening.Opt
       _cbManager.trigger(rotation)
     })
     DeviceMotion.setUpdateInterval(intervalMap[interval] || intervalMap.normal)
-
+    
     return successHandler(success, complete)(res)
   } catch (error) {
     res.errMsg = 'startDeviceMotionListening:fail'
@@ -72,8 +71,8 @@ function stopDeviceMotionListening (object: Taro.stopDeviceMotionListening.Optio
 }
 
 export {
-  offDeviceMotionChange,
   onDeviceMotionChange,
+  offDeviceMotionChange,
   startDeviceMotionListening,
   stopDeviceMotionListening
 }

package/src/lib/file.ts

@@ -1,15 +1,14 @@
 import * as FileSystem from 'expo-file-system'
 import { Platform } from 'react-native'
-
-import { errorHandler, shouldBeObject, successHandler } from '../utils'
+import { shouldBeObject, successHandler, errorHandler } from '../utils'
 
 interface Func {
   (arg: any): void
 }
 
 interface ExtPromise<T> extends Promise<T> {
-  onProgressUpdateCb?: Func
-  onProgressUpdate?: Func
+  onProgressUpdateCb?: Func,
+  onProgressUpdate?: Func,
   abort?: Func
 }
 
@@ -340,10 +339,10 @@ async function getFileInfo (opts: Taro.getFileInfo.Option): Promise<Taro.getFile
 
 export {
   downloadFile,
-  getFileInfo,
-  getSavedFileInfo,
-  getSavedFileList,
-  removeSavedFile,
+  uploadFile,
   saveFile,
-  uploadFile
+  removeSavedFile,
+  getSavedFileList,
+  getSavedFileInfo,
+  getFileInfo
 }

package/src/lib/getClipboardData/index.ts

@@ -1,5 +1,4 @@
 import Clipboard from '@react-native-clipboard/clipboard'
-
 import { errorHandler } from '../../utils'
 
 export function getClipboardData (opts: Taro.getClipboardData.Option = {}): Promise<Taro.getClipboardData.Promised> {

package/src/lib/getEnv/index.ts

@@ -2,4 +2,4 @@ import { ENV_TYPE } from '../ENV_TYPE'
 
 export function getEnv(): string {
   return ENV_TYPE.RN
-}
+}

package/src/lib/getFileSystemManager/index.ts

@@ -1 +1 @@
-export { getFileSystemManager } from '../unsupportedApi'
+export { getFileSystemManager } from '../unsupportedApi'

package/src/lib/getLocation/index.ts

@@ -1,19 +1,18 @@
 import Geolocation from '@react-native-community/geolocation'
-
 import { errorHandler } from '../../utils'
 
 export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
   const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
   const requestAuthorization = () => {
     return new Promise((resolve, reject) => {
-      Geolocation.requestAuthorization(() => resolve({ granted: true }), (err) => reject(err))
+      Geolocation.requestAuthorization(()=>resolve({granted: true}), (err)=>reject(err))
     })
   }
-
+  
   try {
     // @ts-ignore
     // todo: fix types
-    const { granted } = await requestAuthorization()
+    const {granted} = await requestAuthorization()
     if (!granted) {
       const res = { errMsg: 'Permissions denied!' }
       return errorHandler(fail, complete)(res)

package/src/lib/getRecorderManager/index.ts

@@ -81,7 +81,7 @@ class RecorderManager {
         playsInSilentModeIOS: true,
         staysActiveInBackground: false,
         shouldDuckAndroid: true,
-        interruptionModeAndroid: 1, // InterruptionModeAndroid.DoNotMix
+        interruptionModeAndroid: 1, //InterruptionModeAndroid.DoNotMix
         playThroughEarpieceAndroid: true
       } as any)
 

package/src/lib/getStorage/index.ts

@@ -1,5 +1,4 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-
 import { errorHandler, successHandler } from '../../utils'
 
 export async function getStorage(option: Taro.getStorage.Option<any>): Promise<Taro.getStorage.SuccessCallbackResult<any>> {

package/src/lib/getStorageInfo/index.ts

@@ -1,5 +1,4 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-
 import { errorHandler, successHandler } from '../../utils'
 
 async function getStorageCurrentSize() {

package/src/lib/getStorageInfoSync/index.ts

@@ -1 +1 @@
-export { getStorageInfoSync } from '../unsupportedApi'
+export { getStorageInfoSync } from '../unsupportedApi'

package/src/lib/getStorageSync/index.ts

@@ -1 +1 @@
-export { getStorageSync } from '../unsupportedApi'
+export { getStorageSync } from '../unsupportedApi'

package/src/lib/getSystemInfo/index.ts

@@ -1,7 +1,7 @@
-import { errorHandler, successHandler } from '../../utils'
 import { getSystemInfoSync } from '../getSystemInfoSync'
+import { successHandler, errorHandler } from '../../utils'
 
-export function getSystemInfo(opts: Taro.getSystemInfo.Option = {}): Promise<Taro.getSystemInfo.Result> {
+export function getSystemInfo(opts: Taro.getSystemInfo.Option  = {}): Promise<Taro.getSystemInfo.Result> {
   const { success, fail, complete }: any = opts
   try {
     const res = {

package/src/lib/getSystemInfoSync/index.ts

@@ -1,11 +1,11 @@
 import {
+  Platform,
   Dimensions,
   PixelRatio,
-  Platform,
   StatusBar
 } from 'react-native'
-import DeviceInfo from 'react-native-device-info'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
+import DeviceInfo from 'react-native-device-info'
 
 export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   const res: any = {}
@@ -28,7 +28,7 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
   // NOTE：android 在沉浸式切换时，有几率top值为0。
   // https://github.com/th3rdwave/react-native-safe-area-context/issues/364
-  if (Platform.OS === 'android') { top = StatusBar.currentHeight || 0 }
+  if(Platform.OS === 'android') { top = StatusBar.currentHeight || 0; }
 
   try {
     const W = Math.min(screenWidth, screenHeight)