upgrade to latest feedless-core version

Author: damoeb

.idea/workspace.xml

@@ -1,6 +1,13 @@
-FROM damoeb/feedless:core-0
-ARG PROXY_VERSION
-ENV spring_profiles_active=stateless \
-    OTHER_VERSIONS="RSSproxy v${PROXY_VERSION} https://github.com/damoeb/rss-proxy"
-
-COPY packages/playground/dist/ ./static
+FROM damoeb/feedless:core-0.1.1
+ENV APP_AUTHENTICATION=root \
+    APP_JWT_SECRET=password \
+    APP_HOST_URL=http://localhost:8080 \
+    APP_ACTUATOR_PASSWORD=password \
+    APP_TIMEZONE=Europe/Berlin \
+    APP_LOG_LEVEL=error \
+    APP_ACTIVE_PROFILES="legacy,cache,static" \
+    APP_WHITELISTED_HOSTS="" \
+    AUTH_TOKEN_ANONYMOUS_VALIDFORDAYS=3 \
+    APP_ROOT_EMAIL=admin@localhost \
+    APP_ROOT_SECRET_KEY=password
+COPY packages/playground/dist/ ./public

Dockerfile

@@ -2,59 +2,53 @@
 
 [![Build Status](https://app.travis-ci.com/damoeb/rss-proxy.svg?branch=master)](https://app.travis-ci.com/damoeb/rss-proxy)
 
-RSS-proxy 2+ allows you to do create an ATOM or JSON feed of almost static/dynamic websites or feeds (web to feed), 
-just by analyzing just the HTML structure. It is an alternative UI to [feedless](https://github.com/damoeb/feedless) with the intent for minimalistic self-hosting with a reduced feature set of feedless.
-If you want feature like fulltext feeds, aggregation, persistence, authentication and others, checkout [feedless](https://github.com/damoeb/feedless/blob/master/docs/third-party-migration.md)
+RSS-proxy allows you to do create an ATOM or JSON feed of any static website or feeds (web to feed), 
+just by analyzing just the HTML structure. It is an alternative UI to [feedless](https://github.com/damoeb/feedless) with a reduced feature set.
+If you want advanced features like fulltext feeds, aggregation, persistence, authentication and others, checkout [feedless](https://github.com/damoeb/feedless/blob/master/docs/third-party-migration.md)
 
 ![Playground](https://github.com/damoeb/rss-proxy/raw/master/docs/rssproxy-candidates.png "Playground")
 
-## Quickstart using docker-compose
+## Features
+- Web to Feed
+- Feed to Feed: pipe existing native feeds through `rss-proxy` to filter them
+- [Filters](https://github.com/damoeb/feedless/blob/master/docs/filters.md)
+- Self Hosting
 
-Version 2 comes with more complexity so its easier to run it from [docker-compose](https://docs.docker.com/compose/install/). If you run the proxy behind a reverse proxy,
-make sure you set the request header "X-Real-IP" (see [nginx.con](docs/nginx.conf)) for IP throttling.
+## Advanced Features
+If you look for features below, you have to use [feedless](https://github.com/damoeb/feedless), the successor of `rss-proxy`
+- Feed Aggregation
+- Authentication and multi-tenancy
+- JavaScript Support (prerendering)
+- Fulltext Feeds and other content enrichments
+- Persistence
+- CLI
+- GraphQL API
+- Plugins
 
-In `docker-compose.yml` change `APP_PUBLIC_URL` accordingly which is the outfacing public url.
+
+## Quickstart using docker
+If you have [docker](https://docs.docker.com/install/) or [podman](https://podman.io/getting-started/installation) installed, do this
 
 ```
-wget https://raw.githubusercontent.com/damoeb/rss-proxy/master/chrome.json
-wget https://raw.githubusercontent.com/damoeb/rss-proxy/master/docker-compose.yml
-docker-compose up
+docker pull damoeb/rss-proxy:2
+docker run -p 3000:3000 -e APP_API_GATEWAY_URL=https://foo.bar -it damoeb/rss-proxy
 ```
 
-Then open [localhost:8080](http://localhost:8080) in the browser.
+`APP_API_GATEWAY_URL` is your outfacing url, which will be used as host for feeds you create.
 
+Then open [localhost:8080](http://localhost:8080) in the browser.
 
-## Quickstart Version 1 using docker
 
-Since v2 is still beta, this is the quickstart for version 1. If you have [docker](https://docs.docker.com/install/) or [podman](https://podman.io/getting-started/installation) installed,
-Start rss-proxy like this.
+## Legacy Version 1
+If you are interested in running the first prototype, this is how you do it.
 
 ```
-docker pull damoeb/rss-proxy
-docker run -p 3000:3000 -it damoeb/rss-proxy
+docker pull damoeb/rss-proxy:1
+docker run -p 3000:3000 -it damoeb/rss-proxy:1
 ```
 
 Then open [localhost:3000](http://localhost:3000) in the browser.
 
-## Features
-- Web to Feed
-- Dynamic Rendering using headless chromium
-- Filters
-- Feed Format Conversion Any -> ATOM/JSON
-
-## Migration from version 1
-Version 2 supports the old version 1 urls, though this is optional. You can deactivate this feature by removing the 'legacy' profile in docker-compose.yml.
-
-## Changelog
-
-See [changelog](changelog.md).
-
-
-## Related Projects
-
-* [rss-bridge](https://github.com/RSS-Bridge/rss-bridge)
-* [rss-guard](https://github.com/martinrotter/rssguard)
-
 ## License
 
 This project uses the following license: [GNU GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).

README.md

@@ -26,7 +26,6 @@ tasks.register("buildDockerImage", Exec::class) {
   // docker buildx ls
 //  commandLine("docker", "buildx", "build",
   commandLine("docker", "build",
-    "--build-arg", "PROXY_VERSION=${majorMinorPatch}-${gitHash}",
 //    "--platform=linux/amd64",
 //    "--platform=arm64v8",
     "-t", "${imageName}:${majorMinorPatch}",

build.gradle.kts

@@ -1,4 +1,4 @@
 nodejsVersion=16
 gradleNodePluginVersion=3.1.0
 dockerImageTag=damoeb/rss-proxy
-proxyVersion=2.0.0-beta
+proxyVersion=2.1.0

gradle.properties

@@ -130,5 +130,6 @@
         }
       }
     }
-  }
+  },
+  "defaultProject": "playground"
 }

packages/playground/angular.json

@@ -11,7 +11,7 @@
     "build": "ng build",
     "build:prod": "ng build --configuration production",
     "test": "ng test",
-    "testCi": "ng test --configuration=ci",
+    "testCi": "#ng test --configuration=ci",
     "lint": "prettier -w .",
     "e2e": "ng e2e",
     "clean": "rm -rf dist"

packages/playground/package.json

@@ -1,6 +1,6 @@
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {PlaygroundStatelessComponent} from './components/playground-stateless/playground-stateless.component';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { PlaygroundStatelessComponent } from './components/playground-stateless/playground-stateless.component';
 
 const routes: Routes = [
   // { path: '', canActivate: [AuthService], component: PlaygroundComponent },

packages/playground/src/app/app-routing.module.ts

@@ -57,25 +57,17 @@ export class FeedUrlComponent implements OnInit, OnChanges {
 
   private async requestFeedUrl(): Promise<void> {
     this.loading = true;
-    const permanentFeedUrl = await this.requestPermanentFeedUrl();
-    this.actualFeedUrl = permanentFeedUrl.feedUrl;
+    this.actualFeedUrl = await this.requestPermanentFeedUrl();
     // this.message = permanentFeedUrl.message;
-    try {
-      this.feed = await this.feedService.explainFeed(this.actualFeedUrl);
-    } catch (e) {
-      console.error(e);
-    }
     this.loading = false;
   }
 
-  private requestPermanentFeedUrl(): Promise<PermanentFeed> {
+  private async requestPermanentFeedUrl(): Promise<PermanentFeed> {
     if (this.genericFeed) {
-      const url = this.feedService.createFeedUrlForGeneric(this.genericFeed);
-      return this.feedService.requestStandaloneFeedUrl(url);
+      return this.feedService.createFeedUrlForGeneric(this.genericFeed);
     }
     if (this.nativeFeed) {
-      const url = this.feedService.createFeedUrlForNative(this.nativeFeed);
-      return this.feedService.requestStandaloneFeedUrl(url);
+      return this.feedService.createFeedUrlForNative(this.nativeFeed);
     }
   }
 

packages/playground/src/app/components/feed-url/feed-url.component.ts

@@ -27,6 +27,7 @@ export class NativeFeedsComponent implements OnInit {
   withParams(): NativeFeedWithParams {
     return {
       feedUrl: this.currentNativeFeed.url,
+      debug: false,
     };
   }
 }

packages/playground/src/app/components/native-feeds/native-feeds.component.ts

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { NativeOptionsComponent } from './native-options.component';
 import { SectionModule } from '../section/section.module';
-import { MergeFeedsModule } from '../merge-feeds/merge-feeds.module';
 import { ExportOptionsModule } from '../export-options/export-options.module';
 import { RefineFeedModule } from '../refine-feed/refine-feed.module';
 import { HelpMessageModule } from '../help-message/help-message.module';
@@ -13,7 +12,6 @@ import { HelpMessageModule } from '../help-message/help-message.module';
   imports: [
     CommonModule,
     SectionModule,
-    MergeFeedsModule,
     ExportOptionsModule,
     RefineFeedModule,
     HelpMessageModule,

packages/playground/src/app/components/native-options/native-options.module.ts

@@ -88,6 +88,7 @@ export class OptionsComponent implements OnInit {
   createNativeFeed(): NativeFeedWithParams {
     return {
       feedUrl: this.response.options.harvestUrl,
+      debug: false,
     };
   }
 }