fix: replace pixivClient singleton with store object

dragon-fish · dragon-fish · commit 6ccf1d09df86 · 2026-03-26T01:35:00.000+08:00
diff --git a/app/api/pixiv-client.ts b/app/api/pixiv-client.ts
@@ -57,10 +57,7 @@ export interface FollowingResult {
 
 // ── PixivWebClient ───────────────────────────────────────────────────
 
-function resolveBaseUrl(
-  fallback: string,
-  override?: string
-): string {
+function resolveBaseUrl(fallback: string, override?: string): string {
   if (override) return override.endsWith('/') ? override : override + '/'
   return fallback
 }
@@ -430,8 +427,3 @@ export class PixivWebClient {
     return this.transform(data)
   }
 }
-
-/**
- * Singleton instance for use across the application.
- */
-export const pixivClient = new PixivWebClient()
diff --git a/app/components/Artwork/ArtworkCard.vue b/app/components/Artwork/ArtworkCard.vue
@@ -11,10 +11,15 @@
   .artwork-card(v-else-if='item')
     .artwork-image
       .side-tags
-        .restrict.x-restrict(aria-label='R-18' role='img' title='R-18' v-if='item.xRestrict')
+        .restrict.x-restrict(
+          aria-label='R-18'
+          role='img'
+          title='R-18'
+          v-if='item.xRestrict'
+        )
           IFasEye(aria-hidden='true')
         .restrict.ai-restrict(
-          :aria-label='`AI生成`'
+          :aria-label='`AI生成`',
           :title='`AI生成(${item.aiType})`'
           role='img'
           v-if='item.aiType === 2'
@@ -27,8 +32,8 @@
           IFasImages(data-icon)
           | {{ item.pageCount }}
         button.bookmark(
-          :aria-label='item.bookmarkData ? "取消收藏" : "添加收藏"'
-          :class='{ bookmarked: item.bookmarkData, disabled: loadingBookmark }'
+          :aria-label='item.bookmarkData ? "取消收藏" : "添加收藏"',
+          :class='{ bookmarked: item.bookmarkData, disabled: loadingBookmark }',
           :title='item.bookmarkData ? "取消收藏" : "添加收藏"'
           @click.stop.prevent='handleBookmark'
         )
@@ -53,22 +58,22 @@
 
 <script lang="ts" setup>
 import DeferLoad from '../DeferLoad.vue'
-import { pixivClient } from '~/api/pixiv-client'
 import { NSkeleton } from 'naive-ui'
 import { IllustType } from '~/utils/constants'
 import IFasEye from '~icons/fa-solid/eye'
 import IFasHeart from '~icons/fa-solid/heart'
 import IFasImages from '~icons/fa-solid/images'
 import IFasRobot from '~icons/fa-solid/robot'
 import IPlayCircle from '~icons/fa-solid/play-circle'
-
 import type { ArtworkInfo } from '~/types'
 
 const props = defineProps<{
   item?: ArtworkInfo
   loading?: boolean
 }>()
 
+const pixivClient = usePixivClientStore().client
+
 const loadingBookmark = ref(false)
 async function handleBookmark() {
   if (loadingBookmark.value) return
diff --git a/app/components/AuthorCard.vue b/app/components/AuthorCard.vue
@@ -37,7 +37,6 @@
 <script lang="ts" setup>
 import ArtworkList from './Artwork/ArtworkList.vue'
 import type { User } from '~/types'
-import { pixivClient } from '~/api/pixiv-client'
 import { NButton, NEllipsis, NSkeleton } from 'naive-ui'
 import IFasCheck from '~icons/fa-solid/check'
 import IFasPlus from '~icons/fa-solid/plus'
diff --git a/app/components/Comment/CommentArea.vue b/app/components/Comment/CommentArea.vue
@@ -24,7 +24,6 @@
 
 <script lang="ts" setup>
 import Comment from './Comment.vue'
-import { pixivClient } from '~/api/pixiv-client'
 import type { Comments } from '~/types'
 import { NButton } from 'naive-ui'
 import IFasPlus from '~icons/fa-solid/plus'
diff --git a/app/components/FollowUserCard.vue b/app/components/FollowUserCard.vue
@@ -37,13 +37,13 @@
 <script lang="ts" setup>
 import ArtworkList from './Artwork/ArtworkList.vue'
 import type { User, UserListItem } from '~/types'
-import { pixivClient } from '~/api/pixiv-client'
 import { NButton, NEllipsis, NSkeleton } from 'naive-ui'
 import IFasCheck from '~icons/fa-solid/check'
 import IFasPlus from '~icons/fa-solid/plus'
 import { useUserStore } from '~/stores/session'
 
 const userStore = useUserStore()
+const pixivClient = usePixivClientStore().client
 
 const props = defineProps<{
   user?: UserListItem
diff --git a/app/composables/userData.ts b/app/composables/userData.ts
@@ -1,5 +1,4 @@
 import type { PixivUser } from '~/types'
-import { pixivClient } from '~/api/pixiv-client'
 import Cookies from 'js-cookie'
 
 export function existsSessionId(): boolean {
@@ -13,6 +12,7 @@ export function existsSessionId(): boolean {
 }
 
 export async function initUser(): Promise<PixivUser> {
+  const pixivClient = usePixivClientStore().client
   try {
     const data = await pixivClient._getSessionUser()
     if (data.token) {
diff --git a/app/pages/artworks/[id].vue b/app/pages/artworks/[id].vue
@@ -150,7 +150,6 @@ import IFasThumbsUp from '~icons/fa-solid/thumbs-up'
 
 // Types
 import type { Artwork, ArtworkGallery, User } from '~/types'
-
 import { useUserStore } from '~/stores/session'
 import { useArtworkStore } from '~/stores/artwork'
 import { useUserProfileStore } from '~/stores/user-profile'
diff --git a/app/pages/index.vue b/app/pages/index.vue
@@ -30,7 +30,11 @@
     .bg-info-modal
       .align-center
         RouterLink.thumb(:to='"/artworks/" + randomBg?.id')
-          img(:src='randomBgRegularUrl' lazyload :style="{width: '100%', height: 'auto'}")
+          img(
+            :src='randomBgRegularUrl',
+            :style='{ width: "100%", height: "auto" }'
+            lazyload
+          )
         .desc
           .author
             RouterLink(:to='"/users/" + randomBg?.userId') @{{ randomBg?.userName }}
@@ -56,28 +60,30 @@
         )
           template(#default) {{ homeStore.loadingDiscovery ? '加载中' : '换一批' }}
           template(#icon): NIcon: IFasRandom
-      ArtworkList(:list='homeStore.discoveryList', :loading='homeStore.loadingDiscovery')
+      ArtworkList(
+        :list='homeStore.discoveryList',
+        :loading='homeStore.loadingDiscovery'
+      )
 </template>
 
 <script lang="ts" setup>
-definePageMeta({ name: 'home' })
-
-// Mark body with route class for navbar transparency
-useHead({
-  bodyAttrs: { 'data-route': 'home' },
-})
-
 import ArtworkList from '~/components/Artwork/ArtworkList.vue'
 import SearchBox from '~/components/SearchBox.vue'
 import { NH2, NButton, NIcon, NModal } from 'naive-ui'
 import IFasInfoCircle from '~icons/fa-solid/info-circle'
 import IFasRandom from '~icons/fa-solid/random'
-
 import { useHomeStore } from '~/stores/home'
 import { toRegularUrl } from '~/utils/pximg'
 import LogoH from '~/assets/LogoH.png'
 import { setTitle } from '~/utils/setTitle'
 
+definePageMeta({ name: 'home' })
+
+// Mark body with route class for navbar transparency
+useHead({
+  bodyAttrs: { 'data-route': 'home' },
+})
+
 const isShowBgInfo = ref(false)
 const homeStore = useHomeStore()
 const randomBg = computed(() => homeStore.randomBg)
diff --git a/app/pages/ranking.vue b/app/pages/ranking.vue
@@ -25,7 +25,6 @@ definePageMeta({ name: 'ranking' })
 import ArtworkLargeList from '~/components/Artwork/ArtworkLargeList.vue'
 import ErrorPage from '~/components/ErrorPage.vue'
 import Placeholder from '~/components/Placeholder.vue'
-
 import { useRankingStore } from '~/stores/ranking'
 import { effect } from 'vue'
 import { setTitle } from '~/utils/setTitle'
diff --git a/app/pages/search/[keyword]/[p].vue b/app/pages/search/[keyword]/[p].vue
@@ -32,7 +32,6 @@ import ArtworkList from '~/components/Artwork/ArtworkList.vue'
 import ErrorPage from '~/components/ErrorPage.vue'
 import SearchBox from '~/components/SearchBox.vue'
 import { NButton, NSpin } from 'naive-ui'
-
 import { useSearchStore } from '~/stores/search'
 import { effect } from 'vue'
 import { setTitle } from '~/utils/setTitle'
diff --git a/app/pages/users/[id]/index.vue b/app/pages/users/[id]/index.vue
@@ -181,7 +181,6 @@ import IFasMapMarkerAlt from '~icons/fa-solid/map-marker-alt'
 import IFasParking from '~icons/fa-solid/parking'
 import IFasPlus from '~icons/fa-solid/plus'
 import IFasVenusMars from '~icons/fa-solid/venus-mars'
-
 import { useUserStore } from '~/stores/session'
 import { useUserProfileStore } from '~/stores/user-profile'
 import type { ArtworkInfo, User } from '~/types'
diff --git a/app/stores/artwork.ts b/app/stores/artwork.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { Artwork, ArtworkGallery, ArtworkInfo } from '~/types'
 
 export const useArtworkStore = defineStore('artwork', () => {
+  const pixivClient = usePixivClientStore().client
   const artworkCache = ref(new Map<string, Artwork>())
   const pagesCache = ref(new Map<string, ArtworkGallery[]>())
 
diff --git a/app/stores/following.ts b/app/stores/following.ts
@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkInfo, UserListItem } from '~/types'
 
 export const useFollowingStore = defineStore('following', () => {
@@ -23,6 +22,7 @@ export const useFollowingStore = defineStore('following', () => {
     userId: string,
     hidden: boolean
   ): Promise<void> {
+    const pixivClient = usePixivClientStore().client
     const list = hidden ? hiddenList : publicList
     const isLoading = hidden ? isLoadingHidden : isLoadingPublic
     const total = hidden ? totalHidden : totalPublic
diff --git a/app/stores/home.ts b/app/stores/home.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkInfo } from '~/types'
 
 export const useHomeStore = defineStore('home', () => {
+  const pixivClient = usePixivClientStore().client
   const randomBg = ref<ArtworkInfo | null>(null)
   const discoveryList = ref<ArtworkInfo[]>([])
   const loadingDiscovery = ref(false)
@@ -11,7 +11,7 @@ export const useHomeStore = defineStore('home', () => {
     try {
       const illusts = await pixivClient.getDiscovery({ mode: 'safe', max: 1 })
       if (illusts.length) {
-        randomBg.value = illusts[0]
+        randomBg.value = illusts[0]!
       }
     } catch (err) {
       console.error(err)
diff --git a/app/stores/pixiv-client.ts b/app/stores/pixiv-client.ts
@@ -0,0 +1,12 @@
+import { PixivWebClient } from '~/api/pixiv-client'
+
+export const usePixivClientStore = defineStore('pixiv-client', () => {
+  const runtimeConfig = useRuntimeConfig()
+  const client = markRaw(
+    new PixivWebClient({
+      pximgBaseUrlI: runtimeConfig.public.pximgBaseUrlI,
+      pximgBaseUrlS: runtimeConfig.public.pximgBaseUrlS,
+    })
+  )
+  return { client }
+})
diff --git a/app/stores/ranking.ts b/app/stores/ranking.ts
@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkRank } from '~/types'
 
 export const useRankingStore = defineStore('ranking', () => {
@@ -8,6 +7,7 @@ export const useRankingStore = defineStore('ranking', () => {
     contents: ArtworkRank[]
   } | null>(null)
   const loading = ref(false)
+  const pixivClient = usePixivClientStore().client
 
   async function fetchRanking(params?: {
     p?: string
diff --git a/app/stores/search.ts b/app/stores/search.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkInfo } from '~/types'
 
 export const useSearchStore = defineStore('search', () => {
+  const pixivClient = usePixivClientStore().client
   const results = ref<ArtworkInfo[]>([])
   const total = ref(0)
   const loading = ref(false)
diff --git a/app/stores/session.ts b/app/stores/session.ts
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 import type { PixivUser } from '~/types'
-import { pixivClient } from '~/api/pixiv-client'
 import Cookies from 'js-cookie'
 
 export const useSideNavStore = defineStore('sidenav', () => {
@@ -19,6 +18,7 @@ export const useSideNavStore = defineStore('sidenav', () => {
 })
 
 export const useUserStore = defineStore('user', () => {
+  const pixivClient = usePixivClientStore().client
   const user = ref<PixivUser | null>(null)
   const isLoggedIn = computed(() => !!user.value)
   const userId = computed(() => user.value?.id)
diff --git a/app/stores/user-artworks.ts b/app/stores/user-artworks.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkInfo } from '~/types'
 
 export const useUserArtworksStore = defineStore('user-artworks', () => {
+  const pixivClient = usePixivClientStore().client
   const allIds = ref<string[]>([])
   const cachedPages = ref<Record<number, ArtworkInfo[]>>({})
   const pageSize = 24
diff --git a/app/stores/user-profile.ts b/app/stores/user-profile.ts
@@ -1,9 +1,9 @@
 import { defineStore } from 'pinia'
-import { pixivClient } from '~/api/pixiv-client'
 import type { ArtworkInfo, User } from '~/types'
 import { sortArtList } from '~/utils'
 
 export const useUserProfileStore = defineStore('user-profile', () => {
+  const pixivClient = usePixivClientStore().client
   const userCache = ref(new Map<string, User>())
 
   function getCachedUser(id: string): User | undefined {

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,7 @@ export interface FollowingResult {`
`57`	`57`
`58`	`58`	`// ── PixivWebClient ───────────────────────────────────────────────────`
`59`	`59`
`60`		`-function resolveBaseUrl(`
`61`		`- fallback: string,`
`62`		`- override?: string`
`63`		`-): string {`
	`60`	`+function resolveBaseUrl(fallback: string, override?: string): string {`
`64`	`61`	`if (override) return override.endsWith('/') ? override : override + '/'`
`65`	`62`	`return fallback`
`66`	`63`	`}`
`@@ -430,8 +427,3 @@ export class PixivWebClient {`
`430`	`427`	`return this.transform(data)`
`431`	`428`	`}`
`432`	`429`	`}`
`433`		`-`
`434`		`-/**`
`435`		`- * Singleton instance for use across the application.`
`436`		`- */`
`437`		`-export const pixivClient = new PixivWebClient()`