speechstate 2.2.0 → 2.4.0

package/dist/asr.d.ts

@@ -49,14 +49,21 @@ interface ASRInit {
     locale: string;
     audioContext: AudioContext;
     azureCredentials: string | AzureSpeechCredentials;
+    azureRegion: string;
     speechRecognitionEndpointId?: string;
     azureLanguageCredentials?: AzureLanguageCredentials;
 }
+interface ASRPonyfillInput {
+    audioContext: AudioContext;
+    azureAuthorizationToken: string;
+    azureRegion: string;
+    speechRecognitionEndpointId?: string;
+}
 export declare const asrMachine: import("xstate").StateMachine<ASRContext, ASREvent, {
-    [x: string]: import("xstate").ActorRef<import("xstate").CallbackSnapshot<{}>, import("xstate").EventObject, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").PromiseSnapshot<string, any>, {
+    [x: string]: import("xstate").ActorRef<import("xstate").PromiseSnapshot<string, any>, {
         [k: string]: unknown;
         type: string;
-    }, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<any>, import("xstate").EventObject, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").PromiseSnapshot<any, AzureLanguageCredentials & {
+    }, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<ASRPonyfillInput>, null, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<any>, import("xstate").EventObject, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").PromiseSnapshot<any, AzureLanguageCredentials & {
         query: string;
     }>, {
         [k: string]: unknown;
@@ -70,7 +77,7 @@ export declare const asrMachine: import("xstate").StateMachine<ASRContext, ASREv
     };
     ponyfill: {
         src: "ponyfill";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {}>;
+        logic: import("xstate").CallbackActorLogic<null, ASRPonyfillInput>;
         id: string;
     };
     recStart: {
@@ -98,7 +105,7 @@ export declare const asrMachine: import("xstate").StateMachine<ASRContext, ASREv
     };
     ponyfill: {
         src: "ponyfill";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {}>;
+        logic: import("xstate").CallbackActorLogic<null, ASRPonyfillInput>;
         id: string;
     };
     recStart: {

package/dist/asr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asr.d.ts","sourceRoot":"","sources":["../src/asr.ts"],"names":[],"mappings":";AAcA,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,SAAS,CAAC;AAEjB,UAAU,mBAAoB,SAAQ,iBAAiB;IACrD,YAAO;CACR;AACD,UAAU,mBAAoB,SAAQ,iBAAiB;IACrD,YAAO;CACR;AAED,KAAK,QAAQ,GACT;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE;QACL,MAAM,EAAE,mBAAmB,CAAC;QAC5B,cAAc,EAAE,mBAAmB,CAAC;KACrC,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC7B,GACD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE;QAAE,cAAc,EAAE,mBAAmB,CAAA;KAAE,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAE5C,UAAU,UAAW,SAAQ,OAAO;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B;AAED,UAAU,OAAO;IACf,yBAAyB,EAAE,MAAM,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAClD,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;CACrD;AAED,eAAO,MAAM,UAAU;;;;;eAiF8C,MAAM;;;;;;;;;;;;;;;;;;;;;;;;mBAAN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAN,MAAM;;;;;;;uDA6RzE,CAAC"}
+{"version":3,"file":"asr.d.ts","sourceRoot":"","sources":["../src/asr.ts"],"names":[],"mappings":";AAaA,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,SAAS,CAAC;AAEjB,UAAU,mBAAoB,SAAQ,iBAAiB;IACrD,YAAO;CACR;AACD,UAAU,mBAAoB,SAAQ,iBAAiB;IACrD,YAAO;CACR;AAED,KAAK,QAAQ,GACT;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE;QACL,MAAM,EAAE,mBAAmB,CAAC;QAC5B,cAAc,EAAE,mBAAmB,CAAC;KACrC,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC7B,GACD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE;QAAE,cAAc,EAAE,mBAAmB,CAAA;KAAE,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAE5C,UAAU,UAAW,SAAQ,OAAO;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B;AAED,UAAU,OAAO;IACf,yBAAyB,EAAE,MAAM,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;CACrD;AAED,UAAU,gBAAgB;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,eAAO,MAAM,UAAU;;;;;eAgF8C,MAAM;;;;;;;;;;;;;;;;;;;;;;;;mBAAN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAN,MAAM;;;;;;;uDA+RzE,CAAC"}

package/dist/asr.js

@@ -13,7 +13,6 @@ exports.asrMachine = void 0;
 const xstate_1 = require("xstate");
 const getToken_1 = require("./getToken");
 const SpeechToText_1 = require("web-speech-cognitive-services/lib/SpeechServices/SpeechToText");
-const REGION = "northeurope";
 exports.asrMachine = (0, xstate_1.setup)({
     types: {
         context: {},
@@ -31,10 +30,9 @@ exports.asrMachine = (0, xstate_1.setup)({
         ponyfill: (0, xstate_1.fromCallback)(({ sendBack, input }) => {
             const { SpeechGrammarList, SpeechRecognition } = (0, SpeechToText_1.default)({
                 audioContext: input.audioContext,
-                speechRecognitionEndpointId: input
-                    .speechRecognitionEndpointId,
+                speechRecognitionEndpointId: input.speechRecognitionEndpointId,
                 credentials: {
-                    region: REGION, // TODO
+                    region: input.azureRegion,
                     authorizationToken: input.azureAuthorizationToken,
                 },
             });
@@ -126,6 +124,7 @@ exports.asrMachine = (0, xstate_1.setup)({
         locale: input.locale || "en-US",
         audioContext: input.audioContext,
         azureCredentials: input.azureCredentials,
+        azureRegion: input.azureRegion,
         azureLanguageCredentials: input.azureLanguageCredentials,
         speechRecognitionEndpointId: input.speechRecognitionEndpointId,
     }),
@@ -343,6 +342,7 @@ exports.asrMachine = (0, xstate_1.setup)({
                 id: "ponyASR",
                 src: "ponyfill",
                 input: ({ context }) => ({
+                    azureRegion: context.azureRegion,
                     audioContext: context.audioContext,
                     azureAuthorizationToken: context.azureAuthorizationToken,
                     locale: context.locale,

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { speechstate } from "./speechstate";
 export { AzureCredentials, Settings, Hypothesis, Agenda, RecogniseParameters, } from "./types";
+export type { SpeechStateExternalEvent } from "./types";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,MAAM,EACN,mBAAmB,GACpB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,MAAM,EACN,mBAAmB,GACpB,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC"}

package/dist/speechstate.d.ts

@@ -1,48 +1,10 @@
-import { Settings, Agenda, Hypothesis, RecogniseParameters } from "./types";
+import { Settings, SpeechStateEvent } from "./types";
 interface SSContext {
     settings: Settings;
     audioContext?: AudioContext;
     asrRef?: any;
     ttsRef?: any;
 }
-/** events sent to the spawned `speechstate` machine **/
-type SSEventExtIn = {
-    type: "PREPARE";
-} | {
-    type: "CONTROL";
-} | {
-    type: "STOP";
-} | {
-    type: "SPEAK";
-    value: Agenda;
-} | {
-    type: "LISTEN";
-    value: RecogniseParameters;
-};
-/** for sendParent, not type-checked */
-type SSEventExtOut = {
-    type: "ASR_NOINPUT";
-} | {
-    type: "ASRTTS_READY";
-} | {
-    type: "ASR_STARTED";
-} | {
-    type: "TTS_STARTED";
-} | {
-    type: "SPEAK_COMPLETE";
-} | {
-    type: "RECOGNISED";
-    value: Hypothesis[];
-    nluValue?: any;
-};
-type SSEventIntIn = {
-    type: "TTS_READY";
-} | {
-    type: "ASR_READY";
-} | {
-    type: "TTS_ERROR";
-};
-type SSEvent = SSEventIntIn | SSEventExtIn | SSEventExtOut;
-declare const speechstate: import("xstate").StateMachine<SSContext, SSEvent, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, Settings, {}, import("xstate").EventObject, import("xstate").ResolveTypegenMeta<import("xstate").TypegenDisabled, SSEvent, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, string, import("xstate").EventObject>>;
+declare const speechstate: import("xstate").StateMachine<SSContext, SpeechStateEvent, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, Settings, {}, import("xstate").EventObject, import("xstate").ResolveTypegenMeta<import("xstate").TypegenDisabled, SpeechStateEvent, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, string, import("xstate").EventObject>>;
 export { speechstate };
 //# sourceMappingURL=speechstate.d.ts.map

package/dist/speechstate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"speechstate.d.ts","sourceRoot":"","sources":["../src/speechstate.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC5E,UAAU,SAAS;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,wDAAwD;AACxD,KAAK,YAAY,GACb;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEnD,uCAAuC;AACvC,KAAK,aAAa,GACd;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC;AAEhE,KAAK,YAAY,GACb;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1B,KAAK,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAE3D,QAAA,MAAM,WAAW,ghBAiWhB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"speechstate.d.ts","sourceRoot":"","sources":["../src/speechstate.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACrD,UAAU,SAAS;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,QAAA,MAAM,WAAW,kiBAmWhB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/speechstate.js

@@ -55,6 +55,7 @@ const speechstate = (0, xstate_1.createMachine)({
                                                 ttsLexicon: context.settings.ttsLexicon,
                                                 audioContext: context.audioContext,
                                                 azureCredentials: context.settings.azureCredentials,
+                                                azureRegion: context.settings.azureRegion,
                                             },
                                         });
                                     },
@@ -69,6 +70,7 @@ const speechstate = (0, xstate_1.createMachine)({
                                                 locale: context.settings.locale,
                                                 audioContext: context.audioContext,
                                                 azureCredentials: context.settings.azureCredentials,
+                                                azureRegion: context.settings.azureRegion,
                                                 azureLanguageCredentials: context.settings.azureLanguageCredentials,
                                                 speechRecognitionEndpointId: context.settings.speechRecognitionEndpointId,
                                             },

package/dist/tts.d.ts

@@ -5,6 +5,7 @@ interface MySpeechSynthesisUtterance extends SpeechSynthesisUtterance {
 interface TTSInit {
     audioContext: AudioContext;
     azureCredentials: string | AzureSpeechCredentials;
+    azureRegion: string;
     ttsDefaultVoice: string;
     ttsLexicon?: string;
 }
@@ -15,8 +16,14 @@ interface TTSContext extends TTSInit {
     wsaUtt?: MySpeechSynthesisUtterance;
     agenda?: Agenda;
     buffer?: string;
+    currentVoice?: string;
     utteranceFromStream?: string;
 }
+interface TTSPonyfillInput {
+    audioContext: AudioContext;
+    azureRegion: string;
+    azureAuthorizationToken: string;
+}
 type TTSEvent = {
     type: "PREPARE";
 } | {
@@ -39,6 +46,9 @@ type TTSEvent = {
 } | {
     type: "STREAMING_CHUNK";
     value: string;
+} | {
+    type: "STREAMING_SET_VOICE";
+    value: string;
 } | {
     type: "STREAMING_DONE";
 } | {
@@ -48,7 +58,7 @@ export declare const ttsMachine: import("xstate").StateMachine<TTSContext, TTSEv
     [x: string]: import("xstate").ActorRef<import("xstate").CallbackSnapshot<{}>, import("xstate").EventObject, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").PromiseSnapshot<string, any>, {
         [k: string]: unknown;
         type: string;
-    }, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<Agenda>, import("xstate").EventObject, import("xstate").EventObject>;
+    }, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<Agenda>, import("xstate").EventObject, import("xstate").EventObject> | import("xstate").ActorRef<import("xstate").CallbackSnapshot<TTSPonyfillInput>, null, import("xstate").EventObject>;
 }, import("xstate").Values<{
     getToken: {
         src: "getToken";
@@ -62,7 +72,7 @@ export declare const ttsMachine: import("xstate").StateMachine<TTSContext, TTSEv
     };
     ponyfill: {
         src: "ponyfill";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {}>;
+        logic: import("xstate").CallbackActorLogic<null, TTSPonyfillInput>;
         id: string;
     };
     start: {
@@ -79,6 +89,10 @@ export declare const ttsMachine: import("xstate").StateMachine<TTSContext, TTSEv
         type: "addFiller";
         params: {};
     };
+    assignCurrentVoice: {
+        type: "assignCurrentVoice";
+        params: {};
+    };
 }>, import("xstate").Values<{
     bufferContainsUtterancePartReadyToBeSpoken: {
         type: "bufferContainsUtterancePartReadyToBeSpoken";
@@ -111,7 +125,7 @@ export declare const ttsMachine: import("xstate").StateMachine<TTSContext, TTSEv
     };
     ponyfill: {
         src: "ponyfill";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {}>;
+        logic: import("xstate").CallbackActorLogic<null, TTSPonyfillInput>;
         id: string;
     };
     start: {
@@ -128,6 +142,10 @@ export declare const ttsMachine: import("xstate").StateMachine<TTSContext, TTSEv
         type: "addFiller";
         params: {};
     };
+    assignCurrentVoice: {
+        type: "assignCurrentVoice";
+        params: {};
+    };
 }>, import("xstate").Values<{
     bufferContainsUtterancePartReadyToBeSpoken: {
         type: "bufferContainsUtterancePartReadyToBeSpoken";

package/dist/tts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../src/tts.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEzD,UAAU,0BAA2B,SAAQ,wBAAwB;IACnE,KAAK,CAAC,EAAE,MAAM,OAAE;CACjB;AAED,UAAU,OAAO;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,UAAW,SAAQ,OAAO;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,KAAK,QAAQ,GACT;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE;QACL,MAAM,EAAE,eAAe,CAAC;QACxB,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAI/B,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0DA8arB,CAAC"}
+{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../src/tts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEzD,UAAU,0BAA2B,SAAQ,wBAAwB;IACnE,KAAK,CAAC,EAAE,MAAM,OAAE;CACjB;AAED,UAAU,OAAO;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,UAAW,SAAQ,OAAO;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,UAAU,gBAAgB;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED,KAAK,QAAQ,GACT;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE;QACL,MAAM,EAAE,eAAe,CAAC;QACxB,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAI/B,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0DAscrB,CAAC"}

package/dist/tts.js

@@ -4,7 +4,6 @@ exports.ttsMachine = void 0;
 const xstate_1 = require("xstate");
 const getToken_1 = require("./getToken");
 const TextToSpeech_1 = require("web-speech-cognitive-services/lib/SpeechServices/TextToSpeech");
-const REGION = "northeurope";
 const UTTERANCE_CHUNK_REGEX = /(^.*([!?]+|([.,]+\s)))/;
 exports.ttsMachine = (0, xstate_1.setup)({
     types: {},
@@ -20,6 +19,11 @@ exports.ttsMachine = (0, xstate_1.setup)({
                     context.buffer.substring(spaceIndex),
             };
         }),
+        assignCurrentVoice: (0, xstate_1.assign)(({ event, }) => {
+            return {
+                currentVoice: event.value,
+            };
+        }),
     },
     actors: {
         getToken: getToken_1.getToken,
@@ -37,12 +41,16 @@ exports.ttsMachine = (0, xstate_1.setup)({
                 console.log("received streaming chunk:", event);
                 sendBack({ type: "STREAMING_CHUNK", value: event.data });
             });
+            eventSource.addEventListener("STREAMING_SET_VOICE", (event) => {
+                console.log("received streaming voice set command:", event);
+                sendBack({ type: "STREAMING_SET_VOICE", value: event.data });
+            });
         }),
         ponyfill: (0, xstate_1.fromCallback)(({ sendBack, input }) => {
             const ponyfill = (0, TextToSpeech_1.default)({
                 audioContext: input.audioContext,
                 credentials: {
-                    region: REGION, // TODO
+                    region: input.azureRegion,
                     authorizationToken: input.azureAuthorizationToken,
                 },
             });
@@ -106,6 +114,7 @@ exports.ttsMachine = (0, xstate_1.setup)({
         ttsLexicon: input.ttsLexicon,
         audioContext: input.audioContext,
         azureCredentials: input.azureCredentials,
+        azureRegion: input.azureRegion,
         buffer: "",
     }),
     initial: "GetToken",
@@ -167,6 +176,11 @@ exports.ttsMachine = (0, xstate_1.setup)({
                     states: {
                         Buffer: {
                             initial: "BufferIdle",
+                            on: {
+                                STREAMING_SET_VOICE: {
+                                    actions: "assignCurrentVoice",
+                                },
+                            },
                             states: {
                                 BufferIdle: {
                                     id: "BufferIdle",
@@ -302,7 +316,9 @@ exports.ttsMachine = (0, xstate_1.setup)({
                                                     wsaTTS: context.wsaTTS,
                                                     wsaUtt: context.wsaUtt,
                                                     ttsLexicon: context.ttsLexicon,
-                                                    voice: context.agenda.voice || context.ttsDefaultVoice,
+                                                    voice: context.currentVoice ||
+                                                        context.agenda.voice ||
+                                                        context.ttsDefaultVoice,
                                                     utterance: context.utteranceFromStream,
                                                 }),
                                             },
@@ -392,6 +408,7 @@ exports.ttsMachine = (0, xstate_1.setup)({
                 input: ({ context }) => ({
                     audioContext: context.audioContext,
                     azureAuthorizationToken: context.azureAuthorizationToken,
+                    azureRegion: context.azureRegion,
                 }),
             },
         },

package/dist/types.d.ts

@@ -16,6 +16,7 @@ export interface AzureLanguageCredentials {
 export interface Settings {
     locale?: string;
     azureCredentials: string | AzureCredentials | AzureSpeechCredentials;
+    azureRegion: string;
     azureLanguageCredentials?: AzureLanguageCredentials;
     asrDefaultCompleteTimeout?: number;
     asrDefaultNoInputTimeout?: number;
@@ -40,4 +41,44 @@ export interface RecogniseParameters {
     hints?: string[];
     nlu?: boolean | AzureLanguageCredentials;
 }
+/** events sent to the spawned `speechstate` machine **/
+type SSEventExtIn = {
+    type: "PREPARE";
+} | {
+    type: "CONTROL";
+} | {
+    type: "STOP";
+} | {
+    type: "SPEAK";
+    value: Agenda;
+} | {
+    type: "LISTEN";
+    value: RecogniseParameters;
+};
+/** for sendParent, not type-checked */
+type SSEventExtOut = {
+    type: "ASR_NOINPUT";
+} | {
+    type: "ASRTTS_READY";
+} | {
+    type: "ASR_STARTED";
+} | {
+    type: "TTS_STARTED";
+} | {
+    type: "SPEAK_COMPLETE";
+} | {
+    type: "RECOGNISED";
+    value: Hypothesis[];
+    nluValue?: any;
+};
+type SSEventIntIn = {
+    type: "TTS_READY";
+} | {
+    type: "ASR_READY";
+} | {
+    type: "TTS_ERROR";
+};
+export type SpeechStateExternalEvent = SSEventExtIn | SSEventExtOut;
+export type SpeechStateEvent = SSEventIntIn | SpeechStateExternalEvent;
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,sBAAsB;CAAG;AAEnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,GAAG,gBAAgB,GAAG,sBAAsB,CAAC;IACrE,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC;CAC1C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,sBAAsB;CAAG;AAEnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,GAAG,gBAAgB,GAAG,sBAAsB,CAAC;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC;CAC1C;AAED,wDAAwD;AACxD,KAAK,YAAY,GACb;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEnD,uCAAuC;AACvC,KAAK,aAAa,GACd;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC;AAEhE,KAAK,YAAY,GACb;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1B,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,aAAa,CAAC;AACpE,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,wBAAwB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speechstate",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "license": "GPL-3.0",
   "homepage": "http://localhost/speechstate",
   "main": "./dist/index.js",