jinaga-server 1.0.0 → 1.1.0

package/dist/postgres/specification-sql.js

@@ -1,119 +1,252 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sqlFromSpecification = void 0;
+exports.sqlFromFeed = exports.sqlFromSpecification = void 0;
+const jinaga_1 = require("jinaga");
 const maps_1 = require("./maps");
-const query_description_1 = require("./query-description");
-const query_description_builder_1 = require("./query-description-builder");
-class DescriptionBuilder extends query_description_builder_1.QueryDescriptionBuilder {
-    constructor(factTypes, roleMap) { super(factTypes, roleMap); }
-    buildDescriptions(start, specification) {
-        // Verify that the number of start facts equals the number of inputs
-        if (start.length !== specification.given.length) {
-            throw new Error(`The number of start facts (${start.length}) does not equal the number of inputs (${specification.given.length})`);
-        }
-        // Verify that the input type matches the start fact type
-        for (let i = 0; i < start.length; i++) {
-            if (start[i].type !== specification.given[i].type) {
-                throw new Error(`The type of start fact ${i} (${start[i].type}) does not match the type of input ${i} (${specification.given[i].type})`);
+;
+class QueryDescription {
+    constructor(inputs, parameters, outputs, edges, notExistsConditions = []) {
+        this.inputs = inputs;
+        this.parameters = parameters;
+        this.outputs = outputs;
+        this.edges = edges;
+        this.notExistsConditions = notExistsConditions;
+    }
+    generateSqlQuery(bookmark, limit) {
+        const hashes = this.outputs
+            .map(output => `f${output.factIndex}.hash as hash${output.factIndex}`)
+            .join(", ");
+        const factIds = this.outputs
+            .map(output => `f${output.factIndex}.fact_id`)
+            .join(", ");
+        const firstEdge = this.edges[0];
+        const predecessorFact = this.inputs.find(i => i.factIndex === firstEdge.predecessorFactIndex);
+        const successorFact = this.inputs.find(i => i.factIndex === firstEdge.successorFactIndex);
+        const firstFactIndex = predecessorFact ? predecessorFact.factIndex : successorFact.factIndex;
+        const writtenFactIndexes = new Set().add(firstFactIndex);
+        const joins = generateJoins(this.edges, writtenFactIndexes);
+        const inputWhereClauses = this.inputs
+            .filter(input => input.factTypeParameter !== 0)
+            .map(input => `f${input.factIndex}.fact_type_id = $${input.factTypeParameter} AND f${input.factIndex}.hash = $${input.factHashParameter}`)
+            .join(" AND ");
+        const notExistsWhereClauses = this.notExistsConditions
+            .map(notExistsWhereClause => ` AND NOT EXISTS (${generateNotExistsWhereClause(notExistsWhereClause, writtenFactIndexes)})`)
+            .join("");
+        const bookmarkParameter = this.parameters.length + 1;
+        const limitParameter = bookmarkParameter + 1;
+        const sql = `SELECT ${hashes}, sort(array[${factIds}], 'desc') as bookmark FROM public.fact f${firstFactIndex}${joins.join("")} WHERE ${inputWhereClauses}${notExistsWhereClauses} AND sort(array[${factIds}], 'desc') > $${bookmarkParameter} ORDER BY bookmark ASC LIMIT $${limitParameter}`;
+        const bookmarkValue = parseBookmark(bookmark);
+        return {
+            sql,
+            parameters: [...this.parameters, bookmarkValue, limit],
+            labels: this.outputs.map(output => ({
+                type: output.type,
+                index: output.factIndex
+            })),
+            bookmark: "[]"
+        };
+    }
+}
+function generateJoins(edges, writtenFactIndexes) {
+    const joins = [];
+    edges.forEach(edge => {
+        if (writtenFactIndexes.has(edge.predecessorFactIndex)) {
+            if (writtenFactIndexes.has(edge.successorFactIndex)) {
+                joins.push(` JOIN public.edge e${edge.edgeIndex}` +
+                    ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
+                    ` AND e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
+                    ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`);
+            }
+            else {
+                joins.push(` JOIN public.edge e${edge.edgeIndex}` +
+                    ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
+                    ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`);
+                joins.push(` JOIN public.fact f${edge.successorFactIndex}` +
+                    ` ON f${edge.successorFactIndex}.fact_id = e${edge.edgeIndex}.successor_fact_id`);
+                writtenFactIndexes.add(edge.successorFactIndex);
             }
         }
-        // Allocate a fact table for each given.
-        // While the fact type and hash parameters are zero, the join will not be written.
-        const inputs = specification.given
-            .map((label, i) => ({
-            label: label.name,
-            factIndex: i + 1,
-            factTypeId: (0, maps_1.getFactTypeId)(this.factTypes, label.type),
-            factHash: start[i].hash,
-            factTypeParameter: 0,
-            factHashParameter: 0
-        }));
-        const facts = specification.given
-            .map((label, i) => ({
-            factIndex: i + 1,
-            type: label.type
-        }));
-        const givenFacts = specification.given.reduce((knownFacts, label, i) => (Object.assign(Object.assign({}, knownFacts), { [label.name]: facts[i] })), {});
-        // The QueryDescription is an immutable data type.
-        // Initialize it with the inputs and facts.
-        // The DescriptionBuilder will branch at various points, and
-        // build on the current query description along each branch.
-        const initialQueryDescription = new query_description_1.QueryDescription(inputs, [], [], facts, [], []);
-        const { queryDescriptions, knownFacts } = this.addEdges(initialQueryDescription, givenFacts, [], "", specification.matches);
-        // The final query description represents the complete tuple.
-        // Build projections onto that one.
-        const finalQueryDescription = queryDescriptions[queryDescriptions.length - 1];
-        if (Array.isArray(specification.childProjections)) {
-            const queryDescriptionsWithProjections = this.addProjections(finalQueryDescription, knownFacts, specification.childProjections);
-            return [...queryDescriptions, ...queryDescriptionsWithProjections];
+        else if (writtenFactIndexes.has(edge.successorFactIndex)) {
+            joins.push(` JOIN public.edge e${edge.edgeIndex}` +
+                ` ON e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
+                ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`);
+            joins.push(` JOIN public.fact f${edge.predecessorFactIndex}` +
+                ` ON f${edge.predecessorFactIndex}.fact_id = e${edge.edgeIndex}.predecessor_fact_id`);
+            writtenFactIndexes.add(edge.predecessorFactIndex);
+        }
+        else {
+            throw new Error("Neither predecessor nor successor fact has been written");
+        }
+    });
+    return joins;
+}
+function generateNotExistsWhereClause(notExistsWhereClause, outerFactIndexes) {
+    const firstEdge = notExistsWhereClause.edges[0];
+    const writtenFactIndexes = new Set(outerFactIndexes);
+    const firstJoin = [];
+    const whereClause = [];
+    if (writtenFactIndexes.has(firstEdge.predecessorFactIndex)) {
+        if (writtenFactIndexes.has(firstEdge.successorFactIndex)) {
+            throw new Error("Not yet implemented");
         }
         else {
-            return queryDescriptions;
+            whereClause.push(`e${firstEdge.edgeIndex}.predecessor_fact_id = f${firstEdge.predecessorFactIndex}.fact_id` +
+                ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`);
+            firstJoin.push(` JOIN public.fact f${firstEdge.successorFactIndex}` +
+                ` ON f${firstEdge.successorFactIndex}.fact_id = e${firstEdge.edgeIndex}.successor_fact_id`);
+            writtenFactIndexes.add(firstEdge.successorFactIndex);
         }
     }
-    addEdges(queryDescription, knownFacts, path, prefix, matches) {
-        const queryDescriptions = [];
-        for (const match of matches) {
-            for (const condition of match.conditions) {
-                if (condition.type === "path") {
-                    ({ queryDescription, knownFacts } = this.addPathCondition(queryDescription, knownFacts, path, match.unknown, prefix, condition));
-                }
-                else if (condition.type === "existential") {
-                    if (condition.exists) {
-                        // Include the edges of the existential condition into the current
-                        // query description.
-                        const { queryDescriptions: newQueryDescriptions } = this.addEdges(queryDescription, knownFacts, path, prefix, condition.matches);
-                        const last = newQueryDescriptions.length - 1;
-                        queryDescriptions.push(...newQueryDescriptions.slice(0, last));
-                        queryDescription = newQueryDescriptions[last];
-                    }
-                    else {
-                        // Branch from the current query description and follow the
-                        // edges of the existential condition.
-                        // This will produce tuples that prove the condition false.
-                        const { queryDescriptions: newQueryDescriptions } = this.addEdges(queryDescription, knownFacts, path, prefix, condition.matches);
-                        // Then apply the where clause and continue with the tuple where it is true.
-                        // The path describes which not-exists condition we are currently building on.
-                        // Because the path is not empty, labeled facts will be included in the output.
-                        const { query: queryDescriptionWithNotExist, path: conditionalPath } = queryDescription.withNotExistsCondition(path);
-                        const { queryDescriptions: newQueryDescriptionsWithNotExists } = this.addEdges(queryDescriptionWithNotExist, knownFacts, conditionalPath, prefix, condition.matches);
-                        const last = newQueryDescriptionsWithNotExists.length - 1;
-                        const queryDescriptionConditional = newQueryDescriptionsWithNotExists[last];
-                        // If the negative existential condition is not satisfiable, then
-                        // that means that the condition will always be true.
-                        // We can therefore skip the branch for the negative existential condition.
-                        if (queryDescriptionConditional.isSatisfiable()) {
-                            queryDescriptions.push(...newQueryDescriptions);
-                            queryDescriptions.push(...newQueryDescriptionsWithNotExists.slice(0, last));
-                            queryDescription = queryDescriptionConditional;
-                        }
-                    }
-                }
+    else if (writtenFactIndexes.has(firstEdge.successorFactIndex)) {
+        whereClause.push(`e${firstEdge.edgeIndex}.successor_fact_id = f${firstEdge.successorFactIndex}.fact_id` +
+            ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`);
+        firstJoin.push(` JOIN public.fact f${firstEdge.predecessorFactIndex}` +
+            ` ON f${firstEdge.predecessorFactIndex}.fact_id = e${firstEdge.edgeIndex}.predecessor_fact_id`);
+        writtenFactIndexes.add(firstEdge.predecessorFactIndex);
+    }
+    else {
+        throw new Error("Neither predecessor nor successor fact has been written");
+    }
+    const tailJoins = generateJoins(notExistsWhereClause.edges.slice(1), writtenFactIndexes);
+    const joins = firstJoin.concat(tailJoins);
+    return `SELECT 1 FROM public.edge e${firstEdge.edgeIndex}${joins.join("")} WHERE ${whereClause.join(" AND ")}`;
+}
+function parseBookmark(bookmark) {
+    if (bookmark === undefined || bookmark === null || bookmark === "") {
+        return [];
+    }
+    else {
+        return bookmark.split(".").map(str => parseInt(str));
+    }
+}
+class DescriptionBuilder {
+    constructor(factTypes, roleMap) {
+        this.factTypes = factTypes;
+        this.roleMap = roleMap;
+    }
+    isSatisfiable(feed, edges) {
+        for (const edge of edges) {
+            const successor = feed.facts.find(f => f.factIndex === edge.successorFactIndex);
+            if (!successor) {
+                return false;
+            }
+            const predecessor = feed.facts.find(f => f.factIndex === edge.predecessorFactIndex);
+            if (!predecessor) {
+                return false;
+            }
+            const successorFactTypeId = (0, maps_1.getFactTypeId)(this.factTypes, successor.factType);
+            if (!successorFactTypeId) {
+                return false;
+            }
+            if (!(0, maps_1.getRoleId)(this.roleMap, successorFactTypeId, edge.roleName)) {
+                return false;
+            }
+            const predecessorFactTypeId = (0, maps_1.getFactTypeId)(this.factTypes, predecessor.factType);
+            if (!predecessorFactTypeId) {
+                return false;
             }
         }
-        queryDescriptions.push(queryDescription);
-        return { queryDescriptions, knownFacts };
+        return true;
     }
-    addProjections(queryDescription, knownFacts, projections) {
-        const queryDescriptions = [];
-        projections.forEach(projection => {
-            if (projection.type === "specification") {
-                // Produce more facts in the tuple, and prefix the labels with the projection name.
-                const prefix = projection.name + ".";
-                const { queryDescriptions: queryDescriptionsWithEdges } = this.addEdges(queryDescription, knownFacts, [], prefix, projection.matches);
-                queryDescriptions.push(...queryDescriptionsWithEdges);
-            }
-        });
-        return queryDescriptions;
+    buildDescription(feed) {
+        const parameters = [];
+        function addParameter(value) {
+            parameters.push(value);
+            return parameters.length;
+        }
+        // Allocate parameters for the inputs.
+        const inputs = feed.inputs.map(input => this.buildInputDescription(feed, input, addParameter));
+        // Allocate parameters for the edge roles.
+        const edges = feed.edges.map(edge => this.buildEdgeDescription(feed, edge, addParameter));
+        // Allocate parameters for the conditional roles.
+        const satisfiableNotExistsConditions = feed.notExistsConditions.filter(condition => this.isSatisfiable(feed, condition.edges));
+        const notExistsConditions = satisfiableNotExistsConditions.map(condition => this.buildNotExistsConditionDescription(feed, condition, addParameter));
+        const outputs = feed.outputs.map(output => this.buildOutputDescription(feed, output));
+        return new QueryDescription(inputs, parameters, outputs, edges, notExistsConditions);
+    }
+    buildInputDescription(feed, input, addParameter) {
+        const fact = feed.facts.find(f => f.factIndex === input.factIndex);
+        if (!fact) {
+            throw new Error(`Fact not found: ${input.factIndex}`);
+        }
+        const factTypeId = (0, maps_1.getFactTypeId)(this.factTypes, fact.factType);
+        if (!factTypeId) {
+            throw new Error(`Fact type not found: ${fact.factType}`);
+        }
+        const factTypeParameter = addParameter(factTypeId);
+        const factHashParameter = addParameter(input.factHash);
+        return {
+            factIndex: input.factIndex,
+            factTypeId,
+            factTypeParameter,
+            factHash: input.factHash,
+            factHashParameter
+        };
+    }
+    buildEdgeDescription(feed, edge, addParameter) {
+        const fact = feed.facts.find(f => f.factIndex === edge.successorFactIndex);
+        if (!fact) {
+            throw new Error(`Fact not found: ${edge.successorFactIndex}`);
+        }
+        const factTypeId = (0, maps_1.getFactTypeId)(this.factTypes, fact.factType);
+        if (!factTypeId) {
+            throw new Error(`Fact type not found: ${fact.factType}`);
+        }
+        const roleId = (0, maps_1.getRoleId)(this.roleMap, factTypeId, edge.roleName);
+        if (!roleId) {
+            throw new Error(`Role not found: ${fact.factType}.${edge.roleName}`);
+        }
+        const roleParameter = addParameter(roleId);
+        return {
+            edgeIndex: edge.edgeIndex,
+            predecessorFactIndex: edge.predecessorFactIndex,
+            successorFactIndex: edge.successorFactIndex,
+            roleParameter
+        };
+    }
+    buildOutputDescription(feed, output) {
+        const fact = feed.facts.find(f => f.factIndex === output.factIndex);
+        if (!fact) {
+            throw new Error(`Fact not found: ${output.factIndex}`);
+        }
+        return {
+            factIndex: output.factIndex,
+            type: fact.factType
+        };
+    }
+    buildNotExistsConditionDescription(feed, condition, addParameter) {
+        const edges = condition.edges.map(edge => this.buildEdgeDescription(feed, edge, addParameter));
+        const notExistsConditions = condition.notExistsConditions.map(condition => this.buildNotExistsConditionDescription(feed, condition, addParameter));
+        return {
+            edges,
+            notExistsConditions
+        };
     }
 }
 function sqlFromSpecification(start, bookmarks, limit, specification, factTypes, roleMap) {
+    const feeds = (0, jinaga_1.buildFeeds)(start, specification);
     const descriptionBuilder = new DescriptionBuilder(factTypes, roleMap);
-    const descriptions = descriptionBuilder.buildDescriptions(start, specification);
-    // Only generate SQL for satisfiable queries.
-    return descriptions
-        .filter(description => description.isSatisfiable())
-        .map(description => description.generateSqlQuery(bookmarks, limit));
+    const feedAndBookmark = feeds.map((feed, index) => ({
+        feed,
+        bookmark: bookmarks[index]
+    }));
+    const satisfiableFeedsAndBookmarks = feedAndBookmark.filter(fb => descriptionBuilder.isSatisfiable(fb.feed, fb.feed.edges));
+    const sqlQueries = satisfiableFeedsAndBookmarks.map(fb => {
+        const description = descriptionBuilder.buildDescription(fb.feed);
+        const sql = description.generateSqlQuery(fb.bookmark, limit);
+        return sql;
+    });
+    return sqlQueries;
 }
 exports.sqlFromSpecification = sqlFromSpecification;
+function sqlFromFeed(feed, bookmark, limit, factTypes, roleMap) {
+    const descriptionBuilder = new DescriptionBuilder(factTypes, roleMap);
+    if (!descriptionBuilder.isSatisfiable(feed, feed.edges)) {
+        return null;
+    }
+    const description = descriptionBuilder.buildDescription(feed);
+    const sql = description.generateSqlQuery(bookmark, limit);
+    return sql;
+}
+exports.sqlFromFeed = sqlFromFeed;
 //# sourceMappingURL=specification-sql.js.map

package/dist/postgres/specification-sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"specification-sql.js","sourceRoot":"","sources":["../../src/postgres/specification-sql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"specification-sql.js","sourceRoot":"","sources":["../../src/postgres/specification-sql.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinaga-server",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Application-agnostic back end for web applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "express": "^4.18.1",
-    "jinaga": "^4.0.1",
+    "jinaga": "^4.1.0",
     "node-forge": "^1.3.1",
     "passport": "^0.6.0",
     "pg": "^8.7.1"

package/src/authentication/authentication-device.ts

@@ -3,6 +3,7 @@ import {
     FactEnvelope,
     FactRecord,
     FactReference,
+    Feed,
     Fork,
     LoginResponse,
     Observable,
@@ -10,6 +11,7 @@ import {
     Specification,
     UserIdentity,
 } from "jinaga";
+import { FactFeed } from "jinaga/dist/storage";
 
 import { Keystore } from "../keystore";
 import { Authentication } from "./authentication";
@@ -50,6 +52,10 @@ export class AuthenticationDevice implements Authentication {
         return this.inner.read(start, specification);
     }
 
+    feed(feed: Feed, bookmark: string): Promise<FactFeed> {
+        return this.inner.feed(feed, bookmark);
+    }
+
     whichExist(references: FactReference[]): Promise<FactReference[]> {
         throw new Error("whichExist method not implemented on AuthenticationDevice.");
     }

package/src/authentication/authentication-impl.ts

@@ -1,4 +1,5 @@
-import { Channel, FactEnvelope, FactRecord, FactReference, Fork, Observable, Query, Specification, WebClient } from "jinaga";
+import { Channel, FactEnvelope, FactRecord, FactReference, Feed, Fork, Observable, Query, Specification, WebClient } from "jinaga";
+import { FactFeed } from "jinaga/dist/storage";
 
 import { Authentication } from "./authentication";
 
@@ -7,8 +8,6 @@ export class Principal {
 }
 
 export class AuthenticationImpl implements Authentication {
-    private principal: Principal;
-
     constructor(private inner: Fork, private client: WebClient) {
     }
 
@@ -37,6 +36,10 @@ export class AuthenticationImpl implements Authentication {
         return this.inner.read(start, specification);
     }
 
+    feed(feed: Feed, bookmark: string): Promise<FactFeed> {
+        return this.inner.feed(feed, bookmark);
+    }
+
     whichExist(references: FactReference[]): Promise<FactReference[]> {
         throw new Error("whichExist method not implemented on AuthenticationImpl.");
     }

package/src/authentication/authentication-session.ts

@@ -8,10 +8,12 @@ import {
     Feed,
     LoginResponse,
     Observable,
+    ObservableSource,
     Query,
     Specification,
     UserIdentity,
 } from "jinaga";
+import { FactFeed } from "jinaga/dist/storage";
 
 import { Keystore } from "../keystore";
 import { Authentication } from "./authentication";
@@ -20,7 +22,7 @@ export class AuthenticationSession implements Authentication {
     private authorizationEngine: AuthorizationEngine | null;
 
     constructor(
-        private inner: Feed,
+        private inner: ObservableSource,
         private keystore: Keystore,
         authorizationRules: AuthorizationRules | null,
         private userIdentity: UserIdentity,
@@ -65,7 +67,9 @@ export class AuthenticationSession implements Authentication {
     async save(envelopes: FactEnvelope[]): Promise<FactEnvelope[]> {
         const userFact = await this.keystore.getUserFact(this.userIdentity);
         const facts = envelopes.map(envelope => envelope.fact);
-        const authorizedFacts = await this.authorizationEngine.authorizeFacts(facts, userFact);
+        const authorizedFacts = this.authorizationEngine
+            ? await this.authorizationEngine.authorizeFacts(facts, userFact)
+            : facts;
         const signedFacts = await this.keystore.signFacts(this.userIdentity, authorizedFacts);
         return await this.inner.save(signedFacts);
     }
@@ -78,6 +82,10 @@ export class AuthenticationSession implements Authentication {
         return this.inner.read(start, specification);
     }
 
+    feed(feed: Feed, bookmark: string): Promise<FactFeed> {
+        return this.inner.feed(feed, bookmark);
+    }
+
     whichExist(references: FactReference[]): Promise<FactReference[]> {
         throw new Error("WhichExist method not implemented on AuthenticationSession.");
     }
@@ -87,7 +95,7 @@ export class AuthenticationSession implements Authentication {
     }
 
     addChannel(fact: FactReference, query: Query): Channel {
-        return null;
+        return new Channel(async () => {});
     }
 
     removeChannel(channel: Channel): void {

package/src/authentication.ts

@@ -1,13 +1,22 @@
-import { FactEnvelope, FactRecord, FactReference, Feed, Observable, Query, Specification, WebClient } from "jinaga";
+import {
+    FactEnvelope,
+    FactRecord,
+    FactReference,
+    Feed,
+    Observable,
+    ObservableSource,
+    Query,
+    Specification,
+    WebClient,
+} from "jinaga";
+import { FactFeed } from "jinaga/dist/storage";
 
 export class Principal {
     
 }
 
-export class Authentication implements Feed {
-    private principal: Principal;
-
-    constructor(private inner: Feed, private client: WebClient) {
+export class Authentication implements ObservableSource {
+    constructor(private inner: ObservableSource, private client: WebClient) {
     }
 
     async close(): Promise<void> {
@@ -31,6 +40,10 @@ export class Authentication implements Feed {
         return this.inner.read(start, specification);
     }
 
+    feed(feed: Feed, bookmark: string): Promise<FactFeed> {
+        return this.inner.feed(feed, bookmark);
+    }
+
     whichExist(references: FactReference[]): Promise<FactReference[]> {
         throw new Error("whichExist method not implemented on Authentication.");
     }

package/src/authorization/authorization-keystore.ts

@@ -6,10 +6,12 @@ import {
     FactRecord,
     FactReference,
     Feed,
+    ObservableSource,
     Query,
     Specification,
     UserIdentity,
 } from "jinaga";
+import { FactFeed } from "jinaga/dist/storage";
 
 import { Keystore } from "../keystore";
 
@@ -17,12 +19,12 @@ export class AuthorizationKeystore implements Authorization {
     private authorizationEngine: AuthorizationEngine | null;
 
     constructor(
-        private feed: Feed,
+        private observableSource: ObservableSource,
         private keystore: Keystore,
         authorizationRules: AuthorizationRules | null) {
 
         this.authorizationEngine = authorizationRules &&
-            new AuthorizationEngine(authorizationRules, feed);
+            new AuthorizationEngine(authorizationRules, observableSource);
     }
 
     async getOrCreateUserFact(userIdentity: UserIdentity) {
@@ -33,25 +35,29 @@ export class AuthorizationKeystore implements Authorization {
                 signatures: []
             }
         ];
-        await this.feed.save(envelopes);
+        await this.observableSource.save(envelopes);
         return userFact;
     }
 
     query(userIdentity: UserIdentity, start: FactReference, query: Query) {
-        return this.feed.query(start, query);
+        return this.observableSource.query(start, query);
     }
 
     read(userIdentity: UserIdentity, start: FactReference[], specification: Specification) {
-        return this.feed.read(start, specification);
+        return this.observableSource.read(start, specification);
+    }
+
+    feed(userIdentity: UserIdentity, feed: Feed, bookmark: string): Promise<FactFeed> {
+        return this.observableSource.feed(feed, bookmark);
     }
 
     load(userIdentity: UserIdentity, references: FactReference[]) {
-        return this.feed.load(references);
+        return this.observableSource.load(references);
     }
 
     async save(userIdentity: UserIdentity, facts: FactRecord[]) {
         if (!this.authorizationEngine) {
-            const envelopes = await this.feed.save(facts.map(fact => ({
+            const envelopes = await this.observableSource.save(facts.map(fact => ({
                 fact,
                 signatures: []
             })));
@@ -61,7 +67,7 @@ export class AuthorizationKeystore implements Authorization {
         const userFact = await this.keystore.getUserFact(userIdentity);
         const authorizedFacts = await this.authorizationEngine.authorizeFacts(facts, userFact);
         const signedFacts = await this.keystore.signFacts(userIdentity, authorizedFacts);
-        const envelopes = await this.feed.save(signedFacts);
+        const envelopes = await this.observableSource.save(signedFacts);
         return envelopes.map(envelope => envelope.fact);
     }
 }

package/src/http/feed-cache.ts

@@ -0,0 +1,6 @@
+import { Feed } from "jinaga";
+
+export interface FeedCache {
+    storeFeed(feedHash: string, feed: Feed): Promise<void>;
+    getFeed(feedHash: string): Promise<Feed | undefined>;
+}