next version

* feat: rename npm start scripts

.dockerignore

@@ -2,5 +2,6 @@ node_modules/
 npm-debug.log
 test/
 db/
+conf/
 .git/
 .github/

.github/workflows/check_source.yml

@@ -0,0 +1,26 @@
+name: Check the source code
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+jobs:
+  check_source_code:
+    name: Check the source code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Check formatting
+        run: yarn format:check
+
+      - name: Lint
+        run: yarn lint

.github/workflows/stales.yml

@@ -1,4 +1,4 @@
-name: "Close stale issues and PRs"
+name: Close stale issues and PRs
 
 on:
   schedule:

.github/workflows/test.yml

@@ -13,8 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Node.js
+      - uses: actions/setup-node@v4
-        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'yarn'

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "printWidth": 120
+}

CONTRIBUTING.md

@@ -106,14 +106,14 @@ exports.config = {
 ```
 
 #### Running Tests
-If you've written a new provider you are an awesome person. If you now write tests for it, you are even more awesome. And who doesn't want to be more awesome right?
+If you've written a new provider you are an awesome person. If you now write tests for it, you are even more awesome. And who doesn't want to be more awesome, right?
 
 #### Codestyle
-I'm using Eslint to maintain quote style and quality. Do not skip it...
+I'm using ESLint to maintain quote style and quality. Do not skip it...
 
-##### To do before merging:
+##### To-do before merging:
 
-- executed tests? (`pnpm test`)
+- Have you executed the tests? (`yarn test`)
-- sure the changes are useful for everybody? Or is it maybe a custom modification just for your case?
+- Are you sure the changes are useful for everybody? Or is it maybe a custom modification just for your case?
 
 _Thanks!_ :heart:

Dockerfile

@@ -11,16 +11,16 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 
 # Copy lockfiles first to leverage cache for dependencies
-COPY package.json yarn.lock ./
+COPY package.json yarn.lock .
 
 # Set Yarn timeout, install dependencies and PM2 globally
 RUN yarn config set network-timeout 600000 \
-  && yarn install --frozen-lockfile \
+  && yarn --frozen-lockfile \
   && yarn global add pm2
 
 # Copy application source and build production assets
-COPY . ./
+COPY . .
-RUN yarn run prod
+RUN yarn build:frontend
 
 # Prepare runtime directories and symlinks for data and config
 RUN mkdir -p /db /conf \

README.md

@@ -1,6 +1,6 @@
 <img src="https://github.com/orangecoding/fredy/blob/master/doc/logo.png" width="400">  
 
-![Build Status](https://github.com/orangecoding/fredy/actions/workflows/test.yml/badge.svg)  [![Create and publish Docker image](https://github.com/orangecoding/fredy/actions/workflows/docker.yml/badge.svg)](https://github.com/orangecoding/fredy/actions/workflows/docker.yml)
+![Test](https://github.com/orangecoding/fredy/actions/workflows/test.yml/badge.svg)  [![Create and publish Docker image](https://github.com/orangecoding/fredy/actions/workflows/docker.yml/badge.svg)](https://github.com/orangecoding/fredy/actions/workflows/docker.yml) ![Check the sourcecode](https://github.com/orangecoding/fredy/actions/workflows/check_source.yml/badge.svg)
 
 Searching an apartment in Germany can be a frustrating task. Not any longer though, as _Fredy_ will take over and will only notify you once new listings have been found that match your requirements.
 
@@ -8,8 +8,6 @@ _Fredy_ scrapes multiple services (Immonet, Immowelt etc.) and send new listings
 
 If _Fredy_ finds matching results, it will send them to you via Slack, Email, Telegram etc. (More adapters can be configured.) As _Fredy_ stores the listings it has found, new results will not be sent to you twice (and as a side-effect, _Fredy_ can show some statistics). Furthermore, _Fredy_ checks duplicates per scraping so that the same listings are not being sent twice or more when posted on various platforms (which happens more often than one might think).
 
-<a href="https://www.producthunt.com/posts/fredy-find-real-estates-damn-easy?embed=true&utm_source=badge-featured&utm_medium=badge&utm_source=badge-fredy&#0045;find&#0045;real&#0045;estates&#0045;damn&#0045;easy" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=965690&theme=light&t=1747292331626" alt="Fredy&#0032;&#0045;&#0032;Find&#0032;Real&#0032;Estates&#0032;Damn&#0032;EasY&#0032; - Your&#0032;personal&#0032;real&#0032;estate&#0032;search&#0032;bot | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
 # Sponsorship [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/orangecoding)    
 If you like my work, consider becoming a sponsor. I'm not expecting anybody to pay for _Fredy_ or any other Open Source Project I'm maintaining, however keep in mind, I'm doing all of this in my spare time :) Thanks.
 
@@ -25,9 +23,9 @@ If you want to try out _Fredy_, you can access the demo version [here](https://f
 - Make sure to use Node.js 20 or above
 - Run the following commands:
 ```ssh
-yarn (or npm install)
+yarn
-yarn run prod
+yarn run start:backend
-yarn run start
+yarn run start:frontend
 ```
 _Fredy_ will start with the default port, set to `9998`. You can access _Fredy_ by opening your browser at `http://localhost:9998`. The default login is `admin`, both for username and password. You should change the password as soon as possible when you plan to run Fredy on a server.
 
@@ -48,7 +46,7 @@ A provider contains the URL that points to the search results for the respective
 **It is important that you order the search results by date, so that _Fredy_ always picks the latest results first!**
 
 #### Adapter
-_Fredy_ supports multiple adapters, such as Slack, SendGrid, Telegram etc. A search job can have as many adapters as supported by _Fredy_. Each adapter needs different configuration values, which you have to provide when using them. A adapter dictactes how the frontend renders by telling the frontend what information it needs in order to send listings to the user.
+_Fredy_ supports multiple adapters, such as Slack, SendGrid, Telegram etc. A search job can have as many adapters as supported by _Fredy_. Each adapter needs different configuration values, which you have to provide when using them. An adapter dictates how the frontend renders by telling the frontend what information it needs in order to send listings to the user.
 
 #### Jobs
 A Job wraps adapters and providers. _Fredy_ runs the configured jobs in a specific interval (can be configured in `/conf/config.json`).
@@ -63,14 +61,13 @@ As an administrator, you can create, edit and remove users from _Fredy_. Be care
 # Development
 
 ### Running Fredy in development mode
-To run _Fredy_ in development mode, you need to run the backend & frontend separately.
 Start the backend with:
 ```shell
-yarn run start
+yarn run start:backend:dev
 ```
 For the frontend, run:
 ```shell
-yarn run dev
+yarn run start:frontend:dev
 ```
 You should now be able to access _Fredy_ from your browser. Check your Terminal to see what port the frontend is running on.
 
@@ -84,7 +81,7 @@ yarn run test
 ![Architecture](/doc/architecture.jpg "Architecture")
 
 ### Immoscout
-Immoscout has implemented advanced bot detection. In order to work around this, we are using a reversed engineered version of their mobile api. See See [Immoscout Reverse Engineering Documentation](https://github.com/orangecoding/fredy/blob/master/reverse-engineered-immoscout.md)
+Immoscout has implemented advanced bot detection. In order to work around this, we are using a reversed engineered version of their mobile api. See [Immoscout Reverse Engineering Documentation](https://github.com/orangecoding/fredy/blob/master/reverse-engineered-immoscout.md)
 
 # Analytics
 Fredy is completely free (and will always remain free). However, it would be a huge help if you’d allow me to collect some analytical data. 

index.js

@@ -1,14 +1,14 @@
 import fs from 'fs';
-import {config} from './lib/utils.js';
+import { config } from './lib/utils.js';
 import * as similarityCache from './lib/services/similarity-check/similarityCache.js';
 import { setLastJobExecution } from './lib/services/storage/listingsStorage.js';
 import * as jobStorage from './lib/services/storage/jobStorage.js';
 import FredyRuntime from './lib/FredyRuntime.js';
 import { duringWorkingHoursOrNotSet } from './lib/utils.js';
 import './lib/api/api.js';
-import {track} from './lib/services/tracking/Tracker.js';
+import { track } from './lib/services/tracking/Tracker.js';
-import {handleDemoUser} from './lib/services/storage/userStorage.js';
+import { handleDemoUser } from './lib/services/storage/userStorage.js';
-import {cleanupDemoAtMidnight} from './lib/services/demoCleanup.js';
+import { cleanupDemoAtMidnight } from './lib/services/demoCleanup.js';
 //if db folder does not exist, ensure to create it before loading anything else
 if (!fs.existsSync('./db')) {
   fs.mkdirSync('./db');
@@ -19,13 +19,13 @@ const provider = fs.readdirSync(path).filter((file) => file.endsWith('.js'));
 const INTERVAL = config.interval * 60 * 1000;
 /* eslint-disable no-console */
 console.log(`Started Fredy successfully. Ui can be accessed via http://localhost:${config.port}`);
-if(config.demoMode){
+if (config.demoMode) {
   console.info('Running in demo mode');
   cleanupDemoAtMidnight();
 }
 /* eslint-enable no-console */
 const fetchedProvider = await Promise.all(
-  provider.filter((provider) => provider.endsWith('.js')).map(async (pro) => import(`${path}/${pro}`))
+  provider.filter((provider) => provider.endsWith('.js')).map(async (pro) => import(`${path}/${pro}`)),
 );
 
 handleDemoUser();
@@ -33,7 +33,7 @@ handleDemoUser();
 setInterval(
   (function exec() {
     const isDuringWorkingHoursOrNotSet = duringWorkingHoursOrNotSet(config, Date.now());
-        if(!config.demoMode) {
+    if (!config.demoMode) {
       if (isDuringWorkingHoursOrNotSet) {
         track();
         config.lastRun = Date.now();
@@ -58,5 +58,5 @@ setInterval(
     }
     return exec;
   })(),
-  INTERVAL
+  INTERVAL,
 );

lib/api/api.js

@@ -12,7 +12,7 @@ import restana from 'restana';
 import files from 'serve-static';
 import path from 'path';
 import { getDirName } from '../utils.js';
-import {demoRouter} from './routes/demoRouter.js';
+import { demoRouter } from './routes/demoRouter.js';
 const service = restana();
 const staticService = files(path.join(getDirName(), '../ui/public'));
 const PORT = config.port || 9998;

lib/api/routes/jobRouter.js

@@ -15,7 +15,7 @@ function doesJobBelongsToUser(job, req) {
   if (user == null) {
     return false;
   }
-  return user.isAdmin || job.userId === job.userId;
+  return user.isAdmin || job.userId === user.id;
 }
 jobRouter.get('/', async (req, res) => {
   const isUserAdmin = isAdmin(req);

lib/notification/adapter/telegram.js

@@ -22,16 +22,18 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
   const { token, chatId } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
   const job = getJob(jobKey);
   const jobName = job == null ? jobKey : job.name;
-  //we have to split messages into chunk, because otherwise messages are going to become too big and will fail
+  // we have to split messages into chunks, because otherwise messages are going to become too big and will fail
   const chunks = arrayChunks(newListings, MAX_ENTITIES_PER_CHUNK);
   const promises = chunks.map((chunk) => {
-    let message = `<i>${jobName}</i> (${serviceName}) found <b>${newListings.length}</b> new listings:\n\n`;
+    const messageParagraphs = [];
-    message += chunk.map(
+
+    messageParagraphs.push(`<i>${jobName}</i> (${serviceName}) found <b>${newListings.length}</b> new listings:`);
+    messageParagraphs.push(...chunk.map(
       (o) =>
         `<a href='${o.link}'><b>${shorten(o.title.replace(/\*/g, ''), 45).trim()}</b></a>\n` +
-        [o.address, o.price, o.size].join(' | ') +
+        [o.address, o.price, o.size].join(' | ')
-        '\n\n',
+    ));
-    );
+
     /**
      * This is to not break the rate limit. It is to only send 1 message per second
      */
@@ -41,7 +43,7 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
           method: 'post',
           body: JSON.stringify({
             chat_id: chatId,
-            text: message,
+            text: messageParagraphs.join('\n\n'),
             parse_mode: 'HTML',
             disable_web_page_preview: true,
           }),

lib/notification/notify.js

@@ -6,7 +6,7 @@ const adapter = await Promise.all(
   fs
     .readdirSync('./lib/notification/adapter')
     .filter((file) => file.endsWith('.js'))
-    .map(async (integPath) => await import(`${path}/${integPath}`))
+    .map(async (integPath) => await import(`${path}/${integPath}`)),
 );
 
 if (adapter.length === 0) {

lib/provider/immobilienDe.js

@@ -1,4 +1,4 @@
-import utils, {buildHash} from '../utils.js';
+import utils, { buildHash } from '../utils.js';
 let appliedBlackList = [];
 function shortenLink(link) {
   return link.substring(0, link.indexOf('?'));

lib/provider/immoscout.js

@@ -36,7 +36,7 @@
  */
 
 import utils, { buildHash } from '../utils.js';
-import { convertWebToMobile } from '../services/immoscout/immoscout-web-translater.js';
+import { convertWebToMobile } from '../services/immoscout/immoscout-web-translator.js';
 let appliedBlackList = [];
 
 async function getListings(url) {

lib/provider/kleinanzeigen.js

@@ -1,4 +1,4 @@
-import utils, {buildHash} from '../utils.js';
+import utils, { buildHash } from '../utils.js';
 
 let appliedBlackList = [];
 let appliedBlacklistedDistricts = [];
@@ -7,7 +7,7 @@ function normalize(o) {
   const size = o.size || '--- m²';
   const id = buildHash(o.id, o.price);
   const link = `https://www.kleinanzeigen.de${o.link}`;
-    return Object.assign(o, {id, size, link});
+  return Object.assign(o, { id, size, link });
 }
 
 function applyBlacklist(o) {
@@ -47,4 +47,4 @@ export const init = (sourceConfig, blacklist, blacklistedDistricts) => {
   appliedBlacklistedDistricts = blacklistedDistricts || [];
   appliedBlackList = blacklist || [];
 };
-export {config};
+export { config };

lib/provider/neubauKompass.js

@@ -1,4 +1,4 @@
-import utils, {buildHash} from '../utils.js';
+import utils, { buildHash } from '../utils.js';
 
 let appliedBlackList = [];
 
@@ -7,9 +7,11 @@ function nullOrEmpty(val) {
 }
 
 function normalize(o) {
-    const link = nullOrEmpty(o.link) ? 'NO LINK' : `https://www.neubaukompass.de${o.link.substring(o.link.indexOf('/neubau'))}`;
+  const link = nullOrEmpty(o.link)
+    ? 'NO LINK'
+    : `https://www.neubaukompass.de${o.link.substring(o.link.indexOf('/neubau'))}`;
   const id = buildHash(o.link, o.price);
-    return Object.assign(o, {id, link});
+  return Object.assign(o, { id, link });
 }
 
 function applyBlacklist(o) {
@@ -41,4 +43,4 @@ export const metaInformation = {
   baseUrl: 'https://www.neubaukompass.de/',
   id: 'neubauKompass',
 };
-export {config};
+export { config };

lib/provider/wgGesucht.js

@@ -1,4 +1,4 @@
-import utils, {buildHash} from '../utils.js';
+import utils, { buildHash } from '../utils.js';
 
 let appliedBlackList = [];
 
@@ -40,4 +40,4 @@ export const metaInformation = {
   baseUrl: 'https://www.wg-gesucht.de/',
   id: 'wgGesucht',
 };
-export {config};
+export { config };

lib/services/extractor/parser/parser.js

@@ -8,7 +8,7 @@ export function loadParser(text) {
 
 export function parse(crawlContainer, crawlFields, text, url) {
   if (!text) {
-    console.warn('Cannot parse, text was empty for url ', url);
+    console.warn('No content found for ', url);
     return null;
   }
 

lib/services/storage/userStorage.js

@@ -1,5 +1,5 @@
 import { JSONFileSync } from 'lowdb/node';
-import {config, getDirName} from '../../utils.js';
+import { config, getDirName } from '../../utils.js';
 import * as hasher from '../security/hash.js';
 import { nanoid } from 'nanoid';
 import * as jobStorage from './jobStorage.js';
@@ -86,25 +86,30 @@ export const removeUser = (userId) => {
   db.chain
     .set(
       'user',
-      user.filter((u) => u.id !== userId)
+      user.filter((u) => u.id !== userId),
     )
     .value();
   db.write();
 };
 
 export const handleDemoUser = () => {
-    if(!config.demoMode){
+  if (!config.demoMode) {
     const user = db.chain.get('user').value();
-        db.chain.get('user').value();
+    db.chain
-        db.chain.set('user', user.filter((u) => u.username !== 'demo')).value();
+      .set(
+        'user',
+        user.filter((u) => u.username !== 'demo'),
+      )
+      .value();
     db.write();
-    }else {
+  } else {
     const demoUser = db.chain
       .get('user')
       .filter((u) => u.username === 'demo')
       .value();
     if (demoUser == null || demoUser.length === 0) {
-            db.chain.get('user')
+      db.chain
+        .get('user')
         .value()
         .push({
           id: nanoid(),
@@ -116,4 +121,3 @@ export const handleDemoUser = () => {
     }
   }
 };
-

lib/utils.js

@@ -9,12 +9,9 @@ function inDevMode(){
 }
 
 function isOneOf(word, arr) {
-    if (arr == null || arr.length === 0) {
+    if (!arr || arr.length === 0 || word == null) return false;
-        return false;
+    const lowerWord = word.toLowerCase();
-    }
+    return arr.some(item => lowerWord.indexOf(item.toLowerCase()) !== -1);
-    const expression = String.raw`\b(${arr.join('|')})\b`;
-    const blacklist = new RegExp(expression, 'ig');
-    return blacklist.test(word);
 }
 
 function nullOrEmpty(val) {

package.json

@@ -1,21 +1,25 @@
 {
   "name": "fredy",
-  "version": "11.2.2",
+  "version": "11.3.0",
   "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
   "scripts": {
-    "start": "node prod.js",
+    "prepare": "husky",
-    "dev": "yarn && rm -rf ./ui/public/* && vite",
+    "start:backend": "x-var NODE_ENV=production node index.js",
-    "ui": "rm -rf ./ui/public/* && vite",
+    "start:backend:dev": "nodemon --watch index.js --watch lib",
-    "prod": "yarn && vite build --emptyOutDir",
+    "start:frontend": "vite -m production",
-    "format": "prettier --write lib/**/*.js ui/src/**/*.jsx test/**/*.js *.js --single-quote --print-width 120",
+    "start:frontend:dev": "vite",
+    "build:frontend": "vite build",
+    "format": "prettier --write lib/**/*.js ui/src/**/*.jsx test/**/*.js *.js",
+    "format:check": "prettier --check lib/**/*.js ui/src/**/*.jsx test/**/*.js *.js",
     "test": "mocha --loader=esmock --timeout 3000000 test/**/*.test.js",
-    "lint": "eslint ./index.js ./lib/**/*.js ./test/**/*.js ./ui/src/**/*.jsx"
+    "lint": "eslint index.js lib/**/*.js test/**/*.js ui/src/**/*.jsx",
+    "lint:fix": "yarn lint --fix"
   },
   "type": "module",
   "lint-staged": {
-    "*.js": [
+    "*.{js,jsx}": [
-      "eslint ./index.js ./lib/**/*.js ./test/**/*.js",
+      "yarn lint",
-      "prettier --single-quote --print-width 120 --write"
+      "yarn format"
     ]
   },
   "main": "index.js",
@@ -50,17 +54,17 @@
     "Firefox ESR"
   ],
   "dependencies": {
-    "@douyinfe/semi-ui": "2.79.0",
+    "@douyinfe/semi-ui": "2.83.0",
     "@rematch/core": "2.2.0",
     "@rematch/loading": "2.1.2",
     "@sendgrid/mail": "8.1.5",
-    "@vitejs/plugin-react": "4.4.1",
+    "@vitejs/plugin-react": "4.7.0",
     "better-sqlite3": "^11.10.0",
     "body-parser": "2.2.0",
-    "cheerio": "^1.0.0",
+    "cheerio": "^1.1.0",
-    "cookie-session": "2.1.0",
+    "cookie-session": "2.1.1",
     "handlebars": "4.7.8",
-    "highcharts": "12.2.0",
+    "highcharts": "12.3.0",
     "highcharts-react-official": "3.2.2",
     "lodash": "4.17.21",
     "lowdb": "6.0.1",
@@ -70,10 +74,10 @@
     "node-fetch": "3.3.2",
     "node-mailjet": "6.0.8",
     "package-up": "^5.0.0",
-    "puppeteer": "^24.8.2",
+    "puppeteer": "^24.14.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
-    "query-string": "9.1.2",
+    "query-string": "9.2.2",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-redux": "9.2.0",
@@ -81,28 +85,30 @@
     "react-router-dom": "5.3.0",
     "redux": "5.0.1",
     "redux-thunk": "3.1.0",
-    "restana": "4.9.9",
+    "restana": "5.0.0",
-    "serve-static": "1.16.2",
+    "serve-static": "2.2.0",
     "slack": "11.0.2",
     "string-similarity": "^4.0.4",
-    "vite": "5.4.11"
+    "vite": "7.0.5",
+    "x-var": "^2.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.27.1",
+    "@babel/core": "7.27.3",
-    "@babel/eslint-parser": "7.27.1",
+    "@babel/eslint-parser": "7.27.5",
     "@babel/preset-env": "7.27.2",
     "@babel/preset-react": "7.27.1",
-    "chai": "5.2.0",
+    "chai": "5.2.1",
     "eslint": "8.56.0",
     "eslint-config-prettier": "8.8.0",
-    "eslint-plugin-react": "7.37.4",
+    "eslint-plugin-react": "7.37.5",
-    "esmock": "2.7.0",
+    "esmock": "2.7.1",
     "history": "5.3.0",
     "husky": "9.1.7",
-    "less": "4.3.0",
+    "less": "4.4.0",
     "lint-staged": "15.5.2",
     "mocha": "10.8.2",
-    "prettier": "3.5.3",
+    "nodemon": "^3.1.10",
+    "prettier": "3.6.2",
     "redux-logger": "3.0.6"
   }
 }

prod.js

@@ -1,2 +0,0 @@
-process.env.NODE_ENV = 'production';
-import('./index.js');

reverse-engineered-immoscout.md

@@ -77,4 +77,4 @@ curl -H "User-Agent: ImmoScout24_1410_30_._" \
 
 
 ## Parameters 
-The parameters between web and mobile are very different which is why we have to translate them. Please see `immoscout-web-translator.js`.
+The parameters between web and mobile are very different which is why we have to translate them. Please see [/lib/services/immoscout/immoscout-web-translator.js](https://github.com/orangecoding/fredy/blob/master/lib/services/immoscout/immoscout-web-translator.js).

test/provider/immonet.test.js

@@ -1,7 +1,7 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import {get} from '../mocks/mockNotification.js';
+import { get } from '../mocks/mockNotification.js';
-import {mockFredy, providerConfig} from '../utils.js';
+import { mockFredy, providerConfig } from '../utils.js';
-import {expect} from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immonet.js';
 
 describe('#immonet testsuite()', () => {

test/provider/neubauKompass.test.js

@@ -1,7 +1,7 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import {get} from '../mocks/mockNotification.js';
+import { get } from '../mocks/mockNotification.js';
-import {mockFredy, providerConfig} from '../utils.js';
+import { mockFredy, providerConfig } from '../utils.js';
-import {expect} from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/neubauKompass.js';
 
 describe('#neubauKompass testsuite()', () => {

test/similarity/similarity.test.js

@@ -34,6 +34,7 @@ describe('similarityCheck', () => {
       check.setCacheEntry(
         'where |X| and |Y| are the cardinalities of the two sets (i.e. the number of elements in each set). The Sørensen index equals twice the number of elements common to both sets divided by the sum of the number of elements in each set.',
       );
+      expect(check.hasSimilarEntries('unrelated text')).to.be.false;
     });
   });
 });

test/utils/utils.test.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import {buildHash} from '../../lib/utils.js';
+import { buildHash } from '../../lib/utils.js';
 
 describe('utilsCheck', () => {
   describe('#utilsCheck()', () => {

ui/src/App.jsx

@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, { useEffect } from 'react';
 
 import InsufficientPermission from './components/permission/InsufficientPermission';
 import PermissionAwareRoute from './components/permission/PermissionAwareRoute';
@@ -6,19 +6,19 @@ import GeneralSettings from './views/generalSettings/GeneralSettings';
 import JobMutation from './views/jobs/mutation/JobMutation';
 import UserMutator from './views/user/mutation/UserMutator';
 import JobInsight from './views/jobs/insights/JobInsight.jsx';
-import {useDispatch, useSelector} from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
-import {Switch, Redirect} from 'react-router-dom';
+import { Switch, Redirect } from 'react-router-dom';
 import Logout from './components/logout/Logout';
 import Logo from './components/logo/Logo';
 import Menu from './components/menu/Menu';
 import Login from './views/login/Login';
 import Users from './views/user/Users';
 import Jobs from './views/jobs/Jobs';
-import {Route} from 'react-router';
+import { Route } from 'react-router';
 
 import './App.less';
 import TrackingModal from './components/tracking/TrackingModal.jsx';
-import {Banner} from '@douyinfe/semi-ui';
+import { Banner } from '@douyinfe/semi-ui';
 
 export default function FredyApp() {
   const dispatch = useDispatch();
@@ -50,8 +50,8 @@ export default function FredyApp() {
 
   const login = () => (
     <Switch>
-            <Route name="Login" path={'/login'} component={Login}/>
+      <Route name="Login" path={'/login'} component={Login} />
-            <Redirect from="*" to={'/login'}/>
+      <Redirect from="*" to={'/login'} />
     </Switch>
   );
 
@@ -60,48 +60,50 @@ export default function FredyApp() {
   ) : (
     <div className="app">
       <div className="app__container">
-                <Logout/>
+        <Logout />
-                <Logo width={190} white/>
+        <Logo width={190} white />
-                <Menu isAdmin={isAdmin()}/>
+        <Menu isAdmin={isAdmin()} />
 
         {settings.demoMode && (
           <>
-                    <Banner fullMode={true}
+            <Banner
+              fullMode={true}
               type="info"
               bordered
               closeIcon={null}
               description="You're currently viewing the demo version of Fredy. Jobs won't scrape websites, and any changes you make will be reverted at midnight."
             />
-                    <br/>
+            <br />
-                </>)}
+          </>
-                {(settings.analyticsEnabled === null && !settings.demoMode) && <TrackingModal/>}
+        )}
+        {settings.analyticsEnabled === null && !settings.demoMode && <TrackingModal />}
         <Switch>
-                    <Route name="Insufficient Permission" path={'/403'} component={InsufficientPermission}/>
+          <Route name="Insufficient Permission" path={'/403'} component={InsufficientPermission} />
-                    <Route name="Create new Job" path={'/jobs/new'} component={JobMutation}/>
+          <Route name="Create new Job" path={'/jobs/new'} component={JobMutation} />
-                    <Route name="Edit a Job" path={'/jobs/edit/:jobId'} component={JobMutation}/>
+          <Route name="Edit a Job" path={'/jobs/edit/:jobId'} component={JobMutation} />
-                    <Route name="Insights into a Job" path={'/jobs/insights/:jobId'} component={JobInsight}/>
+          <Route name="Insights into a Job" path={'/jobs/insights/:jobId'} component={JobInsight} />
-                    <Route name="Job overview" path={'/jobs'} component={Jobs}/>
+          <Route name="Job overview" path={'/jobs'} component={Jobs} />
           <PermissionAwareRoute
             name="Create new User"
             path="/users/new"
-                        component={<UserMutator/>}
+            component={<UserMutator />}
             currentUser={currentUser}
           />
           <PermissionAwareRoute
             name="Edit a user"
             path="/users/edit/:userId"
-                        component={<UserMutator/>}
+            component={<UserMutator />}
             currentUser={currentUser}
           />
-                    <PermissionAwareRoute name="Users" path="/users" component={<Users/>} currentUser={currentUser}/>
+          <PermissionAwareRoute name="Users" path="/users" component={<Users />} currentUser={currentUser} />
           <PermissionAwareRoute
             name="General Settings"
             path="/generalSettings"
-                        component={<GeneralSettings/>}
+            component={<GeneralSettings />}
             currentUser={currentUser}
           />
 
-                    <Redirect from="/" to={'/jobs'}/>
+          <Redirect from="/" to={'/jobs'} />
         </Switch>
       </div>
     </div>

ui/src/App.less

@@ -41,3 +41,7 @@ a:active {
   background-color: transparent;
   text-decoration: underline;
 }
+
+.semi-icon:not(.semi-tabs-bar .semi-tabs-tab .semi-icon) {
+  vertical-align: middle;
+}

ui/src/Index.jsx

@@ -23,5 +23,5 @@ root.render(
         <App />
       </LocaleProvider>
     </HashRouter>
-  </Provider>
+  </Provider>,
 );

ui/src/components/table/ProviderTable.jsx

@@ -30,7 +30,7 @@ export default function ProviderTable({ providerData = [], onRemove } = {}) {
           render: (_, record) => {
             return (
               <div style={{ float: 'right' }}>
-                <Button type="danger" icon={<IconDelete />} onClick={() => onRemove(record.id)} />
+                <Button type="danger" icon={<IconDelete />} onClick={() => onRemove(record.url)} />
               </div>
             );
           },

ui/src/components/tracking/TrackingModal.jsx

@@ -1,19 +1,24 @@
 import React from 'react';
-import {Modal} from '@douyinfe/semi-ui';
+import { Modal } from '@douyinfe/semi-ui';
 import Logo from '../logo/Logo.jsx';
-import {xhrPost} from '../../services/xhr.js';
+import { xhrPost } from '../../services/xhr.js';
 
 import './TrackingModal.less';
+import inDevelopment from '../../services/developmentMode.js';
 
 const saveResponse = async (analyticsEnabled) => {
   await xhrPost('/api/admin/generalSettings', {
-        analyticsEnabled
+    analyticsEnabled,
   });
 };
 
 export default function TrackingModal() {
+  if (inDevelopment()) {
+    return null;
+  }
 
-    return <Modal
+  return (
+    <Modal
       visible={true}
       onOk={async () => {
         await saveResponse(true);
@@ -28,21 +33,24 @@ export default function TrackingModal() {
       okText="Yes! I want to help"
       cancelText="No, thanks"
     >
-        <Logo white/>
+      <Logo white />
       <div className="trackingModal__description">
         <p>Hey 👋</p>
         <p>Fed up with popups? Yeah, me too. But this one’s important, and I promise it will only appear once ;)</p>
-            <p>Fredy is completely free (and will always remain free). If you’d like, you can support me by donating
+        <p>
-                through my GitHub, but there’s absolutely no obligation to do so.</p>
+          Fredy is completely free (and will always remain free). If you’d like, you can support me by donating through
-            <p>However, it would be a huge
+          my GitHub, but there’s absolutely no obligation to do so.
-                help if you’d allow me to collect some analytical data. Wait, before you click "no", let me explain. If
+        </p>
-                you
+        <p>
-                agree, Fredy will send a ping to my Mixpanel project each time it runs.</p>
+          However, it would be a huge help if you’d allow me to collect some analytical data. Wait, before you click
-            <p>The data includes: names of
+          "no", let me explain. If you agree, Fredy will send a ping to my Mixpanel project each time it runs.
-                active adapters/providers, OS, architecture, Node version, and language. The information is entirely
+        </p>
-                anonymous and helps me understand which adapters/providers are most frequently used.</p>
+        <p>
+          The data includes: names of active adapters/providers, OS, architecture, Node version, and language. The
+          information is entirely anonymous and helps me understand which adapters/providers are most frequently used.
+        </p>
         <p>Thanks🤘</p>
       </div>
-    </Modal>;
+    </Modal>
-
+  );
 }

ui/src/services/developmentMode.js

@@ -0,0 +1,4 @@
+export default function isDevelopmentMode(){
+    const inDevMode= import.meta.env.MODE;
+    return inDevMode != null && inDevMode === 'development';
+}

ui/src/views/generalSettings/GeneralSettings.jsx

@@ -1,14 +1,21 @@
 import React from 'react';
 
-import {useDispatch, useSelector} from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
-import {Divider, TimePicker, Button, Checkbox} from '@douyinfe/semi-ui';
+import { Divider, TimePicker, Button, Checkbox } from '@douyinfe/semi-ui';
-import {InputNumber} from '@douyinfe/semi-ui';
+import { InputNumber } from '@douyinfe/semi-ui';
 import Headline from '../../components/headline/Headline';
-import {xhrPost} from '../../services/xhr';
+import { xhrPost } from '../../services/xhr';
-import {SegmentPart} from '../../components/segment/SegmentPart';
+import { SegmentPart } from '../../components/segment/SegmentPart';
-import {Banner, Toast} from '@douyinfe/semi-ui';
+import { Banner, Toast } from '@douyinfe/semi-ui';
-import {IconSave, IconCalendar, IconRefresh, IconSignal, IconLineChartStroked, IconSearch} from '@douyinfe/semi-icons';
+import {
+  IconSave,
+  IconCalendar,
+  IconRefresh,
+  IconSignal,
+  IconLineChartStroked,
+  IconSearch,
+} from '@douyinfe/semi-icons';
 import './GeneralSettings.less';
 
 function formatFromTimestamp(ts) {
@@ -97,19 +104,19 @@ const GeneralSettings = function GeneralSettings() {
           to: workingHourTo,
         },
         demoMode,
-                analyticsEnabled
+        analyticsEnabled,
       });
     } catch (exception) {
       console.error(exception);
-            if(exception?.json?.message != null){
+      if (exception?.json?.message != null) {
         throwMessage(exception.json.message, 'error');
-            }else {
+      } else {
         throwMessage('Error while trying to store settings.', 'error');
       }
       return;
     }
     throwMessage('Settings stored successfully. We will reload your browser in 3 seconds.', 'success');
-        setTimeout(()=>{
+    setTimeout(() => {
       location.reload();
     }, 3000);
   };
@@ -118,7 +125,7 @@ const GeneralSettings = function GeneralSettings() {
     <div>
       {!loading && (
         <React.Fragment>
-                    <Headline text="General Settings"/>
+          <Headline text="General Settings" />
           <div>
             <SegmentPart
               name="Interval"
@@ -135,7 +142,7 @@ const GeneralSettings = function GeneralSettings() {
                 suffix={'minutes'}
               />
             </SegmentPart>
-                        <Divider margin="1rem"/>
+            <Divider margin="1rem" />
             <SegmentPart name="Port" helpText="Port on which Fredy is running." Icon={IconSignal}>
               <InputNumber
                 min={0}
@@ -146,7 +153,7 @@ const GeneralSettings = function GeneralSettings() {
                 onChange={(value) => setPort(value)}
               />
             </SegmentPart>
-                        <Divider margin="1rem"/>
+            <Divider margin="1rem" />
             <SegmentPart
               name="Working hours"
               helpText="During this hours, Fredy will search for new apartments. If nothing is configured, Fredy will search around the clock."
@@ -173,26 +180,20 @@ const GeneralSettings = function GeneralSettings() {
                 />
               </div>
             </SegmentPart>
-                        <Divider margin="1rem"/>
+            <Divider margin="1rem" />
 
-                        <SegmentPart
+            <SegmentPart name="Analytics" helpText="Insights into the usage of Fredy." Icon={IconLineChartStroked}>
-                            name="Analytics"
-                            helpText="Insights into the usage of Fredy."
-                            Icon={IconLineChartStroked}
-                        >
               <Banner
                 fullMode={false}
                 type="info"
                 closeIcon={null}
-                                title={
+                title={<div style={{ fontWeight: 600, fontSize: '14px', lineHeight: '20px' }}>Explanation</div>}
-                                    <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                style={{ marginBottom: '1rem' }}
-                                        Explanation
-                                    </div>
-                                }
-                                style={{marginBottom: '1rem'}}
                 description={
                   <div>
-                                        Analytics are disabled by default. If you choose to enable them, we will begin tracking the following:<br/>
+                    Analytics are disabled by default. If you choose to enable them, we will begin tracking the
+                    following:
+                    <br />
                     <ul>
                       <li>Name of active provider (e.g. Immoscout)</li>
                       <li>Name of active adapter (e.g. Console)</li>
@@ -201,36 +202,27 @@ const GeneralSettings = function GeneralSettings() {
                       <li>node version</li>
                       <li>arch</li>
                     </ul>
-                                        The data is sent anonymously and helps me understand which providers or adapters are being used the most. In the end it helps me to improve fredy.
+                    The data is sent anonymously and helps me understand which providers or adapters are being used the
+                    most. In the end it helps me to improve fredy.
                   </div>
                 }
               />
 
-                            <Checkbox
+              <Checkbox checked={analyticsEnabled} onChange={(e) => setAnalyticsEnabled(e.target.checked)}>
-                                checked={analyticsEnabled}
+                {' '}
-                                onChange={(e) => setAnalyticsEnabled(e.target.checked)}
+                Enabled
-                            > Enabled
               </Checkbox>
-
             </SegmentPart>
 
-                        <Divider margin="1rem"/>
+            <Divider margin="1rem" />
 
-                        <SegmentPart
+            <SegmentPart name="Demo Mode" helpText="If enabled, Fredy runs in demo mode." Icon={IconSearch}>
-                            name="Demo Mode"
-                            helpText="If enabled, Fredy runs in demo mode."
-                            Icon={IconSearch}
-                        >
               <Banner
                 fullMode={false}
                 type="info"
                 closeIcon={null}
-                                title={
+                title={<div style={{ fontWeight: 600, fontSize: '14px', lineHeight: '20px' }}>Explanation</div>}
-                                    <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                style={{ marginBottom: '1rem' }}
-                                        Explanation
-                                    </div>
-                                }
-                                style={{marginBottom: '1rem'}}
                 description={
                   <div>
                     In demo mode, Fredy will not (really) search for any real estates. Fredy is in a lockdown mode. Also
@@ -239,16 +231,14 @@ const GeneralSettings = function GeneralSettings() {
                 }
               />
 
-                            <Checkbox
+              <Checkbox checked={demoMode} onChange={(e) => setDemoMode(e.target.checked)}>
-                                checked={demoMode}
+                {' '}
-                                onChange={(e) => setDemoMode(e.target.checked)}
+                Enabled
-                            > Enabled
               </Checkbox>
-
             </SegmentPart>
 
-                        <Divider margin="1rem"/>
+            <Divider margin="1rem" />
-                        <Button type="primary" theme="solid" onClick={onStore} icon={<IconSave/>}>
+            <Button type="primary" theme="solid" onClick={onStore} icon={<IconSave />}>
               Save
             </Button>
           </div>

ui/src/views/jobs/ProcessingTimes.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import {format} from '../../services/time/timeService';
+import { format } from '../../services/time/timeService';
-import {Banner, Descriptions} from '@douyinfe/semi-ui';
+import { Descriptions } from '@douyinfe/semi-ui';
 
-export default function ProcessingTimes({processingTimes = {}}) {
+export default function ProcessingTimes({ processingTimes = {} }) {
   if (Object.keys(processingTimes).length === 0) {
     return null;
   }

ui/src/views/jobs/mutation/JobMutation.jsx

@@ -94,7 +94,7 @@ export default function JobMutator() {
       <form>
         <SegmentPart name="Name">
           <Input
-            autofocus
+            autoFocus
             type="text"
             maxLength={40}
             placeholder="Name"
@@ -124,8 +124,8 @@ export default function JobMutator() {
 
           <ProviderTable
             providerData={providerData}
-            onRemove={(providerId) => {
+            onRemove={(providerUrl) => {
-              setProviderData(providerData.filter((provider) => provider.id !== providerId));
+              setProviderData(providerData.filter((provider) => provider.url !== providerUrl));
             }}
           />
         </SegmentPart>

ui/src/views/jobs/mutation/components/notificationAdapter/NotificationAdapterMutator.jsx

@@ -27,7 +27,7 @@ const validate = (selectedAdapter) => {
     }
     if (uiElement.type === 'number') {
       const numberValue = parseFloat(uiElement.value);
-      if(isNaN(numberValue) || numberValue < 0) {
+      if (isNaN(numberValue) || numberValue < 0) {
         results.push('A number field cannot contain anything else and must be > 0.');
         continue;
       }
@@ -83,7 +83,7 @@ export default function NotificationAdapterMutator({
           id: selectedAdapter.id,
           name: selectedAdapter.name,
           fields: selectedAdapter.fields || {},
-        })
+        }),
       );
 
       setSelectedAdapter(null);
@@ -114,7 +114,7 @@ export default function NotificationAdapterMutator({
         setSuccessMessage('It seems like it worked! Please check your service.');
       })
       .catch((error) =>
-        setValidationMessage(`This did not work :-( I've received the following error: ${error.json.message}`)
+        setValidationMessage(`This did not work :-( I've received the following error: ${error.json.message}`),
       );
   };
 
@@ -229,7 +229,7 @@ export default function NotificationAdapterMutator({
           .filter((option) =>
             editNotificationAdapter != null
               ? true
-              : selected.find((selectedOption) => selectedOption.id === option.key) == null
+              : selected.find((selectedOption) => selectedOption.id === option.key) == null,
           )
           .sort(sortAdapter)}
         onChange={(value) => {

ui/src/views/jobs/mutation/components/provider/ProviderMutator.jsx

@@ -45,7 +45,7 @@ export default function ProviderMutator({ onVisibilityChanged, visible = false,
             url: providerUrl,
             id: selectedProvider.id,
             name: selectedProvider.name,
-          })
+          }),
         );
         setProviderUrl(null);
         setSelectedProvider(null);
@@ -101,7 +101,7 @@ export default function ProviderMutator({ onVisibilityChanged, visible = false,
         description={
           <div>
             <p>
-              Currently, our Immoscout implementation does not drawing shapes on a map. Use a radius instead.
+              Currently, our Immoscout implementation does not support drawing shapes on a map. Use a radius instead.
             </p>
           </div>
         }

ui/src/views/login/Login.jsx

@@ -1,14 +1,14 @@
-import React, {useEffect} from 'react';
+import React, { useEffect } from 'react';
 
 import cityBackground from '../../assets/city_background.jpg';
 import Logo from '../../components/logo/Logo';
-import {xhrPost} from '../../services/xhr';
+import { xhrPost } from '../../services/xhr';
-import {useHistory} from 'react-router';
+import { useHistory } from 'react-router';
-import {useDispatch, useSelector} from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
-import {Input, Button, Banner} from '@douyinfe/semi-ui';
+import { Input, Button, Banner } from '@douyinfe/semi-ui';
 
 import './login.less';
-import {IconUser, IconLock} from '@douyinfe/semi-icons';
+import { IconUser, IconLock } from '@douyinfe/semi-icons';
 
 export default function Login() {
   const dispatch = useDispatch();
@@ -47,18 +47,18 @@ export default function Login() {
 
   return (
     <div className="login">
-            <div className="login__bgImage" style={{background: `url("${cityBackground}")`}}/>
+      <div className="login__bgImage" style={{ background: `url("${cityBackground}")` }} />
-            <Logo/>
+      <Logo />
       <form>
         <div className="login__loginWrapper">
-                    {error && <Banner type="danger" closeIcon={null} description={error}/>}
+          {error && <Banner type="danger" closeIcon={null} description={error} />}
           <Input
             size="large"
-                        prefix={<IconUser/>}
+            prefix={<IconUser />}
             placeholder="Username"
             value={username}
             showClear
-                        style={{marginTop: error ? '1rem' : '4rem'}}
+            style={{ marginTop: error ? '1rem' : '4rem' }}
             autoFocus
             onChange={(value) => setUserName(value)}
             onKeyPress={async (e) => {
@@ -71,10 +71,10 @@ export default function Login() {
           <Input
             size="large"
             mode="password"
-                        prefix={<IconLock/>}
+            prefix={<IconLock />}
             value={password}
             placeholder="Password"
-                        style={{marginTop: '2rem'}}
+            style={{ marginTop: '2rem' }}
             onChange={(value) => setPassword(value)}
             onKeyPress={async (e) => {
               if (e.key === 'Enter') {
@@ -83,16 +83,19 @@ export default function Login() {
             }}
           />
 
-                    <Button type="primary" onClick={tryLogin} theme="solid" style={{marginTop: '3rem'}}>
+          <Button type="primary" onClick={tryLogin} theme="solid" style={{ marginTop: '3rem' }}>
             Login
           </Button>
-                    <br/>
+          <br />
-                    {demoMode && <Banner fullMode={true}
+          {demoMode && (
+            <Banner
+              fullMode={true}
               type="info"
               bordered
               closeIcon={null}
               description="This is the demo version of Fredy. Use 'demo' as both the username and password to log in."
-                    />}
+            />
+          )}
         </div>
       </form>
     </div>

vite.config.js

@@ -6,6 +6,7 @@ export default defineConfig({
   build: {
     chunkSizeWarningLimit: 9999999,
     outDir: './ui/public',
+    emptyOutDir: true,
   },
   plugins: [react()],
   server: {