ns-rss-spider 0.0.24 → 0.0.26

package/dist/cjs/parse.js

@@ -49,6 +49,7 @@ async function parseRss(name, feed, server) {
   if (!result.items.length) {
     throw Error("rss no conent");
   }
+  const originRss = [...result.items];
   if (server == null ? void 0 : server.latest) {
     const d = new Date(server.latest.pubDate);
     console.log("server lastest", d, "before num", result.items.length);
@@ -57,33 +58,30 @@ async function parseRss(name, feed, server) {
     });
     console.log("after num", result.items.length);
   }
-  if (!result.items.length) {
-    return {
-      contents: []
-    };
-  }
   const contents = [];
   const strategy = import_strategy.strategies[name];
-  result.items.forEach((item) => {
-    if (!item.guid) {
-      item.guid = item.link;
-    }
-  });
-  for (let item of result.items) {
-    console.log(import_zx.chalk.green(`正在解析文章 【${item.title}】`));
-    if (!item.guid) {
-      console.log(JSON.stringify(item));
-      throw Error(`item has no guid`);
-    }
-    const content = await (0, import_parseContent.parseContent)(item, strategy).catch((e) => console.error(import_zx.chalk.red("文章解析失败"), e));
-    if (content) {
-      contents.push(content);
+  if (result.items.length) {
+    result.items.forEach((item) => {
+      if (!item.guid) {
+        item.guid = item.link;
+      }
+    });
+    for (let item of result.items) {
+      console.log(import_zx.chalk.green(`正在解析文章 【${item.title}】`));
+      if (!item.guid) {
+        console.log(JSON.stringify(item));
+        throw Error(`item has no guid`);
+      }
+      const content = await (0, import_parseContent.parseContent)(item, strategy).catch((e) => console.error(import_zx.chalk.red("文章解析失败"), e));
+      if (content) {
+        contents.push(content);
+      }
     }
   }
   let thumbs;
   if (strategy == null ? void 0 : strategy.getThumbs) {
     console.log(import_zx.chalk.green(`正在获取缩略图数据`));
-    const thumbKv = await (strategy == null ? void 0 : strategy.getThumbs(contents));
+    const thumbKv = await (strategy == null ? void 0 : strategy.getThumbs(originRss));
     if (thumbKv && Object.keys(thumbKv).length) {
       console.log(import_zx.chalk.green(`正在更新缩略图`));
       thumbs = thumbKv;

package/dist/cjs/parsers/cnbeta.js

@@ -57,7 +57,7 @@ var cnbeta = {
     };
   },
   ignoreProbeImage: true,
-  getThumbs: async (articles) => {
+  getThumbs: async (items) => {
     const res = await import_axios.default.get("https://m.cnbeta.com.tw/", {
       responseType: "text"
     }).catch((e) => {
@@ -74,7 +74,7 @@ var cnbeta = {
       const href = $($a).attr("href") || "";
       const reg = /([\d]+).htm/;
       const articleId = (_a = reg.exec(href)) == null ? void 0 : _a[1];
-      const guid = (_b = articles.find((a) => a.guid.includes(`/${articleId}.htm`))) == null ? void 0 : _b.guid;
+      const guid = (_b = items.find((a) => (a.guid || a.link || "").includes(`/${articleId}.htm`))) == null ? void 0 : _b.guid;
       if (guid && thumb) {
         kv[guid] = thumb;
       }

package/dist/cjs/parsers/ithome.js

@@ -83,7 +83,7 @@ var ithome = {
       const reg = /([\d]+).htm/;
       const articleId = (_a = reg.exec(href)) == null ? void 0 : _a[1];
       const guid = (_b = articles.find((a) => {
-        const r = /([\d]+)\/([\d]+).htm/.exec(a.guid);
+        const r = /([\d]+)\/([\d]+).htm/.exec(a.guid || a.link || "");
         if (r && r[1] && r[2]) {
           return `${r[1]}${r[2]}` === articleId;
         }

package/dist/cjs/types.d.ts

@@ -11,7 +11,7 @@ export interface ParseStrategy {
     getContentFromHtml?: ($: CheerioAPI, node: Cheerio<AnyNode>) => string;
     getExtraItems?: ($: CheerioAPI, current: RichArticle, item: Item) => Promise<Record<string, any>>;
     ignoreProbeImage?: boolean;
-    getThumbs?: (articles: Article[]) => Promise<Record<string, string> | undefined>;
+    getThumbs?: (items: Item[]) => Promise<Record<string, string> | undefined>;
 }
 export interface SimpleArticle {
     type: 'simple';

package/dist/cjs/upload/index.d.ts

@@ -12,14 +12,14 @@ export declare function uploadContent({ app, getUploadApi, items, }: {
     items: Article[];
 } & ServerInfo): Promise<Article[] | {
     storePath: any;
-    source?: string | undefined;
-    type: "rich" | "simple";
+    type: "simple" | "rich";
     guid: string;
     title: string;
     link: string;
     description: string;
     pubDate: Date;
     author?: string | undefined;
+    source?: string | undefined;
     categories?: string | undefined;
     thumb?: string | undefined;
 }[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-rss-spider",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",