diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e01f9f1d5..57b4dbd8e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,7 +12,7 @@
"iview": "^3.4.2",
"monaco-editor": "^0.17.0",
"monaco-editor-webpack-plugin": "^1.7.0",
- "socket.io-client": "^2.4.0",
+ "socket.io-client": "^3.1.3",
"vue": "^2.7.10",
"vue-clipboard2": "^0.3.1",
"vue-draggable-nested-tree": "^2.2.17",
@@ -1348,6 +1348,11 @@
"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.0.tgz",
"integrity": "sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ=="
},
+ "node_modules/@types/component-emitter": {
+ "version": "1.2.11",
+ "resolved": "https://registry.npmmirror.com/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+ "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="
+ },
"node_modules/@types/events": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -2016,11 +2021,6 @@
"node": ">= 0.12.0"
}
},
- "node_modules/after": {
- "version": "0.8.2",
- "resolved": "https://registry.npm.taobao.org/after/download/after-0.8.2.tgz",
- "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
- },
"node_modules/ajv": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
@@ -2255,11 +2255,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/arraybuffer.slice": {
- "version": "0.0.7",
- "resolved": "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz",
- "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU="
- },
"node_modules/asn1": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -3403,8 +3398,8 @@
},
"node_modules/base64-arraybuffer": {
"version": "0.1.4",
- "resolved": "https://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.4.tgz",
- "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=",
+ "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+ "integrity": "sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==",
"engines": {
"node": ">= 0.6.0"
}
@@ -3468,11 +3463,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/blob": {
- "version": "0.0.5",
- "resolved": "https://registry.npm.taobao.org/blob/download/blob-0.0.5.tgz",
- "integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM="
- },
"node_modules/bluebird": {
"version": "3.5.5",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
@@ -4097,14 +4087,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/abbrev": {
"version": "1.1.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/ansi-regex": {
"version": "2.1.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4114,14 +4102,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/aproba": {
"version": "1.2.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/are-we-there-yet": {
"version": "1.1.5",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4132,14 +4118,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/balanced-match": {
"version": "1.0.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/brace-expansion": {
"version": "1.1.11",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4150,14 +4134,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/chownr": {
"version": "1.1.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/code-point-at": {
"version": "1.1.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4167,28 +4149,24 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/concat-map": {
"version": "0.0.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/console-control-strings": {
"version": "1.1.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/core-util-is": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/debug": {
"version": "4.1.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4198,7 +4176,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/deep-extend": {
"version": "0.6.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4208,14 +4185,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/delegates": {
"version": "1.0.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/detect-libc": {
"version": "1.0.3",
- "dev": true,
"inBundle": true,
"license": "Apache-2.0",
"optional": true,
@@ -4228,7 +4203,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/fs-minipass": {
"version": "1.2.5",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4238,14 +4212,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/fs.realpath": {
"version": "1.0.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/gauge": {
"version": "2.7.4",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4262,7 +4234,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/glob": {
"version": "7.1.3",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4280,14 +4251,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/has-unicode": {
"version": "2.0.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/iconv-lite": {
"version": "0.4.24",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4300,7 +4269,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/ignore-walk": {
"version": "3.0.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4310,7 +4278,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/inflight": {
"version": "1.0.6",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4321,14 +4288,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/inherits": {
"version": "2.0.3",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/ini": {
"version": "1.3.5",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4338,7 +4303,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/is-fullwidth-code-point": {
"version": "1.0.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4351,14 +4315,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/isarray": {
"version": "1.0.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/minimatch": {
"version": "3.0.4",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4371,14 +4333,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/minimist": {
"version": "0.0.8",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/minipass": {
"version": "2.3.5",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4389,7 +4349,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/minizlib": {
"version": "1.2.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4399,7 +4358,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/mkdirp": {
"version": "0.5.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4412,14 +4370,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/ms": {
"version": "2.1.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/needle": {
"version": "2.3.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4437,7 +4393,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/node-pre-gyp": {
"version": "0.12.0",
- "dev": true,
"inBundle": true,
"license": "BSD-3-Clause",
"optional": true,
@@ -4459,7 +4414,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/nopt": {
"version": "4.0.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4473,14 +4427,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/npm-bundled": {
"version": "1.0.6",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/npm-packlist": {
"version": "1.4.1",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4491,7 +4443,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/npmlog": {
"version": "4.1.2",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4504,7 +4455,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/number-is-nan": {
"version": "1.0.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4514,7 +4464,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/object-assign": {
"version": "4.1.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4524,7 +4473,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/once": {
"version": "1.4.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4534,7 +4482,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/os-homedir": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4544,7 +4491,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/os-tmpdir": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4554,7 +4500,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/osenv": {
"version": "0.1.5",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4565,7 +4510,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/path-is-absolute": {
"version": "1.0.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4575,14 +4519,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/process-nextick-args": {
"version": "2.0.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/rc": {
"version": "1.2.8",
- "dev": true,
"inBundle": true,
"license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
"optional": true,
@@ -4598,14 +4540,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/rc/node_modules/minimist": {
"version": "1.2.0",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/readable-stream": {
"version": "2.3.6",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4621,7 +4561,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/rimraf": {
"version": "2.6.3",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4634,28 +4573,24 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/safe-buffer": {
"version": "5.1.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/safer-buffer": {
"version": "2.1.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/sax": {
"version": "1.2.4",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/semver": {
"version": "5.7.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4665,21 +4600,18 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/set-blocking": {
"version": "2.0.0",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/signal-exit": {
"version": "3.0.2",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/string_decoder": {
"version": "1.1.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4689,7 +4621,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/string-width": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4704,7 +4635,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/strip-ansi": {
"version": "3.0.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4717,7 +4647,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/strip-json-comments": {
"version": "2.0.1",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true,
@@ -4727,7 +4656,6 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/tar": {
"version": "4.4.8",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4746,14 +4674,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/util-deprecate": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "MIT",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/wide-align": {
"version": "1.1.3",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true,
@@ -4763,14 +4689,12 @@
},
"node_modules/chokidar/node_modules/fsevents/node_modules/wrappy": {
"version": "1.0.2",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/chokidar/node_modules/fsevents/node_modules/yallist": {
"version": "3.0.3",
- "dev": true,
"inBundle": true,
"license": "ISC",
"optional": true
@@ -5086,21 +5010,11 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true
},
- "node_modules/component-bind": {
- "version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz",
- "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
- },
"node_modules/component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz",
"integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A="
},
- "node_modules/component-inherit": {
- "version": "0.0.3",
- "resolved": "https://registry.npm.taobao.org/component-inherit/download/component-inherit-0.0.3.tgz",
- "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
- },
"node_modules/compressible": {
"version": "2.0.17",
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
@@ -5895,7 +5809,6 @@
"version": "4.3.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
"integrity": "sha1-8NIpxQXgxtjEmsVT0bE9wYP2su4=",
- "dev": true,
"dependencies": {
"ms": "2.1.2"
},
@@ -5906,8 +5819,7 @@
"node_modules/debug/node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
- "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
- "dev": true
+ "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
},
"node_modules/decamelize": {
"version": "1.2.0",
@@ -6424,54 +6336,51 @@
}
},
"node_modules/engine.io-client": {
- "version": "3.5.1",
- "resolved": "https://registry.npm.taobao.org/engine.io-client/download/engine.io-client-3.5.1.tgz?cache=0&sync_timestamp=1614674664258&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-client%2Fdownload%2Fengine.io-client-3.5.1.tgz",
- "integrity": "sha1-tQBFijnAzRl6kh4OdZchp0bQvbk=",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-4.1.4.tgz",
+ "integrity": "sha512-843fqAdKeUMFqKi1sSjnR11tJ4wi8sIefu6+JC1OzkkJBmjtc/gM/rZ53tJfu5Iae/3gApm5veoS+v+gtT0+Fg==",
"dependencies": {
+ "base64-arraybuffer": "0.1.4",
"component-emitter": "~1.3.0",
- "component-inherit": "0.0.3",
- "debug": "~3.1.0",
- "engine.io-parser": "~2.2.0",
+ "debug": "~4.3.1",
+ "engine.io-parser": "~4.0.1",
"has-cors": "1.1.0",
- "indexof": "0.0.1",
"parseqs": "0.0.6",
"parseuri": "0.0.6",
"ws": "~7.4.2",
- "xmlhttprequest-ssl": "~1.5.4",
+ "xmlhttprequest-ssl": "~1.6.2",
"yeast": "0.1.2"
}
},
- "node_modules/engine.io-client/node_modules/debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "dependencies": {
- "ms": "2.0.0"
- }
- },
- "node_modules/engine.io-client/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
"node_modules/engine.io-client/node_modules/ws": {
- "version": "7.4.4",
- "resolved": "https://registry.npm.taobao.org/ws/download/ws-7.4.4.tgz",
- "integrity": "sha1-ODvJdCyyAikskHfOq29gR7F/LVk=",
+ "version": "7.4.6",
+ "resolved": "https://registry.npmmirror.com/ws/-/ws-7.4.6.tgz",
+ "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
"engines": {
"node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
}
},
"node_modules/engine.io-parser": {
- "version": "2.2.1",
- "resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.2.1.tgz?cache=0&sync_timestamp=1607333565894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-parser%2Fdownload%2Fengine.io-parser-2.2.1.tgz",
- "integrity": "sha1-V85WEdk3DulPmWQbWJ+UyX5PXac=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz",
+ "integrity": "sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==",
"dependencies": {
- "after": "0.8.2",
- "arraybuffer.slice": "~0.0.7",
- "base64-arraybuffer": "0.1.4",
- "blob": "0.0.5",
- "has-binary2": "~1.0.2"
+ "base64-arraybuffer": "0.1.4"
+ },
+ "engines": {
+ "node": ">=8.0.0"
}
},
"node_modules/enhanced-resolve": {
@@ -8675,23 +8584,10 @@
"node": ">=0.10.0"
}
},
- "node_modules/has-binary2": {
- "version": "1.0.3",
- "resolved": "https://registry.npm.taobao.org/has-binary2/download/has-binary2-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-binary2%2Fdownload%2Fhas-binary2-1.0.3.tgz",
- "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
- "dependencies": {
- "isarray": "2.0.1"
- }
- },
- "node_modules/has-binary2/node_modules/isarray": {
- "version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
- "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
- },
"node_modules/has-cors": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/has-cors/download/has-cors-1.1.0.tgz",
- "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+ "resolved": "https://registry.npmmirror.com/has-cors/-/has-cors-1.1.0.tgz",
+ "integrity": "sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
},
"node_modules/has-flag": {
"version": "3.0.0",
@@ -9229,7 +9125,8 @@
"node_modules/indexof": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+ "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+ "dev": true
},
"node_modules/inflight": {
"version": "1.0.6",
@@ -11565,13 +11462,13 @@
},
"node_modules/parseqs": {
"version": "0.0.6",
- "resolved": "https://registry.npm.taobao.org/parseqs/download/parseqs-0.0.6.tgz",
- "integrity": "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU="
+ "resolved": "https://registry.npmmirror.com/parseqs/-/parseqs-0.0.6.tgz",
+ "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
},
"node_modules/parseuri": {
"version": "0.0.6",
- "resolved": "https://registry.npm.taobao.org/parseuri/download/parseuri-0.0.6.tgz",
- "integrity": "sha1-4Ulugp46wv9H85pN0ESzKCPEolo="
+ "resolved": "https://registry.npmmirror.com/parseuri/-/parseuri-0.0.6.tgz",
+ "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
},
"node_modules/parseurl": {
"version": "1.3.3",
@@ -14133,64 +14030,35 @@
"dev": true
},
"node_modules/socket.io-client": {
- "version": "2.4.0",
- "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.4.0.tgz?cache=0&sync_timestamp=1614298839186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.4.0.tgz",
- "integrity": "sha1-qvtdWUo8VaNDVVYvyK6iLtkRmjU=",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-3.1.3.tgz",
+ "integrity": "sha512-4sIGOGOmCg3AOgGi7EEr6ZkTZRkrXwub70bBB/F0JSkMOUFpA77WsL87o34DffQQ31PkbMUIadGOk+3tx1KGbw==",
"dependencies": {
- "backo2": "1.0.2",
- "component-bind": "1.0.0",
+ "@types/component-emitter": "^1.2.10",
+ "backo2": "~1.0.2",
"component-emitter": "~1.3.0",
- "debug": "~3.1.0",
- "engine.io-client": "~3.5.0",
- "has-binary2": "~1.0.2",
- "indexof": "0.0.1",
- "parseqs": "0.0.6",
+ "debug": "~4.3.1",
+ "engine.io-client": "~4.1.0",
"parseuri": "0.0.6",
- "socket.io-parser": "~3.3.0",
- "to-array": "0.1.4"
- }
- },
- "node_modules/socket.io-client/node_modules/debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "dependencies": {
- "ms": "2.0.0"
+ "socket.io-parser": "~4.0.4"
+ },
+ "engines": {
+ "node": ">=10.0.0"
}
},
- "node_modules/socket.io-client/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
"node_modules/socket.io-parser": {
- "version": "3.3.2",
- "resolved": "https://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-3.3.2.tgz?cache=0&sync_timestamp=1610669809014&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-parser%2Fdownload%2Fsocket.io-parser-3.3.2.tgz",
- "integrity": "sha1-74cgCdCtz3BPL76DAZGhR1KtULY=",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+ "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
"dependencies": {
+ "@types/component-emitter": "^1.2.10",
"component-emitter": "~1.3.0",
- "debug": "~3.1.0",
- "isarray": "2.0.1"
- }
- },
- "node_modules/socket.io-parser/node_modules/debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "dependencies": {
- "ms": "2.0.0"
+ "debug": "~4.3.1"
+ },
+ "engines": {
+ "node": ">=10.0.0"
}
},
- "node_modules/socket.io-parser/node_modules/isarray": {
- "version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
- "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
- },
- "node_modules/socket.io-parser/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
"node_modules/sockjs": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
@@ -14996,11 +14864,6 @@
"node": ">=0.6.0"
}
},
- "node_modules/to-array": {
- "version": "0.1.4",
- "resolved": "https://registry.npm.taobao.org/to-array/download/to-array-0.1.4.tgz",
- "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
- },
"node_modules/to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -17007,9 +16870,9 @@
}
},
"node_modules/xmlhttprequest-ssl": {
- "version": "1.5.5",
- "resolved": "https://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz",
- "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+ "version": "1.6.3",
+ "resolved": "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
+ "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==",
"engines": {
"node": ">=0.4.0"
}
@@ -17138,8 +17001,8 @@
},
"node_modules/yeast": {
"version": "0.1.2",
- "resolved": "https://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz",
- "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
+ "resolved": "https://registry.npmmirror.com/yeast/-/yeast-0.1.2.tgz",
+ "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
},
"node_modules/yorkie": {
"version": "2.0.0",
@@ -18515,6 +18378,11 @@
"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.0.tgz",
"integrity": "sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ=="
},
+ "@types/component-emitter": {
+ "version": "1.2.11",
+ "resolved": "https://registry.npmmirror.com/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+ "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="
+ },
"@types/events": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -19143,11 +19011,6 @@
"integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==",
"dev": true
},
- "after": {
- "version": "0.8.2",
- "resolved": "https://registry.npm.taobao.org/after/download/after-0.8.2.tgz",
- "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
- },
"ajv": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
@@ -19339,11 +19202,6 @@
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
"dev": true
},
- "arraybuffer.slice": {
- "version": "0.0.7",
- "resolved": "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz",
- "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU="
- },
"asn1": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -20422,8 +20280,8 @@
},
"base64-arraybuffer": {
"version": "0.1.4",
- "resolved": "https://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.4.tgz",
- "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI="
+ "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+ "integrity": "sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg=="
},
"base64-js": {
"version": "1.3.0",
@@ -20475,11 +20333,6 @@
"integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
"dev": true
},
- "blob": {
- "version": "0.0.5",
- "resolved": "https://registry.npm.taobao.org/blob/download/blob-0.0.5.tgz",
- "integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM="
- },
"bluebird": {
"version": "3.5.5",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
@@ -20979,25 +20832,21 @@
"abbrev": {
"version": "1.1.1",
"bundled": true,
- "dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
"bundled": true,
- "dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"delegates": "^1.0.0",
@@ -21007,13 +20856,11 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
@@ -21023,37 +20870,31 @@
"chownr": {
"version": "1.1.1",
"bundled": true,
- "dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"debug": {
"version": "4.1.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"ms": "^2.1.1"
@@ -21062,25 +20903,21 @@
"deep-extend": {
"version": "0.6.0",
"bundled": true,
- "dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
"bundled": true,
- "dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.5",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"minipass": "^2.2.1"
@@ -21089,13 +20926,11 @@
"fs.realpath": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"aproba": "^1.0.3",
@@ -21111,7 +20946,6 @@
"glob": {
"version": "7.1.3",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"fs.realpath": "^1.0.0",
@@ -21125,13 +20959,11 @@
"has-unicode": {
"version": "2.0.1",
"bundled": true,
- "dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
@@ -21140,7 +20972,6 @@
"ignore-walk": {
"version": "3.0.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"minimatch": "^3.0.4"
@@ -21149,7 +20980,6 @@
"inflight": {
"version": "1.0.6",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"once": "^1.3.0",
@@ -21159,19 +20989,16 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
"bundled": true,
- "dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
@@ -21180,13 +21007,11 @@
"isarray": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
@@ -21195,13 +21020,11 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
@@ -21211,7 +21034,6 @@
"minizlib": {
"version": "1.2.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"minipass": "^2.2.1"
@@ -21220,7 +21042,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
@@ -21229,13 +21050,11 @@
"ms": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
"optional": true
},
"needle": {
"version": "2.3.0",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"debug": "^4.1.0",
@@ -21246,7 +21065,6 @@
"node-pre-gyp": {
"version": "0.12.0",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"detect-libc": "^1.0.2",
@@ -21264,7 +21082,6 @@
"nopt": {
"version": "4.0.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"abbrev": "1",
@@ -21274,13 +21091,11 @@
"npm-bundled": {
"version": "1.0.6",
"bundled": true,
- "dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"ignore-walk": "^3.0.1",
@@ -21290,7 +21105,6 @@
"npmlog": {
"version": "4.1.2",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"are-we-there-yet": "~1.1.2",
@@ -21302,19 +21116,16 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
"bundled": true,
- "dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"wrappy": "1"
@@ -21323,19 +21134,16 @@
"os-homedir": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"os-homedir": "^1.0.0",
@@ -21345,19 +21153,16 @@
"path-is-absolute": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"deep-extend": "^0.6.0",
@@ -21369,7 +21174,6 @@
"minimist": {
"version": "1.2.0",
"bundled": true,
- "dev": true,
"optional": true
}
}
@@ -21377,7 +21181,6 @@
"readable-stream": {
"version": "2.3.6",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -21392,7 +21195,6 @@
"rimraf": {
"version": "2.6.3",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"glob": "^7.1.3"
@@ -21401,43 +21203,36 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
"bundled": true,
- "dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
"bundled": true,
- "dev": true,
"optional": true
},
"semver": {
"version": "5.7.0",
"bundled": true,
- "dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
"bundled": true,
- "dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"string_decoder": {
"version": "1.1.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"safe-buffer": "~5.1.0"
@@ -21446,7 +21241,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
@@ -21457,7 +21251,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
@@ -21466,13 +21259,11 @@
"strip-json-comments": {
"version": "2.0.1",
"bundled": true,
- "dev": true,
"optional": true
},
"tar": {
"version": "4.4.8",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"chownr": "^1.1.1",
@@ -21487,13 +21278,11 @@
"util-deprecate": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
"bundled": true,
- "dev": true,
"optional": true,
"requires": {
"string-width": "^1.0.2 || 2"
@@ -21502,13 +21291,11 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
"optional": true
}
}
@@ -21777,21 +21564,11 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true
},
- "component-bind": {
- "version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz",
- "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
- },
"component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz",
"integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A="
},
- "component-inherit": {
- "version": "0.0.3",
- "resolved": "https://registry.npm.taobao.org/component-inherit/download/component-inherit-0.0.3.tgz",
- "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
- },
"compressible": {
"version": "2.0.17",
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
@@ -22473,7 +22250,6 @@
"version": "4.3.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
"integrity": "sha1-8NIpxQXgxtjEmsVT0bE9wYP2su4=",
- "dev": true,
"requires": {
"ms": "2.1.2"
},
@@ -22481,8 +22257,7 @@
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
- "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
- "dev": true
+ "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
}
}
},
@@ -22932,53 +22707,36 @@
}
},
"engine.io-client": {
- "version": "3.5.1",
- "resolved": "https://registry.npm.taobao.org/engine.io-client/download/engine.io-client-3.5.1.tgz?cache=0&sync_timestamp=1614674664258&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-client%2Fdownload%2Fengine.io-client-3.5.1.tgz",
- "integrity": "sha1-tQBFijnAzRl6kh4OdZchp0bQvbk=",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-4.1.4.tgz",
+ "integrity": "sha512-843fqAdKeUMFqKi1sSjnR11tJ4wi8sIefu6+JC1OzkkJBmjtc/gM/rZ53tJfu5Iae/3gApm5veoS+v+gtT0+Fg==",
"requires": {
+ "base64-arraybuffer": "0.1.4",
"component-emitter": "~1.3.0",
- "component-inherit": "0.0.3",
- "debug": "~3.1.0",
- "engine.io-parser": "~2.2.0",
+ "debug": "~4.3.1",
+ "engine.io-parser": "~4.0.1",
"has-cors": "1.1.0",
- "indexof": "0.0.1",
"parseqs": "0.0.6",
"parseuri": "0.0.6",
"ws": "~7.4.2",
- "xmlhttprequest-ssl": "~1.5.4",
+ "xmlhttprequest-ssl": "~1.6.2",
"yeast": "0.1.2"
},
"dependencies": {
- "debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
"ws": {
- "version": "7.4.4",
- "resolved": "https://registry.npm.taobao.org/ws/download/ws-7.4.4.tgz",
- "integrity": "sha1-ODvJdCyyAikskHfOq29gR7F/LVk="
+ "version": "7.4.6",
+ "resolved": "https://registry.npmmirror.com/ws/-/ws-7.4.6.tgz",
+ "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+ "requires": {}
}
}
},
"engine.io-parser": {
- "version": "2.2.1",
- "resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.2.1.tgz?cache=0&sync_timestamp=1607333565894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-parser%2Fdownload%2Fengine.io-parser-2.2.1.tgz",
- "integrity": "sha1-V85WEdk3DulPmWQbWJ+UyX5PXac=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz",
+ "integrity": "sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==",
"requires": {
- "after": "0.8.2",
- "arraybuffer.slice": "~0.0.7",
- "base64-arraybuffer": "0.1.4",
- "blob": "0.0.5",
- "has-binary2": "~1.0.2"
+ "base64-arraybuffer": "0.1.4"
}
},
"enhanced-resolve": {
@@ -24704,25 +24462,10 @@
}
}
},
- "has-binary2": {
- "version": "1.0.3",
- "resolved": "https://registry.npm.taobao.org/has-binary2/download/has-binary2-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-binary2%2Fdownload%2Fhas-binary2-1.0.3.tgz",
- "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
- "requires": {
- "isarray": "2.0.1"
- },
- "dependencies": {
- "isarray": {
- "version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
- "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
- }
- }
- },
"has-cors": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/has-cors/download/has-cors-1.1.0.tgz",
- "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+ "resolved": "https://registry.npmmirror.com/has-cors/-/has-cors-1.1.0.tgz",
+ "integrity": "sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
},
"has-flag": {
"version": "3.0.0",
@@ -25178,7 +24921,8 @@
"indexof": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+ "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+ "dev": true
},
"inflight": {
"version": "1.0.6",
@@ -27090,13 +26834,13 @@
},
"parseqs": {
"version": "0.0.6",
- "resolved": "https://registry.npm.taobao.org/parseqs/download/parseqs-0.0.6.tgz",
- "integrity": "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU="
+ "resolved": "https://registry.npmmirror.com/parseqs/-/parseqs-0.0.6.tgz",
+ "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
},
"parseuri": {
"version": "0.0.6",
- "resolved": "https://registry.npm.taobao.org/parseuri/download/parseuri-0.0.6.tgz",
- "integrity": "sha1-4Ulugp46wv9H85pN0ESzKCPEolo="
+ "resolved": "https://registry.npmmirror.com/parseuri/-/parseuri-0.0.6.tgz",
+ "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
},
"parseurl": {
"version": "1.3.3",
@@ -29214,66 +28958,27 @@
}
},
"socket.io-client": {
- "version": "2.4.0",
- "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.4.0.tgz?cache=0&sync_timestamp=1614298839186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.4.0.tgz",
- "integrity": "sha1-qvtdWUo8VaNDVVYvyK6iLtkRmjU=",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-3.1.3.tgz",
+ "integrity": "sha512-4sIGOGOmCg3AOgGi7EEr6ZkTZRkrXwub70bBB/F0JSkMOUFpA77WsL87o34DffQQ31PkbMUIadGOk+3tx1KGbw==",
"requires": {
- "backo2": "1.0.2",
- "component-bind": "1.0.0",
+ "@types/component-emitter": "^1.2.10",
+ "backo2": "~1.0.2",
"component-emitter": "~1.3.0",
- "debug": "~3.1.0",
- "engine.io-client": "~3.5.0",
- "has-binary2": "~1.0.2",
- "indexof": "0.0.1",
- "parseqs": "0.0.6",
+ "debug": "~4.3.1",
+ "engine.io-client": "~4.1.0",
"parseuri": "0.0.6",
- "socket.io-parser": "~3.3.0",
- "to-array": "0.1.4"
- },
- "dependencies": {
- "debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- }
+ "socket.io-parser": "~4.0.4"
}
},
"socket.io-parser": {
- "version": "3.3.2",
- "resolved": "https://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-3.3.2.tgz?cache=0&sync_timestamp=1610669809014&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-parser%2Fdownload%2Fsocket.io-parser-3.3.2.tgz",
- "integrity": "sha1-74cgCdCtz3BPL76DAZGhR1KtULY=",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+ "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
"requires": {
+ "@types/component-emitter": "^1.2.10",
"component-emitter": "~1.3.0",
- "debug": "~3.1.0",
- "isarray": "2.0.1"
- },
- "dependencies": {
- "debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566548985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
- "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "isarray": {
- "version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
- "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- }
+ "debug": "~4.3.1"
}
},
"sockjs": {
@@ -29955,11 +29660,6 @@
"os-tmpdir": "~1.0.2"
}
},
- "to-array": {
- "version": "0.1.4",
- "resolved": "https://registry.npm.taobao.org/to-array/download/to-array-0.1.4.tgz",
- "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
- },
"to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -31670,9 +31370,9 @@
"dev": true
},
"xmlhttprequest-ssl": {
- "version": "1.5.5",
- "resolved": "https://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz",
- "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
+ "version": "1.6.3",
+ "resolved": "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
+ "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="
},
"xtend": {
"version": "4.0.1",
@@ -31779,8 +31479,8 @@
},
"yeast": {
"version": "0.1.2",
- "resolved": "https://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz",
- "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
+ "resolved": "https://registry.npmmirror.com/yeast/-/yeast-0.1.2.tgz",
+ "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
},
"yorkie": {
"version": "2.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index e1f6b00b3..1c09e8fc0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,7 +11,7 @@
"iview": "^3.4.2",
"monaco-editor": "^0.17.0",
"monaco-editor-webpack-plugin": "^1.7.0",
- "socket.io-client": "^2.4.0",
+ "socket.io-client": "^3.1.3",
"vue": "^2.7.10",
"vue-clipboard2": "^0.3.1",
"vue-draggable-nested-tree": "^2.2.17",
diff --git a/frontend/src/views/inspector/FlowList.vue b/frontend/src/views/inspector/FlowList.vue
index ec2d2c543..64d486eb3 100644
--- a/frontend/src/views/inspector/FlowList.vue
+++ b/frontend/src/views/inspector/FlowList.vue
@@ -89,36 +89,40 @@
-
- {{ item.request.scheme }}
- ://
+
+
+ {{ item.request.scheme }}
+ ://
- {{ item.request.host}}
- {{ item.request.path}}
+ {{ item.request.host}}
+ {{ item.request.path}}
- ?
- {{ item.request.params }}
-
+ ?
+ {{ item.request.params }}
+
-
-
-
-
-
- mdi-content-copy
-
-
-
- Copy
-
+
-
+
+
+
+
+
+ mdi-content-copy
+
+
+
+ Copy
+
+
+
+
@@ -389,6 +393,9 @@ export default {
.flow-table table>tbody>tr>td>span {
color: #666 !important;
}
+.flow-table table>tbody>tr>td>div {
+ color: #666 !important;
+}
.flow-table {
width: 100%;
}
@@ -462,6 +469,7 @@ export default {
.flow-list-item-url {
display: inline-block;
word-break: keep-all;
+ max-width: 900px;
width: calc(100% - 50px);
white-space: nowrap;
overflow: hidden;
diff --git a/lyrebird/application.py b/lyrebird/application.py
index 52fb82d26..cced4da8d 100644
--- a/lyrebird/application.py
+++ b/lyrebird/application.py
@@ -1,4 +1,5 @@
from flask import jsonify
+from functools import reduce
"""
Lyrebird context
@@ -24,9 +25,6 @@ def make_fail_response(msg, **kwargs):
return jsonify(fail_resp)
-# Lyrebird status contains: 'READY' and 'INITING'
-status = 'INITING'
-
_cm = None
_src = None
@@ -86,3 +84,66 @@ def raw(self):
def root_dir():
if _cm:
return _cm.ROOT
+
+
+# --------- Lyrebird status ---------
+'''
+[INITING] --> /run lyrebird main method/ --> [READY]
+ /start services /
+ /extra mock server ready /
+ /mitm proxy server ready /
+'''
+
+# Lyrebird status contains: 'READY' and 'INITING'
+status = 'INITING'
+
+# mitm proxy check point will be added if args set useing mitm server (--no-mitm False)
+status_checkpoints = {
+ 'main': False,
+ 'extra_mock': False
+}
+
+
+def status_listener(event):
+ '''
+ event example
+ event = {
+ 'channel': 'system',
+ 'system': {
+ 'action': 'init_module',
+ 'status': 'READY',
+ 'module': 'main'
+ }
+ }
+ '''
+
+ system = event.get('system')
+ if not system:
+ return
+
+ action = system.get('action')
+ if action != 'init_module':
+ return
+
+ module = system.get('module')
+ if module not in status_checkpoints:
+ return
+
+ module_status = system.get('status')
+ if module_status == 'READY':
+ status_checkpoints[module] = True
+
+ is_all_status_checkpoints_ok = reduce(lambda x, y: x and y, status_checkpoints.values())
+ if is_all_status_checkpoints_ok:
+ global status
+ status = 'READY'
+
+
+def process_status_listener():
+ server['event'].subscribe('system', status_listener)
+
+
+def status_ready():
+ server['event'].publish('system', {
+ 'system': {'action': 'init_module', 'status': 'READY', 'module': 'main'}
+ })
diff --git a/lyrebird/manager.py b/lyrebird/manager.py
index ce4b5128a..f712e266b 100644
--- a/lyrebird/manager.py
+++ b/lyrebird/manager.py
@@ -85,9 +85,6 @@ def main():
gen_parser = subparser.add_parser('gen')
gen_parser.add_argument('path', help='Create plugin project')
- install_parser = subparser.add_parser('install')
- install_parser.add_argument('extension_name')
-
args = parser.parse_args()
if args.version:
@@ -188,6 +185,7 @@ def run(args: argparse.Namespace):
else:
should_start_mitm = not conf_no_mitm
if should_start_mitm:
+ application.status_checkpoints['mitm_proxy'] = False
application.server['proxy'] = LyrebirdProxyServer()
application.server['mock'] = LyrebirdMockServer()
@@ -196,6 +194,9 @@ def run(args: argparse.Namespace):
application.server['plugin'] = PluginManager()
application.server['checker'] = LyrebirdCheckerServer()
+ # handle progress message
+ application.process_status_listener()
+
application.start_server()
# int statistics reporter
@@ -225,8 +226,8 @@ def run(args: argparse.Namespace):
if not args.no_browser:
webbrowser.open(f'http://localhost:{application.config["mock.port"]}')
- # Lyrebird status contains: 'READY' and 'INITING'
- application.status = 'READY'
+ # main process is ready, publish system event
+ application.status_ready()
# stop event handler
def signal_handler(signum, frame):
diff --git a/lyrebird/mitm/proxy_server.py b/lyrebird/mitm/proxy_server.py
index 831b4af2c..4cb8dcfac 100644
--- a/lyrebird/mitm/proxy_server.py
+++ b/lyrebird/mitm/proxy_server.py
@@ -45,7 +45,7 @@ def wait_for_mitm_start(self, config, logger):
except Exception:
continue
- def start_mitmdump(self, config, logger, mitmdump_path):
+ def start_mitmdump(self, queue, config, logger, mitmdump_path):
proxy_port = config.get('proxy.port', 4272)
mock_port = config.get('mock.port', 9090)
'''
@@ -82,16 +82,31 @@ def start_mitmdump(self, config, logger, mitmdump_path):
subprocess.Popen(f'{str(mitmdump_path)} {" ".join(mitm_arguments)}', shell=True, env=mitmenv)
is_mitm_start = self.wait_for_mitm_start(config, logger)
if is_mitm_start:
+ self.publish_init_status(queue, 'READY')
logger.log(60, f'HTTP proxy server start on {proxy_port}')
else:
+ self.publish_init_status(queue, 'ERROR')
self.show_mitmdump_start_timeout_help(mitmdump_path, logger)
+ def publish_init_status(self, queue, status):
+ queue.put({
+ 'type': 'event',
+ "channel": "system",
+ "content": {
+ 'system': {
+ 'action': 'init_module',
+ 'status': status,
+ 'module': 'mitm_proxy'
+ }
+ }
+ })
+
def run(self, queue, config, *args, **kwargs):
# Init logger
log.init(config)
logger = log.get_logger()
mitm_path = kwargs.get('mitm_path')
- self.start_mitmdump(config, logger, mitm_path)
+ self.start_mitmdump(queue, config, logger, mitm_path)
class UnsupportedPlatform(Exception):
diff --git a/lyrebird/mock/context.py b/lyrebird/mock/context.py
index 3899e6668..90ace7f99 100644
--- a/lyrebird/mock/context.py
+++ b/lyrebird/mock/context.py
@@ -121,7 +121,7 @@ def save(self):
Because of iview table has render preformance problem
We need to limit render time
"""
-EMIT_INTERVAL = 0.4
+EMIT_INTERVAL = 0.25
last_emit_time = {}
diff --git a/lyrebird/mock/extra_mock_server/__init__.py b/lyrebird/mock/extra_mock_server/__init__.py
index 273af65fe..cde478438 100644
--- a/lyrebird/mock/extra_mock_server/__init__.py
+++ b/lyrebird/mock/extra_mock_server/__init__.py
@@ -1,28 +1,12 @@
-
-import multiprocessing
-
-from lyrebird import application
from lyrebird.log import get_logger
-from .server import serve
-
+from .server import serve, publish_init_status
+from lyrebird.base_server import ProcessServer
logger = get_logger()
-class ExtraMockServer():
- def __init__(self) -> None:
- self._server_process = None
-
- def start(self):
- self._server_process = multiprocessing.Process(
- group=None,
- daemon=True,
- target=serve,
- kwargs={'config': application.config.raw()})
- self._server_process.start()
+class ExtraMockServer(ProcessServer):
- def stop(self):
- if self._server_process:
- self._server_process.terminate()
- logger.warning(f'MockServer shutdown')
- self._server_process = None
+ def run(self, queue, config, *args, **kwargs):
+ publish_init_status(queue, 'READY')
+ serve(queue, config, *args, **kwargs)
diff --git a/lyrebird/mock/extra_mock_server/server.py b/lyrebird/mock/extra_mock_server/server.py
index fcfaa6e68..e475d4b43 100644
--- a/lyrebird/mock/extra_mock_server/server.py
+++ b/lyrebird/mock/extra_mock_server/server.py
@@ -175,8 +175,21 @@ def _cancel_tasks(
}
)
-
-def serve(config):
+def publish_init_status(queue, status):
+ queue.put({
+ 'type': 'event',
+ "channel": "system",
+ "content": {
+ 'system': {
+ 'action': 'init_module',
+ 'status': status,
+ 'module': 'extra_mock'
+ }
+ }
+ })
+
+
+def serve(queue, config, *args, **kwargs):
loop = asyncio.new_event_loop()
main_task = loop.create_task(_run_app(config))
@@ -184,7 +197,7 @@ def serve(config):
asyncio.set_event_loop(loop)
loop.run_until_complete(main_task)
except KeyboardInterrupt:
- pass
+ publish_init_status(queue, 'ERROR')
finally:
_cancel_tasks({main_task}, loop)
_cancel_tasks(asyncio.all_tasks(loop), loop)
diff --git a/requirements.txt b/requirements.txt
index 4e1555e3a..45ef20649 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ packaging==19.0
Pillow==9.1.1
portpicker==1.3.1
qrcode==7.3.1
-requests==2.21.0
+requests==2.25.1
SQLAlchemy==1.3.22
aiohttp==3.8.1
netifaces==0.11.0
diff --git a/requirements.txt.lock b/requirements.txt.lock
index 2f4a12596..049066df2 100644
--- a/requirements.txt.lock
+++ b/requirements.txt.lock
@@ -33,7 +33,7 @@ python-engineio==4.3.4
python-socketio==5.7.1
pytz==2022.2.1
qrcode==7.3.1
-requests==2.21.0
+requests==2.25.1
six==1.16.0
soupsieve==2.3.2.post1
SQLAlchemy==1.3.22