microsoft · glharper · Nov 30, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/package.json b/package.json
@@ -5,7 +5,6 @@
   "version": "1.31.0-alpha.0.1",
   "license": "MIT",
   "description": "Microsoft Cognitive Services Speech SDK for JavaScript",
-  "type": "module",
   "keywords": [
     "microsoft",
     "cognitiveservices",

diff --git a/src/common.browser/PCMRecorder.ts b/src/common.browser/PCMRecorder.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { RiffPcmEncoder, Stream } from "../common/Exports.js";
-import { IRecorder } from "./IRecorder.js";
+import { RiffPcmEncoder, Stream } from "../common/Exports";
+import { IRecorder } from "./IRecorder";
 
 export class PcmRecorder implements IRecorder {
     private privMediaResources: IMediaResources;
@@ -60,71 +60,59 @@ export class PcmRecorder implements IRecorder {
             };
         };
 
-        const connectWorkletToMicInput = (context: AudioContext): void => {
-            const workletNode = new AudioWorkletNode(context, "speech-processor");
-            workletNode.port.onmessage = (ev: MessageEvent): void => {
-                const inputFrame: Float32Array = ev.data as Float32Array;
-
-                if (outputStream && !outputStream.isClosed) {
-                    const waveFrame = waveStreamEncoder.encode(inputFrame);
-                    if (!!waveFrame) {
-                        outputStream.writeStreamChunk({
-                            buffer: waveFrame,
-                            isEnd: false,
-                            timeReceived: Date.now(),
-                        });
-                    }
-                }
-            };
-            micInput.connect(workletNode);
-            workletNode.connect(context.destination);
-            this.privMediaResources = {
-                scriptProcessorNode: workletNode,
-                source: micInput,
-                stream: mediaStream,
-            };
-        };
-
         // https://webaudio.github.io/web-audio-api/#audioworklet
         // Using AudioWorklet to improve audio quality and avoid audio glitches due to blocking the UI thread
         const skipAudioWorklet = !!this.privSpeechProcessorScript && this.privSpeechProcessorScript.toLowerCase() === "ignore";
 
         if (!!context.audioWorklet && !skipAudioWorklet) {
-            /* eslint-disable-next-line */
-            this.privSpeechProcessorScript = new URL( /* webpackChunkName: 'script_processor_audioWorklet' */ "speech-processor.js", import.meta.url).toString(); 
+            if (!this.privSpeechProcessorScript) {
+                const workletScript = `class SP extends AudioWorkletProcessor {
+                    constructor(options) {
+                      super(options);
+                    }
+                    process(inputs, outputs) {
+                      const input = inputs[0];
+                      const output = [];
+                      for (let channel = 0; channel < input.length; channel += 1) {
+                        output[channel] = input[channel];
+                      }
+                      this.port.postMessage(output[0]);
+                      return true;
+                    }
+                  }
+                  registerProcessor('speech-processor', SP);`;
+                const blob = new Blob([workletScript], { type: "application/javascript; charset=utf-8" });
+                this.privSpeechProcessorScript = URL.createObjectURL(blob);
+            }
 
             context.audioWorklet
                 .addModule(this.privSpeechProcessorScript)
                 .then((): void => {
-                    connectWorkletToMicInput(context);
+                    const workletNode = new AudioWorkletNode(context, "speech-processor");
+                    workletNode.port.onmessage = (ev: MessageEvent): void => {
+                        const inputFrame: Float32Array = ev.data as Float32Array;
+
+                        if (outputStream && !outputStream.isClosed) {
+                            const waveFrame = waveStreamEncoder.encode(inputFrame);
+                            if (!!waveFrame) {
+                                outputStream.writeStreamChunk({
+                                    buffer: waveFrame,
+                                    isEnd: false,
+                                    timeReceived: Date.now(),
+                                });
+                            }
+                        }
+                    };
+                    micInput.connect(workletNode);
+                    workletNode.connect(context.destination);
+                    this.privMediaResources = {
+                        scriptProcessorNode: workletNode,
+                        source: micInput,
+                        stream: mediaStream,
+                    };
                 })
                 .catch((): void => {
-                    const workletScript = `class SP extends AudioWorkletProcessor {
-                        constructor(options) {
-                        super(options);
-                        }
-                        process(inputs, outputs) {
-                        const input = inputs[0];
-                        const output = [];
-                        for (let channel = 0; channel < input.length; channel += 1) {
-                            output[channel] = input[channel];
-                        }
-                        this.port.postMessage(output[0]);
-                        return true;
-                        }
-                    }
-                    registerProcessor('speech-processor', SP);`;
-                    const blob = new Blob([workletScript], { type: "application/javascript; charset=utf-8" });
-                    this.privSpeechProcessorScript = URL.createObjectURL(blob);
-
-                    context.audioWorklet
-                        .addModule(this.privSpeechProcessorScript)
-                        .then((): void => {
-                            connectWorkletToMicInput(context);
-                        })
-                        .catch((): void => {
-                            attachScriptProcessor();
-                        });
+                    attachScriptProcessor();
                 });
         } else {
             try {

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