@tarojs/taro-rn 3.3.5 → 3.3.9

package/src/lib/connectSocket/socketTask.ts

@@ -29,13 +29,13 @@ class SocketTask {
     try {
       this.ws.send(data)
 
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
     } catch (err) {
       const res = { errMsg: err.message }
 
-      fail && fail(res)
-      complete && complete(res)
+      fail?.(res)
+      complete?.(res)
     }
   }
 
@@ -54,12 +54,12 @@ class SocketTask {
       this.ws.close(code, reason)
       // 把自己从链接数组中清除
       this._destroyWhenClose && this._destroyWhenClose()
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
     } catch (err) {
       const res = { errMsg: err.message }
-      fail && fail(res)
-      complete && complete(res)
+      fail?.(res)
+      complete?.(res)
     }
   }
 

package/src/lib/createCameraContext/index.ts

@@ -1,11 +1,12 @@
 import * as Permissions from 'expo-permissions'
-const globalAny:any = global
+import { errorHandler, successHandler } from '../../utils'
+const globalAny: any = global
 
 class CameraContext {
   private cameraRef: any
   private recordCallback: Taro.CameraContext.StopRecordOption
 
-  constructor (cameraRef) {
+  constructor(cameraRef) {
     this.cameraRef = cameraRef
   }
 
@@ -51,33 +52,51 @@ class CameraContext {
   /**
    * 拍摄照片
    */
-  takePhoto = (option: Taro.CameraContext.TakePhotoOption) => {
-    let quality = 0
-    switch (option.quality) {
+  takePhoto = async (option: Taro.CameraContext.TakePhotoOption) => {
+    const { quality = 'normal', success, fail, complete } = option
+    let _quality = 0
+    switch (quality) {
       case 'high':
-        quality = 1
+        _quality = 1
         break
       case 'normal':
-        quality = 0.6
+        _quality = 0.6
         break
       case 'low':
-        quality = 0.3
+        _quality = 0.3
         break
     }
-    Permissions.askAsync(Permissions.CAMERA, Permissions.AUDIO_RECORDING).then(() =>
-      this.cameraRef?.takePictureAsync({ quality: quality }).then(res => {
-        const { uri } = res
-        option?.success?.({
-          tempImagePath: uri ?? '',
-          errMsg: 'takePhoto: ok'
-        })
-      }).catch(e => {
-        option?.fail?.({ errMsg: e })
-      }).finally(() =>
-        option?.complete?.({ errMsg: '' })
-      )).catch((e) =>
-      console.log(e)
-    )
+    try {
+      const { status } = await Permissions.askAsync(Permissions.CAMERA, Permissions.AUDIO_RECORDING)
+      if (status === 'granted') {
+        if (this.cameraRef?.takePictureAsync) {
+          const { uri } = await this.cameraRef.takePictureAsync({ quality: _quality })
+          const res = {
+            tempImagePath: uri,
+            errMsg: 'takePhoto: ok'
+          }
+          return successHandler(success, complete)(res)
+        } else {
+          const err = {
+            errMsg: 'takePhoto: fail',
+            err: Error('unknown')
+          }
+          return errorHandler(fail, complete)(err)
+        }
+      } else {
+        const err = {
+          errMsg: 'takePhoto: fail',
+          err: Error('You have not enabled camera permissions')
+        }
+        return errorHandler(fail, complete)(err)
+      }
+    } catch (error) {
+      const err = {
+        errMsg: 'takePhoto: fail',
+        err: error
+      }
+      return errorHandler(fail, complete)(err)
+    }
   }
 
   /**

package/src/lib/file.ts

@@ -1,6 +1,6 @@
 import * as FileSystem from 'expo-file-system'
 import { Platform } from 'react-native'
-import { shouleBeObject } from '../utils'
+import { shouleBeObject, successHandler, errorHandler } from '../utils'
 
 interface Func{
   (arg: any): void
@@ -39,7 +39,7 @@ const createFormData = (filePath, body, name) => {
   Object.keys(body).forEach(key => {
     data.append(key, body[key])
   })
-  
+
   data.append(name, fileObj)
 
   return data
@@ -67,20 +67,14 @@ function uploadFile (opts: Taro.uploadFile.Option): Promise<Taro.uploadFile.Succ
 
   return _fetch(execFetch, timeout).then((res: any) => {
     if (res.ok) {
-      success && success(res)
-      complete && complete(res)
-      return Promise.resolve(res)
+      return successHandler(success, complete)(res)
     } else {
       const errMsg = `uploadFile fail: ${res.status} ${res.statusText}`
-      fail && fail({ errMsg })
-      complete && complete({ errMsg })
-      return Promise.reject(new Error(errMsg))
+      return errorHandler(fail, complete)({ errMsg })
     }
   }).catch(e => {
     const errMsg = `uploadFile fail: ${e}`
-    fail && fail({ errMsg })
-    complete && complete({ errMsg })
-    return Promise.reject(new Error(errMsg))
+    return errorHandler(fail, complete)({ errMsg })
   })
 }
 
@@ -93,10 +87,6 @@ function uploadFile (opts: Taro.uploadFile.Option): Promise<Taro.uploadFile.Succ
  * @returns {*}
  */
 function downloadFile (opts: Taro.downloadFile.Option): Promise<Taro.DownloadTask> {
-  if (typeof opts !== 'object') {
-    const res = { errMsg: `fail parameter error: ${opts} should be Object` }
-    return Promise.reject(res)
-  }
   const { url, header, filePath, success, fail, complete }: any = opts
   let downloadResumable
   const p: ExtPromise<any> = new Promise((resolve, reject) => {
@@ -128,16 +118,16 @@ function downloadFile (opts: Taro.downloadFile.Option): Promise<Taro.DownloadTas
         statusCode: status
       }
       filePath && (res.filePath = filePath)
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
       resolve(res)
     }).catch((err) => {
       const res = {
         errMsg: 'download file fail',
         err
       }
-      fail && fail(res)
-      complete && complete(res)
+      fail?.(res)
+      complete?.(res)
       reject(res)
     })
   })
@@ -166,7 +156,6 @@ async function saveFile (opts: Taro.saveFile.Option): Promise<Taro.saveFile.Succ
   const isObject = shouleBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `saveFile${isObject.msg}`
-    console.error(res)
     return Promise.reject(res)
   }
 
@@ -175,8 +164,6 @@ async function saveFile (opts: Taro.saveFile.Option): Promise<Taro.saveFile.Succ
   const destPath = filePath || FileSystem.documentDirectory
   const savedFilePath = destPath + fileName
 
-  console.log('文件路径', FileSystem.documentDirectory)
-
   try {
     const props = await FileSystem.getInfoAsync(destPath)
     if (!props.exists) {
@@ -187,13 +174,13 @@ async function saveFile (opts: Taro.saveFile.Option): Promise<Taro.saveFile.Succ
       await FileSystem.moveAsync({ from: tempFilePath, to: savedFilePath })
     }
     res.savedFilePath = savedFilePath
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
     return res
   } catch (e) {
     res.errMsg = `saveFile:fail. ${e.message}`
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
     throw res
   }
 }
@@ -220,14 +207,10 @@ async function removeSavedFile (opts: Taro.removeSavedFile.Option): Promise<Taro
       ...res,
       ...obj
     }
-    success && success(res)
-    complete && complete(res)
-    return Promise.resolve(res)
+    return successHandler(success, complete)(res)
   } catch (e) {
     res.errMsg = `removeSavedFile:fail. ${e.message}`
-    fail && fail(res)
-    complete && complete(res)
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
 }
 
@@ -260,13 +243,13 @@ async function getSavedFileList (opts: Taro.getSavedFileList.Option = {}): Promi
       }
     })
     res.fileList = fileList
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
     return res
   } catch (e) {
     res.errMsg = `getSavedFileList:fail. ${e.message}`
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
     throw res
   }
 }
@@ -293,13 +276,13 @@ async function getSavedFileInfo (opts: Taro.getSavedFileInfo.Option): Promise<Ta
     }
     res.size = obj.size
     res.createTime = obj.modificationTime
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
     return res
   } catch (e) {
     res.errMsg = `getSavedFileInfo:fail. ${e.message}`
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
     throw res
   }
 }
@@ -328,13 +311,13 @@ async function getFileInfo (opts: Taro.getFileInfo.Option): Promise<Taro.getFile
     }
     res.size = obj.size
     res.md5 = obj.md5
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
     return res
   } catch (e) {
     res.errMsg = `getFileInfo:fail. ${e.message}`
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
     throw res
   }
 }

package/src/lib/getClipboardData/index.ts

@@ -1,4 +1,5 @@
 import Clipboard from '@react-native-community/clipboard'
+import { errorHandler } from '../../utils'
 
 export function getClipboardData (opts: Taro.getClipboardData.Option = {}): Promise<Taro.getClipboardData.Promised> {
   const { success, fail, complete } = opts
@@ -17,9 +18,6 @@ export function getClipboardData (opts: Taro.getClipboardData.Option = {}): Prom
       const res = {
         errMsg: err.message
       }
-      fail?.(res)
-      complete?.(res)
-
-      return Promise.reject(err)
+      return errorHandler(fail, complete)(res)
     })
 }

package/src/lib/getLocation/index.ts

@@ -1,24 +1,22 @@
 import Geolocation from '@react-native-community/geolocation'
 import { Permissions } from 'react-native-unimodules'
 import { askAsyncPermissions } from '../../utils/premissions'
+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
+
   try {
     const status = await askAsyncPermissions(Permissions.LOCATION)
     if (status !== 'granted') {
       const res = { errMsg: 'Permissions denied!' }
-      return Promise.reject(res)
+      return errorHandler(fail, complete)(res)
     }
   } catch (err) {
-    const res = {
-      errMsg: 'Permissions denied!',
-      err
-    }
-    return Promise.reject(res)
+    const res = { errMsg: 'Permissions denied!' }
+    return errorHandler(fail, complete)(res)
   }
 
-  const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
-
   return new Promise((resolve, reject) => {
     Geolocation.getCurrentPosition(
       ({ coords }) => {

package/src/lib/getStorage/index.ts

@@ -1,34 +1,24 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+import { errorHandler, successHandler } from '../../utils'
 
-export function getStorage(option: Taro.getStorage.Option<any>): Promise<Taro.getStorage.SuccessCallbackResult<any>> {
+export async function getStorage(option: Taro.getStorage.Option<any>): Promise<Taro.getStorage.SuccessCallbackResult<any>> {
   const { key, success, fail, complete } = option
   const res = { errMsg: 'getStorage:ok' }
 
-  return new Promise((resolve, reject) => {
-    AsyncStorage.getItem(key)
-      .then((data) => {
-        if (data) {
-          const result = {
-            data: JSON.parse(data),
-            ...res
-          }
-          success?.(result)
-          complete?.(result)
-
-          resolve(result)
-        } else {
-          res.errMsg = 'getStorage:fail data not found'
-          fail?.(res)
-          complete?.(res)
-
-          reject(res)
-        }
-      }).catch((err) => {
-        res.errMsg = err.message
-        fail?.(res)
-        complete?.(res)
-
-        reject(err)
-      })
-  })
+  try {
+    const data = await AsyncStorage.getItem(key)
+    if (data) {
+      const result = {
+        data: JSON.parse(data),
+        ...res
+      }
+      return successHandler(success, complete)(result)
+    } else {
+      res.errMsg = 'getStorage:fail data not found'
+      return errorHandler(fail, complete)(res)
+    }
+  } catch (err) {
+    res.errMsg = err.message
+    return errorHandler(fail, complete)(res)
+  }
 }

package/src/lib/getStorageInfo/index.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+import { errorHandler, successHandler } from '../../utils'
 
 async function getStorageCurrentSize() {
   const keys = await AsyncStorage.getAllKeys()
@@ -10,29 +11,22 @@ async function getStorageCurrentSize() {
   return Number((size / 1024).toFixed(2))
 }
 
-export function getStorageInfo(option: Taro.getStorageInfo.Option = {}): Promise<Taro.General.CallbackResult> {
+export async function getStorageInfo(option: Taro.getStorageInfo.Option = {}): Promise<Taro.General.CallbackResult> {
   const { success, fail, complete } = option
   const res = { errMsg: 'getStorageInfo:ok' }
 
-  return new Promise((resolve, reject) => {
-    AsyncStorage.getAllKeys()
-      .then(async (data) => {
-        const result = {
-          ...res,
-          keys: data,
-          currentSize: await getStorageCurrentSize(),
-          limitSize: Infinity
-        }
-        success && success(result)
-        complete && complete(result)
-
-        resolve(result)
-      }).catch((err) => {
-        res.errMsg = err.message
-        fail && fail(res)
-        complete && complete(res)
-
-        reject(err)
-      })
-  })
+  try {
+    const data = await AsyncStorage.getAllKeys()
+    const result = {
+      ...res,
+      keys: data,
+      currentSize: await getStorageCurrentSize(),
+      limitSize: Infinity
+    }
+    // @ts-ignore
+    return successHandler(success, complete)(result)
+  } catch (err) {
+    res.errMsg = err.message
+    return errorHandler(fail, complete)(err)
+  }
 }

package/src/lib/getSystemInfo/index.ts

@@ -1,4 +1,5 @@
 import { getSystemInfoSync } from '../getSystemInfoSync'
+import { successHandler, errorHandler } from '../../utils'
 
 export function getSystemInfo(opts: Taro.getSystemInfo.Option  = {}): Promise<Taro.getSystemInfo.Result> {
   const { success, fail, complete }: any = opts
@@ -7,15 +8,9 @@ export function getSystemInfo(opts: Taro.getSystemInfo.Option  = {}): Promise<Ta
       ...getSystemInfoSync(),
       errMsg: 'getSystemInfo: ok'
     }
-    success && success(res)
-    complete && complete(res)
-
-    return Promise.resolve(res)
+    return successHandler(success, complete)(res)
   } catch (err) {
     const res = { errMsg: err.message }
-    fail && fail(res)
-    complete && complete(res)
-
-    return Promise.reject(err)
+    return errorHandler(fail, complete)(res)
   }
-}
+}

package/src/lib/keyboard.ts

@@ -1,17 +1,15 @@
 import { Keyboard } from 'react-native'
-import { createCallbackManager } from '../utils'
+import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
-const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): void => {
+const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<Taro.General.CallbackResult> => {
   const { success, fail, complete } = opts
   try {
     Keyboard.dismiss()
     const res = { errMsg: 'hideKeyboard:ok' }
-    success?.(res)
-    complete?.(res)
+    return successHandler(success, complete)(res)
   } catch (err) {
     const res = { errMsg: err.message }
-    fail?.(res)
-    complete?.(res)
+    return errorHandler(fail, complete)(res)
   }
 }
 

package/src/lib/makePhoneCall/index.ts

@@ -1,4 +1,5 @@
 import { Linking } from 'react-native'
+import { successHandler, errorHandler } from '../../utils'
 
 export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<Taro.General.CallbackResult> {
   const { phoneNumber, success, fail, complete } = opts
@@ -8,15 +9,9 @@ export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<Ta
   const isSupport = await Linking.canOpenURL(telUrl)
   if (isSupport) {
     await Linking.openURL(telUrl)
-    success?.(res)
-    complete?.(res)
-
-    return Promise.resolve(res)
+    return successHandler(success, complete)(res)
   } else {
     res.errMsg = 'makePhoneCall:fail. Do not support the makePhoneCall Api'
-    fail?.(res)
-    complete?.(res)
-
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
 }

package/src/lib/media.ts

@@ -2,6 +2,7 @@ import CameraRoll from '@react-native-community/cameraroll'
 import { Permissions } from 'react-native-unimodules'
 import * as ImagePicker from 'expo-image-picker'
 import { askAsyncPermissions } from '../utils/premissions'
+import { successHandler, errorHandler } from '../utils'
 
 export const MEDIA_TYPE = {
   VIDEOS: 'Videos',
@@ -9,26 +10,23 @@ export const MEDIA_TYPE = {
 }
 
 export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option|Taro.saveVideoToPhotosAlbum.Option, type:string, API:string):Promise<Taro.General.CallbackResult> {
+  const { filePath, success, fail, complete } = opts
   const status = await askAsyncPermissions(Permissions.CAMERA_ROLL)
   if (status !== 'granted') {
     const res = { errMsg: 'Permissions denied!' }
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
-  const { filePath, success, fail, complete } = opts
+
   const res: any = { errMsg: `${API}:ok` }
   const saveType = (type === 'video' || type === 'photo') ? type : 'auto'
-  return CameraRoll.save(filePath, { type: saveType })
-    .then((url) => {
-      res.path = url
-      success?.(res)
-      complete?.(res)
-      return Promise.resolve(res)
-    }).catch((err) => {
-      res.errMsg = err.message
-      fail?.(res)
-      complete?.(res)
-      return Promise.reject(res)
-    })
+  try {
+    const url: string = await CameraRoll.save(filePath, { type: saveType })
+    res.path = url;
+    return successHandler(success, complete)(res)
+  } catch (err) {
+    res.errMsg = err.message
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 export async function chooseMedia(opts: Taro.chooseImage.Option|Taro.chooseVideo.Option, mediaTypes: string): Promise<Taro.General.CallbackResult> {
@@ -45,50 +43,42 @@ export async function chooseMedia(opts: Taro.chooseImage.Option|Taro.chooseVideo
   const status = isCamera ? await askAsyncPermissions(Permissions.CAMERA) : await askAsyncPermissions(Permissions.CAMERA_ROLL)
   if (status !== 'granted') {
     const res = { errMsg: 'Permissions denied!' }
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
 
-  let p
-  return new Promise((resolve, reject) => {
-    p = isCamera ? ImagePicker.launchCameraAsync(options as any) : ImagePicker.launchImageLibraryAsync(options as any)
-    p.then((resp) => {
-      const { uri, duration, width, height } = resp
-      resp.path = uri
+  let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync
+  try {
+    const resp: any = await launchMediaAsync(options as any)
+    const { uri, duration, width, height } = resp
+    resp.path = uri
 
-      let res: any = {}
-      if (mediaTypes === MEDIA_TYPE.VIDEOS) {
-        res = {
-          tempFilePath: uri,
-          duration,
-          width,
-          height
-        }
-      } else {
-        res = {
-          tempFilePaths: [uri],
-          tempFiles: [resp]
-        }
+    let res: any = {}
+    if (mediaTypes === MEDIA_TYPE.VIDEOS) {
+      res = {
+        tempFilePath: uri,
+        duration,
+        width,
+        height
       }
-      if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
-        success?.(res)
-        complete?.(res)
-        resolve(res as any)
-      } else {
-        const res = {
-          errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo:fail cancel' : 'chooseImage:fail cancel',
-        }
-        fail?.(res)
-        complete?.(res)
-        reject(res)
+    } else {
+      res = {
+        tempFilePaths: [uri],
+        tempFiles: [resp]
       }
-    }).catch((err) => {
+    }
+    if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
+      return successHandler(success, complete)(res)
+    } else {
       const res = {
-        errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo fail' : 'chooseImage fail',
-        err
+        errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo:fail cancel' : 'chooseImage:fail cancel',
       }
-      fail?.(res)
-      complete?.(res)
-      reject(res)
-    })
-  })
+      return errorHandler(fail, complete)(res)
+    }
+  } catch (err) {
+    const res = {
+      errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo fail' : 'chooseImage fail',
+      err
+    }
+    return errorHandler(fail, complete)(res)
+  }
 }

package/src/lib/network.ts

@@ -13,14 +13,14 @@ export function getNetworkType(opts: Taro.getNetworkType.Option = {}): Promise<T
       .then((connectionInfo) => {
         res.networkType = connectionInfo.type
         res.errMsg = 'getNetworkType:ok'
-        success && success(res)
-        complete && complete(res)
+        success?.(res)
+        complete?.(res)
 
         resolve(res)
       }).catch((err) => {
         res.errMsg = err.message
-        fail && fail(res)
-        complete && complete(res)
+        fail?.(res)
+        complete?.(res)
 
         reject(err)
       })