feat: fallback to default doc path

asyncapi · Oct 17, 2023 · c0fd61c · c0fd61c
1 parent c92fa52
commit c0fd61c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 31 deletions.
diff --git a/src/services/app.service.ts b/src/services/app.service.ts
@@ -5,6 +5,7 @@ import { show } from '@ebay/nice-modal-react';
 import { RedirectedModal } from '../components/Modals';
 
 import { appState, filesState } from '../state';
+import { File } from '../state/files.state';
 
 export class ApplicationService extends AbstractService {
   override async onInit() {
@@ -18,7 +19,10 @@ export class ApplicationService extends AbstractService {
 
     let error: any; 
     try {
-      await this.fetchResource(url, base64);
+      const file = await this.fetchFile(url, base64);
+      if (file) {
+        this.updateFile(file);
+      }
     } catch (err) {
       error = err;
       console.error(err);
@@ -37,27 +41,35 @@ export class ApplicationService extends AbstractService {
     }
   }
 
-  private async fetchResource(url: string | null, base64: string | null) {
-    if (!url && !base64) {
-      return;
-    }
-
-    const { updateFile } = filesState.getState();
-    let content = '';
+  private async fetchFile(url: string | null, base64: string | null): Promise<Partial<File> | null> {
     if (url) {
-      content = await fetch(url).then(res => res.text());
-    } else if (base64) {
-      content = this.svcs.formatSvc.decodeBase64(base64);
+      return {
+        content: await fetch(url).then((res) => res.text()),
+        source: url,
+        from: 'url',
+      };
+    }
+    if (base64) {
+      return {
+        content: this.svcs.formatSvc.decodeBase64(base64),
+        from: 'base64',
+      };
     }
+    const res = await Promise.any([
+      fetch('/docs/asyncapi/asyncapi.yaml'),
+      fetch('/docs/asyncapi/asyncapi.json'),
+    ]);
+    if (res.status === 200) {
+      return res.text().then((content) => ({ content }));
+    }
+    return null;
+  }
 
+  private async updateFile(file: Partial<File>) {
+    const { updateFile } = filesState.getState();
+    const { source, content = '' } = file;
     const language = this.svcs.formatSvc.retrieveLangauge(content);
-    const source = url || undefined;
-    updateFile('asyncapi', {
-      content,
-      language,
-      source,
-      from: url ? 'url' : 'base64',
-    });
+    updateFile('asyncapi', { ...file, language });
     await this.svcs.parserSvc.parse('asyncapi', content, { source });
   }
 

diff --git a/src/services/navigation.service.ts b/src/services/navigation.service.ts
@@ -80,19 +80,6 @@ export class NavigationService extends AbstractService {
       }
     }
 
-    if (liveServerPort && typeof Number(liveServerPort) === 'number') {
-      SocketClient.connect(window.location.hostname, liveServerPort);
-    } else if (documentUrl) {
-      await EditorService.importFromURL(documentUrl);
-    } else if (base64Document) {
-      await EditorService.importBase64(base64Document);
-    } else {
-      await Promise.any([
-        EditorService.importFromURL('/docs/asyncapi/asyncapi.yaml'),
-        EditorService.importFromURL('/docs/asyncapi/asyncapi.json'),
-      ]);
-    }
-
     window.addEventListener('hashchange', hashChanged);
     return () => {
       window.removeEventListener('hashchange', hashChanged);