@goplus123/core-api 1.0.5 → 1.0.6

package/dist/index.d.mts

@@ -157,6 +157,7 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
     private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;

package/dist/index.d.ts

@@ -157,6 +157,7 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
     private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;

package/dist/index.js

@@ -148,20 +148,43 @@ var GrpcClient = class {
   getInvokerClientKey(service, baseUrl) {
     return `${String(service?.typeName ?? "")}@@${baseUrl}`;
   }
-  getServiceMethodDesc(service, methodName) {
+  getServiceMethodMap(service) {
+    const out = {};
+    const addMethod = (m) => {
+      if (!m) return;
+      const localName = m.localName != null ? String(m.localName) : "";
+      const name = m.name != null ? String(m.name) : "";
+      if (localName) out[localName] = m;
+      if (name && !(name in out)) out[name] = m;
+    };
+    const direct = service?.method;
+    if (direct && typeof direct === "object") {
+      for (const [k, v] of Object.entries(direct)) {
+        if (v) out[k] = v;
+        addMethod(v);
+      }
+    }
     const methods = service?.methods;
-    if (!methods) return void 0;
     if (Array.isArray(methods)) {
-      for (const m of methods) {
-        if (!m) continue;
-        const localName = String(m.localName ?? "");
-        const name = String(m.name ?? "");
-        if (localName === methodName || name === methodName) return m;
+      for (const m of methods) addMethod(m);
+    } else if (methods && typeof methods === "object") {
+      for (const [k, v] of Object.entries(methods)) {
+        if (v) out[k] = v;
+        addMethod(v);
       }
-      return void 0;
     }
-    if (typeof methods === "object") {
-      return methods[methodName];
+    return Object.keys(out).length > 0 ? out : void 0;
+  }
+  getServiceMethodDesc(service, methodName) {
+    const methodMap = this.getServiceMethodMap(service);
+    if (!methodMap) return void 0;
+    const direct = methodMap[methodName];
+    if (direct) return direct;
+    for (const m of Object.values(methodMap)) {
+      if (!m) continue;
+      const localName = m.localName != null ? String(m.localName) : "";
+      const name = m.name != null ? String(m.name) : "";
+      if (localName === methodName || name === methodName) return m;
     }
     return void 0;
   }
@@ -170,24 +193,7 @@ var GrpcClient = class {
     const key = this.getInvokerClientKey(service, baseUrl);
     const cached = this.invokerClientByKey.get(key);
     if (cached) return cached;
-    const methods = service?.methods;
-    const hasMethods = methods != null;
-    const methodMap = (() => {
-      if (!methods) return void 0;
-      if (Array.isArray(methods)) {
-        const out = {};
-        for (const m of methods) {
-          if (!m) continue;
-          const localName = String(m.localName ?? "");
-          const name = String(m.name ?? "");
-          if (localName) out[localName] = m;
-          if (name && !(name in out)) out[name] = m;
-        }
-        return out;
-      }
-      if (typeof methods === "object") return methods;
-      return void 0;
-    })();
+    const methodMap = this.getServiceMethodMap(service);
     const typeName = String(service?.typeName ?? "");
     const client = new Proxy(
       {},
@@ -195,7 +201,7 @@ var GrpcClient = class {
         get: (_target, prop) => {
           if (prop === "then") return void 0;
           if (typeof prop !== "string") return void 0;
-          if (hasMethods && methodMap && !(prop in methodMap)) {
+          if (methodMap && !(prop in methodMap)) {
             return async () => {
               throw new Error(`gRPC method not found: ${typeName}.${prop}`);
             };