@goplus123/core-api 1.0.4 → 1.0.6

package/dist/index.d.mts

@@ -94,6 +94,7 @@ type GrpcInvokerUnaryArgs = {
     baseUrl: string;
     service: DescService;
     methodName: string;
+    method?: unknown;
     request: unknown;
     headers: Record<string, string>;
     callOptions?: CallOptions;
@@ -156,6 +157,8 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
+    private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;
     /**

package/dist/index.d.ts

@@ -94,6 +94,7 @@ type GrpcInvokerUnaryArgs = {
     baseUrl: string;
     service: DescService;
     methodName: string;
+    method?: unknown;
     request: unknown;
     headers: Record<string, string>;
     callOptions?: CallOptions;
@@ -156,6 +157,8 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
+    private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;
     /**

package/dist/index.js

@@ -148,13 +148,52 @@ var GrpcClient = class {
   getInvokerClientKey(service, baseUrl) {
     return `${String(service?.typeName ?? "")}@@${baseUrl}`;
   }
+  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 (Array.isArray(methods)) {
+      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 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;
+  }
   getServiceViaInvoker(service) {
     const baseUrl = this.pickBaseUrl(service.typeName ?? "");
     const key = this.getInvokerClientKey(service, baseUrl);
     const cached = this.invokerClientByKey.get(key);
     if (cached) return cached;
-    const methods = service?.methods;
-    const hasMethodsMap = methods && typeof methods === "object";
+    const methodMap = this.getServiceMethodMap(service);
     const typeName = String(service?.typeName ?? "");
     const client = new Proxy(
       {},
@@ -162,7 +201,7 @@ var GrpcClient = class {
         get: (_target, prop) => {
           if (prop === "then") return void 0;
           if (typeof prop !== "string") return void 0;
-          if (hasMethodsMap && !(prop in methods)) {
+          if (methodMap && !(prop in methodMap)) {
             return async () => {
               throw new Error(`gRPC method not found: ${typeName}.${prop}`);
             };
@@ -181,6 +220,7 @@ var GrpcClient = class {
     const baseUrl = this.pickBaseUrl(typeName);
     try {
       if (this.invoker) {
+        const method2 = this.getServiceMethodDesc(service, methodName);
         const headers = await this.attachInvokerHeaders(
           this.normalizeHeaders(options?.headers),
           methodName
@@ -195,6 +235,7 @@ var GrpcClient = class {
           baseUrl,
           service,
           methodName,
+          method: method2,
           request,
           headers,
           callOptions: options