@graffy/client 0.15.25 → 0.16.0-alpha.10

package/index.cjs

@@ -13,7 +13,7 @@ const debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 function getOptionsParam(options) {
   if (!options)
     return "";
-  return encodeURIComponent(common.serialize(options));
+  return encodeURIComponent(JSON.stringify(options));
 }
 const aggregateQueries = {};
 class AggregateQuery {
@@ -37,7 +37,7 @@ class AggregateQuery {
     const response = await fetch(this.url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: common.serialize(this.combinedQuery)
+      body: JSON.stringify(common.pack(this.combinedQuery))
     });
     if (response.status !== 200) {
       const message = await response.text();
@@ -47,9 +47,14 @@ class AggregateQuery {
       }
       return;
     }
-    const data = await response.json();
-    for (const reader of this.readers) {
-      reader.resolve(data);
+    try {
+      const data = common.unpack(JSON.parse(await response.text()));
+      for (const reader of this.readers)
+        reader.resolve(data);
+    } catch (e) {
+      console.error(e);
+      for (const reader of this.readers)
+        reader.reject(e);
     }
   }
 }
@@ -88,14 +93,16 @@ const httpClient = (baseUrl, {
     if (!EventSource)
       throw Error("client.sse.unavailable");
     const optionsParam = getOptionsParam(await getOptions("watch", options));
-    const url = `${baseUrl}?q=${common.encodeUrl(query)}&opts=${optionsParam}`;
+    const url = `${baseUrl}?q=${encodeURIComponent(
+      JSON.stringify(common.pack(query))
+    )}&opts=${optionsParam}`;
     const source = new EventSource(url);
     yield* stream.makeStream((push, end) => {
       source.onmessage = ({ data }) => {
-        push(common.deserialize(data));
+        push(common.unpack(JSON.parse(data)));
       };
       source.onerror = (e) => {
-        end(Error("client.sse.transport: " + e.message));
+        end(Error("client.sse.transport: " + e));
       };
       source.addEventListener("graffyerror", (e) => {
         end(Error("server." + e.data));
@@ -113,10 +120,10 @@ const httpClient = (baseUrl, {
     return fetch(url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: common.serialize(change)
-    }).then((res) => {
+      body: JSON.stringify(common.pack(change))
+    }).then(async (res) => {
       if (res.status === 200)
-        return res.json();
+        return common.unpack(JSON.parse(await res.text()));
       return res.text().then((message) => {
         throw Error("server." + message);
       });
@@ -168,7 +175,7 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     socket.onopen = opened;
   }
   function received(event) {
-    const [id, ...data] = common.deserialize(event.data);
+    const [id, ...data] = JSON.parse(event.data);
     setAlive();
     if (id === ":ping") {
       send([":pong"]);
@@ -232,12 +239,13 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     }
     if (Date.now() - lastAlive < PING_TIMEOUT)
       return true;
+    log("Ping timeout, closing", lastAlive);
     socket.close();
     return false;
   }
   function send(req) {
     if (isAlive()) {
-      socket.send(common.serialize(req));
+      socket.send(JSON.stringify(req));
     } else {
       buffer.push(req);
     }
@@ -270,10 +278,10 @@ const wsClient = (url, {
   function once(op, payload, options) {
     return new Promise((resolve, reject) => {
       const id = socket.start(
-        [op, payload, getOptions(op, options) || {}],
+        [op, common.pack(payload), getOptions(op, options) || {}],
         (error, result) => {
           socket.stop(id);
-          error ? reject(Error("server." + error)) : resolve(result);
+          error ? reject(Error("server." + error)) : resolve(common.unpack(result));
         }
       );
     });
@@ -292,14 +300,14 @@ const wsClient = (url, {
     const op = "watch";
     return stream.makeStream((push, end) => {
       const id = socket.start(
-        [op, query, getOptions(op, options) || {}],
+        [op, common.pack(query), getOptions(op, options) || {}],
         (error, result) => {
           if (error) {
             socket.stop(id);
             end(Error("server." + error));
             return;
           }
-          push(result);
+          push(common.unpack(result));
         }
       );
       return () => {

package/index.mjs

@@ -4,13 +4,13 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { encodeUrl, deserialize, serialize, add, makeId, makeWatcher } from "@graffy/common";
+import { pack, unpack, add, makeId, makeWatcher } from "@graffy/common";
 import { makeStream } from "@graffy/stream";
 import debug from "debug";
 function getOptionsParam(options) {
   if (!options)
     return "";
-  return encodeURIComponent(serialize(options));
+  return encodeURIComponent(JSON.stringify(options));
 }
 const aggregateQueries = {};
 class AggregateQuery {
@@ -34,7 +34,7 @@ class AggregateQuery {
     const response = await fetch(this.url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: serialize(this.combinedQuery)
+      body: JSON.stringify(pack(this.combinedQuery))
     });
     if (response.status !== 200) {
       const message = await response.text();
@@ -44,9 +44,14 @@ class AggregateQuery {
       }
       return;
     }
-    const data = await response.json();
-    for (const reader of this.readers) {
-      reader.resolve(data);
+    try {
+      const data = unpack(JSON.parse(await response.text()));
+      for (const reader of this.readers)
+        reader.resolve(data);
+    } catch (e) {
+      console.error(e);
+      for (const reader of this.readers)
+        reader.reject(e);
     }
   }
 }
@@ -85,14 +90,16 @@ const httpClient = (baseUrl, {
     if (!EventSource)
       throw Error("client.sse.unavailable");
     const optionsParam = getOptionsParam(await getOptions("watch", options));
-    const url = `${baseUrl}?q=${encodeUrl(query)}&opts=${optionsParam}`;
+    const url = `${baseUrl}?q=${encodeURIComponent(
+      JSON.stringify(pack(query))
+    )}&opts=${optionsParam}`;
     const source = new EventSource(url);
     yield* makeStream((push, end) => {
       source.onmessage = ({ data }) => {
-        push(deserialize(data));
+        push(unpack(JSON.parse(data)));
       };
       source.onerror = (e) => {
-        end(Error("client.sse.transport: " + e.message));
+        end(Error("client.sse.transport: " + e));
       };
       source.addEventListener("graffyerror", (e) => {
         end(Error("server." + e.data));
@@ -110,10 +117,10 @@ const httpClient = (baseUrl, {
     return fetch(url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: serialize(change)
-    }).then((res) => {
+      body: JSON.stringify(pack(change))
+    }).then(async (res) => {
       if (res.status === 200)
-        return res.json();
+        return unpack(JSON.parse(await res.text()));
       return res.text().then((message) => {
         throw Error("server." + message);
       });
@@ -165,7 +172,7 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     socket.onopen = opened;
   }
   function received(event) {
-    const [id, ...data] = deserialize(event.data);
+    const [id, ...data] = JSON.parse(event.data);
     setAlive();
     if (id === ":ping") {
       send([":pong"]);
@@ -229,12 +236,13 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     }
     if (Date.now() - lastAlive < PING_TIMEOUT)
       return true;
+    log("Ping timeout, closing", lastAlive);
     socket.close();
     return false;
   }
   function send(req) {
     if (isAlive()) {
-      socket.send(serialize(req));
+      socket.send(JSON.stringify(req));
     } else {
       buffer.push(req);
     }
@@ -267,10 +275,10 @@ const wsClient = (url, {
   function once(op, payload, options) {
     return new Promise((resolve, reject) => {
       const id = socket.start(
-        [op, payload, getOptions(op, options) || {}],
+        [op, pack(payload), getOptions(op, options) || {}],
         (error, result) => {
           socket.stop(id);
-          error ? reject(Error("server." + error)) : resolve(result);
+          error ? reject(Error("server." + error)) : resolve(unpack(result));
         }
       );
     });
@@ -289,14 +297,14 @@ const wsClient = (url, {
     const op = "watch";
     return makeStream((push, end) => {
       const id = socket.start(
-        [op, query, getOptions(op, options) || {}],
+        [op, pack(query), getOptions(op, options) || {}],
         (error, result) => {
           if (error) {
             socket.stop(id);
             end(Error("server." + error));
             return;
           }
-          push(result);
+          push(unpack(result));
         }
       );
       return () => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/client",
   "description": "Graffy client library for the browser, usin the `fetch()` or `WebSocket` APIs. This module is intended to be used with a Node.js server running Graffy Server.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.25",
+  "version": "0.16.0-alpha.10",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/stream": "0.15.25",
-    "@graffy/common": "0.15.25",
+    "@graffy/common": "0.16.0-alpha.10",
+    "@graffy/stream": "0.16.0-alpha.10",
     "debug": "^4.3.3"
   }
 }

package/types/httpClient.d.ts

@@ -3,14 +3,14 @@ export default httpClient;
  *
  * @param {string} baseUrl
  * @param {{
- *    getOptions?: () => Promise<void>,
+ *    getOptions?: (op: string, options: any) => Promise<void>,
  *    watch?: 'sse' | 'none' | 'hang',
  *    connInfoPath?: string,
  * } | undefined} options
  * @returns {(store: any) => void}
  */
 declare function httpClient(baseUrl: string, { getOptions, watch, connInfoPath, }?: {
-    getOptions?: () => Promise<void>;
+    getOptions?: (op: string, options: any) => Promise<void>;
     watch?: 'sse' | 'none' | 'hang';
     connInfoPath?: string;
-} | undefined): (store: any) => void;
+}): (store: any) => void;