Merge pull request #2789 from humanprotocol/develop

Release 20241114

Author: portuu3

.github/workflows/ci-test-dashboard-ui.yaml

@@ -8,7 +8,7 @@ on:
     paths:
       - 'packages/core/**'
       - 'packages/sdk/typescript/human-protocol-sdk/**'
-      - 'packages/apps/faucet-server/**'
+      - 'packages/apps/faucet/server/**'
   workflow_dispatch:
 
 jobs:
@@ -21,6 +21,6 @@ jobs:
         name: Install dependencies
       - run: cp .env.example .env
         name: Create .env file
-        working-directory: packages/apps/faucet-server
+        working-directory: packages/apps/faucet/server
       - run: yarn workspace @human-protocol/faucet-server test
-        name: Run faucet-server test
+        name: Run faucet/server test

.github/workflows/ci-test-faucet-server.yaml

@@ -7,7 +7,7 @@
   "license": "MIT",
   "scripts": {
     "test": "concurrently \"yarn workspace @human-protocol/core test\" \"yarn workspace @human-protocol/sdk test\" \"yarn workspace @human-protocol/subgraph test\" \"yarn workspace @human-protocol/dashboard-ui test\" \"yarn workspace @human-protocol/faucet-server test\" \"yarn workspace @human-protocol/job-launcher-server test\" \"yarn workspace @human-protocol/job-launcher-client test\" \"yarn workspace @human-protocol/human-app-frontend test\" \"yarn workspace @human-protocol/human-app-server test\" \"yarn workspace @human-protocol/reputation-oracle test\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server test\" \"yarn workspace @human-protocol/fortune-recording-oracle test\"",
-    "lint": "concurrently \"yarn workspace @human-protocol/core lint\" \"yarn workspace @human-protocol/sdk lint\" \"yarn workspace @human-protocol/subgraph lint\" \"yarn workspace @human-protocol/dashboard-ui lint\" \"yarn workspace @human-protocol/faucet-server lint\" \"yarn workspace @human-protocol/job-launcher-server lint\" \"yarn workspace @human-protocol/job-launcher-client lint\" \"yarn workspace @human-protocol/human-app-frontend lint\" \"yarn workspace @human-protocol/human-app-server lint\" \"yarn workspace @human-protocol/reputation-oracle lint\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server lint\" \"yarn workspace @human-protocol/fortune-recording-oracle lint\"",
+    "lint": "concurrently \"yarn workspace @human-protocol/core lint\" \"yarn workspace @human-protocol/sdk lint\" \"yarn workspace @human-protocol/subgraph lint\" \"yarn workspace @human-protocol/faucet-client lint\" \"yarn workspace @human-protocol/faucet-server lint\" \"yarn workspace @human-protocol/job-launcher-server lint\" \"yarn workspace @human-protocol/job-launcher-client lint\" \"yarn workspace @human-protocol/human-app-frontend lint\" \"yarn workspace @human-protocol/human-app-server lint\" \"yarn workspace @human-protocol/reputation-oracle lint\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server lint\" \"yarn workspace @human-protocol/fortune-recording-oracle lint\"",
     "prepare": "husky",
     "postinstall": "yarn workspace @human-protocol/sdk build"
   },

package.json

@@ -16,15 +16,17 @@
   },
   "dependencies": {
     "@human-protocol/sdk": "*",
-    "@nestjs/axios": "^3.0.2",
+    "@nestjs/axios": "^3.1.2",
     "@nestjs/cache-manager": "^2.2.2",
     "@nestjs/common": "^10.2.7",
     "@nestjs/config": "^3.2.3",
     "@nestjs/core": "^10.2.8",
     "@nestjs/mapped-types": "*",
     "@nestjs/platform-express": "^10.3.10",
-    "cache-manager-redis-store": "^3.0.1",
+    "cache-manager": "^5.4.0",
+    "cache-manager-redis-yet": "^5.1.5",
     "dayjs": "^1.11.12",
+    "lodash": "^4.17.21",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.2.0"
   },

packages/apps/dashboard/server/package.json

@@ -21,8 +21,12 @@ import { StatsModule } from './modules/stats/stats.module';
       validationSchema: Joi.object({
         HOST: Joi.string().required(),
         PORT: Joi.number().port().default(3000),
+        REDIS_HOST: Joi.string(),
+        REDIS_PORT: Joi.number(),
         SUBGRAPH_API_KEY: Joi.string().required(),
         HCAPTCHA_API_KEY: Joi.string().required(),
+        CACHE_HMT_PRICE_TTL: Joi.number(),
+        CACHE_HMT_GENERAL_STATS_TTL: Joi.number(),
       }),
     }),
     CacheModule.registerAsync(CacheFactoryConfig),

packages/apps/dashboard/server/src/app.module.ts

@@ -1,7 +1,15 @@
 import { CacheModuleAsyncOptions } from '@nestjs/common/cache';
 import { ConfigModule } from '@nestjs/config';
+import * as _ from 'lodash';
 import { RedisConfigService } from './redis-config.service';
-import { redisStore } from 'cache-manager-redis-store';
+import { redisStore } from 'cache-manager-redis-yet';
+import { Logger } from '@nestjs/common';
+
+const logger = new Logger('CacheFactoryRedisStore');
+
+const throttledRedisErrorLog = _.throttle((error) => {
+  logger.error('Redis client network error', error);
+}, 1000 * 5);
 
 export const CacheFactoryConfig: CacheModuleAsyncOptions = {
   isGlobal: true,
@@ -12,7 +20,11 @@ export const CacheFactoryConfig: CacheModuleAsyncOptions = {
         host: configService.redisHost,
         port: configService.redisPort,
       },
+      disableOfflineQueue: true,
     });
+
+    store.client.on('error', throttledRedisErrorLog);
+
     return {
       store: () => store,
     };

packages/apps/dashboard/server/src/common/config/cache-factory.config.ts

@@ -17,18 +17,22 @@ export class RedisConfigService {
     return this.configService.get<string>('REDIS_HOST', DEFAULT_REDIS_HOST);
   }
   get redisPort(): number {
-    return +this.configService.get<number>('REDIS_PORT', DEFAULT_REDIS_PORT);
+    return this.configService.get<number>('REDIS_PORT', DEFAULT_REDIS_PORT);
   }
   get cacheHmtPriceTTL(): number {
-    return +this.configService.get<number>(
-      'CACHE_HMT_PRICE_TTL',
-      DEFAULT_CACHE_HMT_PRICE_TTL,
+    return (
+      this.configService.get<number>(
+        'CACHE_HMT_PRICE_TTL',
+        DEFAULT_CACHE_HMT_PRICE_TTL,
+      ) * 1000
     );
   }
   get cacheHmtGeneralStatsTTL(): number {
-    return +this.configService.get<number>(
-      'CACHE_HMT_GENERAL_STATS_TTL',
-      DEFAULT_CACHE_HMT_GENERAL_STATS_TTL,
+    return (
+      this.configService.get<number>(
+        'CACHE_HMT_GENERAL_STATS_TTL',
+        DEFAULT_CACHE_HMT_GENERAL_STATS_TTL,
+      ) * 1000
     );
   }
   get hmtPriceCacheKey(): string {

packages/apps/dashboard/server/src/common/config/redis-config.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 import { lastValueFrom } from 'rxjs';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs';
 import { Cron } from '@nestjs/schedule';
 import { Cache, CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NETWORKS, StatisticsClient } from '@human-protocol/sdk';
@@ -322,7 +322,7 @@ export class StatsService implements OnModuleInit {
     await this.cacheManager.set(
       this.redisConfigService.hmtPriceCacheKey,
       hmtPrice,
-      { ttl: this.redisConfigService.cacheHmtPriceTTL } as any,
+      this.redisConfigService.cacheHmtPriceTTL,
     );
     return hmtPrice;
   }

packages/apps/dashboard/server/src/modules/stats/stats.service.ts

@@ -16,6 +16,7 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "noFallthroughCasesInSwitch": false,
+    "esModuleInterop": true
   }
 }

packages/apps/dashboard/server/tsconfig.json

@@ -3,6 +3,6 @@
 	"semi": true,
 	"singleQuote": true,
 	"tabWidth": 2,
-	"useTabs": true,
+	"useTabs": false,
 	"endOfLine": "lf"
 }