ddm-plugin-dubbo-support 0.3.0 → 0.3.1

package/dist/index.js

@@ -49693,7 +49693,7 @@ class NacosDataSource {
    */
   async getInterfaceServiceList(dataSourceInfo) {
     const serviceNameList = await _main_datasource_nacos_NacosUtils__WEBPACK_IMPORTED_MODULE_4__["default"].getNacosServiceList(dataSourceInfo);
-    const serviceList = new Map();
+    const serviceList = new Set();
     for (const serviceName of serviceNameList) {
       // doms的每个元素： "providers:org.apache.dubbo.demo.DemoService:1.0.0:${分组}",
       const datas = serviceName.split(":");
@@ -49702,17 +49702,11 @@ class NacosDataSource {
       if (datas[0] !== "providers") {
         continue;
       }
-      let serviceInfo = serviceList.get(datas[1]);
-      if (!serviceInfo) {
-        serviceInfo = {
-          serviceName: datas[1],
-          providers: []
-        };
-        serviceList.set(datas[1], serviceInfo);
-      }
-      serviceInfo.providers.push(serviceName);
+      serviceList.add(datas[1]);
     }
-    return serviceList;
+    return Array.from(serviceList).map(serviceName => {
+      serviceName;
+    });
   }
 
   /**
@@ -52951,23 +52945,17 @@ class Nacos3DataSource {
   }
   async getInterfaceServiceList(dataSourceInfo) {
     const serviceNameList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getNacosServiceList(dataSourceInfo);
-    const serviceList = new Map();
+    const serviceList = new Set();
     for (const serviceName of serviceNameList) {
       const datas = serviceName.split(":");
       if (datas[0] !== "providers") {
         continue;
       }
-      let serviceInfo = serviceList.get(datas[1]);
-      if (!serviceInfo) {
-        serviceInfo = {
-          serviceName: datas[1],
-          providers: []
-        };
-        serviceList.set(datas[1], serviceInfo);
-      }
-      serviceInfo.providers.push(serviceName);
+      serviceList.add(datas[1]);
     }
-    return Array.from(serviceList.values());
+    return Array.from(serviceList).map(serviceName => {
+      serviceName;
+    });
   }
   mergeServiceList(interfaceServiceList, applicationServiceList) {
     const applicationServiceNameSet = new Set(applicationServiceList.map(item => item.serviceName));
@@ -53093,7 +53081,7 @@ class Nacos3DataSource {
     await this.doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, doc);
   }
   async getConfiguration(dataSourceInfo, serviceInfo, providerInfo) {
-    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getConfig(dataSourceInfo, this.buildDataId(providerInfo));
+    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getConfig(dataSourceInfo, this.buildDataId(providerInfo), dataSourceInfo.group || 'dubbo');
     return config ? config : _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].JSONToYaml(_main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].createDubboDefaultConfiguration());
   }
   async getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo) {
@@ -53105,7 +53093,7 @@ class Nacos3DataSource {
   async doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, doc) {
     const dataId = this.buildDataId(providerInfo);
     const config = doc?.configs?.length > 0 ? _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].JSONToYaml(doc) : null;
-    await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].saveConfig(dataSourceInfo, dataId, config);
+    await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].saveConfig(dataSourceInfo, dataId, dataSourceInfo.group || 'dubbo', config);
   }
   async invokeMethod(dataSourceInfo, serviceInfo, provder, methodInfo, code, invokerType) {
     return _main_invoker___WEBPACK_IMPORTED_MODULE_5__["default"].invokeMethod(provder, methodInfo, code, invokerType);
@@ -53367,11 +53355,11 @@ class Nacos3Utils {
       throw error;
     }
   }
-  async saveConfig(dataSourceInfo, dataId, config) {
+  async saveConfig(dataSourceInfo, dataId, group, config) {
     const url = `${dataSourceInfo.address}/v3/console/cs/config`;
     const params = {
       dataId,
-      groupName: dataSourceInfo.group || 'dubbo',
+      groupName: group,
       namespaceId: dataSourceInfo.namespaceId || 'public',
       accessToken: await this.getAccessToken(dataSourceInfo)
     };
@@ -53419,7 +53407,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(400);
 /* harmony import */ var _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(202);
 /* harmony import */ var _main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(203);
-/* harmony import */ var _main_invoker___WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(346);
+/* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
+/* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(logger__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _main_invoker___WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(346);
+
 
 
 
@@ -53427,6 +53418,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const PROVIDER_PREFIX = "/dubbo";
+const MAPPING_PREFIX = "/dubbo/mapping";
+const METADATA_PREFIX = "/dubbo/metadata";
+const APPLICATION_PREFIX = "/services";
 
 /**
  * Etcd 数据源操作类，提供 Dubbo 服务的注册、查询、配置等功能。
@@ -53435,6 +53429,16 @@ const PROVIDER_PREFIX = "/dubbo";
  */
 class EtcdDataSource {
   async getServiceList(dataSourceInfo) {
+    const applicationServiceList = dataSourceInfo.instanceMode !== false ? await this.getApplicationServiceList(dataSourceInfo) : [];
+    const interfaceServiceList = dataSourceInfo.interfaceMode !== false ? await this.getInterfaceServiceList(dataSourceInfo) : [];
+    return {
+      list: this.mergeServiceList(interfaceServiceList, applicationServiceList),
+      separator: '.',
+      packageSeparator: '.'
+    };
+  }
+  async getInterfaceServiceList(dataSourceInfo) {
+    const startTime = Date.now();
     const children = await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getChildren(dataSourceInfo, PROVIDER_PREFIX);
     const exculdeName = ["mapping", "config", "metadata"];
     const serviceList = children.filter(e => !exculdeName.find(name => name == e)).map(e => {
@@ -53444,17 +53448,106 @@ class EtcdDataSource {
         type: 'dubbo'
       };
     });
-    return {
-      list: serviceList,
-      separator: '.',
-      packageSeparator: '.'
-    };
+    logger__WEBPACK_IMPORTED_MODULE_5___default().info(`【etcd接口模式】-查询服务列表 耗时：${Date.now() - startTime}ms`);
+    return serviceList;
+  }
+  async getApplicationServiceList(dataSourceInfo) {
+    const serviceList = [];
+    let startTime = Date.now();
+    try {
+      serviceList.push(...(await this.getServiceListByApplicationMatedata(dataSourceInfo)));
+      logger__WEBPACK_IMPORTED_MODULE_5___default().info(`【etcd应用模式】-查询服务列表 耗时：${Date.now() - startTime}ms`);
+    } catch (e) {
+      logger__WEBPACK_IMPORTED_MODULE_5___default().error(`【etcd应用模式】-查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
+    }
+    if (dataSourceInfo.useApplicationMapping === true) {
+      startTime = Date.now();
+      try {
+        serviceList.push(...(await this.getServiceListByMapping(dataSourceInfo, new Set(serviceList.map(item => item.serviceName)))));
+        logger__WEBPACK_IMPORTED_MODULE_5___default().info(`【etcd应用模式-兜底反推】-查询服务列表 耗时：${Date.now() - startTime}ms`);
+      } catch (e) {
+        logger__WEBPACK_IMPORTED_MODULE_5___default().error(`【etcd应用模式-兜底反推】-查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
+      }
+    }
+    return serviceList;
+  }
+  async getServiceListByApplicationMatedata(dataSourceInfo) {
+    const serviceList = [];
+    for (const application of await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getChildren(dataSourceInfo, APPLICATION_PREFIX)) {
+      const cache = new Set();
+      for (const instance of await this.getAppInstanceList(dataSourceInfo, application)) {
+        const revision = instance?.payload?.metadata?.["dubbo.metadata.revision"] || instance?.metadata?.["dubbo.metadata.revision"] || instance?.revision || instance?.metadata?.revision || instance?.metadata?.["metadata.revision"];
+        if (!revision || cache.has(revision)) {
+          continue;
+        }
+        cache.add(revision);
+        const applicationMetadata = await this.getAppMetadata(dataSourceInfo, application, revision);
+        if (!applicationMetadata?.services) {
+          continue;
+        }
+        Object.values(applicationMetadata.services).forEach(service => {
+          const serviceName = service.params?.interface || service.name || service.path;
+          if (!serviceName) {
+            return;
+          }
+          const primaryKey = `${application}:${serviceName}`;
+          if (cache.has(primaryKey)) {
+            return;
+          }
+          cache.add(primaryKey);
+          serviceList.push({
+            application,
+            serviceName,
+            uniqueServiceName: serviceName,
+            type: 'dubbo'
+          });
+        });
+      }
+    }
+    return serviceList;
+  }
+  async getServiceListByMapping(dataSourceInfo, excludeServiceNameSet) {
+    const serviceList = [];
+    const serviceNames = await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getChildren(dataSourceInfo, MAPPING_PREFIX);
+    ["configurators", "consumers", "providers", "routers"].forEach(name => excludeServiceNameSet.add(name));
+    for (const serviceName of serviceNames) {
+      if (excludeServiceNameSet.has(serviceName)) {
+        continue;
+      }
+      const applications = ((await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getData(dataSourceInfo, `${MAPPING_PREFIX}/${serviceName}`)) || "").split(",").map(s => s.trim()).filter(Boolean);
+      applications.forEach(application => {
+        serviceList.push({
+          application,
+          serviceName,
+          uniqueServiceName: serviceName,
+          discoverMode: 'mapping'
+        });
+      });
+    }
+    return serviceList;
+  }
+  mergeServiceList(interfaceServiceList, applicationServiceList) {
+    const applicationServiceNameSet = new Set(applicationServiceList.map(item => item.serviceName));
+    const mergedList = [...applicationServiceList];
+    interfaceServiceList.forEach(serviceInfo => {
+      if (applicationServiceNameSet.has(serviceInfo.serviceName)) {
+        return;
+      }
+      mergedList.push(serviceInfo);
+    });
+    return mergedList;
   }
   async getProviderList(dataSourceInfo, serviceInfo) {
+    if (serviceInfo.application && serviceInfo.discoverMode !== 'mapping') {
+      return await this.getApplicationProviderList(dataSourceInfo, serviceInfo);
+    }
     const serviceDisabledMap = new Map();
     const serviceMetadataMap = new Map();
     const array = [];
     const entries = await this.getCategoryEntries(dataSourceInfo, serviceInfo, "providers");
+    if (serviceInfo.discoverMode === 'mapping' && entries.length === 0) {
+      throw new Error(`你当前接口是dubbo3应用模式，需要开启配置[dubbo.application.metadata-type=remote]才能获取到提供者列表`);
+    }
     for (let i = 0; i < entries.length; i++) {
       let providerInfo = this.parseProviderInfo(entries[i]);
       if (!providerInfo) {
@@ -53463,32 +53556,81 @@ class EtcdDataSource {
       const disabledAddresses = await serviceDisabledMap.computeIfAbsent(this.buildConfigurationPath(providerInfo), async () => _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].getDisableAddresses(await this.getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo)));
       providerInfo.disabled = disabledAddresses.find(item => item === '0.0.0.0' || item === providerInfo.address) != null;
       const metadata = await serviceMetadataMap.computeIfAbsent(this.buildMetaDataPath(providerInfo), async path => await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getJsonData(dataSourceInfo, path));
-      const methodList = [];
-      if (metadata) {
-        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) || "[]"
-          });
-        });
-      } else {
-        providerInfo.methods.forEach(method => {
-          methodList.push({
-            name: method,
-            methodName: method,
-            parameterTypes: [],
-            defaultParameter: "[]",
-            returnType: null
-          });
-        });
-      }
-      providerInfo.methods = methodList;
+      providerInfo.methods = this.resolveMethodList(providerInfo.methods, metadata);
       array.push(providerInfo);
     }
     return array;
   }
+  async getApplicationProviderList(dataSourceInfo, serviceInfo) {
+    const {
+      application,
+      serviceName
+    } = serviceInfo;
+    const providerList = [];
+    const cache = new Map();
+    const instanceList = await this.getAppInstanceList(dataSourceInfo, application);
+    for (const instance of instanceList) {
+      const revision = instance?.payload?.metadata?.["dubbo.metadata.revision"] || instance?.metadata?.["dubbo.metadata.revision"] || instance?.revision || instance?.metadata?.revision || instance?.metadata?.["metadata.revision"];
+      if (!revision) {
+        continue;
+      }
+      const appMetadata = await cache.computeIfAbsent(`a-${revision}`, () => this.getAppMetadata(dataSourceInfo, application, revision));
+      if (!appMetadata || !appMetadata.services) {
+        continue;
+      }
+      const appServiceMetadatas = Object.values(appMetadata.services).filter(service => {
+        return (service.params?.interface || service.name || service.path) === serviceName;
+      });
+      for (const appServiceMetadata of appServiceMetadatas) {
+        const providerInfo = this.parseApplicationProviderInfo(instance, serviceInfo, appServiceMetadata);
+        const metadata = await cache.computeIfAbsent(`s-${providerInfo.version}-${providerInfo.group}`, () => {
+          return this.getServiceMetadata(dataSourceInfo, application, serviceName, providerInfo.version, providerInfo.group);
+        });
+        providerInfo.methods = this.resolveMethodList(providerInfo.methods, metadata);
+        providerList.push(providerInfo);
+      }
+    }
+    return providerList;
+  }
+  resolveMethodList(methods, metadata) {
+    if (metadata && metadata.methods?.length > 0) {
+      return metadata.methods.map(method => ({
+        ...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) || "[]"
+      }));
+    }
+    return (methods || []).map(method => ({
+      name: method,
+      methodName: method,
+      parameterTypes: [],
+      defaultParameter: "[]",
+      returnType: null
+    }));
+  }
+  parseApplicationProviderInfo(instanceData, serviceInfo, applicationMetadata) {
+    const metadataParams = {
+      ...applicationMetadata.allParams,
+      ...applicationMetadata.params
+    };
+    const ip = instanceData.address || instanceData.ip || instanceData.host;
+    const port = applicationMetadata.port || instanceData.port;
+    return {
+      ip,
+      port,
+      address: `${ip}:${port}`,
+      protocol: applicationMetadata.protocol,
+      application: serviceInfo.application,
+      serviceName: serviceInfo.serviceName,
+      uniqueServiceName: serviceInfo.uniqueServiceName || serviceInfo.serviceName,
+      version: applicationMetadata.version || metadataParams?.version || '',
+      group: applicationMetadata.group || metadataParams?.group || '',
+      methods: Array.from(new Set((metadataParams.methods || "").split(",").filter(Boolean))),
+      revision: metadataParams.revision,
+      dubboVersion: metadataParams.release
+    };
+  }
   async getConsumerList(dataSourceInfo, serviceInfo) {
     const entries = await this.getCategoryEntries(dataSourceInfo, serviceInfo, "consumers");
     return entries.map(data => this.parseConsumerInfo(data)).filter(Boolean);
@@ -53514,7 +53656,7 @@ class EtcdDataSource {
     await this.doSaveConfiguration(dataSourceInfo, providerInfo, _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].yamlToJSON(ymal));
   }
   async invokeMethod(dataSourceInfo, serviceInfo, provder, methodInfo, code, invokerType) {
-    return await _main_invoker___WEBPACK_IMPORTED_MODULE_5__["default"].invokeMethod(provder, methodInfo, code, invokerType);
+    return await _main_invoker___WEBPACK_IMPORTED_MODULE_6__["default"].invokeMethod(provder, methodInfo, code, invokerType);
   }
   async doSaveConfiguration(dataSourceInfo, providerInfo, doc) {
     if (!doc || !doc.configs || doc.configs.length == 0) {
@@ -53541,16 +53683,18 @@ class EtcdDataSource {
     const {
       application,
       serviceName,
-      version
+      version,
+      group
     } = providerInfo;
-    return `/dubbo/metadata/${serviceName}/${version}/provider/${application}`;
+    return this.buildServiceMetadataPath(application, serviceName, version, group);
   }
   buildConfigurationPath(providerInfo) {
     let {
       serviceName,
-      version
+      version,
+      group
     } = providerInfo;
-    return `/dubbo/config/dubbo/${serviceName}:${version ? version : ""}:.configurators`;
+    return `/dubbo/config/dubbo/${serviceName}:${version ? version : ""}:${group || ""}.configurators`;
   }
   parseProviderInfo(data) {
     if (!this.isDubboUrl(data)) {
@@ -53565,6 +53709,7 @@ class EtcdDataSource {
       serviceName: urlData.params.interface,
       uniqueServiceName: urlData.params.interface,
       version: urlData.params.version,
+      group: urlData.params.group,
       weight: urlData.params.weight,
       deprecated: urlData.params.deprecated,
       protocol: urlData.protocol,
@@ -53588,6 +53733,7 @@ class EtcdDataSource {
       disabled: false,
       timeout: urlData.params.timeout,
       version: urlData.params.version,
+      group: urlData.params.group,
       retries: urlData.params.retries || 2,
       providerVersion: urlData.params.revision,
       dubboVersion: urlData.params.release,
@@ -53602,6 +53748,54 @@ class EtcdDataSource {
       timestamp: urlData.params.timestamp
     };
   }
+  async getAppInstanceList(dataSourceInfo, application) {
+    const prefix = `${APPLICATION_PREFIX}/${application}/`;
+    const kvs = await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getPrefix(dataSourceInfo, prefix);
+    return kvs.map(({
+      key,
+      value
+    }) => {
+      const data = value || decodeURIComponent(key.substring(prefix.length).split("/").filter(Boolean)[0] || "");
+      return this.parseAppInstanceData(data, application);
+    }).filter(instance => instance && (instance.address || instance.ip || instance.host || instance.revision || instance.metadata || instance.payload));
+  }
+  async getAppMetadata(dataSourceInfo, application, revision) {
+    return (await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getJsonData(dataSourceInfo, `${METADATA_PREFIX}/${application}/${revision}`)) || {};
+  }
+  async getServiceMetadata(dataSourceInfo, application, serviceName, version, group) {
+    return (await _EtcdClientUtils__WEBPACK_IMPORTED_MODULE_2__["default"].getJsonData(dataSourceInfo, this.buildServiceMetadataPath(application, serviceName, version, group))) || {};
+  }
+  buildServiceMetadataPath(application, serviceName, version) {
+    return `/dubbo/metadata/${serviceName}/${version || ""}/provider/${application}`;
+  }
+  parseAppInstanceData(data, application) {
+    if (!data) {
+      return {};
+    }
+    if (typeof data !== 'string') {
+      return data;
+    }
+    try {
+      return JSON.parse(data);
+    } catch (error) {
+      const content = decodeURIComponent(data);
+      if (!this.isDubboUrl(content)) {
+        return {};
+      }
+      const urlData = _common_UrlUtils__WEBPACK_IMPORTED_MODULE_0__["default"].parseURL(content);
+      return {
+        name: application,
+        address: urlData.host,
+        ip: urlData.host,
+        port: urlData.port,
+        metadata: urlData.params,
+        payload: {
+          metadata: urlData.params
+        },
+        revision: urlData.params.revision || urlData.params["metadata.revision"] || urlData.params["dubbo.metadata.revision"]
+      };
+    }
+  }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (EtcdDataSource);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddm-plugin-dubbo-support",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Dubbo-Desktop-Manager插件-支持Dubbo框架",
   "main": "dist/index.js",
   "rendererMain": "dist/renderer.js",