From 6c78c5643c5da79f3271a2a04e53a4b45ec1c189 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 7 May 2023 13:03:06 +0000
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E3=81=99=E3=82=8Bworker?=
 =?UTF-8?q?=E3=82=921=E3=81=A4=E3=81=AB=E3=81=99=E3=82=8B=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkImgWithBlurhash.vue      | 21 ++++++++++---------
 .../frontend/src/workers/draw-blurhash.ts     |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue
index 8b883dc35e..28c24f5c3c 100644
--- a/packages/frontend/src/components/MkImgWithBlurhash.vue
+++ b/packages/frontend/src/components/MkImgWithBlurhash.vue
@@ -14,14 +14,15 @@
 	</TransitionGroup>
 </div>
 </template>
-
-<script lang="ts" setup>
-import { computed, onMounted, onUnmounted, shallowRef, useCssModule, watch } from 'vue';
-import { defaultStore } from '@/store';
+<script lang="ts">
 import DrawBlurhash from '@/workers/draw-blurhash?worker';
 
 const worker = new DrawBlurhash();
-
+</script>
+<script lang="ts" setup>
+import { computed, onMounted, onUnmounted, shallowRef, useCssModule, watch } from 'vue';
+import { v4 as uuid } from 'uuid';
+import { defaultStore } from '@/store';
 const $style = useCssModule();
 
 const props = withDefaults(defineProps<{
@@ -57,6 +58,7 @@ const canvas = shallowRef<HTMLCanvasElement>();
 let loaded = $ref(false);
 let canvasWidth = $ref(props.width);
 let canvasHeight = $ref(props.height);
+let currentDrawId = $ref<string>();
 const hide = computed(() => !loaded || props.forceBlurhash);
 
 function onLoad() {
@@ -78,7 +80,9 @@ watch([() => props.width, () => props.height], () => {
 
 function draw() {
 	if (props.hash == null) return;
+	currentDrawId = uuid();
 	worker.postMessage({
+		id: currentDrawId,
 		hash: props.hash,
 		width: canvasWidth,
 		height: canvasHeight,
@@ -87,9 +91,10 @@ function draw() {
 
 worker.addEventListener('message', event => {
 	if (!canvas.value) return;
+	if (event.data.id !== currentDrawId) return;
 	const ctx = canvas.value.getContext('2d');
 	if (!ctx) return;
-	const bitmap = event.data as ImageBitmap;
+	const bitmap = event.data.bitmap as ImageBitmap;
 	ctx.drawImage(bitmap, 0, 0, canvasWidth, canvasHeight);
 });
 
@@ -100,10 +105,6 @@ watch(() => props.hash, () => {
 onMounted(() => {
 	draw();
 });
-
-onUnmounted(() => {
-	worker.terminate();
-});
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/workers/draw-blurhash.ts b/packages/frontend/src/workers/draw-blurhash.ts
index 2fd3aebd41..4b06b912d6 100644
--- a/packages/frontend/src/workers/draw-blurhash.ts
+++ b/packages/frontend/src/workers/draw-blurhash.ts
@@ -14,5 +14,5 @@ onmessage = async (event) => {
 	imageData.data.set(pixels);
 	ctx.putImageData(imageData, 0, 0);
     const bitmap = canvas.transferToImageBitmap();
-    postMessage(bitmap);
+    postMessage({ bitmap, id: event.data.id });
 };