feat: Wire up WebSockets.

Closes #337
CommunitySolidServer · Nov 25, 2020 · 9b70068 · 9b70068
1 parent 4a7ea4a
commit 9b70068
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 14 deletions.
diff --git a/config/config-default.json b/config/config-default.json
@@ -10,6 +10,7 @@
     "files-scs:config/presets/ldp/permissions-extractor.json",
     "files-scs:config/presets/ldp/response-writer.json",
     "files-scs:config/presets/ldp/request-parser.json",
+    "files-scs:config/presets/ldp/websockets.json",
     "files-scs:config/presets/logging.json",
     "files-scs:config/presets/representation-conversion.json",
     "files-scs:config/presets/setup.json",

diff --git a/config/config-file.json b/config/config-file.json
@@ -10,6 +10,7 @@
     "files-scs:config/presets/ldp/permissions-extractor.json",
     "files-scs:config/presets/ldp/response-writer.json",
     "files-scs:config/presets/ldp/request-parser.json",
+    "files-scs:config/presets/ldp/websockets.json",
     "files-scs:config/presets/logging.json",
     "files-scs:config/presets/representation-conversion.json",
     "files-scs:config/presets/setup.json",

diff --git a/config/config-path-routing.json b/config/config-path-routing.json
@@ -10,6 +10,7 @@
     "files-scs:config/presets/ldp/permissions-extractor.json",
     "files-scs:config/presets/ldp/response-writer.json",
     "files-scs:config/presets/ldp/request-parser.json",
+    "files-scs:config/presets/ldp/websockets.json",
     "files-scs:config/presets/logging.json",
     "files-scs:config/presets/representation-conversion.json",
     "files-scs:config/presets/setup.json",

diff --git a/config/config-rdf-to-sparql-endpoint.json b/config/config-rdf-to-sparql-endpoint.json
@@ -10,6 +10,7 @@
     "files-scs:config/presets/ldp/permissions-extractor.json",
     "files-scs:config/presets/ldp/response-writer.json",
     "files-scs:config/presets/ldp/request-parser.json",
+    "files-scs:config/presets/ldp/websockets.json",
     "files-scs:config/presets/logging.json",
     "files-scs:config/presets/representation-conversion.json",
     "files-scs:config/presets/setup.json",

diff --git a/config/config-sparql-endpoint.json b/config/config-sparql-endpoint.json
@@ -10,6 +10,7 @@
     "files-scs:config/presets/ldp/permissions-extractor.json",
     "files-scs:config/presets/ldp/response-writer.json",
     "files-scs:config/presets/ldp/request-parser.json",
+    "files-scs:config/presets/ldp/websockets.json",
     "files-scs:config/presets/logging.json",
     "files-scs:config/presets/representation-conversion.json",
     "files-scs:config/presets/setup.json",

diff --git a/config/presets/acl.json b/config/presets/acl.json
@@ -12,7 +12,7 @@
         "@id": "urn:solid-server:default:AclManager"
       },
       "WebAclAuthorizer:_resourceStore": {
-        "@id": "urn:solid-server:default:ResourceStore_Patching"
+        "@id": "urn:solid-server:default:ResourceStore"
       }
     }
   ]

diff --git a/config/presets/http.json b/config/presets/http.json
@@ -3,6 +3,16 @@
   "@graph": [
     {
       "@id": "urn:solid-server:default:ServerFactory",
+      "@type": "WebSocketServerFactory",
+      "WebSocketServerFactory:_baseServerFactory": {
+        "@id": "urn:solid-server:default:ExpressHttpServerFactory"
+      },
+      "WebSocketServerFactory:_webSocketHandler": {
+        "@id": "urn:solid-server:default:WebSocketHandler"
+      }
+    },
+    {
+      "@id": "urn:solid-server:default:ExpressHttpServerFactory",
       "@type": "ExpressHttpServerFactory",
       "ExpressHttpServerFactory:_handler": {
         "@id": "urn:solid-server:default:HttpHandler"

diff --git a/config/presets/ldp/operation-handler.json b/config/presets/ldp/operation-handler.json
@@ -8,37 +8,37 @@
         {
           "@type": "DeleteOperationHandler",
           "DeleteOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         },
         {
           "@type": "GetOperationHandler",
           "GetOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         },
         {
           "@type": "HeadOperationHandler",
           "HeadOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         },
         {
           "@type": "PatchOperationHandler",
           "PatchOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         },
         {
           "@type": "PostOperationHandler",
           "PostOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         },
         {
           "@type": "PutOperationHandler",
           "PutOperationHandler:_store": {
-            "@id": "urn:solid-server:default:ResourceStore_Patching"
+            "@id": "urn:solid-server:default:ResourceStore"
           }
         }
       ]

diff --git a/config/presets/ldp/response-writer.json b/config/presets/ldp/response-writer.json
@@ -26,6 +26,12 @@
               "LinkRelMetadataWriter:_headerMap_value": "type"
             }
           ]
+        },
+        {
+          "@type": "WebSocketMetadataWriter",
+          "WebSocketMetadataWriter:_settings_port": {
+            "@id": "urn:solid-server:default:variable:port"
+          }
         }
       ]
     },

diff --git a/config/presets/ldp/websockets.json b/config/presets/ldp/websockets.json
@@ -0,0 +1,12 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "@id": "urn:solid-server:default:WebSocketHandler",
+      "@type": "UnsecureWebSocketsProtocol",
+      "UnsecureWebSocketsProtocol:_source": {
+        "@id": "urn:solid-server:default:ResourceStore"
+      }
+    }
+  ]
+}
diff --git a/config/presets/setup.json b/config/presets/setup.json
@@ -8,7 +8,7 @@
         "@id": "urn:solid-server:default:ServerFactory"
       },
       "Setup:_store": {
-        "@id": "urn:solid-server:default:ResourceStore_Patching"
+        "@id": "urn:solid-server:default:ResourceStore"
       },
       "Setup:_aclManager": {
         "@id": "urn:solid-server:default:AclManager"

diff --git a/config/presets/storage-wrapper.json b/config/presets/storage-wrapper.json
@@ -2,12 +2,11 @@
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld",
   "@graph": [
     {
-      "@id": "urn:solid-server:default:ResourceLocker",
-      "@type": "WrappedExpiringResourceLocker",
-      "WrappedExpiringResourceLocker:_locker": {
-        "@type": "SingleThreadedResourceLocker"
-      },
-      "WrappedExpiringResourceLocker:_expiration": 3000
+      "@id": "urn:solid-server:default:ResourceStore",
+      "@type": "MonitoringStore",
+      "MonitoringStore:_source": {
+        "@id": "urn:solid-server:default:ResourceStore_Patching"
+      }
     },
 
     {
@@ -28,6 +27,16 @@
       }
     },
 
+    {
+      "@id": "urn:solid-server:default:ResourceLocker",
+      "@type": "WrappedExpiringResourceLocker",
+      "WrappedExpiringResourceLocker:_locker": {
+        "@type": "SingleThreadedResourceLocker"
+      },
+      "WrappedExpiringResourceLocker:_expiration": 3000
+    },
+
+
     {
       "@id": "urn:solid-server:default:ResourceStore_ToTurtle",
       "@type": "RepresentationConvertingStore",