@sdata/web-vue 3.22.1 → 3.22.3

package/es/sender/use-speech.d.ts

@@ -12,7 +12,7 @@ interface UseSpeechOptions {
 export declare function useSpeech(allowSpeech: MaybeRefOrGetter<SenderAllowSpeech | undefined>, options: UseSpeechOptions): {
     available: import("vue").ComputedRef<boolean>;
     recording: import("vue").ComputedRef<boolean>;
-    requesting: import("vue").ShallowRef<boolean, boolean>;
+    requesting: import("vue").ComputedRef<boolean>;
     statusText: import("vue").ComputedRef<string>;
     trigger: (breakRecording?: boolean) => Promise<void>;
 };

package/es/sender/use-speech.js

@@ -13,6 +13,7 @@ class SdSenderAudioProcessor extends AudioWorkletProcessor {
     this.bufferSize = Math.max(128, options.processorOptions?.bufferSize || ${DEFAULT_BUFFER_SIZE});
     this.buffer = new Float32Array(this.bufferSize);
     this.offset = 0;
+    this.stopped = false;
     this.port.onmessage = (event) => {
       if (event.data?.type !== 'flush') return;
       if (this.offset > 0) {
@@ -20,11 +21,13 @@ class SdSenderAudioProcessor extends AudioWorkletProcessor {
         this.port.postMessage(chunk.buffer, [chunk.buffer]);
         this.offset = 0;
       }
+      this.stopped = true;
       this.port.postMessage({ type: 'flushed' });
     };
   }
 
   process(inputs) {
+    if (this.stopped) return false;
     const channels = inputs[0];
     if (!channels?.length) return true;
     const frames = channels[0].length;
@@ -55,6 +58,7 @@ function useSpeech(allowSpeech, options) {
 	const supported = shallowRef(false);
 	const internalRecording = shallowRef(false);
 	const requesting = shallowRef(false);
+	const stopping = shallowRef(false);
 	const captureError = shallowRef();
 	const stream = shallowRef();
 	const audioContext = shallowRef();
@@ -65,7 +69,8 @@ function useSpeech(allowSpeech, options) {
 	const chunks = shallowRef(0);
 	const sequence = shallowRef(0);
 	let generatedWorkletUrl;
-	let resolveWorkletFlush;
+	let resolveWorkletStop;
+	let workletStopRequested = false;
 	let workletReady = false;
 	let disposed = false;
 	const recording = computed(() => controlled.value && typeof config.value === "object" ? Boolean(config.value.recording) : internalRecording.value);
@@ -122,25 +127,36 @@ function useSpeech(allowSpeech, options) {
 			else reject(errorEvent.error);
 		};
 	});
-	const flushWorklet = () => new Promise((resolve) => {
+	const stopWorklet = () => new Promise((resolve) => {
 		var _workletNode$value;
 		const port = (_workletNode$value = workletNode.value) === null || _workletNode$value === void 0 ? void 0 : _workletNode$value.port;
-		if (!port) {
+		if (!port || workletStopRequested) {
 			resolve();
 			return;
 		}
-		const timeout = window.setTimeout(resolve, 100);
-		resolveWorkletFlush = () => {
+		workletStopRequested = true;
+		let settled = false;
+		const finish = () => {
+			if (settled) return;
+			settled = true;
 			window.clearTimeout(timeout);
-			resolveWorkletFlush = void 0;
+			resolveWorkletStop = void 0;
 			resolve();
 		};
+		const timeout = window.setTimeout(finish, 100);
+		resolveWorkletStop = finish;
 		port.postMessage({ type: "flush" });
 	});
 	const releaseResources = function() {
 		var _ref = _asyncToGenerator(function* () {
-			var _workletNode$value2, _sourceNode$value, _stream$value, _audioContext$value;
-			(_workletNode$value2 = workletNode.value) === null || _workletNode$value2 === void 0 || _workletNode$value2.disconnect();
+			var _sourceNode$value, _stream$value, _audioContext$value;
+			const currentWorkletNode = workletNode.value;
+			yield stopWorklet();
+			if (currentWorkletNode) {
+				currentWorkletNode.port.onmessage = null;
+				currentWorkletNode.port.close();
+				currentWorkletNode.disconnect();
+			}
 			(_sourceNode$value = sourceNode.value) === null || _sourceNode$value === void 0 || _sourceNode$value.disconnect();
 			(_stream$value = stream.value) === null || _stream$value === void 0 || _stream$value.getTracks().forEach((track) => track.stop());
 			if (((_audioContext$value = audioContext.value) === null || _audioContext$value === void 0 ? void 0 : _audioContext$value.state) === "running") yield audioContext.value.suspend();
@@ -166,25 +182,30 @@ function useSpeech(allowSpeech, options) {
 	}();
 	const stopCapture = function() {
 		var _ref3 = _asyncToGenerator(function* (reason = "manual") {
-			var _socket$value, _config$value$onRecor, _config$value;
-			if (!internalRecording.value) return;
-			yield flushWorklet();
-			const endedAt = performance.now();
-			internalRecording.value = false;
-			if (((_socket$value = socket.value) === null || _socket$value === void 0 ? void 0 : _socket$value.readyState) === WebSocket.OPEN && typeof config.value === "object" && config.value.sendMetadata !== false) socket.value.send(JSON.stringify({
-				type: "end",
-				reason
-			}));
-			yield releaseResources();
-			if (typeof config.value === "object") (_config$value$onRecor = (_config$value = config.value).onRecordingChange) === null || _config$value$onRecor === void 0 || _config$value$onRecor.call(_config$value, false);
-			options.onEnd({
-				source: "capture",
-				reason,
-				startedAt: startedAt.value,
-				endedAt,
-				duration: endedAt - startedAt.value,
-				chunks: chunks.value
-			});
+			if (!internalRecording.value || stopping.value) return;
+			stopping.value = true;
+			try {
+				var _socket$value, _config$value$onRecor, _config$value;
+				yield stopWorklet();
+				const endedAt = performance.now();
+				internalRecording.value = false;
+				if (((_socket$value = socket.value) === null || _socket$value === void 0 ? void 0 : _socket$value.readyState) === WebSocket.OPEN && typeof config.value === "object" && config.value.sendMetadata !== false) socket.value.send(JSON.stringify({
+					type: "end",
+					reason
+				}));
+				yield releaseResources();
+				if (typeof config.value === "object") (_config$value$onRecor = (_config$value = config.value).onRecordingChange) === null || _config$value$onRecor === void 0 || _config$value$onRecor.call(_config$value, false);
+				options.onEnd({
+					source: "capture",
+					reason,
+					startedAt: startedAt.value,
+					endedAt,
+					duration: endedAt - startedAt.value,
+					chunks: chunks.value
+				});
+			} finally {
+				stopping.value = false;
+			}
 		});
 		return function stopCapture() {
 			return _ref3.apply(this, arguments);
@@ -192,7 +213,7 @@ function useSpeech(allowSpeech, options) {
 	}();
 	const startCapture = function() {
 		var _ref4 = _asyncToGenerator(function* () {
-			if (requesting.value || internalRecording.value || !available.value) return;
+			if (requesting.value || stopping.value || internalRecording.value || !available.value) return;
 			requesting.value = true;
 			captureError.value = void 0;
 			let phase = "permission";
@@ -240,12 +261,13 @@ function useSpeech(allowSpeech, options) {
 					channelCount: 1,
 					processorOptions: _objectSpread2(_objectSpread2({}, speechConfig === null || speechConfig === void 0 ? void 0 : speechConfig.processorOptions), {}, { bufferSize })
 				});
+				workletStopRequested = false;
 				workletNode.value = nextWorkletNode;
 				sourceNode.value = nextAudioContext.createMediaStreamSource(stream.value);
 				nextWorkletNode.port.onmessage = (event) => {
 					var _socket$value2;
 					if (!(event.data instanceof ArrayBuffer) && "type" in event.data) {
-						if (event.data.type === "flushed") resolveWorkletFlush === null || resolveWorkletFlush === void 0 || resolveWorkletFlush();
+						if (event.data.type === "flushed") resolveWorkletStop === null || resolveWorkletStop === void 0 || resolveWorkletStop();
 						return;
 					}
 					if (!internalRecording.value) return;
@@ -300,6 +322,7 @@ function useSpeech(allowSpeech, options) {
 	}();
 	const trigger = function() {
 		var _ref5 = _asyncToGenerator(function* (breakRecording = false) {
+			if (requesting.value || stopping.value) return;
 			if (breakRecording && !recording.value) return;
 			if (controlled.value && typeof config.value === "object") {
 				var _config$value$onRecor2, _config$value2;
@@ -349,7 +372,7 @@ function useSpeech(allowSpeech, options) {
 	return {
 		available,
 		recording,
-		requesting,
+		requesting: computed(() => requesting.value || stopping.value),
 		statusText,
 		trigger
 	};

package/json/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "@sdata/web-vue",
-  "version": "3.22.0",
+  "version": "3.22.2",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdata/web-vue",
-  "version": "3.22.1",
+  "version": "3.22.3",
   "description": "SD Design Vue: A Vue.js 3 UI Library",
   "keywords": [
     "sd",