jinaga-server 3.1.0 → 3.1.2

package/http/sans-auth/Save json.http

@@ -0,0 +1,13 @@
+POST {{replicatorUrl}}/save
+Content-Type: application/json
+
+{
+    "facts": [{
+        "type": "Test.Root",
+        "hash": "sdkjbks",
+        "predecessors": {},
+        "fields": {
+            "identifier": "rootfact"
+        }
+    }]
+}

package/http/with-auth/Create post with auth.http

@@ -0,0 +1,24 @@
+POST {{replicatorUrl}}/write
+Content-Type: text/plain
+Authorization: oauth2 authorization_code
+
+let site: Blog.Site = {
+  creator: me,
+  domain: "michaelperry.net"
+}
+
+let post: Blog.Post = {
+    createdAt: "2022-08-16T15:23:13.231Z",
+    site
+}
+
+let title: Blog.Post.Title = {
+    post,
+    value: "Introducing Jinaga Replicator",
+    prior: []
+}
+let title2: Blog.Post.Title = {
+    post,
+    value: "Introduction to the Jinaga Replicator",
+    prior: [ title ]
+}

package/http/with-auth/Define authorization rules.http

@@ -0,0 +1,25 @@
+POST {{authorizationEndpoint}}
+Content-Type: text/plain
+Authorization: Bearer {{secret}}
+
+authorization {
+  any Jinaga.User
+
+  (site: Blog.Site) {
+    creator: Jinaga.User [
+      creator = site->creator: Jinaga.User
+    ]
+  } => creator
+
+  (post: Blog.Post) {
+    creator: Jinaga.User [
+      creator = post->site: Blog.Site->creator: Jinaga.User
+    ]
+  } => creator
+
+  (title: Blog.Post.Title) {
+    creator: Jinaga.User [
+      creator = title->post: Blog.Post->site: Blog.Site->creator: Jinaga.User
+    ]
+  } => creator
+}

package/http/with-auth/Define distribution rules.http

@@ -0,0 +1,30 @@
+POST {{distributionEndpoint}}
+Content-Type: text/plain
+Authorization: Bearer {{secret}}
+
+distribution {
+  share (site: Blog.Site) {
+      post: Blog.Post [
+          post->site: Blog.Site = site
+          !E {
+              deleted: Blog.Post.Deleted [
+                  deleted->post: Blog.Post = post
+              ]
+          }
+      ]
+  } => {
+      id = #post
+      createdAt = post.createdAt
+      titles = {
+          title: Blog.Post.Title [
+              title->post: Blog.Post = post
+              !E {
+                  next: Blog.Post.Title [
+                      next->prior: Blog.Post.Title = title
+                  ]
+              }
+          ]
+      } => title.value
+  }
+  with everyone
+}

package/http/with-auth/Feed sites.http

@@ -0,0 +1,3 @@
+GET {{replicatorUrl}}/feeds/dx2gDQc8HI5kA1zm4p32D8b4mL_UySPtTMCbIUO43E-FiCG7bqRWqOLQRIDDL6J4qLUMdJI8q0aHl0Yel9zVlQ
+Authorization: oauth2 authorization_code
+Accept: application/json

package/http/with-auth/Feeds options.http

@@ -0,0 +1 @@
+OPTIONS {{replicatorUrl}}/feeds

package/http/with-auth/Feeds sites.http

@@ -0,0 +1,32 @@
+POST {{replicatorUrl}}/feeds
+Content-Type: text/plain
+Authorization: oauth2 authorization_code
+
+let site: Blog.Site = {
+  creator: me,
+  domain: "michaelperry.net"
+}
+
+(site: Blog.Site) {
+    post: Blog.Post [
+        post->site: Blog.Site = site
+        !E {
+            deleted: Blog.Post.Deleted [
+                deleted->post: Blog.Post = post
+            ]
+        }
+    ]
+} => {
+    id = #post
+    createdAt = post.createdAt
+    titles = {
+        title: Blog.Post.Title [
+            title->post: Blog.Post = post
+            !E {
+                next: Blog.Post.Title [
+                    next->prior: Blog.Post.Title = title
+                ]
+            }
+        ]
+    } => title.value
+}

package/http/with-auth/Get posts with auth.http

@@ -0,0 +1,32 @@
+POST {{replicatorUrl}}/read
+Content-Type: text/plain
+Authorization: oauth2 authorization_code
+
+let site: Blog.Site = {
+  creator: me,
+  domain: "michaelperry.net"
+}
+
+(site: Blog.Site) {
+    post: Blog.Post [
+        post->site: Blog.Site = site
+        !E {
+            deleted: Blog.Post.Deleted [
+                deleted->post: Blog.Post = post
+            ]
+        }
+    ]
+} => {
+    id = #post
+    createdAt = post.createdAt
+    titles = {
+        title: Blog.Post.Title [
+            title->post: Blog.Post = post
+            !E {
+                next: Blog.Post.Title [
+                    next->prior: Blog.Post.Title = title
+                ]
+            }
+        ]
+    } => title.value
+}

package/http/with-auth/Load titles.http

@@ -0,0 +1,21 @@
+POST {{replicatorUrl}}/load
+Authorization: oauth2 authorization_code
+Content-Type: application/json
+Accept: application/x-jinaga-graph-v1
+
+{
+  "references": [
+    {
+      "type": "Blog.Post",
+      "hash": "XiDu5OWoNUwZhTBs+mwHrxjBDlFjBmDIgEt9ZXmCeMq8uv3Tv89Am6GQSt2ppl4wGG1UWMFxd9tstg5NMSSjKg=="
+    },
+    {
+      "type": "Blog.Post.Title",
+      "hash": "n+hKtiGWHVu16UlxKY73Va+jsriQ/UxVFn3DCdXQEccWeXN5/SIxhWXmuMlfzelpHjuwPgCyeyid/jJrkJRRtQ=="
+    },
+    {
+      "type": "Blog.Post.Title",
+      "hash": "iuRHB3Zkj0P3+b7XPvbEzA/ANdJ3C8Bm1dJ/nW8I9Tb+9VdHQP5g2bpp8hwS4KqzecgG6KSG6VCNOY7RoaEsIQ=="
+    }
+  ]
+}

package/integration-test/jinaga-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.11.0-bullseye-slim
+FROM node:20.12-bullseye-slim
 
 WORKDIR /root
 

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

@@ -13,7 +13,7 @@
         "express": "^4.19.2",
         "jest": "^29.7.0",
         "jest-compact-reporter": "^1.2.9",
-        "jinaga": "^6.0.1",
+        "jinaga": "^6.1.2",
         "node-forge": "^1.3.0",
         "pg": "^8.11.3"
       }
@@ -2959,13 +2959,14 @@
       }
     },
     "node_modules/jinaga": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jinaga/-/jinaga-6.0.1.tgz",
-      "integrity": "sha512-0ViCNhYkG1FgOg7vy626xSY8N6Jk72mdXx00wolVWUN9Lx7vaYvnreTPwcrXmlbW4XIjvIVUIQjhXrjkZ2u+WA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/jinaga/-/jinaga-6.1.2.tgz",
+      "integrity": "sha512-772WIhCyt56EVVsABgmLgVr7GdciqoOJTGL6L7RDws6bCdeUTAcT4st3r0ThFeGJ58dHFzPqAE3ScuHp99TXhg==",
       "dependencies": {
         "@stablelib/base64": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@stablelib/utf8": "^1.0.2"
+        "@stablelib/utf8": "^1.0.2",
+        "node-forge": "^1.3.1"
       },
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"

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

@@ -17,7 +17,7 @@
     "express": "^4.19.2",
     "jest": "^29.7.0",
     "jest-compact-reporter": "^1.2.9",
-    "jinaga": "^6.0.1",
+    "jinaga": "^6.1.2",
     "node-forge": "^1.3.0",
     "pg": "^8.11.3"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinaga-server",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Data management for web and mobile applications.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,6 @@
   "devDependencies": {
     "@types/express": "^4.17.13",
     "@types/jest": "^27.5.1",
-    "@types/node-forge": "^0.10.10",
     "@types/passport": "^1.0.7",
     "@types/pg": "^8.6.1",
     "jest": "^28.1.0",
@@ -48,8 +47,7 @@
   },
   "dependencies": {
     "express": "^4.19.2",
-    "jinaga": "^6.0.1",
-    "node-forge": "^1.3.1",
-    "pg": "^8.11.3"
+    "jinaga": "^6.1.2",
+    "pg": "^8.11.5"
   }
 }

package/replicator/index.ts

@@ -1,4 +1,3 @@
-import cors = require("cors");
 import express = require("express");
 import * as http from "http";
 import { JinagaServer } from "../src";
@@ -15,7 +14,6 @@ const server = http.createServer(app);
 app.set('port', process.env.PORT || 8080);
 app.use(express.json());
 app.use(express.text());
-app.use(cors());
 
 const pgConnection = process.env.JINAGA_POSTGRESQL ||
   'postgresql://appuser:apppw@localhost:5432/appdb';

package/replicator/package-lock.json

@@ -9,12 +9,10 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "cors": "^2.8.5",
-        "express": "^4.18.3",
-        "pg": "8.11.3"
+        "express": "^4.19.2",
+        "pg": "^8.11.4"
       },
       "devDependencies": {
-        "@types/cors": "^2.8.12",
         "@types/express": "^4.17.13",
         "typescript": "^4.7.4"
       }
@@ -38,23 +36,14 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/express": {
-      "version": "4.17.16",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz",
-      "integrity": "sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.31",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
@@ -144,14 +133,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/buffer-writer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
-      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -198,9 +179,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -210,18 +191,6 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -309,16 +278,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
-      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -566,14 +535,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
@@ -593,11 +554,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/packet-reader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
-      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
-    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -612,15 +568,13 @@
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/pg": {
-      "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.2",
-        "pg-pool": "^3.6.1",
-        "pg-protocol": "^1.6.0",
+      "version": "8.11.4",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.4.tgz",
+      "integrity": "sha512-pWb7JKPxGk1UFbtq7jQ0m3IfPpb7LLACCEyN8/u9DYEom+Q/BSKy+4TRl4+Hh003AOYhppB/z+QK87/hx/bk0w==",
+      "dependencies": {
+        "pg-connection-string": "^2.6.3",
+        "pg-pool": "^3.6.2",
+        "pg-protocol": "^1.6.1",
         "pg-types": "^2.1.0",
         "pgpass": "1.x"
       },
@@ -646,9 +600,9 @@
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
-      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
+      "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA=="
     },
     "node_modules/pg-int8": {
       "version": "1.0.1",
@@ -659,17 +613,17 @@
       }
     },
     "node_modules/pg-pool": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz",
-      "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz",
+      "integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
       "peerDependencies": {
         "pg": ">=8.0"
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz",
-      "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz",
+      "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg=="
     },
     "node_modules/pg-types": {
       "version": "2.2.0",

package/replicator/package.json

@@ -15,12 +15,10 @@
   "author": "Michael L Perry",
   "license": "MIT",
   "dependencies": {
-    "cors": "^2.8.5",
-    "express": "^4.18.3",
-    "pg": "8.11.3"
+    "express": "^4.19.2",
+    "pg": "8.11.4"
   },
   "devDependencies": {
-    "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "typescript": "^4.7.4"
   }

package/src/http/line-reader.ts

@@ -0,0 +1,69 @@
+const PauseAt = 10;
+const ResumeAt = 5;
+
+export function createLineReader(stream: NodeJS.ReadableStream): () => Promise<string | null> {
+    // Store the bytes read so far that have not yet been processed.
+    let buffer = Buffer.alloc(0);
+    // Store a queue of promises that resolve to the next line read.
+    let promiseQueue: Promise<string | null>[] = [];
+    // Initialize the queue.
+    let resolve: (value: string | null) => void;
+    let reject: (reason: any) => void;
+    promiseQueue.push(new Promise<string | null>((res, rej) => { resolve = res; reject = rej; }));
+
+    stream.on('data', (data: Buffer) => {
+        let newline = -1;
+        // Look for the first newline in the data.
+        while ((newline = data.indexOf(10)) >= 0) {
+            // Extract the line from the data.
+            let line = Buffer.concat([buffer, data.slice(0, newline)]).toString();
+            data = data.slice(newline + 1);
+            buffer = Buffer.alloc(0);
+            if (line.charCodeAt(0) === 0xFEFF) {
+                // Remove BOM
+                line = line.slice(1);
+            }
+            // Resolve the promise with the line.
+            resolve(line);
+            // Create a new promise for the next line.
+            promiseQueue.push(new Promise<string | null>((res, rej) => { resolve = res; reject = rej; }));
+
+            // Apply backpressure if the promise queue gets too deep
+            if (promiseQueue.length > PauseAt) {
+                stream.pause();
+            }
+        }
+        // Append the remaining data to the buffer.
+        buffer = Buffer.concat([buffer, data]);
+    });
+
+    stream.on('end', () => {
+        // Extract the last line from the buffer.
+        let line = buffer.toString();
+        if (line.charCodeAt(0) === 0xFEFF) {
+            // Remove BOM
+            line = line.slice(1);
+        }
+        // If the stream ends with a newline, then don't add an empty line.
+        if (line.length > 0) {
+            resolve(line);
+            promiseQueue.push(new Promise<string | null>((res, rej) => { resolve = res; reject = rej; }));
+        }
+        resolve(null);
+    });
+
+    stream.on('error', (e: Error) => {
+        reject(e);
+    });
+
+    return () => {
+        if (promiseQueue.length === 0) {
+            throw new Error("Line reader has been closed.");
+        }
+        const promise = promiseQueue.shift()!;
+        if (stream.isPaused() && promiseQueue.length <= ResumeAt) {
+            stream.resume();
+        }
+        return promise;
+    };
+}