@react-native-ohos/react-native-audio 4.2.3-rc.1 → 4.2.3-rc.3

package/README.OpenSource

@@ -0,0 +1,11 @@
+[
+    {
+        "Name": "react-native-audio",
+        "License": "MIT License",
+        "License File": "https://github.com/jsierles/react-native-audio/blob/master/LICENSE",
+        "Version Number": "4.2.2",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/jsierles/react-native-audio",
+        "Description": "Audio recorder library for React Native"
+    }
+]

package/README.md

@@ -11,5 +11,5 @@ This project is based on [react-native-audio](https://github.com/jsierles/react-
 
 ## License
 
-This library is licensed under [The MIT License (MIT)](https://gitee.com/openharmony-sig/rntpc_react-native-audio/blob/master/LICENSE).
+This library is licensed under [The MIT License (MIT)](https://gitcode.com/openharmony-sig/rntpc_react-native-audio/blob/master/LICENSE).
 

package/harmony/audio/oh-package.json5

@@ -5,7 +5,7 @@
   description: '',
   main: 'index.ets',
   type: 'module',
-  version: '4.2.3-rc.1',
+  version: '4.2.3-rc.3',
   dependencies: {
     "@rnoh/react-native-openharmony": "^0.72.38"
   },

package/harmony/audio/src/main/ets/AudioRecordManager.ts

@@ -64,16 +64,16 @@ export class AudioRecordManager {
   async prepareRecordingAtPath(path: string, options: RecordingOptions): Promise<void> {
     if (this.isRecording) {
       this.logger.error('Please call stopRecording before starting recording.');
-      return;
+      return Promise.reject('Please call stopRecording before starting recording.')
     }
     if (path === '') {
       this.logger.error('Invalid path.');
-      return;
+      return Promise.reject('Invalid path.')
     }
     const isAuthorization = await this.checkAuthorizationStatus();
     if (!isAuthorization) {
       this.logger.error('Please obtain microphone authorization first.');
-      return;
+      return Promise.reject('Please obtain microphone authorization first.')
     }
     try {
       //创建录制实例
@@ -102,15 +102,12 @@ export class AudioRecordManager {
       this.file = fs.openSync(path, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE);
       this.avConfig.url = `fd://${this.file.fd}`;
       this.includeBase64 = options.IncludeBase64;
-      await this.avRecorder.prepare(this.avConfig).then((res) => {
-        this.logger.info(`${res}.`);
-      }).catch((err) => {
-        this.logger.error(`${err}.`);
-      });
+      await this.avRecorder.prepare(this.avConfig)
       this.logger.info(`Recording is prepared.`);
       this.logger.debug('Recording is prepared.');
     } catch (error) {
       this.logger.error(`${JSON.stringify(error)}.`);
+      return Promise.reject(error)
     }
   }
 
@@ -150,6 +147,7 @@ export class AudioRecordManager {
       }
     } catch (error) {
       this.logger.error(`requestPermissionsFromUser failed, code is ${error?.code}, message is ${error?.message}.`);
+      return Promise.reject(error)
     }
   }
 
@@ -165,17 +163,19 @@ export class AudioRecordManager {
       tokenId = appInfo.accessTokenId;
     } catch (error) {
       this.logger.error(`getBundleInfoForSelf failed, code is ${error?.code}, message is ${error?.message}.`);
+      return Promise.reject(error)
     }
     //检查应用是否被授予权限
     try {
       grantStatus = await atManager.checkAccessToken(tokenId, permission);
     } catch (error) {
       this.logger.error(`checkAccessToken failed, code is ${error?.code}, message is ${error?.message}.`);
+      return Promise.reject(error)
     }
     return grantStatus === abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED;
   }
 
-  //格式化音频输入源
+  //格式化音频输入源 
   getAudioSourceFormatString(audioSource: number) {
     switch (audioSource) {
       case 0:
@@ -202,8 +202,12 @@ export class AudioRecordManager {
   //格式化封装格式，当前仅支持m4a
   getFileFormatFormatString(fileFormat: string) {
     switch (fileFormat) {
-      case 'm4a':
-        return media.ContainerFormatType.CFT_MPEG_4A;
+      case 'aac':
+        if (media.ContainerFormatType["CFT_AAC"]) {
+          return media.ContainerFormatType["CFT_AAC"];
+        } else {
+          return media.ContainerFormatType.CFT_MPEG_4A;
+        }
       default:
         this.logger.debug(`Using media.ContainerFormatType.CFT_MPEG_4A : ${media.ContainerFormatType.CFT_MPEG_4A}.`);
         return media.ContainerFormatType.CFT_MPEG_4A;
@@ -215,11 +219,12 @@ export class AudioRecordManager {
     try {
       if (this.avRecorder.state === AVRecorderStateEnum.STARTED || this.avRecorder.state === AVRecorderStateEnum.PAUSED) {
         this.logger.error('Please call stopRecording before starting recording.');
-        return;
+        return Promise.reject('Please call stopRecording before starting recording.')
+        
       }
       if (this.avRecorder.state !== AVRecorderStateEnum.PREPARED) {
         this.logger.error('Please call prepareRecording before starting recording.');
-        return;
+        return Promise.reject('Please call prepareRecording before starting recording.')
       }
       await this.avRecorder.start();
       this.isRecording = true;
@@ -230,6 +235,7 @@ export class AudioRecordManager {
       this.startTimer();
     } catch (error) {
       this.logger.error(`startRecording failed, code is ${error?.code}, message is ${error?.message}.`);
+      return Promise.reject(error)
     }
   }
 
@@ -242,10 +248,11 @@ export class AudioRecordManager {
         this.logger.debug('pause recording.');
       } catch (error) {
         this.logger.error(`pauseRecording failed, code is ${error?.code}, message is ${error?.message}.`);
+        return Promise.reject(error)
       }
     } else {
       this.logger.error('It is reasonable to call pauseRecording only in the started state.');
-      return;
+      return Promise.reject('It is reasonable to call pauseRecording only in the started state.')
     }
   }
 
@@ -258,10 +265,11 @@ export class AudioRecordManager {
         this.logger.debug('resume recording.');
       } catch (error) {
         this.logger.error(`resumeRecording failed. code is ${error?.code}, message is ${error?.message}.`);
+        return Promise.reject(`resumeRecording failed. code is ${error?.code}, message is ${error?.message}.`)
       }
     } else {
       this.logger.error('It is reasonable to call resumeRecording only in the paused state.');
-      return;
+      return Promise.reject('It is reasonable to call resumeRecording only in the paused state.')
     }
   }
 
@@ -288,7 +296,7 @@ export class AudioRecordManager {
       }
     } else {
       this.logger.error('It is reasonable to call stopRecording only in the started or paused state.');
-      return;
+      return Promise.reject('It is reasonable to call stopRecording only in the started or paused state.')
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-audio",
-  "version": "4.2.3-rc.1",
+  "version": "4.2.3-rc.3",
   "description": "React Native extension for recording audio",
   "main": "index.js",
   "author": "Joshua Sierles <joshua@diluvia.net> (https://github.com/jsierles)",
@@ -21,7 +21,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/openharmony-sig/rntpc_react-native-audio"
+    "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-audio"
   },
   "scripts": {
     "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-audio --cpp-output-path ./harmony/audio/src/main/cpp/generated --ets-output-path ./harmony/audio/src/main/ets/generated --turbo-modules-spec-paths ./NativeAudio.ts "