ddm-plugin-dubbo-support 0.0.5 → 0.0.6

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;
@@ -88,16 +88,16 @@ class TelnetInvoker {
       });
       tSocket.write(_common_TelnetUtils_js__WEBPACK_IMPORTED_MODULE_5__["default"].buildInvokeCommand({
         serviceName,
-        method: methodInfo.name,
+        method: methodInfo.methodName,
         params
       }));
     });
   }
 
-  /**
-   * 解析响应信息
-   * @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.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","publish":"webpack && npm publish"},"keywords":["Dubbo-Desktop-Manager","ddm-plugin","ddm","dubbo","dubbo service invoke","dubbo manager","dubbo console","dubbo admin"],"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":">=2.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"ddm-plugin-dubbo-support","version":"0.0.6","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,
@@ -4607,7 +4607,7 @@ class JavaInvoker {
       protocol: provder.protocol,
       address: `${ip}:${port}`,
       version: provder.version,
-      method: methodInfo.name,
+      method: methodInfo.methodName,
       argsList: this.getMethodParameterTypes(methodInfo),
       dataList: dataList
     };
@@ -4781,6 +4781,8 @@ class ZookeeperDataSource {
         metadata.methods.forEach(method => {
           methodList.push({
             ...method,
+            name: `${method.name}(${method.parameterTypes.map(pp => pp.substring(pp.lastIndexOf(".") + 1))})`,
+            methodName: method.name,
             defaultParameter: JSON.stringify(_main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_5__["default"].generateParam(metadata, method.name), null, 2) || "[]"
           });
         });
@@ -4864,7 +4866,7 @@ class ZookeeperDataSource {
       weight: urlData.params.weight,
       deprecated: urlData.params.deprecated,
       protocol: urlData.protocol,
-      methods: urlData.params.methods.split(","),
+      methods: Array.from(new Set((urlData.params.methods || "").split(",").filter(Boolean))),
       generic: urlData.params.generic,
       providerVersion: urlData.params.revision,
       dubboVersion: urlData.params.release,
@@ -27032,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) {
@@ -27072,8 +27074,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class ParamGeneratorAdapter {
-  /**
-   * 生成参数
+  /**
+   * 生成参数
    */
   generateParam(mateData, methodName) {
     // 当前提供者使用的dubbo版本
@@ -27098,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);
@@ -48657,13 +48659,13 @@ __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);
@@ -48842,13 +48844,15 @@ 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 || ""
+      groupName: dataSourceInfo.groupName || "",
+      accessToken: this.getAccessToken(dataSourceInfo)
     };
     // `http://127.0.0.1:8848/nacos/v1/ns/service/list?pageNo=1&pageSize=20`
     const url = `${dataSourceInfo.address}/nacos/v1/ns/service/list`;
@@ -48894,7 +48898,8 @@ class NacosDataSource {
     const params = {
       serviceName: serviceInfo.uniqueServiceName,
       namespaceId: dataSourceInfo.namespaceId || "",
-      groupName: dataSourceInfo.groupName || ""
+      groupName: dataSourceInfo.groupName || "",
+      accessToken: this.getAccessToken(dataSourceInfo)
     };
     const response = await this.appCore.axios.get(url, {
       params
@@ -48917,6 +48922,8 @@ class NacosDataSource {
         metadata.methods.forEach(method => {
           methodList.push({
             ...method,
+            name: `${method.name}(${method.parameterTypes.map(pp => pp.substring(pp.lastIndexOf(".") + 1))})`,
+            methodName: method.name,
             defaultParameter: JSON.stringify(_main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_4__["default"].generateParam(metadata, method.name), null, 2) || "[]"
           });
         });
@@ -48941,7 +48948,8 @@ class NacosDataSource {
     let params = {
       serviceName: serviceInfo.uniqueServiceName,
       namespaceId: dataSourceInfo.namespaceId || "",
-      groupName: dataSourceInfo.groupName || ""
+      groupName: dataSourceInfo.groupName || "",
+      accessToken: this.getAccessToken(dataSourceInfo)
     };
     let response = await this.appCore.axios.get(url, {
       params
@@ -48985,7 +48993,8 @@ class NacosDataSource {
       dataId: this.buildDataId(providerInfo),
       group: dataSourceInfo.group || 'dubbo',
       namespaceId: dataSourceInfo.namespaceId || "",
-      tenant: dataSourceInfo.namespaceId || ""
+      tenant: dataSourceInfo.namespaceId || "",
+      accessToken: this.getAccessToken(dataSourceInfo)
     };
 
     // 有配置项，保存，反之删除
@@ -49009,7 +49018,8 @@ class NacosDataSource {
       group: dataSourceInfo.group || 'dubbo',
       namespaceId: dataSourceInfo.namespaceId || "",
       tenant: dataSourceInfo.namespaceId || "",
-      show: 'all'
+      show: 'all',
+      accessToken: this.getAccessToken(dataSourceInfo)
     };
     const response = await this.appCore.axios.get(url, {
       params
@@ -49019,6 +49029,22 @@ class NacosDataSource {
     }
     return null;
   }
+  async getAccessToken(dataSourceInfo) {
+    if (!dataSourceInfo.username) {
+      return null;
+    }
+
+    // http://127.0.0.1:8848/nacos/v1/auth/login
+    let url = `${dataSourceInfo.address}/nacos/v1/auth/login`;
+    let params = {
+      username: dataSourceInfo.username,
+      password: dataSourceInfo.password
+    };
+
+    // 调用登录接口
+    const response = await this.appCore.axios.post(url, qs__WEBPACK_IMPORTED_MODULE_5___default().stringify(params));
+    return response.data.accessToken;
+  }
   buildMataDataPath(providerInfo) {
     let {
       application,
@@ -49052,7 +49078,7 @@ class NacosDataSource {
       weight: data.weight,
       disabled: !data.enabled,
       generic: metadata.generic,
-      methods: metadata.methods.split(","),
+      methods: Array.from(new Set((metadata.methods || "").split(",").filter(Boolean))),
       // 2.7x就是dubbo端口，3.0之后是指定的端口
       protocol: metadata.protocol,
       qosPort: data.qosPort || data.port
@@ -51707,6 +51733,8 @@ class DubboAdminDataSource {
         data.metadata.methods.forEach(method => {
           methodList.push({
             ...method,
+            name: `${method.name}(${method.parameterTypes.map(pp => pp.substring(pp.lastIndexOf(".") + 1))})`,
+            methodName: method.name,
             defaultParameter: JSON.stringify(_main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_4__["default"].generateParam(data.metadata, method.name), null, 2) || "[]"
           });
         });
@@ -51805,7 +51833,7 @@ class DubboAdminDataSource {
     const startTime = new Date().getTime();
     const data = {
       service: serviceInfo.uniqueServiceName,
-      method: methodInfo.name,
+      method: methodInfo.methodName,
       parameterTypes: this.getMethodParameterTypes(methodInfo),
       params: JSON.parse(code)
     };
@@ -51850,7 +51878,7 @@ class DubboAdminDataSource {
       group: "",
       providerVersion: urlData.params.revision,
       dubboVersion: urlData.params.release,
-      methods: urlData.params.methods.split(","),
+      methods: Array.from(new Set((urlData.params.methods || "").split(",").filter(Boolean))),
       protocol: urlData.protocol,
       generic: urlData.params.generic,
       deprecated: urlData.params.deprecated,