opal 1.6.1 → 1.7.0.rc1

data/lib/opal/cli_runners/node_modules/chrome-remote-interface/index.js

@@ -1,11 +1,20 @@
 'use strict';
 
 const EventEmitter = require('events');
+const dns = require('dns');
 
-const devtools = require('./lib/devtools');
-const Chrome = require('./lib/chrome');
+const devtools = require('./lib/devtools.js');
+const Chrome = require('./lib/chrome.js');
 
-module.exports = function (options, callback) {
+// XXX reset the default that has been changed in
+// (https://github.com/nodejs/node/pull/39987) to prefer IPv4. since
+// implementations alway bind on 127.0.0.1 this solution should be fairly safe
+// (see #467)
+if (dns.setDefaultResultOrder) {
+    dns.setDefaultResultOrder('ipv4first');
+}
+
+function CDP(options, callback) {
     if (typeof options === 'function') {
         callback = options;
         options = undefined;
@@ -13,24 +22,20 @@ module.exports = function (options, callback) {
     const notifier = new EventEmitter();
     if (typeof callback === 'function') {
         // allow to register the error callback later
-        process.nextTick(function () {
+        process.nextTick(() => {
             new Chrome(options, notifier);
         });
         return notifier.once('connect', callback);
     } else {
-        return new Promise(function (fulfill, reject) {
+        return new Promise((fulfill, reject) => {
             notifier.once('connect', fulfill);
             notifier.once('error', reject);
             new Chrome(options, notifier);
         });
     }
-};
-
-// for backward compatibility
-module.exports.listTabs = devtools.List;
-module.exports.spawnTab = devtools.New;
-module.exports.closeTab = devtools.Close;
+}
 
+module.exports = CDP;
 module.exports.Protocol = devtools.Protocol;
 module.exports.List = devtools.List;
 module.exports.New = devtools.New;

data/lib/opal/cli_runners/node_modules/chrome-remote-interface/lib/api.js

@@ -2,7 +2,7 @@
 
 function arrayToObject(parameters) {
     const keyValue = {};
-    parameters.forEach(function (parameter) {
+    parameters.forEach((parameter) =>{
         const name = parameter.name;
         delete parameter.name;
         keyValue[name] = parameter;
@@ -12,7 +12,7 @@ function arrayToObject(parameters) {
 
 function decorate(to, category, object) {
     to.category = category;
-    Object.keys(object).forEach(function (field) {
+    Object.keys(object).forEach((field) => {
         // skip the 'name' field as it is part of the function prototype
         if (field === 'name') {
             return;
@@ -28,56 +28,64 @@ function decorate(to, category, object) {
 }
 
 function addCommand(chrome, domainName, command) {
-    const handler = function (params, callback) {
-        return chrome.send(domainName + '.' + command.name, params, callback);
+    const commandName = `${domainName}.${command.name}`;
+    const handler = (params, sessionId, callback) => {
+        return chrome.send(commandName, params, sessionId, callback);
     };
     decorate(handler, 'command', command);
-    chrome[domainName][command.name] = handler;
+    chrome[commandName] = chrome[domainName][command.name] = handler;
 }
 
 function addEvent(chrome, domainName, event) {
-    const eventName = domainName + '.' + event.name;
-    const handler = function (handler) {
+    const eventName = `${domainName}.${event.name}`;
+    const handler = (sessionId, handler) => {
+        if (typeof sessionId === 'function') {
+            handler = sessionId;
+            sessionId = undefined;
+        }
+        const rawEventName = sessionId ? `${eventName}.${sessionId}` : eventName;
         if (typeof handler === 'function') {
-            chrome.on(eventName, handler);
+            chrome.on(rawEventName, handler);
+            return () => chrome.removeListener(rawEventName, handler);
         } else {
-            return new Promise(function (fulfill, reject) {
-                chrome.once(eventName, fulfill);
+            return new Promise((fulfill, reject) => {
+                chrome.once(rawEventName, fulfill);
             });
         }
     };
     decorate(handler, 'event', event);
-    chrome[domainName][event.name] = handler;
+    chrome[eventName] = chrome[domainName][event.name] = handler;
 }
 
 function addType(chrome, domainName, type) {
+    const typeName = `${domainName}.${type.id}`;
     const help = {};
     decorate(help, 'type', type);
-    chrome[domainName][type.id] = help;
+    chrome[typeName] = chrome[domainName][type.id] = help;
 }
 
-function prepare(protocol) {
-    const chrome = this;
-    return new Promise(function (fulfill, reject) {
-        // assign the protocol and generate the shorthands
-        chrome.protocol = protocol;
-        protocol.domains.forEach(function (domain) {
-            const domainName = domain.domain;
-            chrome[domainName] = {};
-            // add commands
-            (domain.commands || []).forEach(function (command) {
-                addCommand(chrome, domainName, command);
-            });
-            // add events
-            (domain.events || []).forEach(function (event) {
-                addEvent(chrome, domainName, event);
-            });
-            // add types
-            (domain.types || []).forEach(function (type) {
-                addType(chrome, domainName, type);
-            });
+function prepare(object, protocol) {
+    // assign the protocol and generate the shorthands
+    object.protocol = protocol;
+    protocol.domains.forEach((domain) => {
+        const domainName = domain.domain;
+        object[domainName] = {};
+        // add commands
+        (domain.commands || []).forEach((command) => {
+            addCommand(object, domainName, command);
+        });
+        // add events
+        (domain.events || []).forEach((event) => {
+            addEvent(object, domainName, event);
+        });
+        // add types
+        (domain.types || []).forEach((type) => {
+            addType(object, domainName, type);
         });
-        fulfill();
+        // add utility listener for each domain
+        object[domainName].on = (eventName, handler) => {
+            return object[domainName][eventName](handler);
+        };
     });
 }