Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: extra fetch to get storage description #38

Merged
merged 3 commits into from
Dec 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions solid-common-lib/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getPodUrlAll, getSolidDataset, getStringNoLocale, getStringWithLocale, getThing, getUrl } from "@inrupt/solid-client";
import { getPodUrlAll, getSolidDataset, getStringNoLocale, getStringWithLocale, getThing, getThingAll, getUrl } from "@inrupt/solid-client";
import { Session } from "@inrupt/solid-client-authn-browser";
import { url } from "./types";
import { FOAF } from "@inrupt/vocab-common-rdf";
Expand All @@ -11,16 +11,44 @@ export { url } from "./types";
* @returns The URL's to the pods the user has access to
*/
export async function listPodUrls(session: Session): Promise<url[]> {
const urls = await getPodUrlAll(session.info.webId!, {
const webId = session.info.webId!
const urls = await getPodUrlAll(webId, {
fetch: session.fetch,
});

const fetchedUrl = await fetchStorageTriple(webId);
if (fetchedUrl) {
urls.push(fetchedUrl)
}

if (urls.length === 0) {
// TODO this is a guess and should be much more resilient
urls.push((new URL('../', session.info.webId!)).toString())
urls.push((new URL('../', webId)).toString())
}
return urls;
}

/**
* Get the storage description following the solid specification (only if the webid is hosted on the pod)
*/
async function fetchStorageTriple(webId: string) {
const resp = await fetch(webId, {
// If cache is used some links headers are not passed
cache: "no-cache"
});
if (!resp.ok) {
throw new Error("Failed to make HEAD request to webId")
}
const links = resp.headers.get("link")?.split(", ")
const storageDescriptionUrl = links?.find(l => l.includes('rel="http://www.w3.org/ns/solid/terms#storageDescription"'))?.replace(/<([^>]+)>.*/, "$1")
if (!storageDescriptionUrl) {
return undefined
}

const dataset = await getSolidDataset(storageDescriptionUrl)
const things = getThingAll(dataset);
const storageThing = things.find(t => t.predicates["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"].namedNodes?.includes("http://www.w3.org/ns/pim/space#Storage"));
return storageThing?.url
}

/**
* @param session An active Solid client connection
Expand Down