@codingame/monaco-vscode-speech-service-override 5.3.0 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-speech-service-override",
-  "version": "5.3.0",
+  "version": "6.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.1"
   }
 }

package/speech.js

@@ -1,6 +1,7 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ISpeechService } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService.service';
 import { SpeechService } from './vscode/src/vs/workbench/contrib/speech/browser/speechService.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 function getServiceOverride() {
     return {

package/vscode/src/vs/workbench/contrib/speech/browser/speechService.js

@@ -8,7 +8,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
-import { HasSpeechProvider, SpeechToTextInProgress, speechLanguageConfigToLanguage, SPEECH_LANGUAGE_CONFIG, SpeechToTextStatus, KeywordRecognitionStatus } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
+import { HasSpeechProvider, SpeechToTextInProgress, TextToSpeechInProgress, speechLanguageConfigToLanguage, SPEECH_LANGUAGE_CONFIG, SpeechToTextStatus, TextToSpeechStatus, KeywordRecognitionStatus } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
@@ -57,13 +57,19 @@ let SpeechService = class SpeechService extends Disposable {
         this.onDidStartSpeechToTextSession = this._onDidStartSpeechToTextSession.event;
         this._onDidEndSpeechToTextSession = this._register(( (new Emitter())));
         this.onDidEndSpeechToTextSession = this._onDidEndSpeechToTextSession.event;
-        this._activeSpeechToTextSession = undefined;
+        this.activeSpeechToTextSessions = 0;
         this.speechToTextInProgress = SpeechToTextInProgress.bindTo(this.contextKeyService);
+        this._onDidStartTextToSpeechSession = this._register(( (new Emitter())));
+        this.onDidStartTextToSpeechSession = this._onDidStartTextToSpeechSession.event;
+        this._onDidEndTextToSpeechSession = this._register(( (new Emitter())));
+        this.onDidEndTextToSpeechSession = this._onDidEndTextToSpeechSession.event;
+        this.activeTextToSpeechSessions = 0;
+        this.textToSpeechInProgress = TextToSpeechInProgress.bindTo(this.contextKeyService);
         this._onDidStartKeywordRecognition = this._register(( (new Emitter())));
         this.onDidStartKeywordRecognition = this._onDidStartKeywordRecognition.event;
         this._onDidEndKeywordRecognition = this._register(( (new Emitter())));
         this.onDidEndKeywordRecognition = this._onDidEndKeywordRecognition.event;
-        this._activeKeywordRecognitionSession = undefined;
+        this.activeKeywordRecognitionSessions = 0;
         this.handleAndRegisterSpeechExtensions();
     }
     handleAndRegisterSpeechExtensions() {
@@ -105,30 +111,30 @@ let SpeechService = class SpeechService extends Disposable {
         this.hasSpeechProviderContext.set(this.hasSpeechProvider);
         this._onDidChangeHasSpeechProvider.fire();
     }
-    get hasActiveSpeechToTextSession() { return !!this._activeSpeechToTextSession; }
+    get hasActiveSpeechToTextSession() { return this.activeSpeechToTextSessions > 0; }
     async createSpeechToTextSession(token, context = 'speech') {
         const provider = await this.getProvider();
         const language = speechLanguageConfigToLanguage(this.configurationService.getValue(SPEECH_LANGUAGE_CONFIG));
-        const session = this._activeSpeechToTextSession = provider.createSpeechToTextSession(token, typeof language === 'string' ? { language } : undefined);
+        const session = provider.createSpeechToTextSession(token, typeof language === 'string' ? { language } : undefined);
         const sessionStart = Date.now();
         let sessionRecognized = false;
         let sessionError = false;
         let sessionContentLength = 0;
         const disposables = ( (new DisposableStore()));
         const onSessionStoppedOrCanceled = () => {
-            if (session === this._activeSpeechToTextSession) {
-                this._activeSpeechToTextSession = undefined;
+            this.activeSpeechToTextSessions = Math.max(0, this.activeSpeechToTextSessions - 1);
+            if (!this.hasActiveSpeechToTextSession) {
                 this.speechToTextInProgress.reset();
-                this._onDidEndSpeechToTextSession.fire();
-                this.telemetryService.publicLog2('speechToTextSession', {
-                    context,
-                    sessionDuration: Date.now() - sessionStart,
-                    sessionRecognized,
-                    sessionError,
-                    sessionContentLength,
-                    sessionLanguage: language
-                });
             }
+            this._onDidEndSpeechToTextSession.fire();
+            this.telemetryService.publicLog2('speechToTextSession', {
+                context,
+                sessionDuration: Date.now() - sessionStart,
+                sessionRecognized,
+                sessionError,
+                sessionContentLength,
+                sessionLanguage: language
+            });
             disposables.dispose();
         };
         disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled()));
@@ -138,10 +144,9 @@ let SpeechService = class SpeechService extends Disposable {
         disposables.add(session.onDidChange(e => {
             switch (e.status) {
                 case SpeechToTextStatus.Started:
-                    if (session === this._activeSpeechToTextSession) {
-                        this.speechToTextInProgress.set(true);
-                        this._onDidStartSpeechToTextSession.fire();
-                    }
+                    this.activeSpeechToTextSessions++;
+                    this.speechToTextInProgress.set(true);
+                    this._onDidStartSpeechToTextSession.fire();
                     break;
                 case SpeechToTextStatus.Recognizing:
                     sessionRecognized = true;
@@ -173,10 +178,55 @@ let SpeechService = class SpeechService extends Disposable {
         }
         return provider;
     }
-    get hasActiveKeywordRecognition() { return !!this._activeKeywordRecognitionSession; }
+    get hasActiveTextToSpeechSession() { return this.activeTextToSpeechSessions > 0; }
+    async createTextToSpeechSession(token, context = 'speech') {
+        const provider = await this.getProvider();
+        const language = speechLanguageConfigToLanguage(this.configurationService.getValue(SPEECH_LANGUAGE_CONFIG));
+        const session = provider.createTextToSpeechSession(token, typeof language === 'string' ? { language } : undefined);
+        const sessionStart = Date.now();
+        let sessionError = false;
+        const disposables = ( (new DisposableStore()));
+        const onSessionStoppedOrCanceled = (dispose) => {
+            this.activeTextToSpeechSessions = Math.max(0, this.activeTextToSpeechSessions - 1);
+            if (!this.hasActiveTextToSpeechSession) {
+                this.textToSpeechInProgress.reset();
+            }
+            this._onDidEndTextToSpeechSession.fire();
+            this.telemetryService.publicLog2('textToSpeechSession', {
+                context,
+                sessionDuration: Date.now() - sessionStart,
+                sessionError,
+                sessionLanguage: language
+            });
+            if (dispose) {
+                disposables.dispose();
+            }
+        };
+        disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled(true)));
+        if (token.isCancellationRequested) {
+            onSessionStoppedOrCanceled(true);
+        }
+        disposables.add(session.onDidChange(e => {
+            switch (e.status) {
+                case TextToSpeechStatus.Started:
+                    this.activeTextToSpeechSessions++;
+                    this.textToSpeechInProgress.set(true);
+                    this._onDidStartTextToSpeechSession.fire();
+                    break;
+                case TextToSpeechStatus.Stopped:
+                    onSessionStoppedOrCanceled(false);
+                    break;
+                case TextToSpeechStatus.Error:
+                    this.logService.error(`Speech provider error in text to speech session: ${e.text}`);
+                    sessionError = true;
+                    break;
+            }
+        }));
+        return session;
+    }
+    get hasActiveKeywordRecognition() { return this.activeKeywordRecognitionSessions > 0; }
     async recognizeKeyword(token) {
         const result = ( (new DeferredPromise()));
-        await this.extensionService.activateByEvent('onSpeech');
         const disposables = ( (new DisposableStore()));
         disposables.add(token.onCancellationRequested(() => {
             disposables.dispose();
@@ -224,14 +274,13 @@ let SpeechService = class SpeechService extends Disposable {
     }
     async doRecognizeKeyword(token) {
         const provider = await this.getProvider();
-        const session = this._activeKeywordRecognitionSession = provider.createKeywordRecognitionSession(token);
+        const session = provider.createKeywordRecognitionSession(token);
+        this.activeKeywordRecognitionSessions++;
         this._onDidStartKeywordRecognition.fire();
         const disposables = ( (new DisposableStore()));
         const onSessionStoppedOrCanceled = () => {
-            if (session === this._activeKeywordRecognitionSession) {
-                this._activeKeywordRecognitionSession = undefined;
-                this._onDidEndKeywordRecognition.fire();
-            }
+            this.activeKeywordRecognitionSessions = Math.max(0, this.activeKeywordRecognitionSessions - 1);
+            this._onDidEndKeywordRecognition.fire();
             disposables.dispose();
         };
         disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled()));