Merge branch 'master' of https://github.com/microsoft/cognitive-servi…

…ces-speech-sdk-js into release/1.33
microsoft · Nov 8, 2023 · 4d74a98 · 4d74a98
2 parents 99a0f86 + a8ecf1a
commit 4d74a98
Show file tree

Hide file tree

Showing 34 changed files with 59 additions and 13 deletions.
diff --git a/bundleApp.js b/bundleApp.js
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-window.SpeechSDK = require('./distrib/lib/microsoft.cognitiveservices.speech.sdk.js');
-
+import * as SpeechSDK from './distrib/lib/microsoft.cognitiveservices.speech.sdk.js';
+window.SpeechSDK = SpeechSDK;
diff --git a/gulpfile.cjs b/gulpfile.cjs
@@ -14,6 +14,8 @@
   gulp.task('build', gulp.series(function build() {
     return gulp.src([
       'src/**/*.ts',
+      '!src/common.browser/__mocks__/',
+      '!src/common.browser/__mocks__/**',
       'microsoft.cognitiveservices.speech.sdk.ts'],
       { base: '.' })
       .pipe(eslint({
@@ -37,7 +39,9 @@
         entry: { 
           'microsoft.cognitiveservices.speech.sdk.bundle': './bundleApp.js',
         },
-        output: { filename: '[name].js' },
+        output: { 
+          filename: '[name].js',
+        },
         devtool: 'source-map',
         module: {
           rules: [{

diff --git a/src/common.browser/AudioWorkerUrl.ts b/src/common.browser/AudioWorkerUrl.ts
diff --git a/src/common.browser/PCMRecorder.ts b/src/common.browser/PCMRecorder.ts
@@ -91,9 +91,7 @@ export class PcmRecorder implements IRecorder {
 
         if (!!context.audioWorklet && !skipAudioWorklet) {
             /* eslint-disable-next-line */
-            const audioUrl = require("./AudioWorkerUrl");
-            /* eslint-disable-next-line */
-            this.privSpeechProcessorScript = audioUrl.getAudioWorkerUrl();
+            this.privSpeechProcessorScript = new URL( /* webpackChunkName: 'script_processor_audioWorklet' */ "speech-processor.js", import.meta.url).toString(); 
 
             context.audioWorklet
                 .addModule(this.privSpeechProcessorScript)

diff --git a/src/common.browser/__mocks__/PCMRecorder.ts b/src/common.browser/__mocks__/PCMRecorder.ts
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import { Stream } from "../../common/Exports.js";
+import { IRecorder } from "../IRecorder.js";
+
+export class PcmRecorder implements IRecorder {
+    public constructor(stopInputOnRelease: boolean) {
+        void stopInputOnRelease;
+    }
+    public record(context: AudioContext, mediaStream: MediaStream, outputStream: Stream<ArrayBuffer>): void {
+        void context;
+        void mediaStream;
+        void outputStream;
+    }
+    public releaseMediaResources(context: AudioContext): void {
+        void context;
+    }
+    public setWorkletUrl(url: string): void {
+        void url;
+    }
+}
diff --git a/tests/AudioOutputStreamTests.ts b/tests/AudioOutputStreamTests.ts
@@ -7,6 +7,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects } from "./Utilities";
 
 let objsToClose: any[];
+jest.mock("../src/common.browser/PCMRecorder");
 
 beforeAll(() => {
     // Override inputs, if necessary

diff --git a/tests/AutoSourceLangDetectionTests.ts b/tests/AutoSourceLangDetectionTests.ts
@@ -27,6 +27,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects, WaitForCondition } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 const defaultTargetLanguage: string = "de-DE";
 

diff --git a/tests/ConnectionTests.ts b/tests/ConnectionTests.ts
@@ -22,6 +22,7 @@ import {
 
 import * as fs from "fs";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/ConversationTranscriberTests.ts b/tests/ConversationTranscriberTests.ts
@@ -23,6 +23,7 @@ import { Settings } from "./Settings";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 import { closeAsyncObjects, RepeatingPullStream, WaitForCondition } from "./Utilities";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/ConversationTranslatorTests.ts b/tests/ConversationTranslatorTests.ts
@@ -26,6 +26,7 @@ import {
 } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 // eslint-disable-next-line no-console
 const consoleInfo = console.info;
 

diff --git a/tests/DiagnosticsTests.ts b/tests/DiagnosticsTests.ts
@@ -6,7 +6,7 @@ import * as sdk from "../microsoft.cognitiveservices.speech.sdk";
 import { Settings } from "./Settings";
 import { closeAsyncObjects, WaitForCondition } from "./Utilities";
 
-
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll((): void => {

diff --git a/tests/DialogServiceConnectorTests.ts b/tests/DialogServiceConnectorTests.ts
@@ -45,6 +45,7 @@ import {
 } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 type Callback = (result?: any) => void;
 // eslint-disable-next-line no-console
 const consoleInfo = console.info;

diff --git a/tests/DynamicGrammarTests.ts b/tests/DynamicGrammarTests.ts
@@ -9,6 +9,7 @@ import {
 } from "../src/common.speech/Exports";
 import { Settings } from "./Settings";
 
+jest.mock("../src/common.browser/PCMRecorder");
 beforeAll(() => {
     // Override inputs, if necessary
     Settings.LoadSettings();

diff --git a/tests/GeneralRecognizerTests.ts b/tests/GeneralRecognizerTests.ts
@@ -5,6 +5,7 @@ import * as sdk from "../microsoft.cognitiveservices.speech.sdk";
 import { Settings } from "./Settings";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let bufferSize: number;
 beforeEach(() => {
     // eslint-disable-next-line no-console

diff --git a/tests/IntentRecognizerTests.ts b/tests/IntentRecognizerTests.ts
@@ -17,6 +17,7 @@ import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
 import { AudioStreamFormatImpl } from "../src/sdk/Audio/AudioStreamFormat";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 let bufferSize: number;
 

diff --git a/tests/LanguageModelTests.ts b/tests/LanguageModelTests.ts
@@ -4,6 +4,7 @@
 import * as sdk from "../microsoft.cognitiveservices.speech.sdk";
 import { LanguageUnderstandingModelImpl } from "../src/sdk/LanguageUnderstandingModel";
 import { Settings } from "./Settings";
+jest.mock("../src/common.browser/PCMRecorder");
 
 beforeAll(() => {
     // Override inputs, if necessary

diff --git a/tests/LongRunning/SpeechRecoAuthTokenErrorMessageTests.ts b/tests/LongRunning/SpeechRecoAuthTokenErrorMessageTests.ts
@@ -8,6 +8,7 @@ import { Events } from "../../src/common/Exports";
 import { Settings } from "../Settings";
 import { CreateRepeatingPullStream, WaitForCondition } from "../Utilities";
 
+jest.mock("../../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/LongRunning/SpeechRecoAuthTokenRefreshTests.ts b/tests/LongRunning/SpeechRecoAuthTokenRefreshTests.ts
@@ -9,6 +9,7 @@ import { Events } from "../../src/common/Exports";
 import { Settings } from "../Settings";
 import { CreateRepeatingPullStream, WaitForCondition } from "../Utilities";
 
+jest.mock("../../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/LongRunning/SpeechRecoReconnectTests.ts b/tests/LongRunning/SpeechRecoReconnectTests.ts
@@ -9,6 +9,7 @@ import { WaveFileAudioInput } from "../WaveFileAudioInputStream";
 
 import { WaitForCondition } from "../Utilities";
 
+jest.mock("../../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll((): void => {

diff --git a/tests/LongRunning/TranslationRecoReconnectTests.ts b/tests/LongRunning/TranslationRecoReconnectTests.ts
@@ -10,6 +10,7 @@ import { WaveFileAudioInput } from "../WaveFileAudioInputStream";
 
 import { WaitForCondition } from "../Utilities";
 
+jest.mock("../../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll((): void => {

diff --git a/tests/MeetingTranscriberTests.ts b/tests/MeetingTranscriberTests.ts
@@ -13,6 +13,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 function sleep(milliseconds: number): Promise<any> {

diff --git a/tests/PronunciationAssessmentTests.ts b/tests/PronunciationAssessmentTests.ts
@@ -17,6 +17,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects, WaitForCondition } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll((): void => {

diff --git a/tests/PullInputStreamTests.ts b/tests/PullInputStreamTests.ts
@@ -14,6 +14,7 @@ import {
 } from "../src/sdk/Audio/AudioStreamFormat";
 import { Settings } from "./Settings";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let bufferSize: number;
 
 beforeAll(() => {

diff --git a/tests/PushInputStreamTests.ts b/tests/PushInputStreamTests.ts
@@ -15,6 +15,7 @@ import {
 } from "../src/sdk/Audio/AudioStreamFormat";
 import { Settings } from "./Settings";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let bufferSize: number;
 beforeAll(() => {
     // Override inputs, if necessary

diff --git a/tests/ReplayableAudioNodeTests.ts b/tests/ReplayableAudioNodeTests.ts
@@ -10,6 +10,7 @@ import {
 } from "../src/common/Exports";
 import { AudioStreamFormatImpl } from "../src/sdk/Audio/AudioStreamFormat";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let readCount: number;
 const targetBytes: number = 4096;
 const defaultAudioFormat: AudioStreamFormatImpl = sdk.AudioStreamFormat.getDefaultInputFormat() as AudioStreamFormatImpl;

diff --git a/tests/SpeechConfigTests.ts b/tests/SpeechConfigTests.ts
@@ -18,6 +18,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 beforeAll((): void => {
     // Override inputs, if necessary

diff --git a/tests/SpeechContextTests.ts b/tests/SpeechContextTests.ts
@@ -9,6 +9,7 @@ import {
     SpeechContext,
 } from "../src/common.speech/Exports";
 import { Settings } from "./Settings";
+jest.mock("../src/common.browser/PCMRecorder");
 
 beforeAll(() => {
     // Override inputs, if necessary

diff --git a/tests/SpeechRecognizerSilenceTests.ts b/tests/SpeechRecognizerSilenceTests.ts
@@ -21,6 +21,7 @@ import { closeAsyncObjects, WaitForCondition } from "./Utilities";
 
 import { AudioStreamFormatImpl } from "../src/sdk/Audio/AudioStreamFormat";
 
+jest.mock("../src/common.browser/PCMRecorder");
 const FIRST_EVENT_ID: number = 1;
 const Recognizing: string = "Recognizing";
 const Recognized: string = "Recognized";

diff --git a/tests/SpeechRecognizerTests.ts b/tests/SpeechRecognizerTests.ts
@@ -58,6 +58,7 @@ const Recognized: string = "Recognized";
 const Canceled: string = "Canceled";
 
 let objsToClose: any[];
+jest.mock("../src/common.browser/PCMRecorder");
 
 beforeAll(() => {
     // override inputs, if necessary

diff --git a/tests/SpeechSynthesisTests.ts b/tests/SpeechSynthesisTests.ts
@@ -20,6 +20,7 @@ import {
     WaitForCondition
 } from "./Utilities";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/TranslationRecognizerBasicsTests.ts b/tests/TranslationRecognizerBasicsTests.ts
@@ -24,6 +24,7 @@ import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
 import { AudioStreamFormatImpl } from "../src/sdk/Audio/AudioStreamFormat";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/TranslationRecognizerTests.ts b/tests/TranslationRecognizerTests.ts
@@ -17,6 +17,7 @@ import {
 } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/TranslationSynthTests.ts b/tests/TranslationSynthTests.ts
@@ -18,6 +18,7 @@ import {
 } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll(() => {

diff --git a/tests/VoiceProfileClientTests.ts b/tests/VoiceProfileClientTests.ts
@@ -12,6 +12,7 @@ import { Settings } from "./Settings";
 import { closeAsyncObjects } from "./Utilities";
 import { WaveFileAudioInput } from "./WaveFileAudioInputStream";
 
+jest.mock("../src/common.browser/PCMRecorder");
 let objsToClose: any[];
 
 beforeAll((): void => {