fix/match_collector: fix boots handling

frontend/components/build/FirstBack.vue

@@ -107,4 +107,15 @@ defineProps<{
   opacity: 0.8;
   white-space: nowrap;
 }
+
+@media only screen and (max-width: 650px) {
+  .item-row {
+    align-items: center;
+    max-width: 100%;
+    margin: 0 20px;
+  }
+  .first-back-content {
+    justify-content: center;
+  }
+}
 </style>

frontend/components/item/ItemIcon.vue

@@ -124,7 +124,6 @@ const itemIconPath = computed(() => CDRAGON_BASE + mapPath(props.item.iconPath))
   border-radius: 4px;
   border: 1px solid var(--color-on-surface);
   overflow: hidden;
-  cursor: help;
   position: relative;
 }
 

frontend/components/rune/Page.vue

@@ -86,7 +86,11 @@ refreshStyles()
     <div class="rune-spacer-bar" />
     <div class="rune-holder" style="align-content: end">
       <div class="rune-slot">
-        <img style="margin: auto" :src="CDRAGON_BASE + mapPath(secondaryStyle.iconPath)" />
+        <img
+          class="rune-style-img"
+          style="margin: auto"
+          :src="CDRAGON_BASE + mapPath(secondaryStyle.iconPath)"
+        />
       </div>
       <div
         v-for="(slot, slotIndex) in secondaryStyle.slots.slice(1, 4)"
@@ -128,6 +132,10 @@ refreshStyles()
   margin-right: 20px;
   border: 1px var(--color-on-surface) solid;
 }
+.rune-style-img {
+  width: 48px;
+  height: 48px;
+}
 
 @media only screen and (max-width: 650px) {
   .rune-slot {
@@ -143,5 +151,9 @@ refreshStyles()
     margin-left: 10px;
     margin-right: 10px;
   }
+  .rune-icon {
+    width: 24px !important;
+    height: 24px !important;
+  }
 }
 </style>

frontend/components/rune/RuneIcon.vue

@@ -114,7 +114,6 @@ const perkIconPath = computed(() => CDRAGON_BASE + mapPath(props.perk.iconPath))
   border-radius: 50%;
   border: 1px solid var(--color-on-surface);
   overflow: hidden;
-  cursor: help;
   position: relative;
 }
 

match_collector/Dockerfile

@@ -20,9 +20,14 @@ RUN npm install
 COPY --chown=node:node match_collector/. .
 
 FROM node:current-alpine
+# Install su-exec for dropping privileges
+RUN apk add --no-cache su-exec
 RUN mkdir -p /home/node/app && chown -R node:node /home/node/app
 WORKDIR /home/node/app
-USER node
 COPY --from=build --chown=node:node /home/node/app/match_collector/node_modules ./node_modules
 COPY --from=build --chown=node:node /home/node/app/match_collector/. .
-CMD ["/bin/sh", "-c", "node --import=tsx src/index.ts; sleep 20h"]
+COPY --chown=node:node match_collector/docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+# Run entrypoint as root to fix permissions, then drop to node user
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+CMD ["/bin/sh", "-c", "node --import=tsx src/index.ts; sleep 12h"]

match_collector/docker-entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Fix permissions on the cdragon cache directory if it exists
+if [ -d "/cdragon" ]; then
+  # Ensure the node user owns the cdragon directory
+  chown -R node:node /cdragon 2>/dev/null || true
+fi
+
+# Execute the main command as the node user
+exec su-exec node "$@"

match_collector/src/champion_stat.ts

@@ -177,7 +177,7 @@ function handleMatchBuilds(
   participantIndex: number,
   builds: Builds,
   platform?: string
-): Build {
+): { build: Build; startItemId: number | undefined } {
   const timeline: Timeline = match.timeline
 
   // Find or create the build for this participant's rune configuration
@@ -185,6 +185,7 @@ function handleMatchBuilds(
   build.count += 1
 
   const items: Array<{ itemId: number; goldAdvantage: GoldAdvantageTag; platform?: string }> = []
+  let startItemId: number | undefined = undefined
   for (const frame of timeline.info.frames) {
     for (const event of frame.events) {
       if (event.participantId != participantIndex) continue
@@ -218,17 +219,10 @@ function handleMatchBuilds(
       }
       if (event.type != 'ITEM_PURCHASED') continue
 
-      // Handle boots upgrades
-      if (
-        itemInfo.requiredBuffCurrencyName == 'Feats_NoxianBootPurchaseBuff' ||
-        itemInfo.requiredBuffCurrencyName == 'Feats_SpecialQuestBootBuff'
-      ) {
-        continue
-      }
-
       // Handle boots differently
       if (itemInfo.categories.includes('Boots')) {
-        if (itemInfo.to.length == 0 || (itemInfo.to[0] >= 3171 && itemInfo.to[0] <= 3176)) {
+        // Ignore basic boots, only count Tier 2 boots
+        if (event.itemId != 1001) {
           // Check for bootsFirst
           if (items.length < 2) {
             build.bootsFirstCount += 1
@@ -267,9 +261,11 @@ function handleMatchBuilds(
   // This tree includes start item as the root, then branching paths
   if (items.length > 0) {
     treeMerge(build.items, items)
+    // The first item is the starter item
+    startItemId = items[0].itemId
   }
 
-  return build
+  return { build, startItemId }
 }
 
 function handleMatch(match: Match, champions: Map<number, ChampionData>, platform?: string) {
@@ -365,14 +361,22 @@ function handleMatch(match: Match, champions: Map<number, ChampionData>, platfor
     }
 
     // Items and runes (builds)
-    const build = handleMatchBuilds(match, participant, participantIndex, lane.builds, platform)
+    const { build, startItemId } = handleMatchBuilds(
+      match,
+      participant,
+      participantIndex,
+      lane.builds,
+      platform
+    )
 
-    // First back data - store at build level
+    // First back data - store at build level with start item tracking
     const firstBackData = extractFirstBackFromMatch(match, participantIndex)
     if (firstBackData) {
       if (!build.firstBacksRaw) {
         build.firstBacksRaw = []
       }
+      // Include the starter item ID for proper filtering when splitting builds
+      firstBackData.startItemId = startItemId
       build.firstBacksRaw.push(firstBackData)
     }
   }
@@ -445,16 +449,44 @@ function splitMergeOnStarterItem(build: Build, championName: string): BuildWithS
     console.log(`Warning: for champion ${championName}, start item splits build variant.`)
     const builds = []
     for (const c of build.items.children) {
+      // Calculate the ratio for proportional distribution
+      const ratio = c.count / build.count
+
+      // Proportionally distribute boots counts
+      const scaledBoots = build.boots.map(b => ({
+        data: b.data,
+        count: Math.round(b.count * ratio)
+      }))
+
+      // Proportionally distribute suppItems counts
+      const scaledSuppItems = build.suppItems.map(s => ({
+        data: s.data,
+        count: Math.round(s.count * ratio)
+      }))
+
+      // Proportionally distribute bootsFirstCount
+      const scaledBootsFirstCount = Math.round(build.bootsFirstCount * ratio)
+
+      // Filter firstBacksRaw by starter item
+      let filteredFirstBacksRaw: FirstBackData[] | undefined
+      if (build.firstBacksRaw && build.firstBacksRaw.length > 0) {
+        // Filter by the starter item ID that was tracked when storing firstBacksRaw
+        filteredFirstBacksRaw = build.firstBacksRaw.filter(fb => fb.startItemId === c.data)
+        if (filteredFirstBacksRaw.length === 0) {
+          filteredFirstBacksRaw = undefined
+        }
+      }
+
       builds.push({
         runeKeystone: build.runeKeystone,
         runes: build.runes,
         items: c,
-        bootsFirstCount: build.bootsFirstCount,
+        bootsFirstCount: scaledBootsFirstCount,
         count: c.count,
         startItems: [{ data: c.data!, count: c.count }],
-        suppItems: build.suppItems,
+        suppItems: scaledSuppItems,
-        boots: build.boots,
+        boots: scaledBoots,
-        firstBacksRaw: build.firstBacksRaw
+        firstBacksRaw: filteredFirstBacksRaw
       })
       c.data = undefined
     }

match_collector/src/types.ts

@@ -82,6 +82,7 @@ export interface ItemSet {
 export interface FirstBackData {
   timestamp: number
   itemSet: ItemSet
+  startItemId?: number
 }
 
 /**