Upload 94 files

.dockerignore

@@ -0,0 +1,8 @@
+node_modules
+.git
+.gitignore
+*.md
+dist
+.env
+.next
+.DS_Store

.gitignore

@@ -0,0 +1,132 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+.DS_Store

.markdownlint.yaml

@@ -0,0 +1,9 @@
+# Default state for all rules
+default: true
+
+line-length: false
+
+# MD033/no-inline-html - Inline HTML
+MD033:
+  # Allowed elements
+  allowed_elements: ["style"]

.npmrc

@@ -0,0 +1,3 @@
+public-hoist-pattern[]=*@nextui-org/*
+engine-strict=true
+deploy-all-files=true

.prettierignore

@@ -0,0 +1,8 @@
+**/*.log
+**/.DS_Store
+*.
+*.json
+apps/web/.next
+dist
+node_modules
+pnpm-lock.yaml

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "singleQuote": true,
+  "trailingComma": "all"
+}

apps/server/package.json

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

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

@@ -34,6 +34,7 @@ export class FeedsService {
         limit: 3,
         methods: ['GET'],
       },
+      timeout: 8 * 1e3,
       headers: {
         accept:
           'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
@@ -52,6 +53,16 @@ export class FeedsService {
         'user-agent':
           'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36',
       },
+      hooks: {
+        beforeRetry: [
+          async (options, error, retryCount) => {
+            this.logger.warn(`retrying ${options.url}...`);
+            return new Promise((resolve) =>
+              setTimeout(resolve, 2e3 * (retryCount || 1)),
+            );
+          },
+        ],
+      },
     });
   }
 
@@ -110,8 +121,9 @@ export class FeedsService {
     }
     const url = `https://mp.weixin.qq.com/s/${id}`;
     content = await this.getHtmlByUrl(url).catch((e) => {
-      this.logger.error('getHtmlByUrl error:', e);
-      return '';
+      this.logger.error(`getHtmlByUrl(${url}) error: ${e.message}`);
+
+      return '获取全文失败，请重试~';
     });
     mpCache.set(id, content);
     return content;
@@ -223,8 +235,8 @@ export class FeedsService {
 
       feedInfo = {
         id: 'all',
-        mpName: 'WeWe-RSS 全部文章',
-        mpIntro: 'WeWe-RSS',
+        mpName: 'WeWe-RSS All',
+        mpIntro: 'WeWe-RSS 全部文章',
         mpCover: 'https://r2-assets.111965.xyz/wewe-rss.png',
         status: 1,
         syncTime: 0,

apps/server/src/trpc/trpc.service.ts

@@ -185,6 +185,7 @@ export class TrpcService {
   }
 
   async getMpInfo(url: string) {
+    url = url.trim();
     const account = await this.getAvailableAccount();
 
     return this.request

apps/web/package.json

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

apps/web/src/pages/feeds/index.tsx

@@ -230,7 +230,7 @@ const Feeds = () => {
                     size="sm"
                     showAnchorIcon
                     target="_blank"
-                    href={`${serverOriginUrl}/feeds/${currentMpInfo.id}`}
+                    href={`${serverOriginUrl}/feeds/${currentMpInfo.id}.atom`}
                     color="foreground"
                   >
                     RSS

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wewe-rss",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": true,
   "author": "cooderl <[email protected]>",
   "description": "",