@goplus123/core-api 1.0.5 → 1.0.7

package/dist/index.d.mts

@@ -129,7 +129,7 @@ interface GrpcClientConfig {
     headers?: Record<string, string>;
     getHeaders?: () => Record<string, string> | null | undefined | Promise<Record<string, string> | null | undefined>;
     logger?: ApiLogger;
-    invoker?: GrpcInvoker;
+    invoker?: GrpcInvoker | 'builtin';
 }
 /**
  * 通用 gRPC 客户端封装 (基于 ConnectRPC)
@@ -149,6 +149,7 @@ declare class GrpcClient {
     private getHeaders?;
     private logger?;
     private invoker?;
+    private invokerMode;
     private invokerClientByKey;
     constructor(config: GrpcClientConfig);
     private createTransport;
@@ -157,6 +158,7 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
     private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;

package/dist/index.d.ts

@@ -129,7 +129,7 @@ interface GrpcClientConfig {
     headers?: Record<string, string>;
     getHeaders?: () => Record<string, string> | null | undefined | Promise<Record<string, string> | null | undefined>;
     logger?: ApiLogger;
-    invoker?: GrpcInvoker;
+    invoker?: GrpcInvoker | 'builtin';
 }
 /**
  * 通用 gRPC 客户端封装 (基于 ConnectRPC)
@@ -149,6 +149,7 @@ declare class GrpcClient {
     private getHeaders?;
     private logger?;
     private invoker?;
+    private invokerMode;
     private invokerClientByKey;
     constructor(config: GrpcClientConfig);
     private createTransport;
@@ -157,6 +158,7 @@ declare class GrpcClient {
     private hasHeader;
     private attachInvokerHeaders;
     private getInvokerClientKey;
+    private getServiceMethodMap;
     private getServiceMethodDesc;
     private getServiceViaInvoker;
     private invokeUnary;

package/dist/index.js

@@ -2,6 +2,173 @@
 import { createClient } from "@connectrpc/connect";
 import { createConnectTransport, createGrpcWebTransport } from "@connectrpc/connect-web";
 import { create } from "@bufbuild/protobuf";
+
+// src/client/invokers/builtinGrpcWebInvoker.ts
+import { fromBinary, toBinary } from "@bufbuild/protobuf";
+function createBuiltinGrpcWebInvoker(options) {
+  const fetchImpl = options.fetch ?? globalThis.fetch;
+  const logger = options.logger;
+  if (!fetchImpl) {
+    return {
+      unary: async () => {
+        throw new Error("fetch is not available in current environment");
+      }
+    };
+  }
+  const grpcWebEncodeUnary = (messageBytes) => {
+    const out = new Uint8Array(5 + messageBytes.byteLength);
+    out[0] = 0;
+    const view = new DataView(out.buffer, out.byteOffset, out.byteLength);
+    view.setUint32(1, messageBytes.byteLength, false);
+    out.set(messageBytes, 5);
+    return out;
+  };
+  const bytesToAscii = (bytes) => {
+    let s = "";
+    for (let i = 0; i < bytes.length; i++) s += String.fromCharCode(bytes[i]);
+    return s;
+  };
+  const parseGrpcWebTrailers = (bytes) => {
+    const text = bytesToAscii(bytes);
+    const out = {};
+    for (const line of text.split("\r\n")) {
+      if (!line) continue;
+      const idx = line.indexOf(":");
+      if (idx < 0) continue;
+      const k = line.slice(0, idx).trim().toLowerCase();
+      const v = line.slice(idx + 1).trim();
+      out[k] = v;
+    }
+    return out;
+  };
+  const grpcWebDecodeUnary = (body) => {
+    let offset = 0;
+    let message;
+    let trailers = {};
+    while (offset + 5 <= body.byteLength) {
+      const flags = body[offset];
+      const length = new DataView(body.buffer, body.byteOffset + offset + 1, 4).getUint32(0, false);
+      offset += 5;
+      if (offset + length > body.byteLength) break;
+      const frame = body.subarray(offset, offset + length);
+      offset += length;
+      const isTrailer = (flags & 128) === 128;
+      if (isTrailer) {
+        trailers = { ...trailers, ...parseGrpcWebTrailers(frame) };
+      } else if (message == null) {
+        message = frame;
+      }
+    }
+    return { message, trailers };
+  };
+  const joinUrl = (baseUrl, path) => {
+    return baseUrl.replace(/\/+$/, "") + "/" + path.replace(/^\/+/, "");
+  };
+  const capitalizeRpcName = (methodName) => {
+    if (!methodName) return methodName;
+    return methodName[0].toUpperCase() + methodName.slice(1);
+  };
+  const getGrpcWebPath = (service, methodName, method) => {
+    const typeName = String(service?.typeName ?? "");
+    const rpcName = String(method?.name ?? "") || capitalizeRpcName(methodName);
+    return `${typeName}/${rpcName}`;
+  };
+  const safeDecodeGrpcMessage = (value) => {
+    if (!value) return value;
+    try {
+      return decodeURIComponent(value);
+    } catch {
+      return value;
+    }
+  };
+  return {
+    unary: async (args) => {
+      const service = String(args.service?.typeName ?? "");
+      const startedAt = Date.now();
+      let url;
+      const contentType = "application/grpc-web+proto";
+      const controller = typeof AbortController !== "undefined" ? new AbortController() : void 0;
+      const timeoutMs = args.callOptions?.timeoutMs;
+      const timeoutId = controller && typeof timeoutMs === "number" ? setTimeout(() => controller.abort(), timeoutMs) : void 0;
+      try {
+        const method = args.method;
+        if (!method) {
+          throw new Error(`gRPC method not found: ${service}.${args.methodName}`);
+        }
+        url = joinUrl(args.baseUrl, getGrpcWebPath(args.service, args.methodName, method));
+        const requestBytes = toBinary(method.input, args.request);
+        const body = grpcWebEncodeUnary(requestBytes);
+        logger?.debug?.("[Grpc:Invoker:Builtin:Start]", {
+          service,
+          methodName: args.methodName,
+          baseUrl: args.baseUrl,
+          url,
+          timeoutMs,
+          requestBytes: requestBytes.byteLength
+        });
+        const res = await fetchImpl(url, {
+          method: "POST",
+          headers: {
+            ...args.headers,
+            "content-type": contentType,
+            accept: contentType,
+            "x-grpc-web": "1"
+          },
+          body: body.buffer,
+          signal: controller?.signal
+        });
+        logger?.debug?.("[Grpc:Invoker:Builtin:Http]", {
+          service,
+          methodName: args.methodName,
+          url,
+          ok: res.ok,
+          status: res.status,
+          statusText: res.statusText,
+          durationMs: Date.now() - startedAt
+        });
+        if (!res.ok) {
+          throw new Error(`gRPC fetch failed: ${res.status} ${res.statusText}`);
+        }
+        const raw = new Uint8Array(await res.arrayBuffer());
+        const decoded = grpcWebDecodeUnary(raw);
+        const statusFromHeaders = typeof res.headers?.get === "function" ? res.headers.get("grpc-status") : void 0;
+        const msgFromHeaders = typeof res.headers?.get === "function" ? res.headers.get("grpc-message") : void 0;
+        const grpcStatus = decoded.trailers["grpc-status"] ?? statusFromHeaders ?? "0";
+        const grpcMessage = safeDecodeGrpcMessage(
+          decoded.trailers["grpc-message"] ?? msgFromHeaders
+        );
+        logger?.debug?.("[Grpc:Invoker:Builtin:End]", {
+          service,
+          methodName: args.methodName,
+          url,
+          grpcStatus,
+          grpcMessage,
+          durationMs: Date.now() - startedAt
+        });
+        if (grpcStatus !== "0") {
+          const msg = grpcMessage ?? "gRPC request failed";
+          throw new Error(`gRPC status=${grpcStatus} message=${msg}`);
+        }
+        if (!decoded.message) throw new Error("gRPC response message missing");
+        return fromBinary(method.output, decoded.message);
+      } catch (error) {
+        logger?.error?.("[Grpc:Invoker:Builtin:Error]", {
+          service,
+          methodName: args.methodName,
+          baseUrl: args.baseUrl,
+          url,
+          durationMs: Date.now() - startedAt,
+          error
+        });
+        throw error;
+      } finally {
+        if (timeoutId) clearTimeout(timeoutId);
+      }
+    }
+  };
+}
+
+// src/client/grpcClient.ts
 var GrpcApiError = class extends Error {
   name = "GrpcApiError";
   service;
@@ -32,6 +199,7 @@ var GrpcClient = class {
   getHeaders;
   logger;
   invoker;
+  invokerMode;
   invokerClientByKey;
   constructor(config) {
     this.baseUrl = config.baseUrl;
@@ -42,7 +210,6 @@ var GrpcClient = class {
     this.getToken = config.getToken;
     this.headers = config.headers;
     this.getHeaders = config.getHeaders;
-    this.invoker = config.invoker;
     this.logger = config.logger ?? (config.debug ? { debug: console.log, info: console.log, warn: console.warn, error: console.error } : void 0);
     this.interceptors = [
       this.createRpcFromInterceptor(),
@@ -53,6 +220,8 @@ var GrpcClient = class {
     this.transportByBaseUrl = /* @__PURE__ */ new Map();
     this.transport = this.createTransport(this.baseUrl);
     this.invokerClientByKey = /* @__PURE__ */ new Map();
+    this.invokerMode = config.invoker === "builtin" ? "builtin" : config.invoker ? "custom" : "none";
+    this.invoker = config.invoker === "builtin" ? createBuiltinGrpcWebInvoker({ fetch: this.fetchImpl, logger: this.logger }) : config.invoker;
   }
   createTransport(baseUrl) {
     const cached = this.transportByBaseUrl.get(baseUrl);
@@ -148,20 +317,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 +362,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 +370,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}`);
             };
@@ -214,6 +389,12 @@ var GrpcClient = class {
     const baseUrl = this.pickBaseUrl(typeName);
     try {
       if (this.invoker) {
+        this.logger?.debug?.("[Grpc:Invoker]", {
+          mode: this.invokerMode,
+          service: typeName,
+          methodName,
+          baseUrl
+        });
         const method2 = this.getServiceMethodDesc(service, methodName);
         const headers = await this.attachInvokerHeaders(
           this.normalizeHeaders(options?.headers),