@asyncapi/cli 5.0.5 → 5.0.6

package/lib/domains/services/validation.service.js

@@ -44,6 +44,29 @@ const convertGitHubWebUrl = (url) => {
     }
     return url;
 };
+/**
+ * Helper function to fetch with error handling
+ */
+const fetchWithErrorHandling = (url, headers, errorMessage) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(url, { headers });
+    if (!res.ok) {
+        throw new Error(`${errorMessage}: ${url} - ${res.statusText}`);
+    }
+    return res;
+});
+/**
+ * Helper function to fetch content from GitHub API
+ */
+const fetchGitHubApiContent = (url, headers) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    headers['Accept'] = 'application/vnd.github.v3+json';
+    const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch GitHub API URL');
+    const fileInfo = (yield res.json());
+    if (!fileInfo.download_url) {
+        throw new Error(`No download URL found in GitHub API response for: ${url}`);
+    }
+    const contentRes = yield fetchWithErrorHandling(fileInfo.download_url, headers, 'Failed to fetch content from download URL');
+    return yield contentRes.text();
+});
 /**
  * Custom resolver for private repositories
  */
@@ -65,36 +88,15 @@ const createHttpWithAuthResolver = () => ({
             Object.assign(headers, authInfo.headers); // merge custom headers
         }
         if (url.includes('api.github.com')) {
-            headers['Accept'] = 'application/vnd.github.v3+json';
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch GitHub API URL: ${url} - ${res.statusText}`);
-            }
-            const fileInfo = (yield res.json());
-            if (fileInfo.download_url) {
-                const contentRes = yield fetch(fileInfo.download_url, { headers });
-                if (!contentRes.ok) {
-                    throw new Error(`Failed to fetch content from download URL: ${fileInfo.download_url} - ${contentRes.statusText}`);
-                }
-                return yield contentRes.text();
-            }
-            throw new Error(`No download URL found in GitHub API response for: ${url}`);
+            return yield fetchGitHubApiContent(url, headers);
         }
-        else if (url.includes('raw.githubusercontent.com')) {
+        if (url.includes('raw.githubusercontent.com')) {
             headers['Accept'] = 'application/vnd.github.v3.raw';
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch GitHub URL: ${url} - ${res.statusText}`);
-            }
-            return yield res.text();
-        }
-        else {
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch URL: ${url} - ${res.statusText}`);
-            }
+            const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch GitHub URL');
             return yield res.text();
         }
+        const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch URL');
+        return yield res.text();
     }),
 });
 const { writeFile } = fs_1.promises;

package/oclif.manifest.json

@@ -2146,5 +2146,5 @@
       ]
     }
   },
-  "version": "5.0.5"
+  "version": "5.0.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -16,7 +16,7 @@
     "@asyncapi/bundler": "^0.6.4",
     "@asyncapi/converter": "^1.6.2",
     "@asyncapi/diff": "^0.5.0",
-    "@asyncapi/generator": "^3.0.1",
+    "@asyncapi/generator": "^3.1.0",
     "@asyncapi/modelina-cli": "^5.10.1",
     "@asyncapi/openapi-schema-parser": "^3.0.24",
     "@asyncapi/optimizer": "^1.0.4",