From 65467d62e060bbd56afd866ce8d62df25ab63007 Mon Sep 17 00:00:00 2001
From: Alexander Drozdov <snosme@gmail.com>
Date: Fri, 22 Jan 2021 09:04:38 +0200
Subject: [PATCH] api: request on demand

---
 src/web/price-check/trade/TradeBulk.vue       | 44 ++++++++++++++++---
 src/web/price-check/trade/pathofexile-bulk.ts | 12 +++--
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/web/price-check/trade/TradeBulk.vue b/src/web/price-check/trade/TradeBulk.vue
index 54209c13..55b85b83 100644
--- a/src/web/price-check/trade/TradeBulk.vue
+++ b/src/web/price-check/trade/TradeBulk.vue
@@ -87,11 +87,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, inject, ref, computed, watch, ComputedRef } from 'vue'
+import { defineComponent, PropType, inject, ref, computed, watch, ComputedRef, shallowRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { DateTime } from 'luxon'
 import { MainProcess } from '@/ipc/main-process-bindings'
-import { BulkSearch, execBulkSearch } from './pathofexile-bulk'
+import { BulkSearch, execBulkSearch, PricingResult, requestResults } from './pathofexile-bulk'
 import { tradeTag, getTradeEndpoint } from './common'
 import { TRADE_TAG_BY_NAME } from '@/assets/data'
 import { selected as league } from '../../background/Leagues'
@@ -101,9 +101,14 @@ import { ParsedItem } from '@/parser'
 import { PriceCheckWidget, WidgetManager } from '@/web/overlay/interfaces'
 
 function useBulkApi () {
+  type BulkSearchExtended = BulkSearch & {
+    exa: { listed: ComputedRef<PricingResult[]> }
+    chaos: { listed: ComputedRef<PricingResult[]> }
+  }
+
   let searchId = 0
   const error = ref<string | null>(null)
-  const result = ref<BulkSearch | null>(null)
+  const result = shallowRef<BulkSearchExtended | null>(null)
 
   async function search (item: ParsedItem, filters: ItemFilters) {
     try {
@@ -114,13 +119,42 @@ function useBulkApi () {
       const _searchId = searchId
       const _result = await execBulkSearch(item, filters)
       if (_searchId === searchId) {
-        result.value = _result
+        result.value = {
+          exa: {
+            ..._result.exa,
+            listed: getResultsByQuery(_result.exa)
+          },
+          chaos: {
+            ..._result.chaos,
+            listed: getResultsByQuery(_result.chaos)
+          }
+        }
       }
     } catch (err) {
       error.value = err.message
     }
   }
 
+  function getResultsByQuery (query: BulkSearch['exa' | 'chaos']) {
+    const items = shallowRef<PricingResult[]>([])
+    let requested = false
+
+    return computed(() => {
+      if (query.total && !requested) {
+        ;(async function () {
+          try {
+            requested = true
+            items.value = await requestResults(query.queryId, query.listedIds.slice(0, 20))
+          } catch (err) {
+            error.value = err.message
+          }
+        })()
+      }
+
+      return items.value
+    })
+  }
+
   return { error, result, search }
 }
 
@@ -146,7 +180,7 @@ export default defineComponent({
       const arr = Array(20)
       if (!result.value) return arr
 
-      const listed = result.value[selectedCurr.value].listed
+      const listed = result.value[selectedCurr.value].listed.value
       arr.splice(0, listed.length, ...listed)
       return arr
     })
diff --git a/src/web/price-check/trade/pathofexile-bulk.ts b/src/web/price-check/trade/pathofexile-bulk.ts
index cc556585..3d4400bb 100644
--- a/src/web/price-check/trade/pathofexile-bulk.ts
+++ b/src/web/price-check/trade/pathofexile-bulk.ts
@@ -32,7 +32,7 @@ interface FetchResult {
   }
 }
 
-interface PricingResult {
+export interface PricingResult {
   id: string
   listedAt: string
   exchangeAmount: number
@@ -63,7 +63,7 @@ async function requestTradeResultList (body: TradeRequest) {
   return data
 }
 
-async function requestResults (queryId: string, resultIds: string[]): Promise<PricingResult[]> {
+export async function requestResults (queryId: string, resultIds: string[]): Promise<PricingResult[]> {
   await RateLimiter.waitMulti(RATE_LIMIT_RULES.FETCH)
 
   const response = await fetch(`https://${getTradeEndpoint()}/api/trade/fetch/${resultIds.join(',')}?query=${queryId}&exchange`)
@@ -95,12 +95,12 @@ export interface BulkSearch {
   exa: {
     queryId: string
     total: number
-    listed: PricingResult[]
+    listedIds: string[]
   }
   chaos: {
     queryId: string
     total: number
-    listed: PricingResult[]
+    listedIds: string[]
   }
 }
 
@@ -121,9 +121,7 @@ export async function execBulkSearch (item: ParsedItem, filters: ItemFilters): P
     return {
       queryId: query.id,
       total: query.total,
-      listed: (query.total > 0)
-        ? await requestResults(query.id, query.result.slice(0, 20))
-        : []
+      listedIds: query.result
     }
   }))