@graffy/client 0.16.19 → 0.16.20-alpha.2

package/index.cjs

@@ -1,16 +1,12 @@
 "use strict";
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const common = require("@graffy/common");
 const stream = require("@graffy/stream");
 const debug = require("debug");
 function getOptionsParam(options) {
-  if (!options)
-    return "";
+  if (!options) return "";
   return encodeURIComponent(JSON.stringify(options));
 }
 const aggregateQueries = {};
@@ -23,8 +19,7 @@ class AggregateQuery {
   }
   add(query) {
     common.add(this.combinedQuery, query);
-    if (this.timer)
-      clearTimeout(this.timer);
+    if (this.timer) clearTimeout(this.timer);
     this.timer = setTimeout(() => this.doFetch(), 0);
     return new Promise((resolve, reject) => {
       this.readers.push({ query, resolve, reject });
@@ -47,17 +42,14 @@ class AggregateQuery {
     }
     try {
       const data = common.unpack(JSON.parse(await response.text()));
-      for (const reader of this.readers)
-        reader.resolve(data);
+      for (const reader of this.readers) reader.resolve(data);
     } catch (e) {
-      for (const reader of this.readers)
-        reader.reject(e);
+      for (const reader of this.readers) reader.reject(e);
     }
   }
 }
 function makeQuery(url, query) {
-  if (!aggregateQueries[url])
-    aggregateQueries[url] = new AggregateQuery(url);
+  if (!aggregateQueries[url]) aggregateQueries[url] = new AggregateQuery(url);
   return aggregateQueries[url].add(query);
 }
 const httpClient = (baseUrl, {
@@ -72,23 +64,20 @@ const httpClient = (baseUrl, {
   });
   store.onRead(connInfoPath, () => ({ url: baseUrl }));
   store.on("read", async (query, options) => {
-    if (!fetch)
-      throw Error("client.fetch.unavailable");
+    if (!fetch) throw Error("client.fetch.unavailable");
     const optionsParam = getOptionsParam(await getOptions("read", options));
     const url = `${baseUrl}?opts=${optionsParam}&op=read`;
     return makeQuery(url, query);
   });
   store.on("watch", async function* (query, options) {
-    if (watch === "none")
-      throw Error("client.no_watch");
+    if (watch === "none") throw Error("client.no_watch");
     if (watch === "hang") {
       yield* stream.makeStream((push) => {
         push(void 0);
       });
       return;
     }
-    if (!EventSource)
-      throw Error("client.sse.unavailable");
+    if (!EventSource) throw Error("client.sse.unavailable");
     const optionsParam = getOptionsParam(await getOptions("watch", options));
     const url = `${baseUrl}?q=${encodeURIComponent(
       JSON.stringify(common.pack(query))
@@ -110,8 +99,7 @@ const httpClient = (baseUrl, {
     });
   });
   store.on("write", async (change, options) => {
-    if (!fetch)
-      throw Error("client.fetch.unavailable");
+    if (!fetch) throw Error("client.fetch.unavailable");
     const optionsParam = getOptionsParam(await getOptions("write", options));
     const url = `${baseUrl}?opts=${optionsParam}&op=write`;
     return fetch(url, {
@@ -119,8 +107,7 @@ const httpClient = (baseUrl, {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(common.pack(change))
     }).then(async (res) => {
-      if (res.status === 200)
-        return common.unpack(JSON.parse(await res.text()));
+      if (res.status === 200) return common.unpack(JSON.parse(await res.text()));
       return res.text().then((message) => {
         throw Error(`server.${message}`);
       });
@@ -150,14 +137,12 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     const id = common.makeId();
     const request = [id, ...params];
     handlers[id] = { request, callback };
-    if (isAlive())
-      send(request);
+    if (isAlive()) send(request);
     return id;
   }
   function stop(id, params) {
     delete handlers[id];
-    if (params)
-      send([id, ...params]);
+    if (params) send([id, ...params]);
   }
   function connect() {
     log("Trying to connect to", url);
@@ -184,8 +169,7 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
   }
   function closed(_event) {
     log("Closed");
-    if (isOpen && onStatusChange)
-      onStatusChange(false);
+    if (isOpen && onStatusChange) onStatusChange(false);
     const wasOpen = isOpen;
     isOpen = false;
     isConnecting = false;
@@ -212,30 +196,24 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     isConnecting = false;
     lastAttempt = Date.now();
     setAlive();
-    if (onStatusChange)
-      onStatusChange(true);
-    for (const id in handlers)
-      send(handlers[id].request);
-    while (buffer.length)
-      send(buffer.shift());
+    if (onStatusChange) onStatusChange(true);
+    for (const id in handlers) send(handlers[id].request);
+    while (buffer.length) send(buffer.shift());
   }
   function setAlive() {
     lastAlive = Date.now();
     log("Set alive", lastAlive - lastAttempt);
-    if (lastAlive - lastAttempt > RESET_TIMEOUT)
-      attempts = 0;
+    if (lastAlive - lastAttempt > RESET_TIMEOUT) attempts = 0;
   }
   function isAlive() {
     log("Liveness check", isOpen ? "open" : "closed", Date.now() - lastAlive);
     clearTimeout(aliveTimer);
     aliveTimer = setTimeout(isAlive, INTERVAL);
     if (!isOpen) {
-      if (!isConnecting)
-        maybeConnect();
+      if (!isConnecting) maybeConnect();
       return false;
     }
-    if (Date.now() - lastAlive < PING_TIMEOUT)
-      return true;
+    if (Date.now() - lastAlive < PING_TIMEOUT) return true;
     log("Ping timeout, closing", lastAlive);
     socket.close();
     return false;
@@ -260,8 +238,7 @@ const wsClient = (url, {
   watch = void 0,
   connInfoPath = "connection"
 } = {}) => (store) => {
-  if (!WebSocket)
-    throw Error("client.websocket.unavailable");
+  if (!WebSocket) throw Error("client.websocket.unavailable");
   const socket = Socket(url, { onUnhandled, onStatusChange });
   let status = false;
   const statusWatcher = common.makeWatcher();
@@ -292,8 +269,7 @@ const wsClient = (url, {
   store.on("read", (query, options) => once("read", query, options));
   store.on("write", (change, options) => once("write", change, options));
   store.on("watch", (query, options) => {
-    if (watch === "none")
-      throw Error("client.no_watch");
+    if (watch === "none") throw Error("client.no_watch");
     const op = "watch";
     return stream.makeStream((push, end) => {
       const id = socket.start(

package/index.mjs

@@ -1,15 +1,11 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { pack, unpack, add, makeId, makeWatcher } from "@graffy/common";
 import { makeStream } from "@graffy/stream";
 import debug from "debug";
 function getOptionsParam(options) {
-  if (!options)
-    return "";
+  if (!options) return "";
   return encodeURIComponent(JSON.stringify(options));
 }
 const aggregateQueries = {};
@@ -22,8 +18,7 @@ class AggregateQuery {
   }
   add(query) {
     add(this.combinedQuery, query);
-    if (this.timer)
-      clearTimeout(this.timer);
+    if (this.timer) clearTimeout(this.timer);
     this.timer = setTimeout(() => this.doFetch(), 0);
     return new Promise((resolve, reject) => {
       this.readers.push({ query, resolve, reject });
@@ -46,17 +41,14 @@ class AggregateQuery {
     }
     try {
       const data = unpack(JSON.parse(await response.text()));
-      for (const reader of this.readers)
-        reader.resolve(data);
+      for (const reader of this.readers) reader.resolve(data);
     } catch (e) {
-      for (const reader of this.readers)
-        reader.reject(e);
+      for (const reader of this.readers) reader.reject(e);
     }
   }
 }
 function makeQuery(url, query) {
-  if (!aggregateQueries[url])
-    aggregateQueries[url] = new AggregateQuery(url);
+  if (!aggregateQueries[url]) aggregateQueries[url] = new AggregateQuery(url);
   return aggregateQueries[url].add(query);
 }
 const httpClient = (baseUrl, {
@@ -71,23 +63,20 @@ const httpClient = (baseUrl, {
   });
   store.onRead(connInfoPath, () => ({ url: baseUrl }));
   store.on("read", async (query, options) => {
-    if (!fetch)
-      throw Error("client.fetch.unavailable");
+    if (!fetch) throw Error("client.fetch.unavailable");
     const optionsParam = getOptionsParam(await getOptions("read", options));
     const url = `${baseUrl}?opts=${optionsParam}&op=read`;
     return makeQuery(url, query);
   });
   store.on("watch", async function* (query, options) {
-    if (watch === "none")
-      throw Error("client.no_watch");
+    if (watch === "none") throw Error("client.no_watch");
     if (watch === "hang") {
       yield* makeStream((push) => {
         push(void 0);
       });
       return;
     }
-    if (!EventSource)
-      throw Error("client.sse.unavailable");
+    if (!EventSource) throw Error("client.sse.unavailable");
     const optionsParam = getOptionsParam(await getOptions("watch", options));
     const url = `${baseUrl}?q=${encodeURIComponent(
       JSON.stringify(pack(query))
@@ -109,8 +98,7 @@ const httpClient = (baseUrl, {
     });
   });
   store.on("write", async (change, options) => {
-    if (!fetch)
-      throw Error("client.fetch.unavailable");
+    if (!fetch) throw Error("client.fetch.unavailable");
     const optionsParam = getOptionsParam(await getOptions("write", options));
     const url = `${baseUrl}?opts=${optionsParam}&op=write`;
     return fetch(url, {
@@ -118,8 +106,7 @@ const httpClient = (baseUrl, {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(pack(change))
     }).then(async (res) => {
-      if (res.status === 200)
-        return unpack(JSON.parse(await res.text()));
+      if (res.status === 200) return unpack(JSON.parse(await res.text()));
       return res.text().then((message) => {
         throw Error(`server.${message}`);
       });
@@ -149,14 +136,12 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     const id = makeId();
     const request = [id, ...params];
     handlers[id] = { request, callback };
-    if (isAlive())
-      send(request);
+    if (isAlive()) send(request);
     return id;
   }
   function stop(id, params) {
     delete handlers[id];
-    if (params)
-      send([id, ...params]);
+    if (params) send([id, ...params]);
   }
   function connect() {
     log("Trying to connect to", url);
@@ -183,8 +168,7 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
   }
   function closed(_event) {
     log("Closed");
-    if (isOpen && onStatusChange)
-      onStatusChange(false);
+    if (isOpen && onStatusChange) onStatusChange(false);
     const wasOpen = isOpen;
     isOpen = false;
     isConnecting = false;
@@ -211,30 +195,24 @@ function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
     isConnecting = false;
     lastAttempt = Date.now();
     setAlive();
-    if (onStatusChange)
-      onStatusChange(true);
-    for (const id in handlers)
-      send(handlers[id].request);
-    while (buffer.length)
-      send(buffer.shift());
+    if (onStatusChange) onStatusChange(true);
+    for (const id in handlers) send(handlers[id].request);
+    while (buffer.length) send(buffer.shift());
   }
   function setAlive() {
     lastAlive = Date.now();
     log("Set alive", lastAlive - lastAttempt);
-    if (lastAlive - lastAttempt > RESET_TIMEOUT)
-      attempts = 0;
+    if (lastAlive - lastAttempt > RESET_TIMEOUT) attempts = 0;
   }
   function isAlive() {
     log("Liveness check", isOpen ? "open" : "closed", Date.now() - lastAlive);
     clearTimeout(aliveTimer);
     aliveTimer = setTimeout(isAlive, INTERVAL);
     if (!isOpen) {
-      if (!isConnecting)
-        maybeConnect();
+      if (!isConnecting) maybeConnect();
       return false;
     }
-    if (Date.now() - lastAlive < PING_TIMEOUT)
-      return true;
+    if (Date.now() - lastAlive < PING_TIMEOUT) return true;
     log("Ping timeout, closing", lastAlive);
     socket.close();
     return false;
@@ -259,8 +237,7 @@ const wsClient = (url, {
   watch = void 0,
   connInfoPath = "connection"
 } = {}) => (store) => {
-  if (!WebSocket)
-    throw Error("client.websocket.unavailable");
+  if (!WebSocket) throw Error("client.websocket.unavailable");
   const socket = Socket(url, { onUnhandled, onStatusChange });
   let status = false;
   const statusWatcher = makeWatcher();
@@ -291,8 +268,7 @@ const wsClient = (url, {
   store.on("read", (query, options) => once("read", query, options));
   store.on("write", (change, options) => once("write", change, options));
   store.on("watch", (query, options) => {
-    if (watch === "none")
-      throw Error("client.no_watch");
+    if (watch === "none") throw Error("client.no_watch");
     const op = "watch";
     return makeStream((push, end) => {
       const id = socket.start(

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.16.19",
+  "version": "0.16.20-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.19",
-    "@graffy/stream": "0.16.19",
-    "debug": "^4.3.3"
+    "@graffy/common": "0.16.20-alpha.2",
+    "@graffy/stream": "0.16.20-alpha.2",
+    "debug": "^4.3.7"
   }
 }

package/types/httpClient.d.ts

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