jinaga-server 2.6.1 → 3.0.0

package/integration-test/jinaga-test/package-lock.json

@@ -13,12 +13,9 @@
         "express": "^4.17.2",
         "jest": "^29.7.0",
         "jest-compact-reporter": "^1.2.9",
-        "jinaga": "^5.6.0",
+        "jinaga": "^6.0.0",
         "node-forge": "^1.3.0",
-        "passport": "^0.6.0",
-        "pg": "^8.11.1",
-        "tweetnacl": "^1.0.3",
-        "tweetnacl-util": "^0.15.1"
+        "pg": "^8.11.3"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1031,9 +1028,9 @@
       }
     },
     "node_modules/@stablelib/utf8": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@stablelib/utf8/-/utf8-1.0.1.tgz",
-      "integrity": "sha512-FrYD1xadah/TtAP6VJ04lDD5h9rdDj/d8wH/jMYTtHqZBv9z2btdvEU8vTxdjdkFmo1b/BH+t3R1wi/mYhCCNg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@stablelib/utf8/-/utf8-1.0.2.tgz",
+      "integrity": "sha512-sDL1aB2U8FIpj7SjQJMxbOFIFkKvDKQGPHSrYejHZhtLNSK3qHe6ZIfa0woWkOiaJsdYslFzrc0VWXJZHmSIQQ=="
     },
     "node_modules/@stablelib/wipe": {
       "version": "1.0.1",
@@ -2894,13 +2891,13 @@
       }
     },
     "node_modules/jinaga": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/jinaga/-/jinaga-5.6.0.tgz",
-      "integrity": "sha512-cw78Ik0TI6yq8ndAyXdlSaAeLdasPid+r+xpU0kuKXCxV43XAXxBfaoeHHG0iNrZwsq8hm1PmbYtfgb2zt39sw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/jinaga/-/jinaga-6.0.0.tgz",
+      "integrity": "sha512-LWUCAO5L3FQgM+SBVHQYlZ2ot1TkPgdDp3SzhfmhgPN9Vapv5l15zKtUs0ggPHECvAskRMmAZIDXWHC3rt0pmg==",
       "dependencies": {
         "@stablelib/base64": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@stablelib/utf8": "^1.0.1"
+        "@stablelib/utf8": "^1.0.2"
       },
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
@@ -3302,31 +3299,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/passport": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
-      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
-      "dependencies": {
-        "passport-strategy": "1.x.x",
-        "pause": "0.0.1",
-        "utils-merge": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/jaredhanson"
-      }
-    },
-    "node_modules/passport-strategy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
-      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3361,19 +3333,14 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
-    "node_modules/pause": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
-      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
-    },
     "node_modules/pg": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.1.tgz",
-      "integrity": "sha512-utdq2obft07MxaDg0zBJI+l/M3mBRfIpEN3iSemsz0G5F2/VXx+XzqF4oxrbIZXQxt2AZzIUzyVg/YM6xOP/WQ==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz",
+      "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==",
       "dependencies": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.6.1",
+        "pg-connection-string": "^2.6.2",
         "pg-pool": "^3.6.1",
         "pg-protocol": "^1.6.0",
         "pg-types": "^2.1.0",
@@ -3401,9 +3368,9 @@
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.1.tgz",
-      "integrity": "sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
     },
     "node_modules/pg-int8": {
       "version": "1.0.1",
@@ -3982,16 +3949,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/tweetnacl": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
-    },
-    "node_modules/tweetnacl-util": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
-      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="
-    },
     "node_modules/type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",

package/integration-test/jinaga-test/package.json

@@ -17,11 +17,8 @@
     "express": "^4.17.2",
     "jest": "^29.7.0",
     "jest-compact-reporter": "^1.2.9",
-    "jinaga": "^5.6.0",
+    "jinaga": "^6.0.0",
     "node-forge": "^1.3.0",
-    "passport": "^0.6.0",
-    "pg": "^8.11.1",
-    "tweetnacl": "^1.0.3",
-    "tweetnacl-util": "^0.15.1"
+    "pg": "^8.11.3"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinaga-server",
-  "version": "2.6.1",
+  "version": "3.0.0",
   "description": "Data management for web and mobile applications.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,9 +48,8 @@
   },
   "dependencies": {
     "express": "^4.18.2",
-    "jinaga": "^5.6.0",
+    "jinaga": "^6.0.0",
     "node-forge": "^1.3.1",
-    "passport": "^0.6.0",
-    "pg": "^8.11.0"
+    "pg": "^8.11.3"
   }
 }

package/src/authentication/authentication-device.ts

@@ -1,4 +1,4 @@
-import { Authentication, AuthorizationEngine, AuthorizationRules, FactEnvelope, FactRecord, LoginResponse, Storage, UserIdentity } from "jinaga";
+import { Authentication, AuthorizationEngine, AuthorizationRules, FactEnvelope, FactRecord, LoginResponse, Storage, UserIdentity, factReferenceEquals } from "jinaga";
 
 import { Keystore } from "../keystore";
 
@@ -33,11 +33,33 @@ export class AuthenticationDevice implements Authentication {
 
     async authorize(envelopes: FactEnvelope[]): Promise<FactEnvelope[]> {
         const deviceFact = await this.keystore.getOrCreateDeviceFact(this.localDeviceIdentity);
-        const facts = envelopes.map(envelope => envelope.fact);
-        const authorizedFacts = this.authorizationEngine
-            ? await this.authorizationEngine.authorizeFacts(facts, deviceFact)
-            : facts;
-        const signedFacts = await this.keystore.signFacts(this.localDeviceIdentity, authorizedFacts);
-        return signedFacts;
+
+        if (this.authorizationEngine) {
+            const results = await this.authorizationEngine.authorizeFacts(envelopes, deviceFact);
+            const authorizedEnvelopes: FactEnvelope[] = results.map(r => {
+                const isFact = factReferenceEquals(r.fact);
+                const envelope = envelopes.find(e => isFact(e.fact));
+                if (!envelope) {
+                    throw new Error("Fact not found in envelopes.");
+                }
+                if (r.verdict === "Accept") {
+                    return {
+                        fact: r.fact,
+                        signatures: envelope.signatures
+                            .filter(s => r.newPublicKeys.includes(s.publicKey))
+                    };
+                }
+                else if (r.verdict === "Existing") {
+                    return envelope;
+                }
+                else {
+                    throw new Error("Unexpected verdict.");
+                }
+            });
+            return authorizedEnvelopes;
+        }
+        else {
+            return envelopes;
+        }
     }
 }

package/src/authentication/authentication-session.ts

@@ -1,4 +1,4 @@
-import { Authentication, AuthorizationEngine, AuthorizationRules, FactEnvelope, FactRecord, LoginResponse, Storage, UserIdentity } from "jinaga";
+import { Authentication, AuthorizationEngine, AuthorizationRules, FactEnvelope, FactRecord, LoginResponse, Storage, UserIdentity, factReferenceEquals } from "jinaga";
 
 import { Keystore } from "../keystore";
 
@@ -41,11 +41,33 @@ export class AuthenticationSession implements Authentication {
 
     async authorize(envelopes: FactEnvelope[]): Promise<FactEnvelope[]> {
         const userFact = await this.keystore.getUserFact(this.userIdentity);
-        const facts = envelopes.map(envelope => envelope.fact);
-        const authorizedFacts = this.authorizationEngine
-            ? await this.authorizationEngine.authorizeFacts(facts, userFact)
-            : facts;
-        const signedFacts = await this.keystore.signFacts(this.userIdentity, authorizedFacts);
-        return signedFacts;
+
+        if (this.authorizationEngine) {
+            const results = await this.authorizationEngine.authorizeFacts(envelopes, userFact);
+            const authorizedEnvelopes: FactEnvelope[] = results.map(r => {
+                const isFact = factReferenceEquals(r.fact);
+                const envelope = envelopes.find(e => isFact(e.fact));
+                if (!envelope) {
+                    throw new Error("Fact not found in envelopes.");
+                }
+                if (r.verdict === "Accept") {
+                    return {
+                        fact: r.fact,
+                        signatures: envelope.signatures
+                            .filter(s => r.newPublicKeys.includes(s.publicKey))
+                    };
+                }
+                else if (r.verdict === "Existing") {
+                    return envelope;
+                }
+                else {
+                    throw new Error("Unexpected verdict.");
+                }
+            });
+            return authorizedEnvelopes;
+        }
+        else {
+            return envelopes;
+        }
     }
 }

package/src/authorization/authorization-keystore.ts

@@ -7,10 +7,8 @@ import {
     FactEnvelope,
     FactFeed,
     FactManager,
-    FactRecord,
     FactReference,
     Forbidden,
-    Query,
     ReferencesByName,
     Specification,
     Storage,
@@ -52,10 +50,6 @@ export class AuthorizationKeystore implements Authorization {
         return userFact;
     }
 
-    query(userIdentity: UserIdentity | null, start: FactReference, query: Query) {
-        return this.factManager.query(start, query);
-    }
-
     async read(userIdentity: UserIdentity | null, start: FactReference[], specification: Specification) {
         if (this.distributionEngine) {
             const userReference: FactReference | null = userIdentity
@@ -111,24 +105,50 @@ export class AuthorizationKeystore implements Authorization {
         return await this.factManager.load(references);
     }
 
-    async save(userIdentity: UserIdentity | null, facts: FactRecord[]) {
-        if (!this.authorizationEngine) {
-            const envelopes = await this.factManager.save(facts.map(fact => ({
-                fact,
-                signatures: []
-            })));
-            return envelopes.map(envelope => envelope.fact);
-        }
-
-        const userFact = userIdentity ? await this.keystore.getUserFact(userIdentity) : null;
-        const authorizedFacts = await this.authorizationEngine.authorizeFacts(facts, userFact);
-        if (userIdentity) {
-            const signedFacts = await this.keystore.signFacts(userIdentity, authorizedFacts);
-            const envelopes = await this.factManager.save(signedFacts);
-            return envelopes.map(envelope => envelope.fact);
+    async save(userIdentity: UserIdentity | null, envelopes: FactEnvelope[]): Promise<FactEnvelope[]> {
+        if (this.authorizationEngine) {
+            const userFact = userIdentity ? await this.keystore.getUserFact(userIdentity) : null;
+            const results = await this.authorizationEngine.authorizeFacts(envelopes, userFact);
+            const userKeys : string[] = (userFact && userFact.fields.hasOwnProperty("publicKey"))
+                ? [ userFact.fields.publicKey ]
+                : [];
+            const factsToSign = results
+                .filter(r => r.verdict === "Accept" && r.newPublicKeys.some(k => userKeys.includes(k)))
+                .map(r => r.fact);
+            const signedFacts = (userIdentity && factsToSign.length > 0)
+                ? await this.keystore.signFacts(userIdentity, factsToSign)
+                : [];
+            const authorizedEnvelopes: FactEnvelope[] = results.map(r => {
+                const isFact = factReferenceEquals(r.fact);
+                const envelope = envelopes.find(e => isFact(e.fact));
+                if (!envelope) {
+                    throw new Error("Fact not found in envelopes.");
+                }
+                if (r.verdict === "Accept") {
+                    const signedFact = signedFacts.find(f => isFact(f.fact));
+                    const userSignatures = signedFact
+                        ? signedFact.signatures
+                        : [];
+                    return {
+                        fact: r.fact,
+                        signatures: envelope.signatures
+                            .filter(s => r.newPublicKeys.includes(s.publicKey))
+                            .concat(userSignatures)
+                    };
+                }
+                else if (r.verdict === "Existing") {
+                    return envelope;
+                }
+                else {
+                    throw new Error("Unexpected verdict.");
+                }
+            });
+            const savedEnvelopes = await this.factManager.save(authorizedEnvelopes);
+            return savedEnvelopes;
         }
         else {
-            return authorizedFacts;
+            const savedEnvelopes = await this.factManager.save(envelopes);
+            return savedEnvelopes;
         }
     }
 

package/src/http/router.ts

@@ -14,8 +14,6 @@ import {
     LoadResponse,
     ProfileMessage,
     ProjectedResult,
-    QueryMessage,
-    QueryResponse,
     ReferencesByName,
     SaveMessage,
     Specification,
@@ -25,10 +23,8 @@ import {
     buildFeeds,
     computeObjectHash,
     computeTupleSubsetHash,
-    fromDescriptiveString,
     invertSpecification,
     parseLoadMessage,
-    parseQueryMessage,
     parseSaveMessage
 } from "jinaga";
 
@@ -68,7 +64,7 @@ function getOrStream<U>(
                             })
                             .done(() => {
                                 clearTimeout(timeout);
-                                next();
+                                res.socket.end();
                             });
                     }
                 })
@@ -285,15 +281,9 @@ export interface RequestUser {
 export class HttpRouter {
     handler: Handler;
 
-    constructor(private factManager: FactManager, private authorization: Authorization, private feedCache: FeedCache, backwardCompatible: boolean) {
+    constructor(private factManager: FactManager, private authorization: Authorization, private feedCache: FeedCache) {
         const router = Router();
         router.get('/login', getAuthenticate(user => this.login(user)));
-        if (backwardCompatible) {
-            router.post('/query', post(
-                parseQueryMessage,
-                (user, queryMessage) => this.query(user, queryMessage)
-            ));
-        }
         router.post('/load', post(
             parseLoadMessage,
             (user, loadMessage) => this.load(user, loadMessage)
@@ -327,26 +317,22 @@ export class HttpRouter {
         };
     }
 
-    private async query(user: RequestUser | null, queryMessage: QueryMessage): Promise<QueryResponse> {
-        const userIdentity = serializeUserIdentity(user);
-        const query = fromDescriptiveString(queryMessage.query);
-        const result = await this.authorization.query(userIdentity, queryMessage.start, query);
-        return {
-            results: result
-        };
-    }
-
     private async load(user: RequestUser, loadMessage: LoadMessage): Promise<LoadResponse> {
         const userIdentity = serializeUserIdentity(user);
         const result = await this.authorization.load(userIdentity, loadMessage.references);
+        const facts = result.map(r => r.fact);
         return {
-            facts: result
+            facts
         };
     }
 
     private async save(user: RequestUser | null, saveMessage: SaveMessage): Promise<void> {
         const userIdentity = serializeUserIdentity(user);
-        await this.authorization.save(userIdentity, saveMessage.facts);
+        await this.authorization.save(userIdentity, saveMessage.facts
+            .map(fact => ({
+                fact: fact,
+                signatures: []
+            })));
     }
 
     private async read(user: RequestUser | null, input: string): Promise<any[]> {
@@ -379,7 +365,11 @@ export class HttpRouter {
         }
 
         const userIdentity = serializeUserIdentity(user);
-        await this.authorization.save(userIdentity, factRecords);
+        await this.authorization.save(userIdentity, factRecords
+            .map(fact => ({
+                fact: fact,
+                signatures: []
+            })));
     }
 
     private async feeds(user: RequestUser | null, input: string): Promise<FeedsResponse> {

package/src/jinaga-server.ts

@@ -65,11 +65,10 @@ export class JinagaServer {
         const feedCache = new FeedCache();
         const authentication = createAuthentication(store, keystore, authorizationRules);
         const network = new NetworkNoOp();
-        const factManager = new FactManager(authentication, fork, source, store, network);
+        const factManager = new FactManager(fork, source, store, network);
         const authorization = createAuthorization(authorizationRules, distributionRules, factManager, store, keystore);
-        // Retain backward compatibility until the user provides distribution rules.
-        const router = new HttpRouter(factManager, authorization, feedCache, distributionRules === null);
-        const j: Jinaga = new Jinaga(factManager, syncStatusNotifier);
+        const router = new HttpRouter(factManager, authorization, feedCache);
+        const j: Jinaga = new Jinaga(authentication, factManager, syncStatusNotifier);
 
         async function close() {
             for (const pool of Object.values(pools)) {
@@ -187,8 +186,8 @@ async function withSession(store: Storage, keystore: Keystore | null, authorizat
     const fork = new PassThroughFork(store);
     const observableSource = new ObservableSource(store);
     const network = new NetworkNoOp();
-    const factManager = new FactManager(authentication, fork, observableSource, store, network);
-    const j = new Jinaga(factManager, syncStatusNotifier);
+    const factManager = new FactManager(fork, observableSource, store, network);
+    const j = new Jinaga(authentication, factManager, syncStatusNotifier);
     await callback(j);
 }