NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(proxy/api): fix JsonRpcWebSocketClient import

Browse Source 
Introduced by df9689854
This commit is contained in:
Julien Fontanet 2021-05-17 16:45:07 +02:00
parent c7f1469e1f
commit 84b3162bcd
7 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@xen-orchestra/proxy/package.json
View File

@ -48,7 +48,7 @@
"golike-defer": "^0.5.1", "golike-defer": "^0.5.1",
"http-server-plus": "^0.11.0", "http-server-plus": "^0.11.0",
"json-rpc-protocol": "^0.13.1", "json-rpc-protocol": "^0.13.1",
"jsonrpc-websocket-client": "^0.5.0", "jsonrpc-websocket-client": "^0.6.0",
"koa": "^2.5.1", "koa": "^2.5.1",
"koa-compress": "^5.0.1", "koa-compress": "^5.0.1",
"koa-helmet": "^5.1.0", "koa-helmet": "^5.1.0",

2
@xen-orchestra/proxy/src/app/mixins/appliance.mjs
View File

@ -2,11 +2,11 @@ import Disposable from 'promise-toolbox/Disposable.js'
import fromCallback from 'promise-toolbox/fromCallback.js' import fromCallback from 'promise-toolbox/fromCallback.js'
import fromEvent from 'promise-toolbox/fromEvent.js' import fromEvent from 'promise-toolbox/fromEvent.js'
import fse from 'fs-extra' import fse from 'fs-extra'
import JsonRpcWebsocketClient from 'jsonrpc-websocket-client'
import parsePairs from 'parse-pairs' import parsePairs from 'parse-pairs'
import { createLogger } from '@xen-orchestra/log' import { createLogger } from '@xen-orchestra/log'
import { deduped } from '@vates/disposable/deduped.js' import { deduped } from '@vates/disposable/deduped.js'
import { execFile, spawn } from 'child_process' import { execFile, spawn } from 'child_process'
import { JsonRpcWebsocketClient } from 'jsonrpc-websocket-client'
const TUNNEL_SERVICE = 'xoa-support-tunnel.service' const TUNNEL_SERVICE = 'xoa-support-tunnel.service'

2
packages/xo-lib/package.json
View File

@ -29,7 +29,7 @@
"node": ">=6" "node": ">=6"
}, },
"dependencies": { "dependencies": {
"jsonrpc-websocket-client": "^0.5.0", "jsonrpc-websocket-client": "^0.6.0",
"lodash": "^4.17.2", "lodash": "^4.17.2",
"make-error": "^1.0.4" "make-error": "^1.0.4"
}, },

2
packages/xo-lib/src/index.js
View File

@ -1,6 +1,6 @@
import JsonRpcWebSocketClient, { OPEN, CLOSED } from 'jsonrpc-websocket-client'
import trimEnd from 'lodash/trimEnd' import trimEnd from 'lodash/trimEnd'
import { BaseError } from 'make-error' import { BaseError } from 'make-error'
import { JsonRpcWebSocketClient, OPEN, CLOSED } from 'jsonrpc-websocket-client'
// =================================================================== // ===================================================================

2
packages/xo-web/package.json
View File

@ -81,7 +81,7 @@
"index-modules": "^0.3.0", "index-modules": "^0.3.0",
"is-ip": "^3.1.0", "is-ip": "^3.1.0",
"js-cookie": "2.2.1", "js-cookie": "2.2.1",
"jsonrpc-websocket-client": "^0.5.0", "jsonrpc-websocket-client": "^0.6.0",
"kindof": "^2.0.0", "kindof": "^2.0.0",
"lodash": "^4.6.1", "lodash": "^4.6.1",
"loose-envify": "^1.1.0", "loose-envify": "^1.1.0",

2
packages/xo-web/src/common/xoa-updater.js
View File

@ -1,8 +1,8 @@
import Client, { AbortedConnection, ConnectionError } from 'jsonrpc-websocket-client'
import eventToPromise from 'event-to-promise' import eventToPromise from 'event-to-promise'
import forEach from 'lodash/forEach' import forEach from 'lodash/forEach'
import makeError from 'make-error' import makeError from 'make-error'
import map from 'lodash/map' import map from 'lodash/map'
import { AbortedConnection, ConnectionError, JsonRpcWebSocketClient as Client } from 'jsonrpc-websocket-client'
import { EventEmitter } from 'events' import { EventEmitter } from 'events'
import { import {
setXoaConfiguration, setXoaConfiguration,

46
yarn.lock
View File

@ -990,13 +990,6 @@
pirates "^4.0.0" pirates "^4.0.0"
source-map-support "^0.5.16" source-map-support "^0.5.16"
"@babel/runtime@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-rc.1.tgz#42f36fc5817911c89ea75da2b874054922967616"
integrity sha512-Nifv2kwP/nwR39cAOasNxzjYfpeuf/ZbZNtQz5eYxWTC9yHARU9wItFnAwz1GTZ62MU+AtSjzZPMbLK5Q9hmbg==
dependencies:
regenerator-runtime "^0.12.0"
"@babel/runtime@^7.1.2", "@babel/runtime@^7.11.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
version "7.13.10" version "7.13.10"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
@ -9831,15 +9824,6 @@ json-parse-even-better-errors@^2.3.0:
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json-rpc-peer@^0.15.0:
version "0.15.5"
resolved "https://registry.yarnpkg.com/json-rpc-peer/-/json-rpc-peer-0.15.5.tgz#51bc04cd4ff1c71694d9d903ce3c250d34f2d97e"
integrity sha512-jZUNbRmcMXTpAnp1WGY9o85IfdGLKp75lBFYOIgpKOT9ZwKDHQOc3UmxOJUUg1bBfI7D1dltR3FSA6D0ZpPMpw==
dependencies:
"@babel/runtime" "7.0.0-rc.1"
json-rpc-protocol "^0.12.0"
lodash "^4.17.4"
json-rpc-peer@^0.17.0: json-rpc-peer@^0.17.0:
version "0.17.0" version "0.17.0"
resolved "https://registry.yarnpkg.com/json-rpc-peer/-/json-rpc-peer-0.17.0.tgz#1182664b1db4c6072faba8163d1d213d063183bb" resolved "https://registry.yarnpkg.com/json-rpc-peer/-/json-rpc-peer-0.17.0.tgz#1182664b1db4c6072faba8163d1d213d063183bb"
@ -9849,13 +9833,6 @@ json-rpc-peer@^0.17.0:
json-rpc-protocol "^0.13.1" json-rpc-protocol "^0.13.1"
lodash "^4.17.4" lodash "^4.17.4"
json-rpc-protocol@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/json-rpc-protocol/-/json-rpc-protocol-0.12.0.tgz#bb6bc5f764deab9dec3c6d14328b5faf3283562a"
integrity sha512-zev0tw+eiKgMkUbP+JWfVfWiYxFz9IxUhThsrAfTzgfQI7slwaeH1/9esvR/E/Yt8x+kVQY67rSh1ap9BQBvog==
dependencies:
make-error "^1.3.0"
json-rpc-protocol@^0.13.1: json-rpc-protocol@^0.13.1:
version "0.13.1" version "0.13.1"
resolved "https://registry.yarnpkg.com/json-rpc-protocol/-/json-rpc-protocol-0.13.1.tgz#eaee783a81eb3553b3cec03bc675963d2201e65f" resolved "https://registry.yarnpkg.com/json-rpc-protocol/-/json-rpc-protocol-0.13.1.tgz#eaee783a81eb3553b3cec03bc675963d2201e65f"
@ -9952,18 +9929,18 @@ jsonparse@^1.2.0:
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
jsonrpc-websocket-client@^0.5.0: jsonrpc-websocket-client@^0.6.0:
version "0.5.0" version "0.6.0"
resolved "https://registry.yarnpkg.com/jsonrpc-websocket-client/-/jsonrpc-websocket-client-0.5.0.tgz#485af0400592daec2446712f5f7f57d42c796e21" resolved "https://registry.yarnpkg.com/jsonrpc-websocket-client/-/jsonrpc-websocket-client-0.6.0.tgz#464439c3983083d85275a967d6c5980879eccb30"
integrity sha512-kZtVAANjBpFjzZrZQm3qenOJ1lQfhemHKto+ZH2ubn58C8+f9B3XJPWKPMt4AG1jzh1/08CzsKMhEfuMmWyuvQ== integrity sha512-qaQuK575Ok7OqmMN/j9zbp8t3P2CgR4v7HlVTg1+ZKzCp/DQkE0LEISr8AK1O7mu/AdwMqeMqrXxxXu7OmtGRQ==
dependencies: dependencies:
isomorphic-ws "^4.0.1" isomorphic-ws "^4.0.1"
iterable-backoff "^0.1.0" iterable-backoff "^0.1.0"
json-rpc-peer "^0.15.0" json-rpc-peer "^0.17.0"
lodash "^4.17.4" lodash "^4.17.4"
make-error "^1.3.0" make-error "^1.3.0"
promise-toolbox "^0.12.1" promise-toolbox "^0.19.0"
ws "^6.0.0" ws "^7.0.0"
jsprim@^1.2.2: jsprim@^1.2.2:
version "1.4.1" version "1.4.1"
@ -14357,11 +14334,6 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.12.0:
version "0.12.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.7" version "0.13.7"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
@ -17669,14 +17641,14 @@ ws@^1.1.1:
options ">=0.0.5" options ">=0.0.5"
ultron "1.0.x" ultron "1.0.x"
ws@^6.0.0, ws@^6.2.1: ws@^6.2.1:
version "6.2.1" version "6.2.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
dependencies: dependencies:
async-limiter "~1.0.0" async-limiter "~1.0.0"
ws@^7.1.2, ws@^7.4.4: ws@^7.0.0, ws@^7.1.2, ws@^7.4.4:
version "7.4.5" version "7.4.5"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==