ns-rss-spider 0.0.16 → 0.0.18

package/dist/cjs/parse.d.ts

@@ -1,10 +1,13 @@
 import { ServerInfo } from "./upload";
 export declare function parseRss(name: string, feed: string, server?: ServerInfo): Promise<import("./types").Article[] | {
     storePath: any;
+    source?: string | undefined;
     type: "simple" | "rich";
     guid: string;
     title: string;
     link: string;
     description: string;
     pubDate: Date;
+    author?: string | undefined;
+    categories?: string | undefined;
 }[]>;

package/dist/cjs/parse.js

@@ -39,7 +39,11 @@ var import_parseContent = require("./parseContent");
 var import_upload = require("./upload");
 var import_axios = __toESM(require("axios"));
 async function parseRss(name, feed, server) {
-  const parser = new import_rss_parser.default();
+  const parser = new import_rss_parser.default({
+    customFields: {
+      item: ["source"]
+    }
+  });
   console.log(import_zx.chalk.green("正在拉取 rss 列表"));
   const result = await parser.parseURL(feed);
   if (!result.items.length) {

package/dist/cjs/parseContent/getBasicFromItem.d.ts

@@ -0,0 +1,2 @@
+import { SimpleArticle, RssItem } from "../types";
+export declare function getBasicFromItem(item: RssItem): Pick<SimpleArticle, "guid" | "title" | "link" | "description" | "pubDate" | "author" | "source" | "categories">;

package/dist/cjs/parseContent/getBasicFromItem.js

@@ -0,0 +1,41 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/parseContent/getBasicFromItem.ts
+var getBasicFromItem_exports = {};
+__export(getBasicFromItem_exports, {
+  getBasicFromItem: () => getBasicFromItem
+});
+module.exports = __toCommonJS(getBasicFromItem_exports);
+function getBasicFromItem(item) {
+  var _a, _b;
+  return {
+    guid: item.guid,
+    title: item.title,
+    link: item.link,
+    description: item.summary || ((_a = item.contentSnippet) == null ? void 0 : _a.trim()) || "",
+    pubDate: new Date(item.pubDate),
+    author: item.author || item.creator || "",
+    source: item.source || "",
+    categories: ((_b = item.categories) == null ? void 0 : _b.join(",")) || ""
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getBasicFromItem
+});

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

@@ -1,5 +1,4 @@
-import { Item as RssItem } from "rss-parser";
-import { Article, ParseStrategy } from "../types";
+import { Article, ParseStrategy, RssItem } from "../types";
 /**
  * 解析文章内容
  * 1. 获取 html 片段。(rss、http、playwright)

package/dist/cjs/parseContent/index.js

@@ -37,6 +37,7 @@ var cheerio = __toESM(require("cheerio"));
 var import_stripeHtml = require("./stripeHtml");
 var import_parseContent = require("./parseContent");
 var import_zx = require("zx");
+var import_getBasicFromItem = require("./getBasicFromItem");
 async function parseContent(item, strategy) {
   var _a, _b;
   let element;
@@ -55,11 +56,8 @@ async function parseContent(item, strategy) {
   if (!(strategy == null ? void 0 : strategy.parse)) {
     return {
       type: "simple",
-      guid: item.guid,
-      title: item.title,
-      link: item.link,
-      description: ((_b = element.html()) == null ? void 0 : _b.trim()) || "",
-      pubDate: new Date(item.pubDate)
+      ...(0, import_getBasicFromItem.getBasicFromItem)(item),
+      content: ((_b = element.html()) == null ? void 0 : _b.trim()) || ""
     };
   }
   console.log(import_zx.chalk.green("正在解析文章内容"));

package/dist/cjs/parseContent/parseContent.d.ts

@@ -1,4 +1,3 @@
-import { Item as RssItem } from "rss-parser";
-import type { ParseStrategy, RichArticle } from "../types";
+import type { ParseStrategy, RichArticle, RssItem } from "../types";
 import { AnyNode, Cheerio, CheerioAPI } from "cheerio";
 export declare function parseContent($: CheerioAPI, $element: Cheerio<AnyNode>, item: RssItem, strategy?: ParseStrategy): Promise<RichArticle>;

package/dist/cjs/parseContent/parseContent.js

@@ -37,8 +37,8 @@ var import_probe_image_size = __toESM(require("probe-image-size"));
 var import_zx = require("zx");
 var import_html_entities = require("html-entities");
 var import_generateSsrContent = require("./generateSsrContent");
+var import_getBasicFromItem = require("./getBasicFromItem");
 async function parseContent($, $element, item, strategy) {
-  var _a;
   const srcs = [];
   const images = [];
   (0, import_utils.walk_the_DOM)($, $element, (node) => {
@@ -96,13 +96,9 @@ async function parseContent($, $element, item, strategy) {
   const content = (0, import_html_entities.decode)($element.html().trim());
   return {
     type: "rich",
-    guid: item.guid,
-    title: item.title,
-    link: item.link,
-    description: ((_a = item.contentSnippet) == null ? void 0 : _a.trim()) || "",
+    ...(0, import_getBasicFromItem.getBasicFromItem)(item),
     content: (0, import_html_entities.decode)($element.html().trim()),
     ssrContent: (0, import_generateSsrContent.generateSsrContent)(content, images),
-    pubDate: new Date(item.pubDate),
     images
   };
 }

package/dist/cjs/types.d.ts

@@ -1,5 +1,9 @@
 import type { AnyNode, Cheerio, CheerioAPI } from 'cheerio';
 import { Item } from 'rss-parser';
+export type RssItem = Item & {
+    source?: string;
+    author?: string;
+};
 export interface ParseStrategy {
     parse: boolean;
     fetcher?: 'http' | 'playwright';
@@ -12,7 +16,11 @@ export interface SimpleArticle {
     title: string;
     link: string;
     description: string;
+    content: string;
     pubDate: Date;
+    author?: string;
+    source?: string;
+    categories?: string;
 }
 export interface RichArticleImage {
     url: string;
@@ -26,7 +34,6 @@ export interface RichArticleImage {
 }
 export interface RichArticle extends Omit<SimpleArticle, 'type'> {
     type: 'rich';
-    content: string;
     ssrContent: string;
     images: RichArticleImage[];
 }

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

@@ -18,4 +18,7 @@ export declare function uploadContent({ app, getUploadApi, items, }: {
     link: string;
     description: string;
     pubDate: Date;
+    author?: string | undefined;
+    source?: string | undefined;
+    categories?: string | undefined;
 }[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-rss-spider",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -10,7 +10,6 @@
     "build": "father build",
     "build:deps": "father prebundle",
     "check": "father doctor",
-    "prepublishOnly": "father doctor && npm run build",
     "sync": "echo '去更新 registry 版本: https://www.npmmirror.com/sync/ns-rss-spider'",
     "pub": "npm run check && npm version patch && npm run build && npm publish --registry=https://registry.npmjs.org && git push origin master --tags && npm run sync"
   },