Revert "add graphql-client and -endpoint for publicInfo of community"

This reverts commit 8c5086e5cdb345216cf8fe6772bb5f14f67f79f4.

backend/src/federation/client/1_0/FederationClient.ts

@@ -0,0 +1,44 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { gql } from 'graphql-request'
+
+import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+export async function requestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
+  let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
+  endpoint = `${endpoint}${dbCom.apiVersion}/`
+  logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)
+
+  const graphQLClient = GraphQLGetClient.getInstance(endpoint)
+  logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
+  const query = gql`
+    query {
+      getPublicKey {
+        publicKey
+      }
+    }
+  `
+  const variables = {}
+
+  try {
+    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
+      query,
+      variables,
+    )
+    logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
+    if (data) {
+      logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
+      logger.info(`requestGetPublicKey processed successfully`)
+      return data.getPublicKey.publicKey
+    }
+    logger.warn(`requestGetPublicKey processed without response data`)
+  } catch (err) {
+    throw new LogError(`Request-Error:`, err)
+  }
+}

backend/src/federation/client/1_0/FederationClientImpl.ts

@@ -1,83 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
-import { gql } from 'graphql-request'
-
-import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import { LogError } from '@/server/LogError'
-import { backendLogger as logger } from '@/server/logger'
-
-// eslint-disable-next-line import/no-relative-parent-imports
-import { FederationClient, PublicInfo } from '../FederationClient'
-
-export class FederationClientImpl implements FederationClient {
-  public async requestGetPublicKey(dbCom: DbFederatedCommunity): Promise<string | undefined> {
-    let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
-    endpoint = `${endpoint}${dbCom.apiVersion}/`
-    logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)
-
-    const graphQLClient = GraphQLGetClient.getInstance(endpoint)
-    logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
-    const query = gql`
-      query {
-        getPublicKey {
-          publicKey
-        }
-      }
-    `
-    const variables = {}
-
-    try {
-      const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
-        query,
-        variables,
-      )
-      logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
-      if (data) {
-        logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
-        logger.info(`requestGetPublicKey processed successfully`)
-        return data.getPublicKey.publicKey
-      }
-      logger.warn(`requestGetPublicKey processed without response data`)
-    } catch (err) {
-      throw new LogError(`Request-Error:`, err)
-    }
-  }
-
-  public async requestGetPublicInfo(dbCom: DbFederatedCommunity): Promise<PublicInfo | undefined> {
-    let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
-    endpoint = `${endpoint}${dbCom.apiVersion}/`
-    logger.info(`requestGetPublicInfo with endpoint='${endpoint}'...`)
-
-    const graphQLClient = GraphQLGetClient.getInstance(endpoint)
-    logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
-    const query = gql`
-      query {
-        getPublicInfo {
-          name
-          description
-          createdAt
-          publicKey
-        }
-      }
-    `
-    const variables = {}
-
-    try {
-      const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
-        query,
-        variables,
-      )
-      logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
-      if (data) {
-        logger.debug(`Response-PublicInfo:`, data.getPublicInfo.publicInfo)
-        logger.info(`requestGetPublicInfo processed successfully`)
-        return data.getPublicInfo.publicInfo
-      }
-      logger.warn(`requestGetPublicInfo processed without response data`)
-    } catch (err) {
-      throw new LogError(`Request-Error:`, err)
-    }
-  }
-}

backend/src/federation/client/1_1/FederationClient.ts

@@ -0,0 +1,44 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { gql } from 'graphql-request'
+
+import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+export async function requestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
+  let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
+  endpoint = `${endpoint}${dbCom.apiVersion}/`
+  logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)
+
+  const graphQLClient = GraphQLGetClient.getInstance(endpoint)
+  logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
+  const query = gql`
+    query {
+      getPublicKey {
+        publicKey
+      }
+    }
+  `
+  const variables = {}
+
+  try {
+    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
+      query,
+      variables,
+    )
+    logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
+    if (data) {
+      logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
+      logger.info(`requestGetPublicKey processed successfully`)
+      return data.getPublicKey.publicKey
+    }
+    logger.warn(`requestGetPublicKey processed without response data`)
+  } catch (err) {
+    throw new LogError(`Request-Error:`, err)
+  }
+}

backend/src/federation/client/1_1/FederationClientImpl.ts

@@ -1,83 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
-import { gql } from 'graphql-request'
-
-import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import { LogError } from '@/server/LogError'
-import { backendLogger as logger } from '@/server/logger'
-
-// eslint-disable-next-line import/no-relative-parent-imports
-import { FederationClient, PublicInfo } from '../FederationClient'
-
-export class FederationClientImpl implements FederationClient {
-  async requestGetPublicKey(dbCom: DbFederatedCommunity): Promise<string | undefined> {
-    let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
-    endpoint = `${endpoint}${dbCom.apiVersion}/`
-    logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)
-
-    const graphQLClient = GraphQLGetClient.getInstance(endpoint)
-    logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
-    const query = gql`
-      query {
-        getPublicKey {
-          publicKey
-        }
-      }
-    `
-    const variables = {}
-
-    try {
-      const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
-        query,
-        variables,
-      )
-      logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
-      if (data) {
-        logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
-        logger.info(`requestGetPublicKey processed successfully`)
-        return data.getPublicKey.publicKey
-      }
-      logger.warn(`requestGetPublicKey processed without response data`)
-    } catch (err) {
-      throw new LogError(`Request-Error:`, err)
-    }
-  }
-
-  async requestGetPublicInfo(dbCom: DbFederatedCommunity): Promise<PublicInfo | undefined> {
-    let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
-    endpoint = `${endpoint}${dbCom.apiVersion}/`
-    logger.info(`requestGetPublicInfo with endpoint='${endpoint}'...`)
-
-    const graphQLClient = GraphQLGetClient.getInstance(endpoint)
-    logger.debug(`graphQLClient=${JSON.stringify(graphQLClient)}`)
-    const query = gql`
-      query {
-        getPublicInfo {
-          name
-          description
-          createdAt
-          publicKey
-        }
-      }
-    `
-    const variables = {}
-
-    try {
-      const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
-        query,
-        variables,
-      )
-      logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
-      if (data) {
-        logger.debug(`Response-PublicInfo:`, data.getPublicInfo.publicInfo)
-        logger.info(`requestGetPublicInfo processed successfully`)
-        return data.getPublicInfo.publicInfo
-      }
-      logger.warn(`requestGetPublicInfo processed without response data`)
-    } catch (err) {
-      throw new LogError(`Request-Error:`, err)
-    }
-  }
-}

backend/src/federation/client/FederationClient.ts

@@ -1,13 +0,0 @@
-import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
-
-export type PublicInfo = {
-  name: string
-  description: string
-  createdAt: Date
-  publicKey: string
-}
-
-export interface FederationClient {
-  requestGetPublicKey(dbCom: DbFederatedCommunity): Promise<string | undefined>
-  requestGetPublicInfo(dbCom: DbFederatedCommunity): Promise<PublicInfo | undefined>
-}

backend/src/federation/validateCommunities.ts

@@ -1,17 +1,15 @@
-/** eslint-disable @typescript-eslint/no-unsafe-assignment */
 /** eslint-disable @typescript-eslint/no-unsafe-call */
+/** eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { IsNull } from '@dbTools/typeorm'
-import { Community as DbCommunity } from '@entity/Community'
 import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line camelcase
-import { FederationClientImpl as V1_0_FederationClientImpl } from './client/1_0/FederationClientImpl'
+import { requestGetPublicKey as v1_0_requestGetPublicKey } from './client/1_0/FederationClient'
 // eslint-disable-next-line camelcase
-import { FederationClientImpl as V1_1_FederationClientImpl } from './client/1_1/FederationClientImpl'
-import { FederationClient, PublicInfo } from './client/FederationClient'
+import { requestGetPublicKey as v1_1_requestGetPublicKey } from './client/1_1/FederationClient'
 import { ApiVersionType } from './enum/apiVersionType'
 
 export function startValidateCommunities(timerInterval: number): void {
@@ -43,10 +41,7 @@ export async function validateCommunities(): Promise<void> {
         `Federation: validate publicKey for dbCom: ${dbCom.id} with apiVersion=${dbCom.apiVersion}`,
       )
       try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        const pubKey = await getVersionedFederationClient(dbCom.apiVersion).requestGetPublicKey(
-          dbCom,
-        )
+        const pubKey = await invokeVersionedRequestGetPublicKey(dbCom)
         logger.info(
           'Federation: received publicKey from endpoint',
           pubKey,
@@ -56,17 +51,6 @@ export async function validateCommunities(): Promise<void> {
           logger.info(`Federation: matching publicKey:  ${pubKey}`)
           await DbFederatedCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() })
           logger.debug(`Federation: updated dbCom:  ${JSON.stringify(dbCom)}`)
-
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          const pubInfo = await getVersionedFederationClient(dbCom.apiVersion).requestGetPublicInfo(
-            dbCom,
-          )
-          logger.debug(`Federation: getPublicInfo pubInfo:  ${JSON.stringify(pubInfo)}`)
-          if (pubInfo) {
-            logger.info(`Federation: write foreign community...`)
-            await writeForeignCommunity(dbCom, pubInfo)
-            logger.info(`Federation: write foreign community... successfully`)
-          }
         } else {
           logger.warn(
             `Federation: received not matching publicKey -> received: ${
@@ -89,36 +73,19 @@ export async function validateCommunities(): Promise<void> {
   }
 }
 
-async function writeForeignCommunity(
-  dbCom: DbFederatedCommunity,
-  pubInfo: PublicInfo,
-): Promise<void> {
-  if (dbCom && pubInfo) {
-    const foreignCom = DbCommunity.create()
-    foreignCom.foreign = true
-    foreignCom.publicKey = dbCom.publicKey
-    foreignCom.url = dbCom.endPoint
-    foreignCom.name = pubInfo.name
-    foreignCom.description = pubInfo.description
-    foreignCom.creationDate = pubInfo.createdAt
-    await DbCommunity.save(foreignCom)
-  }
-}
-
 function isLogError(err: unknown) {
   return err instanceof LogError
 }
 
-function getVersionedFederationClient(apiVersion: string): FederationClient {
-  switch (apiVersion) {
+async function invokeVersionedRequestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
+  switch (dbCom.apiVersion) {
     case ApiVersionType.V1_0:
-      // eslint-disable-next-line camelcase
-      return new V1_0_FederationClientImpl()
+      return v1_0_requestGetPublicKey(dbCom)
     case ApiVersionType.V1_1:
-      // eslint-disable-next-line camelcase
-      return new V1_1_FederationClientImpl()
+      return v1_1_requestGetPublicKey(dbCom)
     default:
-      // eslint-disable-next-line camelcase
-      return new V1_0_FederationClientImpl()
+      return undefined
   }
 }

federation/src/graphql/api/1_0/model/GetPublicInfoResult.ts

@@ -1,26 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Community as DbCommunity } from '@entity/Community'
-import { Field, ObjectType } from 'type-graphql'
-
-@ObjectType()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class GetPublicInfoResult {
-  constructor(dbCom: DbCommunity) {
-    this.publicKey = dbCom.publicKey.toString('hex')
-    this.name = dbCom.name
-    this.description = dbCom.description
-    this.createdAt = dbCom.creationDate
-  }
-
-  @Field(() => String)
-  name: string | null
-
-  @Field(() => String)
-  description: string | null
-
-  @Field(() => Date)
-  createdAt: Date | null
-
-  @Field(() => String)
-  publicKey: string
-}

federation/src/graphql/api/1_0/resolver/PublicInfoResolver.ts

@@ -1,18 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Query, Resolver } from 'type-graphql'
-import { federationLogger as logger } from '@/server/logger'
-import { Community as DbCommunity } from '@entity/Community'
-import { GetPublicInfoResult } from '../model/GetPublicInfoResult'
-
-@Resolver()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class PublicInfoResolver {
-  @Query(() => GetPublicInfoResult)
-  async getPublicInfo(): Promise<GetPublicInfoResult> {
-    logger.debug(`getPublicInfo() via apiVersion=1_0 ...`)
-    const homeCom = await DbCommunity.findOneOrFail({ foreign: false })
-    const result = new GetPublicInfoResult(homeCom)
-    logger.info(`getPublicInfo()-1_0... return publicInfo=${result}`)
-    return result
-  }
-}