merge master of forked repo

.dockerignore

@@ -0,0 +1,7 @@
+.git/
+.gitignore
+Makefile
+README.md
+conf/config.json.example
+node_modules/
+

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: 'docker'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/publish.yml

@@ -0,0 +1,60 @@
+name: Publish Docker image
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*'
+    pull_request:
+      branches:
+        - 'master'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ghcr.io/adriankumpf/findmeaflat
+          tag-edge: true
+          tag-semver: |
+            {{version}}
+            {{major}}.{{minor}}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/[email protected]
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.gitignore

@@ -1,5 +1,5 @@
+.DS_Store
+conf/config.json
+db/listing.json
 node_modules/
 npm-debug.log
-config.json
-ts.json
-.DS_Store

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "singleQuote": true
+}

CHANGELOG.md

@@ -0,0 +1,49 @@
+# Changelog
+
+## [Unreleased]
+
+## [1.2.0] - 2021-03-26
+
+### Enhancements
+
+- Add max radius filter setting (useful for Immonet) ([#25](https://github.com/adriankumpf/findmeaflat/pull/25) by [creichel](https://github.com/creichel))
+- Add number of rooms, property size to Telegram messages ([#25](https://github.com/adriankumpf/findmeaflat/pull/25) by [creichel](https://github.com/creichel))
+- Publish docker image to GitHub container registry
+  - ⚠️ If you're using the Docker image, change the image from `docker.pkg.github.com/adriankumpf/findmeaflat/findmeaflat:latest` to `ghcr.io/adriankumpf/findmeaflat:latest`
+  - The latest development version is available under the `edge` tag
+
+### Bug Fixes
+
+- Fix crawler issues with Immowelt, Kleinanzeigen and Immonet ([#25](https://github.com/adriankumpf/findmeaflat/pull/25) by [creichel](https://github.com/creichel))
+
+## [1.1.0] - 2020-07-30
+
+### Enhancements
+
+- Tweak timeouts and delays between requests
+- Improve image build times
+- Retry to send message to Telegram if request was rate limited
+- Reduce scrape interval to 5 minutes
+- Perform a full page crawl at every 10th round
+
+### Bug Fixes
+
+- Fix example configuration
+- Update scraper rules
+- Persist listing ID right after sending the notification to avoid duplicate messages
+
+## [1.0.1] - 2019-01-09
+
+### Fixed
+
+- Add default parameter to `utils.isOneOf`
+- Fix pagination of immoscout
+- Increase pagination limit
+
+## [1.0.0] - 2018-12-08
+
+[unreleased]: https://github.com/adriankumpf/findmeaflat/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/adriankumpf/findmeaflat/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/adriankumpf/findmeaflat/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/adriankumpf/findmeaflat/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/adriankumpf/findmeaflat/compare/v0.0.0...v1.0.0

Dockerfile

@@ -0,0 +1,17 @@
+FROM node:14-alpine
+
+ENV NODE_ENV=production
+
+WORKDIR /app
+RUN chown -R node:node /app
+
+USER node
+
+COPY --chown=node:node package.json package-lock.json ./
+RUN npm ci --progress=false --no-audit --loglevel=error
+
+COPY --chown=node:node lib/ lib/
+COPY --chown=node:node index.js ./
+RUN mkdir db conf
+
+CMD ["node","index.js"]

Makefile

@@ -0,0 +1,30 @@
+.PHONY: all
+all: build start
+
+.PHONY: build
+build: ## Build the docker image
+	@docker image build -t adriankumpf/findmeaflat .
+
+.PHONY: start
+start: ## Start the docker container
+	@docker container run \
+		--init \
+		--name findmeaflat \
+		--rm \
+		-v $$(pwd)/conf/config.json:/app/conf/config.json \
+		-v findmeaflat:/app/db \
+		adriankumpf/findmeaflat
+
+.PHONY: dev
+dev: ## Start the docker container for development
+	@ docker container run \
+		--init \
+		--rm \
+		-it \
+		-u root \
+		-v $$(pwd)/conf:/app/conf \
+		-v $$(pwd)/db:/app/db \
+		-v $$(pwd)/index.js:/app/index.js \
+		-v $$(pwd)/lib:/app/lib \
+		adriankumpf/findmeaflat
+