@graffy/client 0.15.24-alpha.1 → 0.15.25-alpha.2

package/index.cjs

@@ -5,13 +5,11 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-var common = require("@graffy/common");
-var stream = require("@graffy/stream");
-var debug = require("debug");
-function _interopDefaultLegacy(e) {
-  return e && typeof e === "object" && "default" in e ? e : { "default": e };
-}
-var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
+const common = require("@graffy/common");
+const stream = require("@graffy/stream");
+const debug = require("debug");
+const _interopDefaultLegacy = (e) => e && typeof e === "object" && "default" in e ? e : { default: e };
+const debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 function getOptionsParam(options) {
   if (!options)
     return "";
@@ -125,7 +123,7 @@ const httpClient = (baseUrl, {
     });
   });
 };
-const log = debug__default["default"]("graffy:client:socket");
+const log = debug__default.default("graffy:client:socket");
 log.log = console.log.bind(console);
 const MIN_DELAY = 1e3;
 const MAX_DELAY = 3e5;
@@ -133,7 +131,7 @@ const DELAY_GROWTH = 1.5;
 const INTERVAL = 2e3;
 const PING_TIMEOUT = 4e4;
 const RESET_TIMEOUT = 1e4;
-function Socket(url, { onUnhandled, onStatusChange } = {}) {
+function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
   const handlers = {};
   const buffer = [];
   let isOpen = false;
@@ -163,7 +161,7 @@ function Socket(url, { onUnhandled, onStatusChange } = {}) {
     isConnecting = true;
     lastAttempt = Date.now();
     attempts++;
-    socket = new WebSocket(url);
+    socket = new globalThis.WebSocket(url);
     socket.onmessage = received;
     socket.onerror = closed;
     socket.onclose = closed;
@@ -252,11 +250,14 @@ function Socket(url, { onUnhandled, onStatusChange } = {}) {
     isAlive
   };
 }
-const wsClient = (url, { getOptions = () => {
-}, watch, connInfoPath = "connection" } = {}) => (store) => {
+const wsClient = (url, {
+  getOptions = (..._) => false,
+  watch = void 0,
+  connInfoPath = "connection"
+} = {}) => (store) => {
   if (!WebSocket)
     throw Error("client.websocket.unavailable");
-  const socket = new Socket(url, { onUnhandled, onStatusChange });
+  const socket = Socket(url, { onUnhandled, onStatusChange });
   let status = false;
   const statusWatcher = common.makeWatcher();
   function onUnhandled(id) {
@@ -268,10 +269,13 @@ const wsClient = (url, { getOptions = () => {
   }
   function once(op, payload, options) {
     return new Promise((resolve, reject) => {
-      const id = socket.start([op, payload, getOptions(op, options) || {}], (error, result) => {
-        socket.stop(id);
-        error ? reject(Error("server." + error)) : resolve(result);
-      });
+      const id = socket.start(
+        [op, payload, getOptions(op, options) || {}],
+        (error, result) => {
+          socket.stop(id);
+          error ? reject(Error("server." + error)) : resolve(result);
+        }
+      );
     });
   }
   store.onWrite(connInfoPath, () => {
@@ -287,14 +291,17 @@ const wsClient = (url, { getOptions = () => {
       throw Error("client.no_watch");
     const op = "watch";
     return stream.makeStream((push, end) => {
-      const id = socket.start([op, query, getOptions(op, options) || {}], (error, result) => {
-        if (error) {
-          socket.stop(id);
-          end(Error("server." + error));
-          return;
+      const id = socket.start(
+        [op, query, getOptions(op, options) || {}],
+        (error, result) => {
+          if (error) {
+            socket.stop(id);
+            end(Error("server." + error));
+            return;
+          }
+          push(result);
         }
-        push(result);
-      });
+      );
       return () => {
         socket.stop(id, ["unwatch"]);
       };

package/index.mjs

@@ -128,7 +128,7 @@ const DELAY_GROWTH = 1.5;
 const INTERVAL = 2e3;
 const PING_TIMEOUT = 4e4;
 const RESET_TIMEOUT = 1e4;
-function Socket(url, { onUnhandled, onStatusChange } = {}) {
+function Socket(url, { onUnhandled = void 0, onStatusChange = void 0 } = {}) {
   const handlers = {};
   const buffer = [];
   let isOpen = false;
@@ -158,7 +158,7 @@ function Socket(url, { onUnhandled, onStatusChange } = {}) {
     isConnecting = true;
     lastAttempt = Date.now();
     attempts++;
-    socket = new WebSocket(url);
+    socket = new globalThis.WebSocket(url);
     socket.onmessage = received;
     socket.onerror = closed;
     socket.onclose = closed;
@@ -247,11 +247,14 @@ function Socket(url, { onUnhandled, onStatusChange } = {}) {
     isAlive
   };
 }
-const wsClient = (url, { getOptions = () => {
-}, watch, connInfoPath = "connection" } = {}) => (store) => {
+const wsClient = (url, {
+  getOptions = (..._) => false,
+  watch = void 0,
+  connInfoPath = "connection"
+} = {}) => (store) => {
   if (!WebSocket)
     throw Error("client.websocket.unavailable");
-  const socket = new Socket(url, { onUnhandled, onStatusChange });
+  const socket = Socket(url, { onUnhandled, onStatusChange });
   let status = false;
   const statusWatcher = makeWatcher();
   function onUnhandled(id) {
@@ -263,10 +266,13 @@ const wsClient = (url, { getOptions = () => {
   }
   function once(op, payload, options) {
     return new Promise((resolve, reject) => {
-      const id = socket.start([op, payload, getOptions(op, options) || {}], (error, result) => {
-        socket.stop(id);
-        error ? reject(Error("server." + error)) : resolve(result);
-      });
+      const id = socket.start(
+        [op, payload, getOptions(op, options) || {}],
+        (error, result) => {
+          socket.stop(id);
+          error ? reject(Error("server." + error)) : resolve(result);
+        }
+      );
     });
   }
   store.onWrite(connInfoPath, () => {
@@ -282,14 +288,17 @@ const wsClient = (url, { getOptions = () => {
       throw Error("client.no_watch");
     const op = "watch";
     return makeStream((push, end) => {
-      const id = socket.start([op, query, getOptions(op, options) || {}], (error, result) => {
-        if (error) {
-          socket.stop(id);
-          end(Error("server." + error));
-          return;
+      const id = socket.start(
+        [op, query, getOptions(op, options) || {}],
+        (error, result) => {
+          if (error) {
+            socket.stop(id);
+            end(Error("server." + error));
+            return;
+          }
+          push(result);
         }
-        push(result);
-      });
+      );
       return () => {
         socket.stop(id, ["unwatch"]);
       };
@@ -304,4 +313,6 @@ function GraffyClient(baseUrl, options) {
     return httpClient(baseUrl, options);
   }
 }
-export { GraffyClient as default };
+export {
+  GraffyClient as default
+};

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

package/types/Socket.d.ts

@@ -1,6 +1,6 @@
 export default function Socket(url: any, { onUnhandled, onStatusChange }?: {
-    onUnhandled: any;
-    onStatusChange: any;
+    onUnhandled?: any;
+    onStatusChange?: any;
 }): {
     start: (params: any, callback: any) => any;
     stop: (id: any, params: any) => void;

package/types/wsClient.d.ts

@@ -1,6 +1,6 @@
 export default wsClient;
-declare function wsClient(url: any, { getOptions, watch, connInfoPath }?: {
-    getOptions?: () => void;
-    watch: any;
+declare function wsClient(url: any, { getOptions, watch, connInfoPath, }?: {
+    getOptions?: (..._: any[]) => false;
+    watch?: any;
     connInfoPath?: string;
 }): (store: any) => void;