fix(@aws-amplify/interactions): add audio type Uint8Array to lexV1 (#…

…10273) * fix(interactions): add audio type Uint8Array to lexV1
aws-amplify · Aug 31, 2022 · 840086d · 840086d
1 parent 91fdcd9
commit 840086d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/packages/interactions/src/Providers/AWSLexProvider.ts b/packages/interactions/src/Providers/AWSLexProvider.ts
@@ -31,7 +31,7 @@ import {
 	Credentials,
 	getAmplifyUserAgent,
 } from '@aws-amplify/core';
-import { convert } from './AWSLexProviderHelper/convert';
+import { convert } from './AWSLexProviderHelper/utils';
 
 const logger = new Logger('AWSLexProvider');
 
@@ -163,17 +163,17 @@ export class AWSLexProvider extends AbstractInteractionsProvider {
 				content,
 				options: { messageType },
 			} = message;
-			if (messageType === 'voice') {
-				if (!(content instanceof Blob || content instanceof ReadableStream))
-					return Promise.reject('invalid content type');
+			if (messageType === 'voice' && typeof content === 'object') {
+				const inputStream =
+					content instanceof Uint8Array ? content : await convert(content);
 
 				params = {
 					botAlias: this._config[botname].alias,
 					botName: botname,
 					contentType: 'audio/x-l16; sample-rate=16000; channel-count=1',
-					inputStream: await convert(content),
 					userId: credentials.identityId,
 					accept: 'audio/mpeg',
+					inputStream,
 				};
 			} else {
 				if (typeof content !== 'string')

diff --git a/packages/interactions/src/Providers/AWSLexProviderHelper/commonUtils.ts b/packages/interactions/src/Providers/AWSLexProviderHelper/commonUtils.ts
@@ -11,7 +11,7 @@
  * and limitations under the License.
  */
 import { strFromU8 } from 'fflate';
-import { base64ToArrayBuffer, gzipDecompress } from './convert';
+import { base64ToArrayBuffer, gzipDecompress } from './utils';
 
 export const unGzipBase64AsJson = async (gzipBase64: string | undefined) => {
 	if (typeof gzipBase64 === 'undefined') return undefined;

diff --git a/...rs/AWSLexProviderHelper/convert.native.ts → ...ders/AWSLexProviderHelper/utils.native.ts b/...rs/AWSLexProviderHelper/convert.native.ts → ...ders/AWSLexProviderHelper/utils.native.ts
@@ -14,7 +14,11 @@
 import { decode } from 'base-64';
 import { gunzipSync } from 'fflate';
 
-export const convert = async (stream: Blob): Promise<Uint8Array> => {
+export const convert = async (stream: object): Promise<Uint8Array> => {
+	if (!(stream instanceof Blob)) {
+		return Promise.reject('Invalid content type');
+	}
+
 	return new Promise(async (resolve, reject) => {
 		try {
 			const fileReaderInstance = new FileReader();

diff --git a/...Providers/AWSLexProviderHelper/convert.ts → ...c/Providers/AWSLexProviderHelper/utils.ts b/...Providers/AWSLexProviderHelper/convert.ts → ...c/Providers/AWSLexProviderHelper/utils.ts
@@ -11,18 +11,15 @@
  * and limitations under the License.
  */
 
-import { Readable } from 'stream';
 import { gunzip } from 'fflate';
 
-export const convert = async (
-	stream: Blob | Readable | ReadableStream
-): Promise<Uint8Array> => {
+export const convert = async (stream: object): Promise<Uint8Array> => {
 	if (stream instanceof Blob || stream instanceof ReadableStream) {
 		return new Response(stream)
 			.arrayBuffer()
 			.then(buffer => new Uint8Array(buffer));
 	} else {
-		return Promise.reject('Readable is not supported.');
+		return Promise.reject('Invalid content type');
 	}
 };
 

diff --git a/packages/interactions/src/Providers/AWSLexV2Provider.ts b/packages/interactions/src/Providers/AWSLexV2Provider.ts
@@ -31,7 +31,7 @@ import {
 	Credentials,
 	getAmplifyUserAgent,
 } from '@aws-amplify/core';
-import { convert } from './AWSLexProviderHelper/convert';
+import { convert } from './AWSLexProviderHelper/utils';
 import { unGzipBase64AsJson } from './AWSLexProviderHelper/commonUtils';
 
 const logger = new Logger('AWSLexV2Provider');
@@ -301,18 +301,7 @@ export class AWSLexV2Provider extends AbstractInteractionsProvider {
 		let params: RecognizeUtteranceCommandInput;
 
 		// prepare params
-		if (messageType === 'voice') {
-			// voice input
-			if (
-				!(
-					content instanceof Blob ||
-					content instanceof ReadableStream ||
-					content instanceof Uint8Array
-				)
-			) {
-				return Promise.reject('invalid content type');
-			}
-
+		if (messageType === 'voice' && typeof content === 'object') {
 			const inputStream =
 				content instanceof Uint8Array ? content : await convert(content);