From 463d1db9859e57167fa5055326ebc7021eff9016 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Sun, 7 Jun 2020 17:20:26 +0000 Subject: [PATCH] Resolved merge conflict --- package-lock.json | 18 ++-- src/lib/remixd.js | 223 +++++++++++++++++++++++----------------------- 2 files changed, 120 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9edc113379..f571dd4b3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3841,9 +3841,9 @@ "dev": true }, "compare-func": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz", - "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz", + "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", "dev": true, "requires": { "array-ify": "^1.0.0", @@ -8213,9 +8213,9 @@ "dev": true }, "uglify-js": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz", - "integrity": "sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz", + "integrity": "sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==", "dev": true, "optional": true, "requires": { @@ -11072,9 +11072,9 @@ } }, "moment": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", - "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==", + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", + "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==", "dev": true }, "morphdom": { diff --git a/src/lib/remixd.js b/src/lib/remixd.js index 9c11a01d90..db789fc994 100644 --- a/src/lib/remixd.js +++ b/src/lib/remixd.js @@ -1,102 +1,102 @@ -// 'use strict' -// var EventManager = require('../lib/events') -// var modalDialog = require('../app/ui/modaldialog') -// var yo = require('yo-yo') +'use strict' +var EventManager = require('../lib/events') +var modalDialog = require('../app/ui/modaldialog') +var yo = require('yo-yo') -// class Remixd { -// constructor (port) { -// this.event = new EventManager() -// this.port = port -// this.callbacks = {} -// this.callid = 0 -// this.socket = null -// this.connected = false -// this.receiveResponse() -// } +class Remixd { + constructor (port) { + this.event = new EventManager() + this.port = port + this.callbacks = {} + this.callid = 0 + this.socket = null + this.connected = false + this.receiveResponse() + } -// online () { -// return this.socket !== null -// } + online () { + return this.socket !== null + } -// close () { -// if (this.socket) { -// this.socket.close() -// this.socket = null -// } -// } + close () { + if (this.socket) { + this.socket.close() + this.socket = null + } + } -// start (cb) { -// if (this.socket) { -// try { -// this.socket.close() -// } catch (e) {} -// } -// this.event.trigger('connecting', []) -// this.socket = new WebSocket('ws://localhost:' + this.port, 'echo-protocol') // eslint-disable-line + start (cb) { + if (this.socket) { + try { + this.socket.close() + } catch (e) {} + } + this.event.trigger('connecting', []) + this.socket = new WebSocket('ws://localhost:' + this.port, 'echo-protocol') // eslint-disable-line -// this.socket.addEventListener('open', (event) => { -// this.connected = true -// this.event.trigger('connected', [event]) -// cb() -// }) + this.socket.addEventListener('open', (event) => { + this.connected = true + this.event.trigger('connected', [event]) + cb() + }) -// this.socket.addEventListener('message', (event) => { -// var data = JSON.parse(event.data) -// if (data.type === 'reply') { -// if (this.callbacks[data.id]) { -// this.callbacks[data.id](data.error, data.result) -// delete this.callbacks[data.id] -// } -// this.event.trigger('replied', [data]) -// } else if (data.type === 'notification') { -// this.event.trigger('notified', [data]) -// } else if (data.type === 'system') { -// if (data.error) { -// this.event.trigger('system', [{ -// error: data.error -// }]) -// } -// } -// }) + this.socket.addEventListener('message', (event) => { + var data = JSON.parse(event.data) + if (data.type === 'reply') { + if (this.callbacks[data.id]) { + this.callbacks[data.id](data.error, data.result) + delete this.callbacks[data.id] + } + this.event.trigger('replied', [data]) + } else if (data.type === 'notification') { + this.event.trigger('notified', [data]) + } else if (data.type === 'system') { + if (data.error) { + this.event.trigger('system', [{ + error: data.error + }]) + } + } + }) -// this.socket.addEventListener('error', (event) => { -// this.errored(event) -// cb(event) -// }) + this.socket.addEventListener('error', (event) => { + this.errored(event) + cb(event) + }) -// this.socket.addEventListener('close', (event) => { -// if (event.wasClean) { -// this.connected = false -// this.event.trigger('closed', [event]) -// } else { -// this.errored(event) -// } -// this.socket = null -// }) -// } + this.socket.addEventListener('close', (event) => { + if (event.wasClean) { + this.connected = false + this.event.trigger('closed', [event]) + } else { + this.errored(event) + } + this.socket = null + }) + } -// async receiveResponse (requestId) { -// return new Promise((resolve, reject) => { -// this.event.register('replied', (data) => { -// if (data.id === requestId) { -// if (data.error) reject(data.error) -// else resolve(data.result) -// } -// }) -// }) -// } + async receiveResponse (requestId) { + return new Promise((resolve, reject) => { + this.event.register('replied', (data) => { + if (data.id === requestId) { + if (data.error) reject(data.error) + else resolve(data.result) + } + }) + }) + } -// errored (event) { -// function remixdDialog () { -// return yo`
Connection to Remixd closed. Localhost connection not available anymore.
` -// } -// if (this.connected) { -// modalDialog('Lost connection to Remixd!', remixdDialog(), {}, {label: ''}) -// } -// this.connected = false -// this.socket = null -// this.event.trigger('errored', [event]) -// } + errored (event) { + function remixdDialog () { + return yo`
Connection to Remixd closed. Localhost connection not available anymore.
` + } + if (this.connected) { + modalDialog('Lost connection to Remixd!', remixdDialog(), {}, {label: ''}) + } + this.connected = false + this.socket = null + this.event.trigger('errored', [event]) + } call (service, fn, args, callback) { return new Promise((resolve, reject) => { @@ -106,7 +106,6 @@ reject(error) return } - console.log('this.socket: ', this.socket) if (this.socket && this.socket.readyState === this.socket.OPEN) { var data = this.format(service, fn, args) this.callbacks[data.id] = callback @@ -120,27 +119,27 @@ }) } -// ensureSocket (cb) { -// if (this.socket) return cb(null, this.socket) -// this.start((error) => { -// if (error) { -// cb(error) -// } else { -// cb(null, this.socket) -// } -// }) -// } + ensureSocket (cb) { + if (this.socket) return cb(null, this.socket) + this.start((error) => { + if (error) { + cb(error) + } else { + cb(null, this.socket) + } + }) + } -// format (service, fn, args) { -// var data = { -// id: this.callid, -// service: service, -// fn: fn, -// args: args -// } -// this.callid++ -// return data -// } -// } + format (service, fn, args) { + var data = { + id: this.callid, + service: service, + fn: fn, + args: args + } + this.callid++ + return data + } +} -// module.exports = Remixd +module.exports = Remixd