@graffy/server 0.15.17 → 0.15.19-alpha.2

package/Readme.md

@@ -4,4 +4,4 @@ Node.js library for building an API for a Graffy store.
 
 This creates an HTTP request handler for serving an API that is compatible with Graffy Client. The request handler can be used with the Node.js built-in http, https and http2 `createServer()` and with Express.js.
 
-See [Graffy documentation](https://aravindet.github.io/graffy/#/GraffyServer) for more.
+See [Graffy documentation](https://graffy.org#/GraffyServer) for more.

package/index.cjs

@@ -30,14 +30,14 @@ function _interopDefaultLegacy(e) {
 var url__default = /* @__PURE__ */ _interopDefaultLegacy(url);
 var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 const log$1 = debug__default["default"]("graffy:server:http");
-function server$1(store) {
+function server$1(store, { auth } = {}) {
   if (!store)
     throw new Error("server.store_undef");
   return async (req, res) => {
     const parsed = url__default["default"].parse(req.url, true);
-    const query = parsed.query.q && common.decodeUrl(parsed.query.q);
     const options = parsed.query.opts && !Array.isArray(parsed.query.opts) && common.deserialize(decodeURIComponent(parsed.query.opts));
     if (req.method === "GET") {
+      const query = parsed.query.q && common.decodeUrl(parsed.query.q);
       try {
         if (req.headers["accept"] === "text/event-stream") {
           res.setHeader("content-type", "text/event-stream");
@@ -78,7 +78,7 @@ data: ${e.message}
       }
     } else if (req.method === "POST") {
       try {
-        const op = req.query.op;
+        const op = parsed.query.op;
         if (op !== "write" && op !== "read") {
           throw Error("httpServer.unsupported_op: " + op);
         }
@@ -86,6 +86,11 @@ data: ${e.message}
         for await (const chunk of req)
           chunks.push(chunk);
         const payload = common.deserialize(Buffer.concat(chunks).toString());
+        if (auth && !await auth(op, payload, options)) {
+          res.writeHead(401);
+          res.end("unauthorized");
+          return;
+        }
         const value = await store.call(op, payload, options);
         res.writeHead(200);
         res.end(common.serialize(value));

package/index.mjs

@@ -18,18 +18,18 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import url from "url";
-import { decodeUrl, deserialize, serialize } from "@graffy/common";
+import { deserialize, decodeUrl, serialize } from "@graffy/common";
 import debug from "debug";
 import { WebSocketServer } from "ws";
 const log$1 = debug("graffy:server:http");
-function server$1(store) {
+function server$1(store, { auth } = {}) {
   if (!store)
     throw new Error("server.store_undef");
   return async (req, res) => {
     const parsed = url.parse(req.url, true);
-    const query = parsed.query.q && decodeUrl(parsed.query.q);
     const options = parsed.query.opts && !Array.isArray(parsed.query.opts) && deserialize(decodeURIComponent(parsed.query.opts));
     if (req.method === "GET") {
+      const query = parsed.query.q && decodeUrl(parsed.query.q);
       try {
         if (req.headers["accept"] === "text/event-stream") {
           res.setHeader("content-type", "text/event-stream");
@@ -70,7 +70,7 @@ data: ${e.message}
       }
     } else if (req.method === "POST") {
       try {
-        const op = req.query.op;
+        const op = parsed.query.op;
         if (op !== "write" && op !== "read") {
           throw Error("httpServer.unsupported_op: " + op);
         }
@@ -78,6 +78,11 @@ data: ${e.message}
         for await (const chunk of req)
           chunks.push(chunk);
         const payload = deserialize(Buffer.concat(chunks).toString());
+        if (auth && !await auth(op, payload, options)) {
+          res.writeHead(401);
+          res.end("unauthorized");
+          return;
+        }
         const value = await store.call(op, payload, options);
         res.writeHead(200);
         res.end(serialize(value));

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.15.17",
+  "version": "0.15.19-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "ws": "^8.4.2",
-    "@graffy/common": "0.15.17",
-    "debug": "^4.3.3"
+    "@graffy/common": "0.15.19-alpha.2",
+    "debug": "^4.3.3",
+    "ws": "^8.4.2"
   }
 }

package/types/httpServer.d.ts

@@ -1 +1,12 @@
-export default function server(store: any): (req: any, res: 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: any, { auth }?: {
+    auth?: (operation: string, payload: any, options: any) => Promise<boolean>;
+}): (req: any, res: any) => Promise<void>;
+export type GraffyStore = any;