@exezt-/webamp 1.5.0-0x4 → 1.5.0-0x5

package/built/webamp.bundle.js

@@ -14793,8 +14793,18 @@ function selectAll() {
 
 class webamp_telegram_WinampTelegramCustomHandler {
   constructor() {
+    defineProperty_default()(this, "webamp", void 0);
+
+    defineProperty_default()(this, "telegram", void 0);
+
+    defineProperty_default()(this, "initializeTelegramWebAppEvents", () => {
+      this.telegram.offEvent("deactivated", () => {
+        this.updateAppState();
+      });
+    });
+
     defineProperty_default()(this, "updateAppState", () => {
-      localStorage.setItem('app-state', JSON.stringify(window.__webamp.store.getState()));
+      localStorage.setItem("app-state", JSON.stringify(window.__webamp.store.getState()));
     });
 
     defineProperty_default()(this, "getFiles", async ln => {
@@ -14803,22 +14813,31 @@ class webamp_telegram_WinampTelegramCustomHandler {
       x.open('get', `https://cloud-api.yandex.net/v1/disk/public/resources?public_key=${link}`, true);
       x.setRequestHeader('Accept', 'application/json');
       x.setRequestHeader('Content-Type', 'application/json');
-      x.setRequestHeader('Access-Control-Allow-Origin', 'no-cors');
       x.send();
 
       x.onload = async () => {
         if (x.status === 200) {
           var _JSON$parse;
 
-          const playlistName = JSON.parse(x.responseText).name;
           const data = (_JSON$parse = JSON.parse(x.responseText)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse._embedded.items;
           let i = 0;
           this.saveLastPlaylist(ln);
 
           for (const item of data) {
-            if (item.size > 0x1400000) {// size too large
+            if (item.size > 0x1400000) {
+              console.info(`File ${item.name} can't be loaded due oversize`);
             } else {
-              await fetch(item.file).then(resp => fetch(resp.url)).then(res => {
+              await fetch(item.file, {
+                headers: [['Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'], ['Content-Type', 'application/octet-stream']]
+              }).then(response => response).then(resp => fetch(resp.url)).then(async response => {
+                if (response.status === 302) {
+                  return await fetch(response.headers.get('Location'), {
+                    headers: [['Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'], ['Content-Type', 'application/octet-stream']]
+                  });
+                } else {
+                  return response;
+                }
+              }).then(res => {
                 var _res$body;
 
                 console.log(res);
@@ -14867,6 +14886,10 @@ class webamp_telegram_WinampTelegramCustomHandler {
       };
     });
 
+    defineProperty_default()(this, "saveLastPlaylist", playlistLink => {
+      document.cookie = `lastlist=${playlistLink}; path=/;`;
+    });
+
     defineProperty_default()(this, "getCookie", name => {
       const regex = new RegExp(`(^| )${name}=([^;]+)`);
       const match = document.cookie.match(regex);
@@ -14920,44 +14943,58 @@ class webamp_telegram_WinampTelegramCustomHandler {
         i++;
       }
 
-      if (window.__webamp.store.getState().media.shuffle !== opts.media.shuffle) window.__webamp.store.dispatch({
-        type: "TOGGLE_SHUFFLE"
-      });
-      if (window.__webamp.store.getState().media.repeat !== opts.media.repeat) window.__webamp.store.dispatch({
-        type: "TOGGLE_REPEAT"
-      });
+      if (window.__webamp.store.getState().media.shuffle !== opts.media.shuffle) {
+        window.__webamp.store.dispatch({
+          type: "TOGGLE_SHUFFLE"
+        });
+      }
+
+      if (window.__webamp.store.getState().media.repeat !== opts.media.repeat) {
+        window.__webamp.store.dispatch({
+          type: "TOGGLE_REPEAT"
+        });
+      }
     });
 
-    let lastList = this.getCookie('lastlist');
+    const lastList = this.getCookie('lastlist');
 
     if (typeof lastList !== "undefined") {
-      this.getFiles(lastList).catch(err => 0x0);
+      this.getFiles(lastList);
     }
+  }
 
-    setTimeout(() => {
-      if (typeof localStorage.getItem('app-state') !== "undefined") this.loadOptions(JSON.parse(localStorage.getItem('app-state')));
+  initialize() {
+    var _window, _window$Telegram, _window2, _window2$Telegram;
 
-      window.__webamp.onTrackDidChange(() => {
-        this.updateAppState();
-      });
+    // @ts-ignore | because no global var telegram avail in project types
+    this.telegram = (_window = window) === null || _window === void 0 ? void 0 : (_window$Telegram = _window.Telegram) === null || _window$Telegram === void 0 ? void 0 : _window$Telegram.WebApp;
 
-      window.__webamp.onWillClose(() => {
-        this.updateAppState();
-      });
+    if (!window.__webamp) {
+      throw new Error("Webamp __webamp is undefined!!");
+    } // @ts-ignore | because no global var telegram avail in project types
 
-      window.__webamp.store.dispatch({
-        type: "ENABLE_MILKDROP",
-        open: false
-      });
-    }, 2000);
-  }
 
-  saveLastPlaylist(playlistName) {
-    document.cookie = `lastlist=${playlistName}; path=/;`;
+    if (!((_window2 = window) !== null && _window2 !== void 0 && (_window2$Telegram = _window2.Telegram) !== null && _window2$Telegram !== void 0 && _window2$Telegram.WebApp)) {
+      console.error("Telegram is undefined!! Skipping Telegram.WebApp event handler...");
+    }
+
+    if (typeof localStorage.getItem('app-state') !== "undefined") this.loadOptions(JSON.parse(localStorage.getItem('app-state')));
+
+    window.__webamp.onTrackDidChange(() => {
+      this.updateAppState();
+    });
+
+    window.__webamp.onWillClose(() => {
+      this.updateAppState();
+    });
+
+    window.__webamp.store.dispatch({
+      type: "ENABLE_MILKDROP",
+      open: false
+    });
   }
 
 }
-new webamp_telegram_WinampTelegramCustomHandler();
 // CONCATENATED MODULE: ./js/actionCreators/files.ts