solid-logic 1.3.14-fd51b121 → 1.3.15-599d981c

package/lib/util/UtilityLogic.js

@@ -43,10 +43,10 @@ exports.ACL_LINK = (0, rdflib_1.sym)("http://www.iana.org/assignments/link-relat
  * Utility-related logic
  */
 var UtilityLogic = /** @class */ (function () {
-    function UtilityLogic(store, ns, fetcher) {
+    function UtilityLogic(store, ns, underlyingFetch) {
         this.store = store;
         this.ns = ns;
-        this.fetcher = fetcher;
+        this.underlyingFetch = underlyingFetch;
     }
     UtilityLogic.prototype.findAclDocUrl = function (url) {
         var _a;
@@ -105,7 +105,7 @@ var UtilityLogic = /** @class */ (function () {
                         return [4 /*yield*/, this.findAclDocUrl(options.target)];
                     case 1:
                         aclDocUrl = _a.sent();
-                        return [2 /*return*/, this.fetcher.fetch(aclDocUrl, {
+                        return [2 /*return*/, this.underlyingFetch.fetch(aclDocUrl, {
                                 method: 'PUT',
                                 body: str,
                                 headers: [
@@ -151,7 +151,7 @@ var UtilityLogic = /** @class */ (function () {
                         if (!this.isContainer(url)) {
                             throw new Error("Not a container URL ".concat(url));
                         }
-                        return [4 /*yield*/, this.fetcher.fetch(url, {
+                        return [4 /*yield*/, this.underlyingFetch.fetch(url, {
                                 method: "PUT",
                                 headers: {
                                     "Content-Type": "text/turtle",
@@ -204,7 +204,7 @@ var UtilityLogic = /** @class */ (function () {
                         return [4 /*yield*/, this.findAclDocUrl(url)];
                     case 1:
                         aclDocUrl = _a.sent();
-                        return [4 /*yield*/, this.fetcher.fetch(aclDocUrl, { method: "DELETE" })];
+                        return [4 /*yield*/, this.underlyingFetch.fetch(aclDocUrl, { method: "DELETE" })];
                     case 2:
                         _a.sent();
                         return [4 /*yield*/, this.getContainerMembers(url)];
@@ -214,7 +214,7 @@ var UtilityLogic = /** @class */ (function () {
                     case 4:
                         _a.sent();
                         _a.label = 5;
-                    case 5: return [2 /*return*/, this.fetcher.fetch(url, { method: "DELETE" })];
+                    case 5: return [2 /*return*/, this.underlyingFetch.fetch(url, { method: "DELETE" })];
                     case 6:
                         e_1 = _a.sent();
                         return [3 /*break*/, 7];

package/lib/util/UtilityLogic.js.map

@@ -1 +1 @@
-{"version":3,"file":"UtilityLogic.js","sourceRoot":"","sources":["../../src/util/UtilityLogic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UtilityLogic.js","sourceRoot":"","sources":["../../src/util/UtilityLogic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8D;AAGjD,QAAA,QAAQ,GAAG,IAAA,YAAG,EACzB,oDAAoD,CACrD,CAAC;AAEF;;GAEG;AACH;IAKE,sBAAY,KAAgB,EAAE,EAAkB,EAAE,eAA+D;QAC/G,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEK,oCAAa,GAAnB,UAAoB,GAAW;;;;;;;wBACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBAChC,qBAAM,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAA,EAAA;;wBAAnC,SAAmC,CAAC;wBAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAQ,CAAC,CAAC;wBAC9C,IAAI,CAAC,OAAO,EAAE;4BACZ,MAAM,IAAI,KAAK,CAAC,qCAA8B,GAAG,CAAE,CAAC,CAAC;yBACtD;wBACD,sBAAO,OAAO,CAAC,KAAK,EAAC;;;;KACtB;IAED,2GAA2G;IACrG,0CAAmB,GAAzB,UAA0B,OAMzB;;;;;;wBACK,GAAG,GAAG;4BACR,gDAAgD;4BAChD,EAAE;4BACF,sDAA+C,OAAO,CAAC,UAAU,OAAI;4BACrE,0BAAmB,OAAO,CAAC,MAAM,OAAI;4BACrC,yBAAkB,OAAO,CAAC,MAAM,OAAI;4BACpC,8CAA8C;4BAC9C,EAAE;yBACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACZ,IAAI,OAAO,CAAC,aAAa,EAAE;4BACzB,GAAG,IAAI;gCACL,qCAAqC;gCACrC,uBAAgB,OAAO,CAAC,SAAS,OAAI;gCACrC,0BAAmB,OAAO,CAAC,MAAM,OAAI;gCACrC,qBAAc,OAAO,CAAC,aAAa,MAAG;gCACtC,EAAE;6BACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;yBACb;wBACD,IAAI,OAAO,CAAC,YAAY,EAAE;4BACxB,GAAG,IAAI;gCACL,oCAAoC;gCACpC,uBAAgB,OAAO,CAAC,SAAS,OAAI;gCACrC,yBAAkB,OAAO,CAAC,MAAM,OAAI;gCACpC,qBAAc,OAAO,CAAC,YAAY,MAAG;gCACrC,EAAE;6BACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;yBACb;wBACiB,qBAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;;wBAApD,SAAS,GAAG,SAAwC;wBAC1D,sBAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE;gCAC3C,MAAM,EAAE,KAAK;gCACb,IAAI,EAAE,GAAG;gCACT,OAAO,EAAE;oCACP,CAAE,cAAc,EAAE,aAAa,CAAE;iCAClC;6BACF,CAAC,EAAC;;;;KACJ;IAEK,8BAAO,GAAb,UAAc,GAAc;;;;;wBAC1B,0DAA0D;wBAC1D,sFAAsF;wBACtF,sEAAsE;wBACtE,0CAA0C;wBAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;4BACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;yBACrD;wBACD,qBAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;gCACjC,eAAe,EAAE,KAAK;gCACtB,KAAK,EAAE,QAAQ;6BAChB,CAAC,EAAA;;wBAHF,SAGE,CAAC;;;;;KAEJ;IAED,kCAAW,GAAX,UAAY,GAAW;QACrB,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IAChC,CAAC;IAEK,sCAAe,GAArB,UAAsB,GAAW;;;;;;wBAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;4BAC1B,MAAM,IAAI,KAAK,CAAC,8BAAuB,GAAG,CAAE,CAAC,CAAC;yBAC/C;wBAEc,qBAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE;gCACnD,MAAM,EAAE,KAAK;gCACb,OAAO,EAAE;oCACP,cAAc,EAAE,aAAa;oCAC7B,eAAe,EAAE,GAAG;oCACpB,IAAI,EAAE,uDAAuD,EAAE,6DAA6D;iCAC7H;gCACD,IAAI,EAAE,GAAG,EAAE,iGAAiG;6BAC7G,CAAC,EAAA;;wBARI,MAAM,GAAG,SAQb;wBACF,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;4BACvC,MAAM,IAAI,KAAK,CAAC,sBAAe,MAAM,CAAC,MAAM,mDAAyC,GAAG,CAAE,CAAC,CAAC;yBAC7F;;;;;KACF;IAED,2CAAoB,GAApB,UAAqB,aAAwB;QAC3C,OAAO,IAAI,CAAC,KAAK;aACd,kBAAkB,CACjB,aAAa,EACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,mCAAmC,CAAC,EACnD,SAAS,EACT,aAAa,CAAC,GAAG,EAAE,CACpB;aACA,GAAG,CAAC,UAAC,EAAa,IAAK,OAAA,EAAE,CAAC,MAAmB,EAAtB,CAAsB,CAAC,CAAC;IACpD,CAAC;IAEK,0CAAmB,GAAzB,UAA0B,YAAoB;;;;;;;wBACtC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;wBACnD,qBAAM,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,0CAAE,IAAI,CAAC,aAAa,CAAC,CAAA,EAAA;;wBAA7C,SAA6C,CAAC;wBACxC,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;wBACvD,sBAAO,KAAK,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,KAAK,EAAV,CAAU,CAAC,EAAC;;;;KACtC;IAEK,sCAAe,GAArB,UAAsB,GAAW;;;;;;;;6BAEzB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAArB,wBAAqB;wBACL,qBAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAA;;wBAAzC,SAAS,GAAG,SAA6B;wBAC/C,qBAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAA;;wBAAjE,SAAiE,CAAC;wBACzC,qBAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAA;;wBAAtD,gBAAgB,GAAG,SAAmC;wBAC5D,qBAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,KAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAzB,CAAyB,CAAC,CACzD,EAAA;;wBAFD,SAEC,CAAC;;4BAEJ,sBAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAC;;;;;;;;KAIhE;IAED,iCAAU,GAAV;QACE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,oCAAa,GAAb,UAAc,OAAe,EAAE,IAAU;QACvC,IAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACnC,IAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,GAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,IAAM,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,IAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAE,CAAC,CAAE,CAAC;QACzC,OAAO,IAAI,GAAG,CAAC,oBAAa,IAAI,cAAI,KAAK,cAAI,GAAG,cAAI,QAAQ,CAAE,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtF,CAAC;IACH,mBAAC;AAAD,CAAC,AAtJD,IAsJC;AAtJY,oCAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-logic",
-  "version": "1.3.14-fd51b121",
+  "version": "1.3.15-599d981c",
   "description": "Core business logic of Solid OS",
   "main": "lib/index.js",
   "scripts": {
@@ -24,23 +24,23 @@
   },
   "homepage": "https://github.com/solid/solid-logic#readme",
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "~7.16.5",
-    "@babel/plugin-proposal-optional-chaining": "~7.16.5",
-    "@babel/plugin-transform-async-to-generator": "~7.16.5",
+    "@babel/plugin-proposal-class-properties": "~7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "~7.16.7",
+    "@babel/plugin-transform-async-to-generator": "~7.16.8",
     "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/preset-env": "~7.16.5",
-    "@babel/preset-typescript": "~7.16.5",
-    "@types/jest": "^27.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^5.8.0",
-    "eslint": "^8.11.0",
+    "@babel/preset-env": "~7.16.11",
+    "@babel/preset-typescript": "~7.16.7",
+    "@types/jest": "^27.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.16.0",
+    "@typescript-eslint/parser": "^5.16.0",
+    "eslint": "^8.12.0",
     "jest": "^27.5.1",
     "jest-fetch-mock": "^3.0.3",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
   },
   "dependencies": {
-    "@inrupt/solid-client-authn-browser": "^1.11.6",
-    "rdflib": "^2.2.18",
+    "@inrupt/solid-client-authn-browser": "^1.11.7",
+    "rdflib": "^2.2.19",
     "solid-namespace": "^0.5.2"
   }
 }

package/src/authn/SolidAuthnLogic.ts

@@ -4,21 +4,21 @@ import * as debug from '../util/debug'
 import { Session } from "@inrupt/solid-client-authn-browser";
 import { AuthenticationContext, AuthnLogic } from "../types";
 export class SolidAuthnLogic implements AuthnLogic {
-  private session: Session; 
+  private session: Session;
 
   constructor(solidAuthSession: Session) {
     this.session = solidAuthSession;
   }
-  
+
   // we created authSession getter because we want to access it as authn.authSession externally
-  get authSession():Session { return this.session } 
+  get authSession():Session { return this.session }
 
   currentUser(): NamedNode | null {
     const app = appContext()
     if (app.viewingNoAuthPage) {
       return sym(app.webId)
     }
-    if (this.session.info.webId && this.session.info.isLoggedIn) {
+    if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
       return sym(this.session.info.webId)
     }
     return offlineTestID() // null unless testing
@@ -120,4 +120,4 @@ export class SolidAuthnLogic implements AuthnLogic {
     return webId
   }
 
-}
+}

package/src/discovery/discoveryLogic.ts

@@ -0,0 +1,311 @@
+import { NamedNode, Namespace, LiveStore, sym, st } from "rdflib";
+// import * as debug from '../util/debug'
+// import { getContainerMembers } from '../util/UtilityLogic'
+import { solidLogicSingleton } from "../logic/solidLogicSingleton"
+import { newThing } from "../util/uri"
+
+const {  authn } = solidLogicSingleton
+const { currentUser } = authn
+
+type TypeIndexScope = { label: string, index: NamedNode, agent: NamedNode } ;
+type ScopedApp = { instance: NamedNode, scope: TypeIndexScope }
+
+const ns = {
+  dct:     Namespace('http://purl.org/dc/terms/'),
+  ldp:     Namespace('http://www.w3.org/ns/ldp#'),
+  meeting: Namespace('http://www.w3.org/ns/pim/meeting#'),
+  rdf:     Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#'),
+  schema:  Namespace('http://schema.org/'),
+  solid:   Namespace('http://www.w3.org/ns/solid/terms#'),
+  space:   Namespace('http://www.w3.org/ns/pim/space#'),
+  stat:    Namespace('http://www.w3.org/ns/posix/stat#'),
+  vcard:   Namespace('http://www.w3.org/2006/vcard/ns#'),
+  wf:      Namespace('http://www.w3.org/2005/01/wf/flow#'),
+  xsd:     Namespace('http://www.w3.org/2001/XMLSchema#')
+
+}
+
+/** Create a resource if it really does not exist
+ *  Be absolutely sure something does not exist before creating a new empty file
+ * as otherwise existing could  be deleted.
+ * @param doc {NamedNode} - The resource
+ */
+export async function loadOrCreateIfNotExists (store: LiveStore, doc: NamedNode) {
+    let response
+    // console.log('@@ loadOrCreateIfNotExists doc ', doc)
+    try {
+      response = await store.fetcher.load(doc)
+    } catch (err) {
+        if (err.response.status === 404) {
+          // console.log('createIfNotExists doc does NOT exist, will create: ' + doc)
+          try {
+            store.fetcher.webOperation('PUT', doc, {data: '', contentType: 'text/turtle'})
+          } catch (err) {
+            const msg = 'createIfNotExists: PUT FAILED: ' + doc + ': ' + err
+            // console.log(msg)
+            throw new Error(msg)
+          }
+          delete store.fetcher.requested[doc.uri] // delete cached 404 error
+          // console.log('createIfNotExists doc created ok ' + doc)
+        } else {
+          const msg =  'createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err
+          // console.log(msg)
+          throw new Error(msg) // @@ add nested errors
+        }
+    }
+    // console.log('createIfNotExists doc exists, all good ' + doc)
+    return response
+}
+
+export function suggestPreferencesFile (me:NamedNode) {
+  const stripped = me.uri.replace('/profile/', '/').replace('/public/', '/')
+  // const stripped = me.uri.replace(\/[p|P]rofile/\g, '/').replace(\/[p|P]ublic/\g, '/')
+  const folderURI = stripped.split('/').slice(0,-1).join('/') + '/Settings/'
+  const fileURI = folderURI + 'Preferences.ttl'
+  return sym(fileURI)
+}
+
+export function suggestPublicTypeIndex (me:NamedNode) {
+  return sym(me.doc().dir()?.uri + 'publicTypeIndex.ttl')
+}
+// Note this one is based off the pref file not the profile
+
+export function suggestPrivateTypeIndex (preferencesFile:NamedNode) {
+  return sym(preferencesFile.doc().dir()?.uri + 'privateTypeIndex.ttl')
+}
+/* Follow link from this doc to another thing, or else make a new link
+**
+**  return: null no ld one and failed to make a new one
+*/
+export async function followOrCreateLink(store: LiveStore, subject: NamedNode, predicate: NamedNode,
+     object: NamedNode, doc:NamedNode):Promise<NamedNode | null> {
+  await store.fetcher.load(doc)
+  const result = store.any(subject, predicate, null, doc)
+  // console.log('@@ followOrCreateLink result ', result)
+
+  if (result) return result as NamedNode
+  if (!store.updater.editable(doc)) {
+    // console.log(`followOrCreateLink:  Can't modify ${doc} so can't make new link to ${object}.`)
+    // console.log('followOrCreateLink @@ connectedStatements', store.connectedStatements(subject))
+    return null
+  }
+  try {
+    await store.updater.update([], [ st(subject, predicate, object, doc)])
+  } catch (err) {
+    console.warn(`followOrCreateLink: Error making link in ${doc} to ${object}: ${err}`)
+    return null
+  }
+
+  // console.log(`Success making link in ${doc} to ${object}` )
+
+  try {
+    await loadOrCreateIfNotExists(store, object)
+    // store.fetcher.webOperation('PUT', object, { data: '', contentType: 'text/turtle'})
+  } catch (err) {
+    console.warn(`followOrCreateLink: Error loading or saving new linked document: ${object}: ${err}`)
+  }
+  // console.log(`followOrCreateLink: Success loading or saving new linked document: ${object}.`)
+  return object
+}
+
+export async function loadProfile(store: LiveStore, user: NamedNode) {
+  // console.log(' @@  loadProfile: user', user)
+  if (!user) {
+    throw new Error(`loadProfile: no user given.`)
+  }
+  // try {
+    await store.fetcher.load(user.doc())
+  // } catch (err) {
+  //  throw new Error(`Unable to load profile of user ${user}: ${err}`)
+  //}
+  return user.doc()
+}
+
+export async function loadPreferences(store: LiveStore, user: NamedNode): Promise <NamedNode | undefined > {
+  // console.log('loadPreferences @@ user', user)
+  await loadProfile(store as LiveStore, user)
+
+  const possiblePreferencesFile = suggestPreferencesFile(user)
+
+  const preferencesFile = await followOrCreateLink(store, user,  ns.space('preferencesFile') as NamedNode, possiblePreferencesFile, user.doc())
+  // const preferencesFile = store.any(user, ns.space('preferencesFile'), undefined, profile)
+
+  // console.log('loadPreferences @@ pref file', preferencesFile)
+  if (!preferencesFile) {
+    const message = `User ${user} has no pointer in profile to preferences file.`
+    console.warn(message)
+    // throw new Error()
+    return undefined
+  }
+  try {
+    await store.fetcher.load(preferencesFile as NamedNode)
+  } catch (err) { // Mabeb a permission propblem or origin problem
+    return undefined
+    // throw new Error(`Unable to load preferences file ${preferencesFile} of user <${user}>: ${err}`)
+  }
+  return preferencesFile as NamedNode
+}
+
+export async function loadTypeIndexesFor(store: LiveStore, user:NamedNode): Promise<Array<TypeIndexScope>> {
+  // console.log('@@ loadTypeIndexesFor user', user)
+  if (!user) throw new Error(`loadTypeIndexesFor: No user given`)
+  const profile = await loadProfile(store, user)
+
+  const suggestion = suggestPublicTypeIndex(user)
+
+  const publicTypeIndex = await followOrCreateLink(store, user, ns.solid('publicTypeIndex') as NamedNode, suggestion, profile)
+
+  // const publicTypeIndex = store.any(user, ns.solid('publicTypeIndex'), undefined, profile)
+  // console.log('@@ loadTypeIndexesFor publicTypeIndex', publicTypeIndex)
+
+  const  publicScopes = publicTypeIndex ? [ { label: 'public', index: publicTypeIndex as NamedNode, agent: user } ] : []
+
+  let preferencesFile
+  try {
+    preferencesFile = await loadPreferences(store, user)
+  } catch (err) {
+    preferencesFile = null
+  }
+
+  let privateScopes
+  if (preferencesFile) { // watch out - can be in either as spec was not clear.  Legacy is profile.
+    // If there is a legacy one linked from the profile, use that.
+    // Otherwiae use or make one linked from Preferences
+    const suggestedPrivateTypeIndex = suggestPrivateTypeIndex(preferencesFile)
+
+    const privateTypeIndex = store.any(user, ns.solid('privateTypeIndex'), undefined, profile) ||
+
+        await followOrCreateLink(store, user, ns.solid('privateTypeIndex') as NamedNode, suggestedPrivateTypeIndex, preferencesFile);
+
+    privateScopes = privateTypeIndex ? [ { label: 'private', index: privateTypeIndex as NamedNode, agent: user } ] : []
+  } else {
+    privateScopes = []
+  }
+  const scopes =  publicScopes.concat(privateScopes)
+  if (scopes.length === 0) return scopes
+  const files = scopes.map(scope => scope.index)
+  // console.log('@@ loadTypeIndexesFor files ', files)
+  try {
+    await store.fetcher.load(files)
+  } catch (err) {
+    console.warn('Problems loading type index: ', err)
+  }
+  return scopes
+}
+
+export async function loadCommunityTypeIndexes (store:LiveStore, user:NamedNode): Promise<TypeIndexScope[][]> {
+  const preferencesFile = await loadPreferences(store, user)
+  if (preferencesFile) { // For now, pick up communities as simple links from the preferences file.
+    const communities = store.each(user, ns.solid('community'), undefined, preferencesFile as NamedNode)
+    // console.log('loadCommunityTypeIndexes communities: ',communities)
+    let result = []
+    for (const org of communities) {
+      result = result.concat(await loadTypeIndexesFor(store, org as NamedNode) as any)
+    }
+    // const communityTypeIndexesPromises = communities.map(async community => await loadTypeIndexesFor(store, community as NamedNode))
+    // const result1 = Promise.all(communityTypeIndexesPromises)
+    return result
+  }
+  return [] // No communities
+}
+
+export async function loadAllTypeIndexes (store:LiveStore, user:NamedNode) {
+  return (await loadTypeIndexesFor(store, user)).concat((await loadCommunityTypeIndexes(store, user)).flat())
+}
+
+// Utility: remove duplicates from Array of NamedNodes
+
+export function uniqueNodes (arr: NamedNode[]): NamedNode[] {
+  const uris = arr.map(x => x.uri)
+  const set = new Set(uris)
+  const uris2 = Array.from(set)
+  const arr2 = uris2.map(u => new NamedNode(u))
+  return arr2 // Array.from(new Set(arr.map(x => x.uri))).map(u => sym(u))
+}
+
+export async function getScopedAppsfromIndex (store, scope, theClass: NamedNode) {
+  // console.log(`getScopedAppsfromIndex agent ${scope.agent} index: ${scope.index}` )
+  const index = scope.index
+  const registrations = store.each(undefined, ns.solid('forClass'), theClass, index)
+  // console.log('    registrations', registrations )
+
+  const directInstances = registrations.map(reg => store.each(reg as NamedNode, ns.solid('instance'), null, index)).flat()
+  // console.log('    directInstances', directInstances )
+  let instances = uniqueNodes(directInstances)
+
+/*
+  let instanceContainers = []
+  for (const reg of registrations) {
+    const cont = store.any(reg as NamedNode, ns.solid('instanceContainer'), null, index)
+    if (cont) {
+      // console.log('   @@ getScopedAppsfromIndex got one: ', cont)
+      instanceContainers.push(cont)
+    }
+  }
+  */
+ const instanceContainers = registrations.map(
+     reg => store.each(reg as NamedNode, ns.solid('instanceContainer'), null, index)).flat()
+
+  //  instanceContainers may be deprocatable if no one has used them
+
+  const containers = uniqueNodes(instanceContainers)
+  for (let i = 0; i < containers.length; i++) {
+    const cont = containers[i]
+    await store.fetcher.load(cont)
+    const contents = store.each(cont, ns.ldp('contains'), null, cont)
+    // if (contents.length) console.log('getScopedAppsfromIndex @@ instanceContainer contents:', contents)
+    instances = instances.concat(contents)
+  }
+  return instances.map(instance => { return {instance, scope}})
+}
+
+
+export async function getScopedAppInstances (store:LiveStore, klass: NamedNode, user: NamedNode):Promise<ScopedApp[]> {
+  // console.log('getScopedAppInstances @@ ' + user)
+  const scopes = await loadAllTypeIndexes(store, user)
+  let scopedApps = []
+  for (const scope of scopes) {
+    const scopedApps0 = await getScopedAppsfromIndex(store, scope, klass) as any
+    scopedApps = scopedApps.concat(scopedApps0)
+  }
+  return scopedApps
+}
+// This is the function signature which used to be in solid-ui/logic
+// Recommended to use getScopedAppInstances instead as it provides more information.
+//
+export async function getAppInstances (store:LiveStore, klass: NamedNode): Promise<NamedNode[]> {
+  const user = currentUser()
+  if (!user) throw new Error('getAppInstances: Must be logged in to find apps.')
+  const scopedAppInstances = await getScopedAppInstances(store, klass, user)
+  return scopedAppInstances.map(scoped => scoped.instance)
+}
+/**
+ * Register a new app in a type index
+ * used in chat in bookmark.js (solid-ui)
+ * Returns the registration object if successful else null
+ */
+export async function registerInstanceInTypeIndex (
+  store:LiveStore,
+  instance: NamedNode,
+  index: NamedNode,
+  theClass: NamedNode,
+  // agent: NamedNode
+): Promise<NamedNode | null> {
+    const registration = newThing(index)
+    const ins = [
+        // See https://github.com/solid/solid/blob/main/proposals/data-discovery.md
+        st(registration, ns.rdf('type'), ns.solid('TypeRegistration'), index),
+        st(registration, ns.solid('forClass'), theClass, index),
+        st(registration, ns.solid('instance'), instance, index)
+    ]
+    try {
+      console.log('patching index', ins)
+        await store.updater.update([], ins)
+    } catch (err) {
+        const msg = `Unable to register ${instance} in index ${index}: ${err}`
+        console.warn(msg)
+        return null
+    }
+    return registration
+}
+// ENDS

package/src/inbox/InboxLogic.ts

@@ -44,7 +44,7 @@ export class InboxLogic {
     return ourInbox;
   }
   async markAsRead(url: string, date: Date) {
-    const downloaded = await this.util.fetcher.fetch(url);
+    const downloaded = await this.util.underlyingFetch.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.fetcher.fetch(archiveUrl, options);
+    const uploaded = await this.util.underlyingFetch.fetch(archiveUrl, options);
     if (uploaded.status.toString()[0] === '2') {
       await this.store.fetcher?._fetch(url, {
         method: 'DELETE'

package/src/index.ts

@@ -12,12 +12,22 @@ export {
   setACLUserPublic,
   genACLText
 } from './acl/aclLogic'
+
 export {
   ensureTypeIndexes,
   loadTypeIndexes,
   registerInTypeIndex,
   loadIndex
 } from './typeIndex/typeIndexLogic'
+
+export {
+  loadProfile,
+  loadPreferences,
+  loadTypeIndexesFor,
+  loadCommunityTypeIndexes,
+  loadAllTypeIndexes
+} from './discovery/discoveryLogic'
+
 export { SolidLogic } from './logic/SolidLogic'
 export { offlineTestID, appContext } from './authn/authUtil'
 export { ACL_LINK } from './util/UtilityLogic'

package/src/logic/SolidLogic.ts

@@ -10,6 +10,13 @@ import * as debug from "../util/debug";
 import { UtilityLogic } from "../util/UtilityLogic";
 import { CrossOriginForbiddenError, FetchError, NotFoundError, SameOriginForbiddenError, UnauthorizedError } from "./CustomError";
 
+import { solidLogicSingleton } from "../logic/solidLogicSingleton"
+/*
+** It is important to distinquish `fetch`, a function provided by the browser
+** and `Fetcher`, a helper object for the rdflib Store which turns it
+** into a `ConnectedStore` or a `LiveStore`.  A Fetcher object is
+** available at store.fetcher, and `fetch` function at `store.fetcher._fetch`,
+*/
 
 const ns: SolidNamespace = solidNamespace(rdf);
 
@@ -25,60 +32,64 @@ export class SolidLogic {
 
     store: LiveStore;
     me: string | undefined;
-    fetcher: { fetch: (url: string, options?: any) => any };
+    underlyingFetch: { fetch: (url: string, options?: any) => any };
 
     chat: ChatLogic;
     profile: ProfileLogic;
     authn: AuthnLogic;
     util: UtilityLogic;
 
-    constructor(fetcher: { fetch: (url: any, requestInit: any) => any }, session: Session) {
+    constructor(specialFetch: { fetch: (url: any, requestInit: any) => any }, session: Session) {
+  // would xpect to be able to do it this way: but get TypeError:  Failed to execute 'fetch' on 'Window': Illegal invocation status: 999
+        // this.store = new rdf.LiveStore({})
+        // this.store.fetcher._fetch = fetch
+        console.log("SolidLogic: Unique instance created.  There should only be one of these.")
         this.store = rdf.graph() as LiveStore; // Make a Quad store
-        rdf.fetcher(this.store, fetcher); // Attach a web I/O module, store.fetcher
+        rdf.fetcher(this.store, { fetch: specialFetch.fetch}); // Attach a web I/O module, store.fetcher
         this.store.updater = new rdf.UpdateManager(this.store); // Add real-time live updates store.updater
+
         this.store.features = [] // disable automatic node merging on store load
         this.cache = {
         profileDocument: {},
         preferencesFile: {},
         };
-        this.fetcher = fetcher;
+        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.fetcher);
+        this.util = new UtilityLogic(this.store, ns, this.underlyingFetch);
     }
 
     findAclDocUrl(url: string) {
         return this.util.findAclDocUrl(url);
     }
 
-    loadDoc(doc: NamedNode): Promise<void> {
-        return this.util.loadDoc(doc);
-    }
-
     async loadProfile(me: NamedNode): Promise<NamedNode> {
-        // console.log('loadProfile', me)
+        /*
+      // console.log('loadProfile cache ', this.cache)
         if (this.cache.profileDocument[me.value]) {
         return this.cache.profileDocument[me.value];
-        }
-        let profileDocument;
+      }    @@ just use the cache in the store
+        */
+        console.log('loadProfile  me ', me)
+        const profileDocument = me.doc()
         try {
-        profileDocument = me.doc();
-        await this.loadDoc(profileDocument);
-        return profileDocument;
+          await this.store.fetcher.load(profileDocument);
+          return profileDocument;
         } catch (err) {
-        const message = `Logged in but cannot load profile ${profileDocument} : ${err}`;
+        const message = `Cannot load profile ${profileDocument} : ${err}`;
         throw new Error(message);
         }
     }
 
     async loadPreferences(me: NamedNode): Promise<NamedNode> {
-        // console.log('loadPreferences', me)
+        console.log('loadPreferences cache ', this.cache)
         if (this.cache.preferencesFile[me.value]) {
         return this.cache.preferencesFile[me.value];
         }
-        const preferencesFile = this.store.any(me, ns.space("preferencesFile"));
+        await this.loadProfile(me) // Load pointer to pref file
+        const preferencesFile = this.store.any(me, ns.space('preferencesFile'), null, me.doc());
 
         // console.log('this.store.any()', this.store.any())
         /**
@@ -100,12 +111,9 @@ export class SolidLogic {
         );
         }
 
-        if (!this.store.fetcher) {
-        throw new Error("Cannot load doc, have no fetcher");
-        }
         // //// Load preference file
         try {
-        await this.store.fetcher.load(preferencesFile as NamedNode, {
+        await solidLogicSingleton.store.fetcher.load(preferencesFile as NamedNode, { // @@ was this.store.
             withCredentials: true,
         });
         } catch (err) {
@@ -152,9 +160,6 @@ export class SolidLogic {
     }
 
     load(doc: NamedNode | NamedNode[] | string) {
-        if (!this.store.fetcher) {
-        throw new Error("Cannot load doc(s), have no fetcher");
-        }
         return this.store.fetcher.load(doc);
     }
 
@@ -210,9 +215,6 @@ export class SolidLogic {
     }
 
     async createEmptyRdfDoc(doc: NamedNode, comment: string) {
-        if (!this.store.fetcher) {
-        throw new Error("Cannot create empty rdf doc, have no fetcher");
-        }
         await this.store.fetcher.webOperation("PUT", doc.uri, {
         data: `# ${new Date()} ${comment}
     `,
@@ -226,9 +228,6 @@ export class SolidLogic {
         ins: Array<Statement> = []
     ): Promise<void> {
         return new Promise((resolve, reject) => {
-        if (!this.store.updater) {
-            throw new Error("Cannot updatePromise, have no updater");
-        }
         this.store.updater.update(del, ins, function (_uri, ok, errorBody) {
             if (!ok) {
             reject(new Error(errorBody));
@@ -260,6 +259,6 @@ export class SolidLogic {
     }
 
     async fetch(url: string, options?: any) {
-        return this.fetcher.fetch(url, options);
+        return this.underlyingFetch.fetch(url, options);
     }
 }