@react-native-ohos/audio-toolkit 2.0.4-rc.2 → 2.0.4-rc.3

package/src/PlayerModule.ts

@@ -1,51 +1,51 @@
-import {
-  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-  TurboModuleRegistry,
-  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-  TurboModule,
-  EmitterSubscription,
-  NativeEventEmitter,
-} from 'react-native';
-// @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-
-enum PlaybackCategories {
-  Playback = 1,
-  Ambient = 2,
-  SoloAmbient = 3
-}
-
-interface Option {
-  autoDestroy: boolean;
-  continuesToPlayInBackground: boolean;
-  category: PlaybackCategories;
-  mixWithOthers: boolean;
-}
-interface setOptions {
-  volume: string,
-  pan: string,
-  wakeLock: string,
-  looping: boolean,
-  speed: boolean,
-}
-
-interface PlayInfo {
-  duration: number,
-  position: number
-}
-
-export interface Spec extends TurboModule {
-  set(playerId: number, option: setOptions, next: () => void): void;
-  prepare(playerId: number, path: string, option: Option, next: () => void): void;
-  play(playerId: number, next: () => void): void;
-  pause(): void;
-  stop(): void;
-  destroy(content: string): void;
-  seek(): void;
-  getCurrentTime(playerId: number, callback: (err: string, result?: PlayInfo) => void): void
-}
-
-const RCTAudioPlayer =
-  TurboModuleRegistry.getEnforcing<Spec>('RCTAudioPlayer');
-
-export default RCTAudioPlayer;
+import {
+  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+  TurboModuleRegistry,
+  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+  TurboModule,
+  EmitterSubscription,
+  NativeEventEmitter,
+} from 'react-native';
+// @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+
+enum PlaybackCategories {
+  Playback = 1,
+  Ambient = 2,
+  SoloAmbient = 3
+}
+
+interface Option {
+  autoDestroy: boolean;
+  continuesToPlayInBackground: boolean;
+  category: PlaybackCategories;
+  mixWithOthers: boolean;
+}
+interface setOptions {
+  volume: string,
+  pan: string,
+  wakeLock: string,
+  looping: boolean,
+  speed: boolean,
+}
+
+interface PlayInfo {
+  duration: number,
+  position: number
+}
+
+export interface Spec extends TurboModule {
+  set(playerId: number, option: setOptions, next: () => void): void;
+  prepare(playerId: number, path: string, option: Option, next: () => void): void;
+  play(playerId: number, next: () => void): void;
+  pause(): void;
+  stop(): void;
+  destroy(content: string): void;
+  seek(): void;
+  getCurrentTime(playerId: number, callback: (err: string, result?: PlayInfo) => void): void
+}
+
+const RCTAudioPlayer =
+  TurboModuleRegistry.getEnforcing<Spec>('RCTAudioPlayer');
+
+export default RCTAudioPlayer;

package/src/Recorder.js

@@ -1,183 +1,183 @@
-'use strict';
-import {
-  NativeAppEventEmitter,
-  DeviceEventEmitter
-} from 'react-native'
-import RCTAudioRecorder from './RecorderModule'
-import async from 'async';
-import EventEmitter from 'eventemitter3';
-import MediaStates from '@react-native-community/audio-toolkit/src/MediaStates';
-
-// Only import specific items from lodash to keep build size down
-import noop from 'lodash/noop';
-
-var recorderId = 0;
-
-var defaultRecorderOptions = {
-  autoDestroy: true
-};
-
-/**
- * Represents a media recorder
- * @constructor
- */
-class Recorder extends EventEmitter {
-  constructor(path, options = defaultRecorderOptions) {
-    super();
-
-    this._path = path;
-    this._options = options;
-
-    this._recorderId = recorderId++;
-    this._reset();
-
-    let appEventEmitter = Platform.OS === 'ios' ? NativeAppEventEmitter : DeviceEventEmitter;
-
-    appEventEmitter.addListener('RCTAudioRecorderEvent:' + this._recorderId, (payload: Event) => {
-      this._handleEvent(payload.event, payload.data);
-    });
-  }
-
-  _reset() {
-    this._state = MediaStates.IDLE;
-    this._duration = -1;
-    this._position = -1;
-    this._lastSync = -1;
-  }
-
-  _updateState(err, state) {
-    this._state = err ? MediaStates.ERROR : state;
-  }
-
-  _handleEvent(event, data) {
-    switch (event) {
-      case 'ended':
-        this._state = Math.min(this._state, MediaStates.PREPARED);
-        break;
-      case 'info':
-        // TODO
-        break;
-      case 'error':
-        this._reset();
-        break;
-    }
-
-    this.emit(event, data);
-  }
-
-  prepare(callback = noop) {
-    if (Platform.OS !== 'harmony') {
-      this._updateState(null, MediaStates.PREPARING);
-      // Prepare recorder
-      RCTAudioRecorder.prepare(this._recorderId, this._path, this._options, (err, fsPath) => {
-        this._fsPath = fsPath;
-        this._updateState(err, MediaStates.PREPARED);
-        callback(err, fsPath);
-      });
-    } else {
-      RCTAudioRecorder.prepare(this._recorderId, this._path, this._options, (err, fsPath) => {
-        this._fsPath = fsPath;
-        this._updateState(err, MediaStates.PREPARED);
-        callback(err, fsPath);
-      }, (err) => {
-        this._updateState(err, MediaStates.PREPARING);
-      });
-    }
-    return this;
-  }
-
-  record(callback = noop) {
-    let tasks = [];
-    // Make sure recorder is prepared
-    if (this._state === MediaStates.IDLE) {
-      tasks.push((next) => {
-        this.prepare((err, fsPath) => {
-          this.harmonyPrepareCallBack(err, fsPath, callback);
-        });
-      });
-    }
-    // Start recording
-    tasks.push((next) => {
-      RCTAudioRecorder.record(this._recorderId, next);
-    });
-    async.series(tasks, (err) => {
-      if (Platform.OS !== 'harmony') {
-        this._updateState(err, MediaStates.RECORDING);
-        callback(err);
-        return;
-      }
-      if (this._state === MediaStates.PAUSED) {
-        this._updateState(err, MediaStates.RECORDING);
-        callback(err);
-      }
-    });
-    return this;
-  }
-
-  harmonyPrepareCallBack(err, fsPath, callback = noop) {
-    if (Platform.OS !== 'harmony') {
-      return;
-    }
-    if (fsPath) {
-      this._updateState(err, MediaStates.RECORDING);
-      callback(err, fsPath);
-    } else {
-      this._updateState(err, MediaStates.IDLE);
-      callback(err, null);
-    }
-  }
-
-  stop(callback = noop) {
-    if (this._state >= MediaStates.RECORDING) {
-      RCTAudioRecorder.stop(this._recorderId, (err) => {
-        this._updateState(err, MediaStates.DESTROYED);
-        callback(err);
-      });
-    } else {
-      setTimeout(callback, 0);
-    }
-
-    return this;
-  }
-
-  pause(callback = noop) {
-    if (this._state >= MediaStates.RECORDING) {
-      RCTAudioRecorder.pause(this._recorderId, (err) => {
-        this._updateState(err, MediaStates.PAUSED);
-        callback(err);
-      });
-    } else {
-      setTimeout(callback, 0);
-    }
-
-    return this;
-  }
-
-  toggleRecord(callback = noop) {
-    if (this._state === MediaStates.RECORDING) {
-      this.stop((err) => {
-        callback(err, true);
-      });
-    } else {
-      this.record((err) => {
-        callback(err,false);
-      });
-    }
-
-    return this;
-  }
-
-  destroy(callback = noop) {
-    this._reset();
-    RCTAudioRecorder.destroy(this._recorderId, callback);
-  }
-
-  get state()       { return this._state;                          }
-  get canRecord()   { return this._state >= MediaStates.PREPARED;  }
-  get canPrepare()  { return this._state == MediaStates.IDLE;      }
-  get isRecording() { return this._state == MediaStates.RECORDING; }
-  get isPrepared()  { return this._state == MediaStates.PREPARED;  }
-  get fsPath()      { return this._fsPath; }
-}
-
-export default Recorder;
+'use strict';
+import {
+  NativeAppEventEmitter,
+  DeviceEventEmitter
+} from 'react-native'
+import RCTAudioRecorder from './RecorderModule'
+import async from 'async';
+import EventEmitter from 'eventemitter3';
+import MediaStates from '@react-native-community/audio-toolkit/src/MediaStates';
+
+// Only import specific items from lodash to keep build size down
+import noop from 'lodash/noop';
+
+var recorderId = 0;
+
+var defaultRecorderOptions = {
+  autoDestroy: true
+};
+
+/**
+ * Represents a media recorder
+ * @constructor
+ */
+class Recorder extends EventEmitter {
+  constructor(path, options = defaultRecorderOptions) {
+    super();
+
+    this._path = path;
+    this._options = options;
+
+    this._recorderId = recorderId++;
+    this._reset();
+
+    let appEventEmitter = Platform.OS === 'ios' ? NativeAppEventEmitter : DeviceEventEmitter;
+
+    appEventEmitter.addListener('RCTAudioRecorderEvent:' + this._recorderId, (payload: Event) => {
+      this._handleEvent(payload.event, payload.data);
+    });
+  }
+
+  _reset() {
+    this._state = MediaStates.IDLE;
+    this._duration = -1;
+    this._position = -1;
+    this._lastSync = -1;
+  }
+
+  _updateState(err, state) {
+    this._state = err ? MediaStates.ERROR : state;
+  }
+
+  _handleEvent(event, data) {
+    switch (event) {
+      case 'ended':
+        this._state = Math.min(this._state, MediaStates.PREPARED);
+        break;
+      case 'info':
+        // TODO
+        break;
+      case 'error':
+        this._reset();
+        break;
+    }
+
+    this.emit(event, data);
+  }
+
+  prepare(callback = noop) {
+    if (Platform.OS !== 'harmony') {
+      this._updateState(null, MediaStates.PREPARING);
+      // Prepare recorder
+      RCTAudioRecorder.prepare(this._recorderId, this._path, this._options, (err, fsPath) => {
+        this._fsPath = fsPath;
+        this._updateState(err, MediaStates.PREPARED);
+        callback(err, fsPath);
+      });
+    } else {
+      RCTAudioRecorder.prepare(this._recorderId, this._path, this._options, (err, fsPath) => {
+        this._fsPath = fsPath;
+        this._updateState(err, MediaStates.PREPARED);
+        callback(err, fsPath);
+      }, (err) => {
+        this._updateState(err, MediaStates.PREPARING);
+      });
+    }
+    return this;
+  }
+
+  record(callback = noop) {
+    let tasks = [];
+    // Make sure recorder is prepared
+    if (this._state === MediaStates.IDLE) {
+      tasks.push((next) => {
+        this.prepare((err, fsPath) => {
+          this.harmonyPrepareCallBack(err, fsPath, callback);
+        });
+      });
+    }
+    // Start recording
+    tasks.push((next) => {
+      RCTAudioRecorder.record(this._recorderId, next);
+    });
+    async.series(tasks, (err) => {
+      if (Platform.OS !== 'harmony') {
+        this._updateState(err, MediaStates.RECORDING);
+        callback(err);
+        return;
+      }
+      if (this._state === MediaStates.PAUSED) {
+        this._updateState(err, MediaStates.RECORDING);
+        callback(err);
+      }
+    });
+    return this;
+  }
+
+  harmonyPrepareCallBack(err, fsPath, callback = noop) {
+    if (Platform.OS !== 'harmony') {
+      return;
+    }
+    if (fsPath) {
+      this._updateState(err, MediaStates.RECORDING);
+      callback(err, fsPath);
+    } else {
+      this._updateState(err, MediaStates.IDLE);
+      callback(err, null);
+    }
+  }
+
+  stop(callback = noop) {
+    if (this._state >= MediaStates.RECORDING) {
+      RCTAudioRecorder.stop(this._recorderId, (err) => {
+        this._updateState(err, MediaStates.DESTROYED);
+        callback(err);
+      });
+    } else {
+      setTimeout(callback, 0);
+    }
+
+    return this;
+  }
+
+  pause(callback = noop) {
+    if (this._state >= MediaStates.RECORDING) {
+      RCTAudioRecorder.pause(this._recorderId, (err) => {
+        this._updateState(err, MediaStates.PAUSED);
+        callback(err);
+      });
+    } else {
+      setTimeout(callback, 0);
+    }
+
+    return this;
+  }
+
+  toggleRecord(callback = noop) {
+    if (this._state === MediaStates.RECORDING) {
+      this.stop((err) => {
+        callback(err, true);
+      });
+    } else {
+      this.record((err) => {
+        callback(err,false);
+      });
+    }
+
+    return this;
+  }
+
+  destroy(callback = noop) {
+    this._reset();
+    RCTAudioRecorder.destroy(this._recorderId, callback);
+  }
+
+  get state()       { return this._state;                          }
+  get canRecord()   { return this._state >= MediaStates.PREPARED;  }
+  get canPrepare()  { return this._state == MediaStates.IDLE;      }
+  get isRecording() { return this._state == MediaStates.RECORDING; }
+  get isPrepared()  { return this._state == MediaStates.PREPARED;  }
+  get fsPath()      { return this._fsPath; }
+}
+
+export default Recorder;

package/src/RecorderModule.ts

@@ -1,83 +1,83 @@
-import {
-  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-  TurboModuleRegistry,
-  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-  TurboModule,
-} from 'react-native';
-// @ts-ignore - remove this comment when RN in the repo & example app is upgraded
-import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-
-interface RecorderOptions {
-  /**
-   * Set bitrate for the recorder, in bits per second (Default: 128000)
-   */
-  bitrate: number;
-
-  /**
-   * Set number of channels (Default: 2)
-   */
-  channels: number;
-
-  /**
-   * Set how many samples per second (Default: 44100)
-   */
-  sampleRate: number;
-
-  /**
-   * Override format. Possible values:
-   *   - Cross-platform:  'mp4', 'aac'
-   *   - Android only:    'ogg', 'webm', 'amr'
-   * 
-   * (Default: based on filename extension)
-   */
-  format: string;
-
-  /**
-   * Override encoder. Android only.
-   * 
-   * Possible values: 'aac', 'mp4', 'webm', 'ogg', 'amr'
-   * 
-   * (Default: based on filename extension)
-   */
-  encoder: string;
-
-  /**
-   * Quality of the recording, iOS only.
-   * 
-   * Possible values: 'min', 'low', 'medium', 'high', 'max'
-   * 
-   * (Default: 'medium')
-   */
-  quality: string;
-}
-
-interface Event {
-  event: string;
-  data: string | null | undefined;
-}
-
-export interface Spec extends TurboModule {
-  /**
-   * Get content of string type, this method returns a `Promise`, so you can use following code to get clipboard content
-   * ```javascript
-   * async _getContent() {
-   *   var content = await Clipboard.getString();
-   * }
-   * ```
-   */
-  // 准备
-  prepare(recorderId: number, path: string, option: RecorderOptions, next: () => void): void;
-  // 开始
-  record(recorderId: number, next: () => void): void;
-  // 停止
-  stop(recorderId: number, next: () => void): void;
-  // 暂停
-  pause(recorderId: number, next: () => void): void;
-  // 销毁
-  destroy(recorderId: number, next: () => void): void;
-}
-
-const RCTAudioRecorder =
-  TurboModuleRegistry.getEnforcing<Spec>('RCTAudioRecorder');
-
-export default RCTAudioRecorder;
+import {
+  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+  TurboModuleRegistry,
+  // @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+  TurboModule,
+} from 'react-native';
+// @ts-ignore - remove this comment when RN in the repo & example app is upgraded
+import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+
+interface RecorderOptions {
+  /**
+   * Set bitrate for the recorder, in bits per second (Default: 128000)
+   */
+  bitrate: number;
+
+  /**
+   * Set number of channels (Default: 2)
+   */
+  channels: number;
+
+  /**
+   * Set how many samples per second (Default: 44100)
+   */
+  sampleRate: number;
+
+  /**
+   * Override format. Possible values:
+   *   - Cross-platform:  'mp4', 'aac'
+   *   - Android only:    'ogg', 'webm', 'amr'
+   * 
+   * (Default: based on filename extension)
+   */
+  format: string;
+
+  /**
+   * Override encoder. Android only.
+   * 
+   * Possible values: 'aac', 'mp4', 'webm', 'ogg', 'amr'
+   * 
+   * (Default: based on filename extension)
+   */
+  encoder: string;
+
+  /**
+   * Quality of the recording, iOS only.
+   * 
+   * Possible values: 'min', 'low', 'medium', 'high', 'max'
+   * 
+   * (Default: 'medium')
+   */
+  quality: string;
+}
+
+interface Event {
+  event: string;
+  data: string | null | undefined;
+}
+
+export interface Spec extends TurboModule {
+  /**
+   * Get content of string type, this method returns a `Promise`, so you can use following code to get clipboard content
+   * ```javascript
+   * async _getContent() {
+   *   var content = await Clipboard.getString();
+   * }
+   * ```
+   */
+  // 准备
+  prepare(recorderId: number, path: string, option: RecorderOptions, next: () => void): void;
+  // 开始
+  record(recorderId: number, next: () => void): void;
+  // 停止
+  stop(recorderId: number, next: () => void): void;
+  // 暂停
+  pause(recorderId: number, next: () => void): void;
+  // 销毁
+  destroy(recorderId: number, next: () => void): void;
+}
+
+const RCTAudioRecorder =
+  TurboModuleRegistry.getEnforcing<Spec>('RCTAudioRecorder');
+
+export default RCTAudioRecorder;

package/src/index.ts

@@ -1,5 +1,5 @@
-import Player, { PlaybackCategories } from './Player';
-import Recorder from './Recorder';
-import MediaStates from '@react-native-community/audio-toolkit/src/MediaStates';
-
-export { Player, Recorder, MediaStates, PlaybackCategories };
+import Player, { PlaybackCategories } from './Player';
+import Recorder from './Recorder';
+import MediaStates from '@react-native-community/audio-toolkit/src/MediaStates';
+
+export { Player, Recorder, MediaStates, PlaybackCategories };

package/COMMITTERS.md

@@ -1,7 +0,0 @@
-## Committers列表
-
-### 以下是此项目的committer人员
-
-不区分先后顺序
-
-- [xiafeng_xf_admin](https://gitee.com/xiafeng_xf_admin)

package/harmony/audio_toolkit/BuildProfile.ets

@@ -1,17 +0,0 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '2.0.4-rc.1';
-export const BUILD_MODE_NAME = 'debug';
-export const DEBUG = true;
-export const TARGET_NAME = 'default';
-
-/**
- * BuildProfile Class is used only for compatibility purposes.
- */
-export default class BuildProfile { 
-	static readonly HAR_VERSION = HAR_VERSION;
-	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
-	static readonly DEBUG = DEBUG;
-	static readonly TARGET_NAME = TARGET_NAME;
-}