Merge pull request #26 from solid/move-logic

take solidLogic from rdflib

Author: bourgeoa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-logic",
-  "version": "1.3.12",
+  "version": "1.3.12-bbf45639",
   "description": "Core business logic of Solid OS",
   "main": "lib/index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "typescript": "4.5.4"
   },
   "dependencies": {
-    "rdflib": "^2.2.15",
+    "rdflib": "^2.2.15-bbf45639",
     "solid-namespace": "^0.5.2"
   }
 }

package.json

@@ -1,5 +1,5 @@
-import { NamedNode, Node, st, term } from "rdflib";
-import { LiveStore, SolidNamespace } from "../index";
+import { LiveStore, NamedNode, Node, st, term } from "rdflib";
+import { SolidNamespace } from "../index";
 import { ProfileLogic } from "../profile/ProfileLogic";
 import { newThing } from "../uri";
 import { determineChatContainer } from "./determineChatContainer";
@@ -38,7 +38,7 @@ export class ChatLogic {
     // Some servers don't present a Link http response header
     // if the container doesn't exist yet, so refetch the container
     // now that it has been created:
-    await this.store.fetcher.load(chatContainer);
+    await this.store.fetcher?.load(chatContainer);
 
     // FIXME: check the Why value on this quad:
     const chatAclDoc = this.store.any(
@@ -66,7 +66,7 @@ export class ChatLogic {
     acl:mode
         acl:Read, acl:Append.
 `;
-    await this.store.fetcher.webOperation("PUT", chatAclDoc.value, {
+    await this.store.fetcher?.webOperation("PUT", chatAclDoc.value, {
       data: aclBody,
       contentType: "text/turtle",
     });
@@ -81,7 +81,7 @@ export class ChatLogic {
     if (!privateTypeIndex) {
       throw new Error("Private type index not found!");
     }
-    await this.store.fetcher.load(privateTypeIndex);
+    await this.store.fetcher?.load(privateTypeIndex);
     const reg = newThing(privateTypeIndex);
     const ins = [
       st(
@@ -99,7 +99,7 @@ export class ChatLogic {
       st(reg, this.ns.solid("instance"), chatThing, privateTypeIndex.doc()),
     ];
     await new Promise((resolve, reject) => {
-      this.store.updater.update([], ins, function (_uri, ok, errm) {
+      this.store.updater?.update([], ins, function (_uri, ok, errm) {
         if (!ok) {
           reject(new Error(errm));
         } else {
@@ -115,7 +115,7 @@ export class ChatLogic {
     const chatContainer = determineChatContainer(invitee, podRoot);
     let exists = true;
     try {
-      await this.store.fetcher.load(
+      await this.store.fetcher?.load(
         new NamedNode(chatContainer.value + "index.ttl#this")
       );
     } catch (e) {
@@ -165,7 +165,7 @@ export class ChatLogic {
     }
 
     return new Promise(function (resolve, reject) {
-      updater.put(
+      updater?.put(
         newChatDoc,
         kb.statementsMatching(undefined, undefined, undefined, newChatDoc),
         "text/turtle",
@@ -213,7 +213,7 @@ export class ChatLogic {
   }
 
   private async sendInvite(invitee: NamedNode, chatThing: NamedNode) {
-    await this.store.fetcher.load(invitee.doc());
+    await this.store.fetcher?.load(invitee.doc());
     const inviteeInbox = this.store.any(
       invitee,
       this.ns.ldp("inbox"),
@@ -228,17 +228,17 @@ export class ChatLogic {
 ${this.ns.rdf("seeAlso")} <${chatThing.value}> . 
   `;
 
-    const inviteResponse = await this.store.fetcher.webOperation(
+    const inviteResponse = await this.store.fetcher?.webOperation(
       "POST",
       inviteeInbox.value,
       {
         data: inviteBody,
         contentType: "text/turtle",
       }
     );
-    const locationStr = inviteResponse.headers.get("location");
+    const locationStr = inviteResponse?.headers.get("location");
     if (!locationStr) {
-      throw new Error(`Invite sending returned a ${inviteResponse.status}`);
+      throw new Error(`Invite sending returned a ${inviteResponse?.status}`);
     }
   }
 }

src/chat/ChatLogic.ts

@@ -1,6 +1,6 @@
 // import { v4 as uuid } from "uuid";
-import { NamedNode, Node, st, term } from "rdflib";
-import { LiveStore, SolidNamespace } from "../index";
+import { LiveStore, NamedNode, Node, st, term } from "rdflib";
+import { SolidNamespace } from "../index";
 import { ProfileLogic } from "../profile/ProfileLogic";
 import { UtilityLogic } from "../util/UtilityLogic";
 // import { newThing } from "../uri";
@@ -70,7 +70,7 @@ export class InboxLogic {
     };
     const uploaded = await this.util.fetcher.fetch(archiveUrl, options);
     if (uploaded.status.toString()[0] === '2') {
-      await this.store.fetcher._fetch(url, {
+      await this.store.fetcher?._fetch(url, {
         method: 'DELETE'
       });
     }

src/inbox/InboxLogic.ts

@@ -10,18 +10,19 @@ import { ChatLogic } from "./chat/ChatLogic";
 import * as debug from "./debug";
 import { ProfileLogic } from "./profile/ProfileLogic";
 import { UtilityLogic } from "./util/UtilityLogic";
+import { ConnectedStore, LiveStore } from 'rdflib'
 
 export { ACL_LINK } from './util/UtilityLogic';
 
 const ns: SolidNamespace = solidNamespace(rdf);
 
-interface ConnectedStore extends Store {
+/* interface ConnectedStore extends Store {
   fetcher: Fetcher;
 }
 
 export interface LiveStore extends ConnectedStore {
   updater: UpdateManager;
-}
+} */
 
 export interface SolidNamespace {
   [key: string]: (term: string) => NamedNode;

src/index.ts

@@ -1,6 +1,6 @@
-import { NamedNode } from "rdflib";
+import { LiveStore, NamedNode } from "rdflib";
 import { AuthnLogic } from "../authn";
-import { LiveStore, SolidNamespace } from "../index";
+import { SolidNamespace } from "../index";
 
 export class ProfileLogic {
   store: LiveStore;
@@ -18,7 +18,7 @@ export class ProfileLogic {
     if (me === null) {
       throw new Error("Current user not found! Not logged in?");
     }
-    await this.store.fetcher.load(me.doc());
+    await this.store.fetcher?.load(me.doc());
     return me;
   }
 
@@ -31,7 +31,7 @@ export class ProfileLogic {
   }
 
   async getMainInbox(user: NamedNode): Promise<NamedNode> {
-    await this.store.fetcher.load(user);
+    await this.store.fetcher?.load(user);
     const mainInbox = this.store.any(user, this.ns.ldp("inbox"), undefined, user.doc());
     if (!mainInbox) {
       throw new Error("User main inbox not found!");

src/profile/ProfileLogic.ts

@@ -1,5 +1,5 @@
-import { NamedNode, Node, st, term, sym, Statement } from "rdflib";
-import { LiveStore, SolidNamespace } from "../index";
+import { LiveStore, NamedNode, Node, st, term, sym, Statement } from "rdflib";
+import { SolidNamespace } from "../index";
 import { ProfileLogic } from "../profile/ProfileLogic";
 import { newThing } from "../uri";
 
@@ -33,7 +33,7 @@ export class UtilityLogic {
 
   async findAclDocUrl(url: string) {
     const doc = this.store.sym(url);
-    await this.store.fetcher.load(doc);
+    await this.store.fetcher?.load(doc);
     const docNode = this.store.any(doc, ACL_LINK);
     if (!docNode) {
       throw new Error(`No ACL link discovered for ${url}`);
@@ -137,7 +137,7 @@ export class UtilityLogic {
 
   async getContainerMembers(containerUrl: string): Promise<string[]> {
     const containerNode = this.store.sym(containerUrl);
-    await this.store.fetcher.load(containerNode);
+    await this.store.fetcher?.load(containerNode);
     const nodes = this.getContainerElements(containerNode);
     return nodes.map(node => node.value);
   }