添加鸿蒙系统兼容性检查

Author: yinxulai

packages/harmony/library/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change logs
 
+## v1.0.0-rc.3 (2024-01-12)
+
+### 改动
+
+- 添加直传的非完整能力支持
+- 添加系统接口的调用前检查
+
 ## v1.0.0-rc.2 (2024-01-09)
 
 ### 改动

packages/harmony/library/README.md

@@ -92,7 +92,6 @@ interface Context {
 - `result`：上传成功的信息。
 - `error`：队列的错误。
 - `progress`：整体的任务进度信息。
-- `setup()`：初始化函数，队列开始时执行。
 
 ### UploadConfig
 
@@ -102,14 +101,16 @@ interface UploadConfig {
   serverUrl?: string;
   logLevel?: LogLevel;
   protocol?: HttpProtocol;
+  vars?: Record<string, string>;
 }
 ```
 
 - 上传配置接口，用于配置上传任务的相关参数。
 - `serverUrl`：服务器 URL，默认为 api.qiniu.com，专有云根据情况填写。
-- `logLevel`：日志级别。
+- `logLevel`：日志级别，默认为 NONE，不输出任何日志。
 - `protocol`：HTTP 协议，默认 HTTPS。
 - `tokenProvider`：用于获取上传所需 token 的函数。
+- `vars`: 上传过程中是用的自定义变量。
 
 ### OnError
 

packages/harmony/library/oh-package.json5

@@ -1,6 +1,6 @@
 {
   "name": "@qiniu/upload",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.3",
   "keywords": ["qiniu", "upload", "oss"],
   "description": "Qiniu Cloud object storage upload sdk",
   "repository": "https://github.com/qiniu/js-sdk.git",

packages/harmony/library/src/main/ets/components/file/index.ts

@@ -50,6 +50,10 @@ export class UploadFile implements common.IFile {
     }
 
     const initData = async (): Promise<common.Result<boolean>> => {
+      if (!canIUse('SystemCapability.FileManagement.File.FileIO')) {
+        return { error: new common.UploadError('FileSystemError', 'The current system api version does not support') }
+      }
+      
       if (this.data.type === 'uri') {
         // 如果已经是 internal://cache/ 的文件 url 直接赋值更新
         if (this.data.data.startsWith('internal://cache/')) {

packages/harmony/library/src/main/ets/components/http/index.ts

@@ -52,6 +52,10 @@ export class HttpClient implements HttpClient {
   private async request(url: string, options: RequestOptions): Promise<common.Result<common.HttpResponse>> {
     // 使用 requestApi 接口发送请求
     if (shouldUseUploadFile(options)) {
+      if (!canIUse('SystemCapability.MiscServices.Upload')) {
+        return { error: new common.UploadError('NetworkError', 'The current system api version does not support') }
+      }
+
       const files: requestApi.File[] = []
       const formData: requestApi.RequestData[] = []
       const bodyEntries = (options.body as common.HttpFormData).entries()
@@ -120,13 +124,12 @@ export class HttpClient implements HttpClient {
                 })
               })
 
-              task.on('fail', states => {
-                const firstState = states[0]
+              task.on('fail', () => {
                 return resolve({
                   result: {
-                    data: firstState.message,
-                    code: firstState.responseCode,
-                    reqId: 'UploadFile api cannot get this value'
+                    data: '',
+                    code: responseCode,
+                    reqId: responseHeader['X-Reqid']
                   }
                 })
               })
@@ -144,6 +147,10 @@ export class HttpClient implements HttpClient {
       })
     }
 
+    if (!canIUse('SystemCapability.Communication.NetStack')) {
+      return { error: new common.UploadError('NetworkError', 'The current system api version does not support') }
+    }
+
     let estimatedTime = 5 // 预估耗时默认为 5s
     let normalizedBody: string | ArrayBuffer | Object | undefined = options?.body as any
 

packages/harmony/library/src/main/ets/components/index.ts

@@ -20,9 +20,9 @@ function onCancel(task: common.UploadTask, listener: () => Promise<common.Result
 }
 
 /**
- * @deprecated 系统原因一直无法调通，请使用分片上传
+ * @deprecated 受限于当前版本的系统接口暂时无法获取上传之后的结果，优先考虑是用分片。
  */
-export  function createDirectUploadTask(context: ohCommon.Context, file: FileData, config: common.UploadConfig) {
+export function createDirectUploadTask(context: ohCommon.Context, file: FileData, config: common.UploadConfig) {
   const innerFile = new UploadFile(context, file)
   config.httpClient = config.httpClient ?? new HttpClient(context)
   const task = common.createDirectUploadTask(innerFile, config)