fix : vercel edge config

- edge configのスキーマを修正 - アイテムを強制更新できるように変更
Liria-works · Feb 21, 2025 · dc93062 · dc93062
1 parent c98cf9a
commit dc93062
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 37 deletions.
diff --git a/components/badge/header.vue b/components/badge/header.vue
@@ -2,7 +2,7 @@
 const badge = ref<HeaderBadge | null>(null);
 
 try {
-    const res = await $fetch('/api/edgeConfig/badge_main');
+    const res = await $fetch('/api/edgeConfig/badgeMain');
     badge.value = res.value ? (res.value as unknown as HeaderBadge) : null;
 } catch (error) {
     console.error('Failed to fetch badge:', error);

diff --git a/components/setups/item.vue b/components/setups/item.vue
@@ -14,6 +14,8 @@ const props = withDefaults(defineProps<Props>(), {
     noAction: false,
 });
 
+const forceUpdateItem = (await $fetch('/api/edgeConfig/forceUpdateItem')).value;
+
 const loading = ref(false);
 
 const sourceInfo = {
@@ -35,34 +37,42 @@ onMounted(async () => {
         new Date().getTime() - new Date(props.item.updated_at).getTime();
 
     // 時間の差分が1日を超えている場合、処理継続する
-    if (timeDifference > 24 * 60 * 60 * 1000) {
+    // edge config の forceUpdateItem が true の場合は強制的に処理継続する
+    if (forceUpdateItem || timeDifference > 24 * 60 * 60 * 1000) {
+        loading.value = true;
+
         const response = await $fetch('/api/item/booth', {
             query: { id: props.item.id },
         });
 
         if (response.data) item.value = response.data;
         if (!response.data) item.value.outdated = true;
-    }
 
-    loading.value = false;
+        loading.value = false;
+    }
 });
 </script>
 
 <template>
     <div
         v-if="loading"
+        :data-size="props.size"
         :class="
             twMerge(
-                'flex items-center px-6 ring-1 ring-zinc-300 dark:ring-zinc-600 rounded-lg overflow-clip',
+                'group flex items-center px-6 ring-1 ring-zinc-300 dark:ring-zinc-600 rounded-lg overflow-clip',
                 props.class
             )
         "
     >
-        <Icon
-            name="svg-spinners:ring-resize"
-            size="24"
-            :class="props.size === 'lg' ? 'h-20 sm:h-32' : 'h-20'"
-        />
+        <div
+            :data-size="props.size"
+            class="flex items-center gap-3 h-24 data-[size=lg]:h-24 data-[size=lg]:sm:h-36"
+        >
+            <Icon name="svg-spinners:ring-resize" size="24" />
+            <p class="text-sm font-bold text-zinc-600 dark:text-zinc-400">
+                アイテムの最新情報を取得中...
+            </p>
+        </div>
     </div>
 
     <div

diff --git a/components/ui/isMaintenance.vue b/components/ui/isMaintenance.vue
@@ -3,7 +3,7 @@ const isMaintenance = ref<boolean>(false);
 
 onMounted(async () => {
     const res = await $fetch('/api/edgeConfig');
-    if (res.value) isMaintenance.value = res.value.is_maintenance as boolean;
+    if (res.value) isMaintenance.value = res.value.isMaintenance as boolean;
 });
 </script>
 

diff --git a/middleware/maintenance.global.ts b/middleware/maintenance.global.ts
@@ -9,7 +9,7 @@ export default defineNuxtRouteMiddleware(async (_to, _from) => {
     if (env === 'development') return;
 
     const isMaintenance = await $fetch('/api/edgeConfig');
-    if (isMaintenance.value?.is_maintenance)
+    if (isMaintenance.value?.isMaintenance)
         return showError({
             statusCode: 503,
             message: 'メンテナンス中です',

diff --git a/server/api/item/booth.get.ts b/server/api/item/booth.get.ts
@@ -17,6 +17,18 @@ const GetBoothItem = async (
     event: H3Event,
     id: number
 ): Promise<ApiResponse<Item>> => {
+    const edgeConfig = await event.$fetch('/api/edgeConfig');
+    if (!edgeConfig.value)
+        return {
+            data: null,
+            error: {
+                status: 500,
+                message: 'Error in vercel edge config.',
+            },
+        };
+
+    const config = edgeConfig.value;
+
     const client = await serverSupabaseClient(event);
 
     const startTime = Date.now(); // 処理開始時刻を記録
@@ -47,18 +59,21 @@ const GetBoothItem = async (
         .maybeSingle();
 
     // データが存在し、かつ最終更新が1日以内ならそのまま返す
-    if (itemData) {
-        const timeDifference =
-            new Date().getTime() - new Date(itemData.updated_at).getTime();
+    // edge config の forceUpdateItem が true の場合は強制的に更新
+    if (!config.forceUpdateItem) {
+        if (itemData) {
+            const timeDifference =
+                new Date().getTime() - new Date(itemData.updated_at).getTime();
 
-        if (timeDifference < 24 * 60 * 60 * 1000)
-            return {
-                data: itemData,
-                error: null,
-            };
+            if (timeDifference < 24 * 60 * 60 * 1000)
+                return {
+                    data: itemData,
+                    error: null,
+                };
 
-        console.log('Data is old, fetching from Booth', id);
-    }
+            console.log('Data is old, fetching from Booth', id);
+        }
+    } else console.log('Force update is enabled, fetching from Booth', id);
 
     const locale = 'ja';
     const urlBase = `https://booth.pm/${locale}/items/`;
@@ -147,21 +162,10 @@ const GetBoothItem = async (
     //      134 - 素材（その他）
 
     try {
-        const config = await event.$fetch(
-            '/api/edgeConfig/allowed_category_id'
-        );
-        if (config.status !== 200 || !config.value)
-            return {
-                data: null,
-                error: {
-                    status: 500,
-                    message: 'Error in vercel edge config.',
-                },
-            };
-
-        const allowed_category_id: number[] = config.value as number[];
-
-        if (!allowed_category_id.includes(Number(response.category.id)))
+        const allowedBoothCategoryId =
+            config.allowedBoothCategoryId as number[];
+
+        if (!allowedBoothCategoryId.includes(Number(response.category.id)))
             if (!item.tags.map((t: string) => t).includes('VRChat'))
                 return {
                     data: null,