@graffy/server 0.17.6 → 0.17.8-alpha.1

package/index.cjs

@@ -16,6 +16,15 @@ function server$1(store, { auth } = {}) {
         const qParam = parsed.query.q && String(parsed.query.q);
         const query = qParam && common.unpack(JSON.parse(decodeURIComponent(qParam)));
         if (req.headers.accept === "text/event-stream") {
+          if (auth && !await auth("watch", common.decodeQuery(query), options)) {
+            const body = "unauthorized";
+            res.writeHead(401, {
+              "Content-Type": "text/plain",
+              "Content-Length": Buffer.byteLength(body)
+            });
+            res.end(body);
+            return;
+          }
           res.setHeader("content-type", "text/event-stream");
           const keepAlive = setInterval(() => {
             if (req.aborted || res.finished) {
@@ -107,7 +116,7 @@ data: ${e.message}
 }
 const log = debug("graffy:server:ws");
 const PING_INTERVAL = 3e4;
-function server(store) {
+function server(store, { auth } = {}) {
   if (!store) throw new Error("server.store_undef");
   const wss = new ws.WebSocketServer({ noServer: true });
   wss.on("connection", function connection(ws2) {
@@ -120,6 +129,13 @@ function server(store) {
           ws2.pingPending = false;
           return;
         }
+        if (auth && op !== "unwatch") {
+          const decoded = op === "write" ? common.decodeGraph(payload) : common.decodeQuery(payload);
+          if (!await auth(op, decoded, options)) {
+            ws2.send(JSON.stringify([id, "unauthorized"]));
+            return;
+          }
+        }
         switch (op) {
           case "read":
           case "write":

package/index.mjs

@@ -1,5 +1,5 @@
 import url from "node:url";
-import { unpack, pack, decodeGraph, decodeQuery } from "@graffy/common";
+import { unpack, decodeQuery, pack, decodeGraph } from "@graffy/common";
 import debug from "debug";
 import { WebSocketServer } from "ws";
 const log$1 = debug("graffy:server:http");
@@ -14,6 +14,15 @@ function server$1(store, { auth } = {}) {
         const qParam = parsed.query.q && String(parsed.query.q);
         const query = qParam && unpack(JSON.parse(decodeURIComponent(qParam)));
         if (req.headers.accept === "text/event-stream") {
+          if (auth && !await auth("watch", decodeQuery(query), options)) {
+            const body = "unauthorized";
+            res.writeHead(401, {
+              "Content-Type": "text/plain",
+              "Content-Length": Buffer.byteLength(body)
+            });
+            res.end(body);
+            return;
+          }
           res.setHeader("content-type", "text/event-stream");
           const keepAlive = setInterval(() => {
             if (req.aborted || res.finished) {
@@ -105,7 +114,7 @@ data: ${e.message}
 }
 const log = debug("graffy:server:ws");
 const PING_INTERVAL = 3e4;
-function server(store) {
+function server(store, { auth } = {}) {
   if (!store) throw new Error("server.store_undef");
   const wss = new WebSocketServer({ noServer: true });
   wss.on("connection", function connection(ws) {
@@ -118,6 +127,13 @@ function server(store) {
           ws.pingPending = false;
           return;
         }
+        if (auth && op !== "unwatch") {
+          const decoded = op === "write" ? decodeGraph(payload) : decodeQuery(payload);
+          if (!await auth(op, decoded, options)) {
+            ws.send(JSON.stringify([id, "unauthorized"]));
+            return;
+          }
+        }
         switch (op) {
           case "read":
           case "write":

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/server",
   "description": "Node.js library for building an API for a Graffy store.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.17.6",
+  "version": "0.17.8-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.17.6",
+    "@graffy/common": "0.17.8-alpha.1",
     "debug": "^4.4.1",
     "ws": "^8.18.2"
   }

package/types/wsServer.d.ts

@@ -1 +1,12 @@
-export default function server(store: any): (request: any, socket: any, head: any) => Promise<void>;
+/**
+ * @typedef {import('@graffy/core').default} GraffyStore
+ * @param {GraffyStore} store
+ * @param {{
+ *   auth?: (operation: string, payload: any, options: any) => Promise<boolean>
+ * } | undefined} options
+ * @returns
+ */
+export default function server(store: GraffyStore, { auth }?: {
+    auth?: (operation: string, payload: any, options: any) => Promise<boolean>;
+} | undefined): (request: any, socket: any, head: any) => Promise<void>;
+export type GraffyStore = import("@graffy/core").default;