@goplus123/core-api 1.0.5 → 1.0.7

package/README.md

@@ -260,11 +260,19 @@ const sdk = initSDK({
 
 对应实现：[`initSDK`](./src/index.ts#L372-L578)
 
-### React Native：注入 gRPC invoker（解决 RN 真机解析 gRPC-Web 响应问题）
+### React Native：配置 gRPC invoker（Invoke）（解决 RN 真机 gRPC-Web 兼容问题）
 
 当后端仅提供 gRPC-Web，而 React Native 环境下 `@connectrpc/connect-web` 的 `fetch`/二进制响应解析存在兼容性问题时，可以通过 `grpc.invoker` 注入一层“可替换的底层调用器”，在不改动上层调用方式（`sdk.xxx` / `requestApi` / spec）前提下，切换为 RN 可用的 gRPC-Web 实现。
 
 这个 `invoker` 只是一个“可插拔的 unary 调用实现”，不限定必须使用某个第三方库。
+内置的 `builtin` invoker 使用的是 gRPC-Web（二进制）协议：`application/grpc-web+proto`。
+
+`grpc.invoker` 支持两种形态（优先级从高到低）：
+
+- `invoker: GrpcInvoker`：使用外部传入的自定义 invoker
+- `invoker: 'builtin'`：使用 SDK 内置的 gRPC-Web unary invoker（基于 `fetch` + `toBinary/fromBinary`）
+
+注意：使用 `invoker: 'builtin'` 时，请确保 `grpc.protocol` 为 `'grpc-web'`。
 
 `invoker.unary()` 的入参约定：
 
@@ -275,7 +283,37 @@ const sdk = initSDK({
 - `headers`：最终要发出去的 headers（已合并 auth/getHeaders/静态 headers 与 callOptions.headers）
 - `callOptions`：透传的调用选项（例如 timeout），按你的底层实现自行使用
 
-示例 A（推荐）：在 RN 工程内用 `fetch` 走 gRPC-Web（二进制），复用本 SDK 的 bufbuild 生成物（不需要重新编译 proto）。这个方案不需要引入 `@improbable-eng/grpc-web-react-native-transport`：
+示例 0（推荐）：直接启用内置 invoker（不需要在 RN 工程维护一套 invoke 代码）：
+
+```ts
+import { initSDK, fetchGuid } from '@goplus123/core-api'
+
+const sdk = initSDK({
+  ws: {
+    url: 'wss://example.com/websocket',
+    protocols: fetchGuid(),
+  },
+  grpc: {
+    baseUrl: 'https://example.com/cms',
+    protocol: 'grpc-web',
+    invoker: 'builtin',
+  },
+  http: {
+    baseUrl: 'https://example.com/api',
+  },
+  headerConfig: {
+    version: '1.0.0',
+    platformId: '50',
+    isReload: false,
+    deviceType: 1,
+    deviceId: '',
+    childPlatformId: '50',
+  },
+  defaultTransport: 'auto',
+})
+```
+
+示例 A（自定义）：在 RN 工程内用 `fetch` 走 gRPC-Web（二进制），复用本 SDK 的 bufbuild 生成物（不需要重新编译 proto）。这个方案不需要引入 `@improbable-eng/grpc-web-react-native-transport`：
 
 ```ts
 import { initSDK, fetchGuid } from '@goplus123/core-api'
@@ -352,6 +390,49 @@ function capitalizeRpcName(methodName: string): string {
   return methodName[0]!.toUpperCase() + methodName.slice(1)
 }
 
+function resolveServiceMethod(service: any, methodName: string, method?: any): any | undefined {
+  if (method) return method
+
+  const expectedLocalName = methodName
+  const expectedRpcName = capitalizeRpcName(methodName)
+
+  const direct = service?.method
+  if (Array.isArray(direct)) {
+    return direct.find((m: any) => {
+      const localName = String(m?.localName ?? '')
+      const rpcName = String(m?.name ?? '')
+      return (
+        localName === expectedLocalName ||
+        localName === expectedRpcName ||
+        rpcName === expectedLocalName ||
+        rpcName === expectedRpcName
+      )
+    })
+  }
+  if (direct && typeof direct === 'object') {
+    return (direct as any)[expectedLocalName] ?? (direct as any)[expectedRpcName]
+  }
+
+  const methods = service?.methods
+  if (Array.isArray(methods)) {
+    return methods.find((m: any) => {
+      const localName = String(m?.localName ?? '')
+      const rpcName = String(m?.name ?? '')
+      return (
+        localName === expectedLocalName ||
+        localName === expectedRpcName ||
+        rpcName === expectedLocalName ||
+        rpcName === expectedRpcName
+      )
+    })
+  }
+  if (methods && typeof methods === 'object') {
+    return (methods as any)[expectedLocalName] ?? (methods as any)[expectedRpcName]
+  }
+
+  return undefined
+}
+
 function getGrpcWebPath(service: any, methodName: string, method: any): string {
   const typeName = String(service?.typeName ?? '')
   const rpcName = String(method?.name ?? method?.rpc?.name ?? '') || capitalizeRpcName(methodName)
@@ -367,14 +448,7 @@ async function rnGrpcWebUnary(args: {
   headers: Record<string, string>
   callOptions?: { timeoutMs?: number }
 }): Promise<any> {
-  const method =
-    args.method ??
-    (() => {
-      const ms = args.service?.methods
-      if (Array.isArray(ms)) return ms.find((m: any) => m?.localName === args.methodName || m?.name === args.methodName)
-      if (ms && typeof ms === 'object') return (ms as any)[args.methodName]
-      return undefined
-    })()
+  const method = resolveServiceMethod(args.service, args.methodName, args.method)
   if (!method) {
     throw new Error(`gRPC method not found: ${String(args.service?.typeName ?? '')}.${args.methodName}`)
   }
@@ -447,7 +521,10 @@ const sdk = initSDK({
 })
 ```
 
-补充说明：如果你已经在 RN 工程里有基于 `@improbable-eng/grpc-web` / `@improbable-eng/grpc-web-react-native-transport` 的 `rnGrpcWebUnary` 封装，也可以直接把它塞进 `invoker.unary`。但需要确保它能消费本 SDK 生成的 bufbuild message 与 schema（`toBinary/fromBinary`），否则通常会因为“message/descriptor 体系不一致”（improbable 常见搭配是另一套 proto 生成物）而对不上类型与序列化方式。
+补充说明：
+
+- 自定义 invoker 时，建议优先使用 `args.method`（SDK 解析好的方法描述），避免在 RN 侧重复解析 `service.method/service.methods` 的结构差异。
+- 如果你已经在 RN 工程里有基于 `@improbable-eng/grpc-web` / `@improbable-eng/grpc-web-react-native-transport` 的 `rnGrpcWebUnary` 封装，也可以直接把它塞进 `invoker.unary`。但需要确保它能消费本 SDK 生成的 bufbuild message 与 schema（`toBinary/fromBinary`），否则通常会因为“message/descriptor 体系不一致”（improbable 常见搭配是另一套 proto 生成物）而对不上类型与序列化方式。
 
 ### 2) 直接调用（推荐）
 

package/dist/index.cjs

@@ -39,7 +39,174 @@ module.exports = __toCommonJS(index_exports);
 // src/client/grpcClient.ts
 var import_connect = require("@connectrpc/connect");
 var import_connect_web = require("@connectrpc/connect-web");
+var import_protobuf2 = require("@bufbuild/protobuf");
+
+// src/client/invokers/builtinGrpcWebInvoker.ts
 var import_protobuf = require("@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 = (0, import_protobuf.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 (0, import_protobuf.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;
@@ -70,6 +237,7 @@ var GrpcClient = class {
   getHeaders;
   logger;
   invoker;
+  invokerMode;
   invokerClientByKey;
   constructor(config) {
     this.baseUrl = config.baseUrl;
@@ -80,7 +248,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(),
@@ -91,6 +258,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);
@@ -186,20 +355,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;
   }
@@ -208,24 +400,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(
       {},
@@ -233,7 +408,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}`);
             };
@@ -252,6 +427,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),
@@ -313,7 +494,7 @@ var GrpcClient = class {
     return (0, import_connect.createClient)(service, transport);
   }
   unary(schema, payload, call, options) {
-    const req = (0, import_protobuf.create)(schema, payload);
+    const req = (0, import_protobuf2.create)(schema, payload);
     return call(req, options);
   }
   /**
@@ -1507,7 +1688,7 @@ var WsRpcClient = class {
 };
 
 // src/client/unifiedApiClient.ts
-var import_protobuf2 = require("@bufbuild/protobuf");
+var import_protobuf3 = require("@bufbuild/protobuf");
 
 // src/client/interceptors.ts
 function isBizError(err) {
@@ -1744,7 +1925,7 @@ var UnifiedApiClient = class {
       throw new Error(`gRPC method not found: ${service.typeName}.${methodName}`);
     }
     const callOptions = ctx.meta?.callOptions;
-    const req = endpoint.grpc.requestSchema ? (0, import_protobuf2.create)(endpoint.grpc.requestSchema, ctx.request ?? {}) : ctx.request;
+    const req = endpoint.grpc.requestSchema ? (0, import_protobuf3.create)(endpoint.grpc.requestSchema, ctx.request ?? {}) : ctx.request;
     const headers = { ...callOptions?.headers ?? {}, ...ctx.headers ?? {} };
     return await method(req, { ...callOptions ?? {}, headers });
   }
@@ -1969,7 +2150,7 @@ var file_auth_MayaService = /* @__PURE__ */ (0, import_codegenv241.fileDesc)("Ch
 var MayaService = /* @__PURE__ */ (0, import_codegenv241.serviceDesc)(file_auth_MayaService, 0);
 
 // src/modules/auth.ts
-var import_protobuf3 = require("@bufbuild/protobuf");
+var import_protobuf4 = require("@bufbuild/protobuf");
 var authService = (grpc) => {
   const client = grpc.getService(FrontendAuthService);
   const faceId = grpc.getService(FrontendFaceIdService);