+ {{ t('may-chu-phat') }}
+
+
+ {{ label }}
+
+
+
{{ t("chat-luong") }}
@@ -769,16 +859,15 @@
dense
flat
no-caps
- class="px-2 flex-1 text-weight-norrmal py-2 c--main rounded-xl"
- v-for="({ html }, index) in sources"
+ class="px-2 flex-1 text-weight-norrmal py-2 rounded-xl"
+ v-for="({ label, qualityCode }) in sources"
:class="{
'c--main':
- html === artQuality ||
- (!artQuality && index === 0),
+ qualityCode === artQuality,
}"
- :key="html"
- @click="setArtQuality(html)"
- >{{ html }}{{ qualityCode }}
@@ -790,7 +879,7 @@
dense
flat
no-caps
- class="px-2 flex-1 text-weight-norrmal py-2 c--main rounded-xl"
+ class="px-2 flex-1 text-weight-norrmal py-2 rounded-xl"
v-for="{ name, value } in playbackRates"
:key="name"
:class="
@@ -998,14 +1087,14 @@ import {
QTabPanels,
QTabs,
QTooltip,
- throttle,
useQuasar,
} from "quasar"
+import type { PlayerLink } from "src/apis/runs/ajax/player-link"
import { useMemoControl } from "src/composibles/memo-control"
import {
- CONFIRMATION_TIME_IS_ACTUALLY_WATCHING,
DELAY_SAVE_VIEWING_PROGRESS,
playbackRates,
+ servers,
} from "src/constants"
import { checkContentEditable } from "src/helpers/checkContentEditable"
import { scrollXIntoView, scrollYIntoView } from "src/helpers/scrollIntoView"
@@ -1033,8 +1122,6 @@ import {
import { useI18n } from "vue-i18n"
import { onBeforeRouteLeave, useRouter } from "vue-router"
-import type { Source } from "./sources"
-
const { t } = useI18n()
// fix toolip fullscreen not hide if change fullscreen
@@ -1060,7 +1147,7 @@ interface SiblingChap {
}
const props = defineProps<{
- sources?: Source[]
+ sources?: Awaited
>["link"]
currentSeason: string
nameCurrentSeason?: string
currentChap?: string
@@ -1181,8 +1268,15 @@ const menuChapsRef = ref()
// =========================== huuuu player API。馬鹿馬鹿しい ====================================
const currentStream = computed(() => {
- return props.sources?.find((item) => item.html === artQuality.value)
+ return props.sources?.find((item) => item.qualityCode === artQuality.value)
})
+if (import.meta.env.DEV)
+ watch(
+ () => props.sources,
+ (sources) => {
+ console.log("sources changed: ", sources)
+ }
+ )
const video = ref()
watch(
@@ -1340,8 +1434,18 @@ watch(
() => tooltipModeMovieRef.value?.hide()
)
-const artQuality = ref()
-const setArtQuality = (value: string) => {
+const _artQuality = ref>["link"][0]['qualityCode']>()
+const artQuality = computed({
+ get() {
+ if (props.sources?.find((item) => item.qualityCode === _artQuality.value)) return _artQuality.value
+
+ return props.sources?.[0]?.qualityCode
+ },
+ set(value) {
+_artQuality.value = value
+ }
+})
+const setArtQuality = (value: Exclude) => {
artQuality.value = value
addNotice(t("chat-luong-da-chuyen-sang-_value", [value]))
}
@@ -1412,37 +1516,43 @@ const emit = defineEmits<{
): void
}>()
-const storeFirstSaving = new Set()
-{
- // eslint-disable-next-line functional/no-let, no-undef
- let timeout: NodeJS.Timeout | number | null = null
+const firstSaveStore = new Set()
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function throttle void>(
+ fn: T
+): T & {
+ cancel: () => void
+} {
// eslint-disable-next-line functional/no-let
- let uidChapTimeout: string | null = null
- onBeforeUnmount(() => {
- if (timeout) clearTimeout(timeout)
- })
- const watcher = watch(artPlaying, (artPlaying) => {
- if (artPlaying) {
- if (timeout) {
- if (uidChapTimeout === uidChap.value) return
- console.log("stop timeout add first saving because change chap")
- clearTimeout(timeout)
- }
- timeout = setTimeout(() => {
- console.log("allow first saving")
- storeFirstSaving.add(uidChap.value)
- }, CONFIRMATION_TIME_IS_ACTUALLY_WATCHING)
- uidChapTimeout = uidChap.value
- } else {
- if (timeout) {
- console.log("stop timeout add first saving")
- clearTimeout(timeout)
- uidChapTimeout = null
- watcher()
- }
+ let wait = false
+ // eslint-disable-next-line functional/no-let, no-undef
+ let timeout: NodeJS.Timeout | number | undefined
+ // eslint-disable-next-line functional/functional-parameters, @typescript-eslint/no-explicit-any
+ const cb = function (...args: any[]) {
+ if (wait === false) {
+ wait = true
+ timeout = setTimeout(
+ () => {
+ firstSaveStore.add(uidChap.value)
+ fn(...args)
+ wait = false
+ },
+ firstSaveStore.has(uidChap.value)
+ ? DELAY_SAVE_VIEWING_PROGRESS
+ : DELAY_SAVE_VIEWING_PROGRESS / 2
+ )
}
- })
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } as any
+
+ cb.cancel = () => {
+ clearTimeout(timeout)
+ wait = false
+ }
+
+ return cb
}
+
// eslint-disable-next-line functional/no-let
let processingSaveCurTimeIn: string | null = null
const saveCurTimeToPer = throttle(
@@ -1453,48 +1563,45 @@ const saveCurTimeToPer = throttle(
dur: number,
nameCurrentChap: string
) => {
+ emit("cur-update", {
+ cur,
+ dur,
+ id: currentChap,
+ })
+
+ console.log("call main fn cur time")
const uid = uidChap.value // 255 byte
+ console.log({ uid, processingSaveCurTimeIn })
+ if (processingSaveCurTimeIn === uid) return // in progressing save this
+ processingSaveCurTimeIn = uid
if (!(await createSeason())) return
if (stateStorageStore.disableAutoRestoration === 2) return
- if (processingSaveCurTimeIn === uid) return // in progressing save this
- processingSaveCurTimeIn = uid
-
- await historyStore
- .setProgressChap(currentSeason, currentChap, {
- cur,
- dur,
- name: nameCurrentChap,
- })
- .catch((err) => console.warn("save viewing progress failed: ", err))
- .finally(() => {
- emit("cur-update", {
+ console.log("%ccall sav curTime", "color: green")
+ try {
+ await historyStore
+ .setProgressChap(currentSeason, currentChap, {
cur,
dur,
- id: currentChap,
+ name: nameCurrentChap,
})
- console.log("save viewing progress")
+ .catch((err) => console.warn("save viewing progress failed: ", err))
+ } catch {}
- processingSaveCurTimeIn = null
- })
- },
- DELAY_SAVE_VIEWING_PROGRESS
+ console.log("save viewing progress")
+
+ processingSaveCurTimeIn = null
+ }
)
-const throttleEmitCurUpdate = throttle(() => {
- if (props.currentChap)
- emit("cur-update", {
- cur: artCurrentTime.value,
- dur: artDuration.value,
- id: props.currentChap,
- })
-}, DELAY_SAVE_VIEWING_PROGRESS)
+watch(uidChap, saveCurTimeToPer.cancel)
function onVideoTimeUpdate() {
if (
artPlaying.value &&
!currentingTime.value &&
artControlShow.value &&
!showMenuQuality.value &&
+ !showMenuServer.value &&
!showMenuPlaybackRate.value &&
!showMenuSettings.value &&
!showMenuSelectChap.value &&
@@ -1505,14 +1612,11 @@ function onVideoTimeUpdate() {
artControlShow.value = false
}
- if (!progressRestored) return
+ if (progressRestored !== uidChap.value) return
if (!props.currentChap) return
if (typeof props.nameCurrentChap !== "string") return
- if (!storeFirstSaving.has(uidChap.value)) {
- throttleEmitCurUpdate()
- return console.log("bypass because not first saving")
- }
+ console.log("call throw emit")
saveCurTimeToPer(
props.currentSeason,
props.currentChap,
@@ -1655,8 +1759,26 @@ function runRemount() {
// eslint-disable-next-line functional/no-let
let currentHls: Hls
onBeforeUnmount(() => currentHls?.destroy())
-function remount(resetCurrentTime?: boolean) {
- currentHls?.destroy()
+function remount(resetCurrentTime?: boolean, noDestroy = false) {
+ if (!noDestroy) currentHls?.destroy()
+ else {
+ const type = currentStream.value?.type
+
+ if (
+ (type === "hls" || type === "m3u" || type === "m3u8") &&
+ Hls.isSupported()
+ ) {
+ // current stream is HLS -> no cancel if canPlay
+ } else {
+ console.warn("can't play HLS stream")
+ // cancel
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ video.value!.oncanplay = function () {
+ currentHls?.destroy()
+ this.oncanplay = null
+ }
+ }
+ }
if (!currentStream.value) {
$q.notify({
@@ -1666,201 +1788,200 @@ function remount(resetCurrentTime?: boolean) {
return
}
- const { url, type } = currentStream.value
+ const { file, type } = currentStream.value
const currentTime = artCurrentTime.value
const playing = artPlaying.value || artEnded
artEnded = false
- switch (type) {
- case "hls":
- case "m3u":
- // eslint-disable-next-line no-case-declarations
- const hls = new Hls({
- debug: import.meta.env.isDev,
- progressive: true,
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- pLoader: class CustomLoader extends (Hls.DefaultConfig.loader as any) {
- loadInternal(): void {
- const { config, context } = this
- if (!config) {
- return
- }
-
- const { stats } = this
- stats.loading.first = 0
- stats.loaded = 0
-
- const controller = new AbortController()
- const xhr = (this.loader = {
- readyState: 0,
- status: 0,
- abort() {
- controller.abort()
- },
- onreadystatechange: <(() => void) | null>null,
- onprogress: <
- ((eventt: { loaded: number; total: number }) => void) | null
- >null,
- response: null,
- responseText: null,
- })
- const headers = new Headers()
- if (this.context.headers)
- for (const [key, val] of Object.entries(this.context.headers))
- headers.set(key, val as string)
-
- if (context.rangeEnd) {
- headers.set(
- "Range",
- "bytes=" + context.rangeStart + "-" + (context.rangeEnd - 1)
- )
- }
+ if (
+ (type === "hls" || type === "m3u" || type === "m3u8") &&
+ Hls.isSupported()
+ ) {
+ const hls = new Hls({
+ debug: import.meta.env.isDev,
+ progressive: true,
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ pLoader: class CustomLoader extends (Hls.DefaultConfig.loader as any) {
+ loadInternal(): void {
+ const { config, context } = this
+ if (!config) {
+ return
+ }
- xhr.onreadystatechange = this.readystatechange.bind(this)
- xhr.onprogress = this.loadprogress.bind(this)
- self.clearTimeout(this.requestTimeout)
- this.requestTimeout = self.setTimeout(
- this.loadtimeout.bind(this),
- config.timeout
+ const { stats } = this
+ stats.loading.first = 0
+ stats.loaded = 0
+
+ const controller = new AbortController()
+ const xhr = (this.loader = {
+ readyState: 0,
+ status: 0,
+ abort() {
+ controller.abort()
+ },
+ onreadystatechange: <(() => void) | null>null,
+ onprogress: <
+ ((eventt: { loaded: number; total: number }) => void) | null
+ >null,
+ response: null,
+ responseText: null,
+ })
+ const headers = new Headers()
+ if (this.context.headers)
+ for (const [key, val] of Object.entries(this.context.headers))
+ headers.set(key, val as string)
+
+ if (context.rangeEnd) {
+ headers.set(
+ "Range",
+ "bytes=" + context.rangeStart + "-" + (context.rangeEnd - 1)
)
+ }
- fetchJava(context.url + "#animevsub-vsub", {
- headers,
- signal: controller.signal,
- })
- .then(async (res) => {
- // eslint-disable-next-line functional/no-let
- let byteLength: number
- if (context.responseType === "arraybuffer") {
- xhr.response = await res.arrayBuffer()
- byteLength = xhr.response.byteLength
- } else {
- xhr.responseText = await res.text()
- byteLength = xhr.responseText.length
- }
-
- xhr.readyState = 4
- xhr.status = 200
-
- xhr.onprogress?.({
- loaded: byteLength,
- total: byteLength,
- })
- // eslint-disable-next-line promise/always-return
- xhr.onreadystatechange?.()
- })
- .catch((e) => {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- this.callbacks!.onError(
- { code: xhr.status, text: e.message },
- context,
- xhr
- )
+ xhr.onreadystatechange = this.readystatechange.bind(this)
+ xhr.onprogress = this.loadprogress.bind(this)
+ self.clearTimeout(this.requestTimeout)
+ this.requestTimeout = self.setTimeout(
+ this.loadtimeout.bind(this),
+ config.timeout
+ )
+
+ fetchJava(context.url + "#animevsub-vsub", {
+ headers,
+ signal: controller.signal,
+ })
+ .then(async (res) => {
+ // eslint-disable-next-line functional/no-let
+ let byteLength: number
+ if (context.responseType === "arraybuffer") {
+ xhr.response = await res.arrayBuffer()
+ byteLength = xhr.response.byteLength
+ } else {
+ xhr.responseText = await res.text()
+ byteLength = xhr.responseText.length
+ }
+
+ xhr.readyState = 4
+ xhr.status = 200
+
+ xhr.onprogress?.({
+ loaded: byteLength,
+ total: byteLength,
})
- }
- } as unknown as PlaylistLoaderConstructor,
- })
- currentHls = hls
- // customLoader(hls.config)
- hls.loadSource(url)
+ // eslint-disable-next-line promise/always-return
+ xhr.onreadystatechange?.()
+ })
+ .catch((e) => {
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ this.callbacks!.onError(
+ { code: xhr.status, text: e.message },
+ context,
+ xhr
+ )
+ })
+ }
+ } as unknown as PlaylistLoaderConstructor,
+ })
+ currentHls = hls
+ // customLoader(hls.config)
+ hls.loadSource(file)
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ hls.attachMedia(video.value!)
+ hls.on(Hls.Events.MANIFEST_PARSED, () => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- hls.attachMedia(video.value!)
- hls.on(Hls.Events.MANIFEST_PARSED, () => {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- if (playing) video.value!.play()
- })
- // eslint-disable-next-line no-case-declarations, functional/no-let
- let needSwapCodec = false
- // eslint-disable-next-line no-case-declarations, functional/no-let, no-undef
- let timeoutUnneedSwapCodec: NodeJS.Timeout | number | null = null
- hls.on(Hls.Events.ERROR, (event, data) => {
- if (data.fatal) {
- console.warn("Player fatal: ", data)
- switch (data.type) {
- case Hls.ErrorTypes.NETWORK_ERROR: {
- // try to recover network error
- $q.notify({
- message: t("loi-mang-khong-kha-dung"),
- position: "bottom-right",
- timeout: 0,
- actions: [
- {
- label: t("thu-lai"),
- color: "yellow",
- noCaps: true,
- handler: () => hls.startLoad(),
- },
- {
- icon: "close",
- round: true,
- },
- ],
- })
- break
+ if (playing) video.value!.play()
+ })
+ // eslint-disable-next-line functional/no-let
+ let needSwapCodec = false
+ // eslint-disable-next-line functional/no-let, no-undef
+ let timeoutUnneedSwapCodec: NodeJS.Timeout | number | null = null
+ hls.on(Hls.Events.ERROR, (event, data) => {
+ if (data.fatal) {
+ console.warn("Player fatal: ", data)
+ switch (data.type) {
+ case Hls.ErrorTypes.NETWORK_ERROR: {
+ // try to recover network error
+ $q.notify({
+ message: t("loi-mang-khong-kha-dung"),
+ position: "bottom-right",
+ timeout: 0,
+ actions: [
+ {
+ label: t("thu-lai"),
+ color: "yellow",
+ noCaps: true,
+ handler: () => hls.startLoad(),
+ },
+ {
+ icon: "close",
+ round: true,
+ },
+ ],
+ })
+ break
+ }
+ case Hls.ErrorTypes.MEDIA_ERROR: {
+ const playing = artPlaying.value
+ if (timeoutUnneedSwapCodec) {
+ clearTimeout(timeoutUnneedSwapCodec)
+ timeoutUnneedSwapCodec = null
}
- case Hls.ErrorTypes.MEDIA_ERROR: {
- const playing = artPlaying.value
+ console.warn("fatal media error encountered, try to recover")
+ if (needSwapCodec) {
+ hls.swapAudioCodec()
+ needSwapCodec = false
if (timeoutUnneedSwapCodec) {
clearTimeout(timeoutUnneedSwapCodec)
timeoutUnneedSwapCodec = null
}
- console.warn("fatal media error encountered, try to recover")
- if (needSwapCodec) {
- hls.swapAudioCodec()
+ } else {
+ needSwapCodec = true
+ timeoutUnneedSwapCodec = setTimeout(() => {
needSwapCodec = false
- if (timeoutUnneedSwapCodec) {
- clearTimeout(timeoutUnneedSwapCodec)
- timeoutUnneedSwapCodec = null
- }
- } else {
- needSwapCodec = true
- timeoutUnneedSwapCodec = setTimeout(() => {
- needSwapCodec = false
- timeoutUnneedSwapCodec = null
- }, 1_000)
- }
- hls.recoverMediaError()
- if (playing)
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- video.value!.play()
- break
+ timeoutUnneedSwapCodec = null
+ }, 1_000)
}
- default: {
- $q.notify({
- message: t("da-gap-su-co-khi-phat-lai"),
- position: "bottom-right",
- timeout: 0,
- actions: [
- {
- label: t("thu-lai"),
- color: "white",
- handler() {
- console.log("retry force")
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- video.value!.load()
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- video.value!.play()
- },
- },
- {
- label: t("remount"),
- color: "white",
- handler: remount,
+ hls.recoverMediaError()
+ if (playing)
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ video.value!.play()
+ break
+ }
+ default: {
+ $q.notify({
+ message: t("da-gap-su-co-khi-phat-lai"),
+ position: "bottom-right",
+ timeout: 0,
+ actions: [
+ {
+ label: t("thu-lai"),
+ color: "white",
+ handler() {
+ console.log("retry force")
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ video.value!.load()
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ video.value!.play()
},
- ],
- })
- break
- }
+ },
+ {
+ label: t("remount"),
+ color: "white",
+ handler: remount,
+ },
+ ],
+ })
+ break
}
- } else {
- console.warn("Player error: ", data)
}
- })
- break
- default:
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- video.value!.src = url
+ } else {
+ console.warn("Player error: ", data)
+ }
+ })
+ } else {
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ video.value!.src = file
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -1882,40 +2003,36 @@ const watcherVideoTagReady = watch(video, (video) => {
// eslint-disable-next-line promise/catch-or-return
Promise.resolve().then(watcherVideoTagReady) // fix this not ready value
+ // pre set volume to default
+ setArtVolume(artVolume.value)
+
+ // eslint-disable-next-line functional/no-let
+ let currentEpStream: null | string = null
watch(
- () => currentStream.value?.url,
+ () => currentStream.value?.file,
(url) => {
if (!url) return currentHls?.destroy()
console.log("set url art %s", url)
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- if ((Hls as unknown as any).isSupported()) {
- remount(true)
- } else {
- const canPlay = video.canPlayType("application/vnd.apple.mpegurl")
- if (canPlay === "probably" || canPlay === "maybe") {
- video.src = url
- }
- }
+ // // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ // if ((Hls as unknown as any).isSupported()) {
+ remount(
+ currentEpStream !== uidChap.value,
+ currentEpStream === uidChap.value
+ )
+ currentEpStream = uidChap.value
+ // } else {
+ // const canPlay = video.canPlayType("application/vnd.apple.mpegurl")
+ // if (canPlay === "probably" || canPlay === "maybe") {
+ // video.src = url
+ // }
+ // }
},
{ immediate: true }
)
})
-// re-set quality if quality not in sources
-watch(
- () => props.sources,
- (sources) => {
- if (!sources || sources.length === 0) return
- // not ready quality on this
- if (!artQuality.value || !currentStream.value) {
- artQuality.value = sources[0].html // not use setArtQuality because skip notify
- }
- },
- { immediate: true }
-)
-
const currentingTime = ref(false)
const progressInnerRef = ref()
@@ -2173,6 +2290,7 @@ watch(showDialogChapter, (status) => {
})
const showMenuQuality = ref(false)
+const showMenuServer = ref(false)
const showMenuPlaybackRate = ref(false)
const showMenuSettings = ref(false)
const showMenuSelectChap = ref(false)
diff --git a/src/components/sources.ts b/src/components/sources.ts
deleted file mode 100644
index cf823341..00000000
--- a/src/components/sources.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export interface Source {
- html: string
- url: string
- type:
- | "hls"
- | "aac"
- | "f4a"
- | "mp4"
- | "f4v"
- | "m3u"
- | "m4v"
- | "mov"
- | "mp3"
- | "mpeg"
- | "oga"
- | "ogg"
- | "ogv"
- | "vorbis"
- | "webm"
- | "youtube"
-}
diff --git a/src/constants.ts b/src/constants.ts
index 2709d954..e6c84211 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,6 +2,10 @@ export const labelToQuality: Record = {
HD: "720p",
SD: "480p",
}
+export const servers = {
+ DU: "High",
+ FB: "Low",
+} as const
export const playbackRates = [
{
name: "0.5x",
@@ -30,8 +34,6 @@ export const playbackRates = [
]
export const DELAY_SAVE_VIEWING_PROGRESS = 20_000 // x4 6s
-export const CONFIRMATION_TIME_IS_ACTUALLY_WATCHING =
- DELAY_SAVE_VIEWING_PROGRESS / 4
export const TIMEOUT_GET_LAST_EP_VIEWING_IN_STORE = 5_000 // 5s
diff --git a/src/global.d.ts b/src/global.d.ts
index 8b54b48e..3614dfc0 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -12,7 +12,7 @@ interface PostOptions {
interface HttpResponse {
headers: Record
- data: ResponseType extends "arraybuffer" ? ArrayBuffer : string
+ data: string
url: string
status: number
}
diff --git a/src/i18n/messages/en-US.json b/src/i18n/messages/en-US.json
index e61f4511..77ec6b32 100644
--- a/src/i18n/messages/en-US.json
+++ b/src/i18n/messages/en-US.json
@@ -245,5 +245,6 @@
"xoa-danh-sach-phat": "delete playlist",
"xoa-khoi-danh-sach-phat": "Remove from playlist",
"yeu-cau-dang-nhap-lai": "Requires re-login",
- "yeu-thich": "Favourite"
+ "yeu-thich": "Favourite",
+ "may-chu-phat": "Broadcast server"
}
diff --git a/src/i18n/messages/ja-JP.json b/src/i18n/messages/ja-JP.json
index a9efe259..cadf60f4 100644
--- a/src/i18n/messages/ja-JP.json
+++ b/src/i18n/messages/ja-JP.json
@@ -245,5 +245,6 @@
"xoa-danh-sach-phat": "プレイリストを削除",
"xoa-khoi-danh-sach-phat": "プレイリストから削除",
"yeu-cau-dang-nhap-lai": "再ログインが必要",
- "yeu-thich": "お気に入り"
+ "yeu-thich": "お気に入り",
+ "may-chu-phat": "ブロードキャスト サーバー"
}
diff --git a/src/i18n/messages/vi-VN.json b/src/i18n/messages/vi-VN.json
index 1d9b06e2..a35269c7 100644
--- a/src/i18n/messages/vi-VN.json
+++ b/src/i18n/messages/vi-VN.json
@@ -245,5 +245,6 @@
"xoa-danh-sach-phat": "Xóa danh sách phát",
"xoa-khoi-danh-sach-phat": "Xóa khỏi danh sách phát",
"yeu-cau-dang-nhap-lai": "Yêu cầu đăng nhập lại",
- "yeu-thich": "Yêu thích"
+ "yeu-thich": "Yêu thích",
+ "may-chu-phat": "Máy chủ phát"
}
diff --git a/src/i18n/messages/zh-CN.json b/src/i18n/messages/zh-CN.json
index 59d2b4d3..5c040b71 100644
--- a/src/i18n/messages/zh-CN.json
+++ b/src/i18n/messages/zh-CN.json
@@ -245,5 +245,6 @@
"xoa-danh-sach-phat": "删除播放列表",
"xoa-khoi-danh-sach-phat": "从播放列表中删除",
"yeu-cau-dang-nhap-lai": "需要重新登录",
- "yeu-thich": "最喜欢的"
+ "yeu-thich": "最喜欢的",
+ "may-chu-phat": "广播服务器"
}
diff --git a/src/logic/get-quality-by-label.spec.ts b/src/logic/get-quality-by-label.spec.ts
new file mode 100644
index 00000000..38b0e0f5
--- /dev/null
+++ b/src/logic/get-quality-by-label.spec.ts
@@ -0,0 +1,13 @@
+import { getQualityByLabel } from "./get-quality-by-label"
+
+describe("get-quality-by-label", () => {
+ test("should label is HD", () => {
+ expect(getQualityByLabel("HD")).toBe("720p")
+ })
+ test("should label is 720p", () => {
+ expect(getQualityByLabel("720p")).toBe("720p")
+ })
+ test("should label is FHD|HD", () => {
+ expect(getQualityByLabel("FHD|HD")).toBe("1080p|720p")
+ })
+})
diff --git a/src/logic/get-quality-by-label.ts b/src/logic/get-quality-by-label.ts
new file mode 100644
index 00000000..f812c4f9
--- /dev/null
+++ b/src/logic/get-quality-by-label.ts
@@ -0,0 +1,17 @@
+import type { PlayerLink } from "src/apis/runs/ajax/player-link"
+
+const map = {
+ "FHD|HD": "1080p|720p",
+ FHD: "1080p",
+ HD: "720p",
+ SD: "480p",
+} as const
+export function getQualityByLabel(
+ label: Awaited>["link"][0]["label"]
+) {
+ return (
+ (map[label as keyof typeof map] as
+ | (typeof map)[keyof typeof map]
+ | undefined) ?? (label as Exclude)
+ )
+}
diff --git a/src/logic/unflat.ts b/src/logic/unflat.ts
index b777bb73..3ef93759 100644
--- a/src/logic/unflat.ts
+++ b/src/logic/unflat.ts
@@ -1,4 +1,4 @@
-export function unflat(array: T[], size: number): T[][] {
+export function unflat(array: readonly T[], size: number): T[][] {
const { length } = array
const max = ~~(length / size)
diff --git a/src/pages/phim/_season.interface.ts b/src/pages/phim/_season.interface.ts
index fa1d3061..23c2f802 100644
--- a/src/pages/phim/_season.interface.ts
+++ b/src/pages/phim/_season.interface.ts
@@ -26,3 +26,29 @@ export type ProgressWatchStore = Map<
status: "queue"
}
>
+
+export interface ConfigPlayer {
+ readonly link: {
+ readonly file: string
+ readonly label?: "HD" | "FHD" | `${720 | 360 | 340}p`
+ readonly preload?: string
+ readonly type:
+ | "hls"
+ | "aac"
+ | "f4a"
+ | "mp4"
+ | "f4v"
+ | "m3u"
+ | "m4v"
+ | "mov"
+ | "mp3"
+ | "mpeg"
+ | "oga"
+ | "ogg"
+ | "ogv"
+ | "vorbis"
+ | "webm"
+ | "youtube"
+ }[]
+ readonly playTech: "api" | "trailer"
+}
diff --git a/src/pages/phim/_season.vue b/src/pages/phim/_season.vue
index fa19218f..8abe4b9e 100644
--- a/src/pages/phim/_season.vue
+++ b/src/pages/phim/_season.vue
@@ -42,10 +42,13 @@
})
"
/>
-
@@ -401,7 +404,6 @@