updated fromTemplate.ts and models.ts in commands/generate folder

asyncapi · Jan 18, 2025 · 4e7a613 · 4e7a613
1 parent 5635245
commit 4e7a613
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/src/commands/generate/fromTemplate.ts b/src/commands/generate/fromTemplate.ts
@@ -16,6 +16,8 @@ import { intro, isCancel, spinner, text } from '@clack/prompts';
 import { inverse, yellow, magenta, green, red } from 'picocolors';
 import fetch from 'node-fetch';
 import { fromTemplateFlags } from '../../core/flags/generate/fromTemplate.flags';
+import { proxyFlags } from 'core/flags/proxy.flags';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 
 interface IMapBaseUrlToFlag {
   url: string,
@@ -57,18 +59,31 @@ export default class Template extends Command {
     'asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write'
   ];
 
-  static flags = fromTemplateFlags();
+  static flags = {
+    ...fromTemplateFlags(),
+    ...proxyFlags(),
+  };
 
   static args = {
     asyncapi: Args.string({ description: '- Local path, url or context-name pointing to AsyncAPI file', required: true }),
     template: Args.string({ description: '- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template', required: true }),
+    proxyHost: Args.string({description: 'Name of the Proxy Host', required: false}),
+    proxyPort: Args.string({description: 'Name of the Port of the ProxyHost', required: false}),
   };
 
   parser = new Parser();
 
   async run() {
-    const { args, flags } = await this.parse(Template); // NOSONAR
+    const { args, flags } = await this.parse(Template); // NOSONAR  
     const interactive = !flags['no-interactive'];
+    const proxyHost = flags['proxyHost'];
+    const proxyPort = flags['proxyPort'];
+
+    let proxyAgent;
+    if (proxyHost && proxyPort) {
+      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
+      proxyAgent = new HttpsProxyAgent(proxyUrl);
+    }
 
     let { asyncapi, template } = args;
     let output = flags.output as string;
@@ -94,7 +109,9 @@ export default class Template extends Command {
         url: flags['registry-url'],
         auth: flags['registry-auth'],
         token: flags['registry-token']
-      }
+      },
+      ...(proxyAgent && { fetchOptions: { agent: proxyAgent } })
+
     };
     const asyncapiInput = (await load(asyncapi)) || (await load());
 
@@ -258,6 +275,9 @@ export default class Template extends Command {
     try {
       specification = await load(asyncapi);
     } catch (err: any) {
+      if (err.message?.includes('Failed to download')) {
+        throw new Error('Proxy Connection Error: Unable to establish a connection to the proxy. Check hostName or PortNumber.');
+      }
       return this.error(
         new ValidationError({
           type: 'invalid-file',
@@ -283,6 +303,9 @@ export default class Template extends Command {
     try {
       specification = await load(asyncapi);
     } catch (err: any) {
+      if (err.message?.includes('Failed to download')) {
+        throw new Error('Proxy Connection Error: Unable to establish a connection to the proxy. Check hostName or PortNumber.');
+      }
       return this.error(
         new ValidationError({
           type: 'invalid-file',

diff --git a/src/commands/generate/models.ts b/src/commands/generate/models.ts
@@ -5,20 +5,34 @@ import { cancel, intro, isCancel, select, spinner, text } from '@clack/prompts';
 import { green, inverse } from 'picocolors';
 import { generateModels, Languages, ModelinaArgs } from '@asyncapi/modelina-cli';
 import { modelsFlags } from '../../core/flags/generate/models.flags';
+import { proxyFlags } from 'core/flags/proxy.flags';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import fetch, { RequestInit } from 'node-fetch';
 
 export default class Models extends Command {
   static description = 'Generates typed models';
 
   static readonly args = ModelinaArgs as any;
 
-  static flags = modelsFlags();
+  static flags = {
+    ...modelsFlags(),
+    ...proxyFlags(),
+  };
 
   async run() {
     const { args, flags } = await this.parse(Models);
     let { language, file } = args;
     let { output } = flags;
 
     const interactive = !flags['no-interactive'];
+    const proxyHost = flags['proxyHost'];
+    const proxyPort = flags['proxyPort'];
+    let proxyAgent;
+
+    if (proxyHost && proxyPort) {
+      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
+     proxyAgent = new HttpsProxyAgent(proxyUrl);
+    }
 
     if (!interactive) {
       intro(inverse('AsyncAPI Generate Models'));
@@ -29,6 +43,9 @@ export default class Models extends Command {
       output = parsedArgs.output;
     }
 
+    const customFetch = proxyAgent
+    ? (url: string, options: RequestInit = {}) => fetch(url, { ...options, agent: proxyAgent })
+    : fetch;
     const inputFile = (await load(file)) || (await load());
 
     const { document, diagnostics ,status } = await parse(this, inputFile, flags as ValidateOptions);