Rename rest library to clash-client

apps/service-auth/src/auth.module.ts

@@ -1,6 +1,5 @@
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { JwtModule } from '@nestjs/jwt';
@@ -13,7 +12,6 @@ import { JwtStrategy } from './strategies';
  ConfigModule.forRoot({ isGlobal: true }),
  MongoDbModule,
  RedisModule,
- RestModule,
  JwtModule.registerAsync({
  useFactory: (configService: ConfigService) => ({
  secret: configService.getOrThrow('JWT_SECRET'),

apps/service-auth/src/auth.service.ts

@@ -2,7 +2,6 @@ import { JwtUser } from '@app/auth';
 import { Tokens } from '@app/constants';
 import { MongoDbService } from '@app/mongodb';
 import { RedisClient, RedisService } from '@app/redis';
-import RestHandler from '@app/rest/rest.module';
 import { Inject, Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Db } from 'mongodb';
@@ -13,7 +12,6 @@ export class AuthService {
  constructor(
  @Inject(Tokens.MONGODB) private readonly db: Db,
  @Inject(Tokens.REDIS) private readonly redis: RedisClient,
- @Inject(Tokens.REST) private readonly restHandler: RestHandler,
  private readonly redisService: RedisService,
  private readonly mongoDbService: MongoDbService,
  private readonly jwtService: JwtService,

apps/service-capital/src/service-capital.module.ts

@@ -1,13 +1,18 @@
+import { ClashClientModule } from '@app/clash-client';
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ServiceCapitalController } from './service-capital.controller';
 import { CapitalService } from './service-capital.service';
 
 @Module({
- imports: [ConfigModule.forRoot({ isGlobal: true }), MongoDbModule, RedisModule, RestModule],
+ imports: [
+ ConfigModule.forRoot({ isGlobal: true }),
+ MongoDbModule,
+ RedisModule,
+ ClashClientModule,
+ ],
  controllers: [ServiceCapitalController],
  providers: [CapitalService],
 })

apps/service-capital/src/service-capital.service.ts

@@ -1,3 +1,4 @@
+import { ClashClient, ClashClientService } from '@app/clash-client';
 import { Collections, RedisKeyPrefixes, Tokens } from '@app/constants';
 import {
  CapitalRaidRemindersEntity,
@@ -13,8 +14,6 @@ import {
  RedisService,
  getRedisKey,
 } from '@app/redis';
-import { RestService } from '@app/rest';
-import RestHandler from '@app/rest/rest.module';
 import { Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import {
@@ -32,11 +31,10 @@ export class CapitalService {
  private configService: ConfigService,
  @Inject(Tokens.MONGODB) private db: Db,
  @Inject(Tokens.REDIS) private redis: RedisClient,
- @Inject(Tokens.REST) private restHandler: RestHandler,
- private restService: RestService,
  private redisService: RedisService,
  private mongoDbService: MongoDbService,
-
+ private clashClientService: ClashClientService,
+ @Inject(Tokens.CLASH_CLIENT) private clashClient: ClashClient,
  @Inject(Collections.CAPITAL_RAID_SEASONS)
  private raidSeasonsCollection: Collection<CapitalRaidSeasonsEntity>,
  @Inject(Collections.RAID_REMINDERS)
@@ -78,10 +76,10 @@ export class CapitalService {
  }
 
  private async fetchCapitalRaidWeekend(clanTag: string) {
- const clan = await this.restService.getClan(clanTag);
+ const clan = await this.clashClientService.getClan(clanTag);
  if (!clan) return null;
 
- const { body, res } = await this.restHandler.getCapitalRaidSeasons(clanTag, { limit: 1 });
+ const { body, res } = await this.clashClient.getCapitalRaidSeasons(clanTag, { limit: 1 });
  if (!res.ok || !body.items.length) return null;
 
  const season = body.items.at(0)!;

apps/service-clans/src/service-clans.module.ts

@@ -1,13 +1,18 @@
+import { ClashClientModule } from '@app/clash-client';
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ServiceClansController } from './service-clans.controller';
 import { ClansService } from './service-clans.service';
 
 @Module({
- imports: [ConfigModule.forRoot({ isGlobal: true }), MongoDbModule, RedisModule, RestModule],
+ imports: [
+ ConfigModule.forRoot({ isGlobal: true }),
+ MongoDbModule,
+ RedisModule,
+ ClashClientModule,
+ ],
  controllers: [ServiceClansController],
  providers: [ClansService],
 })

apps/service-clans/src/service-clans.service.ts

@@ -1,8 +1,8 @@
+import { ClashClient } from '@app/clash-client';
 import { Collections, Tokens } from '@app/constants';
 import { PlayersEntity } from '@app/entities';
 import { MongoDbService, TrackedClanList } from '@app/mongodb';
 import { RedisClient, RedisService } from '@app/redis';
-import RestHandler from '@app/rest/rest.module';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { Collection, Db } from 'mongodb';
@@ -13,10 +13,9 @@ export class ClansService {
  private configService: ConfigService,
  @Inject(Tokens.MONGODB) private db: Db,
  @Inject(Tokens.REDIS) private redis: RedisClient,
- @Inject(Tokens.REST) private restHandler: RestHandler,
+ @Inject(Tokens.CLASH_CLIENT) private clashClient: ClashClient,
  private redisService: RedisService,
  private mongoDbService: MongoDbService,
-
  @Inject(Collections.PLAYERS)
  private lastSeenCollection: Collection<PlayersEntity>,
  ) {}

apps/service-players/src/service-players.module.ts

@@ -1,13 +1,18 @@
+import { ClashClientModule } from '@app/clash-client';
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ServicePlayersController } from './service-players.controller';
 import { PlayersService } from './service-players.service';
 
 @Module({
- imports: [ConfigModule.forRoot({ isGlobal: true }), MongoDbModule, RedisModule, RestModule],
+ imports: [
+ ConfigModule.forRoot({ isGlobal: true }),
+ MongoDbModule,
+ RedisModule,
+ ClashClientModule,
+ ],
  controllers: [ServicePlayersController],
  providers: [PlayersService],
 })

apps/service-players/src/service-players.service.ts

@@ -1,8 +1,8 @@
+import { ClashClient } from '@app/clash-client';
 import { Collections, Tokens } from '@app/constants';
 import { PlayersEntity } from '@app/entities';
 import { MongoDbService, TrackedClanList } from '@app/mongodb';
 import { RedisClient, RedisService } from '@app/redis';
-import RestHandler from '@app/rest/rest.module';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { Collection, Db } from 'mongodb';
@@ -13,7 +13,7 @@ export class PlayersService {
  private configService: ConfigService,
  @Inject(Tokens.MONGODB) private db: Db,
  @Inject(Tokens.REDIS) private redis: RedisClient,
- @Inject(Tokens.REST) private restHandler: RestHandler,
+ @Inject(Tokens.CLASH_CLIENT) private clashClient: ClashClient,
  private redisService: RedisService,
  private mongoDbService: MongoDbService,
 

apps/service-ranking/src/service-ranking.module.ts

@@ -1,13 +1,18 @@
+import { ClashClientModule } from '@app/clash-client';
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ServiceRankingController } from './service-ranking.controller';
 import { RankingService } from './service-ranking.service';
 
 @Module({
- imports: [ConfigModule.forRoot({ isGlobal: true }), MongoDbModule, RedisModule, RestModule],
+ imports: [
+ ConfigModule.forRoot({ isGlobal: true }),
+ MongoDbModule,
+ RedisModule,
+ ClashClientModule,
+ ],
  controllers: [ServiceRankingController],
  providers: [RankingService],
 })

apps/service-ranking/src/service-ranking.service.ts

@@ -1,8 +1,8 @@
+import { ClashClient } from '@app/clash-client';
 import { Collections, Tokens } from '@app/constants';
 import { PlayersEntity } from '@app/entities';
 import { MongoDbService, TrackedClanList } from '@app/mongodb';
 import { RedisClient, RedisService } from '@app/redis';
-import RestHandler from '@app/rest/rest.module';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { Collection, Db } from 'mongodb';
@@ -13,7 +13,7 @@ export class RankingService {
  private configService: ConfigService,
  @Inject(Tokens.MONGODB) private db: Db,
  @Inject(Tokens.REDIS) private redis: RedisClient,
- @Inject(Tokens.REST) private restHandler: RestHandler,
+ @Inject(Tokens.CLASH_CLIENT) private clashClient: ClashClient,
  private redisService: RedisService,
  private mongoDbService: MongoDbService,
 

apps/service-wars/src/service-wars.module.ts

@@ -1,14 +1,19 @@
 import { MongoDbModule } from '@app/mongodb';
 import { RedisModule } from '@app/redis';
 import * as repositories from '@app/repositories';
-import { RestModule } from '@app/rest';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ServiceWarsController } from './service-wars.controller';
 import { WarsService } from './service-wars.service';
+import { ClashClientModule } from '@app/clash-client';
 
 @Module({
- imports: [ConfigModule.forRoot({ isGlobal: true }), MongoDbModule, RedisModule, RestModule],
+ imports: [
+ ConfigModule.forRoot({ isGlobal: true }),
+ MongoDbModule,
+ RedisModule,
+ ClashClientModule,
+ ],
  controllers: [ServiceWarsController],
  providers: [WarsService, ...Object.values(repositories)],
 })

libs/rest/src/rest.module.ts → libs/clash-client/src/clash-client.module.ts

@@ -9,7 +9,7 @@ import {
  RequestOptions,
  Result,
 } from 'clashofclans.js';
-import { RestService } from './rest.service';
+import { ClashClientService } from './clash-client.service';
 
 class ReqHandler extends RequestHandler {
  private readonly logger = new Logger('ClashApiRest');
@@ -28,7 +28,7 @@ class ReqHandler extends RequestHandler {
  }
 }
 
-export default class RestHandler extends RESTManager {
+export class ClashClient extends RESTManager {
  public constructor({
  rateLimit,
  baseURL,
@@ -53,10 +53,10 @@ export default class RestHandler extends RESTManager {
  }
 }
 
-const RestProvider: Provider = {
- provide: Tokens.REST,
- useFactory: (configService: ConfigService): RestHandler => {
- return new RestHandler({
+const ClashClientProvider: Provider = {
+ provide: Tokens.CLASH_CLIENT,
+ useFactory: (configService: ConfigService): ClashClient => {
+ return new ClashClient({
  rateLimit: 0,
  baseURL: configService.getOrThrow('CLASH_API_BASE_URL'),
  keys: configService.getOrThrow<string>('CLASH_API_TOKENS').split(','),
@@ -67,7 +67,7 @@ const RestProvider: Provider = {
 
 @Module({
  imports: [RedisModule],
- providers: [RestService, RestProvider],
- exports: [RestService, RestProvider],
+ providers: [ClashClientService, ClashClientProvider],
+ exports: [ClashClientService, ClashClientProvider],
 })
-export class RestModule {}
+export class ClashClientModule {}

libs/rest/src/rest.service.ts → libs/clash-client/src/clash-client.service.ts

@@ -1,20 +1,20 @@
 import { Tokens } from '@app/constants';
 import { RedisService } from '@app/redis';
 import { Inject, Injectable } from '@nestjs/common';
-import RestHandler from './rest.module';
+import { ClashClient } from './clash-client.module';
 
 @Injectable()
-export class RestService {
+export class ClashClientService {
  constructor(
- @Inject(Tokens.REST) private readonly restHandler: RestHandler,
+ @Inject(Tokens.CLASH_CLIENT) private readonly clashClient: ClashClient,
  private redisService: RedisService,
  ) {}
 
  async getClan(clanTag: string) {
  const cached = await this.redisService.getClan(clanTag);
  if (cached) return cached;
 
- const { body, res } = await this.restHandler.getClan(clanTag);
+ const { body, res } = await this.clashClient.getClan(clanTag);
  if (!res.ok) return null;
 
  return body;

libs/clash-client/src/index.ts

@@ -0,0 +1,2 @@
+export * from './clash-client.module';
+export * from './clash-client.service';

libs/rest/tsconfig.lib.json → libs/clash-client/tsconfig.lib.json

@@ -2,7 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
  "declaration": true,
- "outDir": "../../dist/libs/rest"
+ "outDir": "../../dist/libs/clash-client"
  },
  "include": ["src/**/*"],
  "exclude": ["node_modules", "dist", "test", "**/*spec.ts"]

libs/constants/src/constants.values.ts

@@ -4,7 +4,7 @@ export enum Tokens {
  REDIS_PUB = 'REDIS_PUB',
  REDIS_SUB = 'REDIS_SUB',
  ELASTIC = 'ELASTIC',
- REST = 'REST',
+ CLASH_CLIENT = 'CLASH_CLIENT',
 }
 
 export enum TokenType {