Merge pull request #47 from maartyman/solid-notification-client

Solid notification client
maartyman · Nov 18, 2023 · d938b8f · d938b8f
2 parents 8dded48 + 2ee692f
commit d938b8f
Show file tree

Hide file tree

Showing 40 changed files with 2,577 additions and 619 deletions.
diff --git a/engines/config-query-sparql-incremental/config/config-base.json b/engines/config-query-sparql-incremental/config/config-base.json
@@ -54,6 +54,8 @@
     "ccqs:config/rdf-update-quads/mediators.json",
 
     "icqsi:config/guard/mediators.json",
-    "icqsi:config/guard/actors.json"
+    "icqsi:config/guard/actors.json",
+    "icqsi:config/resource-watch/mediators.json",
+    "icqsi:config/resource-watch/actors.json"
   ]
 }
diff --git a/engines/config-query-sparql-incremental/config/guard/actors.json b/engines/config-query-sparql-incremental/config/guard/actors.json
@@ -2,17 +2,16 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^2.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-guard-polling-diff/^1.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-guard-naive/^1.0.0/components/context.jsonld"
   ],
   "@id": "urn:comunica:default:Runner",
   "@type": "Runner",
   "actors": [
     {
-      "@id": "urn:comunica:default:guard/actors#polling-diff",
-      "@type": "ActorGuardPollingDiff",
-      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
-      "mediatorDereferenceRdf": { "@id": "urn:comunica:default:dereference-rdf/mediators#main" },
-      "pollingFrequency": 10
+      "@id": "urn:comunica:default:guard/actors#naive",
+      "@type": "ActorGuardNaive",
+      "mediatorResourceWatch": { "@id": "urn:comunica:default:resource-watch/mediators#main" },
+      "mediatorDereferenceRdf": { "@id": "urn:comunica:default:dereference-rdf/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql-incremental/config/resource-watch/actors.json b/engines/config-query-sparql-incremental/config/resource-watch/actors.json
@@ -0,0 +1,23 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^2.0.0/components/context.jsonld",
+
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-resource-watch-polling/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-resource-watch-solid-notification-websockets/^1.0.0/components/context.jsonld"
+  ],
+  "@id": "urn:comunica:default:Runner",
+  "@type": "Runner",
+  "actors": [
+    {
+      "@id": "urn:comunica:default:resource-watch/actors#polling",
+      "@type": "ActorResourceWatchPolling",
+      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
+      "defaultPollingFrequency": 10
+    },
+    {
+      "@id": "urn:comunica:default:resource-watch/actors#solid-notification-websockets",
+      "@type": "ActorResourceWatchSolidNotificationWebsockets",
+      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" }
+    }
+  ]
+}
diff --git a/engines/config-query-sparql-incremental/config/resource-watch/mediators.json b/engines/config-query-sparql-incremental/config/resource-watch/mediators.json
@@ -0,0 +1,12 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/bus-resource-watch/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-number/^2.0.0/components/context.jsonld"
+  ],
+  "@id": "urn:comunica:default:resource-watch/mediators#main",
+  "@type": "MediatorNumber",
+  "type": "max",
+  "field": "filterFactor",
+  "ignoreErrors": true,
+  "bus": { "@id": "ActorResourceWatch:_default_bus" }
+}
diff --git a/engines/query-sparql-incremental/package.json b/engines/query-sparql-incremental/package.json
@@ -196,14 +196,18 @@
     "@comunica/runner": "2.6.8",
     "@comunica/runner-cli": "2.6.8",
     "@comunica/types": "2.6.8",
-    "@incremunica/actor-guard-polling-diff": "^1.1.0",
+
+    "@incremunica/actor-guard-naive": "^1.0.0",
+    "@incremunica/actor-resource-watch-polling": "^1.0.0",
+    "@incremunica/actor-resource-watch-solid-notification-websockets": "^1.0.0",
     "@incremunica/actor-query-operation-incremental-quadpattern": "^1.0.0",
     "@incremunica/actor-rdf-join-inner-incremental-full-hash": "^1.1.0",
     "@incremunica/actor-rdf-metadata-extract-guard-data": "^1.0.0",
     "@incremunica/actor-rdf-resolve-hypermedia-stream-none": "^1.1.0",
     "@incremunica/actor-rdf-resolve-quad-pattern-incremental-federated": "^1.0.0",
     "@incremunica/actor-rdf-resolve-quad-pattern-rdfjs-streaming-source": "^1.1.0",
     "@incremunica/bus-guard": "^1.1.0",
+    "@incremunica/bus-resource-watch": "^1.0.0",
     "@incremunica/hash-bindings": "^1.1.0",
     "@incremunica/incremental-bindings-factory": "^1.0.0",
     "@incremunica/incremental-inner-join": "^1.1.0",

diff --git a/...with-the-same-engine-and-wait-a-bit-until-the-polling-is-removed_2084357116/recording.har b/...with-the-same-engine-and-wait-a-bit-until-the-polling-is-removed_2084357116/recording.har
diff --git a/...n-a-raw-RDF-document_1555362862/simple-SPS_2884807479/Raw-Source_2280469750/recording.har b/...n-a-raw-RDF-document_1555362862/simple-SPS_2884807479/Raw-Source_2280469750/recording.har
@@ -120,6 +120,104 @@
           "ssl": -1,
           "wait": 25
         }
+      },
+      {
+        "_id": "fcf8556ade9a7939635831eccdd2caf4",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "name": "host",
+              "value": "www.rubensworks.net"
+            }
+          ],
+          "headersSize": 182,
+          "httpVersion": "HTTP/1.1",
+          "method": "HEAD",
+          "queryString": [],
+          "url": "https://www.rubensworks.net/"
+        },
+        "response": {
+          "bodySize": 2,
+          "content": {
+            "encoding": "base64",
+            "mimeType": "text/html",
+            "size": 2,
+            "text": "[]"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "server",
+              "value": "nginx/1.10.3"
+            },
+            {
+              "name": "date",
+              "value": "Sat, 18 Nov 2023 16:19:06 GMT"
+            },
+            {
+              "name": "content-type",
+              "value": "text/html"
+            },
+            {
+              "name": "last-modified",
+              "value": "Tue, 24 Oct 2023 06:26:32 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "keep-alive"
+            },
+            {
+              "name": "etag",
+              "value": "W/\"65376398-f5e3\""
+            },
+            {
+              "name": "strict-transport-security",
+              "value": "max-age=63072000; includeSubdomains"
+            },
+            {
+              "name": "x-frame-options",
+              "value": "DENY"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "content-encoding",
+              "value": "gzip"
+            }
+          ],
+          "headersSize": 325,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2023-11-18T16:19:06.704Z",
+        "time": 18,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 18
+        }
       }
     ],
     "pages": [],

diff --git a/...39954467/handles-the-query-with-SHACL-compact-syntax-as-a-source_3073831164/recording.har b/...39954467/handles-the-query-with-SHACL-compact-syntax-as-a-source_3073831164/recording.har
@@ -160,6 +160,164 @@
           "ssl": -1,
           "wait": 383
         }
+      },
+      {
+        "_id": "bbb66663db3399c7c6534721e4e50394",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "name": "host",
+              "value": "raw.githubusercontent.com"
+            }
+          ],
+          "headersSize": 274,
+          "httpVersion": "HTTP/1.1",
+          "method": "HEAD",
+          "queryString": [],
+          "url": "https://raw.githubusercontent.com/w3c/data-shapes/gh-pages/shacl-compact-syntax/tests/valid/basic-shape-iri.shaclc"
+        },
+        "response": {
+          "bodySize": 83,
+          "content": {
+            "encoding": "base64",
+            "mimeType": "text/plain; charset=utf-8",
+            "size": 83,
+            "text": "[]"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "connection",
+              "value": "keep-alive"
+            },
+            {
+              "name": "content-length",
+              "value": "83"
+            },
+            {
+              "name": "cache-control",
+              "value": "max-age=300"
+            },
+            {
+              "name": "content-security-policy",
+              "value": "default-src 'none'; style-src 'unsafe-inline'; sandbox"
+            },
+            {
+              "name": "content-type",
+              "value": "text/plain; charset=utf-8"
+            },
+            {
+              "name": "etag",
+              "value": "W/\"835e186d7a04623bcdb8f33bc260b3697da0322f8411919152cc61f45eccf6be\""
+            },
+            {
+              "name": "strict-transport-security",
+              "value": "max-age=31536000"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "x-frame-options",
+              "value": "deny"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-github-request-id",
+              "value": "1E52:128CE:E3099C:ED5F5F:6558CDE2"
+            },
+            {
+              "name": "content-encoding",
+              "value": "gzip"
+            },
+            {
+              "name": "accept-ranges",
+              "value": "bytes"
+            },
+            {
+              "name": "date",
+              "value": "Sat, 18 Nov 2023 16:19:07 GMT"
+            },
+            {
+              "name": "via",
+              "value": "1.1 varnish"
+            },
+            {
+              "name": "x-served-by",
+              "value": "cache-bru1480020-BRU"
+            },
+            {
+              "name": "x-cache",
+              "value": "HIT"
+            },
+            {
+              "name": "x-cache-hits",
+              "value": "0"
+            },
+            {
+              "name": "x-timer",
+              "value": "S1700324347.227997,VS0,VE154"
+            },
+            {
+              "name": "vary",
+              "value": "Authorization,Accept-Encoding,Origin"
+            },
+            {
+              "name": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "name": "cross-origin-resource-policy",
+              "value": "cross-origin"
+            },
+            {
+              "name": "x-fastly-request-id",
+              "value": "fcd069c3344daa0697be180ebe9cd3ab16f9702f"
+            },
+            {
+              "name": "expires",
+              "value": "Sat, 18 Nov 2023 16:24:07 GMT"
+            },
+            {
+              "name": "source-age",
+              "value": "0"
+            }
+          ],
+          "headersSize": 906,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2023-11-18T16:19:07.116Z",
+        "time": 275,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 275
+        }
       }
     ],
     "pages": [],

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "@types/object-inspect": "^1.8.1",
     "@types/readable-stream": "^2.3.15",
     "@types/setup-polly-jest": "^0.5.2",
+    "@types/ws": "^8.5.9",
     "@typescript-eslint/eslint-plugin": "5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
     "abort-controller": "^3.0.0",
@@ -82,13 +83,14 @@
     "test-browser"
   ],
   "scripts": {
-    "pre-commit": "yarn run build && yarn run lint && yarn run depcheck && yarn run test-browser && yarn run test",
+    "pre-commit": "yarn run build && yarn run lint-no-cache && yarn run depcheck && yarn run test-browser && yarn run test",
     "test-changed": "lerna run test --since HEAD",
     "build-changed": "lerna run build --since HEAD",
     "test": "jest",
     "test-ci": "jest --ci --maxWorkers=4 --coverage",
     "test-browser": "karma start karma.config.js --single-run",
     "lint": "eslint . --ext .ts --cache",
+    "lint-no-cache": "eslint . --ext .ts",
     "lint-fix": "eslint . --ext .ts --fix",
     "build": "npm run build-ts && npm run build-components",
     "build-ts": "tsc",

diff --git a/packages/actor-guard-polling-diff/.npmignore → packages/actor-guard-naive/.npmignore b/packages/actor-guard-polling-diff/.npmignore → packages/actor-guard-naive/.npmignore