last alpha release: finish type fix

1.0.0-alpha.4

Author: NeserCode

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "rocox-codex",
 	"private": false,
-	"version": "1.0.0-alpha.3",
+	"version": "1.0.0-alpha.4",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rocox-codex"
-version = "1.0.0-alpha.3"
+version = "1.0.0-alpha.4"
 description = "Rocox Codex"
 authors = ["NeserCode"]
 license = "MIT"
@@ -13,7 +13,7 @@ edition = "2021"
 tauri-build = { version = "1.4", features = [] }
 
 [dependencies]
-tauri = { version = "1.4", features = [ "system-tray", "api-all"] }
+tauri = { version = "1.4", features = [ "system-tray", "api-all", "devtools"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 

src-tauri/Cargo.toml

@@ -8,7 +8,7 @@
 	},
 	"package": {
 		"productName": "RoCoX Codex",
-		"version": "1.0.0-alpha.3"
+		"version": "1.0.0-alpha.4"
 	},
 	"tauri": {
 		"allowlist": {

src-tauri/tauri.conf.json

@@ -2,19 +2,8 @@
 export default {
 	name: "chainItem",
 }
-
-interface ChainItemProp {
-	hash: string
-	id: string
-	img: string
-	name: string
-	start?: boolean
-	lv?: string
-	to: ChainItemProp[] | "0"
-}
 </script>
 <script lang="ts" setup>
-// @ts-ignore
 import { BoltIcon } from "@heroicons/vue/20/solid"
 import { Ref, ref, toRefs } from "vue"
 
@@ -23,6 +12,8 @@ import { useRouter } from "vue-router"
 import { useStorage } from "@vueuse/core"
 import { WindowCreator } from "../composables/useWindow"
 
+import type { ChainItemProp } from "../share"
+
 const $props = defineProps<{
 	chainTo: ChainItemProp | ChainItemProp[]
 }>()
@@ -71,12 +62,12 @@ function goAngelView(hash: string) {
 		>
 			<span
 				class="angel-item"
-				@click="setupWindowParams(chainTo.id, chainTo.name, chainTo.hash)"
+				@click="setupWindowParams(chainTo.id!, chainTo.name!, chainTo.hash!)"
 			>
 				<img
 					class="angel-img"
 					v-if="chainTo.id"
-					:src="iconSrc(chainTo.hash, chainTo.id)"
+					:src="iconSrc(chainTo.hash!, chainTo.id!)"
 					alt="Angel icon"
 					draggable="false"
 					loading="lazy"
@@ -90,19 +81,19 @@ function goAngelView(hash: string) {
 			</span>
 			<chainItem
 				v-if="!(typeof chainTo.to === 'string')"
-				:chainTo="chainTo.to"
+				:chainTo="chainTo.to!"
 			/>
 		</template>
 		<template v-if="Array.isArray(chainTo)">
 			<span v-for="item of chainTo" class="chain-children">
 				<span
 					class="angel-item"
-					@click="setupWindowParams(item.id, item.name, item.hash)"
+					@click="setupWindowParams(item.id!, item.name!, item.hash!)"
 				>
 					<img
 						class="angel-img"
 						v-if="item.id"
-						:src="iconSrc(item.hash, item.id)"
+						:src="iconSrc(item.hash!, item.id!)"
 						alt="Angel icon"
 						draggable="false"
 						loading="lazy"
@@ -114,7 +105,7 @@ function goAngelView(hash: string) {
 					<span class="lv" v-else>Super</span>
 					<BoltIcon class="icon" />
 				</span>
-				<chainItem v-if="!(typeof item.to === 'string')" :chainTo="item.to" />
+				<chainItem v-if="!(typeof item.to === 'string')" :chainTo="item.to!" />
 			</span>
 		</template>
 	</div>

src/components/ChainItem.vue

@@ -62,25 +62,25 @@ watch(listData, (val: any[]) => {
 
 <template>
 	<div class="item-list-main custom-scrollbar">
-		<div class="item-card" v-for="item in listData" :key="item.hash">
+		<div class="item-card" v-for="item in listData" :key="item.id!">
 			<span class="name-text">
 				<span class="id">#{{ item.id }}</span>
-				<span class="font-bold inline-block mx-1"> · </span>
+				<span class="inline-block mx-1 font-bold"> · </span>
 				<span class="name">{{ item.name }}</span>
 			</span>
 			<span class="details">
 				<img
 					v-if="item.id && !loadErrorList.includes(item.id)"
 					class="icon"
-					@error="(e) => onerrorList(e, item.id)"
+					@error="(e) => onerrorList(e, item.id!)"
 					:src="getItemSrc(item.id)"
 					alt="item image"
 					draggable="false"
 				/>
 				<CubeTransparentIcon v-else class="icon placeholder" />
 				<span class="text">
 					<span class="unique"
-						>持有 · {{ parseInt(item.Unique) ? "" : "不" }}唯一</span
+						>持有 · {{ parseInt(item.Unique!) ? "" : "不" }}唯一</span
 					>
 					<span class="price">售价 · {{ item.Price }}</span>
 					<span class="desc"

src/components/ItemList.vue

@@ -88,7 +88,7 @@ function goSkillView(hash: string) {
 			class="skill-card"
 			v-for="skill in listData"
 			:key="skill.hash"
-			@click="setupWindowParams(skill.id, skill.name, skill.hash)"
+			@click="setupWindowParams(skill.id!, skill.name!, skill.hash!)"
 		>
 			<span class="name-text">
 				<span class="id">#{{ skill.id }}</span>
@@ -107,7 +107,7 @@ function goSkillView(hash: string) {
 						v-if="skill.power !== '--'"
 						draggable="false"
 						class="icon damage"
-						:src="damageTypeStaticMap.get(skill.damageType)"
+						:src="damageTypeStaticMap.get(skill.damageType!)"
 						:alt="skill.damageType === '1' ? '物理伤害' : '魔法伤害'"
 						:title="skill.damageType === '1' ? '物理伤害' : '魔法伤害'"
 					/>

src/components/SkillList.vue

@@ -53,6 +53,7 @@ watch(listData, (val: any[]) => {
 		pageSize: pageSize.value,
 		total: totalFromID.value,
 	})
+	// console.log(listData.value)
 })
 
 function getFeatureIconSrc(featureIndex: string) {
@@ -92,7 +93,7 @@ function goAngelView(hash: string) {
 			class="angel-card"
 			v-for="angel in listData"
 			:key="angel.hash"
-			@click="setupWindowParams(angel.id, angel.name, angel.hash)"
+			@click="setupWindowParams(angel.id!, angel.name!, angel.hash!)"
 		>
 			<span class="details">
 				<span class="name-text">#{{ angel.id }} · {{ angel.name }}</span>
@@ -111,7 +112,7 @@ function goAngelView(hash: string) {
 					draggable="false"
 					class="angel-icon icon"
 					v-show="angel.img"
-					:src="getAngelIconSrc(angel.iconSrc)"
+					:src="getAngelIconSrc(angel.iconSrc!)"
 					alt="angel icon"
 					referrerPolicy="no-referrer"
 					loading="lazy"

src/components/SpiritList.vue

@@ -1,7 +1,18 @@
-// @ts-ignore
 import { RocoRequest } from "./useHttp"
 import NProgress from "nprogress"
 
+import {
+	AngelDetailObject,
+	AngelListData,
+	AngelListParma,
+	FeatureListData,
+	ItemListData,
+	ItemListParma,
+	SkillDetailObject,
+	SkillListData,
+	SkillListParma,
+} from "../share"
+
 const baseURL = "https://api.rocotime.com/api"
 const timeout = 5000
 const headers = {
@@ -44,40 +55,6 @@ const rocoApi = new RocoRequest({
 	headers,
 })
 
-interface FeatureObject {
-	id: string
-	name: string
-}
-
-interface AngelListItemObject {
-	id: string
-	group: string
-	hash: string
-	img?: string
-	iconSrc: string
-	features: string[]
-}
-
-interface AngelListParma {
-	search: string
-	id: string
-	feature: string
-	page: number
-}
-
-interface SkillListParma {
-	search: string
-	id: string
-	feature: string
-	page: number
-}
-
-interface ItemListParma {
-	search: string
-	id: string
-	page: number
-}
-
 // Request Interceptions
 rocoApi.setInterceptors("request")(() => {
 	NProgress.start()
@@ -94,16 +71,14 @@ rocoApi.setInterceptors("response")(() => {
 export const useApi = () => {
 	// Angel Feature Map
 	async function getFeatures() {
-		const response = await rocoApi.get<{ list: FeatureObject[] }>(
-			"/feature/",
-			{}
-		)
+		const response = await rocoApi.get<FeatureListData>("/feature/")
 
-		const obj: FeatureObject[] = response.data.list
-		const map = new Map()
+		const obj = response.data.list
+		const map = new Map<string, string>()
 		obj.forEach((pair) => {
-			map.set(pair.id, pair.name)
+			map.set(pair.id!, pair.name!)
 		})
+
 		return map
 	}
 
@@ -116,17 +91,18 @@ export const useApi = () => {
 			page: 1,
 		}
 	) {
-		const response = await rocoApi.post<{ data: AngelListItemObject[] }>(
-			"/spiritList/",
-			params
-		)
+		const response = await rocoApi.post<AngelListData>("/spiritList/", params)
 
 		return response.data.data
 	}
 
 	// Angel Detail
 	async function getAngel(params: { hash: string }) {
-		const response = await rocoApi.post("/detail/angel/", params)
+		const response = await rocoApi.post<AngelDetailObject>(
+			"/detail/angel/",
+			params
+		)
+
 		return response.data.data
 	}
 
@@ -138,7 +114,7 @@ export const useApi = () => {
 			page: 1,
 		}
 	) {
-		const response = await rocoApi.post("/Itemlist/", params)
+		const response = await rocoApi.post<ItemListData>("/Itemlist/", params)
 		return response.data.data
 	}
 
@@ -151,13 +127,16 @@ export const useApi = () => {
 			page: 1,
 		}
 	) {
-		const response = await rocoApi.post("/Skilllist/", params)
+		const response = await rocoApi.post<SkillListData>("/Skilllist/", params)
 		return response.data.data
 	}
 
 	// Skill Detail
 	async function getSkill(params: { hash: string }) {
-		const response = await rocoApi.post("/detail/skill/", params)
+		const response = await rocoApi.post<SkillDetailObject>(
+			"/detail/skill/",
+			params
+		)
 		return response.data
 	}
 

src/composables/useApi.ts

@@ -1,25 +1,6 @@
 import { fetch, Body, ResponseType } from "@tauri-apps/api/http"
 import type { FetchOptions } from "@tauri-apps/api/http"
-
-interface RequestHeaders {
-	authority: string
-	accept: string
-	"accept-language"?: string
-	"content-type"?: string
-	"Access-Control-Allow-Origin"?: string
-	"Access-Control-Allow-Credentials"?: string
-	dnt?: string
-	origin?: string
-	referrer?: string
-	"sec-ch-ua"?: string
-	"sec-ch-ua-mobile"?: string
-	"sec-ch-ua-platform"?: string
-	"sec-fetch-dest"?: string
-	"sec-fetch-mode"?: string
-	"sec-fetch-site"?: string
-	"sec-gpc"?: string
-	"user-agent"?: string
-}
+import type { RequestHeaders } from "../share"
 
 // type Signal = AbortSignal
 
@@ -58,6 +39,7 @@ export class RocoRequest {
 		// Request Interception
 		this.$interceptors.request()
 		console.log("HTTP ST GET - ", reqUrl)
+		console.time("GET" + reqUrl)
 		// Request
 		const response = await fetch<T>(reqUrl, {
 			...this.$Option,
@@ -66,7 +48,8 @@ export class RocoRequest {
 			query: { ...params },
 			responseType: ResponseType.JSON,
 		})
-		console.log("HTTP RC GET - ", response)
+		console.timeEnd("GET" + reqUrl)
+		console.log("HTTP RC GET - ", response.status)
 
 		// Response Interception
 		this.$interceptors.response()
@@ -79,6 +62,7 @@ export class RocoRequest {
 		// Request Interception
 		this.$interceptors.request()
 		console.log("HTTP ST POST - ", reqUrl)
+		console.time("POST" + reqUrl)
 		// Request
 		const response = await fetch<T>(reqUrl, {
 			...this.$Option,
@@ -87,7 +71,8 @@ export class RocoRequest {
 			body: Body.json({ ...params }),
 			responseType: ResponseType.JSON,
 		})
-		console.log("HTTP RC POST - ", response)
+		console.timeEnd("POST" + reqUrl)
+		console.log("HTTP RC POST - ", response.status)
 
 		// Response Interception
 		this.$interceptors.response()