streamlined the fetcher

Author: timea-solid

src/inbox/InboxLogic.ts

@@ -44,7 +44,7 @@ export class InboxLogic {
     return ourInbox;
   }
   async markAsRead(url: string, date: Date) {
-    const downloaded = await this.util.underlyingFetch.fetch(url);
+    const downloaded = await this.store.fetcher._fetch(url);
     if (downloaded.status !== 200) {
       throw new Error(`Not OK! ${url}`);
     }
@@ -56,7 +56,7 @@ export class InboxLogic {
         [ 'Content-Type', downloaded.headers.get('Content-Type') || 'application/octet-stream' ]
       ]
     };
-    const uploaded = await this.util.underlyingFetch.fetch(archiveUrl, options);
+    const uploaded = await this.store.fetcher._fetch(archiveUrl, options);
     if (uploaded.status.toString()[0] === '2') {
       await this.store.fetcher?._fetch(url, {
         method: 'DELETE'

src/logic/SolidLogic.ts

@@ -30,8 +30,6 @@ export class SolidLogic {
 
     store: LiveStore;
     me: string | undefined;
-    underlyingFetch: { fetch: (url: string, options?: any) => any };
-
     chat: ChatLogic;
     profile: ProfileLogic;
     authn: AuthnLogic;
@@ -51,12 +49,11 @@ export class SolidLogic {
         profileDocument: {},
         preferencesFile: {},
         };
-        this.underlyingFetch = { fetch: fetch }; // Note global one not the one passed
         this.authn = new SolidAuthnLogic(session);
         debug.log('SolidAuthnLogic initialized')
         this.profile = new ProfileLogic(this.store, ns, this.authn);
         this.chat = new ChatLogic(this.store, ns, this.profile);
-        this.util = new UtilityLogic(this.store, ns, this.underlyingFetch);
+        this.util = new UtilityLogic(this.store, ns);
     }
 
     findAclDocUrl(url: string) {
@@ -257,6 +254,6 @@ export class SolidLogic {
     }
 
     async fetch(url: string, options?: any) {
-        return this.underlyingFetch.fetch(url, options);
+        return this.store.fetcher._fetch(url, options);
     }
 }

src/util/UtilityLogic.ts

@@ -11,12 +11,10 @@ export const ACL_LINK = sym(
 export class UtilityLogic {
   store: LiveStore;
   ns: SolidNamespace;
-  underlyingFetch: { fetch: (url: string, options?: any) => any };
 
-  constructor(store: LiveStore, ns: SolidNamespace, underlyingFetch: { fetch: (url: string, options?: any) => any }) {
+  constructor(store: LiveStore, ns: SolidNamespace) {
     this.store = store;
     this.ns = ns;
-    this.underlyingFetch = underlyingFetch;
   }
 
   async findAclDocUrl(url: string) {
@@ -65,7 +63,7 @@ export class UtilityLogic {
       ].join('\n')
     }
     const aclDocUrl = await this.findAclDocUrl(options.target);
-    return this.underlyingFetch.fetch(aclDocUrl, {
+    return this.store.fetcher._fetch(aclDocUrl, {
       method: 'PUT',
       body: str,
       headers: [
@@ -74,21 +72,6 @@ export class UtilityLogic {
     });
   }
 
-  async loadDoc(doc: NamedNode): Promise<void> {
-    // Load a document into the knowledge base (fetcher.store)
-    //   withCredentials: Web arch should let us just load by turning off creds helps CORS
-    //   reload: Gets around a specific old Chrome bug caching/origin/cors
-    // console.log('loading', profileDocument)
-    if (!this.store.fetcher) {
-      throw new Error("Cannot load doc, have no fetcher");
-    }
-    await this.store.fetcher.load(doc, {
-      withCredentials: false, // @@ BUT this won't work when logged in an accessing private stuff!
-      cache: "reload",
-    });
-    // console.log('loaded', profileDocument, this.store)
-  }
-
   isContainer(url: string) {
     return url.charAt(url.length-1) === "/";
   }
@@ -98,7 +81,7 @@ export class UtilityLogic {
       throw new Error(`Not a container URL ${url}`);
     }
     // Copied from https://github.com/solidos/solid-crud-tests/blob/v3.1.0/test/surface/create-container.test.ts#L56-L64
-    const result = await this.underlyingFetch.fetch(url, {
+    const result = await this.store.fetcher._fetch(url, {
       method: "PUT",
       headers: {
         "Content-Type": "text/turtle",
@@ -134,13 +117,13 @@ export class UtilityLogic {
     try {
       if (this.isContainer(url)) {
         const aclDocUrl = await this.findAclDocUrl(url);
-        await this.underlyingFetch.fetch(aclDocUrl, { method: "DELETE" });
+        await this.store.fetcher._fetch(aclDocUrl, { method: "DELETE" });
         const containerMembers = await this.getContainerMembers(url);
         await Promise.all(
           containerMembers.map((url) => this.recursiveDelete(url))
         );
       }
-      return this.underlyingFetch.fetch(url, { method: "DELETE" });
+      return this.store.fetcher._fetch(url, { method: "DELETE" });
     } catch (e) {
       // console.log(`Please manually remove ${url} from your system under test.`, e);
     }