Merge branch 'master' into eslint-database-base

.github/workflows/lint_pr.yml

@@ -29,6 +29,7 @@ jobs:
             database
             release
             federation
+            dht
             workflow
             docker
             other

backend/.eslintrc.js

@@ -58,7 +58,7 @@ module.exports = {
     'import/no-dynamic-require': 'error',
     'import/no-internal-modules': 'off',
     'import/no-relative-packages': 'error',
-    'import/no-relative-parent-imports': ['error', { ignore: ['@/*'] }],
+    'import/no-relative-parent-imports': ['error', { ignore: ['@/*', 'random-bigint'] }],
     'import/no-self-import': 'error',
     'import/no-unresolved': 'error',
     'import/no-useless-path-segments': 'error',

backend/@types/random-bigint/index.d.ts

@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/ban-types */
+declare module 'random-bigint' {
+  function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt
+  export = random
+}

backend/src/graphql/resolver/UserResolver.ts

@@ -70,13 +70,13 @@ import { communityDbUser } from '@/util/communityUser'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { getTimeDurationObject, printTimeDuration } from '@/util/time'
 
+import random from 'random-bigint'
+
 import { FULL_CREATION_AVAILABLE } from './const/const'
 import { getUserCreations } from './util/creations'
 import { findUserByIdentifier } from './util/findUserByIdentifier'
 import { validateAlias } from './util/validateAlias'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
-const random = require('random-bigint')
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const sodium = require('sodium-native')
 

deployment/bare_metal/.env.dist

@@ -68,7 +68,7 @@ FEDERATION_COMMUNITY_API_PORT=5000
 
 FEDERATION_CONFIG_VERSION=v1.2023-01-09
 # comma separated list of api-versions, which cause starting several federation modules
-FEDERATION_COMMUNITY_APIS=1_0,1_1,2_0
+FEDERATION_COMMUNITY_APIS=1_0,1_1
 
 # database
 DATABASE_CONFIG_VERSION=v1.2022-03-18

dht-node/src/dht_node/index.ts

@@ -8,11 +8,6 @@ import { Community as DbCommunity } from '@entity/Community'
 import { v4 as uuidv4 } from 'uuid'
 
 const KEY_SECRET_SEEDBYTES = 32
-const getSeed = (): Buffer | null => {
-  return CONFIG.FEDERATION_DHT_SEED
-    ? Buffer.alloc(KEY_SECRET_SEEDBYTES, CONFIG.FEDERATION_DHT_SEED)
-    : null
-}
 
 const POLLTIME = 20000
 const SUCCESSTIME = 120000
@@ -32,7 +27,12 @@ type CommunityApi = {
 export const startDHT = async (topic: string): Promise<void> => {
   try {
     const TOPIC = DHT.hash(Buffer.from(topic))
-    const keyPair = DHT.keyPair(getSeed())
+    // uses a config defined seed or null, which will generate a random seed for the key pair
+    const keyPair = DHT.keyPair(
+      CONFIG.FEDERATION_DHT_SEED
+        ? Buffer.alloc(KEY_SECRET_SEEDBYTES, CONFIG.FEDERATION_DHT_SEED)
+        : null,
+    )
     const pubKeyString = keyPair.publicKey.toString('hex')
     logger.info(`keyPairDHT: publicKey=${pubKeyString}`)
     logger.debug(`keyPairDHT: secretKey=${keyPair.secretKey.toString('hex')}`)
@@ -215,14 +215,7 @@ async function writeFederatedHomeCommunityEntries(pubKey: string): Promise<Commu
 async function writeHomeCommunityEntry(pubKey: string): Promise<void> {
   try {
     // check for existing homeCommunity entry
-    let homeCom = await DbCommunity.findOne({
-      foreign: false,
-      publicKey: Buffer.from(pubKey),
-    })
-    if (!homeCom) {
-      // check if a homecommunity with a different publicKey still exists
-      homeCom = await DbCommunity.findOne({ foreign: false })
-    }
+    let homeCom = await DbCommunity.findOne({ foreign: false })
     if (homeCom) {
       // simply update the existing entry, but it MUST keep the ID and UUID because of possible relations
       homeCom.publicKey = Buffer.from(pubKey)

federation/src/graphql/api/1_0/resolver/PublicKeyResolver.test.ts

@@ -3,12 +3,15 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '@/server/createServer'
 import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import CONFIG from '@/config'
 
 let query: any
 
 // to do: We need a setup for the tests that closes the connection
 let con: any
 
+CONFIG.FEDERATION_API = '1_0'
+
 beforeAll(async () => {
   const server = await createServer()
   con = server.con

federation/src/graphql/api/1_0/resolver/TestResolver.test.ts

@@ -1,41 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { createTestClient } from 'apollo-server-testing'
-import createServer from '@/server/createServer'
-
-let query: any
-
-// to do: We need a setup for the tests that closes the connection
-let con: any
-
-beforeAll(async () => {
-  const server = await createServer()
-  con = server.con
-  query = createTestClient(server.apollo).query
-})
-
-afterAll(async () => {
-  await con.close()
-})
-
-describe('TestResolver', () => {
-  const getTestQuery = `
-    query {
-      test {
-        api
-      }
-    }
-  `
-
-  describe('getTestApi', () => {
-    it('returns 1_0', async () => {
-      await expect(query({ query: getTestQuery })).resolves.toMatchObject({
-        data: {
-          test: {
-            api: '1_0',
-          },
-        },
-      })
-    })
-  })
-})

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

@@ -1,14 +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 { GetTestApiResult } from '../../GetTestApiResult'
-
-@Resolver()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class TestResolver {
-  @Query(() => GetTestApiResult)
-  async test(): Promise<GetTestApiResult> {
-    logger.info(`test api 1_0`)
-    return new GetTestApiResult('1_0')
-  }
-}

federation/src/graphql/api/1_1/resolver/PublicKeyResolver.test.ts

@@ -0,0 +1,56 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '@/server/createServer'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import CONFIG from '@/config'
+
+let query: any
+
+// to do: We need a setup for the tests that closes the connection
+let con: any
+
+CONFIG.FEDERATION_API = '1_1'
+
+beforeAll(async () => {
+  const server = await createServer()
+  con = server.con
+  query = createTestClient(server.apollo).query
+  DbFederatedCommunity.clear()
+})
+
+afterAll(async () => {
+  await con.close()
+})
+
+describe('PublicKeyResolver', () => {
+  const getPublicKeyQuery = `
+    query {
+      getPublicKey
+       {
+        publicKey
+      }
+    }
+  `
+
+  describe('getPublicKey', () => {
+    beforeEach(async () => {
+      const homeCom = new DbFederatedCommunity()
+      homeCom.foreign = false
+      homeCom.apiVersion = '1_0'
+      homeCom.endPoint = 'endpoint-url'
+      homeCom.publicKey = Buffer.from('homeCommunity-publicKey')
+      await DbFederatedCommunity.insert(homeCom)
+    })
+
+    it('returns homeCommunity-publicKey', async () => {
+      await expect(query({ query: getPublicKeyQuery })).resolves.toMatchObject({
+        data: {
+          getPublicKey: {
+            publicKey: expect.stringMatching('homeCommunity-publicKey'),
+          },
+        },
+      })
+    })
+  })
+})

federation/src/graphql/api/1_1/resolver/PublicKeyResolver.ts

@@ -0,0 +1,8 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { Resolver } from 'type-graphql'
+// eslint-disable-next-line camelcase
+import { PublicKeyResolver as PublicKeyResolver_1_0 } from '../../1_0/resolver/PublicKeyResolver'
+
+@Resolver()
+// eslint-disable-next-line camelcase, @typescript-eslint/no-unused-vars
+export class PublicKeyResolver extends PublicKeyResolver_1_0 {}

federation/src/graphql/api/1_1/resolver/TestResolver.test.ts

@@ -1,44 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { createTestClient } from 'apollo-server-testing'
-import createServer from '@/server/createServer'
-import CONFIG from '@/config'
-
-CONFIG.FEDERATION_API = '1_1'
-
-let query: any
-
-// to do: We need a setup for the tests that closes the connection
-let con: any
-
-beforeAll(async () => {
-  const server = await createServer()
-  con = server.con
-  query = createTestClient(server.apollo).query
-})
-
-afterAll(async () => {
-  await con.close()
-})
-
-describe('TestResolver', () => {
-  const getTestQuery = `
-    query {
-      test {
-        api
-      }
-    }
-  `
-
-  describe('getTestApi', () => {
-    it('returns 1_1', async () => {
-      await expect(query({ query: getTestQuery })).resolves.toMatchObject({
-        data: {
-          test: {
-            api: '1_1',
-          },
-        },
-      })
-    })
-  })
-})

federation/src/graphql/api/1_1/resolver/TestResolver.ts

@@ -1,14 +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 { GetTestApiResult } from '../../GetTestApiResult'
-
-@Resolver()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class TestResolver {
-  @Query(() => GetTestApiResult)
-  async test(): Promise<GetTestApiResult> {
-    logger.info(`test api 1_1`)
-    return new GetTestApiResult('1_1')
-  }
-}

federation/src/graphql/api/2_0/resolver/TestResolver.test.ts

@@ -1,44 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { createTestClient } from 'apollo-server-testing'
-import createServer from '@/server/createServer'
-import CONFIG from '@/config'
-
-CONFIG.FEDERATION_API = '2_0'
-
-let query: any
-
-// to do: We need a setup for the tests that closes the connection
-let con: any
-
-beforeAll(async () => {
-  const server = await createServer()
-  con = server.con
-  query = createTestClient(server.apollo).query
-})
-
-afterAll(async () => {
-  await con.close()
-})
-
-describe('TestResolver', () => {
-  const getTestQuery = `
-    query {
-      test {
-        api
-      }
-    }
-  `
-
-  describe('getTestApi', () => {
-    it('returns 2_0', async () => {
-      await expect(query({ query: getTestQuery })).resolves.toMatchObject({
-        data: {
-          test: {
-            api: '2_0',
-          },
-        },
-      })
-    })
-  })
-})

federation/src/graphql/api/2_0/resolver/TestResolver.ts

@@ -1,14 +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 { GetTestApiResult } from '../../GetTestApiResult'
-
-@Resolver()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class TestResolver {
-  @Query(() => GetTestApiResult)
-  async test(): Promise<GetTestApiResult> {
-    logger.info(`test api 2_0`)
-    return new GetTestApiResult('2_0')
-  }
-}

federation/src/graphql/api/GetTestApiResult.ts

@@ -1,13 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Field, ObjectType } from 'type-graphql'
-
-@ObjectType()
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export class GetTestApiResult {
-  constructor(apiVersion: string) {
-    this.api = apiVersion
-  }
-
-  @Field(() => String)
-  api: string
-}

federation/src/graphql/schema.ts

@@ -2,15 +2,15 @@ import { GraphQLSchema } from 'graphql'
 import { buildSchema } from 'type-graphql'
 
 // import isAuthorized from './directive/isAuthorized'
-import DecimalScalar from './scalar/Decimal'
-import Decimal from 'decimal.js-light'
+// import DecimalScalar from './scalar/Decimal'
+// import Decimal from 'decimal.js-light'
 import { getApiResolvers } from './api/schema'
 
 const schema = async (): Promise<GraphQLSchema> => {
   return await buildSchema({
     resolvers: [getApiResolvers()],
     // authChecker: isAuthorized,
-    scalarsMap: [{ type: Decimal, scalar: DecimalScalar }],
+    // scalarsMap: [{ type: Decimal, scalar: DecimalScalar }],
   })
 }