merge dev source fixes

Author: ourongxing

Dockerfile

@@ -7,6 +7,7 @@ RUN pnpm run build
 
 FROM node:20.12.2-alpine
 WORKDIR /usr/app
+RUN apk add --no-cache curl
 COPY --from=builder /usr/src/dist/output ./output
 ENV HOST=0.0.0.0 PORT=4444 NODE_ENV=production
 EXPOSE $PORT

package.json

@@ -11,7 +11,7 @@
   },
   "homepage": "https://github.com/ourongxing/newsnow",
   "scripts": {
-    "dev": "npm run presource && vite dev",
+    "dev": "npm run presource && cross-env NODE_OPTIONS=--use-env-proxy vite dev",
     "build": "npm run presource && vite build",
     "lint": "eslint",
     "presource": "tsx ./scripts/favicon.ts && tsx ./scripts/source.ts",
@@ -116,7 +116,11 @@
       "simple-git-hooks",
       "unrs-resolver",
       "workerd"
-    ]
+    ],
+    "overrides": {
+      "vite-plugin-with-nitro>h3": "npm:h3-nightly@1.15.4-20250730-094032-325a62b",
+      "nitro-go>h3": "npm:h3-nightly@1.15.4-20250730-094032-325a62b"
+    }
   },
   "resolutions": {
     "cross-spawn": ">=7.0.6",

pnpm-lock.yaml

@@ -79,7 +79,7 @@ const renqi = defineSource(async () => {
       })
     }
   })
-  return articles
+  return articles.length ? articles : quick()
 })
 
 export default defineSource({

server/sources/_36kr.ts

@@ -11,7 +11,7 @@ interface Res {
 }
 
 export default defineSource(async () => {
-  const res = await Promise.all(["zhongguo", "guandian", "gj"].map(k => myFetch(`https://china.cankaoxiaoxi.com/json/channel/${k}/list.json`) as Promise<Res>))
+  const res = await Promise.all(["zhongguo", "guandian", "gj"].map(k => myFetch(`http://china.cankaoxiaoxi.com/json/channel/${k}/list.json`) as Promise<Res>))
   return res.map(k => k.list).flat().map(k => ({
     id: k.data.id,
     title: k.data.title,

server/sources/cankaoxiaoxi.ts

@@ -59,9 +59,16 @@ const hot = defineSource(async () => {
 })
 
 const telegraph = defineSource(async () => {
-  const apiUrl = `https://www.cls.cn/nodeapi/updateTelegraphList`
+  const apiUrl = `https://www.cls.cn/v1/roll/get_roll_list`
   const res: TelegraphRes = await myFetch(apiUrl, {
-    query: Object.fromEntries(await getSearchParams()),
+    query: Object.fromEntries(await getSearchParams({
+      last_time: Math.floor(Date.now() / 1000),
+      refresh_type: 1,
+      rn: 30,
+    })),
+    headers: {
+      Referer: "https://www.cls.cn/telegraph",
+    },
   })
   return res.data.roll_data.filter(k => !k.is_ad).map((k) => {
     return {

server/sources/cls/index.ts

@@ -5,24 +5,26 @@ const express = defineSource(async () => {
   const baseURL = "https://www.fastbull.com"
   const html: any = await myFetch(`${baseURL}/cn/express-news`)
   const $ = cheerio.load(html)
-  const $main = $(".news-list")
+  const $main = $(".content-list.news-list")
   const news: NewsItem[] = []
   $main.each((_, el) => {
-    const a = $(el).find(".title_name")
-    const url = a.attr("href")
+    const $el = $(el)
+    const a = $el.find(".title_name")
+    const url = $el.find("[data-href]").attr("data-href") || $el.find("[data-id]").attr("data-id")
     const titleText = a.text()
     const title = titleText.match(/【(.+)】/)?.[1] ?? titleText
-    const date = $(el).attr("data-date")
+    const date = $el.attr("data-date")
     if (url && title && date) {
+      const pathname = url.startsWith("/") ? url : `/cn/fastshort/${url}`
       news.push({
-        url: baseURL + url,
+        url: baseURL + pathname,
         title: title.length < 4 ? titleText : title,
         id: url,
         pubDate: Number(date),
       })
     }
   })
-  return news
+  return news.sort((a, b) => Number(b.pubDate) - Number(a.pubDate))
 })
 
 const news = defineSource(async () => {
@@ -38,14 +40,14 @@ const news = defineSource(async () => {
     const date = a.find("[data-date]").attr("data-date")
     if (url && title && date) {
       news.push({
-        url: baseURL + url,
+        url: url.startsWith("http") ? url : baseURL + url,
         title,
         id: url,
         pubDate: Number(date),
       })
     }
   })
-  return news
+  return news.sort((a, b) => Number(b.pubDate) - Number(a.pubDate))
 })
 
 export default defineSource(