@applitools/eyes-cypress 3.24.0-beta.5 → 3.25.0

package/src/browser/socket.js

@@ -1,143 +1,144 @@
-const uuid = require('uuid');
-
-class Socket {
-  constructor() {
-    this._socket = null;
-    this._listeners = new Map();
-    this._queue = new Set();
-  }
-
-  attach(ws) {
-    if (!ws) return;
-
-    if (ws.readyState === WebSocket.CONNECTING) ws.addEventListener('open', () => this.attach(ws));
-    else if (ws.readyState === WebSocket.OPEN) {
-      this._socket = ws;
-      this._queue.forEach(command => command());
-      this._queue.clear();
-
-      this._socket.addEventListener('message', message => {
-        const {name, key, payload} = this.deserialize(message);
-        const fns = this._listeners.get(name);
-        if (fns) fns.forEach(fn => fn(payload, key));
-        if (key) {
-          const fns = this._listeners.get(`${name}/${key}`);
-          if (fns) fns.forEach(fn => fn(payload, key));
-        }
-      });
-      this._socket.addEventListener('close', () => {
-        const fns = this._listeners.get('close');
-        if (fns) fns.forEach(fn => fn());
-      });
-    }
-  }
-
-  on(type, fn) {
-    const name = typeof type === 'string' ? type : `${type.name}/${type.key}`;
-    let fns = this._listeners.get(name);
-    if (!fns) {
-      fns = new Set();
-      this._listeners.set(name, fns);
-    }
-    fns.add(fn);
-    return () => this.off(name, fn);
-  }
-
-  connect(url) {
-    const ws = new WebSocket(url);
-    this.attach(ws);
-  }
-
-  disconnect() {
-    if (!this._socket) return;
-    this._socket.terminate();
-    this._socket = null;
-  }
-
-  request(name, payload) {
-    return new Promise((resolve, reject) => {
-      try {
-        const key = uuid.v4();
-        this.emit({name, key}, payload);
-        this.once({name, key}, response => {
-          if (response.error) return reject(response.error);
-          return resolve(response.result);
-        });
-      } catch (ex) {
-        console.log(ex);
-        throw ex;
-      }
-    });
-  }
-
-  command(name, fn) {
-    this.on(name, async (payload, key) => {
-      try {
-        const result = await fn(payload);
-        this.emit({name, key}, {result});
-      } catch (error) {
-        console.log(error);
-        this.emit({name, key}, {error});
-      }
-    });
-  }
-
-  subscribe(name, publisher, fn) {
-    const subscription = uuid.v4();
-    this.emit(name, {publisher, subscription});
-    const off = this.on({name, key: subscription}, fn);
-    return () => (this.emit({name, key: subscription}), off());
-  }
-
-  once(type, fn) {
-    const off = this.on(type, (...args) => (fn(...args), this.off()));
-    return off;
-  }
-
-  off(name, fn) {
-    if (!fn) return this._listeners.delete(name);
-    const fns = this._listeners.get(name);
-    if (!fns) return false;
-    const existed = fns.delete(fn);
-    if (!fns.size) this._listeners.delete(name);
-    return existed;
-  }
-
-  emit(type, payload) {
-    try {
-      const command = () => this._socket.send(this.serialize(type, payload));
-      if (this._socket) command();
-      else this._queue.add(command);
-      return () => this._queue.delete(command);
-    } catch (ex) {
-      console.log(ex);
-      throw ex;
-    }
-  }
-
-  ref() {
-    const command = () => this._socket._socket.ref();
-    if (this._socket) command();
-    else this._queue.add(command);
-    return () => this._queue.delete(command);
-  }
-
-  unref() {
-    const command = () => this._socket._socket.unref();
-    if (this._socket) command();
-    else this._queue.add(command);
-    return () => this._queue.delete(command);
-  }
-
-  serialize(type, payload) {
-    const message =
-      typeof type === 'string' ? {name: type, payload} : {name: type.name, key: type.key, payload};
-    return JSON.stringify(message);
-  }
-
-  deserialize(message) {
-    return JSON.parse(message.data);
-  }
-}
-
-module.exports = Socket;
+/* global WebSocket */
+const uuid = require('uuid');
+
+class Socket {
+  constructor() {
+    this._socket = null;
+    this._listeners = new Map();
+    this._queue = new Set();
+  }
+
+  attach(ws) {
+    if (!ws) return;
+
+    if (ws.readyState === WebSocket.CONNECTING) ws.addEventListener('open', () => this.attach(ws));
+    else if (ws.readyState === WebSocket.OPEN) {
+      this._socket = ws;
+      this._queue.forEach(command => command());
+      this._queue.clear();
+
+      this._socket.addEventListener('message', message => {
+        const {name, key, payload} = this.deserialize(message);
+        const fns = this._listeners.get(name);
+        if (fns) fns.forEach(fn => fn(payload, key));
+        if (key) {
+          const fns = this._listeners.get(`${name}/${key}`);
+          if (fns) fns.forEach(fn => fn(payload, key));
+        }
+      });
+      this._socket.addEventListener('close', () => {
+        const fns = this._listeners.get('close');
+        if (fns) fns.forEach(fn => fn());
+      });
+    }
+  }
+
+  on(type, fn) {
+    const name = typeof type === 'string' ? type : `${type.name}/${type.key}`;
+    let fns = this._listeners.get(name);
+    if (!fns) {
+      fns = new Set();
+      this._listeners.set(name, fns);
+    }
+    fns.add(fn);
+    return () => this.off(name, fn);
+  }
+
+  connect(url) {
+    const ws = new WebSocket(url);
+    this.attach(ws);
+  }
+
+  disconnect() {
+    if (!this._socket) return;
+    this._socket.terminate();
+    this._socket = null;
+  }
+
+  request(name, payload) {
+    return new Promise((resolve, reject) => {
+      try {
+        const key = uuid.v4();
+        this.emit({name, key}, payload);
+        this.once({name, key}, response => {
+          if (response.error) return reject(response.error);
+          return resolve(response.result);
+        });
+      } catch (ex) {
+        console.log(ex);
+        throw ex;
+      }
+    });
+  }
+
+  command(name, fn) {
+    this.on(name, async (payload, key) => {
+      try {
+        const result = await fn(payload);
+        this.emit({name, key}, {result});
+      } catch (error) {
+        console.log(error);
+        this.emit({name, key}, {error});
+      }
+    });
+  }
+
+  subscribe(name, publisher, fn) {
+    const subscription = uuid.v4();
+    this.emit(name, {publisher, subscription});
+    const off = this.on({name, key: subscription}, fn);
+    return () => (this.emit({name, key: subscription}), off());
+  }
+
+  once(type, fn) {
+    const off = this.on(type, (...args) => (fn(...args), this.off()));
+    return off;
+  }
+
+  off(name, fn) {
+    if (!fn) return this._listeners.delete(name);
+    const fns = this._listeners.get(name);
+    if (!fns) return false;
+    const existed = fns.delete(fn);
+    if (!fns.size) this._listeners.delete(name);
+    return existed;
+  }
+
+  emit(type, payload) {
+    try {
+      const command = () => this._socket.send(this.serialize(type, payload));
+      if (this._socket) command();
+      else this._queue.add(command);
+      return () => this._queue.delete(command);
+    } catch (ex) {
+      console.log(ex);
+      throw ex;
+    }
+  }
+
+  ref() {
+    const command = () => this._socket._socket.ref();
+    if (this._socket) command();
+    else this._queue.add(command);
+    return () => this._queue.delete(command);
+  }
+
+  unref() {
+    const command = () => this._socket._socket.unref();
+    if (this._socket) command();
+    else this._queue.add(command);
+    return () => this._queue.delete(command);
+  }
+
+  serialize(type, payload) {
+    const message =
+      typeof type === 'string' ? {name: type, payload} : {name: type.name, key: type.key, payload};
+    return JSON.stringify(message);
+  }
+
+  deserialize(message) {
+    return JSON.parse(message.data);
+  }
+}
+
+module.exports = Socket;

package/src/browser/socketCommands.js

@@ -1,81 +1,81 @@
-const spec = require('../../dist/browser/spec-driver');
-
-function socketCommands(socket, refer) {
-  socket.command('Driver.executeScript', ({context, script, arg = []}) => {
-    const res = spec.executeScript(refer.deref(context), script, derefArgs(arg));
-    return refer.ref(res);
-  });
-  socket.command('Driver.mainContext', () => {
-    return refer.ref(spec.mainContext());
-  });
-
-  socket.command('Driver.parentContext', ({context}) => {
-    return refer.ref(spec.parentContext(refer.deref(context)));
-  });
-
-  socket.command('Driver.childContext', ({context, element}) => {
-    return refer.ref(spec.childContext(refer.deref(context), refer.deref(element)));
-  });
-
-  socket.command('Driver.getViewportSize', () => {
-    return spec.getViewportSize();
-  });
-  socket.command('Driver.setViewportSize', vs => {
-    spec.setViewportSize(vs);
-  });
-  socket.command('Driver.findElement', ({context, selector, parent}) => {
-    const element = spec.findElement(
-      refer.deref(context),
-      spec.transformSelector(selector),
-      refer.deref(parent),
-    );
-    return element === null ? element : refer.ref(element, context);
-  });
-  socket.command('Driver.findElements', ({context, selector, parent}) => {
-    const elements = spec.findElements(
-      refer.deref(context),
-      spec.transformSelector(selector),
-      refer.deref(parent),
-    );
-    return Array.prototype.map.call(elements, element =>
-      element === null ? element : refer.ref(element, context),
-    );
-  });
-
-  socket.command('Driver.getUrl', context => {
-    return spec.getUrl(refer.deref(context));
-  });
-
-  socket.command('Driver.getTitle', context => {
-    return spec.getTitle(refer.deref(context.driver));
-  });
-
-  socket.command('Driver.getCookies', async () => {
-    return await spec.getCookies();
-  });
-
-  // utils
-
-  function derefArgs(arg) {
-    const derefArg = [];
-    if (Array.isArray(arg)) {
-      for (const argument of arg) {
-        if (Array.isArray(argument)) {
-          derefArg.push(derefArgs(argument));
-        } else {
-          derefArg.push(refer.deref(argument));
-        }
-      }
-      return derefArg;
-    } else if (typeof arg === 'object') {
-      for (const [key, value] of Object.entries(arg)) {
-        derefArg[key] = refer.deref(value);
-      }
-      return derefArg;
-    } else {
-      return arg;
-    }
-  }
-}
-
-module.exports = {socketCommands};
+const spec = require('../../dist/browser/spec-driver');
+
+function socketCommands(socket, refer) {
+  socket.command('Driver.executeScript', ({context, script, arg = []}) => {
+    const res = spec.executeScript(refer.deref(context), script, derefArgs(arg));
+    return refer.ref(res);
+  });
+  socket.command('Driver.mainContext', () => {
+    return refer.ref(spec.mainContext());
+  });
+
+  socket.command('Driver.parentContext', ({context}) => {
+    return refer.ref(spec.parentContext(refer.deref(context)));
+  });
+
+  socket.command('Driver.childContext', ({context, element}) => {
+    return refer.ref(spec.childContext(refer.deref(context), refer.deref(element)));
+  });
+
+  socket.command('Driver.getViewportSize', () => {
+    return spec.getViewportSize();
+  });
+  socket.command('Driver.setViewportSize', vs => {
+    spec.setViewportSize(vs);
+  });
+  socket.command('Driver.findElement', ({context, selector, parent}) => {
+    const element = spec.findElement(
+      refer.deref(context),
+      spec.transformSelector(selector),
+      refer.deref(parent),
+    );
+    return element === null ? element : refer.ref(element, context);
+  });
+  socket.command('Driver.findElements', ({context, selector, parent}) => {
+    const elements = spec.findElements(
+      refer.deref(context),
+      spec.transformSelector(selector),
+      refer.deref(parent),
+    );
+    return Array.prototype.map.call(elements, element =>
+      element === null ? element : refer.ref(element, context),
+    );
+  });
+
+  socket.command('Driver.getUrl', context => {
+    return spec.getUrl(refer.deref(context));
+  });
+
+  socket.command('Driver.getTitle', context => {
+    return spec.getTitle(refer.deref(context.driver));
+  });
+
+  socket.command('Driver.getCookies', async () => {
+    return await spec.getCookies();
+  });
+
+  // utils
+
+  function derefArgs(arg) {
+    const derefArg = [];
+    if (Array.isArray(arg)) {
+      for (const argument of arg) {
+        if (Array.isArray(argument)) {
+          derefArg.push(derefArgs(argument));
+        } else {
+          derefArg.push(refer.deref(argument));
+        }
+      }
+      return derefArg;
+    } else if (typeof arg === 'object') {
+      for (const [key, value] of Object.entries(arg)) {
+        derefArg[key] = refer.deref(value);
+      }
+      return derefArg;
+    } else {
+      return arg;
+    }
+  }
+}
+
+module.exports = {socketCommands};