Fix Apollo Server initialization and add graphql-tag dependency

Co-authored-by: electerious <499088+electerious@users.noreply.github.com>

Author: Copilot

package-lock.json

@@ -44,6 +44,7 @@
     "express": "^4.21.2",
     "graphql": "^16.6.0",
     "graphql-scalars": "^1.20.1",
+    "graphql-tag": "^2.12.6",
     "is-url": "^1.2.4",
     "is-valid-domain": "^0.1.6",
     "mongoose": "^8.19.3",

package.json

@@ -1,5 +1,6 @@
 'use strict'
 
+const http = require('http')
 const express = require('express')
 const { resolve } = require('path')
 const { readFile } = require('fs').promises
@@ -103,29 +104,25 @@ const apolloServer = createApolloServer(ApolloServer, {
 	formatError: handleGraphError,
 })
 
-// Variable to track if Apollo Server has started
-let apolloServerReady = false
-
-// Start Apollo Server
-apolloServer.start().then(() => {
-	apolloServerReady = true
-	signale.success('Apollo Server started')
-})
+// Start Apollo Server asynchronously
+const apolloServerStarted = apolloServer.start()
+	.then(() => {
+		signale.success('Apollo Server started')
+	})
 	.catch((error) => {
 		signale.fatal('Failed to start Apollo Server:', error)
 		process.exit(1)
 	})
 
 // GraphQL endpoint - wait for server to start before processing
 app.use('/api', express.json(), async (request, response, next) => {
-	if (!apolloServerReady) {
-		await apolloServer.start()
-		apolloServerReady = true
-	}
-	next()
-}, expressMiddleware(apolloServer, {
-	context: createExpressContext,
-}))
+	// Ensure Apollo Server is started
+	await apolloServerStarted
+	// Call expressMiddleware after server is started
+	return expressMiddleware(apolloServer, {
+		context: createExpressContext,
+	})(request, response, next)
+})
 
 // Health check endpoint
 app.get('/.well-known/apollo/server-health', (request, response) => {
@@ -153,4 +150,7 @@ app.use((error, request, response) => {
 	response.status(error.statusCode).send(error.message)
 })
 
-module.exports = app
+// Create HTTP server
+const server = http.createServer(app)
+
+module.exports = server

src/server.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	"""

src/types/actions.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	enum ViewType {

src/types/domainStatistics.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	"""

src/types/domains.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	enum EventChartType {

src/types/eventStatistics.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	enum EventType {

src/types/events.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	type AverageViews {

src/types/facts.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gql } = require('@apollo/server')
+const { gql } = require('graphql-tag')
 
 module.exports = gql`
 	scalar URL