feat: change host to gqlHost and add rest host

lenneTech · Sep 3, 2024 · bcb5d6b · bcb5d6b
1 parent 17230d6
commit bcb5d6b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/playground/nuxt-app/nuxt.config.ts b/playground/nuxt-app/nuxt.config.ts
@@ -14,7 +14,8 @@ export default defineNuxtConfig({
 
   nuxtBase: {
     generateTypes: process.env['GENERATE_TYPES'] === '1',
-    host: 'http://localhost:3000/graphql',
+    gqlHost: 'http://localhost:3000/graphql',
+    host: 'http://localhost:3000',
     registerAuthPlugins: true,
     schema: '../server/schema.gql',
     storagePrefix: 'playground',

diff --git a/src/generate.ts b/src/generate.ts
@@ -22,11 +22,11 @@ export async function loadMetaServer(config: Partial<{ public: { host: string; s
   let schema;
 
   if (!config.public.schema) {
-    if (!config.public.host) {
-      throw new Error('Host is not defined in the configuration');
+    if (!config.public.gqlHost) {
+      throw new Error('Gpql Host is not defined in the configuration');
     }
 
-    const { data: result } = await ofetch(config.public.host, {
+    const { data: result } = await ofetch(config.public.gqlHost, {
       body: JSON.stringify({
         query: getIntrospectionQuery({ descriptions: false }),
         variables: {},
@@ -207,7 +207,7 @@ export async function generateFiles(options: any, logger: any, nuxt: any, resolv
     const meta = await loadMetaServer({ public: options });
 
     // Generate graphql types
-    const generatedTypes = await generateGraphQLTypes(options.schema ?? options.host);
+    const generatedTypes = await generateGraphQLTypes(options.schema ?? options.gqlHost);
     addTemplate({
       filename: nuxt.options.rootDir + '/src/base/default.ts',
       getContents: () => generatedTypes[0].content || '',

diff --git a/src/module.ts b/src/module.ts
@@ -7,6 +7,7 @@ export interface ModuleOptions {
   autoImport?: boolean;
   disableGraphql?: boolean;
   generateTypes?: boolean;
+  gqlHost: string;
   host: string;
   registerAuthPlugins?: boolean;
   registerPlugins?: boolean;
@@ -38,6 +39,7 @@ export default defineNuxtModule<ModuleOptions>({
     autoImport: false,
     disableGraphql: false,
     generateTypes: true,
+    gqlHost: '',
     host: '',
     registerAuthPlugins: false,
     registerPlugins: true,
@@ -57,8 +59,9 @@ export default defineNuxtModule<ModuleOptions>({
     const runtimeDir = resolver.resolve('runtime');
     nuxt.options.build.transpile.push(runtimeDir);
 
-    const wsUrl = options.host?.replace('https://', 'wss://').replace('http://', 'ws://');
+    const wsUrl = options.gqlHost?.replace('https://', 'wss://').replace('http://', 'ws://');
     nuxt.options.runtimeConfig.public['host'] = options.host ?? 'http://localhost:3000';
+    nuxt.options.runtimeConfig.public['gqlHost'] = options.gqlHost ?? 'http://localhost:3000/graphql';
     nuxt.options.runtimeConfig.public['wsUrl'] = wsUrl ?? 'ws://localhost:3000';
     nuxt.options.runtimeConfig.public['schema'] = options.schema ?? null;
     nuxt.options.runtimeConfig.public['storagePrefix'] = options.storagePrefix ?? null;
@@ -146,7 +149,7 @@ export default defineNuxtModule<ModuleOptions>({
       await installModule(await resolver.resolvePath('nuxt-graphql-request'), {
         clients: {
           default: {
-            endpoint: options.host,
+            endpoint: options.gqlHost,
             options: {
               responseMiddleware,
             },

diff --git a/src/runtime/functions/graphql-meta.ts b/src/runtime/functions/graphql-meta.ts
@@ -1,15 +1,16 @@
 import { buildClientSchema, getIntrospectionQuery } from 'graphql';
 import { ofetch } from 'ofetch';
 
-import { GraphQLMeta } from '../../generate';
+import type { GraphQLMeta } from '../../generate';
+
 import { useGraphQLMeta } from '../composables/use-graphql-meta';
 
 export async function loadMeta(config: Partial<{ public: { host: string; schema?: string } }>): Promise<GraphQLMeta> {
   const controller = new AbortController();
   setTimeout(() => controller.abort(), 5000);
 
   return new Promise(async (resolve, reject) => {
-    const { data: result } = await ofetch(config.public.host, {
+    const { data: result } = await ofetch(config.public.gqlHost, {
       body: JSON.stringify({
         query: getIntrospectionQuery({ descriptions: false }),
         variables: {},

diff --git a/src/runtime/plugins/auth.server.ts b/src/runtime/plugins/auth.server.ts
@@ -21,7 +21,7 @@ export default defineNuxtPlugin({
 
     let token = accessTokenState.value;
     if (isTokenExpired(accessTokenState.value)) {
-      const refreshTokenResult = await ofetch(config.public.host, {
+      const refreshTokenResult = await ofetch(config.public.gqlHost, {
         body: JSON.stringify({
           query: 'mutation refreshToken {refreshToken {token, refreshToken}}',
           variables: {},
@@ -50,7 +50,7 @@ export default defineNuxtPlugin({
     $graphql.default.setHeaders({ authorization: `Bearer ${token}` });
 
     if (token && payload?.id) {
-      const userResult = await ofetch(config.public.host, {
+      const userResult = await ofetch(config.public.gqlHost, {
         body: JSON.stringify({
           query: 'query getUser($id: String!) { getUser(id: $id) { id avatar firstName lastName email roles }}',
           variables: {