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

…ces-speech-sdk-js into release/1.33

.gitattributes

@@ -6,6 +6,7 @@ LICENSE text
 
 *.cmd text
 *.js text
+*.cjs text
 *.json text
 *.md text
 *.ts text

jest.config.js → jest.config.cjs

@@ -4,6 +4,9 @@ module.exports = {
     projects: [
         {
             displayName: "jsdom",
+            moduleNameMapper: {
+                "(.+)\\.js": "$1"
+            },
             transform: {
                 "^.+\\.ts$": "ts-jest",
             },
@@ -17,6 +20,9 @@ module.exports = {
         },
         {
             displayName: "node",
+            moduleNameMapper: {
+                "(.+)\\.js": "$1"
+            },
             transform: {
                 "^.+\\.ts$": "ts-jest",
             },

microsoft.cognitiveservices.speech.sdk.ts

@@ -1,11 +1,11 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
-import { ConsoleLoggingListener } from "./src/common.browser/Exports";
-import { Events } from "./src/common/Exports";
+import { AgentConfig } from "./src/common.speech/Exports.js";
 
-// Common.Storage.SetLocalStorage(new Common.Browser.LocalStorage());
-// Common.Storage.SetSessionStorage(new Common.Browser.SessionStorage());
-Events.instance.attachConsoleListener(new ConsoleLoggingListener());
+// Note: this instantiation ensures the above import isn't 
+// removed on compile. The import being absent causes an error on running
+void new AgentConfig();
 
 // Speech SDK API
-export * from "./src/sdk/Exports";
+export * from "./src/sdk/Exports.js";

package.json

@@ -5,6 +5,7 @@
   "version": "1.33.0",
   "license": "MIT",
   "description": "Microsoft Cognitive Services Speech SDK for JavaScript",
+  "type": "module",
   "keywords": [
     "microsoft",
     "cognitiveservices",
@@ -82,11 +83,11 @@
     "webpack-stream": "^7.0.0"
   },
   "scripts": {
-    "build": "gulp compress && gulp build",
+    "build": "gulp compress --gulpfile gulpfile.cjs && gulp build --gulpfile gulpfile.cjs",
     "test": "npm run lint && npm run jest --coverage",
     "jest": "jest",
-    "lint": "eslint -c .eslintrc.js --ext .ts src",
-    "civersion": "node ci/version.js",
+    "lint": "eslint -c .eslintrc.cjs --ext .ts src",
+    "civersion": "node ci/version.cjs",
     "prepare": "npm run build",
     "setup": "npm install --package-lock-only --ignore-scripts --no-audit"
   },

src/common.browser/ConsoleLoggingListener.ts

@@ -3,9 +3,9 @@
 // Licensed under the MIT license.
 
 import * as fs from "fs";
-import { LogLevel } from "../sdk/LogLevel";
-import { IEventListener, PlatformEvent } from "../common/Exports";
-import { Contracts } from "../sdk/Contracts";
+import { LogLevel } from "../sdk/LogLevel.js";
+import { IEventListener, PlatformEvent } from "../common/Exports.js";
+import { Contracts } from "../sdk/Contracts.js";
 
 export class ConsoleLoggingListener implements IEventListener<PlatformEvent> {
     private privLogLevelFilter: LogLevel;

src/common.browser/Exports.ts

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-export * from "./ConsoleLoggingListener";
-export * from "./IRecorder";
-export * from "./MicAudioSource";
-export * from "./FileAudioSource";
-export * from "./PCMRecorder";
-export * from "./WebsocketConnection";
-export * from "./WebsocketMessageAdapter";
-export * from "./ReplayableAudioNode";
-export * from "./ProxyInfo";
-export * from "./RestMessageAdapter";
-export * from "./RestConfigBase";
+export * from "./ConsoleLoggingListener.js";
+export * from "./IRecorder.js";
+export * from "./MicAudioSource.js";
+export * from "./FileAudioSource.js";
+export * from "./PCMRecorder.js";
+export * from "./WebsocketConnection.js";
+export * from "./WebsocketMessageAdapter.js";
+export * from "./ReplayableAudioNode.js";
+export * from "./ProxyInfo.js";
+export * from "./RestMessageAdapter.js";
+export * from "./RestConfigBase.js";

src/common.browser/FileAudioSource.ts

@@ -5,7 +5,7 @@ import {
     connectivity,
     ISpeechConfigAudioDevice,
     type,
-} from "../common.speech/Exports";
+} from "../common.speech/Exports.js";
 import {
     AudioSourceErrorEvent,
     AudioSourceEvent,
@@ -26,8 +26,8 @@ import {
     IStreamChunk,
     IStringDictionary,
     Stream,
-} from "../common/Exports";
-import { AudioStreamFormat, AudioStreamFormatImpl } from "../sdk/Audio/AudioStreamFormat";
+} from "../common/Exports.js";
+import { AudioStreamFormat, AudioStreamFormatImpl } from "../sdk/Audio/AudioStreamFormat.js";
 
 export class FileAudioSource implements IAudioSource {
 

src/common.browser/IRecorder.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { Stream } from "../common/Exports";
+import { Stream } from "../common/Exports.js";
 
 export interface IRecorder {
     record(context: AudioContext, mediaStream: MediaStream, outputStream: Stream<ArrayBuffer>): void;

src/common.browser/MicAudioSource.ts

@@ -5,7 +5,7 @@ import {
     connectivity,
     ISpeechConfigAudioDevice,
     type
-} from "../common.speech/Exports";
+} from "../common.speech/Exports.js";
 import {
     AudioSourceErrorEvent,
     AudioSourceEvent,
@@ -25,13 +25,13 @@ import {
     IAudioStreamNode,
     IStringDictionary,
     Stream,
-} from "../common/Exports";
-import { IStreamChunk } from "../common/Stream";
+} from "../common/Exports.js";
+import { IStreamChunk } from "../common/Stream.js";
 import {
     AudioStreamFormat,
     AudioStreamFormatImpl,
-} from "../sdk/Audio/AudioStreamFormat";
-import { IRecorder } from "./IRecorder";
+} from "../sdk/Audio/AudioStreamFormat.js";
+import { IRecorder } from "./IRecorder.js";
 
 // Extending the default definition with browser specific definitions for backward compatibility
 interface INavigator extends Navigator {

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";
-import { IRecorder } from "./IRecorder";
+import { RiffPcmEncoder, Stream } from "../common/Exports.js";
+import { IRecorder } from "./IRecorder.js";
 
 export class PcmRecorder implements IRecorder {
     private privMediaResources: IMediaResources;

src/common.browser/ProxyInfo.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { RecognizerConfig } from "../common.speech/Exports";
-import { PropertyCollection, PropertyId } from "../sdk/Exports";
+import { RecognizerConfig } from "../common.speech/Exports.js";
+import { PropertyCollection, PropertyId } from "../sdk/Exports.js";
 
 export class ProxyInfo {
     private privProxyHostName: string;

src/common.browser/ReplayableAudioNode.ts

@@ -5,7 +5,7 @@
 import {
     IAudioStreamNode,
     IStreamChunk,
-} from "../common/Exports";
+} from "../common/Exports.js";
 
 export class ReplayableAudioNode implements IAudioStreamNode {
     private privAudioNode: IAudioStreamNode;

src/common.browser/RestConfigBase.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { IErrorMessages } from "../common/Exports";
+import { IErrorMessages } from "../common/Exports.js";
 /**
  * HTTP request helper
  */

src/common.browser/RestMessageAdapter.ts

@@ -5,8 +5,8 @@ import bent, { BentResponse, RequestBody } from "bent";
 import {
     ArgumentNullError,
     Deferred
-} from "../common/Exports";
-import { IRequestOptions } from "./Exports";
+} from "../common/Exports.js";
+import { IRequestOptions } from "./Exports.js";
 
 export enum RestRequestType {
     Get = "GET",

src/common.browser/WebsocketConnection.ts

@@ -12,9 +12,9 @@ import {
     IConnection,
     IStringDictionary,
     IWebsocketMessageFormatter,
-} from "../common/Exports";
-import { ProxyInfo } from "./ProxyInfo";
-import { WebsocketMessageAdapter } from "./WebsocketMessageAdapter";
+} from "../common/Exports.js";
+import { ProxyInfo } from "./ProxyInfo.js";
+import { WebsocketMessageAdapter } from "./WebsocketMessageAdapter.js";
 
 export class WebsocketConnection implements IConnection {
 

src/common.browser/WebsocketMessageAdapter.ts

@@ -10,7 +10,7 @@ import Agent from "agent-base";
 import HttpsProxyAgent from "https-proxy-agent";
 
 import ws from "ws";
-import { HeaderNames } from "../common.speech/HeaderNames";
+import { HeaderNames } from "../common.speech/HeaderNames.js";
 import {
     ArgumentNullError,
     BackgroundEvent,
@@ -31,8 +31,8 @@ import {
     MessageType,
     Queue,
     RawWebsocketMessage,
-} from "../common/Exports";
-import { ProxyInfo } from "./ProxyInfo";
+} from "../common/Exports.js";
+import { ProxyInfo } from "./ProxyInfo.js";
 
 interface ISendItem {
     Message: ConnectionMessage;

src/common.speech/AddedLmIntent.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { LanguageUnderstandingModelImpl } from "../sdk/LanguageUnderstandingModel";
+import { LanguageUnderstandingModelImpl } from "../sdk/LanguageUnderstandingModel.js";
 
 /**
  * @class AddedLmIntent

src/common.speech/AvatarSynthesisAdapter.ts

@@ -7,15 +7,15 @@ import {
     AvatarSynthesizer,
     PropertyId,
     Synthesizer,
-} from "../sdk/Exports";
+} from "../sdk/Exports.js";
 import {
     ISynthesisConnectionFactory,
     ISynthesisMetadata,
     ISynthesisSectionVideo,
     SynthesisAdapterBase,
     SynthesizerConfig
-} from "./Exports";
-import { IAuthentication } from "./IAuthentication";
+} from "./Exports.js";
+import { IAuthentication } from "./IAuthentication.js";
 
 export class AvatarSynthesisAdapter extends SynthesisAdapterBase {
     private readonly privAvatarSynthesizer: AvatarSynthesizer;

src/common.speech/CognitiveSubscriptionKeyAuthentication.ts

@@ -3,12 +3,12 @@
 
 import {
     ArgumentNullError,
-} from "../common/Exports";
-import { HeaderNames } from "./HeaderNames";
+} from "../common/Exports.js";
+import { HeaderNames } from "./HeaderNames.js";
 import {
     AuthInfo,
     IAuthentication
-} from "./IAuthentication";
+} from "./IAuthentication.js";
 
 /**
  * @class

src/common.speech/CognitiveTokenAuthentication.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { ArgumentNullError } from "../common/Exports";
-import { AuthInfo, IAuthentication } from "./IAuthentication";
-import { HeaderNames } from "./HeaderNames";
+import { ArgumentNullError } from "../common/Exports.js";
+import { AuthInfo, IAuthentication } from "./IAuthentication.js";
+import { HeaderNames } from "./HeaderNames.js";
 
 export class CognitiveTokenAuthentication implements IAuthentication {
     private static privTokenPrefix: string = "Bearer ";

src/common.speech/ConnectionFactoryBase.ts

@@ -3,11 +3,11 @@
 
 import {
     ServicePropertiesPropertyName,
-} from "../common.speech/Exports";
-import { IConnection, IStringDictionary } from "../common/Exports";
-import { PropertyId } from "../sdk/Exports";
-import { AuthInfo, IConnectionFactory, RecognizerConfig } from "./Exports";
-import { QueryParameterNames } from "./QueryParameterNames";
+} from "../common.speech/Exports.js";
+import { IConnection, IStringDictionary } from "../common/Exports.js";
+import { PropertyId } from "../sdk/Exports.js";
+import { AuthInfo, IConnectionFactory, RecognizerConfig } from "./Exports.js";
+import { QueryParameterNames } from "./QueryParameterNames.js";
 
 export abstract class ConnectionFactoryBase implements IConnectionFactory {
 

src/common.speech/ConversationServiceRecognizer.ts

@@ -1,4 +1,4 @@
-import { IAudioSource } from "../common/Exports";
+import { IAudioSource } from "../common/Exports.js";
 import {
     CancellationErrorCode,
     CancellationReason,
@@ -8,7 +8,7 @@ import {
     Recognizer,
     ResultReason,
     SpeechRecognitionResult
-} from "../sdk/Exports";
+} from "../sdk/Exports.js";
 import {
     DetailedSpeechPhrase,
     EnumTranslation,
@@ -20,8 +20,8 @@ import {
     ServiceRecognizerBase,
     SimpleSpeechPhrase,
     SpeechHypothesis
-} from "./Exports";
-import { SpeechConnectionMessage } from "./SpeechConnectionMessage.Internal";
+} from "./Exports.js";
+import { SpeechConnectionMessage } from "./SpeechConnectionMessage.Internal.js";
 
 export class ConversationServiceRecognizer extends ServiceRecognizerBase {
 

src/common.speech/ConversationTranscriberConnectionFactory.ts

@@ -4,29 +4,29 @@
 import {
     ProxyInfo,
     WebsocketConnection,
-} from "../common.browser/Exports";
+} from "../common.browser/Exports.js";
 import {
     IConnection,
     IStringDictionary
-} from "../common/Exports";
+} from "../common/Exports.js";
 import {
     PropertyId
-} from "../sdk/Exports";
+} from "../sdk/Exports.js";
 import {
     ServicePropertiesPropertyName
-} from "../common.speech/Exports";
+} from "../common.speech/Exports.js";
 import {
     ConnectionFactoryBase
-} from "./ConnectionFactoryBase";
+} from "./ConnectionFactoryBase.js";
 import {
     AuthInfo,
     RecognizerConfig,
     WebsocketMessageFormatter
-} from "./Exports";
-import { HeaderNames } from "./HeaderNames";
+} from "./Exports.js";
+import { HeaderNames } from "./HeaderNames.js";
 import {
     QueryParameterNames
-} from "./QueryParameterNames";
+} from "./QueryParameterNames.js";
 
 export class ConversationTranscriberConnectionFactory extends ConnectionFactoryBase {
     private readonly universalUri: string = "/speech/universal/v2";