From 0746c235f56c84098d646099aec84a937790e65e Mon Sep 17 00:00:00 2001 From: Scarqin Date: Tue, 1 Nov 2022 21:41:26 +0800 Subject: [PATCH] Share api document (#168) --- .dockerignore | 21 + .github/workflows/release.yml | 1 + .gitignore | 3 + CHANGELOG.md | 23 + Dockerfile | 26 + docker-compose.yml | 39 + nginx.conf | 86 + package.json | 6 +- src/app/electron-main/appView.ts | 91 - src/app/electron-main/main.ts | 65 +- src/app/electron-main/updater.ts | 2 +- src/platform/common/i18n.ts | 4 +- src/platform/electron-browser/preload.ts | 131 +- .../electron-main/browserView/browserView.ts | 41 - .../browserView/browserView.type.ts | 9 - src/platform/electron-node/preload.ts | 3 + src/platform/node/configuration/lib/index.ts | 2 +- .../node/configuration/types/index.ts | 2 +- .../node/extension-manager/lib/core.ts | 15 +- .../node/extension-manager/lib/handler.ts | 8 +- .../node/extension-manager/lib/loader.ts | 61 - .../node/extension-manager/lib/manager.ts | 196 +- .../node/extension-manager/types/handler.ts | 31 + .../node/extension-manager/types/index.ts | 3 +- .../node/extension-manager/types/loader.ts | 18 - .../node/extension-manager/types/manager.ts | 131 -- .../node/extension-manager/types/module.ts | 113 + src/platform/node/i18n.ts | 16 +- src/platform/node/mock-server/index.ts | 4 +- src/shared/common/bounds.ts | 93 - src/workbench/browser/.gitignore | 1 + src/workbench/browser/angular.json | 2 +- src/workbench/browser/build/build.js | 14 +- src/workbench/browser/elements/apiContent.ts | 21 + src/workbench/browser/elements/index.ts | 1 + .../browser/elements/service/eventS.ts | 5 +- src/workbench/browser/elements/tree.ts | 98 +- src/workbench/browser/package.json | 4 +- src/workbench/browser/proxy.conf.json | 10 - .../browser/src/app/app-routing.module.ts | 7 +- .../browser/src/app/app.component.ts | 15 +- src/workbench/browser/src/app/app.module.ts | 12 +- src/workbench/browser/src/app/app.service.ts | 5 +- .../services/language/language.service.ts | 6 +- .../browser/src/app/pages/.component.ts | 10 - .../src/app/pages/account.component.ts | 213 +- .../src/app/pages/api/api-tab.service.ts | 69 +- .../src/app/pages/api/api.component.html | 39 +- .../src/app/pages/api/api.component.scss | 15 +- .../src/app/pages/api/api.component.ts | 42 +- .../browser/src/app/pages/api/api.module.ts | 5 +- .../browser/src/app/pages/api/api.service.ts | 20 +- .../group/edit/api-group-edit.component.html | 5 +- .../group/tree/api-group-tree.component.html | 70 +- .../group/tree/api-group-tree.component.scss | 5 +- .../group/tree/api-group-tree.component.ts | 45 +- .../pages/api/history/eo-history.component.ts | 3 +- .../api/http/detail/api-detail.component.ts | 33 +- .../api/http/edit/api-edit.component.html | 99 +- .../pages/api/http/edit/api-edit.component.ts | 7 +- .../pages/api/http/edit/api-edit.module.ts | 2 + .../api/http/mock/api-mock.component.html | 45 +- .../api/http/test/api-test-util.service.ts | 2 +- .../api/http/test/api-test.component.html | 155 +- .../pages/api/http/test/api-test.component.ts | 7 +- .../pages/api/http/test/api-test.module.ts | 4 +- .../api-test-result-response.component.ts | 13 +- .../pages/api/tab/api-tab-operate.service.ts | 63 +- .../pages/api/tab/api-tab-storage.service.ts | 25 +- .../app/pages/api/tab/api-tab.component.html | 23 +- .../app/pages/api/tab/api-tab.component.scss | 10 +- .../app/pages/api/tab/api-tab.component.ts | 8 +- .../api/websocket/websocket.component.ts | 9 +- .../detail/components/custom-tab.component.ts | 75 + .../detail/components/extensions.component.ts | 31 +- .../detail/extension-detail.component.html | 34 +- .../detail/extension-detail.component.ts | 64 +- .../detail/extension-detail.module.ts | 6 +- .../pages/extension/extension.component.ts | 12 +- .../app/pages/extension/extension.model.ts | 2 +- .../app/pages/extension/extension.service.ts | 41 +- .../list/extension-list.component.html | 28 +- .../list/extension-list.component.ts | 6 +- .../browser/src/app/pages/member.component.ts | 243 +- .../browser/src/app/pages/member.module.ts | 41 +- .../app/pages/navbar/navbar.component.html | 54 +- .../app/pages/navbar/navbar.component.scss | 8 +- .../src/app/pages/navbar/navbar.component.ts | 82 +- .../src/app/pages/navbar/navbar.module.ts | 3 +- .../src/app/pages/pages-routing.module.ts | 10 + .../browser/src/app/pages/pages.component.ts | 9 +- .../browser/src/app/pages/pages.module.ts | 3 +- .../src/app/pages/share-routing.module.ts | 29 + .../browser/src/app/pages/share.component.ts | 13 +- .../browser/src/app/pages/share.module.ts | 13 +- .../src/app/pages/user-modal.component.ts | 519 +++-- .../src/app/pages/vue3/vue3.component.html | 5 + .../src/app/pages/vue3/vue3.component.scss | 0 .../src/app/pages/vue3/vue3.component.spec.ts | 25 + .../src/app/pages/vue3/vue3.component.ts | 45 + .../src/app/pages/workspace.component.ts | 128 +- .../browser/src/app/pages/workspace.module.ts | 36 +- .../shared/components/api-script/constant.ts | 35 - .../components/env-list/env-list.component.ts | 40 +- .../shared/components/env/env.component.html | 30 +- .../shared/components/env/env.component.ts | 12 +- .../export-api/export-api.component.ts | 43 +- .../extension-select.component.html | 4 +- .../import-api/import-api.component.ts | 16 +- .../local-workspace-tip.component.ts | 6 +- .../manage-access.component.html | 2 +- .../monaco-editor/monaco-editor.component.ts | 1 - .../setting/common/data-storage.component.ts | 48 +- .../setting/common/extensions.component.ts | 12 +- .../eoapi-settings/extensiton-settings.json | 12 - .../components/setting/setting.component.html | 26 +- .../components/setting/setting.component.ts | 21 +- .../components/sidebar/sidebar.component.html | 8 +- .../components/sidebar/sidebar.component.ts | 93 +- .../components/sidebar/sidebar.model.ts | 4 +- .../components/sidebar/sidebar.service.ts | 2 +- .../split-panel/split.panel.component.ts | 1 + .../components/sync-api/sync-api.component.ts | 22 +- .../remote-node/test-connect.service.ts | 13 +- .../data-source/data-source.service.ts | 105 +- .../shared/services/remote/remote.service.ts | 185 ++ .../src/app/shared/services/share.service.ts | 22 + .../src/app/shared/services/status.service.ts | 24 + .../services/storage/IndexedDB/lib/index.ts | 2 +- .../shared/services/storage/api.service.ts | 49 + .../src/app/shared/services/storage/api.ts | 20 + .../storage/http/lib/baseUrl.service.ts | 70 +- .../shared/services/storage/index.model.ts | 2 +- .../shared/services/storage/local.service.ts | 178 ++ .../shared/services/storage/remote.service.ts | 1361 ++++++----- .../services/storage/storage.service.ts | 4 +- .../web-extension/webExtension.service.ts | 106 + .../services/workspace/workspace.service.ts | 81 +- .../browser/src/app/shared/shared.module.ts | 5 +- src/workbench/browser/src/app/shared/types.ts | 8 - .../browser/src/app/utils/index.utils.ts | 24 +- .../src/app/utils/module-loader/type.ts | 66 - .../browser/src/app/utils/tree/tree.utils.ts | 1 - .../browser/src/assets/theme/antd.less | 1 + .../browser/src/environments/common.ts | 1 + .../src/environments/environment.docker.ts | 13 + .../browser/src/environments/environment.ts | 3 +- src/workbench/browser/src/locale/messages.xlf | 887 ++++---- .../browser/src/locale/messages.zh.xlf | 918 ++++---- src/workbench/browser/src/main.ts | 17 +- src/workbench/browser/src/ng1/index.css | 3 - src/workbench/browser/views/share.ts | 11 +- src/workbench/browser/views/user-modal.ts | 1 + src/workbench/node/{server => }/package.json | 18 +- src/workbench/node/request/libs/apiUtil.js | 30 +- src/workbench/node/server/main.js | 2 +- src/workbench/node/server/socketio.js | 8 +- src/workbench/node/server/yarn.lock | 537 ++--- src/workbench/node/yarn.lock | 1982 +++++++++++++++++ yarn.lock | 95 +- 160 files changed, 7175 insertions(+), 4172 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 nginx.conf delete mode 100644 src/app/electron-main/appView.ts delete mode 100644 src/platform/electron-main/browserView/browserView.ts delete mode 100644 src/platform/electron-main/browserView/browserView.type.ts create mode 100644 src/platform/electron-node/preload.ts delete mode 100644 src/platform/node/extension-manager/lib/loader.ts delete mode 100644 src/platform/node/extension-manager/types/loader.ts delete mode 100644 src/platform/node/extension-manager/types/manager.ts create mode 100644 src/platform/node/extension-manager/types/module.ts delete mode 100644 src/shared/common/bounds.ts create mode 100644 src/workbench/browser/elements/apiContent.ts delete mode 100644 src/workbench/browser/proxy.conf.json delete mode 100644 src/workbench/browser/src/app/pages/.component.ts create mode 100644 src/workbench/browser/src/app/pages/extension/detail/components/custom-tab.component.ts create mode 100644 src/workbench/browser/src/app/pages/vue3/vue3.component.html create mode 100644 src/workbench/browser/src/app/pages/vue3/vue3.component.scss create mode 100644 src/workbench/browser/src/app/pages/vue3/vue3.component.spec.ts create mode 100644 src/workbench/browser/src/app/pages/vue3/vue3.component.ts delete mode 100644 src/workbench/browser/src/app/shared/components/setting/eoapi-settings/extensiton-settings.json create mode 100644 src/workbench/browser/src/app/shared/services/remote/remote.service.ts create mode 100644 src/workbench/browser/src/app/shared/services/share.service.ts create mode 100644 src/workbench/browser/src/app/shared/services/status.service.ts create mode 100644 src/workbench/browser/src/app/shared/services/web-extension/webExtension.service.ts delete mode 100644 src/workbench/browser/src/app/shared/types.ts delete mode 100644 src/workbench/browser/src/app/utils/module-loader/type.ts create mode 100644 src/workbench/browser/src/environments/environment.docker.ts rename src/workbench/node/{server => }/package.json (51%) create mode 100644 src/workbench/node/yarn.lock diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..37c9ec686 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,21 @@ +.DS_Store +node_modules/ +dist/ +release/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +package-lock.json +tests/**/coverage/ + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln + +.vercel +docker-compose.dev.yml +Dockerfile.dev diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34f66cb96..6763d59cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,7 @@ name: Release on: push: + # branches: [for debug] tags: - 'v*.*.*' diff --git a/.gitignore b/.gitignore index fa347fbb0..e4e35adee 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ Thumbs.db # *-lock.json -error.log .vercel +nginx-test.conf +docker-compose.dev.yml +Dockerfile.dev diff --git a/CHANGELOG.md b/CHANGELOG.md index ba88c231b..eac66bc3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# [1.9.0](https://github.com/eolinker/eoapi/compare/v1.8.2...v1.9.0) (2022-10-19) + + +### Features + +* mock lead to download in web ([65c7ecf](https://github.com/eolinker/eoapi/commit/65c7ecffe795844fd24621c05e412a8af17eca09)) + + + +## [1.8.2](https://github.com/eolinker/eoapi/compare/v1.8.1...v1.8.2) (2022-10-18) + + +### Bug Fixes + +* xml2json parser bug ([e2459a2](https://github.com/eolinker/eoapi/commit/e2459a23fc74a7696f5b6f3296c512d28939f6c7)) + + +### Features + +* keep queryParams stay in page ([baad303](https://github.com/eolinker/eoapi/commit/baad3038cbffd38cfea128f92d3cc3073a786e5a)) + + + ## [1.8.1](https://github.com/eolinker/eoapi/compare/v1.8.0...v1.8.1) (2022-10-13) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..f334d2e40 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +FROM node:lts-alpine as builder + +WORKDIR /test-server + +# api 测试服务端口 +ENV NODE_SERVER_PORT 4201 +# websocket 测试服务端口 +ENV EOAPI_WEBSOCKET_POST 4202 + +COPY /src/workbench/node /test-server + +RUN yarn install + +EXPOSE 4201 4202 + +CMD ["yarn", "start:all"] + + +FROM nginx:alpine as production + +ENV NODE_ENV production + +COPY ./src/workbench/browser/dist/ /usr/share/nginx/html +COPY ./nginx.conf /etc/nginx/conf.d/default.conf + +EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..c6d5551a3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,39 @@ +version: '3' + +services: + eoapi: + # build: 从当前路径构建镜像 + build: + context: . + dockerfile: Dockerfile + target: production + image: eolinker/eoapi:1.9.0 + container_name: eoapi + restart: always + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + - '8000:80' + networks: + - eoapi_net + + eoapi-test-server: + # build: 从当前路径构建镜像 + build: + context: . + dockerfile: Dockerfile + target: builder + image: eolinker/eoapi-test-server:1.9.0 + container_name: eoapi-test-server + restart: always + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + - '4201:4201' + - '4202:4202' + networks: + - eoapi_net + +networks: + eoapi_net: + name: eoapi_net diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 000000000..0696ba28c --- /dev/null +++ b/nginx.conf @@ -0,0 +1,86 @@ +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} + +server { + listen 80; + absolute_redirect off; #取消绝对路径的重定向 + sendfile on; + default_type application/octet-stream; + + gzip on; + gzip_http_version 1.1; + gzip_disable "MSIE [1-6]\."; + gzip_min_length 256; + gzip_vary on; + gzip_proxied expired no-cache no-store private auth; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; + gzip_comp_level 9; + + root /usr/share/nginx/html; + + location / { + return 301 $scheme://$http_host/zh; + } + + location /zh { + alias /usr/share/nginx/html/zh; + index index.html index.htm; + try_files $uri $uri/ /zh/index.html; + } + + location /en { + alias /usr/share/nginx/html/en; + index index.html index.htm; + try_files $uri $uri/ /en/index.html; + } + + # api测试服务 + location /api/unit { + proxy_pass http://eoapi-test-server:4201; # 转发规则 + proxy_set_header Host $proxy_host; # 修改转发请求头，让3000端口的应用可以受到真实的请求 + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + # websocket测试服务 + location ~/socket.io/(.*) { + proxy_pass http://eoapi-test-server:4202; # 转发规则 + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_redirect off; + } + + # 后端服务 + location ^~ /api { + proxy_pass http://eoapi-remote-server:3000; # 转发规则 + proxy_set_header Host $proxy_host; # 修改转发请求头，让3000端口的应用可以受到真实的请求 + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + # 后端服务兼容旧客户端 + location ~ ^/(system|workspace|user|auth|[0-9]+/[0-9]+/api_data|[0-9]+/[0-9]+/group|[0-9]+/[0-9]+/group|[0-9]+/[0-9]+/environment|[0-9]+/[0-9]+/api_test_history|[0-9]+/[0-9]+/mock|[0-9]+/project) { + proxy_pass http://eoapi-remote-server:3000; # 转发规则 + proxy_set_header Host $proxy_host; # 修改转发请求头，让3000端口的应用可以受到真实的请求 + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + rewrite "^/(.*)$" /api/$1 break; + } + + # location ^~ /zh/(.*)/assets/(.*)$ { + # alias /usr/share/nginx/html/zh/assets/$2; + # return 501 /usr/share/nginx/html/zh/assets/$2; + #} + + # location ^~ /zh/\.(gif|jpg|jpeg|png|css|js|ico|svg|ttf|woff2|woff|txt)$ { + # alias /usr/share/nginx/html/zh/$1; + # return 502 /usr/share/nginx/html/zh/$1; + #} +} diff --git a/package.json b/package.json index 466f53b22..091cabb66 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,11 @@ "scripts": { "postinstall": "electron-builder install-app-deps && npx patch-package", "start": "npm-run-all -p start:workbench electron:serve", - "start:web": "cd src/workbench/browser && npm run ng:serve", - "start:testServer": "cd src/workbench/node/server && yarn dev", + "serve:web": "cd src/workbench/browser && npm run ng:serve", + "start:testServer": "cd src/workbench/node && yarn dev", "start:workbench": "cd src/workbench/browser && yarn start", "build:workbench": "cd src/workbench/browser && yarn build", + "docker:build:workbench": "cd src/workbench/browser && yarn build:docker:web", "test:workbench": "cd src/workbench/browser && yarn test", "electron:serve": "wait-on tcp:4200 && npm run electron:dev", "electron:static": "npm run electron:tsc && electron .", @@ -47,6 +48,7 @@ "express": "4.18.1", "fix-path": "3.0.0", "form-data": "^4.0.0", + "http-server": "14.1.1", "iconv-lite": "^0.6.3", "jquery": "^3.3.0", "jsdom": "^11.5.1", diff --git a/src/app/electron-main/appView.ts b/src/app/electron-main/appView.ts deleted file mode 100644 index e40f193d0..000000000 --- a/src/app/electron-main/appView.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { ModuleInfo, ModuleType } from 'eo/platform/node/extension-manager/types'; -import { getViewBounds, SidePosition, ViewBounds, ViewZone } from 'eo/shared/common/bounds'; -import { BrowserView, BrowserWindow } from 'electron'; -import * as path from 'path'; -import { BrowserViewInstance } from 'eo/platform/electron-main/browserView/browserView'; -import { processEnv } from 'eo/platform/node/constant'; -export class AppViews { - mainModuleID: string; - view: BrowserView; - sidePosition: SidePosition = SidePosition.left; - constructor(private win: BrowserWindow) {} - - /** - * 加载app模块 - * @param module - */ - create(module: ModuleInfo) { - if (module && module.moduleType === ModuleType.app) { - if (module.isApp && this.mainModuleID !== module.moduleID) { - this.mainModuleID = module.moduleID; - // this.sidePosition = module.sidePosition; - } - this.createAppView(module); - - if (module.main_node) { - const main_node = require(module.main_node); - if (main_node.module && typeof main_node.module === 'object') { - const _fun = main_node.module; - _fun.setup({ - appView: this.view, - }); - } - } - } - return this.view; - } - - /** - * 删除视图 - */ - remove() { - if (!this.view) { - return; - } - this.view.webContents.closeDevTools(); - this.win.removeBrowserView(this.view); - this.view = undefined; - this.mainModuleID = undefined; - } - - rebuildBounds(sideWidth?: number) { - if (!this.view) { - return; - } - const windBounds = this.win.getContentBounds(); - const _bounds: ViewBounds = getViewBounds( - ViewZone.main, - windBounds.width, - windBounds.height, - this.sidePosition, - sideWidth - ); - this.view.setBounds(_bounds); - } - - /** - * 创建主视图，主要从模块载入文件 - * @param module - */ - private createAppView(module: ModuleInfo) { - const windBounds = this.win.getContentBounds(); - const _bounds: ViewBounds = getViewBounds(ViewZone.main, windBounds.width, windBounds.height, this.sidePosition); - let _view = new BrowserViewInstance({ - bounds: _bounds, - partition: `<${module.moduleID}>`, - preloadPath: path.join(__dirname, '../../', 'platform', 'electron-browser', 'preload.js'), - preload: module.preload, - viewPath: processEnv === 'development' && module.main_debug ? module.main_debug : module.main, - }).init(this.win); - this.remove(); - this.view = _view; - this.view.webContents.openDevTools(); - this.view.webContents.once('did-finish-load', () => { - _view.setBackgroundColor('#FFF'); - }); - this.view.webContents.once('dom-ready', () => { - this.rebuildBounds(); - require('@electron/remote/main').enable(this.view.webContents); - }); - } -} diff --git a/src/app/electron-main/main.ts b/src/app/electron-main/main.ts index 8eb9f7a49..67b42beb3 100644 --- a/src/app/electron-main/main.ts +++ b/src/app/electron-main/main.ts @@ -187,64 +187,20 @@ try { } } }); - ipcMain.on('eo-storage', (event, args) => { - let returnValue: any; - if (args.type === 'default' || args.type === 'remote') { - eoBrowserWindow.win.webContents.send('eo-storage', args); - returnValue = null; - } else if (args.type === 'sync') { - deleteFile(storageTemp); - eoBrowserWindow.win.webContents.send('eo-storage', args); - let data = readJson(storageTemp); - let count: number = 0; - while (data === null) { - if (count > 1500) { - data = { - // status: StorageResStatus.error, - status: 500, - data: 'storage sync load error', - }; - break; - } - data = readJson(storageTemp); - ++count; - } - deleteFile(storageTemp); - returnValue = data; - } else if (args.type === 'result') { - let view = subView.appView ? subView.appView?.view.webContents : eoBrowserWindow.win.webContents; - view.send('storageCallback', args.result); - } - }); // 这里可以封装成类+方法匹配调用，不用多个if else ['on', 'handle'].forEach((eventName) => ipcMain[eventName]('eo-sync', async (event, arg) => { let returnValue: any; - if (arg.action === 'getApiAccessRules') { - // 后期加入权限生成，根据moduleID，上层moduleID，应用范围等 - // 或者是像Android, 跳出权限列表让用户自己选择确认放开的权限。 - const output: string[] = ['getModules', 'getAppModuleList', 'getSlideModuleList', 'hook']; - returnValue = output; - } else if (arg.action === 'getModules') { - returnValue = moduleManager.getModules(true); + if (arg.action === 'getModules') { + returnValue = moduleManager.getModules(); } else if (arg.action === 'getModule') { - returnValue = moduleManager.getModule(arg.data.moduleID); - } else if (arg.action === 'getAppModuleList') { - returnValue = moduleManager.getAppModuleList(); + returnValue = moduleManager.getModule(arg.data.id); } else if (arg.action === 'installModule') { const data = await moduleManager.installExt(arg.data); - if (data.code === 0) { - //subView.mainView.view.webContents.send('moduleUpdate'); - } returnValue = Object.assign(data, { modules: moduleManager.getModules() }); } else if (arg.action === 'uninstallModule') { const data = await moduleManager.uninstall(arg.data); - if (data.code === 0) { - // subView.mainView.view.webContents.send('moduleUpdate'); - } returnValue = Object.assign(data, { modules: moduleManager.getModules() }); - } else if (arg.action === 'getSideModuleList') { - returnValue = moduleManager.getSideModuleList(subView.appView?.mainModuleID || 'default'); } else if (arg.action === 'getFeatures') { returnValue = moduleManager.getFeatures(); } else if (arg.action === 'getFeature') { @@ -257,19 +213,16 @@ try { returnValue = configuration.deleteModuleSettings(arg.data.moduleID); } else if (arg.action === 'getSettings') { returnValue = configuration.getSettings(); - } else if (arg.action === 'getModuleSettings') { - returnValue = configuration.getModuleSettings(arg.data.moduleID); - } else if (arg.action === 'getSidePosition') { - returnValue = subView.appView?.sidePosition; - // 获取mock服务地址 + } else if (arg.action === 'getExtensionSettings') { + returnValue = configuration.getExtensionSettings(arg.data.moduleID); } else if (arg.action === 'getMockUrl') { + // 获取mock服务地址 returnValue = mockServer.getMockUrl(); - // 获取websocket服务端口 } else if (arg.action === 'getWebsocketPort') { + // 获取websocket服务端口 returnValue = websocketPort; - // 重置并初始化mock路由 - } else if (arg.action === 'hook') { - returnValue = 'hook返回'; + } else if (arg.action === 'getExtensionPagePathByName') { + returnValue = moduleManager.setupExtensionPageServer(arg.data.extName); } else { returnValue = 'Invalid data'; } diff --git a/src/app/electron-main/updater.ts b/src/app/electron-main/updater.ts index 9c7910fce..ffe13b10d 100644 --- a/src/app/electron-main/updater.ts +++ b/src/app/electron-main/updater.ts @@ -10,7 +10,7 @@ export class EoUpdater { // url: 'https://packages.eoapi.io', // }); // 是否自动更新 - // autoUpdater.autoDownload = window.eo.getModuleSettings('common.app.autoUpdate') !== false; + // autoUpdater.autoDownload = window.eo.getExtensionSettings('common.app.autoUpdate') !== false; if (appVersion.includes('beta')) autoUpdater.channel = 'beta'; console.log('appVersion', appVersion, autoUpdater.channel); } diff --git a/src/platform/common/i18n.ts b/src/platform/common/i18n.ts index ec1f4690d..e8d7eb8d1 100644 --- a/src/platform/common/i18n.ts +++ b/src/platform/common/i18n.ts @@ -1,10 +1,10 @@ -import { ModuleInfo } from 'eo/platform/node/extension-manager'; +import { ModuleInfo } from "eo/platform/node/extension-manager/types"; /** * Single extension i18 service,chain call */ export class TranslateService { // Default key in package.json translate replace directly - defaultKeys = ['moduleName', 'description', 'author', 'logo']; + defaultKeys = ['moduleName','title','description', 'author', 'logo']; constructor(private module: ModuleInfo, private locale) {} translate() { return this.translateDefaultKey().translateVariableKey().get(); diff --git a/src/platform/electron-browser/preload.ts b/src/platform/electron-browser/preload.ts index 62931c822..5cd016620 100644 --- a/src/platform/electron-browser/preload.ts +++ b/src/platform/electron-browser/preload.ts @@ -1,7 +1,5 @@ import { I18N } from './i18n'; const { ipcRenderer } = require('electron'); -// 可以加上条件判断，根据不同模块id哪些允许放出 -const apiAccessRules = ipcRenderer.sendSync('eo-sync', { action: 'getApiAccessRules' }) || []; // 正在安装中的插件任务列表 const installTask = new Map(); // 正在卸载中的插件任务列表 @@ -25,67 +23,38 @@ const featureModules = new Map(); window.eo = { name: 'Eoapi public api', version: '1.0.0', -}; -// 边栏显示 -// window.eo.sidePosition = ipcRenderer.sendSync('eo-sync', { action: 'getSidePosition' }) || 'left'; -// 获取模块列表 -window.eo.getModules = () => { - return ipcRenderer.sendSync('eo-sync', { action: 'getModules' }); -}; -// 获取某个模块 -window.eo.getModule = (moduleID) => { - return ipcRenderer.sendSync('eo-sync', { action: 'getModule', data: { moduleID: moduleID } }); -}; -// 获取App应用列表 -window.eo.getAppModuleList = () => { - return ipcRenderer.sendSync('eo-sync', { action: 'getAppModuleList' }); -}; -// 获取边栏应用列表 -window.eo.getSideModuleList = () => { - return ipcRenderer.sendSync('eo-sync', { action: 'getSideModuleList' }); -}; -// 获取所有功能点列表 -window.eo.getFeatures = () => { - return ipcRenderer.sendSync('eo-sync', { action: 'getFeatures' }); -}; -// 获取某个功能点 -window.eo.getFeature = (featureKey) => { - return ipcRenderer.sendSync('eo-sync', { action: 'getFeature', data: { featureKey: featureKey } }); -}; -// 加载feature模块 -window.eo.loadFeatureModule = async (moduleID) => { - if (!featureModules.has(moduleID)) { - try { - const module = window.eo.getModule(moduleID); - window.eo._currentExtensionID = moduleID; - const _module = await require(module.baseDir); - featureModules.set(moduleID, _module); - } catch (e) { - console.log(e); + // 获取模块列表 + getModules() { + return ipcRenderer.sendSync('eo-sync', { action: 'getModules' }); + }, + getModule (id) { + return ipcRenderer.sendSync('eo-sync', { action: 'getModule', data: { id: id } }); + }, + getFeatures(){ + return ipcRenderer.sendSync('eo-sync', { action: 'getFeatures' }); + }, + getFeature(featureKey) { + return ipcRenderer.sendSync('eo-sync', { action: 'getFeature', data: { featureKey: featureKey } }); + }, + loadFeatureModule(id){ + if (!featureModules.has(id)) { + try { + const module = window.eo.getModule(id); + window.eo._currentExtensionID = id; + const _module = require(module.baseDir); + featureModules.set(id, _module); + } catch (e) { + console.log(e); + } } - } - return featureModules.get(moduleID); + return featureModules.get(id); + }, }; // 卸载feature模块 -window.eo.unloadFeatureModule = (moduleID) => { - featureModules.delete(moduleID); -}; -// Hook请求返回 -if (apiAccessRules.includes('hook')) { - window.eo.hook = (data) => { - return ipcRenderer.sendSync('eo-sync', { action: 'hook', data }); - }; -} -// 临时测试用 -window.eo.tempApi = (params) => { - return ipcRenderer.sendSync('eo-sync', params); -}; -window.eo.autoResize = (sideWidth) => { - ipcRenderer.send('eo-sync', { action: 'autoResize', data: { sideWidth: sideWidth } }); -}; -window.eo.getModules = () => { - return ipcRenderer.sendSync('eo-sync', { action: 'getModules' }); +window.eo.unloadFeatureModule = (id) => { + featureModules.delete(id); }; + window.eo.installModule = (name, isLocal = false) => { installTask.set(name, []); const result = ipcRenderer.invoke('eo-sync', { action: 'installModule', data: { name, isLocal } }); @@ -145,9 +114,6 @@ window.eo.uninstallModule = (name, isLocal = false) => { }); return result; }; -window.eo.openApp = (inputArg) => { - return ipcRenderer.sendSync('eo-sync', { action: 'openApp', data: inputArg }); -}; window.eo.getInstallTask = () => installTask; window.eo.getUninstallTask = () => uninstallTask; window.eo.getExtIsInTask = (name, callback) => { @@ -166,40 +132,9 @@ window.eo.getExtIsInTask = (name, callback) => { return false; }; -window.eo.storage = (args, callback: any) => { - const key = `${args.action}_${Date.now()}`; - storageCallback.set(key, callback); - args.type = 'default'; - args.callback = key; - ipcRenderer.send('eo-storage', args); -}; -window.eo.storageSync = (args) => { - console.log('run preload storageSync'); - args.type = 'sync'; - return ipcRenderer.sendSync('eo-storage', args); -}; -// window.eo.storageRemote = (args) => { -// console.log('run preload storageRemote'); -// args.type = 'remote'; -// const shareObject = window.require('@electron/remote').getGlobal('shareObject'); -// shareObject.storageResult = null; -// ipcRenderer.send('eo-storage', args); -// let output: any = shareObject.storageResult; -// let count: number = 0; -// while (output === null) { -// if (count > 1500) { -// output = { -// status: 'error', -// data: 'storage remote load error', -// }; -// break; -// } -// output = shareObject.storageResult; -// ++count; -// } -// shareObject.storageResult = null; -// return output; -// }; +window.eo.getExtensionPagePathByName = (extName: string) => { + return ipcRenderer.invoke('eo-sync', { action: 'getExtensionPagePathByName', data: { extName } }); +}; window.eo.saveSettings = (settings) => { // console.log('window.eo.saveSettings', settings); @@ -226,8 +161,8 @@ window.eo.getSettings = () => { }; window.eo.i18n = new I18N(); -window.eo.getModuleSettings = (moduleID) => { - return ipcRenderer.sendSync('eo-sync', { action: 'getModuleSettings', data: { moduleID: moduleID } }); +window.eo.getExtensionSettings = (moduleID) => { + return ipcRenderer.sendSync('eo-sync', { action: 'getExtensionSettings', data: { moduleID: moduleID } }); }; // 注册单个mock路由 window.eo.registerMockRoute = ({ method, path, data }) => { diff --git a/src/platform/electron-main/browserView/browserView.ts b/src/platform/electron-main/browserView/browserView.ts deleted file mode 100644 index 3e7992c24..000000000 --- a/src/platform/electron-main/browserView/browserView.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { throws } from 'assert'; -import { BrowserWindow, BrowserView, session, BrowserViewConstructorOptions } from 'electron'; -import { ViewBounds } from 'eo/shared/common/bounds'; -import { proxyOpenExternal } from 'eo/shared/common/browserView'; -import { BrowserViewOpts } from './browserView.type'; -export class BrowserViewInstance { - bounds: ViewBounds; - constructor(private opts: BrowserViewOpts) { - this.bounds = this.opts.bounds; - } - init(win: BrowserWindow) { - let viewOps: BrowserViewConstructorOptions = { - webPreferences: { - webSecurity: false, - nodeIntegration: true, - contextIsolation: false, - devTools: true, - webviewTag: true, - }, - }; - if (this.opts.preloadPath) { - const partition = this.opts.partition || ''; - const ses = session.fromPartition(partition); - ses.setPreloads([this.opts.preloadPath]); - viewOps.webPreferences.session = ses; - } - if (this.opts.preload) { - viewOps.webPreferences.preload = this.opts.preload; - } - let view = new BrowserView(viewOps); - view.webContents.loadURL(this.opts.viewPath); - // view.webContents.on("console-message",(e,level,message)=>{ - // console.log(message) - // }) - // view.webContents.openDevTools(); - win.addBrowserView(view); - view.setBounds(this.bounds); - proxyOpenExternal(view); - return view; - } -} diff --git a/src/platform/electron-main/browserView/browserView.type.ts b/src/platform/electron-main/browserView/browserView.type.ts deleted file mode 100644 index 9bc377702..000000000 --- a/src/platform/electron-main/browserView/browserView.type.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ViewBounds } from 'eo/shared/common/bounds'; - -export interface BrowserViewOpts { - bounds: ViewBounds; - partition?: string; - preloadPath?: string; - viewPath: string; - preload?: string; -} diff --git a/src/platform/electron-node/preload.ts b/src/platform/electron-node/preload.ts new file mode 100644 index 000000000..6f10512e4 --- /dev/null +++ b/src/platform/electron-node/preload.ts @@ -0,0 +1,3 @@ +globalThis.eo = { + getExtensionSetting() {}, +}; diff --git a/src/platform/node/configuration/lib/index.ts b/src/platform/node/configuration/lib/index.ts index 7cbbf85c7..556f9fc3d 100644 --- a/src/platform/node/configuration/lib/index.ts +++ b/src/platform/node/configuration/lib/index.ts @@ -88,7 +88,7 @@ export class Configuration implements ConfigurationInterface { * @param section * @returns */ - getModuleSettings(section?: string): T { + getExtensionSettings(section?: string): T { return this.getConfiguration(section); } diff --git a/src/platform/node/configuration/types/index.ts b/src/platform/node/configuration/types/index.ts index 2b3f20379..18f8d3ba3 100644 --- a/src/platform/node/configuration/types/index.ts +++ b/src/platform/node/configuration/types/index.ts @@ -6,7 +6,7 @@ export interface ConfigurationInterface { saveModuleSettings: (moduleID: string, settings: ConfigurationValueInterface) => boolean; deleteModuleSettings: (moduleID: string) => boolean; getSettings: () => ConfigurationValueInterface; - getModuleSettings: (moduleID: string) => ConfigurationValueInterface; + getExtensionSettings: (moduleID: string) => ConfigurationValueInterface; } export interface ConfigurationValueInterface { diff --git a/src/platform/node/extension-manager/lib/core.ts b/src/platform/node/extension-manager/lib/core.ts index d738a03d2..bb9e85ed7 100644 --- a/src/platform/node/extension-manager/lib/core.ts +++ b/src/platform/node/extension-manager/lib/core.ts @@ -1,7 +1,6 @@ import * as path from 'path'; import { ModuleHandlerOptions, ModuleInfo } from '../types'; import { fileExists, readFile, readJson } from 'eo/shared/node/file'; -import { isNotEmpty } from 'eo/shared/common/common'; import { getLocaleData } from 'eo/platform/node/i18n'; import { LanguageService } from 'eo/app/electron-main/language.service'; import { TranslateService } from 'eo/platform/common/i18n'; @@ -53,24 +52,20 @@ export class CoreHandler { // Check that the file exists locally moduleInfo.introduction = readFile(path.join(baseDir, `README.${lang}.md`)) || readFile(path.join(baseDir, `README.md`)); - moduleInfo.main = 'file://' + path.join(moduleInfo.baseDir, moduleInfo.main); - if (moduleInfo.preload?.length > 0) { - moduleInfo.preload = path.join(moduleInfo.baseDir, moduleInfo.preload); + if(moduleInfo.main){ + moduleInfo.main = 'file://' + path.join(moduleInfo.baseDir, moduleInfo.main); } - if (moduleInfo.main_node?.length > 0) { - moduleInfo.main_node = path.join(moduleInfo.baseDir, moduleInfo.main_node); + if(moduleInfo.node){ + moduleInfo.node = 'file://' + path.join(moduleInfo.baseDir, moduleInfo.node); } if (moduleInfo.logo?.length > 0 && !moduleInfo.logo.startsWith('http') && !moduleInfo.logo.includes('icon-')) { moduleInfo.logo = 'file://' + path.join(moduleInfo.baseDir, moduleInfo.logo); } - if (!moduleInfo.belongs || !isNotEmpty(moduleInfo.belongs)) { - moduleInfo.belongs = ['default']; - } if (typeof moduleInfo.author === 'object') { moduleInfo.author = moduleInfo.author['name'] || ''; } } catch (e) { - console.log(`Get module ${moduleInfo?.moduleID} error:${e}`); + console.log(`Get module ${moduleInfo?.name} error:${e}`); moduleInfo = {} as ModuleInfo; } return moduleInfo; diff --git a/src/platform/node/extension-manager/lib/handler.ts b/src/platform/node/extension-manager/lib/handler.ts index da27f2c4d..3259c3dd7 100644 --- a/src/platform/node/extension-manager/lib/handler.ts +++ b/src/platform/node/extension-manager/lib/handler.ts @@ -86,11 +86,11 @@ export class ModuleHandler extends CoreHandler { */ private operatePackage(result: any[], moduleList: string[], action: Action) { if (Array.isArray(result)) { - const moduleNames = moduleList.map((n) => n.split('@')[0]); + const names = moduleList.map((n) => n.split('@')[0]); const packagePath = path.join(this.baseDir, 'package.json'); result.forEach(([name]) => { const [pkgName, pkgVersion] = name.split('@'); - if (moduleNames.includes(pkgName)) { + if (names.includes(pkgName)) { const packageJSON = fs.readFileSync(packagePath); const packageObj = JSON.parse(packageJSON.toString()); const dependencieKeys = Object.keys(packageObj.dependencies); @@ -115,7 +115,7 @@ export class ModuleHandler extends CoreHandler { return; } npmCli.commands[command](moduleList, (err, data) => { - console.log('command', command); + // console.log('command', command); process.chdir(this.baseDir); if (err) { return reject(err); @@ -135,9 +135,7 @@ export class ModuleHandler extends CoreHandler { args = args.concat(`--proxy=${this.proxy}`); } } - console.log(args); const npm = spawn('npm', args, { cwd: this.baseDir }); - // console.log('2==>', npm); let output = ''; npm.stdout .on('data', (data: string) => { diff --git a/src/platform/node/extension-manager/lib/loader.ts b/src/platform/node/extension-manager/lib/loader.ts deleted file mode 100644 index aecda76bc..000000000 --- a/src/platform/node/extension-manager/lib/loader.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { ModuleRuntime, ModuleType, ModuleInfo, ModuleLoaderInterface } from '../types'; - -/** - * 模块加载类 - * 根据运行环境加载模块 - */ -export class ModuleLoader implements ModuleLoaderInterface { - /** - * 模块运行时环境 - */ - private readonly runtime: ModuleRuntime; - - /** - * 模块加载方法 - */ - private readonly moduleRequire: any; - - constructor(_runtime: ModuleRuntime, _moduleRequire?: any) { - this.runtime = _runtime; - this.moduleRequire = _moduleRequire || require; - } - - /** - * 批量加载模块 - * @param modules - */ - loadModules(modules: Array): void { - modules.forEach((module: ModuleInfo) => { - this.loadModule(module); - }) - } - - /** - * 实际加载模块并运行 - * 需要检查模块的类型与运行环境匹配 - * main运行环境只能加载system和app模块 - * render运行环境只能加载ui和feature模块 - * web运行环境只能加载web支持的模块 - * @param module ModuleInfo - */ - loadModule(module: ModuleInfo): void { - if ((this.runtime === ModuleRuntime.main && ![ModuleType.system, ModuleType.app].indexOf(module.moduleType)) - || (this.runtime === ModuleRuntime.render && ![ModuleType.feature].indexOf(module.moduleType))) { - console.log(`The [${module.moduleType}] module [${module.name}] can not run in runtime [${this.runtime}].`); - return; - } - if (this.runtime === ModuleRuntime.main) { - console.log('load from main'); - const _module = this.moduleRequire(module.baseDir)(); - console.log(_module); - } else if (this.runtime === ModuleRuntime.render) { - console.log('load from render'); - const _module = this.moduleRequire(module.baseDir)(); - console.log(_module); - } else if (this.runtime === ModuleRuntime.web) { - console.log('load from web'); - // todo with script src - } - // 加入hooks列表 - } -} diff --git a/src/platform/node/extension-manager/lib/manager.ts b/src/platform/node/extension-manager/lib/manager.ts index 1eb8f43d1..f691c8875 100644 --- a/src/platform/node/extension-manager/lib/manager.ts +++ b/src/platform/node/extension-manager/lib/manager.ts @@ -1,12 +1,26 @@ import { MODULE_DIR as baseDir } from 'eo/shared/electron-main/constant'; import { ModuleHandler } from './handler'; -import { ModuleHandlerResult, ModuleInfo, ModuleManagerInfo, ModuleManagerInterface, ModuleType } from '../types'; +import { + ModuleHandlerResult, + ModuleInfo, + ModuleManagerInfo, + ModuleManagerInterface, + ExtensionTabView, + SidebarView, + FeatureInfo, +} from '../types'; import { isNotEmpty } from 'eo/shared/common/common'; -import { processEnv } from '../../constant'; import http from 'axios'; import { DATA_DIR } from '../../../../shared/electron-main/constant'; import { promises, readFileSync } from 'fs'; import { ELETRON_APP_CONFIG } from '../../../../enviroment'; +import { createServer } from 'http-server/lib/http-server'; +import path from 'node:path'; +import portfinder from 'portfinder'; +import { lstat } from 'fs/promises'; + +const extTabViewServerMap = new Map(); +const extSidebarViewServerMap = new Map(); // * npm pkg name const defaultExtension = [{ name: 'eoapi-export-openapi' }, { name: 'eoapi-import-openapi' }]; @@ -24,7 +38,7 @@ export class ModuleManager implements ModuleManagerInterface { /** * extension list */ - private installExtension = []; + private installExtension: ModuleManagerInfo[] = []; /** * 模块集合 @@ -34,7 +48,7 @@ export class ModuleManager implements ModuleManagerInterface { /** * 功能点集合 */ - private readonly features: Map>; + private readonly features: Map>; constructor() { this.moduleHandler = new ModuleHandler({ baseDir: baseDir }); @@ -43,7 +57,6 @@ export class ModuleManager implements ModuleManagerInterface { this.init(); this.updateAll(); } - async getRemoteExtension() { const { data } = await http.get(`${ELETRON_APP_CONFIG.EXTENSION_URL}/list`); return data.data.map(({ name, version }) => ({ name, version })); @@ -76,6 +89,12 @@ export class ModuleManager implements ModuleManagerInterface { const result = await this.moduleHandler.uninstall([{ name: module.name }], module.isLocal || false); if (result.code === 0) { this.delete(moduleInfo); + [extTabViewServerMap, extSidebarViewServerMap].forEach((item) => { + if (item.has(module.name)) { + item.get(module.name).server.close(); + item.delete(module.name); + } + }); } return result; } @@ -121,44 +140,13 @@ export class ModuleManager implements ModuleManagerInterface { this.refresh(module); }); } - /** - * 获取应用级app列表 - */ - getAppModuleList(): Array { - const output: Array = []; - const modules: Map = this.moduleBelongs(); - modules?.forEach((module: ModuleInfo) => { - if (module.isApp) { - (module.main = processEnv === 'development' && module.main_debug ? module.main_debug : module.main), - output.push(module); - } - }); - return output; - } - - /** - * 获取边栏应用列表 - */ - getSideModuleList(moduleID: string): Array { - const output: Array = []; - const modules: Map = this.moduleBelongs(); - modules.get(moduleID)?.sideItems?.forEach((_moduleID: string) => { - if (modules.has(_moduleID)) { - output.push(modules.get(_moduleID)); - } - }); - return output; - } /** * 获取所有模块列表 * belongs为true，返回关联子模块集合 * @param belongs */ - getModules(belongs: boolean = false): Map { - if (belongs) { - return this.moduleBelongs(); - } + getModules(): Map { return this.modules; } @@ -175,11 +163,8 @@ export class ModuleManager implements ModuleManagerInterface { * belongs为true，返回关联子模块集合 * @param belongs */ - getModule(moduleID: string, belongs: boolean = false): ModuleInfo { - if (belongs) { - return this.moduleBelongs().get(moduleID); - } - return this.modules.get(moduleID); + getModule(id: string): ModuleInfo { + return this.modules.get(id); } /** @@ -197,7 +182,7 @@ export class ModuleManager implements ModuleManagerInterface { */ private set(moduleInfo: ModuleInfo) { // 避免重置 - this.modules.set(moduleInfo.moduleID, moduleInfo); + this.modules.set(moduleInfo.name, moduleInfo); this.setFeatures(moduleInfo); } @@ -211,7 +196,7 @@ export class ModuleManager implements ModuleManagerInterface { if (!this.features.has(key)) { this.features.set(key, new Map()); } - this.features.get(key).set(moduleInfo.moduleID, { name: moduleInfo.name, ...value }); + this.features.get(key).set(moduleInfo.name, { extensionID: moduleInfo.name, ...value }); }); } } @@ -222,7 +207,7 @@ export class ModuleManager implements ModuleManagerInterface { */ private delete(moduleInfo: ModuleInfo) { // 避免删除核心 - this.modules.delete(moduleInfo.moduleID); + this.modules.delete(moduleInfo.name); this.deleteFeatures(moduleInfo); } @@ -234,7 +219,7 @@ export class ModuleManager implements ModuleManagerInterface { if (moduleInfo.features && typeof moduleInfo.features === 'object' && isNotEmpty(moduleInfo.features)) { for (const key in moduleInfo.features) { if (this.features.has(key)) { - this.features.get(key).delete(moduleInfo.moduleID); + this.features.get(key).delete(moduleInfo.name); } } } @@ -245,7 +230,7 @@ export class ModuleManager implements ModuleManagerInterface { * @param moduleInfo */ private setup(moduleInfo: ModuleInfo) { - if (moduleInfo && isNotEmpty(moduleInfo.moduleID)) { + if (moduleInfo && isNotEmpty(moduleInfo.name)) { this.set(moduleInfo); } } @@ -254,55 +239,86 @@ export class ModuleManager implements ModuleManagerInterface { * 读取本地package.json文件得到本地安装的模块列表，依次获取模块信息加入模块列表 */ private init() { - const moduleNames: string[] = this.moduleHandler.list(); - moduleNames.forEach((moduleName: string) => { + const names: string[] = this.moduleHandler.list(); + names.forEach((name: string) => { // 这里要加上try catch，避免异常 - const moduleInfo: ModuleInfo = this.moduleHandler.info(moduleName); + const moduleInfo: ModuleInfo = this.moduleHandler.info(name); this.setup(moduleInfo); }); } - /** - * 获取模块到上层模块后的模块列表 - * @returns - */ - private moduleBelongs(): Map { - const newModules: Map = new Map(); - const sideItems = new Map(); - this.modules?.forEach((module: ModuleInfo) => { - // 如果包含自己则是主应用 - // 后期加入权限限制是否能成为顶层应用 - const belongs: string[] = module.belongs || ['default']; - module.isApp = belongs.includes(module.moduleID); - newModules.set(module.moduleID, module); - belongs.forEach((belong: string) => { - // let _modules: string[]; - if (module.moduleType === ModuleType.app) { - /* - if (!sideItems.has(belong)) { - _modules = []; - } else { - _modules = sideItems.get(belong); - } - */ - const _modules: string[] = sideItems.get(belong) || []; - // 如果指定上层是自己，自己放最前面 - if (module.moduleID === belong) { - _modules.unshift(module.moduleID); - } else { - _modules.push(module.moduleID); - } - sideItems.set(belong, _modules); + + getExtFeatures(extName: string) {} + + async getExtPageInfo( + extName: string, + featureName: string, + ServerMap: typeof extSidebarViewServerMap + ): Promise { + try { + const extPath = this.moduleHandler.getModuleDir(extName); + const stats = await lstat(extPath); + const feature = require(path.join(extPath, 'package.json')).features[featureName]; + // 是否为软连接，是则为本地开发，需要提供本地开发web服务地址 + if (stats.isSymbolicLink()) { + if (feature?.debugUrl) { + return { + url: feature?.debugUrl, + ...feature, + }; } - }); - }); - sideItems?.forEach((value: Array, key: string) => { - const _current: ModuleInfo = newModules.get(key); - if (_current && _current.isApp) { - _current.sideItems = value; - newModules.set(key, _current); } - }); - return newModules; + // 生产环境需要提供 html 入口文件地址(pageEntry字段) + if (feature?.url) { + if (ServerMap.has(extName)) { + return ServerMap.get(extName); + } + const port = await portfinder.getPortPromise(); + const pageDir = path.parse(path.join(extPath, feature?.url)).dir; + console.log('extension pageDir', pageDir); + const server = createServer({ root: pageDir }); + server.listen(port); + const url = `http://127.0.0.1:${port}`; + ServerMap.set(extName, { + ...feature, + url, + server, + }); + return ServerMap.get(extName); + } + return Promise.reject('该插件package.json缺少sidebarView字段'); + } catch (error) { + return Promise.reject(error); + } + } + setupExtensionPageServer() {} + async getExtTabs(extName: string): Promise { + const result = []; + for (let index = 0; index < this.installExtension.length; index++) { + try { + const sidebarView = await this.getExtPageInfo( + this.installExtension[index].name, + 'sidebarView', + extSidebarViewServerMap + ); + result.push(sidebarView); + } catch (error) {} + } + return result; + } + + async getSidebarViews(): Promise { + const result = []; + for (let index = 0; index < this.installExtension.length; index++) { + try { + const sidebarView = await this.getExtPageInfo( + this.installExtension[index].name, + 'sidebarView', + extSidebarViewServerMap + ); + result.push(sidebarView); + } catch (error) {} + } + return result; } } diff --git a/src/platform/node/extension-manager/types/handler.ts b/src/platform/node/extension-manager/types/handler.ts index 8b14d2c13..a6bf52083 100644 --- a/src/platform/node/extension-manager/types/handler.ts +++ b/src/platform/node/extension-manager/types/handler.ts @@ -1,3 +1,5 @@ +import { ModuleInfo } from "eo/platform/node/extension-manager/types"; + /** * 模块管理器配置 * baseDir 模块安装目录 @@ -17,3 +19,32 @@ export interface ModuleHandlerResult { code: number; data: string; } + +/** + * 模块管理信息 + * name 模块名称 + * isLocal 是否本地模块 (本地调用link, unlink安装与卸载) + */ +export interface ModuleManagerInfo { + name: string; + isLocal?: boolean; +} +/** + * 模块管理 + * install 安装模块 + * uninstall 卸载模块 + * refresh 重新从本地读取并更新模块信息 + * getModules 获取所有模块列表，或返回有模块关联子模块的信息 + */ +export interface ModuleManagerInterface { + installExt: any; + install: (module: ModuleManagerInfo) => Promise; + uninstall: (module: ModuleManagerInfo) => Promise; + refresh: (module: ModuleManagerInfo) => void; + refreshAll: () => void; + getModule: (id: string) => ModuleInfo; + getModules: () => Map; + getFeature: (featureKey: string) => Map; + getFeatures: () => Map>; + setupExtensionPageServer: (extName: string) => any; +} diff --git a/src/platform/node/extension-manager/types/index.ts b/src/platform/node/extension-manager/types/index.ts index c5055170a..bcd3f637e 100644 --- a/src/platform/node/extension-manager/types/index.ts +++ b/src/platform/node/extension-manager/types/index.ts @@ -1,3 +1,2 @@ export * from './handler'; -export * from './manager'; -export * from './loader'; +export * from './module'; diff --git a/src/platform/node/extension-manager/types/loader.ts b/src/platform/node/extension-manager/types/loader.ts deleted file mode 100644 index 440a7407f..000000000 --- a/src/platform/node/extension-manager/types/loader.ts +++ /dev/null @@ -1,18 +0,0 @@ -import {ModuleInfo} from './manager'; - -/** - * 模块加载接口. - */ -export interface ModuleLoaderInterface { - loadModules: (modules: Array) => void; - loadModule: (module: ModuleInfo) => void; -} - -/** - * 模块运行环境 - */ -export enum ModuleRuntime { - main = 'main', - render = 'render', - web = 'web' -} diff --git a/src/platform/node/extension-manager/types/manager.ts b/src/platform/node/extension-manager/types/manager.ts deleted file mode 100644 index a689549e4..000000000 --- a/src/platform/node/extension-manager/types/manager.ts +++ /dev/null @@ -1,131 +0,0 @@ -import { SidePosition } from 'eo/shared/common/bounds'; -import { ModuleHandlerResult } from './handler'; - -/** - * 模块类型 - * system 系统模块 - * app 应用模块 - * ui 页面模块 - * feature 功能模块 - */ -export enum ModuleType { - system = 'system', - app = 'app', - feature = 'feature', -} -export interface I18nLocale { - locale: string; - package: any; -} -/** - * 模块信息接口 - */ -export interface ModuleInfo { - // npm package name - name: string; - // author - author: string; - // extension version - version: string; - // extension description - description: string; - // extension intro,from README.md - introduction: string; - // extension ID - moduleID: string; - // extension name - moduleName: string; - // extension type - //!TODO what usage - moduleType: ModuleType; - // extension logo - logo: string; - // manifest code file - main: string; - // main node script - main_node?: string; - // 入口开发调试 - main_debug?: string; - // inject script before start app - preload?: string; - // 判断是不是顶层App - //!TODO use feature contribution to control page - isApp?: boolean; - - // 模块对应上层模块ID - //!TODO what usage? - belongs?: Array; - // 下层关联模块ID集合 - //!TODO what usage? - sideItems?: Array; - // 模块路径 - baseDir?: string; - // 配置项 - configuration?: ModuleConfiguration; - /** 贡献点 */ - contributes: ModuleContributes; - // 功能点配置 - features?: { - [index: string]: any; - }; - i18n?: I18nLocale[]; -} -/** - * 贡献点 - */ - -export type ModuleContributes = { - configuration: ModuleConfiguration; -}; - -/** - * 模块配置项接口 - */ -export interface ModuleConfiguration { - title: string; - properties: { - [index: string]: ModuleConfigurationField; - }; -} - -/** - * 模块配置项目字段接口 - */ -export interface ModuleConfigurationField { - type: string | Array; - default: string | number | null; - label: string; - description?: string; - required?: boolean; -} - -/** - * 模块管理信息 - * name 模块名称 - * isLocal 是否本地模块 (本地调用link, unlink安装与卸载) - */ -export interface ModuleManagerInfo { - name: string; - isLocal?: boolean; -} - -/** - * 模块管理 - * install 安装模块 - * uninstall 卸载模块 - * refresh 重新从本地读取并更新模块信息 - * getModules 获取所有模块列表，或返回有模块关联子模块的信息 - */ -export interface ModuleManagerInterface { - installExt: any; - install: (module: ModuleManagerInfo) => Promise; - uninstall: (module: ModuleManagerInfo) => Promise; - refresh: (module: ModuleManagerInfo) => void; - refreshAll: () => void; - getModule: (moduleID: string, belongs?: boolean) => ModuleInfo; - getModules: (belongs?: boolean) => Map; - getAppModuleList: () => Array; - getSideModuleList: (moduleID: string) => Array; - getFeature: (featureKey: string) => Map; - getFeatures: () => Map>; -} diff --git a/src/platform/node/extension-manager/types/module.ts b/src/platform/node/extension-manager/types/module.ts new file mode 100644 index 000000000..0342f744f --- /dev/null +++ b/src/platform/node/extension-manager/types/module.ts @@ -0,0 +1,113 @@ +import { createServer } from 'http-server/lib/http-server'; + +export type FeatureInfo = { + icon: string; + title: string; + description: string; + //Function name + action: string; + //ExportAPI.Filename + filename?: string; + + //*Field for browser generate by code,not actually in package.json + extensionID: string; + //!Will deprecated + label: string; +}; + +/** + * 模块信息接口 + */ +export interface ModuleInfo { + //Unique npm package name + name: string; + version: string; + author: string | { name: 'string' }; + //Entry js file,webRender enviroment + main: string; + // extension description + description: string; + + //* Eoapi extend + //Entry js file,node enviroment + node: string; + title: string; + // extension logo + logo: string; + //Contribution Feature + features?: { + configuration: ModuleConfiguration; + i18n?: I18nLocale; + extensionTabView: ExtensionTabView; + sidebarView: SidebarView; + importAPI: FeatureInfo; + exportAPI: FeatureInfo; + syncAPI: FeatureInfo; + + //Random feature + [index: string]: any; + + //!Will Deprecated + 'apimanage.export': FeatureInfo; + 'apimanage.import': FeatureInfo; + 'apimanage.sync': FeatureInfo; + }; + + //*Field for browser generate by code,not actually in package.json + //Extension intro,from README.md + introduction: string; + //file location + baseDir: string; + + //*Only exist in HTTP request(from extension server) moduleInfo + i18n: { + locale: string; + package: any | object; + }[]; + //!Will Deprecated + // 模块ID，用于关联 + moduleID: string; + // 模块名称，用于显示 + moduleName: string; +} + +/** + * 模块配置项接口 + */ +interface ModuleConfiguration { + title: string; + properties: { + [index: string]: ModuleConfigurationField; + }; +} + +/** + * 模块配置项目字段接口 + */ +interface ModuleConfigurationField { + type: string | Array; + default: string | number | null; + label: string; + description?: string; + required?: boolean; +} +export type ExtensionTabView = { + name: string; + url: string; + debugUrl: string; + server: HttpServer; +}; + +type HttpServer = ReturnType; +export type SidebarView = { + icon: string; + title: string; + url: string; + debugUrl: string; + server: HttpServer; +}; + +export interface I18nLocale { + sourceLocale: string; + locales: string[]; +} diff --git a/src/platform/node/i18n.ts b/src/platform/node/i18n.ts index 881058fe0..a010226a8 100644 --- a/src/platform/node/i18n.ts +++ b/src/platform/node/i18n.ts @@ -1,4 +1,4 @@ -import { I18nLocale, ModuleInfo } from 'eo/platform/node/extension-manager'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; interface LooseObject { [key: string]: any; @@ -6,7 +6,7 @@ interface LooseObject { const localeStorage: LooseObject = {}; /** * Get locale file from extension i18 file dir - * @param moduleID + * @param module * @returns json */ function getLocaleFile(module: ModuleInfo, lang): Object { @@ -26,12 +26,14 @@ function getSupportLang(module: ModuleInfo) { export function getLocaleData(module: ModuleInfo, lang): Object | null { let supportLang = getSupportLang(module); if (!supportLang.includes(lang)) { - console.log(`Error: extenaion ${module.moduleID} can't find the i18n package ${lang}`); + console.error(`Error: extension ${module.title || module.moduleName} can't find the i18n package ${lang}`); return null; } - localeStorage[module.moduleID] = localeStorage[module.moduleID] || {}; - if (!localeStorage[module.moduleID][lang]) { - localeStorage[module.moduleID][lang] = getLocaleFile(module, lang); + //Get and storage locale data + localeStorage[module.name] = localeStorage[module.name] || {}; + if (!localeStorage[module.name][lang]) { + localeStorage[module.name][lang] = getLocaleFile(module, lang); } - return localeStorage[module.moduleID][lang]; + + return localeStorage[module.name][lang]; } diff --git a/src/platform/node/mock-server/index.ts b/src/platform/node/mock-server/index.ts index 7eef62279..7013a779a 100644 --- a/src/platform/node/mock-server/index.ts +++ b/src/platform/node/mock-server/index.ts @@ -69,7 +69,7 @@ export class MockServer { this.app.all('/mock/:mockID/*', (req, res, next) => { // if (!protocolReg.test(req.url)) { // match request type - const isMatchType = this.configuration.getModuleSettings('eoapi-features.mock.matchType'); + const isMatchType = this.configuration.getExtensionSettings('eoapi-features.mock.matchType'); if (req.params.mockID || isMatchType !== false) { this.view.webContents.send('getMockApiList', JSON.parse(jsonStringify(req))); ipcMain.once('getMockApiList', (event, message) => { @@ -93,7 +93,7 @@ export class MockServer { this.app.all('/:workspaceID/:projectID/mock/:mockID/*', (req, res, next) => { // if (!protocolReg.test(req.url)) { // match request type - const isMatchType = this.configuration.getModuleSettings('eoapi-features.mock.matchType'); + const isMatchType = this.configuration.getExtensionSettings('eoapi-features.mock.matchType'); if (req.params.mockID || isMatchType !== false) { this.view.webContents.send('getMockApiList', JSON.parse(jsonStringify(req))); ipcMain.once('getMockApiList', (event, message) => { diff --git a/src/shared/common/bounds.ts b/src/shared/common/bounds.ts deleted file mode 100644 index 3f5676876..000000000 --- a/src/shared/common/bounds.ts +++ /dev/null @@ -1,93 +0,0 @@ -/** - * 边栏放置位置 - */ -export enum SidePosition { - left = 'left', - right = 'right', - top = 'top', - bottom = 'bottom' -}; - -/** - * 视图区域 - */ -export enum ViewZone { - top = 'top', - bottom = 'bottom', - side = 'side', - main = 'main' -} - -/** - * 视图尺寸、位置 - */ -export interface ViewBounds { - x: number; - y: number; - width: number; - height: number; -} - -/** - * 获取某个显示区域的bounds - * @param zone - * @param width - * @param height - * @param sidePosition - */ -export const getViewBounds = (zone: ViewZone, width: number, height: number, sidePosition?: SidePosition, sideWidth?: number): ViewBounds => { - return calculateViewBounds(width, height, sidePosition, sideWidth).get(zone); -}; - -/** - * 根据容器的尺寸计算所有显示区域的尺寸与位置 - * TODO：需要加上隐藏边栏的属性参数判断 - * @param width - * @param height - * @param sidePosition - */ -export const calculateViewBounds = (width: number, height: number, sidePosition?: SidePosition, sideWidth?: number): Map => { - const position: SidePosition = sidePosition || SidePosition.left; - const _topHeight: number = 50; - const _bottomHeight: number = 0; - const _sideWidth: number = sideWidth || 50; - const _mainHeight: number = height - _topHeight - _bottomHeight; - let topBounds: ViewBounds = {x: 0, y: 0, width: width, height: _topHeight}; - let bottomBounds: ViewBounds = {x: 0, y: (height - _bottomHeight), width: width, height: _bottomHeight}; - let sideBounds: ViewBounds = {x: 0, y: 0, width: _sideWidth, height: _mainHeight }; - let mainBounds: ViewBounds = {x: 0, y: 0, width: width, height: _mainHeight}; - switch (position) { - case SidePosition.left: - sideBounds.y = topBounds.height; - mainBounds.x = sideBounds.width; - mainBounds.y = topBounds.height; - mainBounds.width -= mainBounds.x; - break; - case SidePosition.right: - sideBounds.y = topBounds.height; - sideBounds.x = width - sideBounds.width; - mainBounds.y = topBounds.height; - mainBounds.width = sideBounds.x; - break; - case SidePosition.top: - sideBounds.height = sideBounds.width; - sideBounds.width = width; - sideBounds.y = topBounds.height; - mainBounds.height = height - topBounds.height - sideBounds.height - bottomBounds.height; - mainBounds.y = topBounds.height + sideBounds.height; - break; - case SidePosition.bottom: - sideBounds.height = sideBounds.width; - sideBounds.width = width; - mainBounds.y = topBounds.height; - mainBounds.height -= sideBounds.height; - sideBounds.y = topBounds.height + mainBounds.height; - break; - } - return new Map([ - [ViewZone.top, topBounds], - [ViewZone.bottom, bottomBounds], - [ViewZone.side, sideBounds], - [ViewZone.main, mainBounds] - ]); -}; diff --git a/src/workbench/browser/.gitignore b/src/workbench/browser/.gitignore index fdb3a6a24..ff71a5ad7 100644 --- a/src/workbench/browser/.gitignore +++ b/src/workbench/browser/.gitignore @@ -12,6 +12,7 @@ src/**/*.js !src/ng1/**/*.js !src/assets/libs/*.js *.js.map +proxy.conf.json # dependencies node_modules diff --git a/src/workbench/browser/angular.json b/src/workbench/browser/angular.json index 3db91b5a3..023ba775b 100644 --- a/src/workbench/browser/angular.json +++ b/src/workbench/browser/angular.json @@ -1 +1 @@ -{"$schema":"./node_modules/@angular/cli/lib/config/schema.json","cli":{"analytics":false,"defaultCollection":"@angular-eslint/schematics"},"version":1,"newProjectRoot":"projects","projects":{"eoapi":{"root":"","i18n":{"sourceLocale":{"code":"en","baseHref":""},"locales":{"zh":{"translation":"src/locale/messages.zh.xlf","baseHref":""}}},"sourceRoot":"src","projectType":"application","schematics":{"@schematics/angular:application":{"strict":true}},"architect":{"build":{"builder":"@angular-builders/custom-webpack:browser","options":{"localize":true,"aot":true,"outputPath":"dist","index":"src/index.html","main":"src/main.ts","tsConfig":"src/tsconfig.app.json","polyfills":"src/polyfills.ts","assets":["src/icon.ico","src/assets",{"glob":"**/*","input":"../../../node_modules/monaco-editor/min/vs","output":"/assets/vs/"}],"styles":[{"input":"src/assets/theme/classic_forest.scss","bundleName":"classic_forest","inject":false},"src/assets/theme/antd.less","src/styles.scss","src/assets/font/iconfont.css","src/ng1/index.css"],"scripts":["src/ng1/lib/angular/angular.js","src/ng1/app.module.js","src/ng1/component/select-default.js","src/ng1/component/sort-and-filter.js","src/ng1/component/auto-complete.js","src/ng1/component/list-block.js","src/ng1/directive/get-dom-length.directive.js","src/ng1/directive/drop-down-menu.directive.js","src/ng1/directive/sort.directive.js","src/ng1/directive/drop-change-space.directive.js","src/ng1/directive/inner-html.directive.js","src/ng1/directive/insert-html.directive.js","src/ng1/directive/copy-common.directive.js","src/assets/libs/protocolcheck.js"],"customWebpackConfig":{"path":"./angular.webpack.js","replaceDuplicatePlugins":true},"allowedCommonJsDependencies":["brace","qs","rxjs"]},"configurations":{"dev":{"optimization":false,"outputHashing":"none","sourceMap":true,"namedChunks":false,"localize":false,"extractLicenses":true,"vendorChunk":false,"buildOptimizer":false,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.dev.ts"}]},"devCn":{"optimization":false,"outputHashing":"none","sourceMap":true,"namedChunks":false,"localize":["zh"],"extractLicenses":true,"vendorChunk":false,"buildOptimizer":false,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.dev.ts"}]},"production":{"optimization":true,"outputHashing":"all","sourceMap":false,"namedChunks":false,"extractLicenses":true,"vendorChunk":false,"buildOptimizer":true,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.prod.ts"}]}}},"serve":{"builder":"@angular-builders/custom-webpack:dev-server","options":{"browserTarget":"eoapi:build"},"configurations":{"dev":{"browserTarget":"eoapi:build:dev"},"devCn":{"browserTarget":"eoapi:build:devCn"},"production":{"browserTarget":"eoapi:build:production"}}},"extract-i18n":{"builder":"@angular-devkit/build-angular:extract-i18n","options":{"browserTarget":"eoapi:build"}},"test":{"builder":"@angular-builders/custom-webpack:karma","options":{"main":"src/test.ts","polyfills":"src/polyfills-test.ts","tsConfig":"src/tsconfig.spec.json","karmaConfig":"src/karma.conf.js","scripts":[],"styles":["src/styles.scss"],"assets":["src/assets"],"customWebpackConfig":{"path":"./angular.webpack.js","replaceDuplicatePlugins":true}}},"lint":{"builder":"@angular-eslint/builder:lint","options":{"lintFilePatterns":["src/**/*.ts","src/**/*.html"]}}}},"eoapi-e2e":{"root":"e2e","projectType":"application","architect":{"lint":{"builder":"@angular-eslint/builder:lint","options":{"lintFilePatterns":["e2e/**/*.ts"]}}}}},"defaultProject":"eoapi","schematics":{"@schematics/angular:component":{"prefix":"eo","style":"scss"},"@schematics/angular:directive":{"prefix":"eo"}}} +{"$schema":"./node_modules/@angular/cli/lib/config/schema.json","cli":{"analytics":false,"defaultCollection":"@angular-eslint/schematics"},"version":1,"newProjectRoot":"projects","projects":{"eoapi":{"root":"","i18n":{"sourceLocale":{"code":"en","baseHref":""},"locales":{"zh":{"translation":"src/locale/messages.zh.xlf","baseHref":""}}},"sourceRoot":"src","projectType":"application","schematics":{"@schematics/angular:application":{"strict":true}},"architect":{"build":{"builder":"@angular-builders/custom-webpack:browser","options":{"localize":true,"aot":true,"outputPath":"dist","index":"src/index.html","main":"src/main.ts","tsConfig":"src/tsconfig.app.json","polyfills":"src/polyfills.ts","assets":["src/icon.ico","src/assets",{"glob":"**/*","input":"../../../node_modules/monaco-editor/min/vs","output":"/assets/vs/"}],"styles":[{"input":"src/assets/theme/classic_forest.scss","bundleName":"classic_forest","inject":false},"src/assets/theme/antd.less","src/styles.scss","src/assets/font/iconfont.css","src/ng1/index.css"],"scripts":["src/ng1/lib/angular/angular.js","src/ng1/app.module.js","src/ng1/component/select-default.js","src/ng1/component/sort-and-filter.js","src/ng1/component/auto-complete.js","src/ng1/component/list-block.js","src/ng1/directive/get-dom-length.directive.js","src/ng1/directive/drop-down-menu.directive.js","src/ng1/directive/sort.directive.js","src/ng1/directive/drop-change-space.directive.js","src/ng1/directive/inner-html.directive.js","src/ng1/directive/insert-html.directive.js","src/ng1/directive/copy-common.directive.js","src/assets/libs/protocolcheck.js"],"customWebpackConfig":{"path":"./angular.webpack.js","replaceDuplicatePlugins":true},"allowedCommonJsDependencies":["brace","qs","rxjs"]},"configurations":{"dev":{"optimization":false,"outputHashing":"none","sourceMap":true,"namedChunks":false,"localize":false,"extractLicenses":true,"vendorChunk":false,"buildOptimizer":false,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.dev.ts"}]},"devCn":{"optimization":false,"outputHashing":"none","sourceMap":true,"namedChunks":false,"localize":["zh"],"extractLicenses":true,"vendorChunk":false,"buildOptimizer":false,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.dev.ts"}]},"production":{"optimization":true,"outputHashing":"all","sourceMap":false,"namedChunks":false,"extractLicenses":true,"vendorChunk":false,"buildOptimizer":true,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.prod.ts"}]},"docker":{"optimization":true,"outputHashing":"all","sourceMap":false,"namedChunks":false,"extractLicenses":true,"vendorChunk":false,"buildOptimizer":true,"fileReplacements":[{"replace":"src/environments/environment.ts","with":"src/environments/environment.docker.ts"}]}}},"serve":{"builder":"@angular-builders/custom-webpack:dev-server","options":{"browserTarget":"eoapi:build"},"configurations":{"dev":{"browserTarget":"eoapi:build:dev"},"devCn":{"browserTarget":"eoapi:build:devCn"},"production":{"browserTarget":"eoapi:build:production"}}},"extract-i18n":{"builder":"@angular-devkit/build-angular:extract-i18n","options":{"browserTarget":"eoapi:build"}},"test":{"builder":"@angular-builders/custom-webpack:karma","options":{"main":"src/test.ts","polyfills":"src/polyfills-test.ts","tsConfig":"src/tsconfig.spec.json","karmaConfig":"src/karma.conf.js","scripts":[],"styles":["src/styles.scss"],"assets":["src/assets"],"customWebpackConfig":{"path":"./angular.webpack.js","replaceDuplicatePlugins":true}}},"lint":{"builder":"@angular-eslint/builder:lint","options":{"lintFilePatterns":["src/**/*.ts","src/**/*.html"]}}}},"eoapi-e2e":{"root":"e2e","projectType":"application","architect":{"lint":{"builder":"@angular-eslint/builder:lint","options":{"lintFilePatterns":["e2e/**/*.ts"]}}}}},"defaultProject":"eoapi","schematics":{"@schematics/angular:component":{"prefix":"eo","style":"scss"},"@schematics/angular:directive":{"prefix":"eo"}}} \ No newline at end of file diff --git a/src/workbench/browser/build/build.js b/src/workbench/browser/build/build.js index 52b259613..a608d74eb 100644 --- a/src/workbench/browser/build/build.js +++ b/src/workbench/browser/build/build.js @@ -1,6 +1,9 @@ const fs = require('fs'); const { execSync } = require('child_process'); class webPlatformBuilder { + constructor(environment) { + this.environment = environment; + } resetBuildConfig(json) { delete json.projects.eoapi.i18n.sourceLocale.baseHref; Object.keys(json.projects.eoapi.i18n.locales).forEach((val) => { @@ -9,7 +12,7 @@ class webPlatformBuilder { return json; } executeBuild() { - execSync('ng build -c production', { stdio: 'inherit' }); + execSync(`ng build -c ${this.environment}`, { stdio: 'inherit' }); fs.writeFile( './dist/index.html', ` @@ -22,7 +25,7 @@ class webPlatformBuilder { try{ lang=JSON.parse(window.localStorage.getItem("LOCAL_SETTINGS_KEY"))["eoapi-language"]=='en-US'?'en':'zh'; }catch(e){ - + } let baseDir="/"+lang+'/' let search={}; @@ -53,10 +56,10 @@ class appPlatformBuilder { } } class PlatformBuilder { - constructor(platForm) { + constructor(platForm, environment) { switch (platForm) { case 'web': { - this.instance = new webPlatformBuilder(); + this.instance = new webPlatformBuilder(environment); break; } case 'app': { @@ -79,5 +82,6 @@ class PlatformBuilder { } } let platform = process.argv[2] || 'app'; -let platformBuilder = new PlatformBuilder(platform); +let environment = process.argv[3] || 'production'; +let platformBuilder = new PlatformBuilder(platform, environment); platformBuilder.build(); diff --git a/src/workbench/browser/elements/apiContent.ts b/src/workbench/browser/elements/apiContent.ts new file mode 100644 index 000000000..c56000198 --- /dev/null +++ b/src/workbench/browser/elements/apiContent.ts @@ -0,0 +1,21 @@ +import { Render } from 'ecode/dist/render'; + +export class ApiContent extends Render { + constructor() { + super({ children: [] }); + } + render() { + return { + type: 'element', + imports: [ + { + target: [{ name: 'ApiModule', type: 'module' }], + from: 'eo/workbench/browser/src/app/pages/api/api.module', + }, + ], + template: ``, + data: [], + methods: [], + }; + } +} diff --git a/src/workbench/browser/elements/index.ts b/src/workbench/browser/elements/index.ts index 1ac137b30..9d53f95a4 100644 --- a/src/workbench/browser/elements/index.ts +++ b/src/workbench/browser/elements/index.ts @@ -28,3 +28,4 @@ export { HTTPS } from './service/httpS'; // * 业务 export { ManageAccess } from './manageAccess'; +export { ApiContent } from './apiContent'; diff --git a/src/workbench/browser/elements/service/eventS.ts b/src/workbench/browser/elements/service/eventS.ts index 60741c893..5134cafe8 100644 --- a/src/workbench/browser/elements/service/eventS.ts +++ b/src/workbench/browser/elements/service/eventS.ts @@ -22,7 +22,7 @@ export class EventS extends Render { `; } send(name, data = '{}') { - return `this.message.send({type: '${name}', data: ${data}})`; + return EventS.send(name, (data = '{}')); } render() { return { @@ -47,4 +47,7 @@ export class EventS extends Render { methods: [], }; } + static send(name, data = '{}') { + return `this.message.send({ type: '${name}', data: ${data} })`; + } } diff --git a/src/workbench/browser/elements/tree.ts b/src/workbench/browser/elements/tree.ts index a69019fbd..0f0bcae85 100644 --- a/src/workbench/browser/elements/tree.ts +++ b/src/workbench/browser/elements/tree.ts @@ -1,21 +1,107 @@ import { Render } from 'ecode/dist/render'; export class Tree extends Render { - constructor({ data }) { + id; + showline; + clickMethod; + constructor({ id, showline = false, click = [] }) { super({ children: [] }); + this.id = Render.toCamel(id); + this.showline = showline; + this.clickMethod = Render.callbackRender(click); + } + setData(data) { + return Tree.setData(this.id, data); } render() { + const mainMethods = [ + `async handleClickTree${this.id}Data($event) { + ${this.clickMethod} + }`, + ]; return { type: 'element', imports: [ { - target: [{ name: 'NzTreeModule', type: 'module' }], - from: 'ng-zorro-antd/tree', + target: [{ name: 'ApiModule', type: 'module' }], + from: 'eo/workbench/browser/src/app/pages/api/api.module', }, ], - template: ``, - data: [], - methods: [], + template: ``, + data: [ + // { + // name: `tree${this.id}Data`, + // init: `[ + // { + // title: '0-0', + // key: '00', + // expanded: true, + // children: [ + // { + // title: '0-0-0', + // key: '000', + // expanded: true, + // children: [ + // { title: '0-0-0-0', key: '0000', isLeaf: true }, + // { title: '0-0-0-1', key: '0001', isLeaf: true }, + // { title: '0-0-0-2', key: '0002', isLeaf: true } + // ] + // }, + // { + // title: '0-0-1', + // key: '001', + // children: [ + // { title: '0-0-1-0', key: '0010', isLeaf: true }, + // { title: '0-0-1-1', key: '0011', isLeaf: true }, + // { title: '0-0-1-2', key: '0012', isLeaf: true } + // ] + // }, + // { + // title: '0-0-2', + // key: '002' + // } + // ] + // }, + // { + // title: '0-1', + // key: '01', + // children: [ + // { + // title: '0-1-0', + // key: '010', + // children: [ + // { title: '0-1-0-0', key: '0100', isLeaf: true }, + // { title: '0-1-0-1', key: '0101', isLeaf: true }, + // { title: '0-1-0-2', key: '0102', isLeaf: true } + // ] + // }, + // { + // title: '0-1-1', + // key: '011', + // children: [ + // { title: '0-1-1-0', key: '0110', isLeaf: true }, + // { title: '0-1-1-1', key: '0111', isLeaf: true }, + // { title: '0-1-1-2', key: '0112', isLeaf: true } + // ] + // } + // ] + // }, + // { + // title: '0-2', + // key: '02', + // isLeaf: true + // } + // ]`, + // type: ['any[]'], + // }, + ], + init: [], + methods: [...mainMethods], }; } + static setData(id, data) { + return ` + \/\/ * set tree data + this.tree${Render.toCamel(id)}Data = ${data}`; + } } diff --git a/src/workbench/browser/package.json b/src/workbench/browser/package.json index 844e366ac..c5b16f416 100644 --- a/src/workbench/browser/package.json +++ b/src/workbench/browser/package.json @@ -8,7 +8,8 @@ "start:zh": "ng serve -c devCn -o", "build": "node ./build/build.js", "build:web": "node ./build/build.js web", - "ng:serve": "ng serve -c dev -o", + "build:docker:web": "node ./build/build.js web docker", + "ng:serve": "ng serve -c dev -o --proxy-config=proxy.conf.json", "lang:gen": "ng extract-i18n --output-path src/locale", "test": "ng test --watch=false", "test:watch": "ng test", @@ -32,6 +33,7 @@ "@angular/upgrade": "^14.0.3", "@ant-design/icons-angular": "14.1.0", "@babel/runtime": "7.18.3", + "@micro-zoe/micro-app": "1.0.0-alpha.9", "@ngxs/store": "3.7.4", "ajv": "8.11.0", "js-beautify": "1.14.4", diff --git a/src/workbench/browser/proxy.conf.json b/src/workbench/browser/proxy.conf.json deleted file mode 100644 index 18b2d1c11..000000000 --- a/src/workbench/browser/proxy.conf.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "/api": { - "target": "https://290135738u.oicp.vip/", - "secure": false, - "pathRewrite": { - "^/api": "" - }, - "logLevel": "debug" - } -} diff --git a/src/workbench/browser/src/app/app-routing.module.ts b/src/workbench/browser/src/app/app-routing.module.ts index 01b0a5d08..16515b4d6 100644 --- a/src/workbench/browser/src/app/app-routing.module.ts +++ b/src/workbench/browser/src/app/app-routing.module.ts @@ -1,6 +1,7 @@ -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { PageNotFoundComponent } from './shared/components'; +import { APP_BASE_HREF } from '@angular/common'; const routes: Routes = [ { @@ -23,5 +24,9 @@ const routes: Routes = [ RouterModule.forRoot(routes, { useHash: !!(window && window.process && window.process.type) ? true : false }), ], exports: [RouterModule], + // 👇 设置基础路由 + providers: [ + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }) export class AppRoutingModule {} diff --git a/src/workbench/browser/src/app/app.component.ts b/src/workbench/browser/src/app/app.component.ts index 301a34e6a..68e070249 100644 --- a/src/workbench/browser/src/app/app.component.ts +++ b/src/workbench/browser/src/app/app.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ElectronService, ThemeService } from './core/services'; -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { ThemeService } from './core/services'; +import { WebExtensionService } from 'eo/workbench/browser/src/app/shared/services/web-extension/webExtension.service'; @Component({ selector: 'eo-root', @@ -10,12 +10,11 @@ import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/ `, }) export class AppComponent { - constructor(private theme: ThemeService, private dataSource: DataSourceService, private electron: ElectronService) { + constructor( + private theme: ThemeService, + private webExtensionService: WebExtensionService + ) { + this.webExtensionService.init(); this.theme.changeTheme(); - //Check Connection at fisrt - if (!this.dataSource.isRemote || !this.electron.isElectron) { - return; - } - this.dataSource.checkRemoteAndTipModal(); } } diff --git a/src/workbench/browser/src/app/app.module.ts b/src/workbench/browser/src/app/app.module.ts index 08f2fca47..5d2deec61 100644 --- a/src/workbench/browser/src/app/app.module.ts +++ b/src/workbench/browser/src/app/app.module.ts @@ -1,9 +1,10 @@ import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { NgModule, LOCALE_ID } from '@angular/core'; +import { NgModule, LOCALE_ID, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { EouiModule } from 'eo/workbench/browser/src/app/eoui/eoui.module'; import { CommonModule } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; //Other module import { CoreModule } from './core/core.module'; @@ -17,7 +18,6 @@ import { UpgradeModule } from '@angular/upgrade/static'; import { IndexedDBStorage } from 'eo/workbench/browser/src/app/shared/services/storage/IndexedDB/lib/'; import { HttpStorage } from 'eo/workbench/browser/src/app/shared/services/storage/http/lib'; import { StorageService } from 'eo/workbench/browser/src/app/shared/services/storage'; -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -33,13 +33,16 @@ import { registerLocaleData } from '@angular/common'; import { en_US, NZ_I18N, zh_CN } from 'ng-zorro-antd/i18n'; import en from '@angular/common/locales/en'; import zh from '@angular/common/locales/zh'; +import { Vue3Component } from 'eo/workbench/browser/src/app/pages/vue3/vue3.component'; registerLocaleData(en); registerLocaleData(zh); @NgModule({ - declarations: [AppComponent], + declarations: [AppComponent, Vue3Component], imports: [ CommonModule, + FormsModule, + ReactiveFormsModule, BrowserModule, BrowserAnimationsModule, CoreModule, @@ -54,7 +57,6 @@ registerLocaleData(zh); SettingService, ExtensionService, StorageService, - DataSourceService, IndexedDBStorage, HttpStorage, NzMessageService, @@ -65,7 +67,6 @@ registerLocaleData(zh); deps: ['$injector'], }, { provide: HTTP_INTERCEPTORS, useClass: BaseUrlInterceptor, multi: true }, - // { provide: HTTP_INTERCEPTORS, useClass: RemoteUrlInterceptor, multi: true }, { provide: NZ_I18N, useFactory: (localId: string) => { @@ -80,6 +81,7 @@ registerLocaleData(zh); }, ], bootstrap: [AppComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }) export class AppModule { constructor(private upgrade: UpgradeModule, private lang: LanguageService, private appService: AppService) { diff --git a/src/workbench/browser/src/app/app.service.ts b/src/workbench/browser/src/app/app.service.ts index 49c1fdbf9..0217a7144 100644 --- a/src/workbench/browser/src/app/app.service.ts +++ b/src/workbench/browser/src/app/app.service.ts @@ -8,19 +8,18 @@ import { StorageResStatus, } from 'eo/workbench/browser/src/app/shared/services/storage/index.model'; import { StorageService } from 'eo/workbench/browser/src/app/shared/services/storage/storage.service'; -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; @Injectable() export class AppService { private ipcRenderer: IpcRenderer = window.require?.('electron')?.ipcRenderer; - constructor(private storageService: StorageService, private dataSource: DataSourceService) {} + constructor(private storageService: StorageService) {} init() { if (this.ipcRenderer) { this.ipcRenderer.on('getMockApiList', async (event, req = {}) => { const sender = event.sender; - const isEnabledMatchType = window.eo?.getModuleSettings?.('eoapi-features.mock.matchType') !== false; + const isEnabledMatchType = window.eo?.getExtensionSettings?.('eoapi-features.mock.matchType') !== false; const { mockID } = req.params; if (Number.isInteger(Number(mockID))) { try { diff --git a/src/workbench/browser/src/app/core/services/language/language.service.ts b/src/workbench/browser/src/app/core/services/language/language.service.ts index 49ce14420..12a3a57a7 100644 --- a/src/workbench/browser/src/app/core/services/language/language.service.ts +++ b/src/workbench/browser/src/app/core/services/language/language.service.ts @@ -26,14 +26,16 @@ export class LanguageService { return; } this.systemLanguage = localeID; - const localePath = (this.languages.find((val) => val.value === localeID) || this.languages[0]).path; + // const localePath = (this.languages.find((val) => val.value === localeID) || this.languages[0]).path; if (this.electron.isElectron) { this.electron.ipcRenderer.send('message', { action: 'changeLanguage', data: this.systemLanguage, }); } else { - window.location.href = `/${localePath}`; + const url = window.location.href; + const langHash = new Map().set('zh-Hans', 'zh').set('en-US', 'en'); + window.location.replace(url.replace(/\/(zh|en)\/home\//, `/${langHash.get(localeID)}/home/`)); } } } diff --git a/src/workbench/browser/src/app/pages/.component.ts b/src/workbench/browser/src/app/pages/.component.ts deleted file mode 100644 index 527bfbb42..000000000 --- a/src/workbench/browser/src/app/pages/.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' - -@Component({ - selector: 'eo-', - template: `` -}) -export class undefinedComponent implements OnInit { - constructor(public api: RemoteService) {} - async ngOnInit(): void {} -} diff --git a/src/workbench/browser/src/app/pages/account.component.ts b/src/workbench/browser/src/app/pages/account.component.ts index 641f25386..a6d546e1d 100644 --- a/src/workbench/browser/src/app/pages/account.component.ts +++ b/src/workbench/browser/src/app/pages/account.component.ts @@ -1,37 +1,23 @@ -import { - UntypedFormBuilder, - UntypedFormControl, - UntypedFormGroup, - Validators -} from '@angular/forms' -import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' +import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; +import { ViewChild, ElementRef, Component, OnInit } from '@angular/core'; +import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; @Component({ selector: 'eo-account', template: `

Account

-

+

Username

- + @@ -42,7 +28,7 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m type="submit" class="w-[84px]" nzType="primary" - (click)="btnxxkunjCallback()" + (click)="btnw9ec5mCallback()" i18n > Save @@ -51,72 +37,39 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m
-

+

Password

- Current password + Current password - + - New password + New password - + - Confirm new password + Confirm new password - + Please input your confirm new password; - - Please confirm your password; - + Please confirm your password; - - Min length is 6; - + Min length is 6; - - Max length is 11; - + Max length is 11; @@ -128,7 +81,7 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m type="submit" class="w-[84px]" nzType="primary" - (click)="btncf3rvjCallback()" + (click)="btnn016ppCallback()" i18n > Reset @@ -136,13 +89,13 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m
-
` +
`, }) export class AccountComponent implements OnInit { - validateUsernameForm - isSaveUsernameBtnLoading - validatePasswordForm - isResetBtnBtnLoading + validateUsernameForm; + isSaveUsernameBtnLoading; + validatePasswordForm; + isResetBtnBtnLoading; constructor( public fb: UntypedFormBuilder, public user: UserService, @@ -150,16 +103,16 @@ export class AccountComponent implements OnInit { public api: RemoteService, public eMessage: EoMessageService ) { - this.validateUsernameForm = UntypedFormGroup - this.isSaveUsernameBtnLoading = false - this.validatePasswordForm = UntypedFormGroup - this.isResetBtnBtnLoading = false + this.validateUsernameForm = UntypedFormGroup; + this.isSaveUsernameBtnLoading = false; + this.validatePasswordForm = UntypedFormGroup; + this.isResetBtnBtnLoading = false; } async ngOnInit(): Promise { // * Init Username form this.validateUsernameForm = this.fb.group({ - username: [null, [Validators.required]] - }) + username: [null, [Validators.required]], + }); // * Init Password form this.validatePasswordForm = this.fb.group({ @@ -167,96 +120,86 @@ export class AccountComponent implements OnInit { newPassword: [null, [Validators.required]], confirmPassword: [ null, - [ - Validators.required, - Validators.minLength(6), - Validators.maxLength(11), - this.dynamicPasswordValidator - ] - ] - }) + [Validators.required, Validators.minLength(6), Validators.maxLength(11), this.dynamicPasswordValidator], + ], + }); // * get Username form values this.validateUsernameForm.patchValue({ - username: this.user.userProfile?.username - }) + username: this.user.userProfile?.username, + }); } - async btnxxkunjCallback() { + async btnw9ec5mCallback() { // * click event callback - this.isSaveUsernameBtnLoading = true + this.isSaveUsernameBtnLoading = true; const btnSaveUsernameRunning = async () => { - const { username: user } = this.validateUsernameForm.value + const { username: user } = this.validateUsernameForm.value; const [data, err]: any = await this.api.api_userUpdateUserProfile({ - username: user - }) + username: user, + }); if (err) { - this.eMessage.error($localize`Sorry, username is be used`) + this.eMessage.error($localize`Sorry, username is already in use`); if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - const [pData, pErr]: any = await this.api.api_userReadProfile(null) + const [pData, pErr]: any = await this.api.api_userReadProfile(null); if (pErr) { if (pErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.user.setUserProfile(pData) - this.eMessage.success($localize`Username update success !`) - } - await btnSaveUsernameRunning() - this.isSaveUsernameBtnLoading = false + this.user.setUserProfile(pData); + this.eMessage.success($localize`Username update success !`); + }; + await btnSaveUsernameRunning(); + this.isSaveUsernameBtnLoading = false; } - dynamicPasswordValidator = ( - control: UntypedFormControl - ): { [s: string]: boolean } => { - if ( - control.value && - control.value !== this.validatePasswordForm.controls.newPassword.value - ) { - return { isEqual: true, error: true } + dynamicPasswordValidator = (control: UntypedFormControl): { [s: string]: boolean } => { + if (control.value && control.value !== this.validatePasswordForm.controls.newPassword.value) { + return { isEqual: true, error: true }; } - return {} - } - async btncf3rvjCallback() { + return {}; + }; + async btnn016ppCallback() { // * click event callback - this.isResetBtnBtnLoading = true + this.isResetBtnBtnLoading = true; const btnResetBtnRunning = async () => { - const { oldPassword: oldPassword } = this.validatePasswordForm.value - const { newPassword: newPassword } = this.validatePasswordForm.value + const { oldPassword: oldPassword } = this.validatePasswordForm.value; + const { newPassword: newPassword } = this.validatePasswordForm.value; const [data, err]: any = await this.api.api_userUpdatePsd({ oldPassword, - newPassword - }) + newPassword, + }); if (err) { - this.eMessage.error($localize`Validation failed`) + this.eMessage.error($localize`Validation failed`); if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.user.setLoginInfo(data) - this.eMessage.success($localize`Password reset success !`) + this.user.setLoginInfo(data); + this.eMessage.success($localize`Password reset success !`); // * Clear password form - this.validatePasswordForm.reset() - } - await btnResetBtnRunning() - this.isResetBtnBtnLoading = false + this.validatePasswordForm.reset(); + }; + await btnResetBtnRunning(); + this.isResetBtnBtnLoading = false; } } diff --git a/src/workbench/browser/src/app/pages/api/api-tab.service.ts b/src/workbench/browser/src/app/pages/api/api-tab.service.ts index 79efa87b8..0e78812e1 100644 --- a/src/workbench/browser/src/app/pages/api/api-tab.service.ts +++ b/src/workbench/browser/src/app/pages/api/api-tab.service.ts @@ -6,6 +6,7 @@ import { TabItem } from 'eo/workbench/browser/src/app/pages/api/tab/tab.model'; import { isEmptyObj } from '../../utils/index.utils'; import { MessageService } from '../../shared/services/message'; import { Router } from '@angular/router'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; @Injectable() export class ApiTabService { componentRef; @@ -15,27 +16,47 @@ export class ApiTabService { return this.BASIC_TABS.find((val) => this.router.url.includes(val.pathname)); } private changeContent$: Subject = new Subject(); - BASIC_TABS: Partial[] = [ - { - pathname: '/home/api/http/test', - module: 'test', - type: 'edit', - title: $localize`New Request`, - extends: { method: 'POST' }, - }, - { pathname: '/home/api/http/edit', module: 'edit', isFixed: true, type: 'edit', title: $localize`New API` }, - { pathname: '/home/api/http/detail', module: 'detail', type: 'preview', title: $localize`Preview` }, - { - pathname: '/home/api/ws/test', - module: 'test', - isFixed: true, - type: 'edit', - extends: { method: 'WS' }, - title: $localize`New Websocket`, - }, - { pathname: '/home/api/http/mock', module: 'mock', type: 'preview', title: 'Mock' }, - ]; - constructor(private messageService: MessageService, private router: Router) { + BASIC_TABS: Partial[] = this.status.isShare + ? [ + { + pathname: '/home/share/http/test', + module: 'test', + type: 'edit', + title: $localize`New Request`, + extends: { method: 'POST' }, + }, + { pathname: '/home/share/http/detail', module: 'detail', type: 'preview', title: $localize`Preview` }, + { + pathname: '/home/share/ws/test', + module: 'test', + isFixed: true, + type: 'preview', + extends: { method: 'WS' }, + title: $localize`New Websocket`, + }, + ] + : [ + { + pathname: '/home/api/http/test', + module: 'test', + type: 'edit', + title: $localize`New Request`, + extends: { method: 'POST' }, + }, + { pathname: '/home/api/http/edit', module: 'edit', isFixed: true, type: 'edit', title: $localize`New API` }, + { pathname: '/home/api/http/detail', module: 'detail', type: 'preview', title: $localize`Preview` }, + { + pathname: '/home/api/ws/test', + module: 'test', + isFixed: true, + type: 'edit', + extends: { method: 'WS' }, + title: $localize`New Websocket`, + }, + { pathname: '/home/api/http/mock', module: 'mock', type: 'preview', title: 'Mock' }, + ]; + + constructor(private messageService: MessageService, private router: Router, private status: StatusService) { this.changeContent$.pipe(debounceTime(150)).subscribe((inData) => { this.afterContentChanged(inData); }); @@ -124,9 +145,9 @@ export class ApiTabService { } this.bindChildComponentChangeEvent(); - if (!this.componentRef.init) { + if (!this.componentRef?.init) { this.changeContent$.next({ when: 'init', url }); - console.warn('EO_ERROR:Child componentRef need has init function for reflesh data when router change'); + console.error('EO_ERROR:Child componentRef need has init function for reflesh data when router change'); return; } //?Why should use getCurrentTab()? @@ -183,7 +204,7 @@ export class ApiTabService { `EO_ERROR:Child componentRef[${this.componentRef.constructor.name}] need has isFormChange function check model change` ); } - let currentHasChanged = currentTab.hasChanged; + let currentHasChanged = currentTab.extends?.hasChanged?.[contentID] || false; switch (inData.when) { case 'editing': { // Saved APIs do not need to verify changes diff --git a/src/workbench/browser/src/app/pages/api/api.component.html b/src/workbench/browser/src/app/pages/api/api.component.html index 9a68ab0d0..19c8527f9 100644 --- a/src/workbench/browser/src/app/pages/api/api.component.html +++ b/src/workbench/browser/src/app/pages/api/api.component.html @@ -10,7 +10,12 @@ > - + - + - - + Manage Environment @@ -106,23 +117,28 @@ *ngIf="this.id" nzLinkRouter > - +

{{ tab.title }}

- +
- {{ tab.title }} - + {{ tab.title }} +
-
+
- +
it.isShare) : this.TABS; } ngOnDestroy() { this.destroy$.next(); @@ -154,6 +166,12 @@ export class ApiComponent implements OnInit, OnDestroy { // }); } + countPaddingRight() { + if (this.status.isShare) { + return '0px'; + } + return this.activeBar ? this.dyWidth + 'px' : '40px'; + } onResizeEnd() { this.isDragging = false; } @@ -178,11 +196,20 @@ export class ApiComponent implements OnInit, OnDestroy { localStorage.setItem(DY_WIDTH_KEY, String(this.dyWidth)); } handleEnvSelectStatus(event: boolean) {} - private changeStoreEnv(uuid) { + private async changeStoreEnv(uuid) { if (uuid == null) { this.store.dispatch(new Change(null)); return; } + if (this.status.isShare) { + const [data, err]: any = await this.http.api_shareDocGetEnv({ + uniqueID: this.share.shareId, + }); + if (err) { + return; + } + return this.store.dispatch(new Change(data)); + } this.storage.run('environmentLoadAllByProjectID', [1], (result: StorageRes) => { if (result.status === StorageResStatus.success) { const data = result.data.find((val) => val.uuid === Number(uuid)); @@ -226,7 +253,16 @@ export class ApiComponent implements OnInit, OnDestroy { } private getAllEnv(uuid?: number) { const projectID = 1; - return new Promise((resolve) => { + return new Promise(async (resolve) => { + if (this.status.isShare) { + const [data, err]: any = await this.http.api_shareDocGetEnv({ + uniqueID: this.share.shareId, + }); + if (err) { + return resolve([]); + } + return resolve(data || []); + } this.storage.run('environmentLoadAllByProjectID', [projectID], async (result: StorageRes) => { if (result.status === StorageResStatus.success) { return resolve(result.data || []); diff --git a/src/workbench/browser/src/app/pages/api/api.module.ts b/src/workbench/browser/src/app/pages/api/api.module.ts index 961616bb6..aa649b8d9 100644 --- a/src/workbench/browser/src/app/pages/api/api.module.ts +++ b/src/workbench/browser/src/app/pages/api/api.module.ts @@ -29,6 +29,8 @@ import { NzSelectModule } from 'ng-zorro-antd/select'; import { NzModalModule } from 'ng-zorro-antd/modal'; import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; import { NzUploadModule } from 'ng-zorro-antd/upload'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; + import { ApiGroupTreeComponent } from './group/tree/api-group-tree.component'; import { ApiTabComponent } from './tab/api-tab.component'; @@ -74,6 +76,7 @@ const COMPONENTS = [ NzSpinModule, EouiModule, EnvModule, + NzBadgeModule, NzCardModule, NzModalModule, NzSelectModule, @@ -81,7 +84,7 @@ const COMPONENTS = [ SharedModule, ], declarations: [...COMPONENTS], - exports: [], + exports: [ApiComponent], providers: [ElectronService, ApiService, ApiTabService, ApiTabOperateService, ApiTabStorageService, IndexedDBStorage], }) export class ApiModule {} diff --git a/src/workbench/browser/src/app/pages/api/api.service.ts b/src/workbench/browser/src/app/pages/api/api.service.ts index 3261bb513..6842603e5 100644 --- a/src/workbench/browser/src/app/pages/api/api.service.ts +++ b/src/workbench/browser/src/app/pages/api/api.service.ts @@ -4,6 +4,9 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m import { MessageService } from '../../shared/services/message'; import { StorageService } from '../../shared/services/storage'; import { Router } from '@angular/router'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; @Injectable({ providedIn: 'root', }) @@ -12,10 +15,23 @@ export class ApiService { private messageService: MessageService, private message: EoMessageService, private router: Router, - private storage: StorageService + private storage: StorageService, + private status: StatusService, + private http: RemoteService, + private share: ShareService ) {} get(uuid): Promise { - return new Promise((resolve) => { + return new Promise(async (resolve) => { + if (this.status.isShare) { + const [data, err]: any = await this.http.api_shareDocGetApiDetail({ + uniqueID: this.share.shareId, + apiDataUUID: uuid, + }); + if (err) { + return; + } + return resolve(data); + } this.storage.run('apiDataLoad', [uuid], (result: StorageRes) => { if (result.status === StorageResStatus.success) { resolve(result.data); diff --git a/src/workbench/browser/src/app/pages/api/group/edit/api-group-edit.component.html b/src/workbench/browser/src/app/pages/api/group/edit/api-group-edit.component.html index 9c43f2337..41b8ac38e 100644 --- a/src/workbench/browser/src/app/pages/api/group/edit/api-group-edit.component.html +++ b/src/workbench/browser/src/app/pages/api/group/edit/api-group-edit.component.html @@ -7,8 +7,7 @@

- Data from {{ - group.name.length > 50 ? group.name.slice(0, 50) + '...' : group.name - }} + Data from + {{ group.name.length > 50 ? group.name.slice(0, 50) + '...' : group.name }} will be deleted. This cannot be undone. Are you sure you want to delete?

diff --git a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html index 91b7bedd3..95504d8db 100644 --- a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html +++ b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html @@ -1,9 +1,22 @@
- - @@ -21,10 +34,21 @@
- +
@@ -33,7 +57,7 @@
{{ node.title }}
- + @@ -60,15 +84,17 @@
{{ node.origin.method - }} + }} {{ node.title }}
- - @@ -76,12 +102,16 @@
  • Edit
    • -
  • +
  • Copy
    • -
  • +
  • Delete
    • @@ -91,8 +121,6 @@
    - - + -
    diff --git a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.scss b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.scss index ed296ad86..48b01da62 100644 --- a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.scss +++ b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.scss @@ -37,7 +37,7 @@ ::ng-deep { .group_tree { overflow: hidden auto; - height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - 80px); + height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - 120px); .ant-tree-indent-unit { width: 8px; } @@ -48,9 +48,6 @@ } } } - .web-page-body .group_tree { - height: calc(100vh - var(--NAVBAR_HEIGHT) - var(--FOOTER_HEIGHT) - 87px); - } } .ant-dropdown-menu { min-width: 100px; diff --git a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts index 530be7832..bd7e60a4d 100644 --- a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts +++ b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts @@ -18,6 +18,9 @@ import { ApiService } from 'eo/workbench/browser/src/app/pages/api/api.service'; import { ImportApiComponent } from 'eo/workbench/browser/src/app/shared/components/import-api/import-api.component'; import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; @Component({ selector: 'eo-api-group-tree', templateUrl: './api-group-tree.component.html', @@ -64,20 +67,25 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { }, ]; nzSelectedKeys: number[] = []; + isEdit: boolean; private destroy$: Subject = new Subject(); constructor( + public electron: ElectronService, private router: Router, private route: ActivatedRoute, private modalService: ModalService, private message: EoMessageService, private messageService: MessageService, private storage: StorageService, - public electron: ElectronService, private apiService: ApiService, private projectService: ProjectService, - private nzModalService: NzModalService + private nzModalService: NzModalService, + public status: StatusService, + private http: RemoteService, + private share: ShareService ) {} ngOnInit(): void { + this.isEdit = !this.status.isShare; this.buildGroupTreeData(); this.watchApiAction(); this.watchRouterChange(); @@ -107,9 +115,27 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { callback?.(); }); - getProjectCollections() { + async getProjectCollections() { this.apiDataLoading = true; - return new Promise((resolve) => { + return new Promise(async (resolve) => { + if (this.status.isShare) { + const [res, err]: any = await this.http.api_shareDocGetAllApi( + { + uniqueID: this.share.shareId, + }, + '/api' + ); + if (err) { + resolve(false); + return; + } + const { groups, apis } = res; + this.getGroups(groups); + this.getApis(apis); + this.apiDataLoading = false; + resolve(true); + return; + } this.storage.run('projectCollections', [this.projectService.currentProjectID], (result: StorageRes) => { if (result.status === StorageResStatus.success) { const { groups, apis } = result.data; @@ -190,7 +216,6 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { case 'deleteApiSuccess': case 'updateGroupSuccess': { const group = inArg.data?.group; - if ( inArg.type === 'updateGroupSuccess' && group?.parentID && @@ -198,7 +223,6 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { ) { this.expandKeys.push(`group-${group?.parentID}`); } - this.buildGroupTreeData(); break; } @@ -212,24 +236,25 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { * @param inArg NzFormatEmitEvent */ operateApiEvent(inArg: NzFormatEmitEvent | any): void { + const prefix = this.status.isShare ? 'home/share' : '/home/api'; inArg.event.stopPropagation(); switch (inArg.eventName) { case 'testApi': case 'editApi': case 'detailApi': { - this.router.navigate([`/home/api/http/${inArg.eventName.replace('Api', '')}`], { - queryParams: { uuid: inArg.node.key }, + this.router.navigate([`${prefix}/http/${inArg.eventName.replace('Api', '')}`], { + queryParams: { uuid: inArg.node.key,shareId: this.share.shareId}, }); break; } case 'jumpOverview': { - this.router.navigate(['/home/api/overview'], { + this.router.navigate([`${prefix}/overview`], { queryParams: { uuid: 'overview' }, }); break; } case 'addAPI': { - this.router.navigate(['/home/api/http/edit'], { + this.router.navigate([`${prefix}/http/edit`], { queryParams: { groupID: inArg.node?.origin.key.replace('group-', '') }, }); break; diff --git a/src/workbench/browser/src/app/pages/api/history/eo-history.component.ts b/src/workbench/browser/src/app/pages/api/history/eo-history.component.ts index 3ca594d8d..70e5cc1c6 100644 --- a/src/workbench/browser/src/app/pages/api/history/eo-history.component.ts +++ b/src/workbench/browser/src/app/pages/api/history/eo-history.component.ts @@ -22,7 +22,7 @@ export class HistoryComponent implements OnInit { constructor(private storage: StorageService, private router: Router, private message: MessageService) {} async ngOnInit() { const result = await this.loadAllTest(); - this.historyList = result.reverse(); + this.historyList = (result||[]).reverse(); this.message .get() .pipe(takeUntil(this.destroy$)) @@ -39,7 +39,6 @@ export class HistoryComponent implements OnInit { return new Promise((resolve) => { this.storage.run('apiTestHistoryLoadAllByProjectID', [1], (result: StorageRes) => { if (result.status === StorageResStatus.success) { - console.log(result.data); resolve(result.data); } else { console.error(result.data); diff --git a/src/workbench/browser/src/app/pages/api/http/detail/api-detail.component.ts b/src/workbench/browser/src/app/pages/api/http/detail/api-detail.component.ts index ac5d8fe4a..843e15e59 100644 --- a/src/workbench/browser/src/app/pages/api/http/detail/api-detail.component.ts +++ b/src/workbench/browser/src/app/pages/api/http/detail/api-detail.component.ts @@ -11,6 +11,9 @@ import { treeToListHasLevel } from '../../../../utils/tree/tree.utils'; import { reverseObj } from '../../../../utils/index.utils'; import { StorageService } from '../../../../shared/services/storage'; import { ElectronService } from 'eo/workbench/browser/src/app/core/services'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; @Component({ selector: 'api-detail', templateUrl: './api-detail.component.html', @@ -28,7 +31,14 @@ export class ApiDetailComponent implements OnInit { { title: $localize`Created Type`, slot: 'createWay', width: '18%' }, { title: 'URL', slot: 'url', width: '42%' }, ]; - constructor(private route: ActivatedRoute, private storage: StorageService, public electron: ElectronService) {} + constructor( + private route: ActivatedRoute, + private storage: StorageService, + private status: StatusService, + public electron: ElectronService, + private http: RemoteService, + private share: ShareService + ) {} ngOnInit(): void { this.init(); } @@ -39,13 +49,30 @@ export class ApiDetailComponent implements OnInit { if (id) { this.model = (await this.getApiByUuid(Number(id))) as ApiData; } else { - console.error("Can't no find api"); + console.error(`Can't no find api`); } } this.eoOnInit.emit(this.model); } getApiByUuid(id: number) { - return new Promise((resolve) => { + return new Promise(async (resolve) => { + if (this.status.isShare) { + const [data, err]: any = await this.http.api_shareDocGetApiDetail({ + apiDataUUID: id, + uniqueID: this.share.shareId, + }); + if (err) { + return; + } + ['requestBody', 'responseBody'].forEach((tableName) => { + if (['xml', 'json'].includes(data[`${tableName}Type`])) { + data[tableName] = treeToListHasLevel(data[tableName]); + } + }); + this.model = data; + resolve(this.model); + return; + } this.storage.run('apiDataLoad', [id], (result: StorageRes) => { if (result.status === StorageResStatus.success) { ['requestBody', 'responseBody'].forEach((tableName) => { diff --git a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.html b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.html index 975e8529e..d46a375b3 100644 --- a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.html +++ b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.html @@ -22,14 +22,25 @@ - + - + @@ -45,24 +56,36 @@ Request Headers {{ model.requestHeaders | apiParamsNum - }} + }}     - + Body - + " + nzStatus="success" + > - + @@ -70,20 +93,26 @@ Query {{ model.queryParams | apiParamsNum - }} + }} - + REST {{ model.restParams | apiParamsNum - }} + }} - + @@ -97,24 +126,36 @@ Response Headers {{ model.responseHeaders | apiParamsNum - }} + }} - + Response - + - + diff --git a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.ts b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.ts index e1a3b8e29..92b6d65ca 100644 --- a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.ts +++ b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.ts @@ -24,6 +24,7 @@ import { ApiParamsNumPipe } from '../../../../shared/pipes/api-param-num.pipe'; import { ApiEditService } from 'eo/workbench/browser/src/app/pages/api/http/edit/api-edit.service'; import { ApiEditUtilService } from './api-edit-util.service'; import { EoMessageService } from '../../../../eoui/message/eo-message.service'; +import { after } from 'lodash-es'; @Component({ selector: 'eo-api-edit-edit', templateUrl: './api-edit.component.html', @@ -83,6 +84,8 @@ export class ApiEditComponent implements OnInit, OnDestroy { this.model = result; } } + //! Rest may generate from url + this.watchUri(); //Storage origin api data if (!this.initialModel) { if (!id) { @@ -92,9 +95,9 @@ export class ApiEditComponent implements OnInit, OnDestroy { this.initialModel = eoDeepCopy(this.model); } } + this.initBasicForm(); this.watchBasicForm(); - this.watchUri(); this.changeGroupID$.next(this.model.groupID); this.validateForm.patchValue(this.model); this.eoOnInit.emit(this.model); @@ -130,7 +133,7 @@ export class ApiEditComponent implements OnInit, OnDestroy { if (result.status === StorageResStatus.success) { this.message.success(title); this.initialModel = this.apiEditUtil.getFormdataFromApiData(eoDeepCopy(result.data)); - if(busEvent==='addApi'){ + if (busEvent === 'addApi') { this.router.navigate(['/home/api/http/detail'], { queryParams: { pageID: Number(this.route.snapshot.queryParams.pageID), diff --git a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.module.ts b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.module.ts index 066b6e59e..efe22dfcf 100644 --- a/src/workbench/browser/src/app/pages/api/http/edit/api-edit.module.ts +++ b/src/workbench/browser/src/app/pages/api/http/edit/api-edit.module.ts @@ -31,6 +31,7 @@ import { ApiParamsExtraSettingComponent } from './extra-setting/api-params-extra import { ApiEditUtilService } from './api-edit-util.service'; import { ApiEditService } from 'eo/workbench/browser/src/app/pages/api/http/edit/api-edit.service'; import { RouterModule } from '@angular/router'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; const NZ_COMPONETS = [ NzDropDownModule, @@ -46,6 +47,7 @@ const NZ_COMPONETS = [ NzDividerModule, NzAffixModule, NzPopconfirmModule, + NzBadgeModule ]; const COMPONENTS = [ ApiEditComponent, diff --git a/src/workbench/browser/src/app/pages/api/http/mock/api-mock.component.html b/src/workbench/browser/src/app/pages/api/http/mock/api-mock.component.html index 5ab6d1494..b6c092f2e 100644 --- a/src/workbench/browser/src/app/pages/api/http/mock/api-mock.component.html +++ b/src/workbench/browser/src/app/pages/api/http/mock/api-mock.component.html @@ -6,11 +6,16 @@
    -
    {{ scope.name }}
    +
    {{ scope.name }}
     - + @@ -19,14 +24,28 @@
    - + Preview Edit - Delete + Delete
    @@ -46,8 +65,14 @@ Response - + diff --git a/src/workbench/browser/src/app/pages/api/http/test/api-test-util.service.ts b/src/workbench/browser/src/app/pages/api/http/test/api-test-util.service.ts index 95a62df2a..92214fdf9 100644 --- a/src/workbench/browser/src/app/pages/api/http/test/api-test-util.service.ts +++ b/src/workbench/browser/src/app/pages/api/http/test/api-test-util.service.ts @@ -346,7 +346,7 @@ export class ApiTestUtilService { }); return result; } - private filterCommonHeader(headers) { + private filterCommonHeader(headers=[]) { const commonHeader = [ 'content-type', 'accept', diff --git a/src/workbench/browser/src/app/pages/api/http/test/api-test.component.html b/src/workbench/browser/src/app/pages/api/http/test/api-test.component.html index 8dcd5b9f7..0950c552a 100644 --- a/src/workbench/browser/src/app/pages/api/http/test/api-test.component.html +++ b/src/workbench/browser/src/app/pages/api/http/test/api-test.component.html @@ -9,15 +9,33 @@ -
    +
    {{ env.hostUri }}
    - - + + - - + Headers {{ model.request.requestHeaders | apiParamsNum - }} + }} - + Body - + " + nzStatus="success" + > - + @@ -67,46 +110,67 @@ Query {{ model.request.queryParams | apiParamsNum - }} + }} - + REST {{ model.request.restParams | apiParamsNum - }} + }} - + Pre-request Script - + - + After-response Script - + - +
    - + @@ -118,8 +182,10 @@
    - + @@ -129,8 +195,15 @@
    - +
    diff --git a/src/workbench/browser/src/app/pages/api/http/test/api-test.component.ts b/src/workbench/browser/src/app/pages/api/http/test/api-test.component.ts index 8987db6f2..1ed996d9d 100644 --- a/src/workbench/browser/src/app/pages/api/http/test/api-test.component.ts +++ b/src/workbench/browser/src/app/pages/api/http/test/api-test.component.ts @@ -35,6 +35,7 @@ import { transferUrlAndQuery } from 'eo/workbench/browser/src/app/utils/api'; import { getGlobals, setGlobals } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.utils'; import { ApiTestResultResponseComponent } from 'eo/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component'; import { isEmpty } from 'lodash-es'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; const API_TEST_DRAG_TOP_HEIGHT_KEY = 'API_TEST_DRAG_TOP_HEIGHT'; interface testViewModel { @@ -102,6 +103,7 @@ export class ApiTestComponent implements OnInit, OnDestroy { private apiTestUtil: ApiTestUtilService, private testServer: TestServerService, private messageService: MessageService, + public statusS: StatusService, private lang: LanguageService ) { // TODO Select demo api when first open Eoapi @@ -115,7 +117,6 @@ export class ApiTestComponent implements OnInit, OnDestroy { // testBtn && testBtn.click(); // }, 600); // } - this.initBasicForm(); this.testServer.init((message) => { this.receiveMessage(message); @@ -183,8 +184,8 @@ export class ApiTestComponent implements OnInit, OnDestroy { if (!this.initialModel) { this.initialModel = eoDeepCopy(this.model); } - this.cdRef.detectChanges(); this.eoOnInit.emit(this.model); + this.cdRef.detectChanges(); } clickTest() { if (!this.checkForm()) { @@ -377,7 +378,7 @@ export class ApiTestComponent implements OnInit, OnDestroy { //If test sucess,addHistory //Only has statusCode need save report - if (!message.response.statusCode) { + if (!message.response.statusCode || this.statusS.isShare) { return; } this.addHistory(message.history, Number(queryParams.uuid)); diff --git a/src/workbench/browser/src/app/pages/api/http/test/api-test.module.ts b/src/workbench/browser/src/app/pages/api/http/test/api-test.module.ts index 21d485e02..7818a36ee 100644 --- a/src/workbench/browser/src/app/pages/api/http/test/api-test.module.ts +++ b/src/workbench/browser/src/app/pages/api/http/test/api-test.module.ts @@ -44,6 +44,7 @@ import { TestServerRemoteService } from 'eo/workbench/browser/src/app/shared/ser import { NzUploadModule } from 'ng-zorro-antd/upload'; import { RouterModule } from '@angular/router'; import { ApiSharedModule } from 'eo/workbench/browser/src/app/pages/api/api-shared.module'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; const NZ_COMPONETS = [ NzDropDownModule, @@ -63,7 +64,7 @@ const NZ_COMPONETS = [ NzAlertModule, NzTypographyModule, NzUploadModule, - ApiSharedModule, + NzBadgeModule ]; const COMPONENTS = [ ApiTestComponent, @@ -89,6 +90,7 @@ const COMPONENTS = [ CommonModule, ...NZ_COMPONETS, EouiModule, + ApiSharedModule, SharedModule, ParamsImportModule, ], diff --git a/src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.ts b/src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.ts index 1fa6c949d..5967701a8 100644 --- a/src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.ts +++ b/src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.ts @@ -29,7 +29,6 @@ export class ApiTestResultResponseComponent implements OnInit, OnChanges { ) {} ngOnChanges(changes) { - console.log('this.model', this.model); if (changes.model && this.model) { this.codeStatus = this.apiTest.getHTTPStatus(this.model?.statusCode); if (!this.responseIsImg) { @@ -46,7 +45,17 @@ export class ApiTestResultResponseComponent implements OnInit, OnChanges { } downloadResponseText() { - this.blobUrl = this.responseIsImg ? this.uri : getBlobUrl(this.model.body, this.model.contentType); + let code = this.model.body; + try { + if (['longText', 'stream'].includes(this.model.responseType)) { + code = window.atob(code); + } else { + code = JSON.stringify(typeof code === 'string' ? JSON.parse(code) : code, null, 4); + } + } catch { + code = String(code); + } + this.blobUrl = this.responseIsImg ? this.uri : getBlobUrl(code, this.model.contentType); const blobFileName = decodeURI(this.model.blobFileName || 'test_response'); const tmpAElem = document.createElement('a'); if ('download' in tmpAElem) { diff --git a/src/workbench/browser/src/app/pages/api/tab/api-tab-operate.service.ts b/src/workbench/browser/src/app/pages/api/tab/api-tab-operate.service.ts index 71fe17f98..7a56172e2 100644 --- a/src/workbench/browser/src/app/pages/api/tab/api-tab-operate.service.ts +++ b/src/workbench/browser/src/app/pages/api/tab/api-tab-operate.service.ts @@ -1,10 +1,13 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { ApiTabStorageService } from 'eo/workbench/browser/src/app/pages/api/tab/api-tab-storage.service'; -import { TabItem, TabOperate } from 'eo/workbench/browser/src/app/pages/api/tab/tab.model'; +import { storageTab, TabItem, TabOperate } from 'eo/workbench/browser/src/app/pages/api/tab/tab.model'; import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; import { eoDeepCopy } from 'eo/workbench/browser/src/app/utils/index.utils'; +import { APP_CONFIG } from 'eo/workbench/browser/src/environments/environment'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; /** * Api tab service operate tabs array add/replace/close... * Tab change by url change(router event) @@ -20,18 +23,22 @@ export class ApiTabOperateService { * Tab basic info */ BASIC_TABS: Partial[]; + //* Allow development mode debug not exist router + private allowNotExistRouter = !APP_CONFIG.production; constructor( private tabStorage: ApiTabStorageService, private messageService: MessageService, private router: Router, - private message: EoMessageService + private message: EoMessageService, + private share: ShareService, + private status: StatusService ) {} //Init tab info //Maybe from tab cache info or router url init(BASIC_TABS) { this.BASIC_TABS = BASIC_TABS; this.tabStorage.init(); - const tabCache = this.tabStorage.getPersistenceStorage(); + const tabCache = this.parseChangeRouter(this.tabStorage.getPersistenceStorage()); //No cache if (!tabCache || !tabCache.tabOrder?.length) { this.operateTabAfterRouteChange({ @@ -62,18 +69,21 @@ export class ApiTabOperateService { }); return; } + //Tab from url try { //If current url did't match exist tab,throw error - const existTab = this.getSameContentTab(this.generateTabFromUrl(this.router.url)); - if (existTab) { - this.operateTabAfterRouteChange({ - url: this.router.url, - }); - return; - } + this.getSameContentTab(this.generateTabFromUrl(this.router.url)); + //If current url is valid tab url,select it + this.operateTabAfterRouteChange({ + url: this.router.url, + }); + return; } catch (e) { console.error(e); + if (this.allowNotExistRouter) { + return; + } } //Tab from last choose const targetTab = this.getTabByIndex(tabCache.selectedIndex || 0); @@ -85,10 +95,10 @@ export class ApiTabOperateService { * * @returns tabItem */ - newDefaultTab(path?) { + newDefaultTab(routerStr?) { const tabItem = Object.assign( {}, - eoDeepCopy(this.BASIC_TABS.find((val) => val.pathname === path) || this.BASIC_TABS[0]) + eoDeepCopy(this.BASIC_TABS.find((val) => val.pathname.includes(routerStr)) || this.BASIC_TABS[0]) ); tabItem.params = {}; tabItem.uuid = tabItem.params.pageID = Date.now(); @@ -126,6 +136,12 @@ export class ApiTabOperateService { if (!tab) { return; } + if (this.status.isShare) { + this.router.navigate([tab.pathname], { + queryParams: { pageID: tab.uuid, ...tab.params, shareId: this.share.shareId }, + }); + return; + } this.router.navigate([tab.pathname], { queryParams: { pageID: tab.uuid, ...tab.params }, }); @@ -170,7 +186,7 @@ export class ApiTabOperateService { const params: any = {}; const basicTab = this.BASIC_TABS.find((val) => urlArr[0].includes(val.pathname)); if (!basicTab) { - throw new Error(`EO_ERROR: Please check this router has added in BASIC_TABS,current route:${url}`); + throw new Error(`EO_ERROR: Please check this router has added in BASIC_TABS,current route: ${url}`); } // Parse query params new URLSearchParams(urlArr[1]).forEach((value, key) => { @@ -215,8 +231,9 @@ export class ApiTabOperateService { */ operateTabAfterRouteChange(res: { url: string }) { const pureTab = this.getBasicInfoFromUrl(res.url); - const nextTab = this.generateTabFromUrl(res.url); const existTab = this.getSameContentTab(pureTab); + + const nextTab = this.generateTabFromUrl(res.url); //!Every tab must has pageID //If lack pageID,Jump to exist tab item to keep same pageID and so on if (!pureTab.uuid) { @@ -403,4 +420,22 @@ export class ApiTabOperateService { private updateChildView() { this.messageService.send({ type: 'tabContentInit', data: {} }); } + private parseChangeRouter(cache: storageTab) { + if (!cache) { + return; + } + //If router not exist basic tab,filter it + cache.tabOrder = cache.tabOrder.filter((id) => { + const tabItem = cache.tabsByID[id]; + if (!tabItem) { + return false; + } + const hasExist = this.BASIC_TABS.find((val) => val.pathname === tabItem.pathname); + if (!hasExist) { + delete cache.tabsByID[id]; + } + return hasExist; + }); + return cache; + } } diff --git a/src/workbench/browser/src/app/pages/api/tab/api-tab-storage.service.ts b/src/workbench/browser/src/app/pages/api/tab/api-tab-storage.service.ts index f69b79a91..b16d3449e 100644 --- a/src/workbench/browser/src/app/pages/api/tab/api-tab-storage.service.ts +++ b/src/workbench/browser/src/app/pages/api/tab/api-tab-storage.service.ts @@ -16,9 +16,7 @@ export class ApiTabStorageService { init() { this.tabOrder = []; this.tabsByID = new Map(); - this.cacheName = `${ - this.workspace.isLocal? 'local' : this.workspace.currentWorkspaceID - }_TabCache`; + this.cacheName = `${this.workspace.isLocal ? 'local' : this.workspace.currentWorkspaceID}_TabCache`; } addTab(tabItem) { if (this.tabsByID.has(tabItem.uuid)) { @@ -55,8 +53,10 @@ export class ApiTabStorageService { * @param data */ setPersistenceStorage(selectedIndex, opts) { - //! remote datasource may change - // if (this.dataSource.dataSourceType === 'http') {return;} + //TODO remote datasource may change + if (this.dataSource.dataSourceType === 'http') { + } + let tabsByID = Object.fromEntries(this.tabsByID); Object.values(tabsByID).forEach((val) => { if (val.type === 'preview') { @@ -77,24 +77,11 @@ export class ApiTabStorageService { }) ); } - parseChangeRouter(cache: storageTab) { - const map = { - '/home/api/edit': '/home/api/http/edit', - '/home/api/test': '/home/api/http/test', - '/home/api/detail': '/home/api/http/detail', - '/home/api/mock': '/home/api/http/mock', - }; - cache.tabOrder.forEach((id) => { - const tabItem = cache.tabsByID[id]; - tabItem.pathname = map[tabItem.pathname] || tabItem.pathname; - }); - return cache; - } + getPersistenceStorage(): storageTab { let result: any = null; try { result = JSON.parse(window.localStorage.getItem(this.cacheName) as string); - result = this.parseChangeRouter(result); } catch (e) {} return result; } diff --git a/src/workbench/browser/src/app/pages/api/tab/api-tab.component.html b/src/workbench/browser/src/app/pages/api/tab/api-tab.component.html index 58c9e122e..5e92aa616 100644 --- a/src/workbench/browser/src/app/pages/api/tab/api-tab.component.html +++ b/src/workbench/browser/src/app/pages/api/tab/api-tab.component.html @@ -14,24 +14,23 @@ [ngClass]="{ 'fixed-tab-item-container': tabStorage.tabsByID.get(uuid)?.isFixed }" > - + - {{ tabStorage.tabsByID.get(uuid).extends.method }} - - {{ tabStorage.tabsByID.get(uuid).title }} + {{ + tabStorage.tabsByID.get(uuid)?.extends?.method || 'WS' + }} + + {{ tabStorage.tabsByID.get(uuid)?.title }}
    - +
    - + @@ -73,12 +79,11 @@ import { NzMessageService } from 'ng-zorro-antd/message'; }) export class ExtensionSettingComponent implements OnInit { @Input() configuration = {} as any; + @Input() extName: string; localSettings = {} as Record; validateForm!: FormGroup; objectKeys = Object.keys; - get properties() { - return this.configuration?.properties || {}; - } + properties = {}; constructor( public languageService: LanguageService, @@ -92,14 +97,24 @@ export class ExtensionSettingComponent implements OnInit { } private init() { + this.formatProperties(); this.localSettings = this.settingService.getSettings(); const controls = {}; - this.setSettingsModel(this.configuration.properties, controls); + this.setSettingsModel(this.properties, controls); this.validateForm = this.fb.group(controls); } + formatProperties() { + const prefix = `${this.extName}.`; + this.properties = Object.entries(this.configuration?.properties).reduce((prev, [key, value]) => { + const newKey = key.startsWith(prefix) ? key : `${prefix}${key}`; + prev[newKey] = value; + return prev; + }, {}); + } + /** * set data * diff --git a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.html b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.html index 066c6b986..5b6a30829 100644 --- a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.html +++ b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.html @@ -9,10 +9,14 @@
    - {{ extensionDetail.moduleName }} + {{ extensionDetail.title || extensionDetail.moduleName }} - +
    @@ -21,21 +25,33 @@

    {{ extensionDetail.description }}

    -
    - + (nzSelectChange)="handleTabChange($event)" + > + - + diff --git a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.ts b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.ts index 21c690318..3f1659540 100644 --- a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.ts +++ b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.ts @@ -6,6 +6,7 @@ import { ExtensionService } from '../extension.service'; import { LanguageService } from 'eo/workbench/browser/src/app/core/services/language/language.service'; import { WebService } from '../../../core/services/web/web.service'; import { PROTOCOL } from 'eo/workbench/browser/src/app/shared/constants/protocol'; +import { WebExtensionService } from 'eo/workbench/browser/src/app/shared/services/web-extension/webExtension.service'; @Component({ selector: 'eo-extension-detail', @@ -20,6 +21,8 @@ export class ExtensionDetailComponent implements OnInit { isNotLoaded = true; extensionDetail: EoExtensionInfo; nzSelectedIndex = 0; + pagePath = ''; + extName = ''; changeLog = ''; changeLogNotFound = false; @@ -29,7 +32,8 @@ export class ExtensionDetailComponent implements OnInit { private router: Router, private webService: WebService, public electron: ElectronService, - private language: LanguageService + private language: LanguageService, + private webExtensionService: WebExtensionService ) { this.getDetail(); } @@ -37,16 +41,14 @@ export class ExtensionDetailComponent implements OnInit { ngOnInit(): void {} async handleInstall() { - if (this.electron.isElectron) { - this.manageExtension(this.extensionDetail?.installed ? 'uninstall' : 'install', this.extensionDetail?.name); - } else { - this.webService.jumpToClient($localize`Eoapi Client is required to install this extension.`); - } + this.manageExtension(this.extensionDetail?.installed ? 'uninstall' : 'install', this.extensionDetail?.name); } async getDetail() { - const extName = this.route.snapshot.queryParams.name; - this.isOperating = window.eo?.getExtIsInTask(extName, ({ type, status }) => { + this.extName = this.route.snapshot.queryParams.name; + + this.fetchExtensionPage(this.extName); + this.isOperating = window.eo?.getExtIsInTask(this.extName, ({ type, status }) => { if (type === 'install' && status === 'success') { this.extensionDetail.installed = true; } @@ -55,11 +57,11 @@ export class ExtensionDetailComponent implements OnInit { } this.isOperating = false; }); - this.extensionDetail = await this.extensionService.getDetail(this.route.snapshot.queryParams.id, extName); + this.extensionDetail = await this.extensionService.getDetail(this.route.snapshot.queryParams.id, this.extName); this.isEnable = this.extensionService.isEnable(this.extensionDetail.name); - if (!this.extensionDetail?.installed) { + if (!this.extensionDetail?.installed || this.webService.isWeb) { await this.fetchReadme(this.language.systemLanguage); } this.isNotLoaded = false; @@ -71,6 +73,22 @@ export class ExtensionDetailComponent implements OnInit { this.fetchChangelog(this.language.systemLanguage); } + fetchExtensionPage = async (extName: string) => { + this.pagePath='http://127.0.0.1:8080'; + // try { + // const res = await window.eo.getExtensionPagePathByName(extName); + // console.log('extName res', res); + // this.pagePath = res; + // } catch (e) { + // console.error('getExtensionPagePathByName err', e); + // fetch(`https://unpkg.com/${extName}/page/index.html`).then((res) => { + // if (res.status === 200) { + // this.pagePath = res.url + '/child/react17/'; + // } + // }); + // } + }; + async fetchChangelog(locale = '') { //Default locale en-US if (locale === 'en-US') { @@ -147,23 +165,27 @@ ${log} manageExtension(operate: string, id) { this.isOperating = true; - /** - * * WARNING:Sending a synchronous message will block the whole - * renderer process until the reply is received, so use this method only as a last - * resort. It's much better to use the asynchronous version, `invoke()`. - */ setTimeout(async () => { switch (operate) { case 'install': { - this.extensionDetail.installed = await this.extensionService.install(id); - this.handleEnableExtension(true); - this.getDetail(); + if (this.electron.isElectron) { + this.extensionDetail.installed = await this.extensionService.install(id); + this.handleEnableExtension(true); + this.getDetail(); + } else { + this.extensionDetail.installed = await this.webExtensionService.installExtension(this.extensionDetail.name); + } break; } case 'uninstall': { - this.extensionDetail.installed = !(await this.extensionService.uninstall(id)); - this.handleEnableExtension(false); - this.fetchReadme(this.language.systemLanguage); + if (this.electron.isElectron) { + this.extensionDetail.installed = !(await this.extensionService.uninstall(id)); + this.handleEnableExtension(false); + this.fetchReadme(this.language.systemLanguage); + } else { + this.webExtensionService.unInstallExtension(this.extensionDetail.name); + this.extensionDetail.installed = false; + } break; } } diff --git a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.module.ts b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.module.ts index 7539eb64a..7760b8370 100644 --- a/src/workbench/browser/src/app/pages/extension/detail/extension-detail.module.ts +++ b/src/workbench/browser/src/app/pages/extension/detail/extension-detail.module.ts @@ -1,13 +1,15 @@ -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { ExtensionSettingComponent } from './components/extensions.component'; +import { CustomTabComponent } from './components/custom-tab.component'; import { ExtensionDetailComponent } from './extension-detail.component'; import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'; @NgModule({ imports: [SharedModule, FormsModule, CommonModule], - declarations: [ExtensionSettingComponent, ExtensionDetailComponent], + declarations: [ExtensionSettingComponent, ExtensionDetailComponent, CustomTabComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }) export class ExtensionDetailModule {} diff --git a/src/workbench/browser/src/app/pages/extension/extension.component.ts b/src/workbench/browser/src/app/pages/extension/extension.component.ts index ee5cd50cc..d87428dbc 100644 --- a/src/workbench/browser/src/app/pages/extension/extension.component.ts +++ b/src/workbench/browser/src/app/pages/extension/extension.component.ts @@ -53,13 +53,11 @@ export class ExtensionComponent implements OnInit { ngOnInit(): void { this.watchRouterChange(); this.setSelectedKeys(); - if (this.electron.isElectron) { - this.treeNodes.push({ - key: 'installed', - title: $localize`Installed`, - isLeaf: true, - }); - } + this.treeNodes.push({ + key: 'installed', + title: $localize`Installed`, + isLeaf: true, + }); } onSeachChange(keyword) { diff --git a/src/workbench/browser/src/app/pages/extension/extension.model.ts b/src/workbench/browser/src/app/pages/extension/extension.model.ts index e9a8cfb8f..ebdabc572 100644 --- a/src/workbench/browser/src/app/pages/extension/extension.model.ts +++ b/src/workbench/browser/src/app/pages/extension/extension.model.ts @@ -1,4 +1,4 @@ -import { ModuleInfo } from 'eo/platform/node/extension-manager/types/index'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; export enum ExtensionGroupType { all = 'all', diff --git a/src/workbench/browser/src/app/pages/extension/extension.service.ts b/src/workbench/browser/src/app/pages/extension/extension.service.ts index 38729932e..b2a70dfe1 100644 --- a/src/workbench/browser/src/app/pages/extension/extension.service.ts +++ b/src/workbench/browser/src/app/pages/extension/extension.service.ts @@ -2,11 +2,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { ElectronService } from 'eo/workbench/browser/src/app/core/services'; import { lastValueFrom } from 'rxjs'; -import { ModuleInfo } from 'eo/platform/node/extension-manager/types/index'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; import { TranslateService } from 'eo/platform/common/i18n'; import { LanguageService } from 'eo/workbench/browser/src/app/core/services/language/language.service'; import { APP_CONFIG } from 'eo/workbench/browser/src/environments/environment'; import { DISABLE_EXTENSION_NAMES } from 'eo/workbench/browser/src/app/shared/constants/storageKeys'; +import { WebExtensionService } from 'eo/workbench/browser/src/app/shared/services/web-extension/webExtension.service'; @Injectable({ providedIn: 'root', @@ -17,32 +18,32 @@ export class ExtensionService { extensionIDs: Array = []; HOST = ''; localExtensions: Map; - constructor(private http: HttpClient, private electron: ElectronService, private language: LanguageService) { + constructor( + private http: HttpClient, + private electron: ElectronService, + private language: LanguageService, + private webExtensionService: WebExtensionService + ) { this.localExtensions = this.getExtensions(); this.extensionIDs = this.updateExtensionIDs(); this.HOST = this.electron.isElectron ? APP_CONFIG.EXTENSION_URL : APP_CONFIG.MOCK_URL; } private getExtensions() { - // Local extension - return window.eo?.getModules() || new Map(); + if (this.electron.isElectron) { + return window.eo?.getModules() || new Map(); + } else { + const webeExts = this.webExtensionService.installedList.map((n) => [n.name, n.pkgInfo]); + return new Map(webeExts as any); + } } getInstalledList() { // Local extension exception for ignore list - return Array.from(this.localExtensions.values()).filter((it) => this.extensionIDs.includes(it.moduleID)); + return Array.from(this.localExtensions.values()).filter((it) => this.extensionIDs.includes(it.name)); } isInstalled(name) { const installList = this.getInstalledList(); return installList.includes(name); } - private translateModule(module: ModuleInfo) { - const lang = this.language.systemLanguage; - const locale = module.i18n?.find((val) => val.locale === lang)?.package; - if (!locale) { - return module; - } - module = new TranslateService(module, locale).translate(); - return module; - } public async requestList() { const result: any = await lastValueFrom(this.http.get(`${this.HOST}/list?locale=${this.language.systemLanguage}`)); const installList = this.getInstalledList(); @@ -129,4 +130,16 @@ export class ExtensionService { .filter((it) => it) .filter((it) => !this.ignoreList.includes(it)); } + private translateModule(module: ModuleInfo) { + const lang = this.language.systemLanguage; + + //If extension from web,transalte package content from http moduleInfo + //Locale extension will translate from local i18n file + const locale = module.i18n?.find((val) => val.locale === lang)?.package; + if (!locale) { + return module; + } + module = new TranslateService(module, locale).translate(); + return module; + } } diff --git a/src/workbench/browser/src/app/pages/extension/list/extension-list.component.html b/src/workbench/browser/src/app/pages/extension/list/extension-list.component.html index f727326c6..034310f46 100644 --- a/src/workbench/browser/src/app/pages/extension/list/extension-list.component.html +++ b/src/workbench/browser/src/app/pages/extension/list/extension-list.component.html @@ -2,20 +2,16 @@
    + *ngFor="let it of renderList" (click)="clickExtension($event, it)">
    -
    +
    +
    - {{ it.moduleName }} + {{ it.title || it.moduleName }} {{ it.author }} {{ it.description }}
    @@ -29,19 +25,13 @@
    - +
    - Installed + i18n>Installed
    diff --git a/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts b/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts index ba33dfa3c..4347c9f52 100644 --- a/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts +++ b/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts @@ -13,9 +13,7 @@ class ExtensionList { this.list = list; } search(keyword: string) { - return this.list.filter( - (it) => it.moduleID.includes(keyword) || it.name.includes(keyword) || it.keywords?.includes(keyword) - ); + return this.list.filter((it) => it.name.includes(keyword) || it.keywords?.includes(keyword)); } } @Component({ @@ -87,7 +85,7 @@ export class ExtensionListComponent implements OnInit { .navigate(['home/extension/detail'], { queryParams: { type: this.route.snapshot.queryParams.type, - id: item.moduleID, + id: item.name, name: item.name, tab: event?.target?.dataset?.id === 'details' ? 1 : 0, }, diff --git a/src/workbench/browser/src/app/pages/member.component.ts b/src/workbench/browser/src/app/pages/member.component.ts index 774ad46d9..bc52dba0a 100644 --- a/src/workbench/browser/src/app/pages/member.component.ts +++ b/src/workbench/browser/src/app/pages/member.component.ts @@ -1,13 +1,13 @@ -import { NzModalService } from 'ng-zorro-antd/modal' -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' -import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service' -import { distinct } from 'rxjs/operators' -import { interval } from 'rxjs' -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service' -import { Component, OnInit } from '@angular/core' +import { NzModalService } from 'ng-zorro-antd/modal'; +import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; +import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service'; +import { distinct } from 'rxjs/operators'; +import { interval } from 'rxjs'; +import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { Component, OnInit } from '@angular/core'; @Component({ selector: 'eo-member', @@ -15,17 +15,12 @@ import { Component, OnInit } from '@angular/core' [nzFooter]="null" [(nzVisible)]="isInvateModalVisible" (nzOnCancel)="handleInvateModalCancel()" - (nzAfterClose)="etmsgjfCallback()" + (nzAfterClose)="ehe4islCallback()" nzTitle="Add people to the workspace" i18n-nzTitle > - +
    - +
    -
    ` +
    `, }) export class MemberComponent implements OnInit { - isInvateModalVisible - inputPersonValue - isSelectBtnLoading - isAddPeopleBtnLoading - memberList + isInvateModalVisible; + inputPersonValue; + isSelectBtnLoading; + isAddPeopleBtnLoading; + memberList; constructor( public modal: NzModalService, public user: UserService, @@ -79,154 +71,149 @@ export class MemberComponent implements OnInit { public workspace: WorkspaceService, public dataSource: DataSourceService ) { - this.isInvateModalVisible = false - this.inputPersonValue = '' - this.isSelectBtnLoading = false - this.isAddPeopleBtnLoading = false - this.memberList = [] + this.isInvateModalVisible = false; + this.inputPersonValue = ''; + this.isSelectBtnLoading = false; + this.isAddPeopleBtnLoading = false; + this.memberList = []; } async ngOnInit(): Promise { this.message .get() .pipe(distinct(({ type }) => type, interval(400))) - .subscribe(async ({ type, data }) => {}) + .subscribe(async ({ type, data }) => {}); - const url = this.dataSource.mockUrl + const url = this.dataSource.remoteServerUrl; if (url === '') { - this.message.send({ type: 'need-config-remote', data: {} }) - return + this.message.send({ type: 'need-config-remote', data: {} }); + return; } - const { id: currentWorkspaceID } = this.workspace.currentWorkspace + const { id: currentWorkspaceID } = this.workspace.currentWorkspace; const [wData, wErr]: any = await this.api.api_workspaceMember({ - workspaceID: currentWorkspaceID - }) + workspaceID: currentWorkspaceID, + }); if (wErr) { if (wErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } // * 对成员列表进行排序 - const Owner = wData.filter((it) => it.roleName === 'Owner') - const Member = wData.filter((it) => it.roleName !== 'Owner') - this.memberList = Owner.concat(Member) + const Owner = wData.filter((it) => it.roleName === 'Owner'); + const Member = wData.filter((it) => it.roleName !== 'Owner'); + this.memberList = Owner.concat(Member); } handleInvateModalCancel(): void { // * 关闭弹窗 - this.isInvateModalVisible = false + this.isInvateModalVisible = false; } - async etmsgjfCallback() { + async ehe4islCallback() { // * nzAfterClose event callback { // * auto clear form - this.inputPersonValue = '' + this.inputPersonValue = ''; } - this.inputPersonValue = '' + this.inputPersonValue = ''; } - async btn7ykkd6Callback() { + async btn0r9zcbCallback() { // * click event callback - this.isSelectBtnLoading = true + this.isSelectBtnLoading = true; const btnSelectRunning = async () => { - const username = this.inputPersonValue - const [uData, uErr]: any = await this.api.api_userSearch({ username }) + const username = this.inputPersonValue; + const [uData, uErr]: any = await this.api.api_userSearch({ username }); if (uErr) { if (uErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } if (uData.length === 0) { - this.eMessage.error( - $localize`Could not find a user matching ${username}` - ) - return + this.eMessage.error($localize`Could not find a user matching ${username}`); + return; } - const [user] = uData - const { id } = user + const [user] = uData; + const { id } = user; - const { id: workspaceID } = this.workspace.currentWorkspace + const { id: workspaceID } = this.workspace.currentWorkspace; const [aData, aErr]: any = await this.api.api_workspaceAddMember({ workspaceID, - userIDs: [id] - }) + userIDs: [id], + }); if (aErr) { if (aErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.eMessage.success($localize`Add new member success`) + this.eMessage.success($localize`Add new member success`); // * 关闭弹窗 - this.isInvateModalVisible = false + this.isInvateModalVisible = false; - const { id: currentWorkspaceID } = this.workspace.currentWorkspace + const { id: currentWorkspaceID } = this.workspace.currentWorkspace; const [wData, wErr]: any = await this.api.api_workspaceMember({ - workspaceID: currentWorkspaceID - }) + workspaceID: currentWorkspaceID, + }); if (wErr) { if (wErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } // * 对成员列表进行排序 - const Owner = wData.filter((it) => it.roleName === 'Owner') - const Member = wData.filter((it) => it.roleName !== 'Owner') - this.memberList = Owner.concat(Member) - } - await btnSelectRunning() - this.isSelectBtnLoading = false + const Owner = wData.filter((it) => it.roleName === 'Owner'); + const Member = wData.filter((it) => it.roleName !== 'Owner'); + this.memberList = Owner.concat(Member); + }; + await btnSelectRunning(); + this.isSelectBtnLoading = false; } - btnrgj8s9Status() { + btnguixdgStatus() { // * disabled status status - return this.inputPersonValue === '' + return this.inputPersonValue === ''; } - async btnuvurciCallback() { + async btnf5umnoCallback() { // * click event callback - this.isAddPeopleBtnLoading = true + this.isAddPeopleBtnLoading = true; const btnAddPeopleRunning = async () => { // * 唤起弹窗 - this.isInvateModalVisible = true + this.isInvateModalVisible = true; { { } { } } - } - await btnAddPeopleRunning() - this.isAddPeopleBtnLoading = false + }; + await btnAddPeopleRunning(); + this.isAddPeopleBtnLoading = false; } - btnsqcmi2Status() { + btny703n5Status() { // * disabled status status - return - return ( - this.workspace.currentWorkspaceID !== -1 && - this.workspace.authEnum.canEdit - ) + return; + return this.workspace.currentWorkspaceID !== -1 && this.workspace.authEnum.canEdit; } - async ew833r8Callback($event) { + async e97uoiuCallback($event) { // * eoOnRemove event callback const confirm = () => @@ -237,50 +224,50 @@ export class MemberComponent implements OnInit { nzOkDanger: true, nzOkText: $localize`Delete`, nzOnOk: () => resolve(true), - nzOnCancel: () => resolve(false) - }) - }) - const isOk = await confirm() + nzOnCancel: () => resolve(false), + }); + }); + const isOk = await confirm(); if (!isOk) { - return + return; } - const { id: workspaceID } = this.workspace.currentWorkspace + const { id: workspaceID } = this.workspace.currentWorkspace; - const { id } = $event + const { id } = $event; const [data, err]: any = await this.api.api_workspaceRemoveMember({ workspaceID, - userIDs: [id] - }) + userIDs: [id], + }); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - const { id: currentWorkspaceID } = this.workspace.currentWorkspace + const { id: currentWorkspaceID } = this.workspace.currentWorkspace; const [wData, wErr]: any = await this.api.api_workspaceMember({ - workspaceID: currentWorkspaceID - }) + workspaceID: currentWorkspaceID, + }); if (wErr) { if (wErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } // * 对成员列表进行排序 - const Owner = wData.filter((it) => it.roleName === 'Owner') - const Member = wData.filter((it) => it.roleName !== 'Owner') - this.memberList = Owner.concat(Member) + const Owner = wData.filter((it) => it.roleName === 'Owner'); + const Member = wData.filter((it) => it.roleName !== 'Owner'); + this.memberList = Owner.concat(Member); } } diff --git a/src/workbench/browser/src/app/pages/member.module.ts b/src/workbench/browser/src/app/pages/member.module.ts index 3095737dd..957ab6ae3 100644 --- a/src/workbench/browser/src/app/pages/member.module.ts +++ b/src/workbench/browser/src/app/pages/member.module.ts @@ -1,35 +1,20 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { NzModalService, NzModalModule } from 'ng-zorro-antd/modal' -import { NzInputModule } from 'ng-zorro-antd/input' -import { FormsModule } from '@angular/forms' -import { NzButtonModule } from 'ng-zorro-antd/button' -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' -import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service' -import { distinct } from 'rxjs/operators' -import { interval } from 'rxjs' -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service' -import { ManageAccessComponent } from 'eo/workbench/browser/src/app/shared/components/manage-access/manage-access.component' -import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module' +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NzModalService, NzModalModule } from 'ng-zorro-antd/modal'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { FormsModule } from '@angular/forms'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { ManageAccessComponent } from 'eo/workbench/browser/src/app/shared/components/manage-access/manage-access.component'; +import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'; -import { MemberRoutingModule } from './member-routing.module' -import { MemberComponent } from './member.component' +import { MemberRoutingModule } from './member-routing.module'; +import { MemberComponent } from './member.component'; @NgModule({ - imports: [ - MemberRoutingModule, - CommonModule, - NzModalModule, - NzInputModule, - FormsModule, - NzButtonModule, - SharedModule - ], + imports: [MemberRoutingModule, CommonModule, NzModalModule, NzInputModule, FormsModule, NzButtonModule, SharedModule], declarations: [MemberComponent, ManageAccessComponent], exports: [], - providers: [NzModalService, MessageService, RemoteService] + providers: [NzModalService, MessageService], }) export class MemberModule {} diff --git a/src/workbench/browser/src/app/pages/navbar/navbar.component.html b/src/workbench/browser/src/app/pages/navbar/navbar.component.html index 7208acff3..5456af300 100644 --- a/src/workbench/browser/src/app/pages/navbar/navbar.component.html +++ b/src/workbench/browser/src/app/pages/navbar/navbar.component.html @@ -6,7 +6,13 @@ -
    +
    -
    +
    + + +
    +

    Share via link

    +

    + This link will be updated with the API content. Everyone can access it without logging in +

    + + + +
    +     + + + + + + + +
    -
    +
    diff --git a/src/workbench/browser/src/app/pages/navbar/navbar.component.scss b/src/workbench/browser/src/app/pages/navbar/navbar.component.scss index b743d7bce..3de50d1d9 100644 --- a/src/workbench/browser/src/app/pages/navbar/navbar.component.scss +++ b/src/workbench/browser/src/app/pages/navbar/navbar.component.scss @@ -34,9 +34,6 @@ left: 0; top: 0; padding: 0 8px; - // background-color: var(--NAVBAR_BG); - // color: var(--NAVBAR_TEXT); - // border-bottom: 1px solid var(--NAVBAR_BORDER_BOTTOM); border-bottom: 1px solid var(--BORDER); height: var(--NAVBAR_HEIGHT); .logo { @@ -72,3 +69,8 @@ font-size: 12px; } } +.btn_scondary{ + color:var(--BTN_PRIMARY_BG); + border-color:var(--BTN_PRIMARY_BG); +} + diff --git a/src/workbench/browser/src/app/pages/navbar/navbar.component.ts b/src/workbench/browser/src/app/pages/navbar/navbar.component.ts index 325fa551f..cee096021 100644 --- a/src/workbench/browser/src/app/pages/navbar/navbar.component.ts +++ b/src/workbench/browser/src/app/pages/navbar/navbar.component.ts @@ -1,14 +1,19 @@ import { Component, OnInit } from '@angular/core'; import { ElectronService, WebService } from '../../core/services'; -import { ModuleInfo } from 'eo/platform/node/extension-manager'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SettingComponent } from '../../shared/components/setting/setting.component'; import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service'; import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; import { distinct } from 'rxjs/operators'; import { interval } from 'rxjs'; +import { copy } from 'eo/workbench/browser/src/app/utils/index.utils'; +import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; +import { LanguageService } from 'eo/workbench/browser/src/app/core/services/language/language.service'; @Component({ selector: 'eo-navbar', templateUrl: './navbar.component.html', @@ -23,6 +28,9 @@ export class NavbarComponent implements OnInit { modules: Map; resourceInfo = this.web.resourceInfo; issueEnvironment; + shareLink = ''; + langValue; + isCopy = false; constructor( public electron: ElectronService, private web: WebService, @@ -30,9 +38,14 @@ export class NavbarComponent implements OnInit { private message: MessageService, public workspaceService: WorkspaceService, public userService: UserService, - public dataSourceService: DataSourceService + public dataSourceService: DataSourceService, + public status: StatusService, + private http: RemoteService, + private eoMessage: EoMessageService, + private lang: LanguageService ) { this.issueEnvironment = this.getEnviroment(); + this.langValue = this.lang.systemLanguage; if (this.workspaceService.currentWorkspace?.id !== -1) { this.workspaceService.getWorkspaceInfo(this.workspaceService.currentWorkspace.id); } @@ -63,44 +76,75 @@ export class NavbarComponent implements OnInit { action: 'close', }); } - ngOnInit(): void { - if (this.electron.isElectron) { - this.modules = window.eo.getAppModuleList(); - } else { - this.modules = new Map(); + handleCopy() { + if (this.isCopy) { + return; } + const isOk = copy(this.shareLink); + if (isOk) { + this.isCopy = true; + interval(700).subscribe(() => { + this.isCopy = false; + }); + } + } + async ngOnInit(): Promise { + this.modules = new Map(); + this.shareLink = await this.getShareLink(); this.message .get() .pipe(distinct(({ type }) => type, interval(400))) - .subscribe(({ type }) => { + .subscribe(async ({ type }) => { if (type === 'open-setting') { this.openSettingModal(); + return; + } + if (type === 'update-share-link') { + // * request share link + this.shareLink = await this.getShareLink(); } }); } - loginOrSign() { - if (this.web.isWeb) { - return this.web.jumpToClient($localize`Eoapi Client is required to sign in`); + async getShareLink() { + if (this.workspaceService.isLocal) { + return ''; + } + if (!this.userService.isLogin) { + return ''; + } + if (this.status.isShare) { + return ''; } + const [res, err]: any = await this.http.api_shareCreateShare({}); + if (err) { + return ''; + } + const langHash = new Map().set('zh-Hans', 'zh').set('en-US', 'en'); + return `${this.dataSourceService?.remoteServerUrl || window.location.host}/${langHash.get( + this.lang.systemLanguage + )}/home/share/http/test?shareId=${res.uniqueID}`.replace( + /\/{2,}(zh|en)\/home\/share/, + `/${langHash.get(this.lang.systemLanguage)}/home/share` + ); + } + loginOrSign() { this.dataSourceService.checkRemoteCanOperate(); } loginOut() { this.message.send({ type: 'logOut', data: {} }); } async addWorkspace() { - if (this.web.isWeb) { - return this.web.jumpToClient($localize`Eoapi Client is required to add workspace`); - // 1. 如果配置了远程地址 - } else { - this.dataSourceService.checkRemoteCanOperate(() => { - this.message.send({ type: 'addWorkspace', data: {} }); - }); - } + this.dataSourceService.checkRemoteCanOperate(() => { + this.message.send({ type: 'addWorkspace', data: {} }); + }); } getModules(): Array { return Array.from(this.modules.values()); } + handleSwitchLang(event) { + this.lang.changeLanguage(event); + } /** * 打开系统设置 diff --git a/src/workbench/browser/src/app/pages/navbar/navbar.module.ts b/src/workbench/browser/src/app/pages/navbar/navbar.module.ts index b393fff45..e263c2a21 100644 --- a/src/workbench/browser/src/app/pages/navbar/navbar.module.ts +++ b/src/workbench/browser/src/app/pages/navbar/navbar.module.ts @@ -4,10 +4,11 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { NavbarComponent } from 'eo/workbench/browser/src/app/pages/navbar/navbar.component'; import { SettingModule } from 'eo/workbench/browser/src/app/shared/components/setting/setting.module'; import { CommonModule } from '@angular/common'; +import { NzSelectModule } from 'ng-zorro-antd/select'; import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'; @NgModule({ - imports: [CommonModule, NzDropDownModule, NzToolTipModule, SettingModule, SharedModule], + imports: [CommonModule, NzDropDownModule, NzSelectModule, NzToolTipModule, SettingModule, SharedModule], declarations: [NavbarComponent], exports: [NavbarComponent], }) diff --git a/src/workbench/browser/src/app/pages/pages-routing.module.ts b/src/workbench/browser/src/app/pages/pages-routing.module.ts index 42142330a..ae49775e9 100644 --- a/src/workbench/browser/src/app/pages/pages-routing.module.ts +++ b/src/workbench/browser/src/app/pages/pages-routing.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { PagesComponent } from './pages.component'; import { PageBlankComponent } from '../shared/components/page-blank/page-blank.component'; +import { Vue3Component } from 'eo/workbench/browser/src/app/pages/vue3/vue3.component'; const routes: Routes = [ { path: '', @@ -37,6 +38,15 @@ const routes: Routes = [ path: 'extension', loadChildren: () => import('./extension/extension.module').then((m) => m.ExtensionModule), }, + // { + // path: 'app-vue3', + // children: [ + // { + // path: '**', + // component: Vue3Component, + // }, + // ], + // }, ], }, ]; diff --git a/src/workbench/browser/src/app/pages/pages.component.ts b/src/workbench/browser/src/app/pages/pages.component.ts index 4245b3fe9..1d2277a79 100644 --- a/src/workbench/browser/src/app/pages/pages.component.ts +++ b/src/workbench/browser/src/app/pages/pages.component.ts @@ -7,7 +7,10 @@ import { ElectronService } from 'eo/workbench/browser/src/app/core/services'; styleUrls: ['./pages.component.scss'], }) export class PagesComponent implements OnInit { - isShowNotification = false; - constructor(public electron: ElectronService) {} - ngOnInit(): void {} + isShowNotification; + constructor(public electron: ElectronService) { + this.isShowNotification = false; + } + ngOnInit(): void { + } } diff --git a/src/workbench/browser/src/app/pages/pages.module.ts b/src/workbench/browser/src/app/pages/pages.module.ts index 3170c310a..6373ea902 100644 --- a/src/workbench/browser/src/app/pages/pages.module.ts +++ b/src/workbench/browser/src/app/pages/pages.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { CommonModule, LocationStrategy } from '@angular/common'; import { PagesRoutingModule } from './pages-routing.module'; import { SettingModule } from '../shared/components/setting/setting.module'; import { PagesComponent } from './pages.component'; @@ -10,6 +10,7 @@ import { UserModalComponent } from './user-modal.component'; import { NzModalService } from 'ng-zorro-antd/modal'; import { NzAlertModule } from 'ng-zorro-antd/alert'; + @NgModule({ imports: [PagesRoutingModule, SettingModule, EouiModule, CommonModule, NzAlertModule, SharedModule, NavbarModule], declarations: [PagesComponent, UserModalComponent], diff --git a/src/workbench/browser/src/app/pages/share-routing.module.ts b/src/workbench/browser/src/app/pages/share-routing.module.ts index bce30c42b..3248569c9 100644 --- a/src/workbench/browser/src/app/pages/share-routing.module.ts +++ b/src/workbench/browser/src/app/pages/share-routing.module.ts @@ -7,6 +7,35 @@ const routes: Routes = [ { path: '', component: ShareComponent, + children: [ + { + path: '', + redirectTo: 'http', + pathMatch: 'full', + }, + { + path: 'http', + children: [ + { + path: 'detail', + loadChildren: () => import('../pages/api/http/detail/api-detail.module').then((m) => m.ApiDetailModule), + }, + { + path: 'test', + loadChildren: () => import('../pages/api/http/test/api-test.module').then((m) => m.ApiTestModule), + }, + ], + }, + { + path: 'ws', + children: [ + { + path: 'test', + loadChildren: () => import('../pages/api/websocket/websocket.module').then((m) => m.WebsocketModule), + }, + ], + }, + ], }, ]; diff --git a/src/workbench/browser/src/app/pages/share.component.ts b/src/workbench/browser/src/app/pages/share.component.ts index 33e78bb30..f76014b11 100644 --- a/src/workbench/browser/src/app/pages/share.component.ts +++ b/src/workbench/browser/src/app/pages/share.component.ts @@ -1,10 +1,17 @@ import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; @Component({ selector: 'eo-share', - template: `
    share
    `, + template: `
    `, }) export class ShareComponent implements OnInit { - constructor() {} - async ngOnInit(): Promise {} + constructor(private route: ActivatedRoute, private share: ShareService, private status: StatusService) {} + async ngOnInit(): Promise { + this.route.queryParams.subscribe(({ shareId }) => { + this.share.setShareId(shareId); + }); + } } diff --git a/src/workbench/browser/src/app/pages/share.module.ts b/src/workbench/browser/src/app/pages/share.module.ts index 77e4dc071..a98456818 100644 --- a/src/workbench/browser/src/app/pages/share.module.ts +++ b/src/workbench/browser/src/app/pages/share.module.ts @@ -1,13 +1,14 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { ApiModule } from 'eo/workbench/browser/src/app/pages/api/api.module' -import { ShareRoutingModule } from './share-routing.module'; -import { ShareComponent } from './share.component'; +import { ShareRoutingModule } from './share-routing.module' +import { ShareComponent } from './share.component' @NgModule({ - imports: [ShareRoutingModule, CommonModule], + imports: [ShareRoutingModule, CommonModule, ApiModule], declarations: [ShareComponent], exports: [], - providers: [], + providers: [] }) export class ShareModule {} diff --git a/src/workbench/browser/src/app/pages/user-modal.component.ts b/src/workbench/browser/src/app/pages/user-modal.component.ts index 0a6eeb5fe..da879d0a4 100644 --- a/src/workbench/browser/src/app/pages/user-modal.component.ts +++ b/src/workbench/browser/src/app/pages/user-modal.component.ts @@ -1,20 +1,17 @@ -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' -import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service' -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service' -import { distinct } from 'rxjs/operators' -import { interval } from 'rxjs' -import { NzModalService } from 'ng-zorro-antd/modal' -import { - UntypedFormBuilder, - UntypedFormControl, - UntypedFormGroup, - Validators -} from '@angular/forms' -import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' -import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service' +import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; +import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service'; +import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { distinct } from 'rxjs/operators'; +import { interval } from 'rxjs'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; +import { ViewChild, ElementRef, Component, OnInit } from '@angular/core'; +import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service'; +import { WebService } from 'eo/workbench/browser/src/app/core/services'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; @Component({ selector: 'eo-user-modal', @@ -22,14 +19,13 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzFooter]="modalSyncFooter" [(nzVisible)]="isSyncModalVisible" (nzOnCancel)="handleSyncModalCancel()" - (nzAfterClose)="ek3bbgpCallback()" + (nzAfterClose)="e7odmm4Callback()" nzTitle="Do you want to upload local data to the cloud ?" i18n-nzTitle > - After confirmation, the system will create a cloud space to upload the - local data to the cloud. + After confirmation, the system will create a cloud space to upload the local data to the cloud. Cancel @@ -54,7 +50,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzLoading]="isSyncSyncBtnLoading" class="" nzType="primary" - (click)="btnddl2g5Callback()" + (click)="btnsf8zsrCallback()" i18n > Sync @@ -65,18 +61,13 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzFooter]="modalCheckConnectFooter" [(nzVisible)]="isCheckConnectModalVisible" (nzOnCancel)="handleCheckConnectModalCancel()" - (nzAfterClose)="e3xpndmCallback()" + (nzAfterClose)="e4pgjfkCallback()" nzTitle="Check your connection" i18n-nzTitle > Can't connect right now, click to retry or - + config in the configuration @@ -86,7 +77,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzLoading]="isCheckConnectCancelBtnLoading" class="" nzType="default" - (click)="btn85p48gCallback()" + (click)="btnzls4ymCallback()" i18n > Cancel @@ -96,7 +87,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzLoading]="isCheckConnectRetryBtnLoading" class="" nzType="primary" - (click)="btnb778v9Callback()" + (click)="btn0mu0b2Callback()" i18n > Retry @@ -108,7 +99,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzWidth]="400" [(nzVisible)]="isLoginModalVisible" (nzOnCancel)="handleLoginModalCancel()" - (nzAfterClose)="e31iieeCallback()" + (nzAfterClose)="euu4ezrCallback()" nzTitle="Sign In/Up" i18n-nzTitle > @@ -138,13 +129,9 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w i18n-placeholder /> - - Please input your password; - + Please input your password; - - Min length is 6; - + Min length is 6; @@ -157,7 +144,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w class="h-10 mt-2" nzType="primary" nzBlock - (click)="btnwvmlg8Callback()" + (click)="btnvz94ljCallback()" i18n > Sign In/Up @@ -171,18 +158,13 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzFooter]="null" [(nzVisible)]="isOpenSettingModalVisible" (nzOnCancel)="handleOpenSettingModalCancel()" - (nzAfterClose)="ejr6w2fCallback()" + (nzAfterClose)="e95oi5lCallback()" nzTitle="Open setting" i18n-nzTitle > If you want to collaborate, please - + open the settings and fill in the configuration @@ -192,16 +174,12 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w [nzFooter]="null" [(nzVisible)]="isAddWorkspaceModalVisible" (nzOnCancel)="handleAddWorkspaceModalCancel()" - (nzAfterClose)="epruwutCallback()" + (nzAfterClose)="ebdsz2aCallback()" nzTitle="Add Workspace" i18n-nzTitle > - + Cancel @@ -233,7 +211,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w type="submit" class="" nzType="primary" - (click)="btnkh8m1jCallback()" + (click)="btnd4wbcjCallback()" i18n > Save @@ -241,26 +219,26 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w
    - ` + `, }) export class UserModalComponent implements OnInit { - isSyncModalVisible - isSyncCancelBtnLoading - isSyncSyncBtnLoading - isCheckConnectModalVisible - isCheckConnectCancelBtnLoading - isCheckConnectRetryBtnLoading - isLoginModalVisible - validateLoginForm - @ViewChild('usernameLoginRef') usernameLoginRef: ElementRef - isLoginBtnBtnLoading - isOpenSettingModalVisible - isAddWorkspaceModalVisible - validateWorkspaceNameForm + isSyncModalVisible; + isSyncCancelBtnLoading; + isSyncSyncBtnLoading; + isCheckConnectModalVisible; + isCheckConnectCancelBtnLoading; + isCheckConnectRetryBtnLoading; + isLoginModalVisible; + validateLoginForm; + @ViewChild('usernameLoginRef') usernameLoginRef: ElementRef; + isLoginBtnBtnLoading; + isOpenSettingModalVisible; + isAddWorkspaceModalVisible; + validateWorkspaceNameForm; @ViewChild('newWorkNameWorkspaceNameRef') - newWorkNameWorkspaceNameRef: ElementRef - isCancelBtnLoading - isSaveBtnLoading + newWorkNameWorkspaceNameRef: ElementRef; + isCancelBtnLoading; + isSaveBtnLoading; constructor( public user: UserService, public message: MessageService, @@ -270,22 +248,24 @@ export class UserModalComponent implements OnInit { public dataSource: DataSourceService, public modal: NzModalService, public fb: UntypedFormBuilder, - public workspace: WorkspaceService + public workspace: WorkspaceService, + private web: WebService, + private status: StatusService ) { - this.isSyncModalVisible = false - this.isSyncCancelBtnLoading = false - this.isSyncSyncBtnLoading = false - this.isCheckConnectModalVisible = false - this.isCheckConnectCancelBtnLoading = false - this.isCheckConnectRetryBtnLoading = false - this.isLoginModalVisible = false - this.validateLoginForm = UntypedFormGroup - this.isLoginBtnBtnLoading = false - this.isOpenSettingModalVisible = false - this.isAddWorkspaceModalVisible = false - this.validateWorkspaceNameForm = UntypedFormGroup - this.isCancelBtnLoading = false - this.isSaveBtnLoading = false + this.isSyncModalVisible = false; + this.isSyncCancelBtnLoading = false; + this.isSyncSyncBtnLoading = false; + this.isCheckConnectModalVisible = false; + this.isCheckConnectCancelBtnLoading = false; + this.isCheckConnectRetryBtnLoading = false; + this.isLoginModalVisible = false; + this.validateLoginForm = UntypedFormGroup; + this.isLoginBtnBtnLoading = false; + this.isOpenSettingModalVisible = false; + this.isAddWorkspaceModalVisible = false; + this.validateWorkspaceNameForm = UntypedFormGroup; + this.isCancelBtnLoading = false; + this.isSaveBtnLoading = false; } async ngOnInit(): Promise { this.message @@ -294,438 +274,443 @@ export class UserModalComponent implements OnInit { .subscribe(async ({ type, data }) => { if (type === 'login') { // * 唤起弹窗 - this.isLoginModalVisible = true + this.isLoginModalVisible = true; { { { // * auto focus setTimeout(() => { - this.usernameLoginRef?.nativeElement.focus() - }, 300) + this.usernameLoginRef?.nativeElement.focus(); + }, 300); } } } - return + return; } if (type === 'clear-user') { - this.user.clearAuth() + this.user.clearAuth(); this.user.setUserProfile({ id: -1, password: '', username: '', - workspaces: [] - }) - return + workspaces: [], + }); + return; } if (type === 'http-401') { - const { id } = this.workspace.currentWorkspace + const { id } = this.workspace.currentWorkspace; if (id === -1) { - return + return; } // * 唤起弹窗 - this.isLoginModalVisible = true + this.isLoginModalVisible = true; { { { // * auto focus setTimeout(() => { - this.usernameLoginRef?.nativeElement.focus() - }, 300) + this.usernameLoginRef?.nativeElement.focus(); + }, 300); } } } - return + return; } if (type === 'logOut') { - this.workspace.setCurrentWorkspaceID(-1) + this.workspace.setCurrentWorkspaceID(-1); this.user.setUserProfile({ id: -1, password: '', username: '', - workspaces: [] - }) + workspaces: [], + }); { - this.workspace.setWorkspaceList([]) + this.workspace.setWorkspaceList([]); } - this.workspace.setCurrentWorkspace( - this.workspace.getLocalWorkspaceInfo() - ) - this.eMessage.success($localize`Successfully logged out !`) - const refreshToken = this.user.refreshToken - this.user.clearAuth() + this.workspace.setCurrentWorkspace(this.workspace.getLocalWorkspaceInfo()); + this.eMessage.success($localize`Successfully logged out !`); + const refreshToken = this.user.refreshToken; + this.user.clearAuth(); { const [data, err]: any = await this.api.api_authLogout({ - refreshToken - }) + refreshToken, + }); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } } - return + return; } if (type === 'ping-fail') { - this.eMessage.error($localize`Connect failed`) + this.eMessage.error($localize`Connect failed`); // * 唤起弹窗 - this.isCheckConnectModalVisible = true + this.isCheckConnectModalVisible = true; { } - return + return; } if (type === 'ping-success') { - this.eMessage.success($localize`Connect success`) - return + this.eMessage.success($localize`Connect success`); + return; } if (type === 'need-config-remote') { // * 唤起弹窗 - this.isOpenSettingModalVisible = true + this.isOpenSettingModalVisible = true; - return + return; } if (type === 'addWorkspace') { // * 唤起弹窗 - this.isAddWorkspaceModalVisible = true + this.isAddWorkspaceModalVisible = true; { { // * auto focus setTimeout(() => { - this.newWorkNameWorkspaceNameRef?.nativeElement.focus() - }, 300) + this.newWorkNameWorkspaceNameRef?.nativeElement.focus(); + }, 300); } } - return + return; } if (type === 'retry') { // * 唤起弹窗 - this.isCheckConnectModalVisible = true + this.isCheckConnectModalVisible = true; { } - return + return; } - }) + }); // * Init Login form this.validateLoginForm = this.fb.group({ username: [null, [Validators.required]], - password: [null, [Validators.required, Validators.minLength(6)]] - }) + password: [null, [Validators.required, Validators.minLength(6)]], + }); // * Init WorkspaceName form this.validateWorkspaceNameForm = this.fb.group({ - newWorkName: [null, [Validators.required]] - }) + newWorkName: [null, [Validators.required]], + }); - const { id: workspaceID } = this.workspace.currentWorkspace - const [data, err]: any = await this.api.api_workspaceList({}) + const { id: workspaceID } = this.workspace.currentWorkspace; + if (this.status.isShare) { + return; + } + const [data, err]: any = await this.api.api_workspaceList({}); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.workspace.setWorkspaceList(data) + this.workspace.setWorkspaceList(data); if (workspaceID !== -1) { - const { projects } = await this.workspace.getWorkspaceInfo(workspaceID) - this.project.setCurrentProjectID(projects.at(0).uuid) + const { projects } = await this.workspace.getWorkspaceInfo(workspaceID); + this.project.setCurrentProjectID(projects.at(0).uuid); } - const url = this.dataSource.mockUrl + const url = this.dataSource.remoteServerUrl; if (url === '') { // * 唤起弹窗 - this.isOpenSettingModalVisible = true + // this.isOpenSettingModalVisible = true; { } - return + return; } - const { id: currentWorkspaceID } = this.workspace.currentWorkspace + const { id: currentWorkspaceID } = this.workspace.currentWorkspace; if (currentWorkspaceID === -1) { - return + return; } - const status = this.dataSource.isConnectRemote + const status = this.dataSource.isConnectRemote; if (!status) { // * 唤起弹窗 - this.isCheckConnectModalVisible = true + if (this.web.isWeb) { + return; + } + this.isCheckConnectModalVisible = true; { } - return + return; } } handleSyncModalCancel(): void { // * 关闭弹窗 - this.isSyncModalVisible = false + this.isSyncModalVisible = false; } - async ek3bbgpCallback() { + async e7odmm4Callback() { // * nzAfterClose event callback { } } - async btn4wxiipCallback() { + async btnsgs0ckCallback() { // * click event callback - this.isSyncCancelBtnLoading = true + this.isSyncCancelBtnLoading = true; const btnSyncCancelRunning = async () => { // * 关闭弹窗 - this.isSyncModalVisible = false - } - await btnSyncCancelRunning() - this.isSyncCancelBtnLoading = false + this.isSyncModalVisible = false; + }; + await btnSyncCancelRunning(); + this.isSyncCancelBtnLoading = false; } - async btnddl2g5Callback() { + async btnsf8zsrCallback() { // * click event callback - this.isSyncSyncBtnLoading = true + this.isSyncSyncBtnLoading = true; const btnSyncSyncRunning = async () => { - const eData = await this.project.exportLocalProjectData() + const eData = await this.project.exportLocalProjectData(); - const [data, err]: any = await this.api.api_workspaceUpload(eData) + const [data, err]: any = await this.api.api_workspaceUpload(eData); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - const { workspace } = data - const list = this.workspace - .getWorkspaceList() - .filter((it) => it.id !== -1) - this.workspace.setWorkspaceList([...list, workspace]) - this.workspace.setCurrentWorkspaceID(workspace) + const { workspace } = data; + const list = this.workspace.getWorkspaceList().filter((it) => it.id !== -1); + this.workspace.setWorkspaceList([...list, workspace]); + this.workspace.setCurrentWorkspaceID(workspace); // * 关闭弹窗 - this.isSyncModalVisible = false - } - await btnSyncSyncRunning() - this.isSyncSyncBtnLoading = false + this.isSyncModalVisible = false; + }; + await btnSyncSyncRunning(); + this.isSyncSyncBtnLoading = false; } handleCheckConnectModalCancel(): void { // * 关闭弹窗 - this.isCheckConnectModalVisible = false + this.isCheckConnectModalVisible = false; } - async e3xpndmCallback() { + async e4pgjfkCallback() { // * nzAfterClose event callback { } } - async btn85p48gCallback() { + async btnzls4ymCallback() { // * click event callback - this.isCheckConnectCancelBtnLoading = true + this.isCheckConnectCancelBtnLoading = true; const btnCheckConnectCancelRunning = async () => { // * 关闭弹窗 - this.isCheckConnectModalVisible = false - } - await btnCheckConnectCancelRunning() - this.isCheckConnectCancelBtnLoading = false + this.isCheckConnectModalVisible = false; + }; + await btnCheckConnectCancelRunning(); + this.isCheckConnectCancelBtnLoading = false; } - async btnb778v9Callback() { + async btn0mu0b2Callback() { // * click event callback - this.isCheckConnectRetryBtnLoading = true + this.isCheckConnectRetryBtnLoading = true; const btnCheckConnectRetryRunning = async () => { - this.dataSource.checkRemoteAndTipModal() + this.dataSource.checkRemoteAndTipModal(); // * 关闭弹窗 - this.isCheckConnectModalVisible = false - } - await btnCheckConnectRetryRunning() - this.isCheckConnectRetryBtnLoading = false + this.isCheckConnectModalVisible = false; + }; + await btnCheckConnectRetryRunning(); + this.isCheckConnectRetryBtnLoading = false; } - async texte83xg2Callback() { + async textiqd22iCallback() { // * click event callback + this.message.send({ type: 'open-setting', data: {} }); // * 关闭弹窗 - this.isOpenSettingModalVisible = false + this.isCheckConnectModalVisible = false; + this.isOpenSettingModalVisible = false; } handleLoginModalCancel(): void { // * 关闭弹窗 - this.isLoginModalVisible = false + this.isLoginModalVisible = false; } - async e31iieeCallback() { + async euu4ezrCallback() { // * nzAfterClose event callback { // * auto clear form - this.validateLoginForm.reset() + this.validateLoginForm.reset(); } } - async btnwvmlg8Callback() { + async btnvz94ljCallback() { // * click event callback - this.isLoginBtnBtnLoading = true + this.isLoginBtnBtnLoading = true; const btnLoginBtnRunning = async () => { - const isOk = this.validateLoginForm.valid + const isOk = this.validateLoginForm.valid; if (!isOk) { - this.eMessage.error($localize`Please check you username or password`) - return + this.eMessage.error($localize`Please check you username or password`); + return; } - // * get login form values - const formData = this.validateLoginForm.value - const [data, err]: any = await this.api.api_authLogin(formData) + const formData = this.validateLoginForm.value; + const [data, err]: any = await this.api.api_authLogin(formData); if (err) { this.eMessage.error( $localize`Please check the account/password, the account must be a mobile phone number or email !` - ) - if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + ); + if ([401, 403].includes(err.status)) { + this.isLoginBtnBtnLoading = false; + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.user.setLoginInfo(data) + this.user.setLoginInfo(data); // * 关闭弹窗 - this.isLoginModalVisible = false + this.isLoginModalVisible = false; + this.message.send({ type: 'update-share-link', data: {} }); { - const [data, err]: any = await this.api.api_userReadProfile(null) + const [data, err]: any = await this.api.api_userReadProfile(null); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.user.setUserProfile(data) + this.user.setUserProfile(data); } { - const [data, err]: any = await this.api.api_workspaceList({}) + const [data, err]: any = await this.api.api_workspaceList({}); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.workspace.setWorkspaceList(data) + this.workspace.setWorkspaceList(data); } if (!data.isFirstLogin) { - return + return; } // * 唤起弹窗 - this.isSyncModalVisible = true + this.isSyncModalVisible = true; { } - } - await btnLoginBtnRunning() - this.isLoginBtnBtnLoading = false + }; + await btnLoginBtnRunning(); + this.isLoginBtnBtnLoading = false; } handleOpenSettingModalCancel(): void { // * 关闭弹窗 - this.isOpenSettingModalVisible = false + this.isOpenSettingModalVisible = false; } - async ejr6w2fCallback() { + async e95oi5lCallback() { // * nzAfterClose event callback { } } - async textnrbqvsCallback() { + async textqdb64pCallback() { // * click event callback - this.message.send({ type: 'open-setting', data: {} }) + this.message.send({ type: 'open-setting', data: {} }); // * 关闭弹窗 - this.isOpenSettingModalVisible = false + this.isOpenSettingModalVisible = false; } handleAddWorkspaceModalCancel(): void { // * 关闭弹窗 - this.isAddWorkspaceModalVisible = false + this.isAddWorkspaceModalVisible = false; } - async epruwutCallback() { + async ebdsz2aCallback() { // * nzAfterClose event callback { // * auto clear form - this.validateWorkspaceNameForm.reset() + this.validateWorkspaceNameForm.reset(); } } - async btnfjbf3iCallback() { + async btn66ztjiCallback() { // * click event callback - this.isCancelBtnLoading = true + this.isCancelBtnLoading = true; const btnCancelRunning = async () => { // * 关闭弹窗 - this.isAddWorkspaceModalVisible = false - } - await btnCancelRunning() - this.isCancelBtnLoading = false + this.isAddWorkspaceModalVisible = false; + }; + await btnCancelRunning(); + this.isCancelBtnLoading = false; } - async btnkh8m1jCallback() { + async btnd4wbcjCallback() { // * click event callback - this.isSaveBtnLoading = true + this.isSaveBtnLoading = true; const btnSaveRunning = async () => { - const { newWorkName: title } = this.validateWorkspaceNameForm.value - const [data, err]: any = await this.api.api_workspaceCreate({ title }) + const { newWorkName: title } = this.validateWorkspaceNameForm.value; + const [data, err]: any = await this.api.api_workspaceCreate({ title }); if (err) { - this.eMessage.error($localize`Add workspace Failed !`) + this.eMessage.error($localize`Add workspace Failed !`); if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.eMessage.success($localize`Create new workspace successfully !`) + this.eMessage.success($localize`Create new workspace successfully !`); // * 关闭弹窗 - this.isAddWorkspaceModalVisible = false - + this.isAddWorkspaceModalVisible = false; + this.message.send({ type: 'update-share-link', data: {} }); { - const [lData, err]: any = await this.api.api_workspaceList({}) + const [lData, err]: any = await this.api.api_workspaceList({}); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.workspace.setWorkspaceList(lData) - this.workspace.setCurrentWorkspace(data) + this.workspace.setWorkspaceList(lData); + this.workspace.setCurrentWorkspace(data); } - } - await btnSaveRunning() - this.isSaveBtnLoading = false + }; + await btnSaveRunning(); + this.isSaveBtnLoading = false; } } diff --git a/src/workbench/browser/src/app/pages/vue3/vue3.component.html b/src/workbench/browser/src/app/pages/vue3/vue3.component.html new file mode 100644 index 000000000..90859cda6 --- /dev/null +++ b/src/workbench/browser/src/app/pages/vue3/vue3.component.html @@ -0,0 +1,5 @@ +
    + +
    diff --git a/src/workbench/browser/src/app/pages/vue3/vue3.component.scss b/src/workbench/browser/src/app/pages/vue3/vue3.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/workbench/browser/src/app/pages/vue3/vue3.component.spec.ts b/src/workbench/browser/src/app/pages/vue3/vue3.component.spec.ts new file mode 100644 index 000000000..d05273c6c --- /dev/null +++ b/src/workbench/browser/src/app/pages/vue3/vue3.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { Vue3Component } from './vue3.component'; + +describe('Vue3Component', () => { + let component: Vue3Component; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ Vue3Component ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(Vue3Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/workbench/browser/src/app/pages/vue3/vue3.component.ts b/src/workbench/browser/src/app/pages/vue3/vue3.component.ts new file mode 100644 index 000000000..b5701bd98 --- /dev/null +++ b/src/workbench/browser/src/app/pages/vue3/vue3.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-vue3', + templateUrl: './vue3.component.html', + styleUrls: ['./vue3.component.scss'], +}) +export class Vue3Component implements OnInit { + url = `https://www.npmjs.com/`; + name = 'app-vue3'; + + constructor() {} + + microAppData = { msg: '来自基座的数据' }; + + ngOnInit(): void {} + + handleCreate(): void { + console.log('child-vue3 创建了'); + } + + handleBeforeMount(): void { + console.log('child-vue3 即将被渲染'); + } + + handleMount(): void { + console.log('child-vue3 已经渲染完成'); + + setTimeout(() => { + this.microAppData = { msg: '来自基座的新数据' }; + }, 2000); + } + + handleUnmount(): void { + console.log('child-vue3 卸载了'); + } + + handleError(): void { + console.log('child-vue3 加载出错了'); + } + + handleDataChange(e): void { + console.log('来自子应用 child-vue3 的数据:', e.detail.data); + } +} diff --git a/src/workbench/browser/src/app/pages/workspace.component.ts b/src/workbench/browser/src/app/pages/workspace.component.ts index 9e218c531..2025ad950 100644 --- a/src/workbench/browser/src/app/pages/workspace.component.ts +++ b/src/workbench/browser/src/app/pages/workspace.component.ts @@ -1,16 +1,16 @@ -import { NzModalService } from 'ng-zorro-antd/modal' -import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' +import { NzModalService } from 'ng-zorro-antd/modal'; +import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service'; +import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; +import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators -} from '@angular/forms' -import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' +} from '@angular/forms'; +import { ViewChild, ElementRef, Component, OnInit } from '@angular/core'; @Component({ selector: 'eo-workspace', @@ -50,7 +50,7 @@ import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' [nzLoading]="isSaveBtnBtnLoading" class="" nzType="primary" - (click)="btnkklkd9Callback()" + (click)="btnogunjqCallback()" i18n > Save @@ -73,7 +73,7 @@ import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' class="" nzType="primary" nzDanger - (click)="btnbtfiktCallback()" + (click)="btn5y8eslCallback()" i18n > Delete @@ -82,9 +82,9 @@ import { ViewChild, ElementRef, Component, OnInit } from '@angular/core' ` }) export class WorkspaceComponent implements OnInit { - validateWspNameForm - isSaveBtnBtnLoading - isDelWspBtnLoading + validateWspNameForm; + isSaveBtnBtnLoading; + isDelWspBtnLoading; constructor( public modal: NzModalService, public workspace: WorkspaceService, @@ -94,66 +94,66 @@ export class WorkspaceComponent implements OnInit { public api: RemoteService, public fb: UntypedFormBuilder ) { - this.validateWspNameForm = UntypedFormGroup - this.isSaveBtnBtnLoading = false - this.isDelWspBtnLoading = false + this.validateWspNameForm = UntypedFormGroup; + this.isSaveBtnBtnLoading = false; + this.isDelWspBtnLoading = false; } async ngOnInit(): Promise { // * Init WspName form this.validateWspNameForm = this.fb.group({ workspace: [null, [Validators.required]] - }) + }); - const { title: currentWsp } = this.workspace.currentWorkspace + const { title: currentWsp } = this.workspace.currentWorkspace; // * get WspName form values this.validateWspNameForm.patchValue({ workspace: currentWsp - }) + }); } - async btnkklkd9Callback() { + async btnogunjqCallback() { // * click event callback - this.isSaveBtnBtnLoading = true + this.isSaveBtnBtnLoading = true; const btnSaveBtnRunning = async () => { - const { id: currentWsp } = this.workspace.currentWorkspace - const { workspace: title } = this.validateWspNameForm.value + const { id: currentWsp } = this.workspace.currentWorkspace; + const { workspace: title } = this.validateWspNameForm.value; const [data, err]: any = await this.api.api_workspaceEdit({ workspaceID: currentWsp, title - }) + }); if (err) { - this.eMessage.error($localize`Edit workspace failed`) + this.eMessage.error($localize`Edit workspace failed`); if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.eMessage.success($localize`Edit workspace successfully !`) - const [list, wErr]: any = await this.api.api_workspaceList({}) + this.eMessage.success($localize`Edit workspace successfully !`); + const [list, wErr]: any = await this.api.api_workspaceList({}); if (wErr) { if (wErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.workspace.setWorkspaceList(list) - } - await btnSaveBtnRunning() - this.isSaveBtnBtnLoading = false + this.workspace.setWorkspaceList(list); + }; + await btnSaveBtnRunning(); + this.isSaveBtnBtnLoading = false; } - async btnbtfiktCallback() { + async btn5y8eslCallback() { // * click event callback - this.isDelWspBtnLoading = true + this.isDelWspBtnLoading = true; const btnDelWspRunning = async () => { - this.isDelWspBtnLoading = false + this.isDelWspBtnLoading = false; const confirm = () => new Promise((resolve) => { @@ -162,46 +162,46 @@ export class WorkspaceComponent implements OnInit { nzContent: $localize`Are you sure you want to delete the workspace ? You cannot restore it once deleted!`, nzOkDanger: true, - nzOkText: $localize`Remove`, + nzOkText: $localize`Delete`, nzOnOk: () => resolve(true), nzOnCancel: () => resolve(false) - }) - }) - const isOk = await confirm() + }); + }); + const isOk = await confirm(); if (!isOk) { - return + return; } - const { id: currentWsp } = this.workspace.currentWorkspace + const { id: currentWsp } = this.workspace.currentWorkspace; const [data, err]: any = await this.api.api_workspaceDelete({ workspaceID: currentWsp - }) + }); if (err) { if (err.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.eMessage.success($localize`Delete success !`) - await this.workspace.setLocalSpace() - const [list, wErr]: any = await this.api.api_workspaceList({}) + this.eMessage.success($localize`Delete success !`); + await this.workspace.setLocalSpace(); + const [list, wErr]: any = await this.api.api_workspaceList({}); if (wErr) { if (wErr.status === 401) { - this.message.send({ type: 'clear-user', data: {} }) + this.message.send({ type: 'clear-user', data: {} }); if (this.user.isLogin) { - return + return; } - this.message.send({ type: 'http-401', data: {} }) + this.message.send({ type: 'http-401', data: {} }); } - return + return; } - this.workspace.setWorkspaceList(list) - } - await btnDelWspRunning() - this.isDelWspBtnLoading = false + this.workspace.setWorkspaceList(list); + }; + await btnDelWspRunning(); + this.isDelWspBtnLoading = false; } } diff --git a/src/workbench/browser/src/app/pages/workspace.module.ts b/src/workbench/browser/src/app/pages/workspace.module.ts index 3fc0f07cb..a2932a84f 100644 --- a/src/workbench/browser/src/app/pages/workspace.module.ts +++ b/src/workbench/browser/src/app/pages/workspace.module.ts @@ -1,22 +1,18 @@ -import { NgModule } from '@angular/core' -import { CommonModule } from '@angular/common' -import { NzModalService, NzModalModule } from 'ng-zorro-antd/modal' -import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service' -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service' -import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service' -import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service' -import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service' -import { ApiOverviewComponent } from 'eo/workbench/browser/src/app/pages/api/overview/api-overview.component' -import { EoIconparkIconModule } from 'eo/workbench/browser/src/app/eoui/iconpark-icon/eo-iconpark-icon.module' -import { NzDividerModule } from 'ng-zorro-antd/divider' -import { NzCardModule } from 'ng-zorro-antd/card' -import { ReactiveFormsModule } from '@angular/forms' -import { NzFormModule } from 'ng-zorro-antd/form' -import { NzInputModule } from 'ng-zorro-antd/input' -import { NzButtonModule } from 'ng-zorro-antd/button' +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NzModalService, NzModalModule } from 'ng-zorro-antd/modal'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { ApiOverviewComponent } from 'eo/workbench/browser/src/app/pages/api/overview/api-overview.component'; +import { EoIconparkIconModule } from 'eo/workbench/browser/src/app/eoui/iconpark-icon/eo-iconpark-icon.module'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { ReactiveFormsModule } from '@angular/forms'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzButtonModule } from 'ng-zorro-antd/button'; -import { WorkspaceRoutingModule } from './workspace-routing.module' -import { WorkspaceComponent } from './workspace.component' +import { WorkspaceRoutingModule } from './workspace-routing.module'; +import { WorkspaceComponent } from './workspace.component'; @NgModule({ imports: [ @@ -29,10 +25,10 @@ import { WorkspaceComponent } from './workspace.component' ReactiveFormsModule, NzFormModule, NzInputModule, - NzButtonModule + NzButtonModule, ], declarations: [WorkspaceComponent, ApiOverviewComponent], exports: [], - providers: [NzModalService, MessageService, RemoteService] + providers: [NzModalService, MessageService], }) export class WorkspaceModule {} diff --git a/src/workbench/browser/src/app/shared/components/api-script/constant.ts b/src/workbench/browser/src/app/shared/components/api-script/constant.ts index d69b8e78f..f94b3a8ed 100644 --- a/src/workbench/browser/src/app/shared/components/api-script/constant.ts +++ b/src/workbench/browser/src/app/shared/components/api-script/constant.ts @@ -160,41 +160,6 @@ const COMMON_DATA: TreeNode[] = [ }, ], }, - { - name: $localize`Environment Management`, - children: [ - { - name: $localize`Get enviroment host`, - caption: 'eo.env.http.baseUrl.get', - value: 'eo.env.http.baseUrl.get()', - note: { - code: 'eo.env.http.baseUrl.get()', - desc: $localize`Get enviroment host`, - output: $localize`The host prefix set in the environment`, - }, - }, - { - name: $localize`Get an environment variables`, - caption: 'eo.env.param.get', - value: 'eo.env.param.get("param_key")', - note: { - code: 'eo.env.param.get("param_key")', - desc: $localize`Get an environment variables`, - input: [commonInputs[0]], - }, - }, - { - name: $localize`Set an environment variables`, - caption: 'eo.env.param.set', - value: 'eo.env.param.set("param_key","param_value")', - note: { - code: 'eo.env.param.set("param_key","param_value")', - desc: $localize`Set an environment variables`, - input: [...commonInputs], - }, - }, - ], - }, { name: $localize`Encode and Decode`, children: [ diff --git a/src/workbench/browser/src/app/shared/components/env-list/env-list.component.ts b/src/workbench/browser/src/app/shared/components/env-list/env-list.component.ts index aac304b0c..d3c087be9 100644 --- a/src/workbench/browser/src/app/shared/components/env-list/env-list.component.ts +++ b/src/workbench/browser/src/app/shared/components/env-list/env-list.component.ts @@ -1,5 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { getGlobals } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.utils'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; import { Environment, StorageRes, StorageResStatus } from '../../../shared/services/storage/index.model'; import { StorageService } from '../../services/storage'; @@ -12,12 +15,14 @@ import { StorageService } from '../../services/storage'; {{ it.value }}

    No Global variables

    -
    - Environment Host -
    -

    {{ env.hostUri }}

    +
    +
    + Environment Host +
    +

    {{ env.hostUri }}

    +
    - Environment variable + Environment Global variable
    {{ it.name }} {{ it.value }} @@ -29,7 +34,12 @@ import { StorageService } from '../../services/storage'; export class EnvListComponent implements OnInit { env: Environment | any = {}; gloablParams: any = []; - constructor(private storage: StorageService) {} + constructor( + private storage: StorageService, + private share: ShareService, + private status: StatusService, + private http: RemoteService + ) {} async ngOnInit() { this.gloablParams = this.getGlobalParams(); const uuid = Number(localStorage.getItem('env:selected')) || null; @@ -37,11 +47,25 @@ export class EnvListComponent implements OnInit { return; } const envList: any = await this.getAllEnv(); - this.env = envList.find((it: any) => it.uuid === uuid); + this.env = envList + .map((it) => ({ + ...it, + parameters: it.parameters.filter((item) => item.name || item.value), + })) + .find((it: any) => it.uuid === uuid); } getAllEnv(uuid?: number) { const projectID = 1; - return new Promise((resolve) => { + return new Promise(async (resolve) => { + if (this.status.isShare) { + const [data, err]: any = await this.http.api_shareDocGetEnv({ + uniqueID: this.share.shareId, + }); + if (err) { + return resolve([]); + } + return resolve(data || []); + } this.storage.run('environmentLoadAllByProjectID', [projectID], async (result: StorageRes) => { if (result.status === StorageResStatus.success) { return resolve(result.data || []); diff --git a/src/workbench/browser/src/app/shared/components/env/env.component.html b/src/workbench/browser/src/app/shared/components/env/env.component.html index e2e356594..569c1e6eb 100644 --- a/src/workbench/browser/src/app/shared/components/env/env.component.html +++ b/src/workbench/browser/src/app/shared/components/env/env.component.html @@ -9,10 +9,20 @@ New
    -
    +
    {{ item.name }} - +
    @@ -33,10 +43,14 @@ -

    Environment variable: API Documentation/Test can use {{ varName }} to refer to the - environment variable

    - +

    + Global variable: API Documentation/Test can use {{ varName }} to refer to the global variable +

    + @@ -45,7 +59,7 @@
    -
    +
    diff --git a/src/workbench/browser/src/app/shared/components/env/env.component.ts b/src/workbench/browser/src/app/shared/components/env/env.component.ts index cbdc7e782..7ab69543b 100644 --- a/src/workbench/browser/src/app/shared/components/env/env.component.ts +++ b/src/workbench/browser/src/app/shared/components/env/env.component.ts @@ -8,6 +8,9 @@ import { Change } from '../../store/env.state'; import { StorageService } from '../../services/storage'; import { Subject } from 'rxjs'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { ShareService } from 'eo/workbench/browser/src/app/shared/services/share.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; @Component({ selector: 'eo-env', @@ -37,7 +40,10 @@ export class EnvComponent implements OnInit, OnDestroy { private storage: StorageService, private messageService: MessageService, private message: EoMessageService, - private store: Store + private store: Store, + private http: RemoteService, + private share: ShareService, + private status: StatusService ) {} get envUuid(): number { @@ -64,7 +70,7 @@ export class EnvComponent implements OnInit, OnDestroy { getAllEnv(uuid?: number) { const projectID = 1; - return new Promise((resolve) => { + return new Promise(async (resolve) => { this.storage.run('environmentLoadAllByProjectID', [projectID], async (result: StorageRes) => { if (result.status === StorageResStatus.success) { this.envList = result.data || []; @@ -105,6 +111,8 @@ export class EnvComponent implements OnInit, OnDestroy { this.storage.run('environmentLoad', [uuid], (result: StorageRes) => { if (result.status === StorageResStatus.success) { this.envInfo = result.data ?? {}; + const parameters = this.envInfo.parameters ?? []; + this.envInfo.parameters = typeof parameters === 'string' ? JSON.parse(parameters) : parameters; this.activeUuid = result.data?.uuid ?? null; resolve(true); } diff --git a/src/workbench/browser/src/app/shared/components/export-api/export-api.component.ts b/src/workbench/browser/src/app/shared/components/export-api/export-api.component.ts index 80530a4c8..f5e951e85 100644 --- a/src/workbench/browser/src/app/shared/components/export-api/export-api.component.ts +++ b/src/workbench/browser/src/app/shared/components/export-api/export-api.component.ts @@ -2,27 +2,29 @@ import { Component, OnInit } from '@angular/core'; import { StorageService } from '../../../shared/services/storage'; import { StorageRes, StorageResStatus } from '../../services/storage/index.model'; import packageJson from '../../../../../../../../package.json'; -import { FeatureType } from '../../types'; -import { ModuleInfo } from 'eo/platform/node/extension-manager'; +import { ModuleInfo, FeatureInfo } from 'eo/platform/node/extension-manager/types'; import { ExtensionService } from 'eo/workbench/browser/src/app/pages/extension/extension.service'; import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service'; +import { WebExtensionService } from 'eo/workbench/browser/src/app/shared/services/web-extension/webExtension.service'; @Component({ selector: 'eo-export-api', - template: ` `, + template: ` `, }) export class ExportApiComponent implements OnInit { currentExtension = 'eoapi'; - supportList: Array = []; - featureMap = window.eo?.getFeature('apimanage.export'); + supportList: Array = []; + featureMap = + this.webExtensionService.getFeatures('exportAPI') || this.webExtensionService.getFeatures('apimanage.export'); constructor( private storage: StorageService, private projectService: ProjectService, - public extensionService: ExtensionService + public extensionService: ExtensionService, + public webExtensionService: WebExtensionService ) {} ngOnInit(): void { - this.featureMap?.forEach((data: FeatureType, key: string) => { - if (this.extensionService.isEnable(data.name)) { + this.featureMap?.forEach((data: FeatureInfo, key: string) => { + if (this.extensionService.isEnable(data.extensionID)) { this.supportList.push({ key, ...data, @@ -30,7 +32,7 @@ export class ExportApiComponent implements OnInit { } }); { - const { key } = this.supportList.at(0); + const { key } = this.supportList?.at(0); this.currentExtension = key || ''; } } @@ -50,25 +52,6 @@ export class ExportApiComponent implements OnInit { window.URL.revokeObjectURL(url); }, 0); } - - /** - * Default export - * - * @param callback - */ - private exportEoapi(callback) { - const params = [this.projectService.currentProjectID]; - this.storage.run('projectExport', params, (result: StorageRes) => { - if (result.status === StorageResStatus.success) { - result.data.version = packageJson.version; - this.transferTextToFile('Eoapi-export.json', result.data); - callback(true); - } else { - callback(false); - } - }); - } - /** * Module export * callback应该支持返回具体的错误信息显示 @@ -79,11 +62,13 @@ export class ExportApiComponent implements OnInit { const feature = this.featureMap.get(this.currentExtension); const action = feature.action || null; const filename = feature.filename || null; - const module: ModuleInfo = await window.eo.loadFeatureModule(this.currentExtension); + const module: ModuleInfo = + (await window.eo?.loadFeatureModule(this.currentExtension)) || globalThis[this.currentExtension]; if (action && filename && module && module[action] && typeof module[action] === 'function') { const params = [this.projectService.currentProjectID]; this.storage.run('projectExport', params, (result: StorageRes) => { if (result.status === StorageResStatus.success) { + console.log('result.data', result.data); result.data.version = packageJson.version; const output = module[action](result || {}); this.transferTextToFile(filename, output); diff --git a/src/workbench/browser/src/app/shared/components/extension-select/extension-select.component.html b/src/workbench/browser/src/app/shared/components/extension-select/extension-select.component.html index 1c825e803..63ed76432 100644 --- a/src/workbench/browser/src/app/shared/components/extension-select/extension-select.component.html +++ b/src/workbench/browser/src/app/shared/components/extension-select/extension-select.component.html @@ -6,11 +6,11 @@ [class.active]="extension === item.key" class="extension relative h-full w-full border rounded-md flex items-center justify-center" nzTooltipPlacement="bottom" - [nzTooltipTitle]="item.label" + [nzTooltipTitle]="item.title||item.label" nz-tooltip [nzTooltipMouseEnterDelay]="0.7" > - {{ item.label }} + {{ item.title||item.label }} `, }) export class ImportApiComponent implements OnInit { - supportList: Array = []; + supportList: Array = []; currentExtension = ''; uploadData = null; - featureMap = window.eo?.getFeature('apimanage.import'); + featureMap = + this.webExtensionService.getFeatures('importAPI') || this.webExtensionService.getFeatures('apimanage.import'); constructor( private router: Router, private storage: StorageService, private eoMessage: EoMessageService, public extensionService: ExtensionService, + public webExtensionService: WebExtensionService, private projectService: ProjectService ) {} ngOnInit(): void { - this.featureMap?.forEach((data: FeatureType, key: string) => { - if (this.extensionService.isEnable(data.name)) { + this.featureMap?.forEach((data: FeatureInfo, key: string) => { + if (this.extensionService.isEnable(data.extensionID)) { this.supportList.push({ key, ...data, @@ -84,8 +87,9 @@ export class ImportApiComponent implements OnInit { // * this.currentExtension is extension's key, like 'eoapi-import-openapi' const feature = this.featureMap.get(this.currentExtension); const action = feature.action || null; - const module = await window.eo.loadFeatureModule(this.currentExtension); + const module = (await window.eo?.loadFeatureModule(this.currentExtension)) || globalThis[this.currentExtension]; const { name, content } = this.uploadData; + console.log('module', module, action, module[action]); const [data, err] = module[action](content); // console.log('import data', structuredClone?.(data)); if (err) { diff --git a/src/workbench/browser/src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts b/src/workbench/browser/src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts index 4790e7c17..d29c4d104 100644 --- a/src/workbench/browser/src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts +++ b/src/workbench/browser/src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts @@ -35,12 +35,14 @@ export class LocalWorkspaceTipComponent implements OnInit { get isShowNotification() { const isShow = this.workspace.isLocal && this.user.isLogin && StorageUtil.get(IS_SHOW_REMOTE_SERVER_NOTIFICATION) !== 'false'; - this.setIsShow(isShow); + this.isShow !== isShow && this.setIsShow(isShow); return isShow; } setIsShow(status: boolean) { this.isShow = status; - this.isShowChange.emit(status); + setTimeout(() => { + this.isShowChange.emit(status); + }, 0); } ngOnInit(): void {} diff --git a/src/workbench/browser/src/app/shared/components/manage-access/manage-access.component.html b/src/workbench/browser/src/app/shared/components/manage-access/manage-access.component.html index 8c1d99c38..8eba64efb 100644 --- a/src/workbench/browser/src/app/shared/components/manage-access/manage-access.component.html +++ b/src/workbench/browser/src/app/shared/components/manage-access/manage-access.component.html @@ -22,7 +22,7 @@
      - {{ item.roleName }} + {{ item.roleName }} Remove diff --git a/src/workbench/browser/src/app/shared/components/monaco-editor/monaco-editor.component.ts b/src/workbench/browser/src/app/shared/components/monaco-editor/monaco-editor.component.ts index 086125263..9f9bee4e8 100644 --- a/src/workbench/browser/src/app/shared/components/monaco-editor/monaco-editor.component.ts +++ b/src/workbench/browser/src/app/shared/components/monaco-editor/monaco-editor.component.ts @@ -152,7 +152,6 @@ export class EoMonacoEditorComponent implements AfterViewInit, OnInit, OnChanges } } ngOnInit() { - // console.log(this.codeEdtor.getSupportedActions()); // To get the Ace instance: this.buttonList = this.electron.isElectron ? this.eventList diff --git a/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts b/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts index 870a25530..07cd3951e 100644 --- a/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts +++ b/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts @@ -1,8 +1,6 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; -import { ElectronService } from 'eo/workbench/browser/src/app/core/services'; -import { WebService } from 'eo/workbench/browser/src/app/core/services'; import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; @@ -53,8 +51,6 @@ export class DataStorageComponent implements OnInit, OnChanges { private fb: FormBuilder, private message: EoMessageService, private messageS: MessageService, - private web: WebService, - private electron: ElectronService, private dataSource: DataSourceService, private user: UserService ) {} @@ -73,38 +69,32 @@ export class DataStorageComponent implements OnInit, OnChanges { } } async submitForm() { - if (!this.electron.isElectron) { - this.web.jumpToClient($localize`Eoapi Client is required to use cloud storage`); - return; - } - const isValid = this.validateForm.valid; - if (isValid) { - this.model = { - ...this.model, - ...this.validateForm.value, - }; - const [isSuccess] = await this.dataSource.pingCloudServerUrl( - this.validateForm.value['eoapi-common.remoteServer.url'] - ); - this.messageS.send({ type: 'workspaceChange', data: {} }); - if (isSuccess) { - this.dataSource.connectCloudSuccess(); - const isLogin = this.user.isLogin; - if (!isLogin) { - this.messageS.send({ type: 'login', data: {} }); - } - this.modelChange.emit(this.model); - } else { - this.message.error($localize`Failed to connect`); - } - } else { + if (!isValid) { Object.values(this.validateForm.controls).forEach((control) => { if (control.invalid) { control.markAsDirty(); control.updateValueAndValidity({ onlySelf: true }); } }); + return; + } + this.model = { + ...this.model, + ...this.validateForm.value, + }; + const isSuccess = await this.dataSource.pingCloudServerUrl( + this.validateForm.value['eoapi-common.remoteServer.url'] + ); + this.messageS.send({ type: 'workspaceChange', data: {} }); + if (isSuccess) { + this.message.success($localize`Successfully connect to cloud`); + localStorage.setItem('IS_SHOW_DATA_SOURCE_TIP', 'false'); + //Relogin to update user info + this.messageS.send({ type: 'login', data: {} }); + this.modelChange.emit(this.model); + } else { + this.message.error($localize`Failed to connect`); } this.messageS.send({ type: 'close-setting', data: {} }); } diff --git a/src/workbench/browser/src/app/shared/components/setting/common/extensions.component.ts b/src/workbench/browser/src/app/shared/components/setting/common/extensions.component.ts index af73d4010..136535fa6 100644 --- a/src/workbench/browser/src/app/shared/components/setting/common/extensions.component.ts +++ b/src/workbench/browser/src/app/shared/components/setting/common/extensions.component.ts @@ -12,9 +12,9 @@ import { debounceTime } from 'rxjs';

      {{ module.title }}

      - + - {{ module.properties[field]?.label }} + {{ module.properties[field]?.title||module.properties[field]?.label }} @@ -26,7 +26,7 @@ import { debounceTime } from 'rxjs';
      @@ -38,7 +38,7 @@ import { debounceTime } from 'rxjs'; [disabled]="module.properties[field]?.disabled" i18n-placeholder placeholder="{{ - module.properties[field]?.placeholder ?? 'Please Enter ' + module.properties[field]?.label + module.properties[field]?.placeholder ?? 'Please Enter ' + module.properties[field]?.title||module.properties[field]?.label }}" formControlName="{{ field }}" [(ngModel)]="model[field]" @@ -104,11 +104,9 @@ export class ExtensionSettingComponent implements OnInit { private init() { const controls = {}; - console.log('model', this.model, controls); - /** Generate settings model based on configuration configuration */ + console.log(this.extensitonConfigurations); this.extensitonConfigurations.forEach((item) => { - console.log('item', item); if (Array.isArray(item)) { item.forEach((n) => { n.properties = this.appendModuleID(n.properties, n.moduleID); diff --git a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/extensiton-settings.json b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/extensiton-settings.json deleted file mode 100644 index 550fde0d2..000000000 --- a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/extensiton-settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "private": true, - "name": "Eoapi-Extensions", - "version": "0.0.1", - "moduleName": "扩展", - "moduleID": "Eoapi-Extensions", - "author": "eoapi", - "publisher": "eoapi", - "contributes": { - "configuration": [] - } -} diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.html b/src/workbench/browser/src/app/shared/components/setting/setting.component.html index 236b845dc..0f9c60918 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.component.html +++ b/src/workbench/browser/src/app/shared/components/setting/setting.component.html @@ -4,11 +4,8 @@ - + {{ node.name }} @@ -17,11 +14,8 @@ - + {{ node.name }} @@ -29,11 +23,15 @@
      - - + + + + - - + + + + diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.ts b/src/workbench/browser/src/app/shared/components/setting/setting.component.ts index 02b41a2c1..531a4c37d 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.component.ts +++ b/src/workbench/browser/src/app/shared/components/setting/setting.component.ts @@ -6,6 +6,7 @@ import { NzTreeFlatDataSource, NzTreeFlattener } from 'ng-zorro-antd/tree-view'; import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; import { debounce, eoDeepCopy } from 'eo/workbench/browser/src/app/utils/index.utils'; import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; +import { WebService } from 'eo/workbench/browser/src/app/core/services'; interface TreeNode { name: string; @@ -83,10 +84,14 @@ export class SettingComponent implements OnInit { }, ], }, - { - name: $localize`:@@Cloud:Cloud Storage`, - moduleID: 'eoapi-common', - }, + ...(this.webService.isWeb + ? [] + : [ + { + name: $localize`:@@Cloud:Cloud Storage`, + moduleID: 'eoapi-common', + }, + ]), { name: $localize`:@@Language:Language`, moduleID: 'eoapi-language', @@ -105,7 +110,7 @@ export class SettingComponent implements OnInit { return this.selectListSelection.selected.at(0)?.moduleID; } - constructor(private settingService: SettingService, public user: UserService) {} + constructor(private settingService: SettingService, public user: UserService, public webService: WebService) {} ngOnInit(): void { this.init(); @@ -122,7 +127,7 @@ export class SettingComponent implements OnInit { * @returns */ getModuleTitle(module: any): string { - const title = module?.moduleName ?? module?.contributes?.title ?? module?.title; + const title = module?.moduleName ?? module?.title; return title; } @@ -171,7 +176,9 @@ export class SettingComponent implements OnInit { this.treeNodes.filter((val) => { switch (val.moduleID) { case 'eoapi-account': { - if (!this.user.isLogin) {return false;} + if (!this.user.isLogin) { + return false; + } } } return true; diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html index 915564638..e6aaab792 100644 --- a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html +++ b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html @@ -1,7 +1,7 @@
      - {{ item.moduleName }} + {{ item.title }}
      diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts index 9a9aea2e7..233a3ad33 100644 --- a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts +++ b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; -import { filter, takeWhile } from 'rxjs/operators'; -import { ElectronService, WebService } from '../../../core/services'; -import { ModuleInfo } from '../../../../../../../platform/node/extension-manager'; +import { filter } from 'rxjs/operators'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; import { SidebarService } from './sidebar.service'; import { NavigationEnd, Router } from '@angular/router'; import { SidebarModuleInfo } from './sidebar.model'; import { WorkspaceService } from '../../services/workspace/workspace.service'; import { Message, MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { StatusService } from 'eo/workbench/browser/src/app/shared/services/status.service'; @Component({ selector: 'eo-sidebar', @@ -19,25 +19,14 @@ export class SidebarComponent implements OnInit, OnDestroy { destroy = false; modules: Array; constructor( - private electron: ElectronService, private router: Router, public sidebar: SidebarService, private dataSourceService: DataSourceService, private messageService: MessageService, - private webService: WebService, - private workspace: WorkspaceService + private workspace: WorkspaceService, + private status: StatusService ) { this.isCollapsed = this.sidebar.getCollapsed(); - this.sidebar - .onCollapsedChanged() - .pipe(takeWhile(() => !this.destroy)) - .subscribe((isCollapsed) => { - this.isCollapsed = isCollapsed; - if (this.electron.isElectron) { - const sideWidth: number = isCollapsed ? 50 : 90; - window.eo.autoResize(sideWidth); - } - }); } toggleCollapsed(): void { this.sidebar.toggleCollapsed(); @@ -45,7 +34,7 @@ export class SidebarComponent implements OnInit, OnDestroy { ngOnInit(): void { this.getModules(); - this.getModuleIDFromRoute(); + this.getIDFromRoute(); this.watchRouterChange(); this.watchWorkspaceChange(); } @@ -60,29 +49,20 @@ export class SidebarComponent implements OnInit, OnDestroy { watchRouterChange() { this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe((res: any) => { - this.getModuleIDFromRoute(); + this.getIDFromRoute(); }); } async clickModule(module) { this.sidebar.currentModule = module; - const nextApp = this.modules.find((val) => val.moduleID === module.moduleID); + const nextApp = this.modules.find((val) => val.id === module.id); const route = (nextApp as SidebarModuleInfo).route || '/home/blank'; - if (this.webService.isWeb) { - if (module.moduleID === '@eo-core-workspace') { - return await this.webService.jumpToClient($localize`Eoapi Client is required to add workspace`); - } - - if (module.moduleID === '@eo-core-member') { - return await this.webService.jumpToClient($localize`Eoapi Client is required to manage member`); - } - } - if (module.moduleID !== '@eo-core-member') { - this.router.navigate([route]); + if (module.id !== '@eo-core-member') { + this.router.navigate([route], { queryParamsHandling: 'merge' }); return; } const isLocal = this.workspace.currentWorkspaceID === -1; this.dataSourceService.checkRemoteCanOperate(() => { - this.router.navigate([route]); + this.router.navigate([route], { queryParamsHandling: 'merge' }); }, isLocal); } ngOnDestroy(): void { @@ -91,18 +71,27 @@ export class SidebarComponent implements OnInit, OnDestroy { private getModules() { const defaultModule = [ { - moduleName: 'API', - moduleID: '@eo-core-apimanger', + title: 'API', + id: '@eo-core-share', + isShare: true, + isOffical: true, + icon: 'api', + activeRoute: 'home/share', + route: 'home/share/http/test', + }, + { + title: 'API', + id: '@eo-core-apimanger', isOffical: true, icon: 'api', activeRoute: 'home/api', route: 'home/api/http/test', }, - ...(!this.workspace.isLocal || !this.dataSourceService.remoteServerUrl + ...(!this.workspace.isLocal ? [ { - moduleName: $localize`Member`, - moduleID: '@eo-core-member', + title: $localize`Member`, + id: '@eo-core-member', isOffical: true, icon: 'every-user', activeRoute: 'home/member', @@ -111,37 +100,41 @@ export class SidebarComponent implements OnInit, OnDestroy { ] : []), { - moduleName: $localize`Workspace`, - moduleID: '@eo-core-workspace', + title: $localize`Workspace`, + id: '@eo-core-workspace', isOffical: true, icon: 'home-5kaioboo', activeRoute: 'home/workspace', route: 'home/workspace', }, { - moduleName: $localize`Extensions`, - moduleID: '@eo-core-extension', + title: $localize`Extensions`, + id: '@eo-core-extension', isOffical: true, icon: 'puzzle', activeRoute: 'home/extension', route: 'home/extension/list', }, + // { + // title: $localize`Vue3`, + // id: '@eo-core-vue3', + // isOffical: true, + // icon: 'puzzle', + // activeRoute: 'home/app-vue3', + // route: 'home/app-vue3', + // }, ]; - if (this.electron.isElectron) { - this.modules = [...defaultModule, ...Array.from(window.eo.getSideModuleList())]; - this.electron.ipcRenderer.on('moduleUpdate', (event, args) => { - this.modules = window.eo.getSideModuleList(); - }); - } else { - this.modules = [...defaultModule]; - } + const isShare = this.status.isShare; + this.modules = defaultModule.filter((it: any) => + isShare ? it?.isShare : it?.isShare ? it?.isShare === isShare : true + ); } - private getModuleIDFromRoute() { + private getIDFromRoute() { const currentModule = this.modules.find((val) => this.router.url.includes(val.activeRoute)); if (!currentModule) { //route error // this.clickModule(this.modules[0]); - console.error('route error: currentModule is undefind', currentModule); + console.warn(`route error: currentModule is [${currentModule}]`, currentModule); return; } this.sidebar.currentModule = currentModule; diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.model.ts b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.model.ts index 05a684448..d555bf08a 100644 --- a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.model.ts +++ b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.model.ts @@ -9,11 +9,11 @@ export interface SidebarModuleInfo { /** * unique extension id **/ - moduleID: string; + id: string; /** * showname **/ - moduleName: string; + title: string; /** * is offcial app **/ diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.service.ts b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.service.ts index 2fa9aeb83..6652b50bc 100644 --- a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.service.ts +++ b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs'; -import { ModuleInfo } from 'eo/platform/node/extension-manager/types/index'; +import { ModuleInfo } from 'eo/platform/node/extension-manager/types'; import { SidebarModuleInfo } from './sidebar.model'; @Injectable({ diff --git a/src/workbench/browser/src/app/shared/components/split-panel/split.panel.component.ts b/src/workbench/browser/src/app/shared/components/split-panel/split.panel.component.ts index d13e0fc0a..597bb1c27 100644 --- a/src/workbench/browser/src/app/shared/components/split-panel/split.panel.component.ts +++ b/src/workbench/browser/src/app/shared/components/split-panel/split.panel.component.ts @@ -9,6 +9,7 @@ import { Output, EventEmitter, } from '@angular/core'; +import { debug } from 'console'; import { throttle } from 'eo/workbench/browser/src/app/utils/index.utils'; type EventListener = HTMLElement['removeEventListener'] | HTMLElement['addEventListener']; diff --git a/src/workbench/browser/src/app/shared/components/sync-api/sync-api.component.ts b/src/workbench/browser/src/app/shared/components/sync-api/sync-api.component.ts index 85c912479..73d6c4a7b 100644 --- a/src/workbench/browser/src/app/shared/components/sync-api/sync-api.component.ts +++ b/src/workbench/browser/src/app/shared/components/sync-api/sync-api.component.ts @@ -2,8 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { StorageRes, StorageResStatus } from '../../services/storage/index.model'; import { StorageService } from '../../services/storage'; import packageJson from '../../../../../../../../package.json'; -import { FeatureType } from '../../types'; +import { FeatureInfo } from 'eo/platform/node/extension-manager/types'; import { ExtensionService } from 'eo/workbench/browser/src/app/pages/extension/extension.service'; +import { WebExtensionService } from 'eo/workbench/browser/src/app/shared/services/web-extension/webExtension.service'; @Component({ selector: 'eo-sync-api', @@ -12,12 +13,17 @@ import { ExtensionService } from 'eo/workbench/browser/src/app/pages/extension/e export class SyncApiComponent implements OnInit { currentExtension = ''; supportList: any[] = []; - featureMap = window.eo?.getFeature('apimanage.sync'); - constructor(private storage: StorageService, public extensionService: ExtensionService) {} + featureMap = + this.webExtensionService.getFeatures('syncAPI') || this.webExtensionService.getFeatures('apimanage.sync'); + constructor( + private storage: StorageService, + public extensionService: ExtensionService, + public webExtensionService: WebExtensionService + ) {} ngOnInit(): void { - this.featureMap?.forEach((data: FeatureType, key: string) => { - if (this.extensionService.isEnable(data.name)) { + this.featureMap?.forEach((data: FeatureInfo, key: string) => { + if (this.extensionService.isEnable(data.extensionID)) { this.supportList.push({ key, ...data, @@ -25,16 +31,16 @@ export class SyncApiComponent implements OnInit { } }); { - const { key } = this.supportList.at(0); + const { key } = this.supportList?.at(0); this.currentExtension = key || ''; } } async submit() { const feature = this.featureMap.get(this.currentExtension); const action = feature.action || null; - const module = window.eo.loadFeatureModule(this.currentExtension); + const module = window.eo.loadFeatureModule(this.currentExtension) || globalThis[this.currentExtension]; // TODO 临时取值方式需要修改 - const { token: secretKey, projectId } = window.eo?.getModuleSettings( + const { token: secretKey, projectId } = window.eo?.getExtensionSettings( 'eoapi-feature-push-eolink.eolink.remoteServer' ); if (module && module[action] && typeof module[action] === 'function') { diff --git a/src/workbench/browser/src/app/shared/services/api-test/remote-node/test-connect.service.ts b/src/workbench/browser/src/app/shared/services/api-test/remote-node/test-connect.service.ts index 090f513d5..e9c620f06 100644 --- a/src/workbench/browser/src/app/shared/services/api-test/remote-node/test-connect.service.ts +++ b/src/workbench/browser/src/app/shared/services/api-test/remote-node/test-connect.service.ts @@ -2,7 +2,8 @@ import { Injectable, Inject, LOCALE_ID } from '@angular/core'; import { requestDataOpts, TestServer } from '../test-server.model'; import { DEFAULT_UNIT_TEST_RESULT, eoFormatRequestData, eoFormatResponseData } from '../api-test.utils'; -import { ELETRON_APP_CONFIG } from 'eo/enviroment'; +import { APP_CONFIG } from 'eo/workbench/browser/src/environments/environment'; + @Injectable() export class TestServerRemoteService implements TestServer { receiveMessage: (message) => void; @@ -21,11 +22,15 @@ export class TestServerRemoteService implements TestServer { this.xhrByTabID[message.id]?.abort(); } } - if (message.action !== 'ajax') {return;} + if (message.action !== 'ajax') { + return; + } } ajax(message) { const xhr = new XMLHttpRequest(); - const url = `${window.location.protocol}//${window.location.hostname}:${ELETRON_APP_CONFIG.NODE_SERVER_PORT}/api/unit`; + const url = `${window.location.protocol}//${window.location.hostname}:${ + APP_CONFIG.NODE_SERVER_PORT || window.location.port + }/api/unit`; xhr.open('POST', url); xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8'); xhr.onreadystatechange = (e) => { @@ -33,7 +38,7 @@ export class TestServerRemoteService implements TestServer { if (xhr.status === 200) { this.receiveMessage(this.formatResponseData(JSON.parse(xhr.responseText).data)); } else { - this.receiveMessage(Object.assign({id:message.id},DEFAULT_UNIT_TEST_RESULT)); + this.receiveMessage(Object.assign({ id: message.id }, DEFAULT_UNIT_TEST_RESULT)); } } }; diff --git a/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts b/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts index 68cef3791..061d6c9e3 100644 --- a/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts +++ b/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts @@ -1,16 +1,12 @@ import { Injectable } from '@angular/core'; -import { Subject, takeUntil } from 'rxjs'; -import { DataSourceType, StorageService } from 'eo/workbench/browser/src/app/shared/services/storage/storage.service'; +import { Subject } from 'rxjs'; +import { DataSourceType } from 'eo/workbench/browser/src/app/shared/services/storage/storage.service'; import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; -import { Message } from 'eo/workbench/browser/src/app/shared/services/message/message.model'; -import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; -import { Router } from '@angular/router'; import { ApiData } from 'eo/workbench/browser/src/app/shared/services/storage/index.model'; import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; - -/** is show switch success tips */ -export const IS_SHOW_DATA_SOURCE_TIP = 'IS_SHOW_DATA_SOURCE_TIP'; +import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/storage/remote.service'; +import { WebService } from 'eo/workbench/browser/src/app/core/services'; /** * @description @@ -21,7 +17,6 @@ export const IS_SHOW_DATA_SOURCE_TIP = 'IS_SHOW_DATA_SOURCE_TIP'; }) export class DataSourceService { isConnectRemote = false; - private destroy$: Subject = new Subject(); /** data source type @type { DataSourceType } */ get dataSourceType(): DataSourceType { return this.settingService.settings['eoapi-common.dataStorage'] ?? 'local'; @@ -39,12 +34,11 @@ export class DataSourceService { } constructor( - private storageService: StorageService, private messageService: MessageService, - private message: EoMessageService, private settingService: SettingService, - private router: Router, - private user: UserService + private user: UserService, + private http: RemoteService, + private web: WebService ) { this.pingCloudServerUrl(); } @@ -58,52 +52,47 @@ export class DataSourceService { return decodeURIComponent(url.toString()); } - async refreshComponent() { - const { pathname, searchParams } = new URL(this.router.url, 'https://github.com/'); - // console.log('this.router', pathname, Object.fromEntries(searchParams.entries())); - await this.router.navigate(['**']); - await this.router.navigate([pathname], { queryParams: Object.fromEntries(searchParams.entries()) }); - } /** * Test if cloud service address is available */ - async pingCloudServerUrl(inputUrl?): Promise<[boolean, any]> { + async pingCloudServerUrl(inputUrl?): Promise { const remoteUrl = inputUrl || this.remoteServerUrl; - let result; if (!remoteUrl) { - result = [false, remoteUrl]; + return false; } - - const url = `${remoteUrl}/system/status`.replace(/(? {}) => { - const isRemote = dataSource === 'http'; - if (isRemote) { - const [isSuccess] = await this.pingCloudServerUrl(); - if (isSuccess) { - this.switchToHttp(); - localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'false'); - await beforRefreshCompFn?.(); - this.refreshComponent(); - } else { - this.message.error($localize`Cloud Storage not available`); - localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'true'); - } - } else { - this.switchToLocal(); - localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'true'); - await beforRefreshCompFn?.(); - this.refreshComponent(); - } - }; - - connectCloudSuccess() { - this.message.success($localize`Successfully connect to cloud`); - localStorage.setItem('IS_SHOW_DATA_SOURCE_TIP', 'false'); - } } diff --git a/src/workbench/browser/src/app/shared/services/remote/remote.service.ts b/src/workbench/browser/src/app/shared/services/remote/remote.service.ts new file mode 100644 index 000000000..308d678cd --- /dev/null +++ b/src/workbench/browser/src/app/shared/services/remote/remote.service.ts @@ -0,0 +1,185 @@ +import { Injectable } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { DataSourceType, StorageService } from 'eo/workbench/browser/src/app/shared/services/storage/storage.service'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service'; +import { Message } from 'eo/workbench/browser/src/app/shared/services/message/message.model'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { Router } from '@angular/router'; +import { ApiData } from 'eo/workbench/browser/src/app/shared/services/storage/index.model'; +import { ElectronService } from 'eo/workbench/browser/src/app/core/services/electron/electron.service'; +import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; + +/** is show switch success tips */ +export const IS_SHOW_DATA_SOURCE_TIP = 'IS_SHOW_DATA_SOURCE_TIP'; + +/** + * @description + * A message queue global send and get message + */ +@Injectable({ + providedIn: 'root', +}) +export class RemoteService { + private destroy$: Subject = new Subject(); + /** data source type @type { DataSourceType } */ + get dataSourceType(): DataSourceType { + return this.settingService.settings['eoapi-common.dataStorage'] ?? 'local'; + } + get isElectron() { + return this.electronService.isElectron; + } + /** Is it a remote data source */ + get isRemote() { + return this.dataSourceType === 'http'; + } + /** Text corresponding to the current data source */ + get dataSourceText() { + return this.isRemote ? $localize`:@@Remote Server:Remote Server` : $localize`Localhost`; + } + /** get mock url */ + get mockUrl() { + return this.isRemote + ? window.eo?.getExtensionSettings?.('eoapi-common.remoteServer.url') + '/mock/eo-1/' + : window.eo?.getMockUrl?.(); + } + + constructor( + private storageService: StorageService, + private messageService: MessageService, + private message: NzMessageService, + private electronService: ElectronService, + private settingService: SettingService, + private router: Router + ) { + this.messageService + .get() + .pipe(takeUntil(this.destroy$)) + .subscribe((inArg: Message) => { + switch (inArg.type) { + case 'onDataSourceChange': { + if (localStorage.getItem(IS_SHOW_DATA_SOURCE_TIP) === 'true') { + this.showMessage(); + } + break; + } + } + }); + } + + getApiUrl(apiData: ApiData) { + const url = new URL(`${this.mockUrl}/${apiData.uri}`.replace(/(? { + const { url: remoteUrl, token } = this.settingService.getConfiguration('eoapi-common.remoteServer') || {}; + + if (!remoteUrl) { + return [false, remoteUrl]; + } + + const url = `${remoteUrl}/system/status`.replace(/(? { + const localSettings = this.getSettings(); + if (Reflect.has(localSettings, keyPath)) { + return Reflect.get(localSettings, keyPath); + } + + const keys = Object.keys(localSettings); + const filterKeys = keys.filter((n) => n.startsWith(keyPath)); + if (filterKeys.length) { + return filterKeys.reduce((pb, ck) => { + const keyArr = ck.replace(`${keyPath}.`, '').split('.'); + const targetKey = keyArr.pop(); + const target = keyArr.reduce((p, v) => { + p[v] ??= {}; + return p[v]; + }, pb); + target[targetKey] = localSettings[ck]; + return pb; + }, {}); + } + return undefined; + }; + + /** + * switch data + */ + switchDataSource = async (dataSource: DataSourceType) => { + const isRemote = dataSource === 'http'; + if (isRemote) { + const [isSuccess] = await this.pingRmoteServerUrl(); + if (isSuccess) { + localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'true'); + this.switchToHttp(); + this.refreshComponent(); + } else { + this.message.create('error', $localize`Remote data source not available`); + localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'false'); + } + } else { + localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'true'); + this.switchToLocal(); + this.refreshComponent(); + } + }; + + showMessage() { + this.message.create('success', $localize`successfully switched to ${this.dataSourceText} data source`); + localStorage.setItem('IS_SHOW_DATA_SOURCE_TIP', 'false'); + } +} diff --git a/src/workbench/browser/src/app/shared/services/share.service.ts b/src/workbench/browser/src/app/shared/services/share.service.ts new file mode 100644 index 000000000..419896e01 --- /dev/null +++ b/src/workbench/browser/src/app/shared/services/share.service.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { StorageUtil } from '../../utils/storage/Storage'; + +@Injectable({ + providedIn: 'root', +}) +export class ShareService { + shareId; + constructor() { + this.shareId = this.getShareId() || ''; + } + setShareId(data) { + this.shareId = data; + StorageUtil.set('shareId', data); + } + getShareId() { + return StorageUtil.get('shareId'); + } + resetShareId() { + StorageUtil.set('shareId', ''); + } +} diff --git a/src/workbench/browser/src/app/shared/services/status.service.ts b/src/workbench/browser/src/app/shared/services/status.service.ts new file mode 100644 index 000000000..780e564ec --- /dev/null +++ b/src/workbench/browser/src/app/shared/services/status.service.ts @@ -0,0 +1,24 @@ +import { Injectable } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; +import { filter } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root', +}) +export class StatusService { + isShare = this.countShare(); + constructor(private router: Router) { + this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe((res: NavigationEnd) => { + this.countShare(); + }); + } + countShare() { + const { url } = this.router; + if (url.includes('/home/share')) { + this.isShare = true; + return true; + } + this.isShare = false; + return false; + } +} diff --git a/src/workbench/browser/src/app/shared/services/storage/IndexedDB/lib/index.ts b/src/workbench/browser/src/app/shared/services/storage/IndexedDB/lib/index.ts index e160aba44..1d514c71a 100644 --- a/src/workbench/browser/src/app/shared/services/storage/IndexedDB/lib/index.ts +++ b/src/workbench/browser/src/app/shared/services/storage/IndexedDB/lib/index.ts @@ -32,7 +32,7 @@ const getApiUrl = (apiData: ApiData) => { /** get mock url */ const mockUrl = isRemote - ? window.eo?.getModuleSettings?.('eoapi-common.remoteServer.url') + '/mock/eo-1/' + ? window.eo?.getExtensionSettings?.('eoapi-common.remoteServer.url') + '/mock/eo-1/' : window.eo?.getMockUrl?.(); const url = new URL(uniqueSlash(`${mockUrl}/${apiData.uri}`), 'https://github.com/'); diff --git a/src/workbench/browser/src/app/shared/services/storage/api.service.ts b/src/workbench/browser/src/app/shared/services/storage/api.service.ts index 4ed422af5..8c5b746c2 100644 --- a/src/workbench/browser/src/app/shared/services/storage/api.service.ts +++ b/src/workbench/browser/src/app/shared/services/storage/api.service.ts @@ -118,6 +118,48 @@ export class ApiService { return this.remote.api_workspaceRemoveMember(params) } + api_shareCreateShare(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareCreateShare(params) + } + return this.remote.api_shareCreateShare(params) + } + + api_shareGetShareList(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareGetShareList(params) + } + return this.remote.api_shareGetShareList(params) + } + + api_shareDeleteShare(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareDeleteShare(params) + } + return this.remote.api_shareDeleteShare(params) + } + + api_shareDocGetAllApi(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareDocGetAllApi(params) + } + return this.remote.api_shareDocGetAllApi(params) + } + + api_shareDocGetApiDetail(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareDocGetApiDetail(params) + } + return this.remote.api_shareDocGetApiDetail(params) + } + + api_shareDocGetEnv(params) { + if (this.dataSourceType === 'local') { + return this.local.api_shareDocGetEnv(params) + } + return this.remote.api_shareDocGetEnv(params) + } + api_userUpdateUserProfile(params) { if (this.dataSourceType === 'local') { return this.local.api_userUpdateUserProfile(params) @@ -334,4 +376,11 @@ export class ApiService { } return this.remote.api_mockLoadAll(params) } + + api_systemStatus(params) { + if (this.dataSourceType === 'local') { + return this.local.api_systemStatus(params) + } + return this.remote.api_systemStatus(params) + } } diff --git a/src/workbench/browser/src/app/shared/services/storage/api.ts b/src/workbench/browser/src/app/shared/services/storage/api.ts index bf8148af2..47046eee9 100644 --- a/src/workbench/browser/src/app/shared/services/storage/api.ts +++ b/src/workbench/browser/src/app/shared/services/storage/api.ts @@ -23,6 +23,22 @@ const http = { { 'removeMember @delete': '/workspace/{workspaceID}/member/remove', body: 'userIDs' }, ], }, + { + name: 'share', + data: [ + { 'createShare @post': '/shared' }, + { 'getShareList @get': '/shared' }, + { 'deleteShare @delete': '/shared' }, + ], + }, + { + name: 'shareDoc', + data: [ + { 'getAllAPI @get': '/shared-docs/{uniqueID}/collections' }, + { 'getApiDetail @get': '/shared-docs/{uniqueID}/api/{apiDataUUID}' }, + { 'getEnv @get': '/shared-docs/{uniqueID}/environments' }, + ], + }, { name: 'user', data: [ @@ -89,6 +105,10 @@ const http = { { 'loadAll @get': '/mock', query: 'apiDataID' }, ], }, + { + name: 'system', + data: [{ 'status @get': '/system/status' }], + }, ], }; diff --git a/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts b/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts index 3b5f0b977..18a7571e1 100644 --- a/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts +++ b/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts @@ -1,25 +1,49 @@ -import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http'; +import { + HttpErrorResponse, + HttpEvent, + HttpHandler, + HttpHeaders, + HttpInterceptor, + HttpRequest, + HttpResponse, +} from '@angular/common/http'; import { Injectable } from '@angular/core'; import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; import StorageUtil from 'eo/workbench/browser/src/app/utils/storage/Storage'; -import { filter, map, Observable } from 'rxjs'; +import { filter, map, tap, Observable, catchError, of } from 'rxjs'; import { uniqueSlash } from '../../../../../utils/api'; import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/workspace/workspace.service'; import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service'; +import { version2Number } from 'eo/workbench/browser/src/app/utils/index.utils'; +import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; const protocolReg = new RegExp('^(http|https)://'); -const interceptorPaths = ['/api_data', '/group', '/api_test_history', '/mock', '/environment']; +const interceptorPaths = ['/api_data', '/group', '/api_test_history', '/mock', '/environment', '/shared']; const needWorkspaceIDPrefixPaths = ['/project']; +const sharePaths = ['/shared-docs']; +const noPrefix = ['https://', 'http://']; // implements StorageInterface @Injectable() export class BaseUrlInterceptor extends SettingService implements HttpInterceptor { get apiPrefix() { - return `/${this.workspaceService.currentWorkspaceID}/${this.projectService.currentProjectID}`; + return `/${this.workspaceID}/${this.projectID}/`; } - constructor(private workspaceService: WorkspaceService, private projectService: ProjectService) { + get projectID() { + return this.projectService.currentProjectID; + } + get workspaceID() { + return this.workspaceService.currentWorkspaceID; + } + prefix; + constructor( + private workspaceService: WorkspaceService, + private projectService: ProjectService, + private messageService: MessageService + ) { super(); + this.prefix = '/'; } intercept(req: HttpRequest, next: HttpHandler): Observable> { @@ -27,23 +51,47 @@ export class BaseUrlInterceptor extends SettingService implements HttpIntercepto const token = StorageUtil.get('accessToken') || ''; let targetUrl; - if ((targetUrl = interceptorPaths.find((n) => req.url.startsWith(n)))) { + if ((targetUrl = sharePaths.find((n) => req.url.startsWith(n)))) { + req = req.clone({ + url: req.url.replace(targetUrl, `/api${targetUrl}`), + }); + } else if ((targetUrl = interceptorPaths.find((n) => req.url.startsWith(n)))) { req = req.clone({ - url: req.url.replace(targetUrl, `${this.apiPrefix}/${targetUrl}`), + url: req.url.replace(targetUrl, `${this.apiPrefix}${targetUrl}`), }); } else if ((targetUrl = needWorkspaceIDPrefixPaths.find((n) => req.url.startsWith(n)))) { req = req.clone({ - url: req.url.replace(targetUrl, `/${this.workspaceService.currentWorkspaceID}/${targetUrl}`), + url: req.url.replace(targetUrl, `/${this.workspaceID}/${targetUrl}`), }); } req = req.clone({ - url: uniqueSlash(protocolReg.test(req.url) ? req.url : url + req.url), - headers: req.headers.append('Authorization', token), + url: noPrefix.find((n) => req.url.startsWith(n)) + ? req.url + : uniqueSlash(url + this.prefix + req.url).replace(/(\/api){1,}/g, '/api'), + headers: new HttpHeaders({ + Authorization: token, + }), }); return next.handle(req).pipe( filter((event) => event instanceof HttpResponse && [200, 201].includes(event.status)), - map((event: HttpResponse) => event.clone({ body: { status: 200, data: event.body.data } })) + map((event: HttpResponse) => event.clone({ body: { status: 200, data: event.body.data } })), + tap((event: any) => { + // ! TODO delete + if (req.url.includes('/system/status')) { + const { data } = event.body; + this.prefix = version2Number(data) >= version2Number('v1.9.0') ? '/api' : '/'; + console.log(data,this.prefix); + } + }), + catchError((err: any) => { + if (err instanceof HttpErrorResponse) { + if (err.status === 401 && this.workspaceID !== -1) { + this.messageService.send({ type: 'login', data: {} }); + } + } + return err; + }) ); } } diff --git a/src/workbench/browser/src/app/shared/services/storage/index.model.ts b/src/workbench/browser/src/app/shared/services/storage/index.model.ts index c792dea51..21f8cd366 100644 --- a/src/workbench/browser/src/app/shared/services/storage/index.model.ts +++ b/src/workbench/browser/src/app/shared/services/storage/index.model.ts @@ -62,7 +62,7 @@ export interface Environment extends StorageModel { /** * Env parameters */ - parameters?: { name: string; value: string }[]; + parameters?: { name: string; value: string; description: string }[]; } /** diff --git a/src/workbench/browser/src/app/shared/services/storage/local.service.ts b/src/workbench/browser/src/app/shared/services/storage/local.service.ts index 670f6ad28..a2e4770b1 100644 --- a/src/workbench/browser/src/app/shared/services/storage/local.service.ts +++ b/src/workbench/browser/src/app/shared/services/storage/local.service.ts @@ -404,6 +404,167 @@ export default class LocalService extends localStorage { }) } + api_shareCreateShare(params) { + return new Promise((resolve) => { + this.create(this.undefined, params) + .then(({ status, ...data }: any) => { + console.log( + '%c share - createShare 接口调用成功 %c', + SuccessStyle, + '' + ) + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c share - createShare 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } + + api_shareGetShareList(params) { + return new Promise((resolve) => { + this.load(this.undefined, params) + .then(({ status, ...data }: any) => { + console.log( + '%c share - getShareList 接口调用成功 %c', + SuccessStyle, + '' + ) + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c share - getShareList 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } + + api_shareDeleteShare(params) { + return new Promise((resolve) => { + this.remove(this.undefined, params) + .then(({ status, ...data }: any) => { + console.log( + '%c share - deleteShare 接口调用成功 %c', + SuccessStyle, + '' + ) + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c share - deleteShare 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } + + api_shareDocGetAllApi({ uniqueID }) { + if (!uniqueID) { + console.log( + '%c Error: shareDoc - getAllAPI 接口 缺失参数 uniqueID %c', + ErrorStyle, + '' + ) + return + } + + return new Promise((resolve) => { + this.load(this.undefined, { uniqueID }) + .then(({ status, ...data }: any) => { + console.log( + '%c shareDoc - getAllAPI 接口调用成功 %c', + SuccessStyle, + '' + ) + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c shareDoc - getAllAPI 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } + + api_shareDocGetApiDetail({ uniqueID, apiDataUUID }) { + if (!uniqueID) { + console.log( + '%c Error: shareDoc - getApiDetail 接口 缺失参数 uniqueID %c', + ErrorStyle, + '' + ) + return + } + if (!apiDataUUID) { + console.log( + '%c Error: shareDoc - getApiDetail 接口 缺失参数 apiDataUUID %c', + ErrorStyle, + '' + ) + return + } + + return new Promise((resolve) => { + this.load(this.undefined, { uniqueID, apiDataUUID }) + .then(({ status, ...data }: any) => { + console.log( + '%c shareDoc - getApiDetail 接口调用成功 %c', + SuccessStyle, + '' + ) + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log( + '%c shareDoc - getApiDetail 接口调用失败 %c', + ErrorStyle, + '' + ) + resolve([null, error]) + }) + }) + } + + api_shareDocGetEnv({ uniqueID }) { + if (!uniqueID) { + console.log( + '%c Error: shareDoc - getEnv 接口 缺失参数 uniqueID %c', + ErrorStyle, + '' + ) + return + } + + return new Promise((resolve) => { + this.load(this.undefined, { uniqueID }) + .then(({ status, ...data }: any) => { + console.log('%c shareDoc - getEnv 接口调用成功 %c', SuccessStyle, '') + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c shareDoc - getEnv 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } + api_userUpdateUserProfile(params) { return new Promise((resolve) => { this.update(this.undefined, params) @@ -1143,4 +1304,21 @@ export default class LocalService extends localStorage { }) }) } + + api_systemStatus(params) { + return new Promise((resolve) => { + this.load(this.undefined, params) + .then(({ status, ...data }: any) => { + console.log('%c system - status 接口调用成功 %c', SuccessStyle, '') + if (status === 200) { + return resolve([data, null]) + } + resolve([null, data]) + }) + .catch((error) => { + console.log('%c system - status 接口调用失败 %c', ErrorStyle, '') + resolve([null, error]) + }) + }) + } } diff --git a/src/workbench/browser/src/app/shared/services/storage/remote.service.ts b/src/workbench/browser/src/app/shared/services/storage/remote.service.ts index 4034e6c79..c42e7ea3d 100644 --- a/src/workbench/browser/src/app/shared/services/storage/remote.service.ts +++ b/src/workbench/browser/src/app/shared/services/storage/remote.service.ts @@ -1,11 +1,9 @@ -import { HttpClient } from '@angular/common/http' -import { Injectable } from '@angular/core' +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; -const ErrorStyle = - 'background-color: #a73836; color: #fff;padding:3px;box-sizing: border-box;border-radius: 3px;' +const ErrorStyle = 'background-color: #a73836; color: #fff;padding:3px;box-sizing: border-box;border-radius: 3px;'; -const SuccessStyle = - 'background-color: #316745; color: #fff;padding:3px;box-sizing: border-box;border-radius: 3px;' +const SuccessStyle = 'background-color: #316745; color: #fff;padding:3px;box-sizing: border-box;border-radius: 3px;'; @Injectable({ providedIn: 'root', @@ -13,1171 +11,1142 @@ const SuccessStyle = export class RemoteService { constructor(private http: HttpClient) {} - api_projectCreate(params) { + api_projectCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/project`, params).subscribe({ + this.http.post(`${prefix}/project`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c project - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c project:create - api_projectCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c project - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c project:create - api_projectCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_projectUpdate({ uuid, ...items }) { + api_projectUpdate({ uuid, ...items }, prefix = '') { if (!uuid) { - console.log( - '%c Error: project - update 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: project - update 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/project/${uuid}`, { ...items }).subscribe({ + this.http.put(`${prefix}/project/${uuid}`, { ...items }).subscribe({ next: ({ status, data }: any) => { - console.log('%c project - update 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c project:update - api_projectUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c project - update 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c project:update - api_projectUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_projectDelete({ uuid }) { + api_projectDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: project - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: project - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/project/${uuid}`, {}).subscribe({ + this.http.delete(`${prefix}/project/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c project - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c project:delete - api_projectDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c project - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c project:delete - api_projectDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_projectExport(params) { + api_projectExport(params, prefix = '') { return new Promise((resolve) => { - this.http.get(`/project/export`, params).subscribe({ + this.http.get(`${prefix}/project/export`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c project - export 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c project:export - api_projectExport 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c project - export 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c project:export - api_projectExport 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceCreate({ title }) { + api_workspaceCreate({ title }, prefix = '') { if (!title) { - console.log( - '%c Error: workspace - create 接口 缺失参数 title %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - create 接口 缺失参数 title %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.post(`/workspace`, { title }).subscribe({ + this.http.post(`${prefix}/workspace`, { title }).subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:create - api_workspaceCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:create - api_workspaceCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceList({ ...items }) { + api_workspaceList({ ...items }, prefix = '') { return new Promise((resolve) => { this.http - .get(`/workspace/list`, { + .get(`${prefix}/workspace/list`, { params: { ...items }, }) .subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - list 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:list - api_workspaceList 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - list 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:list - api_workspaceList 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceUpload(params) { + api_workspaceUpload(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/workspace/upload`, params).subscribe({ + this.http.post(`${prefix}/workspace/upload`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - upload 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:upload - api_workspaceUpload 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - upload 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:upload - api_workspaceUpload 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceEdit({ workspaceID, title }) { + api_workspaceEdit({ workspaceID, title }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - edit 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - edit 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } if (!title) { - console.log( - '%c Error: workspace - edit 接口 缺失参数 title %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - edit 接口 缺失参数 title %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/workspace/${workspaceID}`, { title }).subscribe({ + this.http.put(`${prefix}/workspace/${workspaceID}`, { title }).subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - edit 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:edit - api_workspaceEdit 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - edit 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:edit - api_workspaceEdit 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceDelete({ workspaceID }) { + api_workspaceDelete({ workspaceID }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - delete 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - delete 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/workspace/${workspaceID}`, {}).subscribe({ + this.http.delete(`${prefix}/workspace/${workspaceID}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:delete - api_workspaceDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:delete - api_workspaceDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceGetInfo({ workspaceID }) { + api_workspaceGetInfo({ workspaceID }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - getInfo 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - getInfo 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/workspace/${workspaceID}`, {}).subscribe({ + this.http.get(`${prefix}/workspace/${workspaceID}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log( - '%c workspace - getInfo 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:getInfo - api_workspaceGetInfo 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - getInfo 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:getInfo - api_workspaceGetInfo 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceMember({ workspaceID }) { + api_workspaceMember({ workspaceID }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - member 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - member 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/workspace/${workspaceID}/member/list`, {}).subscribe({ + this.http.get(`${prefix}/workspace/${workspaceID}/member/list`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c workspace - member 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:member - api_workspaceMember 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c workspace - member 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c workspace:member - api_workspaceMember 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_workspaceAddMember({ workspaceID, userIDs }) { + api_workspaceAddMember({ workspaceID, userIDs }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - addMember 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - addMember 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } if (!userIDs) { - console.log( - '%c Error: workspace - addMember 接口 缺失参数 userIDs %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - addMember 接口 缺失参数 userIDs %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http - .post(`/workspace/${workspaceID}/member/add`, { userIDs }) - .subscribe({ - next: ({ status, data }: any) => { - console.log( - '%c workspace - addMember 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) - } - resolve([null, { status, ...data }]) - }, - error: (error) => { - console.log( - '%c workspace - addMember 接口请求失败 %c', - ErrorStyle, - '' - ) - resolve([null, error]) - }, - }) - }) + this.http.post(`${prefix}/workspace/${workspaceID}/member/add`, { userIDs }).subscribe({ + next: ({ status, data }: any) => { + console.log('%c workspace:addMember - api_workspaceAddMember 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c workspace:addMember - api_workspaceAddMember 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); } - api_workspaceRemoveMember({ workspaceID, userIDs }) { + api_workspaceRemoveMember({ workspaceID, userIDs }, prefix = '') { if (!workspaceID) { - console.log( - '%c Error: workspace - removeMember 接口 缺失参数 workspaceID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - removeMember 接口 缺失参数 workspaceID %c', ErrorStyle, ''); + return; } if (!userIDs) { - console.log( - '%c Error: workspace - removeMember 接口 缺失参数 userIDs %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: workspace - removeMember 接口 缺失参数 userIDs %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .delete(`/workspace/${workspaceID}/member/remove`, { + .delete(`${prefix}/workspace/${workspaceID}/member/remove`, { body: { userIDs }, }) .subscribe({ next: ({ status, data }: any) => { - console.log( - '%c workspace - removeMember 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) + console.log('%c workspace:removeMember - api_workspaceRemoveMember 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log( - '%c workspace - removeMember 接口请求失败 %c', - ErrorStyle, - '' - ) - resolve([null, error]) + console.log('%c workspace:removeMember - api_workspaceRemoveMember 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_userUpdateUserProfile(params) { + api_shareCreateShare(params, prefix = '') { return new Promise((resolve) => { - this.http.put(`/user/profile`, params).subscribe({ + this.http.post(`${prefix}/shared`, params).subscribe({ next: ({ status, data }: any) => { - console.log( - '%c user - updateUserProfile 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) + console.log('%c share:createShare - api_shareCreateShare 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log( - '%c user - updateUserProfile 接口请求失败 %c', - ErrorStyle, - '' - ) - resolve([null, error]) - }, - }) - }) + console.log('%c share:createShare - api_shareCreateShare 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); } - api_userReadProfile({ ...items }) { + api_shareGetShareList(params, prefix = '') { + return new Promise((resolve) => { + this.http.get(`${prefix}/shared`, params).subscribe({ + next: ({ status, data }: any) => { + console.log('%c share:getShareList - api_shareGetShareList 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c share:getShareList - api_shareGetShareList 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_shareDeleteShare(params, prefix = '') { + return new Promise((resolve) => { + this.http.delete(`${prefix}/shared`, params).subscribe({ + next: ({ status, data }: any) => { + console.log('%c share:deleteShare - api_shareDeleteShare 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c share:deleteShare - api_shareDeleteShare 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_shareDocGetAllApi({ uniqueID }, prefix = '') { + if (!uniqueID) { + console.log('%c Error: shareDoc - getAllAPI 接口 缺失参数 uniqueID %c', ErrorStyle, ''); + return; + } + + return new Promise((resolve) => { + this.http.get(`${prefix}/shared-docs/${uniqueID}/collections`, {}).subscribe({ + next: ({ status, data }: any) => { + console.log('%c shareDoc:getAllAPI - api_shareDocGetAllApi 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c shareDoc:getAllAPI - api_shareDocGetAllApi 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_shareDocGetApiDetail({ uniqueID, apiDataUUID }, prefix = '') { + if (!uniqueID) { + console.log('%c Error: shareDoc - getApiDetail 接口 缺失参数 uniqueID %c', ErrorStyle, ''); + return; + } + if (!apiDataUUID) { + console.log('%c Error: shareDoc - getApiDetail 接口 缺失参数 apiDataUUID %c', ErrorStyle, ''); + return; + } + + return new Promise((resolve) => { + this.http.get(`${prefix}/shared-docs/${uniqueID}/api/${apiDataUUID}`, {}).subscribe({ + next: ({ status, data }: any) => { + console.log('%c shareDoc:getApiDetail - api_shareDocGetApiDetail 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c shareDoc:getApiDetail - api_shareDocGetApiDetail 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_shareDocGetEnv({ uniqueID }, prefix = '') { + if (!uniqueID) { + console.log('%c Error: shareDoc - getEnv 接口 缺失参数 uniqueID %c', ErrorStyle, ''); + return; + } + + return new Promise((resolve) => { + this.http.get(`${prefix}/shared-docs/${uniqueID}/environments`, {}).subscribe({ + next: ({ status, data }: any) => { + console.log('%c shareDoc:getEnv - api_shareDocGetEnv 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c shareDoc:getEnv - api_shareDocGetEnv 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_userUpdateUserProfile(params, prefix = '') { + return new Promise((resolve) => { + this.http.put(`${prefix}/user/profile`, params).subscribe({ + next: ({ status, data }: any) => { + console.log('%c user:updateUserProfile - api_userUpdateUserProfile 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c user:updateUserProfile - api_userUpdateUserProfile 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); + } + + api_userReadProfile({ ...items }, prefix = '') { return new Promise((resolve) => { this.http - .get(`/user/profile`, { + .get(`${prefix}/user/profile`, { params: { ...items }, }) .subscribe({ next: ({ status, data }: any) => { - console.log( - '%c user - readProfile 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) + console.log('%c user:readProfile - api_userReadProfile 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c user - readProfile 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c user:readProfile - api_userReadProfile 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_userUpdatePsd({ oldPassword, newPassword }) { + api_userUpdatePsd({ oldPassword, newPassword }, prefix = '') { if (!oldPassword) { - console.log( - '%c Error: user - updatePsd 接口 缺失参数 oldPassword %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: user - updatePsd 接口 缺失参数 oldPassword %c', ErrorStyle, ''); + return; } if (!newPassword) { - console.log( - '%c Error: user - updatePsd 接口 缺失参数 newPassword %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: user - updatePsd 接口 缺失参数 newPassword %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/user/password`, { oldPassword, newPassword }).subscribe({ + this.http.put(`${prefix}/user/password`, { oldPassword, newPassword }).subscribe({ next: ({ status, data }: any) => { - console.log('%c user - updatePsd 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c user:updatePsd - api_userUpdatePsd 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c user - updatePsd 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c user:updatePsd - api_userUpdatePsd 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_userSearch({ username }) { + api_userSearch({ username }, prefix = '') { if (!username) { - console.log( - '%c Error: user - search 接口 缺失参数 username %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: user - search 接口 缺失参数 username %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/user/${username}`, {}).subscribe({ + this.http.get(`${prefix}/user/${username}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c user - search 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c user:search - api_userSearch 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c user - search 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c user:search - api_userSearch 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_authLogin({ username, password }) { + api_authLogin({ username, password }, prefix = '') { if (!username) { - console.log( - '%c Error: auth - login 接口 缺失参数 username %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: auth - login 接口 缺失参数 username %c', ErrorStyle, ''); + return; } if (!password) { - console.log( - '%c Error: auth - login 接口 缺失参数 password %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: auth - login 接口 缺失参数 password %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.post(`/auth/login`, { username, password }).subscribe({ + this.http.post(`${prefix}/auth/login`, { username, password }).subscribe({ next: ({ status, data }: any) => { - console.log('%c auth - login 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c auth:login - api_authLogin 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c auth - login 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c auth:login - api_authLogin 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_authRefresh(params) { + api_authRefresh(params, prefix = '') { return new Promise((resolve) => { - this.http.put(`/auth/refresh`, params).subscribe({ + this.http.put(`${prefix}/auth/refresh`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c auth - refresh 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c auth:refresh - api_authRefresh 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c auth - refresh 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c auth:refresh - api_authRefresh 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_authLogout({ refreshToken }) { + api_authLogout({ refreshToken }, prefix = '') { if (!refreshToken) { - console.log( - '%c Error: auth - logout 接口 缺失参数 refreshToken %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: auth - logout 接口 缺失参数 refreshToken %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.post(`/auth/logout`, { refreshToken }).subscribe({ + this.http.post(`${prefix}/auth/logout`, { refreshToken }).subscribe({ next: ({ status, data }: any) => { - console.log('%c auth - logout 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c auth:logout - api_authLogout 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c auth - logout 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c auth:logout - api_authLogout 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_envCreate(params) { + api_envCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/environment`, params).subscribe({ + this.http.post(`${prefix}/environment`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c env - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c env:create - api_envCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c env - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c env:create - api_envCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_envUpdate({ uuid, ...items }) { + api_envUpdate({ uuid, ...items }, prefix = '') { if (!uuid) { - console.log( - '%c Error: env - update 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: env - update 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/environment/${uuid}`, { ...items }).subscribe({ + this.http.put(`${prefix}/environment/${uuid}`, { ...items }).subscribe({ next: ({ status, data }: any) => { - console.log('%c env - update 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c env:update - api_envUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c env - update 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c env:update - api_envUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_envDelete({ uuid }) { + api_envDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: env - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: env - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/environment/${uuid}`, {}).subscribe({ + this.http.delete(`${prefix}/environment/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c env - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c env:delete - api_envDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c env - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c env:delete - api_envDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_envLoad({ uuid }) { + api_envLoad({ uuid }, prefix = '') { if (!uuid) { - console.log('%c Error: env - load 接口 缺失参数 uuid %c', ErrorStyle, '') - return + console.log('%c Error: env - load 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/environment/${uuid}`, {}).subscribe({ + this.http.get(`${prefix}/environment/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c env - load 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c env:load - api_envLoad 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c env - load 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c env:load - api_envLoad 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_envSearch({ projectID }) { + api_envSearch({ projectID }, prefix = '') { if (!projectID) { - console.log( - '%c Error: env - search 接口 缺失参数 projectID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: env - search 接口 缺失参数 projectID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .get(`/environment`, { + .get(`${prefix}/environment`, { params: { projectID }, }) .subscribe({ next: ({ status, data }: any) => { - console.log('%c env - search 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c env:search - api_envSearch 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c env - search 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c env:search - api_envSearch 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_groupCreate(params) { + api_groupCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/group`, params).subscribe({ + this.http.post(`${prefix}/group`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c group - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c group:create - api_groupCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c group - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c group:create - api_groupCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_groupUpdate({ uuid, ...items }) { + api_groupUpdate({ uuid, ...items }, prefix = '') { if (!uuid) { - console.log( - '%c Error: group - update 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: group - update 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/group/${uuid}`, { ...items }).subscribe({ + this.http.put(`${prefix}/group/${uuid}`, { ...items }).subscribe({ next: ({ status, data }: any) => { - console.log('%c group - update 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c group:update - api_groupUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c group - update 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c group:update - api_groupUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_groupBulkUpdate(params) { + api_groupBulkUpdate(params, prefix = '') { return new Promise((resolve) => { - this.http.put(`/group/batch`, params).subscribe({ + this.http.put(`${prefix}/group/batch`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c group - bulkUpdate 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c group:bulkUpdate - api_groupBulkUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c group - bulkUpdate 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c group:bulkUpdate - api_groupBulkUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_groupDelete({ uuid }) { + api_groupDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: group - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: group - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/group?uuids=[${uuid}]`, {}).subscribe({ + this.http.delete(`${prefix}/group?uuids=[${uuid}]`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c group - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c group:delete - api_groupDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c group - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c group:delete - api_groupDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_groupLoadAll({ projectID }) { + api_groupLoadAll({ projectID }, prefix = '') { if (!projectID) { - console.log( - '%c Error: group - loadAll 接口 缺失参数 projectID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: group - loadAll 接口 缺失参数 projectID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .get(`/group`, { + .get(`${prefix}/group`, { params: { projectID }, }) .subscribe({ next: ({ status, data }: any) => { - console.log('%c group - loadAll 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c group:loadAll - api_groupLoadAll 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c group - loadAll 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c group:loadAll - api_groupLoadAll 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiCreate(params) { + api_apiCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/api_data`, params).subscribe({ + this.http.post(`${prefix}/api_data`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c api - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c api:create - api_apiCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c api - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c api:create - api_apiCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiUpdate({ uuid, ...items }) { + api_apiUpdate({ uuid, ...items }, prefix = '') { if (!uuid) { - console.log( - '%c Error: api - update 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: api - update 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/api_data/${uuid}`, { ...items }).subscribe({ + this.http.put(`${prefix}/api_data/${uuid}`, { ...items }).subscribe({ next: ({ status, data }: any) => { - console.log('%c api - update 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c api:update - api_apiUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c api - update 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c api:update - api_apiUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiBulkUpdate(params) { + api_apiBulkUpdate(params, prefix = '') { return new Promise((resolve) => { - this.http.put(`/api_data/batch`, params).subscribe({ + this.http.put(`${prefix}/api_data/batch`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c api - bulkUpdate 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c api:bulkUpdate - api_apiBulkUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c api - bulkUpdate 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c api:bulkUpdate - api_apiBulkUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiDelete({ uuid }) { + api_apiDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: api - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: api - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/api_data?uuids=[${uuid}]`, {}).subscribe({ + this.http.delete(`${prefix}/api_data?uuids=[${uuid}]`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c api - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c api:delete - api_apiDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c api - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c api:delete - api_apiDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiLoadApi({ uuid }) { + api_apiLoadApi({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: api - loadApi 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: api - loadApi 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/api_data/${uuid}`, {}).subscribe({ + this.http.get(`${prefix}/api_data/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c api - loadApi 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c api:loadApi - api_apiLoadApi 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c api - loadApi 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c api:loadApi - api_apiLoadApi 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_apiLoadAllByProjectId({ projectID }) { + api_apiLoadAllByProjectId({ projectID }, prefix = '') { if (!projectID) { - console.log( - '%c Error: api - LoadAllByProjectID 接口 缺失参数 projectID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: api - LoadAllByProjectID 接口 缺失参数 projectID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .get(`/api_data`, { + .get(`${prefix}/api_data`, { params: { projectID }, }) .subscribe({ next: ({ status, data }: any) => { - console.log( - '%c api - LoadAllByProjectID 接口请求成功 %c', - SuccessStyle, - '' - ) - if (status === 200) { - return resolve([data, null]) + console.log('%c api:LoadAllByProjectID - api_apiLoadAllByProjectId 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log( - '%c api - LoadAllByProjectID 接口请求失败 %c', - ErrorStyle, - '' - ) - resolve([null, error]) + console.log('%c api:LoadAllByProjectID - api_apiLoadAllByProjectId 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_testCreate(params) { + api_testCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/api_test_history`, params).subscribe({ + this.http.post(`${prefix}/api_test_history`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c test - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c test:create - api_testCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c test - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c test:create - api_testCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_testDelete({ uuid }) { + api_testDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: test - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: test - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/api_test_history?uuids=[${uuid}]`, {}).subscribe({ + this.http.delete(`${prefix}/api_test_history?uuids=[${uuid}]`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c test - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c test:delete - api_testDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c test - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c test:delete - api_testDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_testLoadAll({ apiDataID }) { + api_testLoadAll({ apiDataID }, prefix = '') { if (!apiDataID) { - console.log( - '%c Error: test - LoadAll 接口 缺失参数 apiDataID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: test - LoadAll 接口 缺失参数 apiDataID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .get(`/api_test_history`, { + .get(`${prefix}/api_test_history`, { params: { apiDataID }, }) .subscribe({ next: ({ status, data }: any) => { - console.log('%c test - LoadAll 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c test:LoadAll - api_testLoadAll 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c test - LoadAll 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c test:LoadAll - api_testLoadAll 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_mockCreate(params) { + api_mockCreate(params, prefix = '') { return new Promise((resolve) => { - this.http.post(`/mock`, params).subscribe({ + this.http.post(`${prefix}/mock`, params).subscribe({ next: ({ status, data }: any) => { - console.log('%c mock - create 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c mock:create - api_mockCreate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c mock - create 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c mock:create - api_mockCreate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_mockLoad({ uuid }) { + api_mockLoad({ uuid }, prefix = '') { if (!uuid) { - console.log('%c Error: mock - load 接口 缺失参数 uuid %c', ErrorStyle, '') - return + console.log('%c Error: mock - load 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.get(`/mock/${uuid}`, {}).subscribe({ + this.http.get(`${prefix}/mock/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c mock - load 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c mock:load - api_mockLoad 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c mock - load 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c mock:load - api_mockLoad 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_mockDelete({ uuid }) { + api_mockDelete({ uuid }, prefix = '') { if (!uuid) { - console.log( - '%c Error: mock - delete 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: mock - delete 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.delete(`/mock/${uuid}`, {}).subscribe({ + this.http.delete(`${prefix}/mock/${uuid}`, {}).subscribe({ next: ({ status, data }: any) => { - console.log('%c mock - delete 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c mock:delete - api_mockDelete 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c mock - delete 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c mock:delete - api_mockDelete 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_mockUpdate({ uuid, ...items }) { + api_mockUpdate({ uuid, ...items }, prefix = '') { if (!uuid) { - console.log( - '%c Error: mock - update 接口 缺失参数 uuid %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: mock - update 接口 缺失参数 uuid %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { - this.http.put(`/mock/${uuid}`, { ...items }).subscribe({ + this.http.put(`${prefix}/mock/${uuid}`, { ...items }).subscribe({ next: ({ status, data }: any) => { - console.log('%c mock - update 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c mock:update - api_mockUpdate 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c mock - update 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c mock:update - api_mockUpdate 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); } - api_mockLoadAll({ apiDataID }) { + api_mockLoadAll({ apiDataID }, prefix = '') { if (!apiDataID) { - console.log( - '%c Error: mock - loadAll 接口 缺失参数 apiDataID %c', - ErrorStyle, - '' - ) - return + console.log('%c Error: mock - loadAll 接口 缺失参数 apiDataID %c', ErrorStyle, ''); + return; } return new Promise((resolve) => { this.http - .get(`/mock`, { + .get(`${prefix}/mock`, { params: { apiDataID }, }) .subscribe({ next: ({ status, data }: any) => { - console.log('%c mock - loadAll 接口请求成功 %c', SuccessStyle, '') - if (status === 200) { - return resolve([data, null]) + console.log('%c mock:loadAll - api_mockLoadAll 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); } - resolve([null, { status, ...data }]) + resolve([null, { status, ...data }]); }, error: (error) => { - console.log('%c mock - loadAll 接口请求失败 %c', ErrorStyle, '') - resolve([null, error]) + console.log('%c mock:loadAll - api_mockLoadAll 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); }, - }) - }) + }); + }); + } + + api_systemStatus(params, prefix = '') { + return new Promise((resolve) => { + this.http.get(`${prefix}/system/status`, params).subscribe({ + next: ({ status, data }: any) => { + console.log('%c system:status - api_systemStatus 接口请求成功 %c', SuccessStyle, ''); + if ([200, 201].includes(status)) { + return resolve([data, null]); + } + resolve([null, { status, ...data }]); + }, + error: (error) => { + console.log('%c system:status - api_systemStatus 接口请求失败 %c', ErrorStyle, ''); + resolve([null, error]); + }, + }); + }); } } diff --git a/src/workbench/browser/src/app/shared/services/storage/storage.service.ts b/src/workbench/browser/src/app/shared/services/storage/storage.service.ts index 143f486d9..a8b6fdd07 100644 --- a/src/workbench/browser/src/app/shared/services/storage/storage.service.ts +++ b/src/workbench/browser/src/app/shared/services/storage/storage.service.ts @@ -2,7 +2,6 @@ import { Injectable, Injector } from '@angular/core'; import { StorageResStatus } from './index.model'; import { IndexedDBStorage } from './IndexedDB/lib'; import { HttpStorage } from './http/lib'; -import { MessageService } from '../../../shared/services/message'; import { getSettings, SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; export type DataSourceType = 'local' | 'http'; @@ -21,12 +20,11 @@ export class StorageService { } constructor( private injector: Injector, - private messageService: MessageService, private settingService: SettingService, private indexedDBStorage: IndexedDBStorage ) { console.log('StorageService init'); - this.setStorage(this.dataSourceType); + this.setStorage( this.dataSourceType); } /** * Handle data from IndexedDB diff --git a/src/workbench/browser/src/app/shared/services/web-extension/webExtension.service.ts b/src/workbench/browser/src/app/shared/services/web-extension/webExtension.service.ts new file mode 100644 index 000000000..cc2137e80 --- /dev/null +++ b/src/workbench/browser/src/app/shared/services/web-extension/webExtension.service.ts @@ -0,0 +1,106 @@ +import { Injectable } from '@angular/core'; +import { WebService } from 'eo/workbench/browser/src/app/core/services'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { StorageUtil } from '../../../utils/storage/Storage'; +import { FeatureInfo } from 'eo/platform/node/extension-manager/types'; +import { ConsoleSqlOutline } from '@ant-design/icons-angular/icons'; + +type ExtensionItem = { + name: string; + version: string; + url: string; + disable: boolean; + pkgInfo: Record; +}; + +const extKey = 'ext_installed_list'; +const defaultExtensions = ['eoapi-export-openapi', 'eoapi-import-openapi']; + +@Injectable({ + providedIn: 'root', +}) +export class WebExtensionService { + installedList: ExtensionItem[] = StorageUtil.get(extKey, []); + + constructor(private message: NzMessageService, private webService: WebService) {} + + init() { + if (this.webService.isWeb) { + defaultExtensions.forEach((n) => { + const isInstall = this.getExtensionByName(n); + isInstall || this.installedList.push({ name: n } as any); + }); + this.installedList.forEach((n) => { + this.installExtension(n.name); + }); + } + } + + async installExtension(extName: string) { + const res = await fetch(`https://unpkg.com/${extName}`); + const data = await res.text(); + if (res.status === 200) { + this.insertScript(data); + const pkgJson = await this.getPkgInfo(extName); + const pkgObj = typeof pkgJson === 'object' ? pkgJson : JSON.parse(pkgJson); + const oldIndex = this.installedList.findIndex((n) => n.name === extName); + this.installedList.splice(oldIndex, oldIndex === -1 ? 0 : 1, { + name: extName, + disable: false, + version: pkgObj.version, + url: res.url, + pkgInfo: pkgObj, + }); + StorageUtil.set(extKey, this.installedList); + return true; + } else { + this.message.info(data); + return false; + } + } + + unInstallExtension(extName: string) { + this.installedList = this.installedList.filter((n) => n.name !== extName); + StorageUtil.set(extKey, this.installedList); + } + + getExtensionByName(extName: string) { + return this.installedList.find((n) => n.name === extName); + } + + insertScript(scriptText) { + const script = document.createElement('script'); + script.type = 'text/javascript'; + const text = ` + (() => { + const __define = global.define; + global.define = undefined; + ${scriptText} + + ;global.define = __define; + })() + `; + script.text = text; + document.head.appendChild(script); + } + + async getPkgInfo(extName: string) { + const res = await fetch(`https://unpkg.com/${extName}/package.json`); + return res.json(); + } + + getFeatures(featureName: string): Map { + if (window.eo) { + return window.eo.getFeature(featureName); + } + const featureMap = new Map([]); + this.installedList.forEach((item) => { + const feature: FeatureInfo = item.pkgInfo?.features?.[featureName]; + if (feature) { + featureMap.set(item.name, feature); + } + }); + if(featureMap.size===0) {return;} + return featureMap; + } +} diff --git a/src/workbench/browser/src/app/shared/services/workspace/workspace.service.ts b/src/workbench/browser/src/app/shared/services/workspace/workspace.service.ts index 4bf6e423b..c37340941 100644 --- a/src/workbench/browser/src/app/shared/services/workspace/workspace.service.ts +++ b/src/workbench/browser/src/app/shared/services/workspace/workspace.service.ts @@ -1,12 +1,15 @@ import { Injectable } from '@angular/core'; import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message'; import { StorageUtil } from '../../../utils/storage/Storage'; -import { DataSourceService } from 'eo/workbench/browser/src/app/shared/services/data-source/data-source.service'; +import { DataSourceType } from 'eo/workbench/browser/src/app/shared/services/storage/storage.service'; import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service'; import { StorageService } from 'eo/workbench/browser/src/app/shared/services/storage'; import { StorageRes, StorageResStatus } from 'eo/workbench/browser/src/app/shared/services/storage/index.model'; import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/user.service'; - +import { ActivatedRoute, Router } from '@angular/router'; +import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service'; +/** is show switch success tips */ +export const IS_SHOW_DATA_SOURCE_TIP = 'IS_SHOW_DATA_SOURCE_TIP'; @Injectable({ providedIn: 'root', }) @@ -15,15 +18,20 @@ export class WorkspaceService { title: $localize`Local workspace`, id: -1, } as API.Workspace; - currentWorkspaceID: number = StorageUtil.get('currentWorkspace', this.localWorkspace).id; - + currentWorkspaceID: number = + Number(this.route.snapshot.queryParams?.spaceID) || + StorageUtil.get('currentWorkspace', this.localWorkspace)?.id || + -1; + isRemote = + window.location.pathname.includes('/home/share') || + this.settingService.settings['eoapi-common.dataStorage'] === 'http'; authEnum = { canEdit: false, canDelete: false, canCreate: false, }; get isLocal() { - return this.currentWorkspaceID === -1; + return !window.location.pathname.includes('/home/share') && this.currentWorkspaceID === -1; } get currentWorkspace() { @@ -36,20 +44,25 @@ export class WorkspaceService { return result; } workspaceList: API.Workspace[] = [this.localWorkspace]; - constructor( private messageService: MessageService, - private dataSourceService: DataSourceService, private storage: StorageService, private projectService: ProjectService, - private userService: UserService + private userService: UserService, + private settingService: SettingService, + private storageService: StorageService, + private router: Router, + private route: ActivatedRoute ) { - //Current storage workspaceID not match remote storage,reset it; - if (this.isLocal && this.dataSourceService.isRemote) { - this.setCurrentWorkspace(this.localWorkspace); - } else if (!this.isLocal && !this.dataSourceService.isRemote) { + if (this.isRemote) { + this.switchToHttp(); + } + StorageUtil.set('currentWorkspace', this.currentWorkspaceID); + // Current storage workspaceID not match remote storage,reset it; + if ((this.isLocal && this.isRemote) || (!this.isLocal && !this.isRemote)) { this.setCurrentWorkspace(this.currentWorkspace); } + //TODO currentworkspace not spaceID,redirect it } getWorkspaceInfo(workspaceID: number): Promise { @@ -94,24 +107,52 @@ export class WorkspaceService { this.currentWorkspaceID = workspace.id; StorageUtil.set('currentWorkspace', workspace); // * Change data storage - await this.dataSourceService.switchDataSource(workspace.id === -1 ? 'local' : 'http', () => - this.updateProjectID(this.currentWorkspaceID) - ); + this.messageService.send({ + type: 'changeStorage', + data: { + type: workspace.id === -1 ? 'local' : 'http', + }, + }); + this.switchDataSource(workspace.id === -1 ? 'local' : 'http'); + await this.updateProjectID(this.currentWorkspaceID); + //refresh componnet + await this.router.navigate(['**']); + await this.router.navigate(['/home'], { queryParams: { spaceID: workspace.id } }); + this.messageService.send({ type: 'workspaceChange', data: true }); } + /** + * switch data + */ + private switchDataSource = async (dataSource: DataSourceType) => { + const isRemote = dataSource === 'http'; + if (isRemote) { + this.switchToHttp(); + localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'false'); + } else { + this.switchToLocal(); + localStorage.setItem(IS_SHOW_DATA_SOURCE_TIP, 'true'); + } + }; + switchToLocal() { + this.storageService.toggleDataSource({ dataSourceType: 'local' }); + } + switchToHttp() { + this.storageService.toggleDataSource({ dataSourceType: 'http' }); + } getWorkspaceList() { return this.workspaceList; } async updateProjectID(workspaceID: number) { - if (workspaceID !== -1 && this.dataSourceService.isRemote) { - const { projects, creatorID } = await this.getWorkspaceInfo(workspaceID); - this.projectService.setCurrentProjectID(projects.at(0).uuid); - this.authEnum.canEdit = creatorID === this.userService.userProfile.id; - } if (workspaceID === -1) { this.projectService.setCurrentProjectID(1); + return; } + const { projects, creatorID } = await this.getWorkspaceInfo(workspaceID); + console.log(projects); + this.projectService.setCurrentProjectID(projects.at(0).uuid); + this.authEnum.canEdit = creatorID === this.userService.userProfile.id; } } diff --git a/src/workbench/browser/src/app/shared/shared.module.ts b/src/workbench/browser/src/app/shared/shared.module.ts index f30da2da8..97b616853 100644 --- a/src/workbench/browser/src/app/shared/shared.module.ts +++ b/src/workbench/browser/src/app/shared/shared.module.ts @@ -35,7 +35,6 @@ import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; import { NzNotificationModule } from 'ng-zorro-antd/notification'; import { NzMessageModule } from 'ng-zorro-antd/message'; import { ApiParamsNumPipe } from './pipes/api-param-num.pipe'; -import { ModalService } from './services/modal.service'; import { PageBlankComponent } from './components/page-blank/page-blank.component'; import { RouterModule } from '@angular/router'; import { ShadowDomEncapsulationComponent } from 'eo/workbench/browser/src/app/shared/components/shadow/shadow-dom-encapsulation.component'; @@ -64,7 +63,7 @@ const COMPONENTS = [ SplitPanelComponent, EoMonacoEditorComponent, DownloadClienteComponent, - LocalWorkspaceTipComponent + LocalWorkspaceTipComponent, ]; const SHARED_MODULE = [ @@ -110,7 +109,7 @@ const SHARED_MODULE = [ @NgModule({ imports: [...SHARED_MODULE], declarations: [...COMPONENTS, ClickStopPropagationDirective, ApiParamsNumPipe, PageBlankComponent, EnvListComponent], - providers: [ModalService], + providers: [], exports: [...SHARED_MODULE, ...COMPONENTS, ClickStopPropagationDirective, ApiParamsNumPipe], }) export class SharedModule {} diff --git a/src/workbench/browser/src/app/shared/types.ts b/src/workbench/browser/src/app/shared/types.ts deleted file mode 100644 index 6fd99cd3e..000000000 --- a/src/workbench/browser/src/app/shared/types.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type FeatureType = { - icon: string; - label: string; - name: string; - description: string; - key?: string; - properties?: object; -}; diff --git a/src/workbench/browser/src/app/utils/index.utils.ts b/src/workbench/browser/src/app/utils/index.utils.ts index 6d9840b24..8d462722b 100644 --- a/src/workbench/browser/src/app/utils/index.utils.ts +++ b/src/workbench/browser/src/app/utils/index.utils.ts @@ -119,12 +119,22 @@ const base64ToUint8Array = (inputBase64String) => { } return tmpOutputArray; }; +// 字符串转ArrayBuffer +const s2ab = (s) => { + const buf = new ArrayBuffer(s.length); + const view = new Uint8Array(buf); + for (let i = 0; i !== s.length; ++i) { + view[i] = s.charCodeAt(i) & 0xff; + } + return buf; +}; + export const getBlobUrl = (inputStream, inputFileType) => { let tmpBlob; try { // inputStream = base64ToUint8Array(inputStream); if (typeof window.Blob === 'function') { - tmpBlob = new Blob([inputStream], { + tmpBlob = new Blob([s2ab(inputStream)], { type: inputFileType, }); } else { @@ -246,3 +256,15 @@ export function isBase64(str) { return false; } } + +export const version2Number = (version) => Number(version.replace(/[v.]/g, '')); + +export const copy = (text) => { + const el = document.createElement('input'); + el.setAttribute('value', text); + document.body.appendChild(el); + el.select(); + const flag = document.execCommand('copy'); + document.body.removeChild(el); + return !!flag; +}; diff --git a/src/workbench/browser/src/app/utils/module-loader/type.ts b/src/workbench/browser/src/app/utils/module-loader/type.ts deleted file mode 100644 index 4077e9936..000000000 --- a/src/workbench/browser/src/app/utils/module-loader/type.ts +++ /dev/null @@ -1,66 +0,0 @@ -/** - * 模块加载接口. - */ -export interface ModuleLoaderInterface { - loadModules: (modules: Array) => void; - loadModule: (module: ModuleInfo) => void; -} - -/** - * 模块运行环境 - */ -export enum ModuleRuntime { - main = 'main', - render = 'render', - web = 'web', -} - -/** - * 模块类型 - * system 系统模块 - * app 应用模块 - * ui 页面模块 - * feature 功能模块 - */ -export enum ModuleType { - system = 'system', - app = 'app', - ui = 'ui', - feature = 'feature', -} - -/** - * 模块信息接口 - */ -export interface ModuleInfo { - // 模块名称, npm包名 - name: string; - // 作者 - author: string; - // 版本 - version: string; - // 模块描述 - description: string; - // 详细信息 - introduction: string; - // 模块ID，用于关联 - moduleID: string; - // 模块名称，用于显示 - moduleName: string; - // 模块类型 - type: ModuleType; - // 模块Logo - logo: string; - // 入口文件 - main: string; - // 预加载js文件 - preload?: string; - // web运行支持 - web?: boolean; - // 模块对应上层模块ID - belongs?: Array; - // 下层关联模块ID集合 - subModules?: Array; - // 模块路径 - baseDir?: string; -} diff --git a/src/workbench/browser/src/app/utils/tree/tree.utils.ts b/src/workbench/browser/src/app/utils/tree/tree.utils.ts index 7e8bf2974..7b9fee327 100644 --- a/src/workbench/browser/src/app/utils/tree/tree.utils.ts +++ b/src/workbench/browser/src/app/utils/tree/tree.utils.ts @@ -180,7 +180,6 @@ export const tree2obj = (list: any[] = [], opts: TreeToObjOpts = {}, initObj = { curr = typeof curr === 'string' ? JSON.parse(curr) : curr; prev[curr[key]] = curr[valueKey] || fieldTypeMap.get(curr.type); if (Array.isArray(curr[childKey]) && curr[childKey].length > 0) { - console.log(`prev: ${prev} == curr: ${curr} == key: ${key}`); tree2obj(curr[childKey], opts, (prev[curr[key]] = {})); } else if (curr?.example) { prev[curr[key]] = curr?.example; diff --git a/src/workbench/browser/src/assets/theme/antd.less b/src/workbench/browser/src/assets/theme/antd.less index 3f242aba4..5028ec29e 100644 --- a/src/workbench/browser/src/assets/theme/antd.less +++ b/src/workbench/browser/src/assets/theme/antd.less @@ -1,5 +1,6 @@ // Custom Theming for NG-ZORRO // For more information: https://ng.ant.design/docs/customize-theme/en +@import '~ng-zorro-antd/ng-zorro-antd.variable.min.css'; @import '../../../node_modules/ng-zorro-antd/ng-zorro-antd.less'; @import '../../../node_modules/ng-zorro-antd/code-editor/style/entry.less'; diff --git a/src/workbench/browser/src/environments/common.ts b/src/workbench/browser/src/environments/common.ts index 7c0db3cd3..c826c3c06 100644 --- a/src/workbench/browser/src/environments/common.ts +++ b/src/workbench/browser/src/environments/common.ts @@ -6,5 +6,6 @@ export type APP_CONFIG_INSTANT = { EXTENSION_URL: string; REMOTE_SOCKET_URL: 'wss://eoapi.eolinker.com'; SOCKET_PORT: number; + NODE_SERVER_PORT: number; MOCK_URL: string; }; diff --git a/src/workbench/browser/src/environments/environment.docker.ts b/src/workbench/browser/src/environments/environment.docker.ts new file mode 100644 index 000000000..fd25c30d9 --- /dev/null +++ b/src/workbench/browser/src/environments/environment.docker.ts @@ -0,0 +1,13 @@ +import { APP_CONFIG_INSTANT, COMMON_CONFIG } from 'eo/workbench/browser/src/environments/common'; + +export const APP_CONFIG = Object.assign( + { + production: true, + environment: 'PROD', + }, + { + ...COMMON_CONFIG, + REMOTE_SOCKET_URL: '', + NODE_SERVER_PORT: '', + } +); diff --git a/src/workbench/browser/src/environments/environment.ts b/src/workbench/browser/src/environments/environment.ts index 503035cf1..e3132cf21 100644 --- a/src/workbench/browser/src/environments/environment.ts +++ b/src/workbench/browser/src/environments/environment.ts @@ -1,6 +1,7 @@ -import { APP_CONFIG_INSTANT } from 'eo/workbench/browser/src/environments/common'; +import { APP_CONFIG_INSTANT, COMMON_CONFIG } from 'eo/workbench/browser/src/environments/common'; export const APP_CONFIG: APP_CONFIG_INSTANT | any = { production: false, environment: 'LOCAL', + ...COMMON_CONFIG, }; diff --git a/src/workbench/browser/src/locale/messages.xlf b/src/workbench/browser/src/locale/messages.xlf index 0dda7049c..72d0f0990 100644 --- a/src/workbench/browser/src/locale/messages.xlf +++ b/src/workbench/browser/src/locale/messages.xlf @@ -6,7 +6,7 @@ No mock found with ID src/app/app.service.ts - 49 + 48 @@ -69,21 +69,21 @@ Account src/app/pages/account.component.ts - 16 + 11 Username src/app/pages/account.component.ts - 22 + 14 Save src/app/pages/account.component.ts - 47,49 + 33,35 src/app/pages/workspace.component.ts @@ -94,133 +94,149 @@ Password src/app/pages/account.component.ts - 58 + 41 Current password src/app/pages/account.component.ts - 64 + 46 New password src/app/pages/account.component.ts - 79 + 53 Confirm new password src/app/pages/account.component.ts - 94 + 60 Please input your confirm new password; src/app/pages/account.component.ts - 105,107 + 64,66 - + Please confirm your password; src/app/pages/account.component.ts - 109,111 + 68 - + Min length is 6; src/app/pages/account.component.ts - 113,115 + 70 + + + src/app/pages/user-modal.component.ts + 134 - + Max length is 11; src/app/pages/account.component.ts - 117,119 + 72 Reset src/app/pages/account.component.ts - 133,135 + 86,88 - - Sorry, username is be used + + Sorry, username is already in use src/app/pages/account.component.ts - 193 + 141 Username update success ! src/app/pages/account.component.ts - 215 + 163 Validation failed src/app/pages/account.component.ts - 243 + 186 Password reset success ! src/app/pages/account.component.ts - 254 + 197 New Request src/app/pages/api/api-tab.service.ts - 23 + 25 - - - New API src/app/pages/api/api-tab.service.ts - 26 + 43 Preview src/app/pages/api/api-tab.service.ts - 27 + 28 + + + src/app/pages/api/api-tab.service.ts + 47 New Websocket src/app/pages/api/api-tab.service.ts - 34 + 35 + + + src/app/pages/api/api-tab.service.ts + 54 + + + + New API + + src/app/pages/api/api-tab.service.ts + 46 Collections src/app/pages/api/api.component.html - 18 + 23 History src/app/pages/api/api.component.html - 34 + 39 src/app/pages/api/history/eo-history.component.html @@ -231,7 +247,7 @@ Environment src/app/pages/api/api.component.html - 71 + 76 src/app/shared/components/env/env.component.html @@ -243,35 +259,35 @@ Manage Environment src/app/pages/api/api.component.html - 79 + 90 Enviroment Quick Look src/app/pages/api/api.component.html - 88 + 99 Environment Setting src/app/pages/api/api.component.html - 138 + 153 Preview src/app/pages/api/api.component.ts - 48 + 54 Edit src/app/pages/api/api.component.ts - 52 + 58 src/app/pages/api/http/mock/api-mock.component.ts @@ -282,7 +298,14 @@ Test src/app/pages/api/api.component.ts - 56 + 63 + + + + Eoapi Client is required to use Mock. + + src/app/pages/api/api.component.ts + 131 @@ -313,7 +336,7 @@ Search src/app/pages/api/group/tree/api-group-tree.component.html - 2 + 7 src/app/pages/extension/extension.component.html @@ -328,61 +351,61 @@ New API src/app/pages/api/group/tree/api-group-tree.component.html - 12 + 25 New Group src/app/pages/api/group/tree/api-group-tree.component.html - 14 + 27 Import API src/app/pages/api/group/tree/api-group-tree.component.html - 16 + 29 Add API src/app/pages/api/group/tree/api-group-tree.component.html - 43 + 67 Add Subgroup src/app/pages/api/group/tree/api-group-tree.component.html - 46 + 70 Edit src/app/pages/api/group/tree/api-group-tree.component.html - 49 + 73 src/app/pages/api/group/tree/api-group-tree.component.html - 77 + 103 src/app/pages/api/http/mock/api-mock.component.html - 25 + 35 Delete src/app/pages/api/group/tree/api-group-tree.component.html - 52 + 76 src/app/pages/api/group/tree/api-group-tree.component.html - 85 + 115 src/app/pages/api/http/edit/api-edit-util.service.ts @@ -398,7 +421,7 @@ src/app/pages/api/http/mock/api-mock.component.html - 29 + 47 src/app/pages/api/http/test/api-test-util.service.ts @@ -413,7 +436,7 @@ Copy src/app/pages/api/group/tree/api-group-tree.component.html - 81 + 109 src/app/shared/components/monaco-editor/monaco-editor.component.ts @@ -424,14 +447,14 @@ Index src/app/pages/api/group/tree/api-group-tree.component.ts - 58 + 61 Import API src/app/pages/api/group/tree/api-group-tree.component.ts - 238 + 267 src/app/pages/api/overview/api-overview.component.ts @@ -442,7 +465,7 @@ successfully src/app/pages/api/group/tree/api-group-tree.component.ts - 248 + 277 src/app/pages/api/overview/api-overview.component.ts @@ -453,7 +476,7 @@ Failed to src/app/pages/api/group/tree/api-group-tree.component.ts - 252 + 281 src/app/pages/api/overview/api-overview.component.ts @@ -464,7 +487,7 @@ Deletion Confirmation? src/app/pages/api/group/tree/api-group-tree.component.ts - 262 + 291 src/app/pages/workspace.component.ts @@ -475,35 +498,35 @@ Are you sure you want to delete the data <strong title=""></strong> ? You cannot restore it once deleted! src/app/pages/api/group/tree/api-group-tree.component.ts - 263,265 + 292,294 Add Group src/app/pages/api/group/tree/api-group-tree.component.ts - 321 + 350 Add Subgroup src/app/pages/api/group/tree/api-group-tree.component.ts - 330 + 359 Edit Group src/app/pages/api/group/tree/api-group-tree.component.ts - 339 + 368 Delete Group src/app/pages/api/group/tree/api-group-tree.component.ts - 348 + 377 @@ -613,7 +636,7 @@ src/app/shared/components/env/env.component.ts - 31 + 34 @@ -723,7 +746,7 @@ src/app/pages/api/http/test/api-test.component.html - 125 + 190 @@ -738,7 +761,7 @@ src/app/pages/api/http/test/api-test.component.html - 67 + 109 src/app/pages/api/http/test/query/api-test-query.component.html @@ -757,7 +780,7 @@ src/app/pages/api/http/test/api-test.component.html - 77 + 122 @@ -772,11 +795,11 @@ src/app/pages/api/http/test/api-test.component.html - 52 + 85 src/app/pages/api/http/test/api-test.component.html - 119 + 182 @@ -799,7 +822,7 @@ src/app/pages/api/http/test/api-test.component.html - 115 + 178 @@ -818,11 +841,11 @@ src/app/pages/api/http/mock/api-mock.component.html - 47 + 66 src/app/pages/api/http/test/api-test.component.html - 110 + 173 @@ -844,7 +867,7 @@ Name src/app/pages/api/http/detail/api-detail.component.ts - 27 + 30 src/app/pages/api/http/mock/api-mock.component.ts @@ -852,14 +875,14 @@ src/app/shared/components/env/env.component.ts - 29 + 32 Created Type src/app/pages/api/http/detail/api-detail.component.ts - 28 + 31 src/app/pages/api/http/mock/api-mock.component.ts @@ -980,11 +1003,11 @@ src/app/pages/api/http/mock/api-mock.component.html - 58 + 83 src/app/shared/components/env/env.component.html - 50 + 64 @@ -1041,7 +1064,7 @@ src/app/shared/components/env/env.component.ts - 143 + 151 @@ -1056,21 +1079,21 @@ src/app/shared/components/env/env.component.ts - 157 + 165 Failed Operation src/app/pages/api/http/edit/api-edit.component.ts - 143 + 144 Root directory src/app/pages/api/http/edit/api-edit.component.ts - 187 + 188 @@ -1172,39 +1195,39 @@ Click to Copy src/app/pages/api/http/mock/api-mock.component.html - 12 + 14 Preview src/app/pages/api/http/mock/api-mock.component.html - 24 + 34 Are you sure you want to delete this Mock? src/app/pages/api/http/mock/api-mock.component.html - 28 + 43 Mock Name src/app/pages/api/http/mock/api-mock.component.html - 41 + 60 Cancel src/app/pages/api/http/mock/api-mock.component.html - 59 + 84 src/app/shared/components/env/env.component.html - 49 + 63 src/app/shared/components/params-import/params-import.component.html @@ -1258,7 +1281,7 @@ src/app/utils/index.utils.ts - 156 + 166 @@ -1284,14 +1307,14 @@ src/app/shared/components/env/env.component.ts - 30 + 33 Please enter URL src/app/pages/api/http/test/api-test.component.html - 18 + 27 src/app/pages/api/websocket/websocket.component.html @@ -1302,7 +1325,7 @@ Enter URL src/app/pages/api/http/test/api-test.component.html - 19 + 32 src/app/pages/api/websocket/websocket.component.html @@ -1313,28 +1336,28 @@ Send src/app/pages/api/http/test/api-test.component.html - 24 + 42 Abort src/app/pages/api/http/test/api-test.component.html - 25 + 43 Save as API src/app/pages/api/http/test/api-test.component.html - 30,32 + 57,59 Headers src/app/pages/api/http/test/api-test.component.html - 41 + 71 src/app/pages/api/websocket/websocket.component.html @@ -1345,21 +1368,21 @@ Pre-request Script src/app/pages/api/http/test/api-test.component.html - 87 + 135 After-response Script src/app/pages/api/http/test/api-test.component.html - 96 + 149 Save As File src/app/pages/api/http/test/api-test.component.html - 133 + 203 @@ -1479,7 +1502,7 @@ Program will not close unsaved tabs src/app/pages/api/tab/api-tab-operate.service.ts - 319 + 336 @@ -1514,25 +1537,25 @@ Do you want to save the changes? src/app/pages/api/tab/api-tab.component.ts - 69 + 71 Your changes will be lost if you don't save them. src/app/pages/api/tab/api-tab.component.ts - 70 + 72 Cancel src/app/pages/api/tab/api-tab.component.ts - 74 + 76 src/app/pages/api/websocket/websocket.component.ts - 300 + 305 src/app/shared/services/modal.service.ts @@ -1543,14 +1566,14 @@ Don't Save src/app/pages/api/tab/api-tab.component.ts - 80 + 82 Save src/app/pages/api/tab/api-tab.component.ts - 88 + 90 @@ -1606,21 +1629,21 @@ Do you want to leave the page? src/app/pages/api/websocket/websocket.component.ts - 285 + 290 After leaving, the current long connection is no longer maintained, whether to confirm to leave? src/app/pages/api/websocket/websocket.component.ts - 286 + 291 Leave src/app/pages/api/websocket/websocket.component.ts - 290 + 295 @@ -1669,7 +1692,7 @@ Details src/app/pages/extension/detail/extension-detail.component.html - 41 + 42 src/app/pages/extension/list/extension-list.component.html @@ -1680,77 +1703,70 @@ Support src/app/pages/extension/detail/extension-detail.component.html - 49 + 50 Author src/app/pages/extension/detail/extension-detail.component.html - 51 + 52 Version src/app/pages/extension/detail/extension-detail.component.html - 52 + 53 Repository src/app/pages/extension/detail/extension-detail.component.html - 53 + 54 Homepage src/app/pages/extension/detail/extension-detail.component.html - 58 + 59 BugReport src/app/pages/extension/detail/extension-detail.component.html - 61 + 62 ChangeLog src/app/pages/extension/detail/extension-detail.component.html - 66 + 67 Changelog failed to load src/app/pages/extension/detail/extension-detail.component.html - 69 + 70 Reacquire src/app/pages/extension/detail/extension-detail.component.html - 71 - - - - Eoapi Client is required to install this extension. - - src/app/pages/extension/detail/extension-detail.component.ts - 43 + 72 This plugin has no documentation yet. src/app/pages/extension/detail/extension-detail.component.ts - 66 + 68 @@ -1813,379 +1829,372 @@ Search by username src/app/pages/member.component.ts - 27 + 23 Select a member above src/app/pages/member.component.ts - 39,41 + 34,36 Manage access src/app/pages/member.component.ts - 46 + 41 Add people src/app/pages/member.component.ts - 55,57 + 50,52 Could not find a user matching src/app/pages/member.component.ts - 151 + 142 Add new member success src/app/pages/member.component.ts - 173 + 163 Warning src/app/pages/member.component.ts - 229 + 222 Are you sure you want to remove the member ? src/app/pages/member.component.ts - 230 + 223 Delete src/app/pages/member.component.ts - 232 + 225 + + + src/app/pages/workspace.component.ts + 165 Search Workspace src/app/pages/navbar/navbar.component.html - 27 + 33 New Workspace src/app/pages/navbar/navbar.component.html - 33 + 39 - - Open Settings + + Share src/app/pages/navbar/navbar.component.html - 64 + 74,76 - - Document + + Share via link src/app/pages/navbar/navbar.component.html - 75 + 79 - - Developer Support + + This link will be updated with the API content. Everyone can access it without logging in src/app/pages/navbar/navbar.component.html - 76 + 80,82 + + + + Open Settings + + src/app/pages/navbar/navbar.component.html + 103 + + + + Document + + src/app/pages/navbar/navbar.component.html + 114 Report Issue src/app/pages/navbar/navbar.component.html - 85 + 123 Sign in for Collaboration src/app/pages/navbar/navbar.component.html - 96 + 140 Account Setting src/app/pages/navbar/navbar.component.html - 103 + 147 Sign Out src/app/pages/navbar/navbar.component.html - 106 + 150 Minimize src/app/pages/navbar/navbar.component.html - 116 + 160 Close src/app/pages/navbar/navbar.component.html - 136 + 180 Download src/app/pages/navbar/navbar.component.html - 145,148 - - - - Eoapi Client is required to sign in - - src/app/pages/navbar/navbar.component.ts - 83 - - - - Eoapi Client is required to add workspace - - src/app/pages/navbar/navbar.component.ts - 92 - - - src/app/shared/components/sidebar/sidebar.component.ts - 73 + 189,192 Do you want to upload local data to the cloud ? src/app/pages/user-modal.component.ts - 26 + 23 - + After confirmation, the system will create a cloud space to upload the local data to the cloud. src/app/pages/user-modal.component.ts - 30,33 + 27,29 Subsequent local space and cloud space are no longer synchronized src/app/pages/user-modal.component.ts - 36 + 32 Cancel src/app/pages/user-modal.component.ts - 49,51 + 45,47 src/app/pages/user-modal.component.ts - 91,93 + 82,84 Sync src/app/pages/user-modal.component.ts - 59,61 + 55,57 Check your connection src/app/pages/user-modal.component.ts - 69 + 65 Can't connect right now, click to retry or src/app/pages/user-modal.component.ts - 73 + 69 config in the configuration src/app/pages/user-modal.component.ts - 79,81 + 70,72 Retry src/app/pages/user-modal.component.ts - 101,103 + 92,94 Sign In/Up src/app/pages/user-modal.component.ts - 112 + 103 Enter Email/Phone/Username src/app/pages/user-modal.component.ts - 124 + 116 Enter password src/app/pages/user-modal.component.ts - 136 + 128 - + Please input your password; src/app/pages/user-modal.component.ts - 140,142 - - - - Min length is 6; - - src/app/pages/user-modal.component.ts - 144,146 + 132 Sign In/Up src/app/pages/user-modal.component.ts - 161,163 + 149,151 Open setting src/app/pages/user-modal.component.ts - 174 + 162 If you want to collaborate, please src/app/pages/user-modal.component.ts - 178 + 166 open the settings src/app/pages/user-modal.component.ts - 184,186 + 167,169 and fill in the configuration src/app/pages/user-modal.component.ts - 187 + 170 Add Workspace src/app/pages/user-modal.component.ts - 195 + 178 Workspace Name src/app/pages/user-modal.component.ts - 210 + 190 Cancel src/app/pages/user-modal.component.ts - 225,227 + 205,207 Save src/app/pages/user-modal.component.ts - 236,238 + 216,218 Successfully logged out ! src/app/pages/user-modal.component.ts - 334 + 337 Connect failed src/app/pages/user-modal.component.ts - 356 + 359 Connect success src/app/pages/user-modal.component.ts - 365 + 370 Please check you username or password src/app/pages/user-modal.component.ts - 546 + 568 Please check the account/password, the account must be a mobile phone number or email ! src/app/pages/user-modal.component.ts - 555 + 578 Add workspace Failed ! src/app/pages/user-modal.component.ts - 661 + 680 Create new workspace successfully ! src/app/pages/user-modal.component.ts - 671 + 690 @@ -2210,7 +2219,7 @@ src/app/shared/components/env/env.component.html - 25 + 35 @@ -2256,13 +2265,6 @@ You cannot restore it once deleted! 162,163 - - Remove - - src/app/pages/workspace.component.ts - 165 - - Delete success ! @@ -2440,935 +2442,888 @@ You cannot restore it once deleted! 158 - - Environment Management - - src/app/shared/components/api-script/constant.ts - 164 - - - - Get enviroment host - - src/app/shared/components/api-script/constant.ts - 167 - - - src/app/shared/components/api-script/constant.ts - 172 - - - - The host prefix set in the environment - - src/app/shared/components/api-script/constant.ts - 173 - - - - Get an environment variables - - src/app/shared/components/api-script/constant.ts - 177 - - - src/app/shared/components/api-script/constant.ts - 182 - - - - Set an environment variables - - src/app/shared/components/api-script/constant.ts - 187 - - - src/app/shared/components/api-script/constant.ts - 192 - - Encode and Decode src/app/shared/components/api-script/constant.ts - 199 + 164 JSON Encode src/app/shared/components/api-script/constant.ts - 202 + 167 src/app/shared/components/api-script/constant.ts - 207 + 172 JSON object src/app/shared/components/api-script/constant.ts - 208 + 173 src/app/shared/components/api-script/constant.ts - 220 + 185 JSON string src/app/shared/components/api-script/constant.ts - 209 + 174 src/app/shared/components/api-script/constant.ts - 219 + 184 JSON Decode src/app/shared/components/api-script/constant.ts - 213 + 178 src/app/shared/components/api-script/constant.ts - 218 + 183 XML Encode src/app/shared/components/api-script/constant.ts - 224 + 189 src/app/shared/components/api-script/constant.ts - 229 + 194 XML object src/app/shared/components/api-script/constant.ts - 230 + 195 XML string src/app/shared/components/api-script/constant.ts - 231 + 196 src/app/shared/components/api-script/constant.ts - 241 + 206 XML Decode src/app/shared/components/api-script/constant.ts - 235 + 200 src/app/shared/components/api-script/constant.ts - 240 + 205 XML code src/app/shared/components/api-script/constant.ts - 242 + 207 Base64 Encode src/app/shared/components/api-script/constant.ts - 246 + 211 src/app/shared/components/api-script/constant.ts - 251 + 216 string of wait for encode src/app/shared/components/api-script/constant.ts - 252 + 217 src/app/shared/components/api-script/constant.ts - 274 + 239 string after encode src/app/shared/components/api-script/constant.ts - 253 + 218 src/app/shared/components/api-script/constant.ts - 275 + 240 Base64 Decode src/app/shared/components/api-script/constant.ts - 257 + 222 src/app/shared/components/api-script/constant.ts - 262 + 227 string of wait for decode src/app/shared/components/api-script/constant.ts - 263 + 228 src/app/shared/components/api-script/constant.ts - 285 + 250 string after decode src/app/shared/components/api-script/constant.ts - 264 + 229 src/app/shared/components/api-script/constant.ts - 286 + 251 UrlEncode Encode src/app/shared/components/api-script/constant.ts - 268 + 233 src/app/shared/components/api-script/constant.ts - 273 + 238 UrlEncode Decode src/app/shared/components/api-script/constant.ts - 279 + 244 src/app/shared/components/api-script/constant.ts - 284 + 249 Gzip zip src/app/shared/components/api-script/constant.ts - 290 + 255 src/app/shared/components/api-script/constant.ts - 295 + 260 string of wait for zip src/app/shared/components/api-script/constant.ts - 296 + 261 src/app/shared/components/api-script/constant.ts - 318 + 283 string after zip src/app/shared/components/api-script/constant.ts - 297 + 262 src/app/shared/components/api-script/constant.ts - 319 + 284 Gzip unzip src/app/shared/components/api-script/constant.ts - 301 + 266 src/app/shared/components/api-script/constant.ts - 306 + 271 string of wait for unzip src/app/shared/components/api-script/constant.ts - 307 + 272 src/app/shared/components/api-script/constant.ts - 329 + 294 string after unzip src/app/shared/components/api-script/constant.ts - 308 + 273 src/app/shared/components/api-script/constant.ts - 330 + 295 Deflate zip src/app/shared/components/api-script/constant.ts - 312 + 277 src/app/shared/components/api-script/constant.ts - 317 + 282 Deflate unzip src/app/shared/components/api-script/constant.ts - 323 + 288 src/app/shared/components/api-script/constant.ts - 328 + 293 Encryption and Decryption src/app/shared/components/api-script/constant.ts - 336 + 301 MD5 Encryption src/app/shared/components/api-script/constant.ts - 344 + 309 Content to be encrypted src/app/shared/components/api-script/constant.ts - 348 + 313 src/app/shared/components/api-script/constant.ts - 364 + 329 src/app/shared/components/api-script/constant.ts - 380 + 345 src/app/shared/components/api-script/constant.ts - 396 + 361 src/app/shared/components/api-script/constant.ts - 420 + 385 src/app/shared/components/api-script/constant.ts - 444 + 409 src/app/shared/components/api-script/constant.ts - 468 + 433 src/app/shared/components/api-script/constant.ts - 492 + 457 src/app/shared/components/api-script/constant.ts - 540 + 505 src/app/shared/components/api-script/constant.ts - 572 + 537 src/app/shared/components/api-script/constant.ts - 604 + 569 src/app/shared/components/api-script/constant.ts - 636 + 601 Encrypted result src/app/shared/components/api-script/constant.ts - 351 + 316 src/app/shared/components/api-script/constant.ts - 367 + 332 src/app/shared/components/api-script/constant.ts - 383 + 348 src/app/shared/components/api-script/constant.ts - 503 + 468 src/app/shared/components/api-script/constant.ts - 559 + 524 src/app/shared/components/api-script/constant.ts - 591 + 556 src/app/shared/components/api-script/constant.ts - 623 + 588 src/app/shared/components/api-script/constant.ts - 655 + 620 SHA1 Encryption src/app/shared/components/api-script/constant.ts - 355 + 320 src/app/shared/components/api-script/constant.ts - 360 + 325 SHA256 Encryption src/app/shared/components/api-script/constant.ts - 371 + 336 src/app/shared/components/api-script/constant.ts - 376 + 341 RSA-SHA1 Signature src/app/shared/components/api-script/constant.ts - 387 + 352 src/app/shared/components/api-script/constant.ts - 392 + 357 private key src/app/shared/components/api-script/constant.ts - 400 + 365 src/app/shared/components/api-script/constant.ts - 424 + 389 src/app/shared/components/api-script/constant.ts - 496 + 461 src/app/shared/components/api-script/constant.ts - 520 + 485 The encoding format of the result, base64 (default) src/app/shared/components/api-script/constant.ts - 404 + 369 src/app/shared/components/api-script/constant.ts - 428 + 393 src/app/shared/components/api-script/constant.ts - 452 + 417 src/app/shared/components/api-script/constant.ts - 500 + 465 Content After Signing src/app/shared/components/api-script/constant.ts - 407 + 372 src/app/shared/components/api-script/constant.ts - 431 + 396 src/app/shared/components/api-script/constant.ts - 455 + 420 RSA-SHA256 Signature src/app/shared/components/api-script/constant.ts - 411 + 376 src/app/shared/components/api-script/constant.ts - 416 + 381 RSA Public Key Encryption src/app/shared/components/api-script/constant.ts - 435 + 400 src/app/shared/components/api-script/constant.ts - 440 + 405 public key src/app/shared/components/api-script/constant.ts - 448 + 413 src/app/shared/components/api-script/constant.ts - 472 + 437 RSA Public Key Dencryption src/app/shared/components/api-script/constant.ts - 459 + 424 src/app/shared/components/api-script/constant.ts - 464 + 429 The encoding format of the content to be decrypted, base64 (default) src/app/shared/components/api-script/constant.ts - 476 + 441 src/app/shared/components/api-script/constant.ts - 524 + 489 Decrypted content src/app/shared/components/api-script/constant.ts - 479 + 444 RSA Private Key Encryption src/app/shared/components/api-script/constant.ts - 483 + 448 src/app/shared/components/api-script/constant.ts - 488 + 453 src/app/shared/components/api-script/constant.ts - 507 + 472 src/app/shared/components/api-script/constant.ts - 512 + 477 Content to be decrypted src/app/shared/components/api-script/constant.ts - 516 + 481 Decrypted Content src/app/shared/components/api-script/constant.ts - 527 + 492 AES Encryption src/app/shared/components/api-script/constant.ts - 531 + 496 src/app/shared/components/api-script/constant.ts - 536 + 501 password src/app/shared/components/api-script/constant.ts - 544 + 509 src/app/shared/components/api-script/constant.ts - 576 + 541 src/app/shared/components/api-script/constant.ts - 608 + 573 src/app/shared/components/api-script/constant.ts - 640 + 605 Padding mode, Pkcs7 (default)/NoPadding/ZeroPadding src/app/shared/components/api-script/constant.ts - 548 + 513 src/app/shared/components/api-script/constant.ts - 580 + 545 src/app/shared/components/api-script/constant.ts - 612 + 577 src/app/shared/components/api-script/constant.ts - 644 + 609 Mode, CBC (default)/ECB/CTR/OFB/CFB src/app/shared/components/api-script/constant.ts - 552 + 517 src/app/shared/components/api-script/constant.ts - 584 + 549 src/app/shared/components/api-script/constant.ts - 616 + 581 src/app/shared/components/api-script/constant.ts - 648 + 613 offset vector src/app/shared/components/api-script/constant.ts - 556 + 521 src/app/shared/components/api-script/constant.ts - 588 + 553 src/app/shared/components/api-script/constant.ts - 620 + 585 src/app/shared/components/api-script/constant.ts - 652 + 617 AES Dencryption src/app/shared/components/api-script/constant.ts - 563 + 528 src/app/shared/components/api-script/constant.ts - 568 + 533 DES Encryption src/app/shared/components/api-script/constant.ts - 595 + 560 src/app/shared/components/api-script/constant.ts - 600 + 565 DES Dencryption src/app/shared/components/api-script/constant.ts - 627 + 592 src/app/shared/components/api-script/constant.ts - 632 + 597 HTTP API request src/app/shared/components/api-script/constant.ts - 664 + 629 src/app/shared/components/api-script/constant.ts - 754 + 719 Set Request URL src/app/shared/components/api-script/constant.ts - 667 + 632 Set HTTP API request path src/app/shared/components/api-script/constant.ts - 672 + 637 new url src/app/shared/components/api-script/constant.ts - 673 + 638 Set Header src/app/shared/components/api-script/constant.ts - 677 + 642 Set HTTP API request header params src/app/shared/components/api-script/constant.ts - 682 + 647 params name src/app/shared/components/api-script/constant.ts - 684 + 649 src/app/shared/components/api-script/constant.ts - 709 + 674 src/app/shared/components/api-script/constant.ts - 722 + 687 params value src/app/shared/components/api-script/constant.ts - 685 + 650 src/app/shared/components/api-script/constant.ts - 710 + 675 src/app/shared/components/api-script/constant.ts - 723 + 688 Request body[Form-data] src/app/shared/components/api-script/constant.ts - 691 + 656 Request body[Raw] src/app/shared/components/api-script/constant.ts - 697 + 662 Set REST params src/app/shared/components/api-script/constant.ts - 702 + 667 Set HTTP API REST params src/app/shared/components/api-script/constant.ts - 707 + 672 Set Query params src/app/shared/components/api-script/constant.ts - 715 + 680 Set HTTP API Query params src/app/shared/components/api-script/constant.ts - 720 + 685 Insert new API test[Form-data] src/app/shared/components/api-script/constant.ts - 728 + 693 Insert new API test[JSON] src/app/shared/components/api-script/constant.ts - 733 + 698 Insert new API test[XML] src/app/shared/components/api-script/constant.ts - 738 + 703 Insert new API test[Raw] src/app/shared/components/api-script/constant.ts - 743 + 708 Get Response Results src/app/shared/components/api-script/constant.ts - 757 + 722 Get the response result of the HTTP API src/app/shared/components/api-script/constant.ts - 762 + 727 Set Response Result src/app/shared/components/api-script/constant.ts - 766 + 731 Set the response result of the HTTP API src/app/shared/components/api-script/constant.ts - 771 + 736 response result src/app/shared/components/api-script/constant.ts - 772 + 737 Global variable src/app/shared/components/env-list/env-list.component.ts - 9 + 12 No Global variables src/app/shared/components/env-list/env-list.component.ts - 14 + 17 Environment Host src/app/shared/components/env-list/env-list.component.ts - 16 + 20 - - Environment variable + + Environment Global variable src/app/shared/components/env-list/env-list.component.ts - 20 + 25 @@ -3382,67 +3337,67 @@ You cannot restore it once deleted! Are you sure you want to delete? src/app/shared/components/env/env.component.html - 14 + 21 - - Environment variable: API Documentation/Test can use to refer to the environment variable + + Global variable: API Documentation/Test can use to refer to the global variable src/app/shared/components/env/env.component.html - 36,37 + 46,48 {{Variable Name}} src/app/shared/components/env/env.component.ts - 20 + 23 New Environment src/app/shared/components/env/env.component.ts - 21 + 24 src/app/shared/components/env/env.component.ts - 124 + 132 Operate src/app/shared/components/env/env.component.ts - 32 + 35 Edit Environment src/app/shared/components/env/env.component.ts - 101 + 107 Name is not allowed to be empty src/app/shared/components/env/env.component.ts - 133 + 141 Failed to edit src/app/shared/components/env/env.component.ts - 150 + 158 Failed to add src/app/shared/components/env/env.component.ts - 162 + 170 @@ -3470,14 +3425,14 @@ You cannot restore it once deleted! Please import the file first src/app/shared/components/import-api/import-api.component.ts - 81 + 84 Same as the parent's field src/app/shared/components/import-api/import-api.component.ts - 104 + 108 @@ -3498,7 +3453,7 @@ You cannot restore it once deleted! You don't have cloud space yet, please create one src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts - 49 + 51 @@ -3600,7 +3555,7 @@ You cannot restore it once deleted! src/app/shared/components/setting/setting.component.ts - 87 + 91 @@ -3645,11 +3600,18 @@ You cannot restore it once deleted! 77 + + Successfully connect to cloud + + src/app/shared/components/setting/common/data-storage.component.ts + 92 + + Failed to connect src/app/shared/components/setting/common/data-storage.component.ts - 99 + 100 @@ -3694,60 +3656,53 @@ You cannot restore it once deleted! src/app/shared/components/setting/setting.component.ts - 91 + 96 Account src/app/shared/components/setting/setting.component.ts - 72 + 73 src/app/shared/components/setting/setting.component.ts - 77 + 78 Password src/app/shared/components/setting/setting.component.ts - 81 + 82 About src/app/shared/components/setting/setting.component.ts - 95 - - - - Eoapi Client is required to manage member - - src/app/shared/components/sidebar/sidebar.component.ts - 77 + 100 Member src/app/shared/components/sidebar/sidebar.component.ts - 105 + 109 Workspace src/app/shared/components/sidebar/sidebar.component.ts - 115 + 119 Extensions src/app/shared/components/sidebar/sidebar.component.ts - 123 + 127 @@ -3764,20 +3719,6 @@ You cannot restore it once deleted! 219 - - Cloud Storage not available - - src/app/shared/services/data-source/data-source.service.ts - 181 - - - - Successfully connect to cloud - - src/app/shared/services/data-source/data-source.service.ts - 193 - - Confirm @@ -3838,7 +3779,7 @@ You cannot restore it once deleted! Local workspace src/app/shared/services/workspace/workspace.service.ts - 15 + 18 diff --git a/src/workbench/browser/src/locale/messages.zh.xlf b/src/workbench/browser/src/locale/messages.zh.xlf index c89c71456..86278eea7 100644 --- a/src/workbench/browser/src/locale/messages.zh.xlf +++ b/src/workbench/browser/src/locale/messages.zh.xlf @@ -6,7 +6,7 @@ No mock found with ID src/app/app.service.ts - 49 + 48 没有找到 ID 为的 Mock！ @@ -78,7 +78,7 @@ Account src/app/pages/account.component.ts - 16 + 11 账号 @@ -86,7 +86,7 @@ Username src/app/pages/account.component.ts - 22 + 14 用户名 @@ -94,7 +94,7 @@ Save src/app/pages/account.component.ts - 47,49 + 33,35 src/app/pages/workspace.component.ts @@ -106,7 +106,7 @@ Password src/app/pages/account.component.ts - 58 + 41 密码 @@ -114,7 +114,7 @@ Current password src/app/pages/account.component.ts - 64 + 46 当前密码 @@ -122,7 +122,7 @@ New password src/app/pages/account.component.ts - 79 + 53 新密码 @@ -130,7 +130,7 @@ Confirm new password src/app/pages/account.component.ts - 94 + 60 确认新密码 @@ -138,31 +138,35 @@ Please input your confirm new password; src/app/pages/account.component.ts - 105,107 + 64,66 请输入新密码 - + Please confirm your password; src/app/pages/account.component.ts - 109,111 + 68 请再次输入密码 - + Min length is 6; src/app/pages/account.component.ts - 113,115 + 70 + + + src/app/pages/user-modal.component.ts + 134 最小长度为 6； - + Max length is 11; src/app/pages/account.component.ts - 117,119 + 72 最大长度为 11； @@ -170,23 +174,23 @@ Reset src/app/pages/account.component.ts - 133,135 + 86,88 重置 - - Sorry, username is be used + + Sorry, username is already in use src/app/pages/account.component.ts - 193 + 141 - 抱歉，用户名已被占用 + 用户名已存在 Username update success ! src/app/pages/account.component.ts - 215 + 163 用户名编辑成功！ @@ -194,7 +198,7 @@ Validation failed src/app/pages/account.component.ts - 243 + 186 验证失败 @@ -202,7 +206,7 @@ Password reset success ! src/app/pages/account.component.ts - 254 + 197 密码重置成功！ @@ -210,15 +214,11 @@ New Request src/app/pages/api/api-tab.service.ts - 23 + 25 - 新请求 - - - New API src/app/pages/api/api-tab.service.ts - 26 + 43 新请求 @@ -226,7 +226,11 @@ Preview src/app/pages/api/api-tab.service.ts - 27 + 28 + + + src/app/pages/api/api-tab.service.ts + 47 文档 @@ -234,15 +238,27 @@ New Websocket src/app/pages/api/api-tab.service.ts - 34 + 35 + + + src/app/pages/api/api-tab.service.ts + 54 测试 Websocket + + New API + + src/app/pages/api/api-tab.service.ts + 46 + + 新请求 + Collections src/app/pages/api/api.component.html - 18 + 23 API 集合 @@ -250,7 +266,7 @@ History src/app/pages/api/api.component.html - 34 + 39 src/app/pages/api/history/eo-history.component.html @@ -262,7 +278,7 @@ Environment src/app/pages/api/api.component.html - 71 + 76 src/app/shared/components/env/env.component.html @@ -275,7 +291,7 @@ Manage Environment src/app/pages/api/api.component.html - 79 + 90 管理环境 @@ -283,7 +299,7 @@ Enviroment Quick Look src/app/pages/api/api.component.html - 88 + 99 点击查看环境信息 @@ -291,7 +307,7 @@ Environment Setting src/app/pages/api/api.component.html - 138 + 153 环境设置 @@ -299,7 +315,7 @@ Preview src/app/pages/api/api.component.ts - 48 + 54 文档 @@ -307,7 +323,7 @@ Edit src/app/pages/api/api.component.ts - 52 + 58 src/app/pages/api/http/mock/api-mock.component.ts @@ -319,10 +335,18 @@ Test src/app/pages/api/api.component.ts - 56 + 63 测试 + + Eoapi Client is required to use Mock. + + src/app/pages/api/api.component.ts + 131 + + Mock 需要下载 Eoapi 客户端. + Group Name @@ -353,7 +377,7 @@ Search src/app/pages/api/group/tree/api-group-tree.component.html - 2 + 7 src/app/pages/extension/extension.component.html @@ -369,7 +393,7 @@ New API src/app/pages/api/group/tree/api-group-tree.component.html - 12 + 25 新建 API @@ -377,7 +401,7 @@ New Group src/app/pages/api/group/tree/api-group-tree.component.html - 14 + 27 新建分组 @@ -385,7 +409,7 @@ Import API src/app/pages/api/group/tree/api-group-tree.component.html - 16 + 29 导入 API 数据 @@ -393,7 +417,7 @@ Add API src/app/pages/api/group/tree/api-group-tree.component.html - 43 + 67 添加 API @@ -401,7 +425,7 @@ Add Subgroup src/app/pages/api/group/tree/api-group-tree.component.html - 46 + 70 添加子分组 @@ -409,15 +433,15 @@ Edit src/app/pages/api/group/tree/api-group-tree.component.html - 49 + 73 src/app/pages/api/group/tree/api-group-tree.component.html - 77 + 103 src/app/pages/api/http/mock/api-mock.component.html - 25 + 35 编辑 @@ -425,11 +449,11 @@ Delete src/app/pages/api/group/tree/api-group-tree.component.html - 52 + 76 src/app/pages/api/group/tree/api-group-tree.component.html - 85 + 115 src/app/pages/api/http/edit/api-edit-util.service.ts @@ -445,7 +469,7 @@ src/app/pages/api/http/mock/api-mock.component.html - 29 + 47 src/app/pages/api/http/test/api-test-util.service.ts @@ -461,7 +485,7 @@ Copy src/app/pages/api/group/tree/api-group-tree.component.html - 81 + 109 src/app/shared/components/monaco-editor/monaco-editor.component.ts @@ -473,7 +497,7 @@ Index src/app/pages/api/group/tree/api-group-tree.component.ts - 58 + 61 概况 @@ -481,7 +505,7 @@ Import API src/app/pages/api/group/tree/api-group-tree.component.ts - 238 + 267 src/app/pages/api/overview/api-overview.component.ts @@ -493,7 +517,7 @@ successfully src/app/pages/api/group/tree/api-group-tree.component.ts - 248 + 277 src/app/pages/api/overview/api-overview.component.ts @@ -505,7 +529,7 @@ Failed to src/app/pages/api/group/tree/api-group-tree.component.ts - 252 + 281 src/app/pages/api/overview/api-overview.component.ts @@ -517,7 +541,7 @@ Deletion Confirmation? src/app/pages/api/group/tree/api-group-tree.component.ts - 262 + 291 src/app/pages/workspace.component.ts @@ -529,7 +553,7 @@ Are you sure you want to delete the data <strong title=""></strong> ? You cannot restore it once deleted! src/app/pages/api/group/tree/api-group-tree.component.ts - 263,265 + 292,294 确认要删除数据 <strong title=""></strong> 吗？删除后不可恢复！ @@ -537,7 +561,7 @@ Add Group src/app/pages/api/group/tree/api-group-tree.component.ts - 321 + 350 添加分组 @@ -545,7 +569,7 @@ Add Subgroup src/app/pages/api/group/tree/api-group-tree.component.ts - 330 + 359 添加子分组 @@ -553,7 +577,7 @@ Edit Group src/app/pages/api/group/tree/api-group-tree.component.ts - 339 + 368 编辑分组 @@ -561,7 +585,7 @@ Delete Group src/app/pages/api/group/tree/api-group-tree.component.ts - 348 + 377 删除分组 @@ -677,7 +701,7 @@ src/app/shared/components/env/env.component.ts - 31 + 34 说明 @@ -797,7 +821,7 @@ src/app/pages/api/http/test/api-test.component.html - 125 + 190 请求头部 @@ -813,7 +837,7 @@ src/app/pages/api/http/test/api-test.component.html - 67 + 109 src/app/pages/api/http/test/query/api-test-query.component.html @@ -833,7 +857,7 @@ src/app/pages/api/http/test/api-test.component.html - 77 + 122 REST 参数 @@ -849,11 +873,11 @@ src/app/pages/api/http/test/api-test.component.html - 52 + 85 src/app/pages/api/http/test/api-test.component.html - 119 + 182 请求体 @@ -877,7 +901,7 @@ src/app/pages/api/http/test/api-test.component.html - 115 + 178 返回头部 @@ -897,11 +921,11 @@ src/app/pages/api/http/mock/api-mock.component.html - 47 + 66 src/app/pages/api/http/test/api-test.component.html - 110 + 173 返回结果 @@ -925,7 +949,7 @@ Name src/app/pages/api/http/detail/api-detail.component.ts - 27 + 30 src/app/pages/api/http/mock/api-mock.component.ts @@ -933,7 +957,7 @@ src/app/shared/components/env/env.component.ts - 29 + 32 名称 @@ -941,7 +965,7 @@ Created Type src/app/pages/api/http/detail/api-detail.component.ts - 28 + 31 src/app/pages/api/http/mock/api-mock.component.ts @@ -1073,11 +1097,11 @@ src/app/pages/api/http/mock/api-mock.component.html - 58 + 83 src/app/shared/components/env/env.component.html - 50 + 64 保存 @@ -1141,7 +1165,7 @@ src/app/shared/components/env/env.component.ts - 143 + 151 编辑成功 @@ -1157,7 +1181,7 @@ src/app/shared/components/env/env.component.ts - 157 + 165 添加成功 @@ -1165,7 +1189,7 @@ Failed Operation src/app/pages/api/http/edit/api-edit.component.ts - 143 + 144 操作失败 @@ -1173,7 +1197,7 @@ Root directory src/app/pages/api/http/edit/api-edit.component.ts - 187 + 188 根目录 @@ -1289,7 +1313,7 @@ Click to Copy src/app/pages/api/http/mock/api-mock.component.html - 12 + 14 点击复制 @@ -1297,7 +1321,7 @@ Preview src/app/pages/api/http/mock/api-mock.component.html - 24 + 34 预览 @@ -1305,7 +1329,7 @@ Are you sure you want to delete this Mock? src/app/pages/api/http/mock/api-mock.component.html - 28 + 43 您确定要删除此Mock吗? @@ -1313,7 +1337,7 @@ Mock Name src/app/pages/api/http/mock/api-mock.component.html - 41 + 60 Mock 名称 @@ -1321,11 +1345,11 @@ Cancel src/app/pages/api/http/mock/api-mock.component.html - 59 + 84 src/app/shared/components/env/env.component.html - 49 + 63 src/app/shared/components/params-import/params-import.component.html @@ -1385,7 +1409,7 @@ src/app/utils/index.utils.ts - 156 + 166 复制成功 @@ -1413,7 +1437,7 @@ src/app/shared/components/env/env.component.ts - 30 + 33 参数值 @@ -1421,7 +1445,7 @@ Please enter URL src/app/pages/api/http/test/api-test.component.html - 18 + 27 src/app/pages/api/websocket/websocket.component.html @@ -1433,7 +1457,7 @@ Enter URL src/app/pages/api/http/test/api-test.component.html - 19 + 32 src/app/pages/api/websocket/websocket.component.html @@ -1445,7 +1469,7 @@ Send src/app/pages/api/http/test/api-test.component.html - 24 + 42 发送 @@ -1453,7 +1477,7 @@ Abort src/app/pages/api/http/test/api-test.component.html - 25 + 43 中止 @@ -1461,7 +1485,7 @@ Save as API src/app/pages/api/http/test/api-test.component.html - 30,32 + 57,59 保存为新 API @@ -1469,7 +1493,7 @@ Headers src/app/pages/api/http/test/api-test.component.html - 41 + 71 src/app/pages/api/websocket/websocket.component.html @@ -1481,7 +1505,7 @@ Pre-request Script src/app/pages/api/http/test/api-test.component.html - 87 + 135 前置脚本 @@ -1489,7 +1513,7 @@ After-response Script src/app/pages/api/http/test/api-test.component.html - 96 + 149 后置脚本 @@ -1497,7 +1521,7 @@ Save As File src/app/pages/api/http/test/api-test.component.html - 133 + 203 保存为文件 @@ -1633,7 +1657,7 @@ Program will not close unsaved tabs src/app/pages/api/tab/api-tab-operate.service.ts - 319 + 336 程序将不会关闭未保存的标签 @@ -1673,7 +1697,7 @@ Do you want to save the changes? src/app/pages/api/tab/api-tab.component.ts - 69 + 71 您要保存这些更改吗？ @@ -1681,7 +1705,7 @@ Your changes will be lost if you don't save them. src/app/pages/api/tab/api-tab.component.ts - 70 + 72 如未保存，所有更改将会被丢弃。 @@ -1689,11 +1713,11 @@ Cancel src/app/pages/api/tab/api-tab.component.ts - 74 + 76 src/app/pages/api/websocket/websocket.component.ts - 300 + 305 src/app/shared/services/modal.service.ts @@ -1705,7 +1729,7 @@ Don't Save src/app/pages/api/tab/api-tab.component.ts - 80 + 82 放弃保存 @@ -1713,7 +1737,7 @@ Save src/app/pages/api/tab/api-tab.component.ts - 88 + 90 保存 @@ -1777,7 +1801,7 @@ Do you want to leave the page? src/app/pages/api/websocket/websocket.component.ts - 285 + 290 你想要离开当前页面吗？ @@ -1785,7 +1809,7 @@ After leaving, the current long connection is no longer maintained, whether to confirm to leave? src/app/pages/api/websocket/websocket.component.ts - 286 + 291 当前的长连接将会断开，是否确认离开？ @@ -1793,7 +1817,7 @@ Leave src/app/pages/api/websocket/websocket.component.ts - 290 + 295 离开 @@ -1851,7 +1875,7 @@ Details src/app/pages/extension/detail/extension-detail.component.html - 41 + 42 src/app/pages/extension/list/extension-list.component.html @@ -1863,7 +1887,7 @@ Support src/app/pages/extension/detail/extension-detail.component.html - 49 + 50 支持 @@ -1871,7 +1895,7 @@ Author src/app/pages/extension/detail/extension-detail.component.html - 51 + 52 作者 @@ -1879,7 +1903,7 @@ Version src/app/pages/extension/detail/extension-detail.component.html - 52 + 53 版本 @@ -1887,7 +1911,7 @@ Repository src/app/pages/extension/detail/extension-detail.component.html - 53 + 54 代码仓库 @@ -1895,7 +1919,7 @@ Homepage src/app/pages/extension/detail/extension-detail.component.html - 58 + 59 首页 @@ -1903,7 +1927,7 @@ BugReport src/app/pages/extension/detail/extension-detail.component.html - 61 + 62 报告问题 @@ -1911,7 +1935,7 @@ ChangeLog src/app/pages/extension/detail/extension-detail.component.html - 66 + 67 更新日志 @@ -1919,7 +1943,7 @@ Changelog failed to load src/app/pages/extension/detail/extension-detail.component.html - 69 + 70 更新日志加载失败 @@ -1927,23 +1951,15 @@ Reacquire src/app/pages/extension/detail/extension-detail.component.html - 71 + 72 重新获取 - - Eoapi Client is required to install this extension. - - src/app/pages/extension/detail/extension-detail.component.ts - 43 - - 安装此扩展需要下载 Eoapi 客户端。 - This plugin has no documentation yet. src/app/pages/extension/detail/extension-detail.component.ts - 66 + 68 此插件尚无文档。 @@ -2015,7 +2031,7 @@ Search by username src/app/pages/member.component.ts - 27 + 23 搜索用户名 @@ -2023,15 +2039,15 @@ Select a member above src/app/pages/member.component.ts - 39,41 + 34,36 - 选中成员 + 添加被选中成员 Manage access src/app/pages/member.component.ts - 46 + 41 协作管理 @@ -2039,7 +2055,7 @@ Add people src/app/pages/member.component.ts - 55,57 + 50,52 添加人员 @@ -2047,7 +2063,7 @@ Could not find a user matching src/app/pages/member.component.ts - 151 + 142 找不到用户 @@ -2055,7 +2071,7 @@ Add new member success src/app/pages/member.component.ts - 173 + 163 成员添加成功 @@ -2063,7 +2079,7 @@ Warning src/app/pages/member.component.ts - 229 + 222 警告 @@ -2071,7 +2087,7 @@ Are you sure you want to remove the member ? src/app/pages/member.component.ts - 230 + 223 您确定要移除成员吗？ @@ -2079,7 +2095,11 @@ Delete src/app/pages/member.component.ts - 232 + 225 + + + src/app/pages/workspace.component.ts + 165 删除 @@ -2087,7 +2107,7 @@ Search Workspace src/app/pages/navbar/navbar.component.html - 27 + 33 搜索空间 @@ -2095,15 +2115,39 @@ New Workspace src/app/pages/navbar/navbar.component.html - 33 + 39 新建空间 + + Share + + src/app/pages/navbar/navbar.component.html + 74,76 + + 分享 + + + Share via link + + src/app/pages/navbar/navbar.component.html + 79 + + 通过链接分享 + + + This link will be updated with the API content. Everyone can access it without logging in + + src/app/pages/navbar/navbar.component.html + 80,82 + + 每个人都可以在没有登录的情况下查看最新的 API 文档 + Open Settings src/app/pages/navbar/navbar.component.html - 64 + 103 打开设置 @@ -2111,23 +2155,15 @@ Document src/app/pages/navbar/navbar.component.html - 75 + 114 文档 - - Developer Support - - src/app/pages/navbar/navbar.component.html - 76 - - 开发者支持 - Report Issue src/app/pages/navbar/navbar.component.html - 85 + 123 问题反馈 @@ -2135,7 +2171,7 @@ Sign in for Collaboration src/app/pages/navbar/navbar.component.html - 96 + 140 登录后可以协作 @@ -2143,7 +2179,7 @@ Account Setting src/app/pages/navbar/navbar.component.html - 103 + 147 账号设置 @@ -2151,7 +2187,7 @@ Sign Out src/app/pages/navbar/navbar.component.html - 106 + 150 退出登录 @@ -2159,7 +2195,7 @@ Minimize src/app/pages/navbar/navbar.component.html - 116 + 160 最小化 @@ -2167,7 +2203,7 @@ Close src/app/pages/navbar/navbar.component.html - 136 + 180 关闭 @@ -2175,43 +2211,23 @@ Download src/app/pages/navbar/navbar.component.html - 145,148 + 189,192 下载 - - Eoapi Client is required to sign in - - src/app/pages/navbar/navbar.component.ts - 83 - - 登录需要下载 Eoapi 客户端 - - - Eoapi Client is required to add workspace - - src/app/pages/navbar/navbar.component.ts - 92 - - - src/app/shared/components/sidebar/sidebar.component.ts - 73 - - 新增空间功能需要下载 Eoapi 客户端 - Do you want to upload local data to the cloud ? src/app/pages/user-modal.component.ts - 26 + 23 您想要上传本地数据到云端吗？ - + After confirmation, the system will create a cloud space to upload the local data to the cloud. src/app/pages/user-modal.component.ts - 30,33 + 27,29 确认后，该系统将创建一个云空间并将本地数据上传到云端。 @@ -2219,7 +2235,7 @@ Subsequent local space and cloud space are no longer synchronized src/app/pages/user-modal.component.ts - 36 + 32 后续本地空间和云空间不再同步 @@ -2227,11 +2243,11 @@ Cancel src/app/pages/user-modal.component.ts - 49,51 + 45,47 src/app/pages/user-modal.component.ts - 91,93 + 82,84 取消 @@ -2239,7 +2255,7 @@ Sync src/app/pages/user-modal.component.ts - 59,61 + 55,57 同步 @@ -2247,7 +2263,7 @@ Check your connection src/app/pages/user-modal.component.ts - 69 + 65 检查您的网络连接 @@ -2255,7 +2271,7 @@ Can't connect right now, click to retry or src/app/pages/user-modal.component.ts - 73 + 69 目前无法连接，点击重试或者 @@ -2263,7 +2279,7 @@ config in the configuration src/app/pages/user-modal.component.ts - 79,81 + 70,72 填写配置 @@ -2271,7 +2287,7 @@ Retry src/app/pages/user-modal.component.ts - 101,103 + 92,94 重连 @@ -2279,7 +2295,7 @@ Sign In/Up src/app/pages/user-modal.component.ts - 112 + 103 登录/注册 @@ -2287,7 +2303,7 @@ Enter Email/Phone/Username src/app/pages/user-modal.component.ts - 124 + 116 请输入邮箱/电话/用户名 @@ -2295,31 +2311,23 @@ Enter password src/app/pages/user-modal.component.ts - 136 + 128 输入密码 - + Please input your password; src/app/pages/user-modal.component.ts - 140,142 - - 请填写你的密码. - - - Min length is 6; - - src/app/pages/user-modal.component.ts - 144,146 + 132 - 最小长度为 6； + 请输入你的密码. Sign In/Up src/app/pages/user-modal.component.ts - 161,163 + 149,151 登录/注册 @@ -2327,7 +2335,7 @@ Open setting src/app/pages/user-modal.component.ts - 174 + 162 打开设置 @@ -2335,7 +2343,7 @@ If you want to collaborate, please src/app/pages/user-modal.component.ts - 178 + 166 如果您想要协作，请 @@ -2343,7 +2351,7 @@ open the settings src/app/pages/user-modal.component.ts - 184,186 + 167,169 打开设置 @@ -2351,7 +2359,7 @@ and fill in the configuration src/app/pages/user-modal.component.ts - 187 + 170 并填写配置 @@ -2359,7 +2367,7 @@ Add Workspace src/app/pages/user-modal.component.ts - 195 + 178 新建空间 @@ -2367,7 +2375,7 @@ Workspace Name src/app/pages/user-modal.component.ts - 210 + 190 空间名称 @@ -2375,7 +2383,7 @@ Cancel src/app/pages/user-modal.component.ts - 225,227 + 205,207 取消 @@ -2383,7 +2391,7 @@ Save src/app/pages/user-modal.component.ts - 236,238 + 216,218 保存 @@ -2391,7 +2399,7 @@ Successfully logged out ! src/app/pages/user-modal.component.ts - 334 + 337 退出登录成功 @@ -2399,7 +2407,7 @@ Connect failed src/app/pages/user-modal.component.ts - 356 + 359 连接失败 @@ -2407,7 +2415,7 @@ Connect success src/app/pages/user-modal.component.ts - 365 + 370 连接成功 @@ -2415,7 +2423,7 @@ Please check you username or password src/app/pages/user-modal.component.ts - 546 + 568 请检查您的用户名和密码。 @@ -2423,7 +2431,7 @@ Please check the account/password, the account must be a mobile phone number or email ! src/app/pages/user-modal.component.ts - 555 + 578 请检查账户/密码，账户必须是手机号码或邮箱！ @@ -2431,7 +2439,7 @@ Add workspace Failed ! src/app/pages/user-modal.component.ts - 661 + 680 新建空间失败 ! @@ -2439,7 +2447,7 @@ Create new workspace successfully ! src/app/pages/user-modal.component.ts - 671 + 690 创建空间成功！ @@ -2467,7 +2475,7 @@ src/app/shared/components/env/env.component.html - 25 + 35 名称 @@ -2520,14 +2528,6 @@ You cannot restore it once deleted! 您确定要删除空间吗？ 删除后无法恢复！ - - Remove - - src/app/pages/workspace.component.ts - 165 - - 移除 - Delete success ! @@ -2728,63 +2728,11 @@ You cannot restore it once deleted! 清空所有全局变量 - - Environment Management - - src/app/shared/components/api-script/constant.ts - 164 - - 环境管理 - - - Get enviroment host - - src/app/shared/components/api-script/constant.ts - 167 - - - src/app/shared/components/api-script/constant.ts - 172 - - 获取环境 Host - - - The host prefix set in the environment - - src/app/shared/components/api-script/constant.ts - 173 - - 环境中设置的 Host - - - Get an environment variables - - src/app/shared/components/api-script/constant.ts - 177 - - - src/app/shared/components/api-script/constant.ts - 182 - - 获取环境变量 - - - Set an environment variables - - src/app/shared/components/api-script/constant.ts - 187 - - - src/app/shared/components/api-script/constant.ts - 192 - - 设置环境变量 - Encode and Decode src/app/shared/components/api-script/constant.ts - 199 + 164 编码和解码 @@ -2792,11 +2740,11 @@ You cannot restore it once deleted! JSON Encode src/app/shared/components/api-script/constant.ts - 202 + 167 src/app/shared/components/api-script/constant.ts - 207 + 172 JSON 编码 @@ -2804,11 +2752,11 @@ You cannot restore it once deleted! JSON object src/app/shared/components/api-script/constant.ts - 208 + 173 src/app/shared/components/api-script/constant.ts - 220 + 185 JSON 对象 @@ -2816,11 +2764,11 @@ You cannot restore it once deleted! JSON string src/app/shared/components/api-script/constant.ts - 209 + 174 src/app/shared/components/api-script/constant.ts - 219 + 184 JSON 字符串 @@ -2828,11 +2776,11 @@ You cannot restore it once deleted! JSON Decode src/app/shared/components/api-script/constant.ts - 213 + 178 src/app/shared/components/api-script/constant.ts - 218 + 183 JSON 解码 @@ -2840,11 +2788,11 @@ You cannot restore it once deleted! XML Encode src/app/shared/components/api-script/constant.ts - 224 + 189 src/app/shared/components/api-script/constant.ts - 229 + 194 XML 编码 @@ -2852,7 +2800,7 @@ You cannot restore it once deleted! XML object src/app/shared/components/api-script/constant.ts - 230 + 195 XML 对象 @@ -2860,11 +2808,11 @@ You cannot restore it once deleted! XML string src/app/shared/components/api-script/constant.ts - 231 + 196 src/app/shared/components/api-script/constant.ts - 241 + 206 XML 字符串 @@ -2872,11 +2820,11 @@ You cannot restore it once deleted! XML Decode src/app/shared/components/api-script/constant.ts - 235 + 200 src/app/shared/components/api-script/constant.ts - 240 + 205 XML 解码 @@ -2884,7 +2832,7 @@ You cannot restore it once deleted! XML code src/app/shared/components/api-script/constant.ts - 242 + 207 XML 代码 @@ -2892,11 +2840,11 @@ You cannot restore it once deleted! Base64 Encode src/app/shared/components/api-script/constant.ts - 246 + 211 src/app/shared/components/api-script/constant.ts - 251 + 216 Base64 编码 @@ -2904,11 +2852,11 @@ You cannot restore it once deleted! string of wait for encode src/app/shared/components/api-script/constant.ts - 252 + 217 src/app/shared/components/api-script/constant.ts - 274 + 239 待编码字符串 @@ -2916,11 +2864,11 @@ You cannot restore it once deleted! string after encode src/app/shared/components/api-script/constant.ts - 253 + 218 src/app/shared/components/api-script/constant.ts - 275 + 240 编码后的字符串 @@ -2928,11 +2876,11 @@ You cannot restore it once deleted! Base64 Decode src/app/shared/components/api-script/constant.ts - 257 + 222 src/app/shared/components/api-script/constant.ts - 262 + 227 Base64 解码 @@ -2940,11 +2888,11 @@ You cannot restore it once deleted! string of wait for decode src/app/shared/components/api-script/constant.ts - 263 + 228 src/app/shared/components/api-script/constant.ts - 285 + 250 待解码字符串 @@ -2952,11 +2900,11 @@ You cannot restore it once deleted! string after decode src/app/shared/components/api-script/constant.ts - 264 + 229 src/app/shared/components/api-script/constant.ts - 286 + 251 解码后的字符串 @@ -2964,11 +2912,11 @@ You cannot restore it once deleted! UrlEncode Encode src/app/shared/components/api-script/constant.ts - 268 + 233 src/app/shared/components/api-script/constant.ts - 273 + 238 UrlEncode 编码 @@ -2976,11 +2924,11 @@ You cannot restore it once deleted! UrlEncode Decode src/app/shared/components/api-script/constant.ts - 279 + 244 src/app/shared/components/api-script/constant.ts - 284 + 249 UrlEncode 解码 @@ -2988,11 +2936,11 @@ You cannot restore it once deleted! Gzip zip src/app/shared/components/api-script/constant.ts - 290 + 255 src/app/shared/components/api-script/constant.ts - 295 + 260 Gzip 压缩 @@ -3000,11 +2948,11 @@ You cannot restore it once deleted! string of wait for zip src/app/shared/components/api-script/constant.ts - 296 + 261 src/app/shared/components/api-script/constant.ts - 318 + 283 待压缩字符串 @@ -3012,11 +2960,11 @@ You cannot restore it once deleted! string after zip src/app/shared/components/api-script/constant.ts - 297 + 262 src/app/shared/components/api-script/constant.ts - 319 + 284 压缩后的字符串 @@ -3024,11 +2972,11 @@ You cannot restore it once deleted! Gzip unzip src/app/shared/components/api-script/constant.ts - 301 + 266 src/app/shared/components/api-script/constant.ts - 306 + 271 Gzip 解压 @@ -3036,11 +2984,11 @@ You cannot restore it once deleted! string of wait for unzip src/app/shared/components/api-script/constant.ts - 307 + 272 src/app/shared/components/api-script/constant.ts - 329 + 294 待解压字符串 @@ -3048,11 +2996,11 @@ You cannot restore it once deleted! string after unzip src/app/shared/components/api-script/constant.ts - 308 + 273 src/app/shared/components/api-script/constant.ts - 330 + 295 压缩后的字符串 @@ -3060,11 +3008,11 @@ You cannot restore it once deleted! Deflate zip src/app/shared/components/api-script/constant.ts - 312 + 277 src/app/shared/components/api-script/constant.ts - 317 + 282 Deflate 压缩 @@ -3072,11 +3020,11 @@ You cannot restore it once deleted! Deflate unzip src/app/shared/components/api-script/constant.ts - 323 + 288 src/app/shared/components/api-script/constant.ts - 328 + 293 Deflate 解压 @@ -3084,7 +3032,7 @@ You cannot restore it once deleted! Encryption and Decryption src/app/shared/components/api-script/constant.ts - 336 + 301 加密/解密 @@ -3092,7 +3040,7 @@ You cannot restore it once deleted! MD5 Encryption src/app/shared/components/api-script/constant.ts - 344 + 309 MD5 加密 @@ -3100,51 +3048,51 @@ You cannot restore it once deleted! Content to be encrypted src/app/shared/components/api-script/constant.ts - 348 + 313 src/app/shared/components/api-script/constant.ts - 364 + 329 src/app/shared/components/api-script/constant.ts - 380 + 345 src/app/shared/components/api-script/constant.ts - 396 + 361 src/app/shared/components/api-script/constant.ts - 420 + 385 src/app/shared/components/api-script/constant.ts - 444 + 409 src/app/shared/components/api-script/constant.ts - 468 + 433 src/app/shared/components/api-script/constant.ts - 492 + 457 src/app/shared/components/api-script/constant.ts - 540 + 505 src/app/shared/components/api-script/constant.ts - 572 + 537 src/app/shared/components/api-script/constant.ts - 604 + 569 src/app/shared/components/api-script/constant.ts - 636 + 601 待加密内容 @@ -3152,35 +3100,35 @@ You cannot restore it once deleted! Encrypted result src/app/shared/components/api-script/constant.ts - 351 + 316 src/app/shared/components/api-script/constant.ts - 367 + 332 src/app/shared/components/api-script/constant.ts - 383 + 348 src/app/shared/components/api-script/constant.ts - 503 + 468 src/app/shared/components/api-script/constant.ts - 559 + 524 src/app/shared/components/api-script/constant.ts - 591 + 556 src/app/shared/components/api-script/constant.ts - 623 + 588 src/app/shared/components/api-script/constant.ts - 655 + 620 加密结果 @@ -3188,11 +3136,11 @@ You cannot restore it once deleted! SHA1 Encryption src/app/shared/components/api-script/constant.ts - 355 + 320 src/app/shared/components/api-script/constant.ts - 360 + 325 SHA1 加密 @@ -3200,11 +3148,11 @@ You cannot restore it once deleted! SHA256 Encryption src/app/shared/components/api-script/constant.ts - 371 + 336 src/app/shared/components/api-script/constant.ts - 376 + 341 SHA256 加密 @@ -3212,11 +3160,11 @@ You cannot restore it once deleted! RSA-SHA1 Signature src/app/shared/components/api-script/constant.ts - 387 + 352 src/app/shared/components/api-script/constant.ts - 392 + 357 RSA-SHA1 签名 @@ -3224,19 +3172,19 @@ You cannot restore it once deleted! private key src/app/shared/components/api-script/constant.ts - 400 + 365 src/app/shared/components/api-script/constant.ts - 424 + 389 src/app/shared/components/api-script/constant.ts - 496 + 461 src/app/shared/components/api-script/constant.ts - 520 + 485 私钥 @@ -3244,19 +3192,19 @@ You cannot restore it once deleted! The encoding format of the result, base64 (default) src/app/shared/components/api-script/constant.ts - 404 + 369 src/app/shared/components/api-script/constant.ts - 428 + 393 src/app/shared/components/api-script/constant.ts - 452 + 417 src/app/shared/components/api-script/constant.ts - 500 + 465 结果的编码格式 base64 (默认) @@ -3264,15 +3212,15 @@ You cannot restore it once deleted! Content After Signing src/app/shared/components/api-script/constant.ts - 407 + 372 src/app/shared/components/api-script/constant.ts - 431 + 396 src/app/shared/components/api-script/constant.ts - 455 + 420 签名后的内容 @@ -3280,11 +3228,11 @@ You cannot restore it once deleted! RSA-SHA256 Signature src/app/shared/components/api-script/constant.ts - 411 + 376 src/app/shared/components/api-script/constant.ts - 416 + 381 RSA-SHA256 签名 @@ -3292,11 +3240,11 @@ You cannot restore it once deleted! RSA Public Key Encryption src/app/shared/components/api-script/constant.ts - 435 + 400 src/app/shared/components/api-script/constant.ts - 440 + 405 RSA 公钥加密 @@ -3304,11 +3252,11 @@ You cannot restore it once deleted! public key src/app/shared/components/api-script/constant.ts - 448 + 413 src/app/shared/components/api-script/constant.ts - 472 + 437 公钥 @@ -3316,11 +3264,11 @@ You cannot restore it once deleted! RSA Public Key Dencryption src/app/shared/components/api-script/constant.ts - 459 + 424 src/app/shared/components/api-script/constant.ts - 464 + 429 公用钥匙加密 @@ -3328,11 +3276,11 @@ You cannot restore it once deleted! The encoding format of the content to be decrypted, base64 (default) src/app/shared/components/api-script/constant.ts - 476 + 441 src/app/shared/components/api-script/constant.ts - 524 + 489 要解密的内容的编码格式，Base64 (默认) @@ -3340,7 +3288,7 @@ You cannot restore it once deleted! Decrypted content src/app/shared/components/api-script/constant.ts - 479 + 444 已解密的内容 @@ -3348,19 +3296,19 @@ You cannot restore it once deleted! RSA Private Key Encryption src/app/shared/components/api-script/constant.ts - 483 + 448 src/app/shared/components/api-script/constant.ts - 488 + 453 src/app/shared/components/api-script/constant.ts - 507 + 472 src/app/shared/components/api-script/constant.ts - 512 + 477 RSA 私钥加密 @@ -3368,7 +3316,7 @@ You cannot restore it once deleted! Content to be decrypted src/app/shared/components/api-script/constant.ts - 516 + 481 待加密内容 @@ -3376,7 +3324,7 @@ You cannot restore it once deleted! Decrypted Content src/app/shared/components/api-script/constant.ts - 527 + 492 已解密的内容 @@ -3384,11 +3332,11 @@ You cannot restore it once deleted! AES Encryption src/app/shared/components/api-script/constant.ts - 531 + 496 src/app/shared/components/api-script/constant.ts - 536 + 501 AES 加密 @@ -3396,19 +3344,19 @@ You cannot restore it once deleted! password src/app/shared/components/api-script/constant.ts - 544 + 509 src/app/shared/components/api-script/constant.ts - 576 + 541 src/app/shared/components/api-script/constant.ts - 608 + 573 src/app/shared/components/api-script/constant.ts - 640 + 605 密码 @@ -3416,19 +3364,19 @@ You cannot restore it once deleted! Padding mode, Pkcs7 (default)/NoPadding/ZeroPadding src/app/shared/components/api-script/constant.ts - 548 + 513 src/app/shared/components/api-script/constant.ts - 580 + 545 src/app/shared/components/api-script/constant.ts - 612 + 577 src/app/shared/components/api-script/constant.ts - 644 + 609 填充模式， Pkcs7 (默认)/NoPadding/ZeroPadding @@ -3436,19 +3384,19 @@ You cannot restore it once deleted! Mode, CBC (default)/ECB/CTR/OFB/CFB src/app/shared/components/api-script/constant.ts - 552 + 517 src/app/shared/components/api-script/constant.ts - 584 + 549 src/app/shared/components/api-script/constant.ts - 616 + 581 src/app/shared/components/api-script/constant.ts - 648 + 613 模式, CBC (默认)/ECB/CTR/OFB/CFB @@ -3456,19 +3404,19 @@ You cannot restore it once deleted! offset vector src/app/shared/components/api-script/constant.ts - 556 + 521 src/app/shared/components/api-script/constant.ts - 588 + 553 src/app/shared/components/api-script/constant.ts - 620 + 585 src/app/shared/components/api-script/constant.ts - 652 + 617 偏移向量 @@ -3476,11 +3424,11 @@ You cannot restore it once deleted! AES Dencryption src/app/shared/components/api-script/constant.ts - 563 + 528 src/app/shared/components/api-script/constant.ts - 568 + 533 AES 加密 @@ -3488,11 +3436,11 @@ You cannot restore it once deleted! DES Encryption src/app/shared/components/api-script/constant.ts - 595 + 560 src/app/shared/components/api-script/constant.ts - 600 + 565 DES 解密 @@ -3500,11 +3448,11 @@ You cannot restore it once deleted! DES Dencryption src/app/shared/components/api-script/constant.ts - 627 + 592 src/app/shared/components/api-script/constant.ts - 632 + 597 DES 加密 @@ -3512,11 +3460,11 @@ You cannot restore it once deleted! HTTP API request src/app/shared/components/api-script/constant.ts - 664 + 629 src/app/shared/components/api-script/constant.ts - 754 + 719 HTTP 请求 @@ -3524,7 +3472,7 @@ You cannot restore it once deleted! Set Request URL src/app/shared/components/api-script/constant.ts - 667 + 632 设置请求地址 @@ -3532,7 +3480,7 @@ You cannot restore it once deleted! Set HTTP API request path src/app/shared/components/api-script/constant.ts - 672 + 637 设置 HTTP API 的请求路径 @@ -3540,7 +3488,7 @@ You cannot restore it once deleted! new url src/app/shared/components/api-script/constant.ts - 673 + 638 新的请求路径 @@ -3548,7 +3496,7 @@ You cannot restore it once deleted! Set Header src/app/shared/components/api-script/constant.ts - 677 + 642 设置 Header 参数 @@ -3556,7 +3504,7 @@ You cannot restore it once deleted! Set HTTP API request header params src/app/shared/components/api-script/constant.ts - 682 + 647 设置 HTTP API 的请求头部参数 @@ -3564,15 +3512,15 @@ You cannot restore it once deleted! params name src/app/shared/components/api-script/constant.ts - 684 + 649 src/app/shared/components/api-script/constant.ts - 709 + 674 src/app/shared/components/api-script/constant.ts - 722 + 687 参数名 @@ -3580,15 +3528,15 @@ You cannot restore it once deleted! params value src/app/shared/components/api-script/constant.ts - 685 + 650 src/app/shared/components/api-script/constant.ts - 710 + 675 src/app/shared/components/api-script/constant.ts - 723 + 688 参数值 @@ -3596,7 +3544,7 @@ You cannot restore it once deleted! Request body[Form-data] src/app/shared/components/api-script/constant.ts - 691 + 656 请求体[Form-data] @@ -3604,7 +3552,7 @@ You cannot restore it once deleted! Request body[Raw] src/app/shared/components/api-script/constant.ts - 697 + 662 请求体[Raw] @@ -3612,7 +3560,7 @@ You cannot restore it once deleted! Set REST params src/app/shared/components/api-script/constant.ts - 702 + 667 设置 REST 参数 @@ -3620,7 +3568,7 @@ You cannot restore it once deleted! Set HTTP API REST params src/app/shared/components/api-script/constant.ts - 707 + 672 设置 HTTP API 的 REST 参数 @@ -3628,7 +3576,7 @@ You cannot restore it once deleted! Set Query params src/app/shared/components/api-script/constant.ts - 715 + 680 设置 Query 参数 @@ -3636,7 +3584,7 @@ You cannot restore it once deleted! Set HTTP API Query params src/app/shared/components/api-script/constant.ts - 720 + 685 设置 HTTP API 的 Query 参数 @@ -3644,7 +3592,7 @@ You cannot restore it once deleted! Insert new API test[Form-data] src/app/shared/components/api-script/constant.ts - 728 + 693 插入 API 测试[Form-data] @@ -3652,7 +3600,7 @@ You cannot restore it once deleted! Insert new API test[JSON] src/app/shared/components/api-script/constant.ts - 733 + 698 插入 API 测试[JSON] @@ -3660,7 +3608,7 @@ You cannot restore it once deleted! Insert new API test[XML] src/app/shared/components/api-script/constant.ts - 738 + 703 插入 API 测试[XML] @@ -3668,7 +3616,7 @@ You cannot restore it once deleted! Insert new API test[Raw] src/app/shared/components/api-script/constant.ts - 743 + 708 插入 API 测试[Raw] @@ -3676,7 +3624,7 @@ You cannot restore it once deleted! Get Response Results src/app/shared/components/api-script/constant.ts - 757 + 722 获取响应结果 @@ -3684,7 +3632,7 @@ You cannot restore it once deleted! Get the response result of the HTTP API src/app/shared/components/api-script/constant.ts - 762 + 727 获取 HTTP API 的响应结果 @@ -3692,7 +3640,7 @@ You cannot restore it once deleted! Set Response Result src/app/shared/components/api-script/constant.ts - 766 + 731 设置响应结果 @@ -3700,7 +3648,7 @@ You cannot restore it once deleted! Set the response result of the HTTP API src/app/shared/components/api-script/constant.ts - 771 + 736 设置 HTTP API 的响应结果 @@ -3708,7 +3656,7 @@ You cannot restore it once deleted! response result src/app/shared/components/api-script/constant.ts - 772 + 737 响应结果 @@ -3716,7 +3664,7 @@ You cannot restore it once deleted! Global variable src/app/shared/components/env-list/env-list.component.ts - 9 + 12 全局变量 @@ -3724,7 +3672,7 @@ You cannot restore it once deleted! No Global variables src/app/shared/components/env-list/env-list.component.ts - 14 + 17 暂无全局变量 @@ -3732,17 +3680,17 @@ You cannot restore it once deleted! Environment Host src/app/shared/components/env-list/env-list.component.ts - 16 + 20 环境 Host - - Environment variable + + Environment Global variable src/app/shared/components/env-list/env-list.component.ts - 20 + 25 - 环境变量 + 环境全局变量 New @@ -3756,23 +3704,23 @@ You cannot restore it once deleted! Are you sure you want to delete? src/app/shared/components/env/env.component.html - 14 + 21 是否确定删除? - - Environment variable: API Documentation/Test can use to refer to the environment variable + + Global variable: API Documentation/Test can use to refer to the global variable src/app/shared/components/env/env.component.html - 36,37 + 46,48 - 环境变量：在接口文档或测试的过程中，使用即可引用该环境变量 + 全局变量：在接口文档或测试的过程中，使用即可引用该全局变量 {{Variable Name}} src/app/shared/components/env/env.component.ts - 20 + 23 {{变量名}} @@ -3780,11 +3728,11 @@ You cannot restore it once deleted! New Environment src/app/shared/components/env/env.component.ts - 21 + 24 src/app/shared/components/env/env.component.ts - 124 + 132 新建环境 @@ -3792,7 +3740,7 @@ You cannot restore it once deleted! Operate src/app/shared/components/env/env.component.ts - 32 + 35 操作 @@ -3800,7 +3748,7 @@ You cannot restore it once deleted! Edit Environment src/app/shared/components/env/env.component.ts - 101 + 107 编辑环境 @@ -3808,7 +3756,7 @@ You cannot restore it once deleted! Name is not allowed to be empty src/app/shared/components/env/env.component.ts - 133 + 141 名称不允许为空 @@ -3816,7 +3764,7 @@ You cannot restore it once deleted! Failed to edit src/app/shared/components/env/env.component.ts - 150 + 158 编辑失败 @@ -3824,7 +3772,7 @@ You cannot restore it once deleted! Failed to add src/app/shared/components/env/env.component.ts - 162 + 170 添加失败 @@ -3856,7 +3804,7 @@ You cannot restore it once deleted! Please import the file first src/app/shared/components/import-api/import-api.component.ts - 81 + 84 请先导入文件 @@ -3864,7 +3812,7 @@ You cannot restore it once deleted! Same as the parent's field src/app/shared/components/import-api/import-api.component.ts - 104 + 108 与父字段 相同 @@ -3888,7 +3836,7 @@ You cannot restore it once deleted! You don't have cloud space yet, please create one src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts - 49 + 51 您还没有云空间，请创建一个 @@ -4004,7 +3952,7 @@ You cannot restore it once deleted! src/app/shared/components/setting/setting.component.ts - 87 + 91 云端服务 @@ -4056,11 +4004,19 @@ You cannot restore it once deleted! 使用云端储存需要下载 Eoapi 客户端 + + Successfully connect to cloud + + src/app/shared/components/setting/common/data-storage.component.ts + 92 + + 成功连接云服务 + Failed to connect src/app/shared/components/setting/common/data-storage.component.ts - 99 + 100 连接失败 @@ -4110,7 +4066,7 @@ You cannot restore it once deleted! src/app/shared/components/setting/setting.component.ts - 91 + 96 语言 @@ -4118,11 +4074,11 @@ You cannot restore it once deleted! Account src/app/shared/components/setting/setting.component.ts - 72 + 73 src/app/shared/components/setting/setting.component.ts - 77 + 78 账号 @@ -4130,7 +4086,7 @@ You cannot restore it once deleted! Password src/app/shared/components/setting/setting.component.ts - 81 + 82 密码 @@ -4138,23 +4094,15 @@ You cannot restore it once deleted! About src/app/shared/components/setting/setting.component.ts - 95 + 100 关于 - - Eoapi Client is required to manage member - - src/app/shared/components/sidebar/sidebar.component.ts - 77 - - 管理成员需要下载 Eoapi 客户端 - Member src/app/shared/components/sidebar/sidebar.component.ts - 105 + 109 成员 @@ -4162,7 +4110,7 @@ You cannot restore it once deleted! Workspace src/app/shared/components/sidebar/sidebar.component.ts - 115 + 119 空间 @@ -4170,7 +4118,7 @@ You cannot restore it once deleted! Extensions src/app/shared/components/sidebar/sidebar.component.ts - 123 + 127 插件广场 @@ -4190,22 +4138,6 @@ You cannot restore it once deleted! 测试服务连接失败，请提交 Issue 联系社区 - - Cloud Storage not available - - src/app/shared/services/data-source/data-source.service.ts - 181 - - 云储存不可用 - - - Successfully connect to cloud - - src/app/shared/services/data-source/data-source.service.ts - 193 - - 成功连接云服务 - Confirm @@ -4274,7 +4206,7 @@ You cannot restore it once deleted! Local workspace src/app/shared/services/workspace/workspace.service.ts - 15 + 18 本地空间 diff --git a/src/workbench/browser/src/main.ts b/src/workbench/browser/src/main.ts index bc877113d..192bf067c 100644 --- a/src/workbench/browser/src/main.ts +++ b/src/workbench/browser/src/main.ts @@ -1,5 +1,6 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import microApp from '@micro-zoe/micro-app'; import { AppModule } from './app/app.module'; import { APP_CONFIG } from './environments/environment'; @@ -7,6 +8,20 @@ import { APP_CONFIG } from './environments/environment'; if (APP_CONFIG.production) { enableProdMode(); } + +microApp.start({ + fetch(url, options, appName) { + if (url.startsWith('https://unpkg.com/') && !url.startsWith(`https://unpkg.com/${appName}`)) { + // 删除 http://localhost:3001/error.js 的内容 + return window + .fetch(new URL(url.replace('https://unpkg.com/', ''), `https://unpkg.com/${appName}/page/`).href, options) + .then((res) => res.text()); + } + + return window.fetch(url, options).then((res) => res.text()); + }, +}); + platformBrowserDynamic() - .bootstrapModule(AppModule, {}) + .bootstrapModule(AppModule) .catch((err) => console.error(err)); diff --git a/src/workbench/browser/src/ng1/index.css b/src/workbench/browser/src/ng1/index.css index 30155320d..a85db10fa 100644 --- a/src/workbench/browser/src/ng1/index.css +++ b/src/workbench/browser/src/ng1/index.css @@ -5301,9 +5301,6 @@ input::-ms-reveal { color: #ccc; } -.eo-tab-theme-icon { - color: var(--MAIN_THEME_COLOR); -} .eo-tab-icon { color: #fff; diff --git a/src/workbench/browser/views/share.ts b/src/workbench/browser/views/share.ts index 6fbf322cd..953fe9d2e 100644 --- a/src/workbench/browser/views/share.ts +++ b/src/workbench/browser/views/share.ts @@ -13,7 +13,7 @@ import { ModalS, WorkspaceS, HTTPS, - MessageS, + ApiContent, } from '../elements'; export default new Module({ @@ -21,7 +21,14 @@ export default new Module({ children: [ new Component({ id: 'share', - children: [], + imports: [], + init: [], + children: [ + new Canvas({ + class: ['flex', 'flex-col'], + children: [new ApiContent()], + }), + ], }), ], }); diff --git a/src/workbench/browser/views/user-modal.ts b/src/workbench/browser/views/user-modal.ts index d9c686cbb..d0dbfd2e4 100644 --- a/src/workbench/browser/views/user-modal.ts +++ b/src/workbench/browser/views/user-modal.ts @@ -107,6 +107,7 @@ const loginForm = new Form({ }), userS.setLoginInfo('data'), Modal.close('login'), + EventS.send('update-share-link'), // * show share button [httpS.send('api_userReadProfile', null), userS.setUserProfile('data')], [ // * update workspace diff --git a/src/workbench/node/server/package.json b/src/workbench/node/package.json similarity index 51% rename from src/workbench/node/server/package.json rename to src/workbench/node/package.json index 645490104..0bb00ee46 100644 --- a/src/workbench/node/server/package.json +++ b/src/workbench/node/package.json @@ -2,11 +2,12 @@ "name": "eo-test-server", "version": "1.0.0", "description": "Recieve eoapi tes config and response http result", - "main": "main.js", + "main": "./server/main.js", "scripts": { - "dev": "node main.js", - "start": "pm2 start main.js", - "start:io": "pm2 start socketio.js", + "dev": "node ./server/main.js", + "start": "pm2-runtime start ./server/main.js", + "start:io": "pm2-runtime start ./server/socketio.js", + "start:all": "yarn start && yarn start:io", "watch": "pm2 list", "stop": "pm2 stop all", "test": "echo \"Error: no test specified\" && exit 1" @@ -15,8 +16,13 @@ "license": "ISC", "dependencies": { "@koa/cors": "3.3.0", + "crypto-js": "4.1.1", + "jquery": "3.6.1", + "jsdom": "20.0.1", "koa": "2.13.4", "koa-body": "5.0.0", - "pm2": "5.2.0" + "pm2": "5.2.0", + "socket.io": "4.5.3", + "xml2js": "0.4.23" } -} \ No newline at end of file +} diff --git a/src/workbench/node/request/libs/apiUtil.js b/src/workbench/node/request/libs/apiUtil.js index 0fa015c6d..d5c853d64 100644 --- a/src/workbench/node/request/libs/apiUtil.js +++ b/src/workbench/node/request/libs/apiUtil.js @@ -140,12 +140,6 @@ privateFun.getBaiscEoFn = (inputSanboxVar, inputEnv = {}) => { throw `codeError_自定义全局变量 ${inputKey} 仅支持储存 string、number、bool 类型数据，您试图为其赋值为 ${tmpType.toLowerCase()} 类型`; } } - if (inputSanboxVar.eo.env.envParam.hasOwnProperty(inputKey)) { - inputSanboxVar.eo.info( - `温馨提示：当前已存在同名环境变量 ${inputKey}，eo.globals.set 可能无法达到预期效果`, - 'warning' - ); - } }, unset: (inputKey) => { delete global.eoTestGlobals[inputKey]; @@ -159,20 +153,6 @@ privateFun.getBaiscEoFn = (inputSanboxVar, inputEnv = {}) => { }, env: { envParam: inputEnv.envParam, - param: { - get: (inputKey) => { - return inputSanboxVar.eo.env.envParam[inputKey]; - }, - set: (inputKey, inputVal) => { - inputSanboxVar.eo.env.envParam[inputKey] = inputVal; - }, - unset: (inputKey) => { - delete inputSanboxVar.eo.env.envParam[inputKey]; - }, - clear: () => { - inputSanboxVar.eo.env.envParam = {}; - }, - }, }, crypt: { md5: _LibsEncrypt.md5, @@ -254,14 +234,6 @@ privateFun.getBaiscEoFn = (inputSanboxVar, inputEnv = {}) => { }; ['http'].map((val) => { tmpResult.env[val] = _LibsCommon.deepCopy(inputEnv[val]) || {}; - tmpResult.env[val].baseUrl = { - get: () => { - return inputSanboxVar.eo.env[val].baseUrlParam; - }, - set: (inputVal) => { - inputSanboxVar.eo.env[val].baseUrlParam = inputVal; - }, - }; }); return tmpResult; }; @@ -284,7 +256,7 @@ privateFun.constructUiCodeBasicFn = (inputSanboxVar, inputEnv, inputOpts = {}) = data: tmpInputTestData, env: Object.assign({}, inputSanboxVar.eo.env, { envAuth: inputEnv.envAuth, - http: Object.assign({}, inputSanboxVar.eo.env.http, { + http: Object.assign({}, { requestScript: '', responseScript: '', }), diff --git a/src/workbench/node/server/main.js b/src/workbench/node/server/main.js index e31a3cf97..ce941e4e2 100644 --- a/src/workbench/node/server/main.js +++ b/src/workbench/node/server/main.js @@ -11,7 +11,7 @@ const cors = require('@koa/cors'); const socketio = require('./socketio'); const app = new Koa(); -const port = 4201; +const port = process.env.TEST_SERVER_PORT || 4201; app.use(cors()); app.use(koaBody()); diff --git a/src/workbench/node/server/socketio.js b/src/workbench/node/server/socketio.js index 7487050f1..8423afefd 100644 --- a/src/workbench/node/server/socketio.js +++ b/src/workbench/node/server/socketio.js @@ -5,8 +5,12 @@ process.on('uncaughtException', (err) => { console.error('uncaughtException', err); }); -const socket = (port = 13928) => { - const io = new IO.Server(port); +const _post = process.env.EOAPI_WEBSOCKET_POST || 13928; + +const socket = (port = _post) => { + const io = new IO.Server(port, { + transports: ['websocket'], + }); io.on('connection', (socket) => { // send a message to the client socket.emit('ws-client', 'link success'); diff --git a/src/workbench/node/server/yarn.lock b/src/workbench/node/server/yarn.lock index c9f131854..713115ff3 100644 --- a/src/workbench/node/server/yarn.lock +++ b/src/workbench/node/server/yarn.lock @@ -4,14 +4,14 @@ "@koa/cors@3.3.0": version "3.3.0" - resolved "https://registry.npmjs.org/@koa/cors/-/cors-3.3.0.tgz" + resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.3.0.tgz#b4c1c7ee303b7c968c8727f2a638a74675b50bb2" integrity sha512-lzlkqLlL5Ond8jb6JLnVVDmD2OPym0r5kvZlMgAWiS9xle+Q5ulw1T358oW+RVguxUkANquZQz82i/STIRmsqQ== dependencies: vary "^1.1.2" "@opencensus/core@0.0.9": version "0.0.9" - resolved "https://registry.npmjs.org/@opencensus/core/-/core-0.0.9.tgz" + resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.9.tgz#b16f775435ee309433e4126af194d37313fc93b3" integrity sha512-31Q4VWtbzXpVUd2m9JS6HEaPjlKvNMOiF7lWKNmXF84yUcgfAFL5re7/hjDmdyQbOp32oGc+RFV78jXIldVz6Q== dependencies: continuation-local-storage "^3.2.1" @@ -22,7 +22,7 @@ "@opencensus/core@^0.0.8": version "0.0.8" - resolved "https://registry.npmjs.org/@opencensus/core/-/core-0.0.8.tgz" + resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.8.tgz#df01f200c2d2fbfe14dae129a1a86fb87286db92" integrity sha512-yUFT59SFhGMYQgX0PhoTR0LBff2BEhPrD9io1jWfF/VDbakRfs6Pq60rjv0Z7iaTav5gQlttJCX2+VPxFWCuoQ== dependencies: continuation-local-storage "^3.2.1" @@ -33,7 +33,7 @@ "@opencensus/propagation-b3@0.0.8": version "0.0.8" - resolved "https://registry.npmjs.org/@opencensus/propagation-b3/-/propagation-b3-0.0.8.tgz" + resolved "https://registry.yarnpkg.com/@opencensus/propagation-b3/-/propagation-b3-0.0.8.tgz#0751e6fd75f09400d9d3c419001e9e15a0df68e9" integrity sha512-PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A== dependencies: "@opencensus/core" "^0.0.8" @@ -41,7 +41,7 @@ "@pm2/agent@~2.0.0": version "2.0.1" - resolved "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-2.0.1.tgz#0edffc54cd8ee2b12f90136264e7880f3f78c79d" integrity sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw== dependencies: async "~3.2.0" @@ -60,7 +60,7 @@ "@pm2/io@~5.0.0": version "5.0.0" - resolved "https://registry.npmjs.org/@pm2/io/-/io-5.0.0.tgz" + resolved "https://registry.yarnpkg.com/@pm2/io/-/io-5.0.0.tgz#623cbcaf6fe39375f20ac2e75497477a1b1ec5c5" integrity sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw== dependencies: "@opencensus/core" "0.0.9" @@ -76,7 +76,7 @@ "@pm2/js-api@~0.6.7": version "0.6.7" - resolved "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz" + resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.6.7.tgz#ed28c3b7b6d26f03f826318754fdc5468afa589f" integrity sha512-jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw== dependencies: async "^2.6.3" @@ -87,31 +87,31 @@ "@pm2/pm2-version-check@latest": version "1.0.4" - resolved "https://registry.npmjs.org/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz#cf97fbb14b0eca95430ca05eedccbd2683806e43" integrity sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA== dependencies: debug "^4.3.1" "@tootallnate/once@1": version "1.1.2" - resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@types/formidable@^2.0.4": version "2.0.5" - resolved "https://registry.npmjs.org/@types/formidable/-/formidable-2.0.5.tgz" + resolved "https://registry.yarnpkg.com/@types/formidable/-/formidable-2.0.5.tgz#e54e31d242ef750ac2d05aa163fa0274c8e6ef9c" integrity sha512-uvMcdn/KK3maPOaVUAc3HEYbCEhjaGFwww4EsX6IJfWIJ1tzHtDHczuImH3GKdusPnAAmzB07St90uabZeCKPA== dependencies: "@types/node" "*" "@types/node@*": - version "18.0.3" - resolved "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz" - integrity sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ== + version "18.11.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.5.tgz#1bc94cf2f9ab5fe33353bc7c79c797dcc5325bef" + integrity sha512-3JRwhbjI+cHLAkUorhf8RnqUbFXajvzX4q6fMn5JwkgtuwfYtRQYI3u4V92vI6NJuTsbBQWWh3RZjFsuevyMGQ== accepts@^1.3.5: version "1.3.8" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: mime-types "~2.1.34" @@ -119,48 +119,48 @@ accepts@^1.3.5: acorn-walk@^8.2.0: version "8.2.0" - resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^8.7.0: - version "8.8.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: version "6.0.2" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: debug "4" amp-message@~0.1.1: version "0.1.2" - resolved "https://registry.npmjs.org/amp-message/-/amp-message-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/amp-message/-/amp-message-0.1.2.tgz#a78f1c98995087ad36192a41298e4db49e3dfc45" integrity sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg== dependencies: amp "0.3.1" amp@0.3.1, amp@~0.3.1: version "0.3.1" - resolved "https://registry.npmjs.org/amp/-/amp-0.3.1.tgz" + resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d" integrity sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw== ansi-colors@^4.1.1: version "4.1.3" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== ansi-styles@^4.1.0: version "4.3.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" @@ -168,26 +168,26 @@ anymatch@~3.1.2: argparse@^1.0.7: version "1.0.10" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== dependencies: sprintf-js "~1.0.2" asap@^2.0.0: version "2.0.6" - resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== ast-types@^0.13.2: version "0.13.4" - resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782" integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w== dependencies: tslib "^2.0.1" async-listener@^0.6.0: version "0.6.10" - resolved "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz" + resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc" integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw== dependencies: semver "^5.3.0" @@ -195,46 +195,46 @@ async-listener@^0.6.0: async@^2.6.3, async@~2.6.1: version "2.6.4" - resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" async@^3.2.0, async@~3.2.0: version "3.2.4" - resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== axios@^0.21.0: version "0.21.4" - resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== binary-extensions@^2.0.0: version "2.2.0" - resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== blessed@0.1.81: version "0.1.81" - resolved "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz" + resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129" integrity sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ== bodec@^0.1.0: version "0.1.0" - resolved "https://registry.npmjs.org/bodec/-/bodec-0.1.0.tgz" + resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc" integrity sha512-Ylo+MAo5BDUq1KA3f3R/MFhh+g8cnHmo8bz3YPGhI1znrMaf77ol1sfvYJzsw3nTE+Y2GryfDxBaR+AqpAkEHQ== brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" @@ -242,24 +242,24 @@ brace-expansion@^1.1.7: braces@~3.0.2: version "3.0.2" - resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== bytes@3.1.2: version "3.1.2" - resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== cache-content-type@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c" integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA== dependencies: mime-types "^2.1.18" @@ -267,7 +267,7 @@ cache-content-type@^1.0.0: call-bind@^1.0.0: version "1.0.2" - resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -275,7 +275,7 @@ call-bind@^1.0.0: chalk@3.0.0, chalk@~3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== dependencies: ansi-styles "^4.1.0" @@ -283,12 +283,12 @@ chalk@3.0.0, chalk@~3.0.0: charm@~0.1.1: version "0.1.2" - resolved "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296" integrity sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ== chokidar@^3.5.1: version "3.5.3" - resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" @@ -303,14 +303,14 @@ chokidar@^3.5.1: cli-tableau@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/cli-tableau/-/cli-tableau-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/cli-tableau/-/cli-tableau-2.0.1.tgz#baa78d83e08a2d7ab79b7dad9406f0254977053f" integrity sha512-he+WTicka9cl0Fg/y+YyxcN6/bfQ/1O3QmgxRXDhABKqLzvoOSM4fMzp39uMyLBulAFuywD2N7UaoQE7WaADxQ== dependencies: chalk "3.0.0" co-body@^5.1.1: version "5.2.0" - resolved "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz" + resolved "https://registry.yarnpkg.com/co-body/-/co-body-5.2.0.tgz#5a0a658c46029131e0e3a306f67647302f71c124" integrity sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ== dependencies: inflation "^2.0.0" @@ -320,46 +320,46 @@ co-body@^5.1.1: co@^4.6.0: version "4.6.0" - resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== dependencies: color-name "~1.1.4" color-name@~1.1.4: version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== commander@2.15.1: version "2.15.1" - resolved "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== concat-map@0.0.1: version "0.0.1" - resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== content-disposition@~0.5.2: version "0.5.4" - resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: safe-buffer "5.2.1" content-type@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== continuation-local-storage@^3.2.1: version "3.2.1" - resolved "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz" + resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb" integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA== dependencies: async-listener "^0.6.0" @@ -367,7 +367,7 @@ continuation-local-storage@^3.2.1: cookies@~0.8.0: version "0.8.0" - resolved "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== dependencies: depd "~2.0.0" @@ -375,56 +375,56 @@ cookies@~0.8.0: core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== croner@~4.1.92: version "4.1.97" - resolved "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz" + resolved "https://registry.yarnpkg.com/croner/-/croner-4.1.97.tgz#6e373dc7bb3026fab2deb0d82685feef20796766" integrity sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ== culvert@^0.1.2: version "0.1.2" - resolved "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/culvert/-/culvert-0.1.2.tgz#9502f5f0154a2d5a22a023e79f71cc936fa6ef6f" integrity sha512-yi1x3EAWKjQTreYWeSd98431AV+IEE0qoDyOoaHJ7KJ21gv6HtBXHVLX74opVSGqcR8/AbjJBHAHpcOy2bj5Gg== data-uri-to-buffer@3: version "3.0.1" - resolved "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== dayjs@~1.8.24, dayjs@~1.8.25: version "1.8.36" - resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50" integrity sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw== debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1: version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" debug@^3.2.6: version "3.2.7" - resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" deep-equal@~1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw== deep-is@~0.1.3: version "0.1.4" - resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== degenerator@^3.0.2: version "3.0.2" - resolved "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== dependencies: ast-types "^0.13.2" @@ -434,27 +434,27 @@ degenerator@^3.0.2: delegates@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== depd@~1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== destroy@^1.0.4: version "1.2.0" - resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== dezalgo@1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" integrity sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ== dependencies: asap "^2.0.0" @@ -462,41 +462,41 @@ dezalgo@1.0.3: ee-first@1.1.1: version "1.1.1" - resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== emitter-listener@^1.1.1: version "1.1.2" - resolved "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== dependencies: shimmer "^1.2.0" encodeurl@^1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== enquirer@2.3.6: version "2.3.6" - resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: ansi-colors "^4.1.1" escape-html@^1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== escodegen@^1.8.1: version "1.14.3" - resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== dependencies: esprima "^4.0.1" @@ -508,69 +508,69 @@ escodegen@^1.8.1: esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" - resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== estraverse@^4.2.0: version "4.3.0" - resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== esutils@^2.0.2: version "2.0.3" - resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== eventemitter2@5.0.1, eventemitter2@~5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452" integrity sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg== eventemitter2@^6.3.1: - version "6.4.7" - resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz" - integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg== + version "6.4.9" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125" + integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg== eventemitter2@~0.4.14: version "0.4.14" - resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ== fast-json-patch@^3.0.0-1: version "3.1.1" - resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz" + resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947" integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ== fast-levenshtein@~2.0.6: version "2.0.6" - resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fclone@1.0.11, fclone@~1.0.11: version "1.0.11" - resolved "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz" + resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640" integrity sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw== file-uri-to-path@2: version "2.0.0" - resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: to-regex-range "^5.0.1" follow-redirects@^1.14.0: - version "1.15.1" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== formidable@^2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff" integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ== dependencies: dezalgo "1.0.3" @@ -580,12 +580,12 @@ formidable@^2.0.1: fresh@~0.5.2: version "0.5.2" - resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== fs-extra@^8.1.0: version "8.1.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== dependencies: graceful-fs "^4.2.0" @@ -594,17 +594,17 @@ fs-extra@^8.1.0: fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.2" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== ftp@^0.3.10: version "0.3.10" - resolved "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz" + resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ== dependencies: readable-stream "1.1.x" @@ -612,13 +612,13 @@ ftp@^0.3.10: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== get-intrinsic@^1.0.2: - version "1.1.2" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -626,7 +626,7 @@ get-intrinsic@^1.0.2: get-uri@3: version "3.0.2" - resolved "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c" integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg== dependencies: "@tootallnate/once" "1" @@ -638,24 +638,24 @@ get-uri@3: git-node-fs@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/git-node-fs/-/git-node-fs-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/git-node-fs/-/git-node-fs-1.0.0.tgz#49b215e242ebe43aa4c7561bbba499521752080f" integrity sha512-bLQypt14llVXBg0S0u8q8HmU7g9p3ysH+NvVlae5vILuUvs759665HvmR5+wb04KjHyjFcDRxdYb4kyNnluMUQ== git-sha1@^0.1.2: version "0.1.2" - resolved "https://registry.npmjs.org/git-sha1/-/git-sha1-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/git-sha1/-/git-sha1-0.1.2.tgz#599ac192b71875825e13a445f3a6e05118c2f745" integrity sha512-2e/nZezdVlyCopOCYHeW0onkbZg7xP1Ad6pndPy1rCygeRykefUS6r7oA5cJRGEFvseiaz5a/qUHFVX1dd6Isg== glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" glob@^7.0.5: version "7.2.3" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" @@ -667,41 +667,41 @@ glob@^7.0.5: graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== dependencies: has-symbols "^1.0.2" has@^1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" hexoid@1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== http-assert@^1.3.0: version "1.5.0" - resolved "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz" + resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" integrity sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w== dependencies: deep-equal "~1.0.1" @@ -709,7 +709,7 @@ http-assert@^1.3.0: http-errors@2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: depd "2.0.0" @@ -720,7 +720,7 @@ http-errors@2.0.0: http-errors@^1.6.3, http-errors@~1.8.0: version "1.8.1" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" @@ -731,7 +731,7 @@ http-errors@^1.6.3, http-errors@~1.8.0: http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: version "4.0.1" - resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== dependencies: "@tootallnate/once" "1" @@ -740,7 +740,7 @@ http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: https-proxy-agent@5, https-proxy-agent@^5.0.0: version "5.0.1" - resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" @@ -748,19 +748,19 @@ https-proxy-agent@5, https-proxy-agent@^5.0.0: iconv-lite@0.4.24, iconv-lite@^0.4.4: version "0.4.24" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" inflation@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/inflation/-/inflation-2.0.0.tgz#8b417e47c28f925a45133d914ca1fd389107f30f" integrity sha512-m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw== inflight@^1.0.4: version "1.0.6" - resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" @@ -768,70 +768,70 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@~2.0.1: version "2.0.4" - resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ini@^1.3.5: version "1.3.8" - resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== ip@^1.1.5: version "1.1.8" - resolved "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== ip@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== dependencies: binary-extensions "^2.0.0" is-core-module@^2.9.0: - version "2.10.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-generator-function@^1.0.7: version "1.0.10" - resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== dependencies: has-tostringtag "^1.0.0" is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" is-number@^7.0.0: version "7.0.0" - resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== isarray@0.0.1: version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== js-git@^0.7.8: version "0.7.8" - resolved "https://registry.npmjs.org/js-git/-/js-git-0.7.8.tgz" + resolved "https://registry.yarnpkg.com/js-git/-/js-git-0.7.8.tgz#52fa655ab61877d6f1079efc6534b554f31e5444" integrity sha512-+E5ZH/HeRnoc/LW0AmAyhU+mNcWBzAKE+30+IDMLSLbbK+Tdt02AdkOKq9u15rlJsDEGFqtgckc8ZM59LhhiUA== dependencies: bodec "^0.1.0" @@ -841,26 +841,26 @@ js-git@^0.7.8: json-stringify-safe@^5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== jsonfile@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== optionalDependencies: graceful-fs "^4.1.6" keygrip@~1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ== dependencies: tsscmp "1.0.6" koa-body@5.0.0: version "5.0.0" - resolved "https://registry.npmjs.org/koa-body/-/koa-body-5.0.0.tgz" + resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-5.0.0.tgz#d310372bea09a24ccc450c76ca142ee55395dda6" integrity sha512-nHwEODrQGiyKBILCWO8QSS40C87cKr2cp3y/Cw8u9Z8w5t0CdSkGm3+y9WK5BIAlPpo9tTw5RtSbxpVyG79vmw== dependencies: "@types/formidable" "^2.0.4" @@ -869,12 +869,12 @@ koa-body@5.0.0: koa-compose@^4.1.0: version "4.1.0" - resolved "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz" + resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw== koa-convert@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5" integrity sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA== dependencies: co "^4.6.0" @@ -882,7 +882,7 @@ koa-convert@^2.0.0: koa@2.13.4: version "2.13.4" - resolved "https://registry.npmjs.org/koa/-/koa-2.13.4.tgz" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e" integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g== dependencies: accepts "^1.3.5" @@ -911,12 +911,12 @@ koa@2.13.4: lazy@~1.0.11: version "1.0.11" - resolved "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz" + resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690" integrity sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA== levn@~0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== dependencies: prelude-ls "~1.1.2" @@ -924,75 +924,80 @@ levn@~0.3.0: lodash@^4.17.14: version "4.17.21" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-driver@^1.2.7: version "1.2.7" - resolved "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz" + resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== lru-cache@^5.1.1: version "5.1.1" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== dependencies: yallist "^3.0.2" lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: yallist "^4.0.0" media-typer@0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== mime-db@1.52.0: version "1.52.0" - resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.18, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" - resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" minimatch@^3.1.1: version "3.1.2" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" mkdirp@1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== module-details-from-path@^1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b" integrity sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A== -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mute-stream@~0.0.4: version "0.0.8" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== needle@2.4.0: version "2.4.0" - resolved "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== dependencies: debug "^3.2.6" @@ -1001,22 +1006,22 @@ needle@2.4.0: negotiator@0.6.3: version "0.6.3" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== netmask@^2.0.2: version "2.0.2" - resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== nssocket@0.6.0: version "0.6.0" - resolved "https://registry.npmjs.org/nssocket/-/nssocket-0.6.0.tgz" + resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa" integrity sha512-a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w== dependencies: eventemitter2 "~0.4.14" @@ -1024,31 +1029,31 @@ nssocket@0.6.0: object-inspect@^1.9.0: version "1.12.2" - resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== on-finished@^2.3.0: version "2.4.1" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" once@1.4.0, once@^1.3.0: version "1.4.0" - resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" only@~0.0.2: version "0.0.2" - resolved "https://registry.npmjs.org/only/-/only-0.0.2.tgz" + resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ== optionator@^0.8.1: version "0.8.3" - resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== dependencies: deep-is "~0.1.3" @@ -1060,7 +1065,7 @@ optionator@^0.8.1: pac-proxy-agent@^5.0.0: version "5.0.0" - resolved "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e" integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ== dependencies: "@tootallnate/once" "1" @@ -1075,7 +1080,7 @@ pac-proxy-agent@^5.0.0: pac-resolver@^5.0.0: version "5.0.1" - resolved "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz#c91efa3a9af9f669104fa2f51102839d01cde8e7" integrity sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q== dependencies: degenerator "^3.0.2" @@ -1084,53 +1089,53 @@ pac-resolver@^5.0.0: pako@^0.2.5: version "0.2.9" - resolved "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" + resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA== parseurl@^1.3.2: version "1.3.3" - resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" - resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pidusage@^2.0.21: version "2.0.21" - resolved "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz" + resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.21.tgz#7068967b3d952baea73e57668c98b9eaa876894e" integrity sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA== dependencies: safe-buffer "^5.2.1" pidusage@~3.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz" - integrity sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.2.tgz#6faa5402b2530b3af2cf93d13bcf202889724a53" + integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w== dependencies: safe-buffer "^5.2.1" pm2-axon-rpc@~0.7.0, pm2-axon-rpc@~0.7.1: version "0.7.1" - resolved "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz" + resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz#2daec5383a63135b3f18babb70266dacdcbc429a" integrity sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw== dependencies: debug "^4.3.1" pm2-axon@~4.0.1: version "4.0.1" - resolved "https://registry.npmjs.org/pm2-axon/-/pm2-axon-4.0.1.tgz" + resolved "https://registry.yarnpkg.com/pm2-axon/-/pm2-axon-4.0.1.tgz#a7b4bb586e9aeb35b1042b488cde15b60cabafd2" integrity sha512-kES/PeSLS8orT8dR5jMlNl+Yu4Ty3nbvZRmaAtROuVm9nYYGiaoXqqKQqQYzWQzMYWUKHMQTvBlirjE5GIIxqg== dependencies: amp "~0.3.1" @@ -1140,7 +1145,7 @@ pm2-axon@~4.0.1: pm2-deploy@~1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/pm2-deploy/-/pm2-deploy-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/pm2-deploy/-/pm2-deploy-1.0.2.tgz#98d8385553a3a4dca11c7b3116deb519bc5961a7" integrity sha512-YJx6RXKrVrWaphEYf++EdOOx9EH18vM8RSZN/P1Y+NokTKqYAca/ejXwVLyiEpNju4HPZEk3Y2uZouwMqUlcgg== dependencies: run-series "^1.1.8" @@ -1148,14 +1153,14 @@ pm2-deploy@~1.0.2: pm2-multimeter@^0.1.2: version "0.1.2" - resolved "https://registry.npmjs.org/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz#1a1e55153d41a05534cea23cfe860abaa0eb4ace" integrity sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA== dependencies: charm "~0.1.1" pm2-sysmonit@^1.2.8: version "1.2.8" - resolved "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz" + resolved "https://registry.yarnpkg.com/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz#eddea34a53fd8c8d7c3efb73b97a3c548686e24d" integrity sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA== dependencies: async "^3.2.0" @@ -1203,19 +1208,19 @@ pm2@5.2.0: prelude-ls@~1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== promptly@^2: version "2.2.0" - resolved "https://registry.npmjs.org/promptly/-/promptly-2.2.0.tgz" + resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74" integrity sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA== dependencies: read "^1.0.4" proxy-agent@~5.0.0: version "5.0.0" - resolved "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b" integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g== dependencies: agent-base "^6.0.0" @@ -1229,24 +1234,24 @@ proxy-agent@~5.0.0: proxy-from-env@^1.0.0: version "1.1.0" - resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== qs@6.9.3: version "6.9.3" - resolved "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e" integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw== qs@^6.4.0: version "6.11.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" raw-body@^2.2.0: version "2.5.1" - resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: bytes "3.1.2" @@ -1256,14 +1261,14 @@ raw-body@^2.2.0: read@^1.0.4: version "1.0.7" - resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz" + resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== dependencies: mute-stream "~0.0.4" readable-stream@1.1.x: version "1.1.14" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== dependencies: core-util-is "~1.0.0" @@ -1273,23 +1278,23 @@ readable-stream@1.1.x: readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" require-in-the-middle@^5.0.0: - version "5.1.0" - resolved "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz" - integrity sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz#4b71e3cc7f59977100af9beb76bf2d056a5a6de2" + integrity sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg== dependencies: debug "^4.1.1" module-details-from-path "^1.0.3" - resolve "^1.12.0" + resolve "^1.22.1" -resolve@^1.12.0: +resolve@^1.22.1: version "1.22.1" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: is-core-module "^2.9.0" @@ -1298,59 +1303,59 @@ resolve@^1.12.0: run-series@^1.1.8: version "1.1.9" - resolved "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz" + resolved "https://registry.yarnpkg.com/run-series/-/run-series-1.1.9.tgz#15ba9cb90e6a6c054e67c98e1dc063df0ecc113a" integrity sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g== safe-buffer@5.2.1, safe-buffer@^5.2.1: version "5.2.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== "safer-buffer@>= 2.1.2 < 3": version "2.1.2" - resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@^1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" - resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== semver@6.3.0: version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^5.3.0, semver@^5.5.0: version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^7.2: - version "7.3.7" - resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" semver@~7.2.0: version "7.2.3" - resolved "https://registry.npmjs.org/semver/-/semver-7.2.3.tgz" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.3.tgz#3641217233c6382173c76bf2c7ecd1e1c16b0d8a" integrity sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig== setprototypeof@1.2.0: version "1.2.0" - resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" - resolved "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz" + resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -1359,17 +1364,17 @@ side-channel@^1.0.4: signal-exit@^3.0.3: version "3.0.7" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== smart-buffer@^4.2.0: version "4.2.0" - resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== socks-proxy-agent@5, socks-proxy-agent@^5.0.0: version "5.0.1" - resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e" integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ== dependencies: agent-base "^6.0.2" @@ -1377,16 +1382,16 @@ socks-proxy-agent@5, socks-proxy-agent@^5.0.0: socks "^2.3.3" socks@^2.3.3: - version "2.7.0" - resolved "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz" - integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: ip "^2.0.0" smart-buffer "^4.2.0" source-map-support@0.5.19: version "0.5.19" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== dependencies: buffer-from "^1.0.0" @@ -1394,100 +1399,100 @@ source-map-support@0.5.19: source-map@^0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== sprintf-js@1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== statuses@2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== "statuses@>= 1.5.0 < 2", statuses@^1.5.0: version "1.5.0" - resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== string_decoder@~0.10.x: version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== supports-color@^7.1.0: version "7.2.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== systeminformation@^5.7: - version "5.12.3" - resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.3.tgz" - integrity sha512-aPyTDzK/VjEheGEODprxFTMahIWTHGyWXxTsh9EOHjeekVltrIWrle4dOZouOlOYgtKM1pDoHkrR+IssgYCK/A== + version "5.12.10" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.10.tgz#05b70c2e1c41209b88bc670b81e5cbd2ea8c9bd3" + integrity sha512-rLShZFpz14aWqg3nNCS8zw74WicRV6c3R17Ob7oO37zSypZATT4M2Dgjr4nE6PYGlome9ObU0A2uqXiAlaBbuA== to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tslib@1.9.3: version "1.9.3" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== tslib@^2.0.1: version "2.4.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== tsscmp@1.0.6: version "1.0.6" - resolved "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz" + resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA== tv4@^1.3.0: version "1.3.0" - resolved "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz" + resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963" integrity sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw== tx2@~1.0.4: version "1.0.5" - resolved "https://registry.npmjs.org/tx2/-/tx2-1.0.5.tgz" + resolved "https://registry.yarnpkg.com/tx2/-/tx2-1.0.5.tgz#ee0b0e5e2c351f8d23e54bdf46dd60afa3bbc73d" integrity sha512-sJ24w0y03Md/bxzK4FU8J8JveYYUbSs2FViLJ2D/8bytSiyPRbuE3DyL/9UKYXTZlV3yXq0L8GLlhobTnekCVg== dependencies: json-stringify-safe "^5.0.1" type-check@~0.3.2: version "0.3.2" - resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" type-is@^1.6.14, type-is@^1.6.16: version "1.6.18" - resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== dependencies: media-typer "0.3.0" @@ -1495,27 +1500,27 @@ type-is@^1.6.14, type-is@^1.6.16: universalify@^0.1.0: version "0.1.2" - resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== unpipe@1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== uuid@^3.2.1: version "3.4.0" - resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== vary@^1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vizion@~2.2.1: version "2.2.1" - resolved "https://registry.npmjs.org/vizion/-/vizion-2.2.1.tgz" + resolved "https://registry.yarnpkg.com/vizion/-/vizion-2.2.1.tgz#04201ea45ffd145d5b5210e385a8f35170387fb2" integrity sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww== dependencies: async "^2.6.3" @@ -1525,45 +1530,63 @@ vizion@~2.2.1: vm2@^3.9.8: version "3.9.11" - resolved "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz" - integrity sha512-AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ== + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" word-wrap@~1.2.3: version "1.2.3" - resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== wrappy@1: version "1.0.2" - resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^7.0.0, ws@~7.4.0: +ws@^7.0.0: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + +ws@~7.4.0: version "7.4.6" - resolved "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== +xml2js@0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + xregexp@2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== yallist@^3.0.2: version "3.1.1" - resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yallist@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yamljs@0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz" + resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b" integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ== dependencies: argparse "^1.0.7" @@ -1571,5 +1594,5 @@ yamljs@0.3.0: ylru@^1.2.0: version "1.3.2" - resolved "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz" + resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" integrity sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA== diff --git a/src/workbench/node/yarn.lock b/src/workbench/node/yarn.lock new file mode 100644 index 000000000..692eee2e1 --- /dev/null +++ b/src/workbench/node/yarn.lock @@ -0,0 +1,1982 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@koa/cors@3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.3.0.tgz#b4c1c7ee303b7c968c8727f2a638a74675b50bb2" + integrity sha512-lzlkqLlL5Ond8jb6JLnVVDmD2OPym0r5kvZlMgAWiS9xle+Q5ulw1T358oW+RVguxUkANquZQz82i/STIRmsqQ== + dependencies: + vary "^1.1.2" + +"@opencensus/core@0.0.9": + version "0.0.9" + resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.9.tgz#b16f775435ee309433e4126af194d37313fc93b3" + integrity sha512-31Q4VWtbzXpVUd2m9JS6HEaPjlKvNMOiF7lWKNmXF84yUcgfAFL5re7/hjDmdyQbOp32oGc+RFV78jXIldVz6Q== + dependencies: + continuation-local-storage "^3.2.1" + log-driver "^1.2.7" + semver "^5.5.0" + shimmer "^1.2.0" + uuid "^3.2.1" + +"@opencensus/core@^0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.8.tgz#df01f200c2d2fbfe14dae129a1a86fb87286db92" + integrity sha512-yUFT59SFhGMYQgX0PhoTR0LBff2BEhPrD9io1jWfF/VDbakRfs6Pq60rjv0Z7iaTav5gQlttJCX2+VPxFWCuoQ== + dependencies: + continuation-local-storage "^3.2.1" + log-driver "^1.2.7" + semver "^5.5.0" + shimmer "^1.2.0" + uuid "^3.2.1" + +"@opencensus/propagation-b3@0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@opencensus/propagation-b3/-/propagation-b3-0.0.8.tgz#0751e6fd75f09400d9d3c419001e9e15a0df68e9" + integrity sha512-PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A== + dependencies: + "@opencensus/core" "^0.0.8" + uuid "^3.2.1" + +"@pm2/agent@~2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-2.0.1.tgz#0edffc54cd8ee2b12f90136264e7880f3f78c79d" + integrity sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw== + dependencies: + async "~3.2.0" + chalk "~3.0.0" + dayjs "~1.8.24" + debug "~4.3.1" + eventemitter2 "~5.0.1" + fast-json-patch "^3.0.0-1" + fclone "~1.0.11" + nssocket "0.6.0" + pm2-axon "~4.0.1" + pm2-axon-rpc "~0.7.0" + proxy-agent "~5.0.0" + semver "~7.2.0" + ws "~7.4.0" + +"@pm2/io@~5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@pm2/io/-/io-5.0.0.tgz#623cbcaf6fe39375f20ac2e75497477a1b1ec5c5" + integrity sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw== + dependencies: + "@opencensus/core" "0.0.9" + "@opencensus/propagation-b3" "0.0.8" + async "~2.6.1" + debug "~4.3.1" + eventemitter2 "^6.3.1" + require-in-the-middle "^5.0.0" + semver "6.3.0" + shimmer "^1.2.0" + signal-exit "^3.0.3" + tslib "1.9.3" + +"@pm2/js-api@~0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.6.7.tgz#ed28c3b7b6d26f03f826318754fdc5468afa589f" + integrity sha512-jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw== + dependencies: + async "^2.6.3" + axios "^0.21.0" + debug "~4.3.1" + eventemitter2 "^6.3.1" + ws "^7.0.0" + +"@pm2/pm2-version-check@latest": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz#cf97fbb14b0eca95430ca05eedccbd2683806e43" + integrity sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA== + dependencies: + debug "^4.3.1" + +"@socket.io/component-emitter@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +"@types/cookie@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" + integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== + +"@types/cors@^2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + +"@types/formidable@^2.0.4": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@types/formidable/-/formidable-2.0.5.tgz#e54e31d242ef750ac2d05aa163fa0274c8e6ef9c" + integrity sha512-uvMcdn/KK3maPOaVUAc3HEYbCEhjaGFwww4EsX6IJfWIJ1tzHtDHczuImH3GKdusPnAAmzB07St90uabZeCKPA== + dependencies: + "@types/node" "*" + +"@types/node@*", "@types/node@>=10.0.0": + version "18.11.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.5.tgz#1bc94cf2f9ab5fe33353bc7c79c797dcc5325bef" + integrity sha512-3JRwhbjI+cHLAkUorhf8RnqUbFXajvzX4q6fMn5JwkgtuwfYtRQYI3u4V92vI6NJuTsbBQWWh3RZjFsuevyMGQ== + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +accepts@^1.3.5, accepts@~1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== + dependencies: + acorn "^8.1.0" + acorn-walk "^8.0.2" + +acorn-walk@^8.0.2, acorn-walk@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== + +acorn@^8.1.0, acorn@^8.7.0, acorn@^8.8.0: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + +agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +amp-message@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/amp-message/-/amp-message-0.1.2.tgz#a78f1c98995087ad36192a41298e4db49e3dfc45" + integrity sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg== + dependencies: + amp "0.3.1" + +amp@0.3.1, amp@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d" + integrity sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw== + +ansi-colors@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== + +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +asap@^2.0.0: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== + +ast-types@^0.13.2: + version "0.13.4" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782" + integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w== + dependencies: + tslib "^2.0.1" + +async-listener@^0.6.0: + version "0.6.10" + resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc" + integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw== + dependencies: + semver "^5.3.0" + shimmer "^1.1.0" + +async@^2.6.3, async@~2.6.1: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +async@^3.2.0, async@~3.2.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +axios@^0.21.0: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64id@2.0.0, base64id@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" + integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +blessed@0.1.81: + version "0.1.81" + resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129" + integrity sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ== + +bodec@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc" + integrity sha512-Ylo+MAo5BDUq1KA3f3R/MFhh+g8cnHmo8bz3YPGhI1znrMaf77ol1sfvYJzsw3nTE+Y2GryfDxBaR+AqpAkEHQ== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +cache-content-type@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c" + integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA== + dependencies: + mime-types "^2.1.18" + ylru "^1.2.0" + +call-bind@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +chalk@3.0.0, chalk@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +charm@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296" + integrity sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ== + +chokidar@^3.5.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +cli-tableau@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cli-tableau/-/cli-tableau-2.0.1.tgz#baa78d83e08a2d7ab79b7dad9406f0254977053f" + integrity sha512-he+WTicka9cl0Fg/y+YyxcN6/bfQ/1O3QmgxRXDhABKqLzvoOSM4fMzp39uMyLBulAFuywD2N7UaoQE7WaADxQ== + dependencies: + chalk "3.0.0" + +co-body@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/co-body/-/co-body-5.2.0.tgz#5a0a658c46029131e0e3a306f67647302f71c124" + integrity sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ== + dependencies: + inflation "^2.0.0" + qs "^6.4.0" + raw-body "^2.2.0" + type-is "^1.6.14" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +content-disposition@~0.5.2: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +continuation-local-storage@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb" + integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA== + dependencies: + async-listener "^0.6.0" + emitter-listener "^1.1.1" + +cookie@~0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== + +cookies@~0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" + integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== + dependencies: + depd "~2.0.0" + keygrip "~1.1.0" + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cors@~2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +croner@~4.1.92: + version "4.1.97" + resolved "https://registry.yarnpkg.com/croner/-/croner-4.1.97.tgz#6e373dc7bb3026fab2deb0d82685feef20796766" + integrity sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ== + +crypto-js@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" + integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== + +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +culvert@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/culvert/-/culvert-0.1.2.tgz#9502f5f0154a2d5a22a023e79f71cc936fa6ef6f" + integrity sha512-yi1x3EAWKjQTreYWeSd98431AV+IEE0qoDyOoaHJ7KJ21gv6HtBXHVLX74opVSGqcR8/AbjJBHAHpcOy2bj5Gg== + +data-uri-to-buffer@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" + integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== + +data-urls@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + +dayjs@~1.8.24, dayjs@~1.8.25: + version "1.8.36" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50" + integrity sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw== + +debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +decimal.js@^10.4.1: + version "10.4.2" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" + integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== + +deep-equal@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" + integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw== + +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +degenerator@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" + integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== + dependencies: + ast-types "^0.13.2" + escodegen "^1.8.1" + esprima "^4.0.0" + vm2 "^3.9.8" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@2.0.0, depd@^2.0.0, depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + +destroy@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + +dezalgo@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" + integrity sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ== + dependencies: + asap "^2.0.0" + wrappy "1" + +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== + dependencies: + webidl-conversions "^7.0.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== + +emitter-listener@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" + integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== + dependencies: + shimmer "^1.2.0" + +encodeurl@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== + +engine.io-parser@~5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" + integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== + +engine.io@~6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.0.tgz#003bec48f6815926f2b1b17873e576acd54f41d0" + integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg== + dependencies: + "@types/cookie" "^0.4.1" + "@types/cors" "^2.8.12" + "@types/node" ">=10.0.0" + accepts "~1.3.4" + base64id "2.0.0" + cookie "~0.4.1" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~5.0.3" + ws "~8.2.3" + +enquirer@2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + +escape-html@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^1.8.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +eventemitter2@5.0.1, eventemitter2@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452" + integrity sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg== + +eventemitter2@^6.3.1: + version "6.4.9" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125" + integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg== + +eventemitter2@~0.4.14: + version "0.4.14" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" + integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ== + +fast-json-patch@^3.0.0-1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947" + integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fclone@1.0.11, fclone@~1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640" + integrity sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw== + +file-uri-to-path@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" + integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +follow-redirects@^1.14.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +formidable@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff" + integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ== + dependencies: + dezalgo "1.0.3" + hexoid "1.0.0" + once "1.4.0" + qs "6.9.3" + +fresh@~0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +ftp@^0.3.10: + version "0.3.10" + resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" + integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ== + dependencies: + readable-stream "1.1.x" + xregexp "2.0.0" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +get-intrinsic@^1.0.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + +get-uri@3: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c" + integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg== + dependencies: + "@tootallnate/once" "1" + data-uri-to-buffer "3" + debug "4" + file-uri-to-path "2" + fs-extra "^8.1.0" + ftp "^0.3.10" + +git-node-fs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/git-node-fs/-/git-node-fs-1.0.0.tgz#49b215e242ebe43aa4c7561bbba499521752080f" + integrity sha512-bLQypt14llVXBg0S0u8q8HmU7g9p3ysH+NvVlae5vILuUvs759665HvmR5+wb04KjHyjFcDRxdYb4kyNnluMUQ== + +git-sha1@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/git-sha1/-/git-sha1-0.1.2.tgz#599ac192b71875825e13a445f3a6e05118c2f745" + integrity sha512-2e/nZezdVlyCopOCYHeW0onkbZg7xP1Ad6pndPy1rCygeRykefUS6r7oA5cJRGEFvseiaz5a/qUHFVX1dd6Isg== + +glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.0.5: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hexoid@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" + integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== + +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== + dependencies: + whatwg-encoding "^2.0.0" + +http-assert@^1.3.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" + integrity sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w== + dependencies: + deep-equal "~1.0.1" + http-errors "~1.8.0" + +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +http-errors@^1.6.3, http-errors@~1.8.0: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + +http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +https-proxy-agent@5, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +iconv-lite@0.4.24, iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +inflation@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/inflation/-/inflation-2.0.0.tgz#8b417e47c28f925a45133d914ca1fd389107f30f" + integrity sha512-m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@~2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +ip@^1.1.5: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" + integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-core-module@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== + dependencies: + has "^1.0.3" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-generator-function@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + +jquery@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" + integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== + +js-git@^0.7.8: + version "0.7.8" + resolved "https://registry.yarnpkg.com/js-git/-/js-git-0.7.8.tgz#52fa655ab61877d6f1079efc6534b554f31e5444" + integrity sha512-+E5ZH/HeRnoc/LW0AmAyhU+mNcWBzAKE+30+IDMLSLbbK+Tdt02AdkOKq9u15rlJsDEGFqtgckc8ZM59LhhiUA== + dependencies: + bodec "^0.1.0" + culvert "^0.1.2" + git-sha1 "^0.1.2" + pako "^0.2.5" + +jsdom@20.0.1: + version "20.0.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.1.tgz#d95b4a3b6e1eec6520aa01d9d908eade8c6ba153" + integrity sha512-pksjj7Rqoa+wdpkKcLzQRHhJCEE42qQhl/xLMUKHgoSejaKOdaXEAnqs6uDNwMl/fciHTzKeR8Wm8cw7N+g98A== + dependencies: + abab "^2.0.6" + acorn "^8.8.0" + acorn-globals "^7.0.0" + cssom "^0.5.0" + cssstyle "^2.3.0" + data-urls "^3.0.2" + decimal.js "^10.4.1" + domexception "^4.0.0" + escodegen "^2.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^3.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.9.0" + xml-name-validator "^4.0.0" + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== + optionalDependencies: + graceful-fs "^4.1.6" + +keygrip@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" + integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ== + dependencies: + tsscmp "1.0.6" + +koa-body@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-5.0.0.tgz#d310372bea09a24ccc450c76ca142ee55395dda6" + integrity sha512-nHwEODrQGiyKBILCWO8QSS40C87cKr2cp3y/Cw8u9Z8w5t0CdSkGm3+y9WK5BIAlPpo9tTw5RtSbxpVyG79vmw== + dependencies: + "@types/formidable" "^2.0.4" + co-body "^5.1.1" + formidable "^2.0.1" + +koa-compose@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" + integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw== + +koa-convert@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5" + integrity sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA== + dependencies: + co "^4.6.0" + koa-compose "^4.1.0" + +koa@2.13.4: + version "2.13.4" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e" + integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g== + dependencies: + accepts "^1.3.5" + cache-content-type "^1.0.0" + content-disposition "~0.5.2" + content-type "^1.0.4" + cookies "~0.8.0" + debug "^4.3.2" + delegates "^1.0.0" + depd "^2.0.0" + destroy "^1.0.4" + encodeurl "^1.0.2" + escape-html "^1.0.3" + fresh "~0.5.2" + http-assert "^1.3.0" + http-errors "^1.6.3" + is-generator-function "^1.0.7" + koa-compose "^4.1.0" + koa-convert "^2.0.0" + on-finished "^2.3.0" + only "~0.0.2" + parseurl "^1.3.2" + statuses "^1.5.0" + type-is "^1.6.16" + vary "^1.1.2" + +lazy@~1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690" + integrity sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA== + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lodash@^4.17.14: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-driver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" + integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +mkdirp@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +module-details-from-path@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b" + integrity sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +mute-stream@~0.0.4: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + +needle@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +netmask@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" + integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +nssocket@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa" + integrity sha512-a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w== + dependencies: + eventemitter2 "~0.4.14" + lazy "~1.0.11" + +nwsapi@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + +object-assign@^4: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-inspect@^1.9.0: + version "1.12.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== + +on-finished@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + +once@1.4.0, once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +only@~0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" + integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ== + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +pac-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e" + integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + get-uri "3" + http-proxy-agent "^4.0.1" + https-proxy-agent "5" + pac-resolver "^5.0.0" + raw-body "^2.2.0" + socks-proxy-agent "5" + +pac-resolver@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz#c91efa3a9af9f669104fa2f51102839d01cde8e7" + integrity sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q== + dependencies: + degenerator "^3.0.2" + ip "^1.1.5" + netmask "^2.0.2" + +pako@^0.2.5: + version "0.2.9" + resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA== + +parse5@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" + integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== + dependencies: + entities "^4.4.0" + +parseurl@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +picomatch@^2.0.4, picomatch@^2.2.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pidusage@^2.0.21: + version "2.0.21" + resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.21.tgz#7068967b3d952baea73e57668c98b9eaa876894e" + integrity sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA== + dependencies: + safe-buffer "^5.2.1" + +pidusage@~3.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.2.tgz#6faa5402b2530b3af2cf93d13bcf202889724a53" + integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w== + dependencies: + safe-buffer "^5.2.1" + +pm2-axon-rpc@~0.7.0, pm2-axon-rpc@~0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz#2daec5383a63135b3f18babb70266dacdcbc429a" + integrity sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw== + dependencies: + debug "^4.3.1" + +pm2-axon@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pm2-axon/-/pm2-axon-4.0.1.tgz#a7b4bb586e9aeb35b1042b488cde15b60cabafd2" + integrity sha512-kES/PeSLS8orT8dR5jMlNl+Yu4Ty3nbvZRmaAtROuVm9nYYGiaoXqqKQqQYzWQzMYWUKHMQTvBlirjE5GIIxqg== + dependencies: + amp "~0.3.1" + amp-message "~0.1.1" + debug "^4.3.1" + escape-string-regexp "^4.0.0" + +pm2-deploy@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pm2-deploy/-/pm2-deploy-1.0.2.tgz#98d8385553a3a4dca11c7b3116deb519bc5961a7" + integrity sha512-YJx6RXKrVrWaphEYf++EdOOx9EH18vM8RSZN/P1Y+NokTKqYAca/ejXwVLyiEpNju4HPZEk3Y2uZouwMqUlcgg== + dependencies: + run-series "^1.1.8" + tv4 "^1.3.0" + +pm2-multimeter@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz#1a1e55153d41a05534cea23cfe860abaa0eb4ace" + integrity sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA== + dependencies: + charm "~0.1.1" + +pm2-sysmonit@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz#eddea34a53fd8c8d7c3efb73b97a3c548686e24d" + integrity sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA== + dependencies: + async "^3.2.0" + debug "^4.3.1" + pidusage "^2.0.21" + systeminformation "^5.7" + tx2 "~1.0.4" + +pm2@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/pm2/-/pm2-5.2.0.tgz#fda71fab4b8fcfa5b7f546ca55a6e59e9ec5a68d" + integrity sha512-PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw== + dependencies: + "@pm2/agent" "~2.0.0" + "@pm2/io" "~5.0.0" + "@pm2/js-api" "~0.6.7" + "@pm2/pm2-version-check" latest + async "~3.2.0" + blessed "0.1.81" + chalk "3.0.0" + chokidar "^3.5.1" + cli-tableau "^2.0.0" + commander "2.15.1" + croner "~4.1.92" + dayjs "~1.8.25" + debug "^4.3.1" + enquirer "2.3.6" + eventemitter2 "5.0.1" + fclone "1.0.11" + mkdirp "1.0.4" + needle "2.4.0" + pidusage "~3.0" + pm2-axon "~4.0.1" + pm2-axon-rpc "~0.7.1" + pm2-deploy "~1.0.2" + pm2-multimeter "^0.1.2" + promptly "^2" + semver "^7.2" + source-map-support "0.5.19" + sprintf-js "1.1.2" + vizion "~2.2.1" + yamljs "0.3.0" + optionalDependencies: + pm2-sysmonit "^1.2.8" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + +promptly@^2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74" + integrity sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA== + dependencies: + read "^1.0.4" + +proxy-agent@~5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b" + integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g== + dependencies: + agent-base "^6.0.0" + debug "4" + http-proxy-agent "^4.0.0" + https-proxy-agent "^5.0.0" + lru-cache "^5.1.1" + pac-proxy-agent "^5.0.0" + proxy-from-env "^1.0.0" + socks-proxy-agent "^5.0.0" + +proxy-from-env@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +psl@^1.1.33: + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + +punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@6.9.3: + version "6.9.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e" + integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw== + +qs@^6.4.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +raw-body@^2.2.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" + integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== + dependencies: + mute-stream "~0.0.4" + +readable-stream@1.1.x: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +require-in-the-middle@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz#4b71e3cc7f59977100af9beb76bf2d056a5a6de2" + integrity sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg== + dependencies: + debug "^4.1.1" + module-details-from-path "^1.0.3" + resolve "^1.22.1" + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +run-series@^1.1.8: + version "1.1.9" + resolved "https://registry.yarnpkg.com/run-series/-/run-series-1.1.9.tgz#15ba9cb90e6a6c054e67c98e1dc063df0ecc113a" + integrity sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g== + +safe-buffer@5.2.1, safe-buffer@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sax@>=0.6.0, sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + +semver@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^5.3.0, semver@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^7.2: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + +semver@~7.2.0: + version "7.2.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.3.tgz#3641217233c6382173c76bf2c7ecd1e1c16b0d8a" + integrity sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +shimmer@^1.1.0, shimmer@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" + integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.3: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socket.io-adapter@~2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" + integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== + +socket.io-parser@~4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" + integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + +socket.io@4.5.3: + version "4.5.3" + resolved "https://registry.npmmirror.com/socket.io/-/socket.io-4.5.3.tgz#44dffea48d7f5aa41df4a66377c386b953bc521c" + integrity sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg== + dependencies: + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.2" + engine.io "~6.2.0" + socket.io-adapter "~2.4.0" + socket.io-parser "~4.2.0" + +socks-proxy-agent@5, socks-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e" + integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ== + dependencies: + agent-base "^6.0.2" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + +source-map-support@0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +sprintf-js@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.5.0 < 2", statuses@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +systeminformation@^5.7: + version "5.12.10" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.10.tgz#05b70c2e1c41209b88bc670b81e5cbd2ea8c9bd3" + integrity sha512-rLShZFpz14aWqg3nNCS8zw74WicRV6c3R17Ob7oO37zSypZATT4M2Dgjr4nE6PYGlome9ObU0A2uqXiAlaBbuA== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== + dependencies: + punycode "^2.1.1" + +tslib@1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" + integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== + +tslib@^2.0.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + +tsscmp@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" + integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA== + +tv4@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963" + integrity sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw== + +tx2@~1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tx2/-/tx2-1.0.5.tgz#ee0b0e5e2c351f8d23e54bdf46dd60afa3bbc73d" + integrity sha512-sJ24w0y03Md/bxzK4FU8J8JveYYUbSs2FViLJ2D/8bytSiyPRbuE3DyL/9UKYXTZlV3yXq0L8GLlhobTnekCVg== + dependencies: + json-stringify-safe "^5.0.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== + dependencies: + prelude-ls "~1.1.2" + +type-is@^1.6.14, type-is@^1.6.16: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + +unpipe@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +uuid@^3.2.1: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +vary@^1, vary@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +vizion@~2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/vizion/-/vizion-2.2.1.tgz#04201ea45ffd145d5b5210e385a8f35170387fb2" + integrity sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww== + dependencies: + async "^2.6.3" + git-node-fs "^1.0.0" + ini "^1.3.5" + js-git "^0.7.8" + +vm2@^3.9.8: + version "3.9.11" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + +w3c-xmlserializer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923" + integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg== + dependencies: + xml-name-validator "^4.0.0" + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +ws@^7.0.0: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + +ws@^8.9.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" + integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== + +ws@~7.4.0: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + +ws@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xml2js@0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +xregexp@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" + integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yamljs@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b" + integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ== + dependencies: + argparse "^1.0.7" + glob "^7.0.5" + +ylru@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" + integrity sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA== diff --git a/yarn.lock b/yarn.lock index 0c78c68a2..1f2279dfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1910,6 +1910,11 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@micro-zoe/micro-app@1.0.0-alpha.9": + version "1.0.0-alpha.9" + resolved "https://registry.npmmirror.com/@micro-zoe/micro-app/-/micro-app-1.0.0-alpha.9.tgz#e6dbe7130fa2091fa9c88e370da33f093807622f" + integrity sha512-/wIzf3jVzDVeg6eb0f2Fj08Mp2OKwucfHldJaUSb/KeC1LdA1yKNEAqXAfUDzmcQ7RAPrGuM5fGZNJSlj3nPSQ== + "@ngtools/webpack@14.0.3": version "14.0.3" resolved "https://registry.npmmirror.com/@ngtools/webpack/-/webpack-14.0.3.tgz#799ba4eb28c0f8cca16fd7c9f774bd33240e0ca2" @@ -3207,7 +3212,7 @@ async-limiter@~1.0.0: resolved "https://registry.npmmirror.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@^2.6.2: +async@^2.6.2, async@^2.6.4: version "2.6.4" resolved "https://registry.npmmirror.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== @@ -3365,6 +3370,13 @@ base64id@2.0.0, base64id@~2.0.0: resolved "https://registry.npmmirror.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== +basic-auth@^2.0.1: + version "2.0.1" + resolved "https://registry.npmmirror.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + batch@0.6.1: version "0.6.1" resolved "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" @@ -3913,7 +3925,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4595,6 +4607,11 @@ cors@2.8.5, cors@~2.8.5: object-assign "^4" vary "^1" +corser@^2.0.1: + version "2.0.1" + resolved "https://registry.npmmirror.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87" + integrity sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ== + cosmiconfig@^7.0.0: version "7.0.1" resolved "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" @@ -7096,6 +7113,11 @@ hdr-histogram-percentiles-obj@^3.0.0: resolved "https://registry.npmmirror.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c" integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw== +he@^1.2.0: + version "1.2.0" + resolved "https://registry.npmmirror.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -7141,6 +7163,13 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.npmmirror.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== + dependencies: + whatwg-encoding "^2.0.0" + html-entities@^2.3.2: version "2.3.3" resolved "https://registry.npmmirror.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" @@ -7238,6 +7267,25 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" +http-server@14.1.1: + version "14.1.1" + resolved "https://registry.npmmirror.com/http-server/-/http-server-14.1.1.tgz#d60fbb37d7c2fdff0f0fbff0d0ee6670bd285e2e" + integrity sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A== + dependencies: + basic-auth "^2.0.1" + chalk "^4.1.2" + corser "^2.0.1" + he "^1.2.0" + html-encoding-sniffer "^3.0.0" + http-proxy "^1.18.1" + mime "^1.6.0" + minimist "^1.2.6" + opener "^1.5.1" + portfinder "^1.0.28" + secure-compare "3.0.1" + union "~0.5.0" + url-join "^4.0.1" + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -7295,7 +7343,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2, iconv-lite@^0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -8913,7 +8961,7 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, dependencies: mime-db "1.52.0" -mime@1.6.0, mime@^1.4.1: +mime@1.6.0, mime@^1.4.1, mime@^1.6.0: version "1.6.0" resolved "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -9125,7 +9173,7 @@ mississippi@^3.0.0: stream-each "^1.1.0" through2 "^2.0.0" -mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.0: +mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.0: version "0.5.6" resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -9918,7 +9966,7 @@ open@8.4.0, open@^8.0.9, open@^8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" -opener@^1.5.2: +opener@^1.5.1, opener@^1.5.2: version "1.5.2" resolved "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== @@ -10425,6 +10473,15 @@ portfinder@1.0.28: debug "^3.1.1" mkdirp "^0.5.5" +portfinder@^1.0.28: + version "1.0.32" + resolved "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" + integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg== + dependencies: + async "^2.6.4" + debug "^3.2.7" + mkdirp "^0.5.6" + postcss-attribute-case-insensitive@^5.0.0, postcss-attribute-case-insensitive@^5.0.1: version "5.0.2" resolved "https://registry.npmmirror.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741" @@ -11011,7 +11068,7 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@6.11.0: +qs@6.11.0, qs@^6.4.0: version "6.11.0" resolved "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== @@ -11718,6 +11775,11 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.0.0" +secure-compare@3.0.1: + version "3.0.1" + resolved "https://registry.npmmirror.com/secure-compare/-/secure-compare-3.0.1.tgz#f1a0329b308b221fae37b9974f3d578d0ca999e3" + integrity sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw== + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -13060,6 +13122,13 @@ unicode-property-aliases-ecmascript@^2.0.0: resolved "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== +union@~0.5.0: + version "0.5.0" + resolved "https://registry.npmmirror.com/union/-/union-0.5.0.tgz#b2c11be84f60538537b846edb9ba266ba0090075" + integrity sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA== + dependencies: + qs "^6.4.0" + unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -13159,6 +13228,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.npmmirror.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.npmmirror.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" @@ -13532,6 +13606,13 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: dependencies: iconv-lite "0.4.24" +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.npmmirror.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: version "2.3.0" resolved "https://registry.npmmirror.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"