diff --git a/src/components/Availability/AvailabilityReservations.tsx b/src/components/Availability/AvailabilityReservations.tsx index 559f968..60a12b2 100644 --- a/src/components/Availability/AvailabilityReservations.tsx +++ b/src/components/Availability/AvailabilityReservations.tsx @@ -38,8 +38,8 @@ export function AvailabilityReservations({ error, } = useQuery({ queryFn: () => - CodexSdk.marketplace() - .reservations(availability!.id) + CodexSdk.client() + .marketplace.reservations(availability!.id) .then((s) => Promises.rejectOnError(s)), queryKey: ["reservations"], diff --git a/src/components/Availability/useAvailabilityMutation.ts b/src/components/Availability/useAvailabilityMutation.ts index 87a4f35..b00d159 100644 --- a/src/components/Availability/useAvailabilityMutation.ts +++ b/src/components/Availability/useAvailabilityMutation.ts @@ -33,8 +33,8 @@ export function useAvailabilityMutation( input: Omit ) => Promise<"" | CodexAvailability> = input.id ? (input) => { - return CodexSdk.marketplace() - .updateAvailability({ + return CodexSdk.client() + .marketplace.updateAvailability({ totalSize: input.totalSize, duration: input.duration, minPricePerBytePerSecond: input.minPricePerBytePerSecond, @@ -44,8 +44,8 @@ export function useAvailabilityMutation( .then((s) => Promises.rejectOnError(s)); } : (input) => - CodexSdk.marketplace() - .createAvailability(input) + CodexSdk.client() + .marketplace.createAvailability(input) .then((s) => Promises.rejectOnError(s)); return fn({ diff --git a/src/components/Files/FileDetails.tsx b/src/components/Files/FileDetails.tsx index b5d178e..2dc58c4 100644 --- a/src/components/Files/FileDetails.tsx +++ b/src/components/Files/FileDetails.tsx @@ -26,8 +26,8 @@ type Props = { export function FileDetails({ onClose, details }: Props) { const { data: purchases = [] } = useQuery({ queryFn: () => - CodexSdk.marketplace() - .purchases() + CodexSdk.client() + .marketplace.purchases() .then(async (res) => { if (res.error) { return res; diff --git a/src/components/LogLevel/LogLevel.tsx b/src/components/LogLevel/LogLevel.tsx index a954416..8d035a2 100644 --- a/src/components/LogLevel/LogLevel.tsx +++ b/src/components/LogLevel/LogLevel.tsx @@ -17,8 +17,8 @@ export function LogLevel() { const [level, setLevel] = useState("DEBUG"); const { mutateAsync, isPending } = useMutation({ mutationFn: (level: CodexLogLevel) => - CodexSdk.debug() - .setLogLevel(level) + CodexSdk.client() + .debug.setLogLevel(level) .then((s) => Promises.rejectOnError(s)), onSuccess: () => { setToast({ diff --git a/src/components/ManifestFetch/ManifestFetch.tsx b/src/components/ManifestFetch/ManifestFetch.tsx index acbe97f..48b12bc 100644 --- a/src/components/ManifestFetch/ManifestFetch.tsx +++ b/src/components/ManifestFetch/ManifestFetch.tsx @@ -11,8 +11,8 @@ export function ManifestFetch() { const { refetch } = useQuery({ queryFn: () => { - CodexSdk.data() - .networkDownload(cid) + CodexSdk.client() + .data.networkDownload(cid) .then((s) => { if (s.error === false) { setCid(""); @@ -21,8 +21,8 @@ export function ManifestFetch() { return Promises.rejectOnError(s); }); - return CodexSdk.data() - .fetchManifest(cid) + return CodexSdk.client() + .data.fetchManifest(cid) .then((s) => { if (s.error === false) { setCid(""); diff --git a/src/components/NodeSpace/NodeSpace.tsx b/src/components/NodeSpace/NodeSpace.tsx index 0c65a20..3146c8f 100644 --- a/src/components/NodeSpace/NodeSpace.tsx +++ b/src/components/NodeSpace/NodeSpace.tsx @@ -15,8 +15,8 @@ const defaultSpace = { export function NodeSpace() { const { data: space, isPending } = useQuery({ queryFn: () => - CodexSdk.data() - .space() + CodexSdk.client() + .data.space() .then((s) => Promises.rejectOnError(s)), queryKey: ["space"], initialData: defaultSpace, diff --git a/src/components/Purchase/PurchasesTable.tsx b/src/components/Purchase/PurchasesTable.tsx index cc82493..be1c436 100644 --- a/src/components/Purchase/PurchasesTable.tsx +++ b/src/components/Purchase/PurchasesTable.tsx @@ -23,8 +23,8 @@ export function PurchasesTable() { const content = useData(); const { data, isPending } = useQuery({ queryFn: () => - CodexSdk.marketplace() - .purchases() + CodexSdk.client() + .marketplace.purchases() .then((s) => Promises.rejectOnError(s)), queryKey: ["purchases"], diff --git a/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx b/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx index 8514b40..83cb6c1 100644 --- a/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx +++ b/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx @@ -92,7 +92,7 @@ export function StorageRequestFileChooser({ editable={false} multiple={false} onDeleteItem={onDelete} - codexData={CodexSdk.data()} + codexData={CodexSdk.client().data} successMessage={"Success, the CID has been copied to the field on top."} /> diff --git a/src/components/StorageRequestSetup/useStorageRequestMutation.ts b/src/components/StorageRequestSetup/useStorageRequestMutation.ts index 322a865..1518267 100644 --- a/src/components/StorageRequestSetup/useStorageRequestMutation.ts +++ b/src/components/StorageRequestSetup/useStorageRequestMutation.ts @@ -18,8 +18,8 @@ export function useStorageRequestMutation( const { mutateAsync } = useMutation({ mutationFn: (input: CodexCreateStorageRequestInput) => - CodexSdk.marketplace() - .createStorageRequest(input) + CodexSdk.client() + .marketplace.createStorageRequest(input) .then((s) => Promises.rejectOnError(s)), onSuccess: async () => { queryClient.invalidateQueries({ queryKey: ["purchases"] }); diff --git a/src/components/UploadCard/UploadCard.tsx b/src/components/UploadCard/UploadCard.tsx index b598a7f..f554925 100644 --- a/src/components/UploadCard/UploadCard.tsx +++ b/src/components/UploadCard/UploadCard.tsx @@ -16,7 +16,7 @@ export function UploadCard() {
} /> diff --git a/src/hooks/useCodexConnection.tsx b/src/hooks/useCodexConnection.tsx index 57fb340..dca6176 100644 --- a/src/hooks/useCodexConnection.tsx +++ b/src/hooks/useCodexConnection.tsx @@ -8,8 +8,8 @@ export function useCodexConnection() { const { data, isError, isFetching, refetch } = useQuery({ queryKey: ["spr"], queryFn: async () => { - return CodexSdk.node() - .spr() + return CodexSdk.client() + .node.spr() .then((data) => Promises.rejectOnError(data, report)); }, refetchInterval: 5000, diff --git a/src/hooks/useData.tsx b/src/hooks/useData.tsx index a2865f1..cf69bbd 100644 --- a/src/hooks/useData.tsx +++ b/src/hooks/useData.tsx @@ -8,8 +8,8 @@ export function useData() { const { data = { content: [] } satisfies CodexDataResponse } = useQuery({ queryFn: () => - CodexSdk.data() - .cids() + CodexSdk.client() + .data.cids() .then((res) => Promises.rejectOnError(res)), queryKey: ["cids"], diff --git a/src/hooks/useDebug.ts b/src/hooks/useDebug.ts index ffe0369..9252bbd 100644 --- a/src/hooks/useDebug.ts +++ b/src/hooks/useDebug.ts @@ -6,8 +6,8 @@ export function useDebug(throwOnError: boolean) { const { data, isError, isPending, refetch, isSuccess, isFetching } = useQuery( { queryFn: () => - CodexSdk.debug() - .info() + CodexSdk.client() + .debug.info() .then((s) => Promises.rejectOnError(s)), queryKey: ["debug"], diff --git a/src/hooks/usePersistence.tsx b/src/hooks/usePersistence.tsx index 7546f11..9a5995f 100644 --- a/src/hooks/usePersistence.tsx +++ b/src/hooks/usePersistence.tsx @@ -8,8 +8,8 @@ export function usePersistence(isCodexOnline: boolean) { const { data, isError, isFetching, refetch } = useQuery({ queryKey: [], queryFn: async () => { - return CodexSdk.marketplace() - .activeSlots() + return CodexSdk.client() + .marketplace.activeSlots() .then((data) => Promises.rejectOnError(data, report)); }, diff --git a/src/proxy.ts b/src/proxy.ts index 190af7a..7e9e401 100644 --- a/src/proxy.ts +++ b/src/proxy.ts @@ -33,7 +33,6 @@ class CodexMarketplaceMock extends CodexMarketplace { override async createStorageRequest( input: CodexCreateStorageRequestInput ): Promise> { - console.info(input); const res = await super.createStorageRequest(input); if (res.error) { diff --git a/src/routes/dashboard/availabilities.tsx b/src/routes/dashboard/availabilities.tsx index 20d83f1..d423214 100644 --- a/src/routes/dashboard/availabilities.tsx +++ b/src/routes/dashboard/availabilities.tsx @@ -34,15 +34,15 @@ export function AvailabilitiesRoute() { AvailabilityWithSlots[] >({ queryFn: () => - CodexSdk.marketplace() - .availabilities() + CodexSdk.client() + .marketplace.availabilities() .then((s) => Promises.rejectOnError(s)) .then((res) => res.sort((a, b) => b.totalSize - a.totalSize)) .then((data) => Promise.all( data.map((a) => - CodexSdk.marketplace() - .reservations(a.id) + CodexSdk.client() + .marketplace.reservations(a.id) .then((res) => { if (res.error) { Errors.report(res); @@ -85,8 +85,8 @@ export function AvailabilitiesRoute() { // Error will be catched in ErrorBounday const { data: space = defaultSpace } = useQuery({ queryFn: () => - CodexSdk.data() - .space() + CodexSdk.client() + .data.space() .then((s) => Promises.rejectOnError(s)), queryKey: ["space"], initialData: defaultSpace, diff --git a/src/routes/dashboard/settings.css b/src/routes/dashboard/settings.css index adcb085..d8ff5c0 100644 --- a/src/routes/dashboard/settings.css +++ b/src/routes/dashboard/settings.css @@ -45,4 +45,8 @@ .input input { --codex-input-background-color: rgba(35, 35, 35, 1); } + + .basic-auth-checkbox { + margin-bottom: 16px; + } } diff --git a/src/sdk/codex.ts b/src/sdk/codex.ts index da348ba..60cb0e8 100644 --- a/src/sdk/codex.ts +++ b/src/sdk/codex.ts @@ -16,6 +16,10 @@ export const CodexSdk = { return url; }, + client() { + return client; + }, + async load() { const [ u = import.meta.env.VITE_CODEX_API_URL, @@ -42,7 +46,7 @@ export const CodexSdk = { url = u; const promises = [WebStorage.set("codex-node-url", url)]; - console.info(url); + if (options.auth) { const { username, password } = options.auth; basicAuthSecret = btoa(`${username}:${password}`); @@ -62,20 +66,4 @@ export const CodexSdk = { return Promise.all(promises); }, - - debug() { - return client.debug; - }, - - data() { - return client.data; - }, - - node() { - return client.node; - }, - - marketplace() { - return client.marketplace; - }, };