fix: support import others url

gkd-kit · Jun 28, 2024 · f7c5c3d · f7c5c3d
1 parent 8bf279e
commit f7c5c3d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/utils/url.ts b/src/utils/url.ts
@@ -71,3 +71,9 @@ export const githubUrlToSelfUrl = (u: string): string => {
     );
   }
 };
+
+export const isValidUrl = (url: string): URL | undefined => {
+  try {
+    return new URL(url);
+  } catch {}
+};
diff --git a/src/views/ImportPage.vue b/src/views/ImportPage.vue
@@ -5,7 +5,7 @@ import { gmOk } from '@/utils/gm';
 import { importFromNetwork } from '@/utils/import';
 import { delay, filterQuery } from '@/utils/others';
 import { importStorage, snapshotStorage, urlStorage } from '@/utils/storage';
-import { getImportFileUrl, getImportId } from '@/utils/url';
+import { getImportFileUrl, getImportId, isValidUrl } from '@/utils/url';
 import { onMounted, shallowRef } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -23,39 +23,45 @@ const goToSnapshot = async (snapshotId: number) => {
   });
 };
 
+const url = String(route.query.url || ``);
+const importId = getImportId(url);
+
 onMounted(async () => {
-  const importId = getImportId(String(route.query.url || ``));
-  if (!importId) {
+  if (!isValidUrl(url)) {
     message.error(`非法URL参数`);
     await delay(1000);
     router.replace({
       path: `/`,
     });
     return;
   }
-  await delay(1000);
-  const snapshotId = urlStorage[importId];
-  if (snapshotId) {
-    const snapshot = await snapshotStorage.getItem(snapshotId);
-    if (snapshot) {
-      goToSnapshot(snapshotId);
-      return;
-    } else {
-      delete urlStorage[importId];
+  if (importId) {
+    const snapshotId = urlStorage[importId];
+    if (snapshotId) {
+      const snapshot = await snapshotStorage.getItem(snapshotId);
+      if (snapshot) {
+        goToSnapshot(snapshotId);
+        return;
+      } else {
+        delete urlStorage[importId];
+      }
     }
   }
   loadingBar.start();
   try {
     const [result] =
-      (await importFromNetwork(getImportFileUrl(importId))) ?? [];
+      (await importFromNetwork(importId ? getImportFileUrl(importId) : url)) ??
+      [];
 
     if (result.status == 'fulfilled') {
       loadingBar.finish();
       const snapshot = result.value;
       if (snapshot?.id) {
-        detectSnapshot(importId);
-        urlStorage[importId] = snapshot.id;
-        importStorage[snapshot.id] = importId;
+        if (importId) {
+          detectSnapshot(importId);
+          urlStorage[importId] = snapshot.id;
+          importStorage[snapshot.id] = importId;
+        }
         loading.value = false;
         await delay(500);
         goToSnapshot(snapshot.id);