🐛 (expo): Use OPDS URLs without any trimming

Author: aaronleopold

apps/expo/components/opds/OPDSAuthDialog.tsx

@@ -6,8 +6,9 @@ import { opdsURL } from '@stump/sdk/controllers'
 import { isAxiosError } from 'axios'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { Controller, useForm, useFormState } from 'react-hook-form'
-import { Image, View } from 'react-native'
+import { View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import TurboImage from 'react-native-turbo-image'
 import urlJoin from 'url-join'
 import { z } from 'zod'
 
@@ -154,7 +155,7 @@ export default function OPDSAuthDialog({ isOpen, authDoc, onClose }: OPDSAuthDia
 			<View className="flex-1 items-start gap-4 p-6">
 				{logoURL && (
 					<View className="w-full items-center justify-center">
-						<Image
+						<TurboImage
 							className="self-center"
 							source={{ uri: logoURL }}
 							style={{ width: 100, height: 100 }}

packages/sdk/src/api.ts

@@ -95,6 +95,24 @@ export class Api {
 		const instance = axios.create({
 			baseURL: this.serviceURL,
 			withCredentials: this.configuration.authMethod === 'session',
+			// Note: Keeping this here for posterity. I went down a DEEP rabbit hole on this one.
+			// If you read through https://github.com/ajslater/codex/issues/524 basically Stump
+			// was stripping trailing slashes from OPDS urls which caused issues with Codex, it would
+			// redirect to a url and axios wasn't preserving the Authorization header on the redirect for iOS.
+			// It _does_ on Android, though. From what I can tell about how axios works in the context of iOS in
+			// a react-native app, it uses native networking (i.e., CFNetwork/NSURLSession) which doesn't seem to
+			// adhere to _this_ beforeRedirect config. From what I understand, I'd need to hook into maybe
+			// https://developer.apple.com/documentation/foundation/urlsessiontaskdelegate/urlsession(_:task:willperformhttpredirection:newrequest:completionhandler:)
+			// which would mean a native module to handle it. That is a pretty sizable effort so for now I am just
+			// going to accept it as a limitation for iOS. A little unfortunate, but as long as there aren't servers
+			// which put feeds behind layers of redirects it should be fine.
+			// beforeRedirect: (config) => {
+			// 	config.headers = config.headers.concat(this.getHeaders())
+			// 	if (this._basicAuth) {
+			// 		config.auth = this._basicAuth
+			// 	}
+			// 	return config
+			// },
 		})
 
 		instance.interceptors.request.use(async (config) => {

packages/sdk/src/controllers/opds-api.ts

@@ -66,7 +66,9 @@ export class OPDSV2API extends APIBase {
 	async feed(url: string, params?: OPDSPageQuery): Promise<OPDSFeed> {
 		const absoluteUrl = resolveUrl(url, this.api.rootURL)
 		const resolvedURL = urlWithParams(
-			`${absoluteUrl.endsWith('/') ? absoluteUrl.slice(0, -1) : absoluteUrl}`,
+			// See https://github.com/ajslater/codex/issues/524 for commented out line
+			// `${absoluteUrl.endsWith('/') ? absoluteUrl.slice(0, -1) : absoluteUrl}`,
+			absoluteUrl,
 			toUrlParams(params),
 		)
 		const { data } = await this.axios.get<OPDSFeed>(resolvedURL, {

packages/sdk/src/utils/url.ts

@@ -28,14 +28,9 @@ export const formatApiURL = (url: string, version: ApiVersion) => {
 export const formatOPDSURL = (url: string) => {
 	let correctedUrl = url
 
-	// Remove trailing slash
-	if (correctedUrl.endsWith('/')) {
-		correctedUrl = correctedUrl.slice(0, -1)
-	}
-
-	// if (correctedUrl.endsWith('/api')) {
-	// 	correctedUrl = correctedUrl.slice(0, -4)
-	// }
+	// We don't remove trailing slash for OPDS urls since we don't have
+	// the knowledge of if they are needed like we do for internal API urls
+	// See https://github.com/ajslater/codex/issues/524
 
 	// Remove all double slashes AFTER the initial http://, https://, etc
 	correctedUrl = correctedUrl.replace(/([^:]\/)\/+/g, '$1')