fix: 优化 App 端文件接口错误回调

src/core/helpers/protocol/file/file.js

+import getRealPath from 'uni-platform/helpers/get-real-path'
+
+export const saveFile = {
+  tempFilePath: {
+    type: String,
+    required: true,
+    validator (value, params) {
+      params.tempFilePath = getRealPath(value)
+    }
+  }
+}
+
+const TYPES = ['md5', 'sha1']
+
+export const getFileInfo = {
+  filePath: {
+    type: String,
+    required: true,
+    validator (value, params) {
+      params.filePath = getRealPath(value)
+    }
+  },
+  digestAlgorithm: {
+    type: String,
+    validator (value, params) {
+      params.digestAlgorithm = TYPES.includes(value) ? value : TYPES[0]
+    },
+    default: TYPES[0]
+  }
+}
+
+export const getSavedFileInfo = {
+  filePath: {
+    type: String,
+    required: true,
+    validator (value, params) {
+      params.filePath = getRealPath(value)
+    }
+  }
+}
+
+export const removeSavedFile = {
+  filePath: {
+    type: String,
+    required: true,
+    validator (value, params) {
+      params.filePath = getRealPath(value)
+    }
+  }
+}

src/platforms/app-plus/service/api/file/file.js

 import {
-  getRealPath
+  warpPlusMethod,
+  warpPlusErrorCallback
 } from '../util'
 
 import {
@@ -8,36 +9,29 @@ import {
 
 const SAVED_DIR = 'uniapp_save'
 const SAVE_PATH = `_doc/${SAVED_DIR}`
-const REGEX_FILENAME = /^.*[/]/
 
 function getSavedFileDir (success, fail) {
-  fail = fail || function () {}
+  fail = fail || function () { }
   plus.io.requestFileSystem(plus.io.PRIVATE_DOC, fs => { // 请求_doc fs
     fs.root.getDirectory(SAVED_DIR, { // 获取文件保存目录对象
       create: true
-    }, dir => {
-      success(dir)
-    }, err => {
-      fail('目录[' + SAVED_DIR + ']创建失败' + err.message)
-    })
-  }, err => {
-    fail('目录[_doc]读取失败' + err.message)
-  })
+    }, success, fail)
+  }, fail)
+}
+
+function getFileName (path) {
+  const array = path.split('/')
+  return array[array.length - 1]
 }
 
 export function saveFile ({
   tempFilePath
 } = {}, callbackId) {
-  let fileName = tempFilePath.replace(REGEX_FILENAME, '')
-  if (fileName) {
-    let extName = ''
-    if (~fileName.indexOf('.')) {
-      extName = '.' + fileName.split('.').pop()
-    }
-
-    fileName = (+new Date()) + '' + extName
+  const errorCallback = warpPlusErrorCallback(callbackId, 'saveFile')
+  let fileName = getFileName(tempFilePath)
+  fileName = `${Date.now()}_${fileName}`
 
-    plus.io.resolveLocalFileSystemURL(getRealPath(tempFilePath), entry => { // 读取临时文件 FileEntry
+  plus.io.resolveLocalFileSystemURL(tempFilePath, entry => { // 读取临时文件 FileEntry
     getSavedFileDir(dir => {
       entry.copyTo(dir, fileName, () => { // 复制临时文件 FileEntry，为了避免把相册里的文件删除，使用 copy，微信中是要删除临时文件的
         const savedFilePath = SAVE_PATH + '/' + fileName
@@ -45,30 +39,14 @@ export function saveFile ({
           errMsg: 'saveFile:ok',
           savedFilePath
         })
-        }, err => {
-          invoke(callbackId, {
-            errMsg: 'saveFile:fail 保存文件[' + tempFilePath +
-              '] copyTo 失败:' + err.message
-          })
-        })
-      }, message => {
-        invoke(callbackId, {
-          errMsg: 'saveFile:fail ' + message
-        })
-      })
-    }, err => {
-      invoke(callbackId, {
-        errMsg: 'saveFile:fail 文件[' + tempFilePath + ']读取失败' + err.message
-      })
-    })
-  } else {
-    return {
-      errMsg: 'saveFile:fail 文件名[' + tempFilePath + ']不存在'
-    }
-  }
+      }, errorCallback)
+    }, errorCallback)
+  }, errorCallback)
 }
 
 export function getSavedFileList (options, callbackId) {
+  const errorCallback = warpPlusErrorCallback(callbackId, 'getSavedFileList')
+
   getSavedFileDir(entry => {
     var reader = entry.createReader()
 
@@ -88,11 +66,7 @@ export function getSavedFileList (options, callbackId) {
                 fileList
               })
             }
-          }, error => {
-            invoke(callbackId, {
-              errMsg: 'getSavedFileList:fail ' + error.message
-            })
-          }, false)
+          }, errorCallback, false)
         })
       } else {
         invoke(callbackId, {
@@ -100,82 +74,38 @@ export function getSavedFileList (options, callbackId) {
           fileList
         })
       }
-    }, error => {
-      invoke(callbackId, {
-        errMsg: 'getSavedFileList:fail ' + error.message
-      })
-    })
-  }, message => {
-    invoke(callbackId, {
-      errMsg: 'getSavedFileList:fail ' + message
-    })
-  })
+    }, errorCallback)
+  }, errorCallback)
 }
 
-export function getFileInfo ({
-  filePath,
-  digestAlgorithm = 'md5'
-} = {}, callbackId) {
-  // TODO 计算文件摘要
-  plus.io.resolveLocalFileSystemURL(getRealPath(filePath), entry => {
-    entry.getMetadata(meta => {
-      invoke(callbackId, {
-        errMsg: 'getFileInfo:ok',
-        size: meta.size,
-        digestAlgorithm: ''
-      })
-    }, err => {
-      invoke(callbackId, {
-        errMsg: 'getFileInfo:fail 文件[' +
-          filePath +
-          '] getMetadata 失败:' + err.message
-      })
-    })
-  }, err => {
-    invoke(callbackId, {
-      errMsg: 'getFileInfo:fail 文件[' + filePath + ']读取失败:' + err.message
-    })
-  })
-}
+export const getFileInfo = warpPlusMethod(plus.io, 'getFileInfo')
 
 export function getSavedFileInfo ({
   filePath
 } = {}, callbackId) {
-  plus.io.resolveLocalFileSystemURL(getRealPath(filePath), entry => {
+  const errorCallback = warpPlusErrorCallback(callbackId, 'getSavedFileInfo')
+
+  plus.io.resolveLocalFileSystemURL(filePath, entry => {
     entry.getMetadata(meta => {
       invoke(callbackId, {
         createTime: meta.modificationTime.getTime(),
         size: meta.size,
         errMsg: 'getSavedFileInfo:ok'
       })
-    }, error => {
-      invoke(callbackId, {
-        errMsg: 'getSavedFileInfo:fail ' + error.message
-      })
-    }, false)
-  }, () => {
-    invoke(callbackId, {
-      errMsg: 'getSavedFileInfo:fail file not find'
-    })
-  })
+    }, errorCallback, false)
+  }, errorCallback)
 }
 
 export function removeSavedFile ({
   filePath
 } = {}, callbackId) {
-  plus.io.resolveLocalFileSystemURL(getRealPath(filePath), entry => {
+  const errorCallback = warpPlusErrorCallback(callbackId, 'removeSavedFile')
+
+  plus.io.resolveLocalFileSystemURL(filePath, entry => {
     entry.remove(() => {
       invoke(callbackId, {
         errMsg: 'removeSavedFile:ok'
       })
-    }, err => {
-      invoke(callbackId, {
-        errMsg: 'removeSavedFile:fail 文件[' + filePath + ']删除失败:' + err.message
-      })
-    })
-  }, () => {
-    invoke(callbackId, {
-      errMsg: 'removeSavedFile:fail file not find'
-    })
-  })
+    }, errorCallback)
+  }, errorCallback)
 }

src/platforms/app-plus/service/api/media/choose-video.js

@@ -6,17 +6,16 @@ import {
   invoke
 } from '../../bridge'
 
+import {
+  warpPlusErrorCallback
+} from '../util'
+
 export function chooseVideo ({
   sourceType = ['album', 'camera'],
   maxDuration = 60,
   camera = 'back'
 } = {}, callbackId) {
-  function errorCallback (error) {
-    error = error || {}
-    invoke(callbackId, {
-      errMsg: `chooseVideo:fail ${error.message || 'cancel'}`
-    })
-  }
+  const errorCallback = warpPlusErrorCallback(callbackId, 'chooseVideo', 'cancel')
 
   function successCallback (tempFilePath = '') {
     plus.io.getVideoInfo({

src/platforms/app-plus/service/api/util.js

@@ -179,6 +179,16 @@ export function warpPlusEvent (origin, name) {
   }
 }
 
+export function warpPlusErrorCallback (callbackId, neme, errMsg) {
+  return function errorCallback (error) {
+    error = error || {}
+    invoke(callbackId, {
+      errMsg: `${neme}:fail ${error.message || errMsg || ''}`,
+      errCode: error.code || 0
+    })
+  }
+}
+
 export function warpPlusMethod (origin, name, before) {
   return function (options, callbackId) {
     if (typeof before === 'function') {
@@ -192,12 +202,7 @@ export function warpPlusMethod (origin, name, before) {
           errMsg: `${name}:ok`
         }))
       },
-      fail (error = {}) {
-        invoke(callbackId, {
-          errMsg: `${name}:fail ${error.message || ''}`,
-          errCode: error.code || 0
-        })
-      }
+      fail: warpPlusErrorCallback(callbackId, name)
     }))
   }
 }