diff --git a/dht-node/.env.dist b/dht-node/.env.dist index 7ee75bb13..c1641ea98 100644 --- a/dht-node/.env.dist +++ b/dht-node/.env.dist @@ -1,9 +1,5 @@ CONFIG_VERSION=v1.2023-01-01 -# Server -PORT=5000 -GRAPHIQL=false - # Database DB_HOST=localhost DB_PORT=3306 diff --git a/dht-node/.env.template b/dht-node/.env.template index 04073ab96..eca7cb277 100644 --- a/dht-node/.env.template +++ b/dht-node/.env.template @@ -1,8 +1,5 @@ CONFIG_VERSION=$BACKEND_CONFIG_VERSION -# Server -GRAPHIQL=false - # Database DB_HOST=localhost DB_PORT=3306 diff --git a/dht-node/src/config/index.ts b/dht-node/src/config/index.ts index 9850e65c6..54457f376 100644 --- a/dht-node/src/config/index.ts +++ b/dht-node/src/config/index.ts @@ -23,8 +23,6 @@ const constants = { } const server = { - PORT: process.env.PORT || 5000, - GRAPHIQL: process.env.GRAPHIQL === 'true' || false, PRODUCTION: process.env.NODE_ENV === 'production' || false, } diff --git a/dht-node/src/graphql/resolver/TestResolver.ts b/dht-node/src/graphql/resolver/TestResolver.ts deleted file mode 100644 index 4241aac98..000000000 --- a/dht-node/src/graphql/resolver/TestResolver.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Query, Resolver } from 'type-graphql' - -@Resolver() -export class TestResolver { - @Query(() => Boolean) - async test(): Promise { - return true - } -} diff --git a/dht-node/src/graphql/schema.ts b/dht-node/src/graphql/schema.ts deleted file mode 100644 index 518e7f2aa..000000000 --- a/dht-node/src/graphql/schema.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { GraphQLSchema } from 'graphql' -import { buildSchema } from 'type-graphql' -import path from 'path' - -const schema = async (): Promise => { - return await buildSchema({ - resolvers: [path.join(__dirname, `./resolver/*Resolver.{ts,js}`)], - }) -} - -export default schema diff --git a/dht-node/src/index.ts b/dht-node/src/index.ts index cf0344d4c..ae09db9fe 100644 --- a/dht-node/src/index.ts +++ b/dht-node/src/index.ts @@ -1,14 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ - -import createServer from './server/createServer' import { startDHT } from '@/dht_node/index' // config import CONFIG from './config' async function main() { - const { app } = await createServer() - // eslint-disable-next-line no-console console.log( `starting Federation on ${CONFIG.FEDERATION_DHT_TOPIC} ${ @@ -16,16 +12,6 @@ async function main() { }`, ) await startDHT(CONFIG.FEDERATION_DHT_TOPIC) - - // management interface - app.listen(CONFIG.PORT, () => { - // eslint-disable-next-line no-console - console.log(`Server is running at http://localhost:${CONFIG.PORT}`) - if (CONFIG.GRAPHIQL) { - // eslint-disable-next-line no-console - console.log(`GraphIQL available at http://localhost:${CONFIG.PORT}`) - } - }) } main().catch((e) => { diff --git a/dht-node/src/server/cors.ts b/dht-node/src/server/cors.ts deleted file mode 100644 index e76ed1591..000000000 --- a/dht-node/src/server/cors.ts +++ /dev/null @@ -1,8 +0,0 @@ -import cors from 'cors' - -const corsOptions = { - origin: '*', - exposedHeaders: ['token'], -} - -export default cors(corsOptions) diff --git a/dht-node/src/server/createServer.ts b/dht-node/src/server/createServer.ts deleted file mode 100644 index ab1397c1d..000000000 --- a/dht-node/src/server/createServer.ts +++ /dev/null @@ -1,54 +0,0 @@ -import 'reflect-metadata' - -import { ApolloServer } from 'apollo-server-express' -import express, { Express } from 'express' - -// database -import connection from '@/typeorm/connection' -import { checkDBVersion } from '@/typeorm/DBVersion' -import cors from './cors' -import CONFIG from '@/config' -import schema from '@/graphql/schema' -import { Connection } from '@dbTools/typeorm' -import { apolloLogger } from './logger' -import { Logger } from 'log4js' - -type ServerDef = { apollo: ApolloServer; app: Express; con: Connection } - -const createServer = async (logger: Logger = apolloLogger): Promise => { - logger.debug('createServer...') - - // open mysql connection - const con = await connection() - if (!con || !con.isConnected) { - logger.fatal(`Couldn't open connection to database!`) - throw new Error(`Fatal: Couldn't open connection to database`) - } - - // check for correct database version - const dbVersion = await checkDBVersion(CONFIG.DB_VERSION) - if (!dbVersion) { - logger.fatal('Fatal: Database Version incorrect') - throw new Error('Fatal: Database Version incorrect') - } - - // Express Server - const app = express() - - // cors - app.use(cors) - - // Apollo Server - const apollo = new ApolloServer({ - schema: await schema(), - playground: CONFIG.GRAPHIQL, - introspection: CONFIG.GRAPHIQL, - logger, - }) - apollo.applyMiddleware({ app, path: '/' }) - logger.debug('createServer...successful') - - return { apollo, app, con } -} - -export default createServer