fix: trailing slash integration url issues (#1571)

packages/integrations/src/media-organizer/lidarr/lidarr-integration.ts

@@ -8,7 +8,7 @@ export class LidarrIntegration extends MediaOrganizerIntegration {
   public async testConnectionAsync(): Promise<void> {
     await super.handleTestConnectionResponseAsync({
       queryFunctionAsync: async () => {
-        return await fetch(`${this.integration.url}/api`, {
+        return await fetch(this.url("/api"), {
           headers: { "X-Api-Key": super.getSecretValue("apiKey") },
         });
       },
@@ -22,11 +22,12 @@ export class LidarrIntegration extends MediaOrganizerIntegration {
    * @param includeUnmonitored When true results will include unmonitored items of the Tadarr library.
    */
   async getCalendarEventsAsync(start: Date, end: Date, includeUnmonitored = true): Promise<CalendarEvent[]> {
-    const url = new URL(this.integration.url);
-    url.pathname = "/api/v1/calendar";
-    url.searchParams.append("start", start.toISOString());
-    url.searchParams.append("end", end.toISOString());
-    url.searchParams.append("unmonitored", includeUnmonitored ? "true" : "false");
+    const url = this.url("/api/v1/calendar", {
+      start,
+      end,
+      unmonitored: includeUnmonitored,
+    });
+
     const response = await fetch(url, {
       headers: {
         "X-Api-Key": super.getSecretValue("apiKey"),

packages/integrations/src/media-organizer/radarr/radarr-integration.ts

@@ -14,11 +14,12 @@ export class RadarrIntegration extends MediaOrganizerIntegration {
    * @param includeUnmonitored When true results will include unmonitored items of the Tadarr library.
    */
   async getCalendarEventsAsync(start: Date, end: Date, includeUnmonitored = true): Promise<CalendarEvent[]> {
-    const url = new URL(this.integration.url);
-    url.pathname = "/api/v3/calendar";
-    url.searchParams.append("start", start.toISOString());
-    url.searchParams.append("end", end.toISOString());
-    url.searchParams.append("unmonitored", includeUnmonitored ? "true" : "false");
+    const url = this.url("/api/v3/calendar", {
+      start,
+      end,
+      unmonitored: includeUnmonitored,
+    });
+
     const response = await fetch(url, {
       headers: {
         "X-Api-Key": super.getSecretValue("apiKey"),
@@ -48,7 +49,7 @@ export class RadarrIntegration extends MediaOrganizerIntegration {
   private getLinksForRadarrCalendarEvent = (event: z.infer<typeof radarrCalendarEventSchema>) => {
     const links: CalendarEvent["links"] = [
       {
-        href: `${this.integration.url}/movie/${event.titleSlug}`,
+        href: this.url(`/movie/${event.titleSlug}`).toString(),
         name: "Radarr",
         logo: "/images/apps/radarr.svg",
         color: undefined,
@@ -93,7 +94,7 @@ export class RadarrIntegration extends MediaOrganizerIntegration {
   public async testConnectionAsync(): Promise<void> {
     await super.handleTestConnectionResponseAsync({
       queryFunctionAsync: async () => {
-        return await fetch(`${this.integration.url}/api`, {
+        return await fetch(this.url("/api"), {
           headers: { "X-Api-Key": super.getSecretValue("apiKey") },
         });
       },

packages/integrations/src/media-organizer/readarr/readarr-integration.ts

@@ -8,7 +8,7 @@ export class ReadarrIntegration extends MediaOrganizerIntegration {
   public async testConnectionAsync(): Promise<void> {
     await super.handleTestConnectionResponseAsync({
       queryFunctionAsync: async () => {
-        return await fetch(`${this.integration.url}/api`, {
+        return await fetch(this.url("/api"), {
           headers: { "X-Api-Key": super.getSecretValue("apiKey") },
         });
       },
@@ -27,12 +27,13 @@ export class ReadarrIntegration extends MediaOrganizerIntegration {
     includeUnmonitored = true,
     includeAuthor = true,
   ): Promise<CalendarEvent[]> {
-    const url = new URL(this.integration.url);
-    url.pathname = "/api/v1/calendar";
-    url.searchParams.append("start", start.toISOString());
-    url.searchParams.append("end", end.toISOString());
-    url.searchParams.append("unmonitored", includeUnmonitored.toString());
-    url.searchParams.append("includeAuthor", includeAuthor.toString());
+    const url = this.url("/api/v1/calendar", {
+      start,
+      end,
+      unmonitored: includeUnmonitored,
+      includeAuthor,
+    });
+
     const response = await fetch(url, {
       headers: {
         "X-Api-Key": super.getSecretValue("apiKey"),
@@ -58,7 +59,7 @@ export class ReadarrIntegration extends MediaOrganizerIntegration {
   private getLinksForReadarrCalendarEvent = (event: z.infer<typeof readarrCalendarEventSchema>) => {
     return [
       {
-        href: `${this.integration.url}/author/${event.author.foreignAuthorId}`,
+        href: this.url(`/author/${event.author.foreignAuthorId}`).toString(),
         color: "#f5c518",
         isDark: false,
         logo: "/images/apps/readarr.svg",
@@ -85,7 +86,7 @@ export class ReadarrIntegration extends MediaOrganizerIntegration {
     if (!bestImage) {
       return undefined;
     }
-    return `${this.integration.url}${bestImage.url}`;
+    return this.url(bestImage.url as `/${string}`).toString();
   };
 }
 

packages/integrations/src/media-organizer/sonarr/sonarr-integration.ts

@@ -12,14 +12,15 @@ export class SonarrIntegration extends MediaOrganizerIntegration {
    * @param includeUnmonitored When true results will include unmonitored items of the Sonarr library.
    */
   async getCalendarEventsAsync(start: Date, end: Date, includeUnmonitored = true): Promise<CalendarEvent[]> {
-    const url = new URL(this.integration.url);
-    url.pathname = "/api/v3/calendar";
-    url.searchParams.append("start", start.toISOString());
-    url.searchParams.append("end", end.toISOString());
-    url.searchParams.append("includeSeries", "true");
-    url.searchParams.append("includeEpisodeFile", "true");
-    url.searchParams.append("includeEpisodeImages", "true");
-    url.searchParams.append("unmonitored", includeUnmonitored ? "true" : "false");
+    const url = this.url("/api/v3/calendar", {
+      start,
+      end,
+      unmonitored: includeUnmonitored,
+      includeSeries: true,
+      includeEpisodeFile: true,
+      includeEpisodeImages: true,
+    });
+
     const response = await fetch(url, {
       headers: {
         "X-Api-Key": super.getSecretValue("apiKey"),
@@ -47,7 +48,7 @@ export class SonarrIntegration extends MediaOrganizerIntegration {
   private getLinksForSonarCalendarEvent = (event: z.infer<typeof sonarrCalendarEventSchema>) => {
     const links: CalendarEvent["links"] = [
       {
-        href: `${this.integration.url}/series/${event.series.titleSlug}`,
+        href: this.url(`/series/${event.series.titleSlug}`).toString(),
         name: "Sonarr",
         logo: "/images/apps/sonarr.svg",
         color: undefined,
@@ -92,7 +93,7 @@ export class SonarrIntegration extends MediaOrganizerIntegration {
   public async testConnectionAsync(): Promise<void> {
     await super.handleTestConnectionResponseAsync({
       queryFunctionAsync: async () => {
-        return await fetch(`${this.integration.url}/api`, {
+        return await fetch(this.url("/api"), {
           headers: { "X-Api-Key": super.getSecretValue("apiKey") },
         });
       },