Do not load webtorrent in page load

ed-asriyan · Apr 17, 2024 · 573fc6d · 573fc6d
1 parent cdf170c
commit 573fc6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/components/index.svelte b/src/components/index.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { onDestroy } from 'svelte';
     import { _ } from 'svelte-i18n';
-    import { initWebtorrent } from '../stores/web-torrent';
     import Loader from './loader.svelte';
     import { Room } from '../stores/room';
     import { syncTime } from '../stores/clock';
@@ -30,7 +29,6 @@
 
     const init = async function (roomId: string): Promise<Room> {
         await initTime();
-        await initWebtorrent();
         await destroy();
         previousRoom = new Room(roomId);
         await previousRoom.init();

diff --git a/src/stores/web-torrent.ts b/src/stores/web-torrent.ts
@@ -1,4 +1,3 @@
-import 'https://cdn.jsdelivr.net/npm/webtorrent@latest/webtorrent.min.js';
 import { iceServers, webTorrentTrackers } from '../settings';
 import { readable, writable } from 'svelte/store';
 
@@ -7,8 +6,9 @@ window.WEBTORRENT_ANNOUNCE = null;
 
 let __client: any;
 let __torrent: any;
-export const initWebtorrent = async function () {
-    if (!navigator.serviceWorker) {
+let isInitiated = false;
+const initWebtorrent = async function () {
+    if (isInitiated || !navigator.serviceWorker) {
         return;
     }
 
@@ -22,10 +22,12 @@ export const initWebtorrent = async function () {
         if (!checkState(worker)) {
             worker.addEventListener('statechange', ({ target }) => {
                 if (checkState(target)) {
+                    isInitiated = true;
                     resolve();
                 }
             });
         } else {
+            isInitiated = true;
             resolve();
         }
     });
@@ -49,6 +51,7 @@ export const createWebTorrentClient = async function () {
     if (__client) {
         return __client;
     }
+    await import('https://cdn.jsdelivr.net/npm/webtorrent@latest/webtorrent.min.js');
     // @ts-ignore
     const client = new WebTorrent({
         tracker: {
@@ -60,6 +63,7 @@ export const createWebTorrentClient = async function () {
             iceCandidatePoolsize: 1
         }
     });
+    await initWebtorrent();
     await promise(client, client.loadWorker, navigator.serviceWorker.controller);
     __client = client;
 };
@@ -81,6 +85,7 @@ export const sendFile = async function (file: File): Promise<string> {
 };
 
 export const getStreamUrl = async function (url: string) {
+    await initWebtorrent();
     await createWebTorrentClient();
     if (__torrent?.magnetURI !== url) {
         isSeeding.set(false);
@@ -117,4 +122,4 @@ export const timeRemaining = readable<number>(0, set => {
     const id = setInterval(() => set(__torrent?.timeRemaining), 1000);
     return () => clearInterval(id);
 });
-export const isSeeding = writable<boolean>(false);
+export const isSeeding = writable<boolean>(false);