ddm-plugin-dubbo-support 0.1.4 → 0.1.5

package/dist/index.js

@@ -29,12 +29,12 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class TelnetInvoker {
-  /**
-   * 调用Dubbo接口
-   * @param {Provider} provder 提供者信息
-   * @param {*} methodInfo 方法名
-   * @param {*} code 参数信息
-   * @returns 
+  /**
+   * 调用Dubbo接口
+   * @param {Provider} provder 提供者信息
+   * @param {*} methodInfo 方法名
+   * @param {*} code 参数信息
+   * @returns 
    */
   invokeMethod(provder, methodInfo, code) {
     const telnetPort = provder.qosPort || provder.port;
@@ -94,10 +94,10 @@ class TelnetInvoker {
     });
   }
 
-  /**
-   * 解析响应信息
-   * @param {String} result 
-   * @returns 
+  /**
+   * 解析响应信息
+   * @param {String} result 
+   * @returns 
    */
   resolveResponse(result) {
     // dubbo返回格式分为三部分，第一部分为
@@ -661,7 +661,7 @@ class AppProxy {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"ddm-plugin-dubbo-support","version":"0.1.4","description":"Dubbo-Desktop-Manager插件-支持Dubbo框架","main":"dist/index.js","rendererMain":"dist/renderer.js","i18nMain":"dist/i18n.js","files":["README.md","logo.png","public/**","dist/**","docs/**","java-invoke/**"],"scripts":{"dev":"webpack","gen:keywords":"node ./scripts/gen-keywords.js","prepublishOnly":"npm run gen:keywords","publish":"webpack && npm publish"},"keywords":["Dubbo-Desktop-Manager","ddm-plugin","ddm","dubbo","dubbo service invoke","dubbo manager","dubbo console","dubbo admin","-","-s","-su","-sup","-supp","-suppo","-suppor","-support","b","bb","bbo","bbo-","bbo-s","bbo-su","bbo-sup","bbo-supp","bbo-suppo","bbo-suppor","bbo-support","bo","bo-","bo-s","bo-su","bo-sup","bo-supp","bo-suppo","bo-suppor","bo-support","d","du","dub","dubb","dubbo-","dubbo-s","dubbo-su","dubbo-sup","dubbo-supp","dubbo-suppo","dubbo-suppor","dubbo-support","o","o-","o-s","o-su","o-sup","o-supp","o-suppo","o-suppor","o-support","or","ort","p","po","por","port","pp","ppo","ppor","pport","r","rt","s","su","sup","supp","suppo","suppor","support","t","u","ub","ubb","ubbo","ubbo-","ubbo-s","ubbo-su","ubbo-sup","ubbo-supp","ubbo-suppo","ubbo-suppor","ubbo-support","up","upp","uppo","uppor","upport"],"homepage":"https://github.com/ddm-plugin/ddm-plugin-dubbo-support","author":"qiaolin","license":"Apache 2.0","devDependencies":{"@babel/core":"^7.24.7","babel-cli":"^6.26.0","babel-loader":"^8.2.5","css-loader":"^6.11.0","js-yaml":"^4.1.0","json-bigint":"^1.0.0","moment":"^2.29.1","node-zookeeper-client":"^1.1.1","qs":"^6.11.0","style-loader":"^3.3.4","telnet-stream":"^1.0.5","urijs":"^1.19.11","vue":"^2.6.11","vue-loader":"15.11.1","vue-style-loader":"^4.1.3","vue-template-compiler":"^2.6.11","webpack":"^5.92.1","webpack-cli":"^5.1.4"},"engines":{"ddm":">=1.1.0 <3.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"ddm-plugin-dubbo-support","version":"0.0.5","description":"Dubbo-Desktop-Manager插件-支持Dubbo框架","main":"dist/index.js","rendererMain":"dist/renderer.js","i18nMain":"dist/i18n.js","files":["README.md","logo.png","public/**","dist/**","docs/**","java-invoke/**"],"scripts":{"dev":"webpack","gen:keywords":"node ./scripts/gen-keywords.js","prepublishOnly":"npm run gen:keywords","publish":"webpack && npm publish"},"keywords":["Dubbo-Desktop-Manager","ddm-plugin","ddm","dubbo","dubbo service invoke","dubbo manager","dubbo console","dubbo admin","-","-s","-su","-sup","-supp","-suppo","-suppor","-support","b","bb","bbo","bbo-","bbo-s","bbo-su","bbo-sup","bbo-supp","bbo-suppo","bbo-suppor","bbo-support","bo","bo-","bo-s","bo-su","bo-sup","bo-supp","bo-suppo","bo-suppor","bo-support","d","du","dub","dubb","dubbo-","dubbo-s","dubbo-su","dubbo-sup","dubbo-supp","dubbo-suppo","dubbo-suppor","dubbo-support","o","o-","o-s","o-su","o-sup","o-supp","o-suppo","o-suppor","o-support","or","ort","p","po","por","port","pp","ppo","ppor","pport","r","rt","s","su","sup","supp","suppo","suppor","support","t","u","ub","ubb","ubbo","ubbo-","ubbo-s","ubbo-su","ubbo-sup","ubbo-supp","ubbo-suppo","ubbo-suppor","ubbo-support","up","upp","uppo","uppor","upport"],"homepage":"https://github.com/ddm-plugin/ddm-plugin-dubbo-support","author":"qiaolin","license":"Apache 2.0","devDependencies":{"@babel/core":"^7.24.7","babel-cli":"^6.26.0","babel-loader":"^8.2.5","css-loader":"^6.11.0","js-yaml":"^4.1.0","json-bigint":"^1.0.0","moment":"^2.29.1","node-zookeeper-client":"^1.1.1","qs":"^6.11.0","style-loader":"^3.3.4","telnet-stream":"^1.0.5","urijs":"^1.19.11","vue":"^2.6.11","vue-loader":"15.11.1","vue-style-loader":"^4.1.3","vue-template-compiler":"^2.6.11","webpack":"^5.92.1","webpack-cli":"^5.1.4"},"engines":{"ddm":">=1.1.0 <3.0.0"}}');
 
 /***/ }),
 /* 16 */
@@ -4505,10 +4505,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/**
- * 执行结果
- * @param {String}} data 响应的数据
- * @param {*} elapsedTime 耗时
+/**
+ * 执行结果
+ * @param {String}} data 响应的数据
+ * @param {*} elapsedTime 耗时
  */
 class InvokeResult {
   constructor(data, elapsedTime) {
@@ -4529,8 +4529,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/** 
- * 构建invoke命令 
+/** 
+ * 构建invoke命令 
  */
 function buildInvokeCommand({
   serviceName,
@@ -4743,12 +4743,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const PRIVDER_PREFIX = "/dubbo";
-
-/**
- * Zookeeper 数据源操作类，提供 Dubbo 服务的注册、查询、配置等功能。
- * @typedef {import('@/main/@types/DataSource').DataSource} DataSource
- * @implements {DataSource}
- */
 class ZookeeperDataSource {
   constructor(app, invoker) {
     this.invoker = invoker;
@@ -4796,7 +4790,6 @@ class ZookeeperDataSource {
         providerInfo.methods.forEach(method => {
           methodList.push({
             name: method,
-            methodName: method,
             parameterTypes: [],
             defaultParameter: "[]",
             returnType: null
@@ -27041,10 +27034,10 @@ class DubboConfigurationUtils {
     return doc;
   }
 
-  /**
-   * 获取被禁用的提供者地址列表
-   * @param {string} serviceName 
-   * @param {string[]} versions 多个版本
+  /**
+   * 获取被禁用的提供者地址列表
+   * @param {string} serviceName 
+   * @param {string[]} versions 多个版本
    */
   async getDisableAddresses(doc) {
     if (!doc || !doc.configs) {
@@ -27081,8 +27074,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class ParamGeneratorAdapter {
-  /**
-   * 生成参数
+  /**
+   * 生成参数
    */
   generateParam(mateData, methodName) {
     // 当前提供者使用的dubbo版本
@@ -27107,12 +27100,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ValueGenerator_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221);
 
 
-/**
- * Dubbo2.7+版本 参数生成器
+/**
+ * Dubbo2.7+版本 参数生成器
  */
 class ParamGeneratorDubbo2_7 {
-  /**
-   * 生成参数
+  /**
+   * 生成参数
    */
   generateParam(mateData, methodName) {
     const method = this.findMethodInfo(mateData, methodName);
@@ -27202,11 +27195,7 @@ class ParamGeneratorDubbo2_7 {
     }
     let data = {};
     for (let property in td.properties) {
-      let value = td.properties[property];
-      if (value.$ref && !value.type) {
-        value = this.resolveRef(types, value.$ref);
-      }
-      data[property] = this.generateObject(types, value.type);
+      data[property] = this.generateObject(types, td.properties[property].type);
     }
     return data;
   }
@@ -27256,15 +27245,6 @@ class ParamGeneratorDubbo2_7 {
     }
     return null;
   }
-  resolveRef(obj, path) {
-    // 解析像 "$.types[3].properties.code" 这种路径
-    const parts = path.replace(/^\$\.types/, '').split(/[\.\[\]]/).filter(Boolean);
-    let result = obj;
-    for (const p of parts) {
-      result = result[p];
-    }
-    return result;
-  }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (new ParamGeneratorDubbo2_7());
 
@@ -48679,24 +48659,24 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ValueGenerator_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221);
 
 
-/**
- * Dubbo3+版本 参数生成器
+/**
+ * Dubbo3+版本 参数生成器
  */
 
 class ParamGeneratorDubbo3 {
-  /**
-   * 生成参数
+  /**
+   * 生成参数
    */
   generateParam(mateData, methodName) {
     let method = mateData.methods.find(m => methodName == m.name);
 
     // 未找到方法
     if (!method) {
-      return [];
+      return null;
     }
     const typeMap = this.typeListToTypeMap(mateData.types);
     return method.parameterTypes.map(parameterType => {
-      return this.generateObject(typeMap, [], typeMap[parameterType]);
+      return this.generateObject(typeMap, typeMap[parameterType]);
     });
   }
   typeListToTypeMap(types) {
@@ -48709,53 +48689,57 @@ class ParamGeneratorDubbo3 {
     });
     return typeMap;
   }
-  generateObject(typeMap, parentTypes, typeInfo) {
+  generateObject(typeMap, typeInfo) {
     // Map 类型
     if (this.isMap(typeMap, typeInfo)) {
-      return this.generateMapType(typeMap, parentTypes, typeInfo);
+      return this.generateMapType(typeMap, typeInfo);
     }
 
     // 数组
     if (this.isArray(typeMap, typeInfo)) {
-      return this.generateArrayType(typeMap, parentTypes, typeInfo);
+      return this.generateArrayType(typeMap, typeInfo);
     }
 
     // 集合
     if (this.isCollection(typeMap, typeInfo)) {
-      return this.generateCollectionType(typeMap, parentTypes, typeInfo);
+      return this.generateCollectionType(typeMap, typeInfo);
     }
 
     // 对象类型
     if (this.isComplexType(typeMap, typeInfo)) {
-      return this.generateComplexType(typeMap, parentTypes, typeInfo);
+      return this.generateComplexType(typeMap, typeInfo);
     }
 
     // 基本类型
     return _ValueGenerator_js__WEBPACK_IMPORTED_MODULE_0__["default"].generate("", typeInfo.type);
   }
-  generateMapType(typeMap, parentTypes, typeInfo) {
+  generateMapType(typeMap, typeInfo) {
     const {
       type
     } = typeInfo;
     let keyStartOffset = type.indexOf("<");
-    let commaOffset = type.indexOf(",");
-    let valueEndOffset = type.lastIndexOf(">");
+    let keyEndOffset = type.indexOf(",");
 
     // 没有泛型
-    if (keyStartOffset < 0 || commaOffset < 0 || valueEndOffset < 0) {
+    if (keyStartOffset < 0 || keyEndOffset < 0) {
+      return {};
+    }
+    let valueStartOffset = type.indexOf(",");
+    let valueEndOffset = type.indexOf(">");
+    if (valueStartOffset < 0 || valueEndOffset < 0) {
       return {};
     }
 
     // 解析key与value
-    let keyType = type.substring(keyStartOffset + 1, commaOffset);
-    let valueType = type.substring(commaOffset + 1, valueEndOffset);
+    let keyType = type.substring(keyStartOffset + 1, keyEndOffset);
+    let valueType = type.substring(valueStartOffset + 1, valueEndOffset);
 
     // 可能会有Map的key里面放对象，但这也没有办法了...
     let data = {};
-    data[keyType] = this.generateObject(typeMap, parentTypes, typeMap[valueType]);
+    data[keyType] = this.generateObject(typeMap, typeMap[valueType]);
     return data;
   }
-  generateCollectionType(typeMap, parentTypes, typeInfo) {
+  generateCollectionType(typeMap, typeInfo) {
     const {
       type
     } = typeInfo;
@@ -48767,34 +48751,30 @@ class ParamGeneratorDubbo3 {
     }
 
     // 子类型
-    const subTypeInfo = typeMap[type.substring(startOffset + 1, type.lastIndexOf(">"))];
+    const subTypeInfo = typeMap[type.substring(startOffset + 1, type.indexOf(">"))];
 
     // 子类型有可能不存在
     if (!subTypeInfo) {
       return [];
     }
-    return [this.generateObject(typeMap, parentTypes, subTypeInfo)];
+    return [this.generateObject(typeMap, subTypeInfo)];
   }
-  generateArrayType(typeMap, parentTypes, typeInfo) {
+  generateArrayType(typeMap, typeInfo) {
     const {
       type
     } = typeInfo;
     let offset = type.indexOf("[]");
     let realType = type.substring(0, offset);
-    return [this.generateObject(typeMap, parentTypes, typeMap[realType])];
+    return [this.generateObject(typeMap, typeMap[realType])];
   }
-  generateComplexType(typeMap, parentTypes, typeInfo) {
-    // 以下情况直接返回空对象
-    // 1. 没有属性了
-    // 2. 出现循环引用了
-    if (typeInfo.properties == null || typeInfo.properties.length == 0 || parentTypes.includes(typeInfo.type)) {
+  generateComplexType(typeMap, typeInfo) {
+    if (typeInfo.properties == null || typeInfo.properties.length == 0) {
       return {};
     }
-    parentTypes = [...parentTypes, typeInfo.type];
     let data = {};
     for (let property in typeInfo.properties) {
       const type = typeInfo.properties[property];
-      data[property] = this.generateObject(typeMap, parentTypes, typeMap[type]);
+      data[property] = this.generateObject(typeMap, typeMap[type]);
     }
     return data;
   }
@@ -48860,25 +48840,17 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-/**
- * Nacos 数据源操作类，提供 Dubbo 服务的注册、查询、配置等功能。
- * @typedef {import('@/main/@types/DataSource').DataSource} DataSource
- * @implements {DataSource}
- */
 class NacosDataSource {
   constructor(appCore, invoker) {
     this.appCore = appCore;
     this.invoker = invoker;
-    this.tokenCache = new Map();
   }
   async getServiceList(dataSourceInfo) {
     const params = {
       pageNo: 1,
       pageSize: 100,
       namespaceId: dataSourceInfo.namespaceId || "",
-      groupName: dataSourceInfo.groupName || "",
-      accessToken: await this.getAccessToken(dataSourceInfo)
+      groupName: dataSourceInfo.groupName || ""
     };
     // `http://127.0.0.1:8848/nacos/v1/ns/service/list?pageNo=1&pageSize=20`
     const url = `${dataSourceInfo.address}/nacos/v1/ns/service/list`;
@@ -48924,8 +48896,7 @@ class NacosDataSource {
     const params = {
       serviceName: serviceInfo.uniqueServiceName,
       namespaceId: dataSourceInfo.namespaceId || "",
-      groupName: dataSourceInfo.groupName || "",
-      accessToken: await this.getAccessToken(dataSourceInfo)
+      groupName: dataSourceInfo.groupName || ""
     };
     const response = await this.appCore.axios.get(url, {
       params
@@ -48957,7 +48928,6 @@ class NacosDataSource {
         providerInfo.methods.forEach(method => {
           methodList.push({
             name: method,
-            methodName: method,
             parameterTypes: null,
             defaultParameter: "[]",
             returnType: null
@@ -48975,8 +48945,7 @@ class NacosDataSource {
     let params = {
       serviceName: serviceInfo.uniqueServiceName,
       namespaceId: dataSourceInfo.namespaceId || "",
-      groupName: dataSourceInfo.groupName || "",
-      accessToken: await this.getAccessToken(dataSourceInfo)
+      groupName: dataSourceInfo.groupName || ""
     };
     let response = await this.appCore.axios.get(url, {
       params
@@ -49020,8 +48989,7 @@ class NacosDataSource {
       dataId: this.buildDataId(providerInfo),
       group: dataSourceInfo.group || 'dubbo',
       namespaceId: dataSourceInfo.namespaceId || "",
-      tenant: dataSourceInfo.namespaceId || "",
-      accessToken: await this.getAccessToken(dataSourceInfo)
+      tenant: dataSourceInfo.namespaceId || ""
     };
 
     // 有配置项，保存，反之删除
@@ -49045,8 +49013,7 @@ class NacosDataSource {
       group: dataSourceInfo.group || 'dubbo',
       namespaceId: dataSourceInfo.namespaceId || "",
       tenant: dataSourceInfo.namespaceId || "",
-      show: 'all',
-      accessToken: await this.getAccessToken(dataSourceInfo)
+      show: 'all'
     };
     const response = await this.appCore.axios.get(url, {
       params
@@ -49056,22 +49023,6 @@ class NacosDataSource {
     }
     return null;
   }
-  async getAccessToken(dataSourceInfo) {
-    if (!dataSourceInfo.username) {
-      return null;
-    }
-    let params = {
-      username: dataSourceInfo.username,
-      password: dataSourceInfo.password
-    };
-
-    // http://127.0.0.1:8848/nacos/v1/auth/login?username=${username}&password=${password}
-    let url = `${dataSourceInfo.address}/nacos/v1/auth/login?${qs__WEBPACK_IMPORTED_MODULE_5___default().stringify(params)}`;
-
-    // 调用登录接口
-    const response = await this.appCore.axios.post(url);
-    return response.data.accessToken;
-  }
   buildMataDataPath(providerInfo) {
     let {
       application,
@@ -51714,12 +51665,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-/**
- * Dubbo Admin 数据源操作类，提供 Dubbo 服务的注册、查询、配置等功能。
- * @typedef {import('@/main/@types/DataSource').DataSource} DataSource
- * @implements {DataSource}
- */
 class DubboAdminDataSource {
   constructor(appCore) {
     this.appCore = appCore;
@@ -51775,7 +51720,6 @@ class DubboAdminDataSource {
         providerInfo.methods.forEach(method => {
           methodList.push({
             name: method,
-            methodName: method,
             parameterTypes: null,
             defaultParameter: "[]",
             returnType: null
@@ -51789,9 +51733,6 @@ class DubboAdminDataSource {
   }
   async getConsumerList(dataSourceInfo, serviceInfo) {
     const data = await this.getServiceData(dataSourceInfo, serviceInfo);
-    if (!data || !data.consumers) {
-      return [];
-    }
     let array = new Array();
     for (let i = 0; i < data.consumers.length; i++) {
       array.push(this.parseConsumerInfo(data.consumers[i]));
@@ -51806,9 +51747,6 @@ class DubboAdminDataSource {
         'Authorization': await this.getToken(dataSourceInfo)
       }
     });
-    if (!response.data || !response.data.application) {
-      throw new Error(this.appCore.pluginT('dubbo.dubboAdmin.errorGetServiceData'));
-    }
     return response.data;
   }
   async disableProvider(dataSourceInfo, serviceInfo, providerInfo) {
@@ -52074,10 +52012,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-/**
- * @param {import('@/main/@types/AppPlugin').AppPlugin} app
- */
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app => {
   Map.prototype.computeIfAbsent = async function (key, fun) {
     if (!this.has(key)) {