@exezt-/webamp 1.5.0-0x602 → 1.5.0-0x604

package/built/webamp.bundle.js

@@ -14792,19 +14792,13 @@ function selectAll() {
 // @ts-ignore
 
 class webamp_telegram_handler_WinampTelegramCustomHandler {
-  constructor() {
+  constructor(emit) {
     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(this.webamp.store.getState()));
     });
 
     defineProperty_default()(this, "getFiles", async ln => {
@@ -14828,15 +14822,13 @@ class webamp_telegram_handler_WinampTelegramCustomHandler {
               console.info(`File ${item.name} can't be loaded due oversize`);
             } else {
               await fetch(item.file).then(response => response).then(resp => fetch(resp.url)).then(async response => {
-                // if (response.status === 302) {
-                // 	return await fetch(response.headers.get('Location' as string)!, {
-                // 		headers: [
-                // 			['Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'],
-                // 			['Content-Type', 'application/octet-stream'],
-                // 		]
-                // 	})
-                // } else {
-                return 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;
 
@@ -14867,12 +14859,12 @@ class webamp_telegram_handler_WinampTelegramCustomHandler {
                 });
               }).then(stream => new Response(stream)).then(response => response.blob()).then(blob => URL.createObjectURL(blob)).then(uri => {
                 if (i === 0) {
-                  window.__webamp.setTracksToPlay([{
+                  this.webamp.setTracksToPlay([{
                     defaultName: item.name,
                     url: uri
                   }]);
                 } else {
-                  window.__webamp.appendTracks([{
+                  this.webamp.appendTracks([{
                     defaultName: item.name,
                     url: uri
                   }]);
@@ -14916,87 +14908,117 @@ class webamp_telegram_handler_WinampTelegramCustomHandler {
       let eq11 = opts.equalizer.sliders["16000"];
       let equal = [eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8, eq9, eq10, eq11];
       let bands = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000];
-
-      window.__webamp.store.dispatch({
+      this.webamp.store.dispatch({
         type: "SET_VOLUME",
         volume: clamp(vol, 0, 100)
       });
-
-      window.__webamp.store.dispatch({
+      this.webamp.store.dispatch({
         type: "SET_BALANCE",
         balance: balance
       });
-
-      window.__webamp.store.dispatch({
+      this.webamp.store.dispatch({
         type: "SET_BAND_VALUE",
         band: "preamp",
         value: opts.equalizer.sliders.preamp
       });
 
       for (const band of bands) {
-        window.__webamp.store.dispatch({
+        this.webamp.store.dispatch({
           type: "SET_BAND_VALUE",
           band: band,
           value: equal[i]
         });
-
         i++;
       }
 
       if (window.__webamp.store.getState().media.shuffle !== opts.media.shuffle) {
-        window.__webamp.store.dispatch({
+        this.webamp.store.dispatch({
           type: "TOGGLE_SHUFFLE"
         });
       }
 
       if (window.__webamp.store.getState().media.repeat !== opts.media.repeat) {
-        window.__webamp.store.dispatch({
+        this.webamp.store.dispatch({
           type: "TOGGLE_REPEAT"
         });
       }
     });
 
-    const lastList = this.getCookie('lastlist');
+    if (emit !== false) {
+      var _window, _window$Telegram, _window2, _window2$Telegram;
 
-    if (typeof lastList !== "undefined") {
-      this.getFiles(lastList);
-    }
+      const lastList = this.getCookie('lastlist'); // @ts-ignore | because no global var telegram avail in project types
 
-    this.initialize();
-  }
+      this.telegram = (_window = window) === null || _window === void 0 ? void 0 : (_window$Telegram = _window.Telegram) === null || _window$Telegram === void 0 ? void 0 : _window$Telegram.WebApp;
 
-  initialize() {
-    var _window, _window$Telegram, _window2, _window2$Telegram;
+      if (typeof lastList !== "undefined") {
+        this.getFiles(lastList);
+      }
 
-    // @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;
+      if (!window.__webamp) {
+        throw new Error("Webamp __webamp is undefined!!");
+      } else {
+        this.webamp = window.__webamp;
+      } // @ts-ignore | because no global var telegram avail in project types
 
-    if (!window.__webamp) {
-      throw new Error("Webamp __webamp is undefined!!");
-    } // @ts-ignore | because no global var telegram avail in project types
 
+      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 (!((_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')));
+      }
 
-    if (typeof localStorage.getItem('app-state') !== "undefined") this.loadOptions(JSON.parse(localStorage.getItem('app-state')));
+      this.initializeApplicationHandlers();
+    }
+  }
 
-    window.__webamp.onTrackDidChange(() => {
+  initializeTelegramWebAppEvents() {
+    this.telegram.offEvent("deactivated", () => {
       this.updateAppState();
     });
+  }
 
-    window.__webamp.onWillClose(() => {
+  initializeApplicationHandlers() {
+    const window_handlers = ['unload', 'beforeunload', 'pagehide'];
+    window_handlers.forEach(handler => {
+      window.addEventListener(handler, () => {
+        this.updateAppState();
+      });
+    });
+    this.webamp.onTrackDidChange(() => {
       this.updateAppState();
     });
-
-    window.__webamp.store.dispatch({
+    this.webamp.onWillClose(() => {
+      this.updateAppState();
+    });
+    this.webamp.onClose(() => {
+      this.updateAppState();
+    });
+    this.webamp.onMinimize(() => {
+      this.updateAppState();
+    });
+    this.webamp.store.dispatch({
       type: "ENABLE_MILKDROP",
       open: false
     });
+    const ev = ['ended', 'playing', 'timeupdate', 'fileLoaded', 'waiting', 'stopWaiting'];
+
+    this.webamp.__onStateChange(() => {
+      this.updateAppState();
+    }); // this.webamp._actionEmitter.on('')
+
+
+    ev.forEach(ev => this.webamp.media.on(ev, () => {
+      this.updateAppState();
+    }));
   }
 
 }
+setTimeout(() => {
+  new webamp_telegram_handler_WinampTelegramCustomHandler(true);
+}, 1000);
 // CONCATENATED MODULE: ./js/actionCreators/files.ts
 
 
@@ -15409,7 +15431,7 @@ function files_addFilesFromUrl(atIndex = 0) {
   return async (dispatch, getState, {
     handleAddUrlEvent
   }) => {
-    await new webamp_telegram_handler_WinampTelegramCustomHandler().getFiles(prompt('Enter playlist link'));
+    await new webamp_telegram_handler_WinampTelegramCustomHandler(false).getFiles(prompt('Enter playlist link'));
   };
 }
 function files_addFilesFromList() {