Upload 88 files

README.md

@@ -1,12 +1,161 @@
----
-title: Airss
-emoji: ⚡
-colorFrom: yellow
-colorTo: pink
-sdk: docker
-pinned: false
-license: mit
-app_port: 4000
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+<div align="center">
+<img src="https://raw.githubusercontent.com/cooderl/wewe-rss/main/assets/logo.png" width="80" alt="预览"/>
+
+<h1 align="center"><a href="https://github.com/cooderl/wewe-rss">WeWe RSS</a></h1>
+
+更优雅的微信公众号订阅方式。
+
+![主界面](https://raw.githubusercontent.com/cooderl/wewe-rss/main/assets/preview1.png)
+
+</div>
+
+## 功能
+
+- [x]  v2.x版本使用全新接口，更加稳定
+- [x]  支持微信公众号订阅（基于微信读书）
+- [x]  后台自动定时更新内容
+- [x]  微信公众号RSS生成（支持`.atom`\.`rss`\.`json`格式)
+- [x]  支持全文内容输出，让阅读无障碍
+- [x]  所有订阅源导出OPML
+- [x]  支持通过/feeds/all.(json|rss|atom)接口和/feeds/:feed对标题进行过滤：使用title_include和title_exclude参数，支持使用`|`实现多个关键词的 或 逻辑
+> {{ORIGIN_URL}}/feeds/all.atom?title_include=张三
+> 
+> {{ORIGIN_URL}}/feeds/MP_WXS_123.json?limit=30&title_include=张三|李四|王五&title_exclude=张三丰|赵六
+- [x]  支持通过/feeds/:feed接口触发单个feedid更新：使用update=true参数（实时返回结果不包含更新后的articles，要获取更新后的articles需去掉update参数再请求一次）
+> {{ORIGIN_URL}}/feeds/MP_WXS_123.rss?update=true
+
+## 部署
+
+### 一键部署（待完善添加模板）
+
+你可以通过以下平台一键部署，只需填写本项目的URL即可。
+
+[Zeabur](https://zeabur.com/) 
+
+[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/DI9BBD)
+
+[Railway](https://railway.app/)
+
+[Hugging Face部署参考](https://github.com/cooderl/wewe-rss/issues/32)
+
+### Docker Compose 部署
+
+可参考 [docker-compose.yml](https://github.com/cooderl/wewe-rss/blob/main/docker-compose.yml) 和 [docker-compose.sqlite.yml](https://github.com/cooderl/wewe-rss/blob/main/docker-compose.sqlite.yml)
+
+### Docker 命令启动
+
+#### Sqlite
+
+```sh
+docker run -d \
+  --name wewe-rss \
+  -p 4000:4000 \
+  -e DATABASE_TYPE=sqlite \
+  -e AUTH_CODE=123567 \
+  -v $(pwd)/data:/app/data \
+  cooderl/wewe-rss-sqlite:latest
+```
+
+#### Mysql
+
+1. 创建docker网络
+
+```sh
+docker network create wewe-rss
+```
+
+2. 启动 MySQL 数据库
+
+```sh
+docker run -d \
+  --name db \
+  -e MYSQL_ROOT_PASSWORD=123456 \
+  -e TZ='Asia/Shanghai' \
+  -e MYSQL_DATABASE='wewe-rss' \
+  -v db_data:/var/lib/mysql \
+  --network wewe-rss \
+  mysql:8.3.0 --mysql-native-password=ON
+```
+
+3. 启动 Server
+
+```sh
+docker run -d \
+  --name wewe-rss \
+  -p 4000:4000 \
+  -e DATABASE_URL='mysql://root:123456@db:3306/wewe-rss?schema=public&connect_timeout=30&pool_timeout=30&socket_timeout=30' \
+  -e AUTH_CODE=123567 \
+  --network wewe-rss \
+  cooderl/wewe-rss:latest
+
+```
+
+[Nginx配置参考](https://raw.githubusercontent.com/cooderl/wewe-rss/main/assets/nginx.example.conf)
+
+### 本地部署
+
+如果你想本地部署，请使用 `pnpm install &&  pnpm run -r build && pnpm run start:server` 命令(可以配合 pm2 来守护进程，防止被杀死)。
+
+## 环境变量
+
+- `DATABASE_URL` （**必填项**）数据库地址，例如 `mysql://root:123456@127.0.0.1:3306/wewe-rss`。
+
+- `DATABASE_TYPE` 数据库类型，使用 `sqlite` 时需要填写 `sqlite`。
+
+- `AUTH_CODE` 服务端接口请求授权码，如果设置为空字符或不设置将不启用。(`/feeds`路径不需要)
+
+- `SERVER_ORIGIN_URL` 服务端访问地址，用于生成RSS的完整路径（外网访问时，设置为服务器的公网 IP 或者域名地址）。
+
+- `MAX_REQUEST_PER_MINUTE` 每分钟最大请求次数，默认 60。
+
+- `FEED_MODE` 输出模式，可选值 `fulltext`（RSS全文模式会使接口响应会变慢，占用更多内存）。
+
+- `CRON_EXPRESSION` 定时更新订阅源Cron表达式，默认为 `35 5,17 * * *`。
+
+## 支持钉钉通知
+
+进入wewe-rss-dingtalk目录按照README.md指引部署
+
+## 使用方式
+
+1. 进入账号管理，点击添加账号，微信扫码登录微信读书账号。
+<img width="400" src="./assets/preview2.png"/>
+
+1. 进入公众号源，点击添加，通过提交微信公众号分享链接，订阅微信公众号。
+  **（添加频率过高容易被封控，等24小时解封）**
+<img width="400" src="./assets/preview3.png"/>
+
+
+## 账号状态说明
+
+- 今日小黑屋 
+  > 账号被封控，等一天恢复
+  > 如果账号正常，可以通过重启服务/容器清除小黑屋记录
+
+- 禁用
+  > 不使用该账号
+
+- 失效
+  > 账号登录状态失效，需要重新登录
+
+## 本地开发
+
+1. 安装 nodejs 18 和 pnpm；
+2. 修改环境变量`cp ./apps/web/.env.local.example ./apps/web/.env`和`cp ./apps/server/.env.local.example ./apps/server/.env`
+3. 执行 `pnpm install && pnpm dev` 即可。⚠️ 注意：此命令仅��于本地开发，不要用于部署！
+4. 前端访问 `http://localhost:5173` ，后端访问 `http://localhost:4000`
+
+## 贡献者
+
+<a href="https://github.com/cooderl/wewe-rss/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=cooderl/wewe-rss" />
+</a>
+
+
+## 风险声明
+
+为了确保本项目的持久运行，某些接口请求将通过`weread.111965.xyz`进行转发。请放心，该转发服务不会保存任何数据。
+
+## License
+
+[MIT](https://raw.githubusercontent.com/cooderl/wewe-rss/main/LICENSE) @cooderl

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "",
   "author": "",
   "private": true,

apps/server/src/app.controller.ts

@@ -1,7 +1,8 @@
-import { Controller, Get, Redirect, Render } from '@nestjs/common';
+import { Controller, Get, Response, Render } from '@nestjs/common';
 import { AppService } from './app.service';
 import { ConfigService } from '@nestjs/config';
 import { ConfigurationType } from './configuration';
+import { Response as Res } from 'express';
 
 @Controller()
 export class AppController {
@@ -21,8 +22,14 @@ export class AppController {
   }
 
   @Get('favicon.ico')
-  @Redirect('https://r2-assets.111965.xyz/wewe-rss.png', 302)
-  getFavicon() {}
+  getFavicon(
+    @Response() res: Res,
+  ) {
+    const imgContent = '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'
+    const imgBuffer = Buffer.from(imgContent, 'base64');
+    res.setHeader('Content-Type', 'image/png');
+    res.send(imgBuffer);
+  }
 
   @Get('/dash*')
   @Render('index.hbs')
@@ -34,6 +41,9 @@ export class AppController {
     return {
       weweRssServerOriginUrl,
       enabledAuthCode: !!code,
+      iconUrl: weweRssServerOriginUrl
+        ? `${weweRssServerOriginUrl}/favicon.ico`
+        : 'https://r2-assets.111965.xyz/wewe-rss.png'
     };
   }
 }

apps/server/src/feeds/feeds.controller.ts

@@ -29,13 +29,18 @@ export class FeedsController {
     @Response() res: Res,
     @Query('limit', new DefaultValuePipe(30), ParseIntPipe) limit: number = 30,
     @Query('mode') mode: string,
+    @Query('title_include') title_include: string,
+    @Query('title_exclude') title_exclude: string,
   ) {
     const path = req.path;
     const type = path.split('.').pop() || '';
+
     const { content, mimeType } = await this.feedsService.handleGenerateFeed({
       type,
       limit,
       mode,
+      title_include,
+      title_exclude,
     });
 
     res.setHeader('Content-Type', mimeType);
@@ -48,14 +53,24 @@ export class FeedsController {
     @Param('feed') feed: string,
     @Query('limit', new DefaultValuePipe(10), ParseIntPipe) limit: number = 10,
     @Query('mode') mode: string,
+    @Query('title_include') title_include: string,
+    @Query('title_exclude') title_exclude: string,
+    @Query('update') update: boolean = false,
   ) {
     const [id, type] = feed.split('.');
     this.logger.log('getFeed: ', id);
+
+    if(update) {
+      this.feedsService.updateFeed(id);
+    }
+
     const { content, mimeType } = await this.feedsService.handleGenerateFeed({
       id,
       type,
       limit,
       mode,
+      title_include,
+      title_exclude,
     });
 
     res.setHeader('Content-Type', mimeType);

apps/server/src/feeds/feeds.service.ts

@@ -6,7 +6,7 @@ import { feedMimeTypeMap, feedTypes } from '@server/constants';
 import { ConfigService } from '@nestjs/config';
 import { Article, Feed as FeedInfo } from '@prisma/client';
 import { ConfigurationType } from '@server/configuration';
-import { Feed } from 'feed';
+import { Feed, Item } from 'feed';
 import got, { Got } from 'got';
 import { load } from 'cheerio';
 import { minify } from 'html-minifier';
@@ -98,6 +98,7 @@ export class FeedsService {
 
     const html = dirtyHtml
       .replace(/data-src=/g, 'src=')
+      .replace(/opacity: 0( !important)?;/g, '')
       .replace(/visibility: hidden;/g, '');
 
     const content =
@@ -215,11 +216,15 @@ export class FeedsService {
     type,
     limit,
     mode,
+    title_include,
+    title_exclude,
   }: {
     id?: string;
     type: string;
     limit: number;
     mode?: string;
+    title_include?: string;
+    title_exclude?: string;
   }) {
     if (!feedTypes.includes(type as any)) {
       type = 'atom';
@@ -247,11 +252,15 @@ export class FeedsService {
         take: limit,
       });
 
+      const { originUrl } =
+        this.configService.get<ConfigurationType['feed']>('feed')!;
       feedInfo = {
         id: 'all',
         mpName: 'WeWe-RSS All',
         mpIntro: 'WeWe-RSS 全部文章',
-        mpCover: 'https://r2-assets.111965.xyz/wewe-rss.png',
+        mpCover: originUrl
+          ? `${originUrl}/favicon.ico`
+          : 'https://r2-assets.111965.xyz/wewe-rss.png',
         status: 1,
         syncTime: 0,
         updateTime: Math.floor(Date.now() / 1e3),
@@ -261,7 +270,18 @@ export class FeedsService {
     }
 
     this.logger.log('handleGenerateFeed articles: ' + articles.length);
-    const feed = await this.renderFeed({ feedInfo, articles, type, mode });
+    let feed = await this.renderFeed({ feedInfo, articles, type, mode });
+
+    if (title_include) {
+      const includes = title_include.split('|');
+      feed.items = feed.items.filter(
+        (i: Item) => includes.some((k) => i.title.includes(k)));
+    }
+    if (title_exclude) {
+      const excludes = title_exclude.split('|');
+      feed.items = feed.items.filter(
+        (i: Item) => !excludes.some((k) => i.title.includes(k)));
+    }
 
     switch (type) {
       case 'rss':
@@ -288,4 +308,15 @@ export class FeedsService {
       };
     });
   }
+
+  async updateFeed(id: string) {
+    try {
+      await this.trpcService.refreshMpArticlesAndUpdateFeed(id);
+    } catch (err) {
+      this.logger.error('updateFeed error', err);
+    } finally {
+      // wait 30s for next feed
+      await new Promise((resolve) => setTimeout(resolve, 30 * 1e3));
+    }
+  }
 }

apps/web/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="https://r2-assets.111965.xyz/wewe-rss.png" />
+    <link rel="icon" href="{{ iconUrl }}" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WeWe RSS</title>
     <meta name="description" content="更好的公众号订阅方式" />
@@ -11,7 +11,7 @@
     <div id="root"></div>
     <script>
       window.__WEWE_RSS_SERVER_ORIGIN_URL__ = '{{ weweRssServerOriginUrl }}';
-      window.__WEWE_RSS_ENABLED_AUTH_CODE__ = {{ enabledAuthCode }};
+      window.__WEWE_RSS_ENABLED_AUTH_CODE__ = '{{ enabledAuthCode }}';
     </script>
     <script type="module" src="/src/main.tsx"></script>
   </body>

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web",
   "private": true,
-  "version": "2.3.1",
+  "version": "2.4.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

apps/web/src/components/Nav.tsx

@@ -11,7 +11,7 @@ import {
 import { ThemeSwitcher } from './ThemeSwitcher';
 import { GitHubIcon } from './GitHubIcon';
 import { useLocation } from 'react-router-dom';
-import { appVersion } from '@web/utils/env';
+import { appVersion, serverOriginUrl } from '@web/utils/env';
 import { useEffect, useState } from 'react';
 
 const navbarItemLink = [
@@ -74,7 +74,10 @@ const Nav = () => {
                 width={28}
                 alt="WeWe RSS"
                 className="mr-2"
-                src="https://r2-assets.111965.xyz/wewe-rss.png"
+                src={ serverOriginUrl
+                  ? `${serverOriginUrl}/favicon.ico`
+                  : 'https://r2-assets.111965.xyz/wewe-rss.png'
+                }
               ></Image>
             </Badge>
             <p className="font-bold text-inherit">WeWe RSS</p>

docker-compose.yml

@@ -2,15 +2,15 @@ version: '3.9'
 
 services:
   db:
-    image: mysql:latest
-    command: --default-authentication-plugin=mysql_native_password
+    image: mysql:8.3.0
+    command: --mysql-native-password=ON
     environment:
       # 请修改为自己的密码
       MYSQL_ROOT_PASSWORD: 123456
       TZ: 'Asia/Shanghai'
       MYSQL_DATABASE: 'wewe-rss'
-      ports:
-       - 13306:3306
+    # ports:
+    #   - 13306:3306
     volumes:
       - db_data:/var/lib/mysql
     healthcheck:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wewe-rss",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "private": true,
   "author": "cooderl <cooder@111965.xyz>",
   "description": "",

wewe-rss-dingtalk/main.py

@@ -77,8 +77,8 @@ def send_dingtalk_msg(access_token, secret):
 
 if __name__ == '__main__':
 
-    access_token = 'ding1kl8vp1obrw3v1qa'
-    secret = 'MHEQTCv_MGFSTeIkJjvYzQNdaTg0xSHyxm28ZGc8W3WvGZpFjP9-qpWwYIdH2M2P'  # 创建机器人时钉钉设置页面有提供
+    access_token = ''
+    secret = ''  # 创建机器人时钉钉设置页面有提供
 
     while True:
         send_dingtalk_msg(access_token, secret)