[radio@driglu4it] Fix soup3 issue and remove me as a maintainer (lin…

…uxmint#5174)

* add preperation for soup3

* add soup3 support

* update version

radio@driglu4it/README.md

@@ -26,4 +26,7 @@ For the youtube download feature you can either use [youtube-dl](https://github.
 
 - Special characters (e.g German Umlaute) are not shown correctly on the sound applet (when the option "Show song information on the panel" is activated). This is a [bug](https://github.com/mpv-player/mpv/issues/8844) of the mpv player. There is an open [pull request](https://github.com/mpv-player/mpv/pull/8845) which will fix that. At the moment the only workaround is to compile mpv from the source of the mentioned pull request. 
 - For some radio stations (e.g. BBC) the metadata can't be shown
-- It is automatically downloaded the compiled version of the mpv mpris plugin which however is only suitable for 64-bit x86 architecutres (e.g. not for the raspberry pi). In that case you unfortunately have to [build the plugin](https://github.com/hoyon/mpv-mpris#build) by yourself at the moment and place the plugin at: `~/.cinnamon/configs/radio@driglu4it/.mpris.so`. 
+- It is automatically downloaded the compiled version of the mpv mpris plugin which however is only suitable for 64-bit x86 architecutres (e.g. not for the raspberry pi). In that case you unfortunately have to [build the plugin](https://github.com/hoyon/mpv-mpris#build) by yourself at the moment and place the plugin at: `~/.cinnamon/configs/radio@driglu4it/.mpris.so`. 
+
+## New Maintainer Needed
+I (https://github.com/jonath92) have been expanding and maintaining the Radio Applet for a while now, but for personal reasons I unfortunately have very little time for this project. Therefore I am looking for a new mainainter. I am still more than willing to help a new maintainer with technical questions about the code. If you need help regarding the code, just open an issue in the applet repo and notify me in the issue. 

radio@driglu4it/files/radio@driglu4it/4.6/radio-applet.js

@@ -5569,8 +5569,9 @@ function createYouTubeDownloadIcon() {
 }
 
 ;// CONCATENATED MODULE: ./src/lib/HttpHandler.ts
-const { Message, SessionAsync } = imports.gi.Soup;
-const httpSession = new SessionAsync();
+const { Message, SessionAsync, Session } = imports.gi.Soup;
+const { PRIORITY_DEFAULT } = imports.gi.GLib;
+const ByteArray = imports.byteArray;
 function isHttpError(x) {
     return typeof x.reason_phrase === "string";
 }
@@ -5596,30 +5597,70 @@ function checkForHttpError(message) {
         }
         : false;
 }
-function makeJsonHttpRequest(args) {
-    const { url, method = "GET", onErr, onSuccess, onSettled, headers, } = args;
-    const uri = url;
-    // const uri = queryParams ? `${url}?${stringify(queryParams)}` : url
-    const message = Message.new(method, uri);
-    if (!message) {
-        throw new Error(`Message Object couldn't be created`);
-    }
-    headers &&
-        Object.entries(headers).forEach(([key, value]) => {
-            message.request_headers.append(key, value);
-        });
-    httpSession.queue_message(message, (session, msgResponse) => {
-        onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-        const error = checkForHttpError(msgResponse);
-        if (error) {
-            onErr(error);
-            return;
-        }
-        // TODO: We should actually check if this is really of type T1
-        const data = JSON.parse(msgResponse.response_body.data);
-        onSuccess(data);
-    });
-}
+const createSoup2HttpHandler = () => {
+    const httpSession = new SessionAsync();
+    return {
+        makeJsonHttpRequest: (args) => {
+            const { url, method = "GET", onErr, onSuccess, onSettled, headers, } = args;
+            // const uri = queryParams ? `${url}?${stringify(queryParams)}` : url
+            const message = Message.new(method, url);
+            if (!message) {
+                throw new Error(`Message Object couldn't be created`);
+            }
+            headers &&
+                Object.entries(headers).forEach(([key, value]) => {
+                    message.request_headers.append(key, value);
+                });
+            httpSession.queue_message(message, (session, msgResponse) => {
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+                const error = checkForHttpError(msgResponse);
+                if (error) {
+                    onErr(error);
+                    return;
+                }
+                // TODO: We should actually check if this is really of type T1
+                const data = JSON.parse(msgResponse.response_body.data);
+                onSuccess(data);
+            });
+        },
+    };
+};
+const createSoup3HttpHandler = () => {
+    const httpSession = new Session();
+    return {
+        makeJsonHttpRequest: (args) => {
+            const { url, method = "GET", onErr, onSuccess, onSettled, headers, } = args;
+            const message = Message.new(method, url);
+            if (!message) {
+                throw new Error(`Message Object couldn't be created`);
+            }
+            headers &&
+                Object.entries(headers).forEach(([key, value]) => {
+                    message.request_headers.append(key, value);
+                });
+            httpSession.send_and_read_async(message, PRIORITY_DEFAULT, null, (session, result) => {
+                const res = httpSession.send_and_read_finish(result);
+                // TODO: check for error
+                const responseBody = res != null ? ByteArray.toString(ByteArray.fromGBytes(res)) : null;
+                if (!responseBody) {
+                    onErr({
+                        code: 0,
+                        reason_phrase: "no network response",
+                        message: "no response body",
+                    });
+                    return;
+                }
+                if (responseBody) {
+                    const data = JSON.parse(responseBody);
+                    onSuccess(data);
+                }
+            });
+        },
+    };
+};
+const { makeJsonHttpRequest } = imports.gi.Soup.MAJOR_VERSION == 2
+    ? createSoup2HttpHandler()
+    : createSoup3HttpHandler();
 
 ;// CONCATENATED MODULE: ./src/ui/RadioPopupMenu/UpdateStationsMenuItem.ts
 
@@ -5628,15 +5669,18 @@ function makeJsonHttpRequest(args) {
 const { File: UpdateStationsMenuItem_File, FileCreateFlags } = imports.gi.Gio;
 const { Bytes } = imports.gi.GLib;
 const saveStations = (stationsUnfiltered) => {
-    const filteredStations = stationsUnfiltered.flatMap(({ name, url }, index) => {
+    const filteredStations = stationsUnfiltered
+        .flatMap(({ name, url }, index) => {
         const isDuplicate = stationsUnfiltered.findIndex((val) => val.name === name && val.url === url) !== index;
         if (isDuplicate)
             return [];
-        if (name.length > 200 || url.length > 200) {
-            // some stations have unnormal long names/urls - probably due to some encoding issue on radio browser api side or so. 
+        const trimmedName = name.trim();
+        const trimmedUrl = url.trim();
+        if (trimmedName.length === 0 || trimmedName.length > 200 || trimmedUrl.length > 200) {
+            // some stations have unnormal long names/urls - probably due to some encoding issue on radio browser api side or so.
             return [];
         }
-        return [[name.trim(), url.trim()]];
+        return [[trimmedName, trimmedUrl]];
     })
         // We need to sort our self - even though they should already be sorted - because some stations are wrongly shown first due to leading spaces
         .sort((a, b) => a[0].localeCompare(b[0]));
@@ -5645,20 +5689,20 @@ const saveStations = (stationsUnfiltered) => {
         file.create(FileCreateFlags.NONE, null);
     }
     file.replace_contents_bytes_async(new Bytes(JSON.stringify(filteredStations)), null, false, FileCreateFlags.REPLACE_DESTINATION, null, (file, result) => {
-        notify('Stations updated successfully');
+        notify("Stations updated successfully");
     });
 };
 function createUpdateStationsMenuItem() {
-    const defaultText = 'Update Radio Stationlist';
+    const defaultText = "Update Radio Stationlist";
     let isLoading = false;
     const menuItem = createSimpleMenuItem({
         text: defaultText,
         onActivated: async (self) => {
             if (isLoading)
                 return;
             isLoading = true;
-            self.setText('Updating Radio stations...');
-            notify('Upating Radio stations... \n\nThis can take several minutes!');
+            self.setText("Updating Radio stations...");
+            notify("Upating Radio stations... \n\nThis can take several minutes!");
             makeJsonHttpRequest({
                 url: "http://de1.api.radio-browser.info/json/stations",
                 onSuccess: (resp) => saveStations(resp),
@@ -5668,7 +5712,7 @@ function createUpdateStationsMenuItem() {
                 onSettled: () => {
                     self.setText(defaultText);
                     isLoading = false;
-                }
+                },
             });
         },
     });

radio@driglu4it/files/radio@driglu4it/metadata.json

@@ -1 +1 @@
-{"uuid":"radio@driglu4it","name":"Radio++","description":"A radio applet with 1000's of searchable stations, mpris support, youtube-download function and more","max-instances":1,"multiversion":true,"version":"2.2.3"}
+{"uuid":"radio@driglu4it","name":"Radio++","description":"A radio applet with 1000's of searchable stations, mpris support, youtube-download function and more","max-instances":1,"multiversion":true,"version":"2.2.4"}

radio@driglu4it/info.json

@@ -1,8 +1,9 @@
 {
-    "author": "jonath92",
+    "author": "",
     "original_author": "Driglu4it",
     "contributors": [
         "NikoKrause",
-        "claudiux"
+        "claudiux", 
+        "jonath92"
     ]
 }

radio@driglu4it/package.json

@@ -11,7 +11,7 @@
   "author": "Jonathan Heard",
   "license": "MIT",
   "devDependencies": {
-    "@ci-types/cjs": "^5.4.2",
+    "@ci-types/cjs": "5.4.6",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.170",
     "@types/lodash-es": "^4.17.5",

radio@driglu4it/src/lib/HttpHandler.ts

@@ -1,6 +1,6 @@
-const { Message, SessionAsync } = imports.gi.Soup;
-
-const httpSession = new SessionAsync();
+const { Message, SessionAsync, Session } = imports.gi.Soup;
+const { PRIORITY_DEFAULT } = imports.gi.GLib;
+const ByteArray = imports.byteArray;
 
 export interface HTTPParams {
   [key: string]: boolean | string | number | undefined;
@@ -30,10 +30,9 @@ export interface LoadJsonArgs<T1> {
   headers?: Headers;
   onSuccess: (resp: T1) => void;
   onErr: (err: HttpError) => void;
-  onSettled?: () => void
+  onSettled?: () => void;
 }
 
-
 function checkForHttpError(
   message: imports.gi.Soup.Message
 ): HttpError | false {
@@ -52,48 +51,117 @@ function checkForHttpError(
 
   return errMessage
     ? {
-      code,
-      reason_phrase,
-      message: errMessage,
-    }
+        code,
+        reason_phrase,
+        message: errMessage,
+      }
     : false;
 }
 
-export function makeJsonHttpRequest<T1>(args: LoadJsonArgs<T1>) {
-  const {
-    url,
-    method = "GET",
-    onErr,
-    onSuccess,
-    onSettled,
-    headers,
-  } = args;
-
-  const uri = url;
-  // const uri = queryParams ? `${url}?${stringify(queryParams)}` : url
-  const message = Message.new(method, uri);
-
-  if (!message) {
-    throw new Error(`Message Object couldn't be created`);
-  }
-
-  headers &&
-    Object.entries(headers).forEach(([key, value]) => {
-      message.request_headers.append(key, value);
-    });
-
-
-  httpSession.queue_message(message, (session, msgResponse) => {
-    onSettled?.()
-    const error = checkForHttpError(msgResponse);
-
-    if (error) {
-      onErr(error);
-      return;
-    }
-
-    // TODO: We should actually check if this is really of type T1
-    const data = JSON.parse(msgResponse.response_body.data) as T1;
-    onSuccess(data);
-  });
-}
+type HttpHandler = {
+  makeJsonHttpRequest: <T1>(args: LoadJsonArgs<T1>) => void;
+};
+
+const createSoup2HttpHandler = (): HttpHandler => {
+  const httpSession = new SessionAsync();
+
+  return {
+    makeJsonHttpRequest: <T1>(args: LoadJsonArgs<T1>) => {
+      const {
+        url,
+        method = "GET",
+        onErr,
+        onSuccess,
+        onSettled,
+        headers,
+      } = args;
+
+      // const uri = queryParams ? `${url}?${stringify(queryParams)}` : url
+      const message = Message.new(method, url);
+
+      if (!message) {
+        throw new Error(`Message Object couldn't be created`);
+      }
+
+      headers &&
+        Object.entries(headers).forEach(([key, value]) => {
+          message.request_headers.append(key, value);
+        });
+
+      httpSession.queue_message(message, (session, msgResponse) => {
+        onSettled?.();
+        const error = checkForHttpError(msgResponse);
+
+        if (error) {
+          onErr(error);
+          return;
+        }
+
+        // TODO: We should actually check if this is really of type T1
+        const data = JSON.parse(msgResponse.response_body.data) as T1;
+        onSuccess(data);
+      });
+    },
+  };
+};
+
+const createSoup3HttpHandler = (): HttpHandler => {
+  const httpSession = new Session() as any;
+
+  return {
+    makeJsonHttpRequest: <T1>(args: LoadJsonArgs<T1>) => {
+      const {
+        url,
+        method = "GET",
+        onErr,
+        onSuccess,
+        onSettled,
+        headers,
+      } = args;
+
+      const message = Message.new(method, url);
+
+      if (!message) {
+        throw new Error(`Message Object couldn't be created`);
+      }
+
+      headers &&
+        Object.entries(headers).forEach(([key, value]) => {
+          message.request_headers.append(key, value);
+        });
+
+      httpSession.send_and_read_async(
+        message,
+        PRIORITY_DEFAULT,
+        null,
+        (session: any, result: any) => {
+          const res: imports.gi.GLib.Bytes | null =
+            httpSession.send_and_read_finish(result);
+
+          // TODO: check for error
+          const responseBody =
+            res != null ? ByteArray.toString(ByteArray.fromGBytes(res)) : null;
+
+          if (!responseBody) {
+            onErr({
+              code: 0,
+              reason_phrase: "no network response",
+              message: "no response body",
+            });
+            return;
+          }
+
+          if (responseBody) {
+            const data = JSON.parse(responseBody) as T1;
+            onSuccess(data);
+          }
+        }
+      );
+    },
+  };
+};
+
+export const { makeJsonHttpRequest } =
+  imports.gi.Soup.MAJOR_VERSION == 2
+    ? createSoup2HttpHandler()
+    : createSoup3HttpHandler();