Release 1.300.0 (#2232)

* Migrate requests from bent to got

* Update changelog

CHANGELOG.md

@@ -5,7 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.299.0 - 2023-08-09
+## 1.300.0 - 2023-08-11
+
+### Added
+
+- Added more durations in the coupon system
+
+### Changed
+
+- Migrated the remaining requests from `bent` to `got`
+
+## 1.299.1 - 2023-08-10
 
 ### Changed
 

apps/api/src/app/info/info.service.ts

@@ -30,9 +30,9 @@ import { permissions } from '@ghostfolio/common/permissions';
 import { SubscriptionOffer } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import * as bent from 'bent';
 import * as cheerio from 'cheerio';
 import { format, subDays } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class InfoService {
@@ -172,17 +172,13 @@ export class InfoService {
 
   private async countDockerHubPulls(): Promise<number> {
     try {
-      const get = bent(
+      const { pull_count } = await got(
         `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
         {
-          'User-Agent': 'request'
+          headers: { 'User-Agent': 'request' }
         }
-      );
+      ).json<any>();
 
-      const { pull_count } = await get();
       return pull_count;
     } catch (error) {
       Logger.error(error, 'InfoService');
@@ -193,16 +189,9 @@ export class InfoService {
 
   private async countGitHubContributors(): Promise<number> {
     try {
-      const get = bent(
-        'https://github.com/ghostfolio/ghostfolio',
-        'GET',
-        'string',
-        200,
-        {}
-      );
+      const { body } = await got('https://github.com/ghostfolio/ghostfolio');
 
-      const html = await get();
-      const $ = cheerio.load(html);
+      const $ = cheerio.load(body);
 
       return extractNumberFromString(
         $(
@@ -218,17 +207,13 @@ export class InfoService {
 
   private async countGitHubStargazers(): Promise<number> {
     try {
-      const get = bent(
+      const { stargazers_count } = await got(
         `https://api.github.com/repos/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
         {
-          'User-Agent': 'request'
+          headers: { 'User-Agent': 'request' }
         }
-      );
+      ).json<any>();
 
-      const { stargazers_count } = await get();
       return stargazers_count;
     } catch (error) {
       Logger.error(error, 'InfoService');
@@ -346,22 +331,21 @@ export class InfoService {
           PROPERTY_BETTER_UPTIME_MONITOR_ID
         )) as string;
 
-        const get = bent(
+        const { data } = await got(
           `https://betteruptime.com/api/v2/monitors/${monitorId}/sla?from=${format(
             subDays(new Date(), 90),
             DATE_FORMAT
           )}&to${format(new Date(), DATE_FORMAT)}`,
-          'GET',
-          'json',
-          200,
-          {
-            Authorization: `Bearer ${this.configurationService.get(
-              'BETTER_UPTIME_API_KEY'
-            )}`
-          }
-        );
 
-        const { data } = await get();
+          {
+            headers: {
+              Authorization: `Bearer ${this.configurationService.get(
+                'BETTER_UPTIME_API_KEY'
+              )}`
+            }
+          }
+        ).json<any>();
+
         return data.attributes.availability / 100;
       } catch (error) {
         Logger.error(error, 'InfoService');

apps/api/src/app/logo/logo.service.ts

@@ -2,7 +2,7 @@ import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/sy
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import { HttpException, Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
-import * as bent from 'bent';
+import got from 'got';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 @Injectable()
@@ -41,15 +41,11 @@ export class LogoService {
   }
 
   private getBuffer(aUrl: string) {
-    const get = bent(
+    return got(
       `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
-      'GET',
-      'buffer',
-      200,
       {
-        'User-Agent': 'request'
+        headers: { 'User-Agent': 'request' }
       }
-    );
-    return get();
+    ).buffer();
   }
 }

apps/api/src/main.ts

@@ -40,6 +40,7 @@ async function bootstrap() {
       helmet({
         contentSecurityPolicy: {
           directives: {
+            connectSrc: ["'self'", 'https://js.stripe.com'], // Allow connections to Stripe
             frameSrc: ["'self'", 'https://js.stripe.com'], // Allow loading frames from Stripe
             scriptSrc: ["'self'", "'unsafe-inline'", 'https://js.stripe.com'], // Allow inline scripts and scripts from Stripe
             scriptSrcAttr: ["'self'", "'unsafe-inline'"], // Allow inline event handlers

apps/api/src/services/data-provider/coingecko/coingecko.service.ts

@@ -15,8 +15,8 @@ import {
   DataSource,
   SymbolProfile
 } from '@prisma/client';
-import bent from 'bent';
 import { format, fromUnixTime, getUnixTime } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class CoinGeckoService implements DataProviderInterface {
@@ -45,8 +45,7 @@ export class CoinGeckoService implements DataProviderInterface {
     };
 
     try {
-      const get = bent(`${this.URL}/coins/${aSymbol}`, 'GET', 'json', 200);
-      const { name } = await get();
+      const { name } = await got(`${this.URL}/coins/${aSymbol}`).json<any>();
 
       response.name = name;
     } catch (error) {
@@ -79,17 +78,13 @@ export class CoinGeckoService implements DataProviderInterface {
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
     try {
-      const get = bent(
+      const { prices } = await got(
         `${
           this.URL
         }/coins/${aSymbol}/market_chart/range?vs_currency=${this.baseCurrency.toLowerCase()}&from=${getUnixTime(
           from
-        )}&to=${getUnixTime(to)}`,
-        'GET',
-        'json',
-        200
-      );
-      const { prices } = await get();
+        )}&to=${getUnixTime(to)}`
+      ).json<any>();
 
       const result: {
         [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@@ -132,15 +127,11 @@ export class CoinGeckoService implements DataProviderInterface {
     }
 
     try {
-      const get = bent(
+      const response = await got(
         `${this.URL}/simple/price?ids=${aSymbols.join(
           ','
-        )}&vs_currencies=${this.baseCurrency.toLowerCase()}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        )}&vs_currencies=${this.baseCurrency.toLowerCase()}`
+      ).json<any>();
 
       for (const symbol in response) {
         if (Object.prototype.hasOwnProperty.call(response, symbol)) {
@@ -174,8 +165,9 @@ export class CoinGeckoService implements DataProviderInterface {
     let items: LookupItem[] = [];
 
     try {
-      const get = bent(`${this.URL}/search?query=${query}`, 'GET', 'json', 200);
-      const { coins } = await get();
+      const { coins } = await got(
+        `${this.URL}/search?query=${query}`
+      ).json<any>();
 
       items = coins.map(({ id: symbol, name }) => {
         return {

apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts

@@ -3,9 +3,7 @@ import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import bent from 'bent';
-
-const getJSON = bent('json');
+import got from 'got';
 
 @Injectable()
 export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
@@ -34,11 +32,13 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       return response;
     }
 
-    const profile = await getJSON(
+    const profile = await got(
       `${TrackinsightDataEnhancerService.baseUrl}/data-api/funds/${symbol}.json`
-    ).catch(() => {
-      return {};
-    });
+    )
+      .json<any>()
+      .catch(() => {
+        return {};
+      });
 
     const isin = profile.isin?.split(';')?.[0];
 
@@ -46,15 +46,17 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       response.isin = isin;
     }
 
-    const holdings = await getJSON(
+    const holdings = await got(
       `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol}.json`
-    ).catch(() => {
-      return getJSON(
-        `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
-          symbol.split('.')?.[0]
-        }.json`
-      );
-    });
+    )
+      .json<any>()
+      .catch(() => {
+        return got(
+          `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
+            symbol.split('.')?.[0]
+          }.json`
+        );
+      });
 
     if (holdings?.weight < 0.95) {
       // Skip if data is inaccurate

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -10,8 +10,8 @@ import { DataProviderInfo } from '@ghostfolio/common/interfaces';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import { format, isAfter, isBefore, isSameDay } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class FinancialModelingPrepService implements DataProviderInterface {
@@ -64,13 +64,9 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
     try {
-      const get = bent(
-        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const { historical } = await get();
+      const { historical } = await got(
+        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`
+      ).json<any>();
 
       const result: {
         [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@@ -115,13 +111,9 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     }
 
     try {
-      const get = bent(
-        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+      const response = await got(
+        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`
+      ).json<any>();
 
       for (const { price, symbol } of response) {
         results[symbol] = {
@@ -153,13 +145,9 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     let items: LookupItem[] = [];
 
     try {
-      const get = bent(
-        `${this.URL}/search?query=${query}&apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const result = await get();
+      const result = await got(
+        `${this.URL}/search?query=${query}&apikey=${this.apiKey}`
+      ).json<any>();
 
       items = result.map(({ currency, name, symbol }) => {
         return {

apps/api/src/services/data-provider/manual/manual.service.ts

@@ -14,10 +14,10 @@ import {
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import * as cheerio from 'cheerio';
 import { isUUID } from 'class-validator';
 import { addDays, format, isBefore } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class ManualService implements DataProviderInterface {
@@ -95,10 +95,9 @@ export class ManualService implements DataProviderInterface {
         return {};
       }
 
-      const get = bent(url, 'GET', 'string', 200, headers);
+      const { body } = await got(url, { headers });
 
-      const html = await get();
-      const $ = cheerio.load(html);
+      const $ = cheerio.load(body);
 
       const value = extractNumberFromString($(selector).text());
 

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -10,8 +10,8 @@ import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import { format } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class RapidApiService implements DataProviderInterface {
@@ -135,19 +135,17 @@ export class RapidApiService implements DataProviderInterface {
     oneYearAgo: { value: number; valueText: string };
   }> {
     try {
-      const get = bent(
+      const { fgi } = await got(
         `https://fear-and-greed-index.p.rapidapi.com/v1/fgi`,
-        'GET',
-        'json',
-        200,
         {
-          useQueryString: true,
-          'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
-          'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
+          headers: {
+            useQueryString: 'true',
+            'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
+            'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
+          }
         }
-      );
+      ).json<any>();
 
-      const { fgi } = await get();
       return fgi;
     } catch (error) {
       Logger.error(error, 'RapidApiService');

apps/client/src/app/components/admin-overview/admin-overview.html

@@ -169,6 +169,8 @@
                       <mat-option value="7 days">7 Days</mat-option>
                       <mat-option value="14 days">14 Days</mat-option>
                       <mat-option value="30 days">30 Days</mat-option>
+                      <mat-option value="90 days">90 Days</mat-option>
+                      <mat-option value="180 days">180 Days</mat-option>
                       <mat-option value="1 year">1 Year</mat-option>
                     </mat-select>
                   </mat-form-field>

apps/client/src/index.html

@@ -1,11 +1,14 @@
 <!DOCTYPE html>
-<html class="h-100 position-relative" lang="${languageCode}">
+<html class="h-100 position-relative" lang="en">
   <head>
-    <title>${title}</title>
+    <title>Ghostfolio – Open Source Wealth Management Software</title>
     <base href="/" />
     <meta charset="utf-8" />
     <meta content="yes" name="apple-mobile-web-app-capable" />
-    <meta content="${description}" name="description" />
+    <meta
+      content="Ghostfolio is a personal finance dashboard to keep track of your assets like stocks, ETFs or cryptocurrencies across multiple platforms."
+      name="description"
+    />
     <meta
       content="app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3"
       name="keywords"
@@ -16,20 +19,29 @@
       content="Ghostfolio is a personal finance dashboard to keep track of your assets like stocks, ETFs or cryptocurrencies"
       name="twitter:description"
     />
-    <meta content="${rootUrl}/${featureGraphicPath}" name="twitter:image" />
-    <meta content="${title}" name="twitter:title" />
+    <meta content="https://ghostfol.io/assets/cover.png" name="twitter:image" />
+    <meta
+      content="Ghostfolio – Open Source Wealth Management Software"
+      name="twitter:title"
+    />
     <meta
       content="initial-scale=1, viewport-fit=cover, width=device-width"
       name="viewport"
     />
     <meta content="#FFFFFF" name="theme-color" />
     <meta content="" property="og:description" />
-    <meta content="${title}" property="og:title" />
+    <meta
+      content="Ghostfolio – Open Source Wealth Management Software"
+      property="og:title"
+    />
     <meta content="website" property="og:type" />
-    <meta content="${rootUrl}${path}" property="og:url" />
-    <meta content="${rootUrl}/${featureGraphicPath}" property="og:image" />
-    <meta content="${currentDate}T00:00:00+00:00" property="og:updated_time" />
-    <meta content="${title}" property="og:site_name" />
+    <meta content="https://ghostfol.io" property="og:url" />
+    <meta content="https://ghostfol.io/assets/cover.png" property="og:image" />
+    <meta content="2023-08-10T00:00:00+00:00" property="og:updated_time" />
+    <meta
+      content="Ghostfolio – Open Source Wealth Management Software"
+      property="og:site_name"
+    />
 
     <link
       href="../assets/apple-touch-icon.png"

apps/client/src/index.template.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html class="h-100 position-relative" lang="${languageCode}">
+  <head>
+    <title>${title}</title>
+    <base href="/" />
+    <meta charset="utf-8" />
+    <meta content="yes" name="apple-mobile-web-app-capable" />
+    <meta content="${description}" name="description" />
+    <meta
+      content="app, asset, cryptocurrency, dashboard, etf, finance, management, performance, portfolio, software, stock, trading, wealth, web3"
+      name="keywords"
+    />
+    <meta content="yes" name="mobile-web-app-capable" />
+    <meta content="summary_large_image" name="twitter:card" />
+    <meta
+      content="Ghostfolio is a personal finance dashboard to keep track of your assets like stocks, ETFs or cryptocurrencies"
+      name="twitter:description"
+    />
+    <meta content="${rootUrl}/${featureGraphicPath}" name="twitter:image" />
+    <meta content="${title}" name="twitter:title" />
+    <meta
+      content="initial-scale=1, viewport-fit=cover, width=device-width"
+      name="viewport"
+    />
+    <meta content="#FFFFFF" name="theme-color" />
+    <meta content="" property="og:description" />
+    <meta content="${title}" property="og:title" />
+    <meta content="website" property="og:type" />
+    <meta content="${rootUrl}${path}" property="og:url" />
+    <meta content="${rootUrl}/${featureGraphicPath}" property="og:image" />
+    <meta content="${currentDate}T00:00:00+00:00" property="og:updated_time" />
+    <meta content="${title}" property="og:site_name" />
+
+    <link
+      href="../assets/apple-touch-icon.png"
+      rel="apple-touch-icon"
+      sizes="180x180"
+    />
+    <link
+      href="../assets/favicon-32x32.png"
+      rel="icon"
+      sizes="32x32"
+      type="image/png"
+    />
+    <link
+      href="../assets/favicon-16x16.png"
+      rel="icon"
+      sizes="16x16"
+      type="image/png"
+    />
+    <link href="../assets/site.webmanifest" rel="manifest" />
+  </head>
+  <body>
+    <gf-root></gf-root>
+
+    <script src="../ionicons/ionicons.esm.js" type="module"></script>
+    <script nomodule="" src="ionicons.js"></script>
+
+    <noscript
+      >Please enable JavaScript to continue using this application.</noscript
+    >
+  </body>
+</html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "1.299.0",
+  "version": "1.300.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "scripts": {
@@ -85,7 +85,6 @@
     "@simplewebauthn/server": "5.2.1",
     "@stripe/stripe-js": "1.47.0",
     "alphavantage": "2.2.0",
-    "bent": "7.3.12",
     "big.js": "6.2.1",
     "body-parser": "1.20.1",
     "bootstrap": "4.6.0",

yarn.lock

@@ -7339,15 +7339,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bent@7.3.12:
-  version "7.3.12"
-  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
-  integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
-  dependencies:
-    bytesish "^0.4.1"
-    caseless "~0.12.0"
-    is-stream "^2.0.0"
-
 better-opn@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
@@ -7646,11 +7637,6 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-bytesish@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
-  integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
-
 cacache@17.1.3, cacache@^17.0.0:
   version "17.1.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044"