@goplus123/core-api 1.0.6 → 1.0.8

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;
@@ -548,6 +549,11 @@ declare class UnifiedApiClient {
     private dispatch;
 }
 
+type KeyValueStorage = {
+    get: (key: string) => string | null;
+    set: (key: string, val: string) => void;
+};
+
 interface RequestApiConfig {
     http?: {
         baseUrl: string;
@@ -573,6 +579,7 @@ interface RequestApiConfig {
     };
     logger?: ApiLogger;
     onApiError?: ApiErrorHandler;
+    uniqueKeyStorage?: KeyValueStorage | null;
 }
 /**
  * 统一请求 API 封装
@@ -17084,11 +17091,6 @@ declare function requestApi<TReq = any, TRes = any>(args: {
     meta?: Record<string, any>;
 }): Promise<TRes>;
 
-type KeyValueStorage = {
-    get: (key: string) => string | null;
-    set: (key: string, val: string) => void;
-};
-
 type FetchGuidOptions = {
     key?: string;
     format?: 'uuid' | 'hex' | 'base64';

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;
@@ -548,6 +549,11 @@ declare class UnifiedApiClient {
     private dispatch;
 }
 
+type KeyValueStorage = {
+    get: (key: string) => string | null;
+    set: (key: string, val: string) => void;
+};
+
 interface RequestApiConfig {
     http?: {
         baseUrl: string;
@@ -573,6 +579,7 @@ interface RequestApiConfig {
     };
     logger?: ApiLogger;
     onApiError?: ApiErrorHandler;
+    uniqueKeyStorage?: KeyValueStorage | null;
 }
 /**
  * 统一请求 API 封装
@@ -17084,11 +17091,6 @@ declare function requestApi<TReq = any, TRes = any>(args: {
     meta?: Record<string, any>;
 }): Promise<TRes>;
 
-type KeyValueStorage = {
-    get: (key: string) => string | null;
-    set: (key: string, val: string) => void;
-};
-
 type FetchGuidOptions = {
     key?: string;
     format?: 'uuid' | 'hex' | 'base64';

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);
@@ -220,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),
@@ -5969,176 +6144,6 @@ var apiMap = {
   userEngagement: userEngagementEndpoints
 };
 
-// src/routing/router.ts
-var serviceInstances = {};
-var rpcClient;
-var unifiedClient;
-var endpointRegistry = /* @__PURE__ */ new Map();
-var endpointDefaultTransports = /* @__PURE__ */ new Map();
-var defaultTransport = "auto";
-var transportState = {
-  hasHttp: false,
-  hasWs: false,
-  hasGrpc: false
-};
-function resetRoutingState() {
-  serviceInstances = {};
-  rpcClient = void 0;
-  unifiedClient = void 0;
-  endpointRegistry.clear();
-  endpointDefaultTransports.clear();
-  defaultTransport = "auto";
-  transportState = { hasHttp: false, hasWs: false, hasGrpc: false };
-}
-function setServiceInstances(instances) {
-  serviceInstances = instances;
-}
-function setRpcClient(client) {
-  rpcClient = client;
-}
-function setUnifiedClient(client) {
-  unifiedClient = client;
-}
-function setTransportState(state) {
-  transportState = state;
-}
-function setDefaultTransport(transport) {
-  defaultTransport = transport;
-}
-function makeEndpointKey(service, functionName) {
-  return `${service}:${functionName}`;
-}
-function isEndpointSpec(value) {
-  return !!value && typeof value === "object" && "transport" in value;
-}
-function isEndpointGroup(value) {
-  return !!value && typeof value === "object" && "transports" in value;
-}
-function registerEndpointVariant(service, functionName, endpoint) {
-  const key = makeEndpointKey(service, functionName);
-  let byTransport = endpointRegistry.get(key);
-  if (!byTransport) {
-    byTransport = /* @__PURE__ */ new Map();
-    endpointRegistry.set(key, byTransport);
-  }
-  byTransport.set(endpoint.transport, endpoint);
-}
-function rebuildEndpointRegistry() {
-  endpointRegistry = /* @__PURE__ */ new Map();
-  endpointDefaultTransports = /* @__PURE__ */ new Map();
-  for (const [serviceName, service] of Object.entries(apiMap)) {
-    for (const [functionName, endpoint] of Object.entries(service)) {
-      if (isEndpointSpec(endpoint)) {
-        registerEndpointVariant(serviceName, functionName, endpoint);
-        continue;
-      }
-      if (isEndpointGroup(endpoint)) {
-        if (endpoint.defaultTransport) {
-          endpointDefaultTransports.set(
-            makeEndpointKey(serviceName, functionName),
-            endpoint.defaultTransport
-          );
-        }
-        for (const [transport, config] of Object.entries(endpoint.transports ?? {})) {
-          if (!config) continue;
-          if (transport === "http") {
-            registerEndpointVariant(serviceName, functionName, {
-              id: endpoint.id,
-              transport: "http",
-              http: config,
-              request: endpoint.request,
-              response: endpoint.response
-            });
-          } else if (transport === "ws") {
-            registerEndpointVariant(serviceName, functionName, {
-              id: endpoint.id,
-              transport: "ws",
-              ws: config,
-              request: endpoint.request,
-              response: endpoint.response
-            });
-          } else if (transport === "grpc") {
-            registerEndpointVariant(serviceName, functionName, {
-              id: endpoint.id,
-              transport: "grpc",
-              grpc: config,
-              request: endpoint.request,
-              response: endpoint.response
-            });
-          }
-        }
-        continue;
-      }
-    }
-  }
-}
-function requestApi(args) {
-  const key = makeEndpointKey(args.service, args.functionName);
-  const endpointVariants = endpointRegistry.get(key);
-  if (endpointVariants) {
-    if (!unifiedClient) {
-      throw new Error("SDK not initialized. Please call initSDK first.");
-    }
-    const specDefaultTransport = endpointDefaultTransports.get(key);
-    const endpoint = pickEndpoint(
-      endpointVariants,
-      args.transport,
-      specDefaultTransport,
-      args.service,
-      args.functionName
-    );
-    if (endpoint.transport === "grpc" && !transportState.hasGrpc) {
-      throw new Error("SDK not initialized. Please call initSDK with grpc config.");
-    }
-    if (endpoint.transport === "ws" && !transportState.hasWs) {
-      throw new Error("SDK not initialized. Please call initSDK with ws config.");
-    }
-    if (endpoint.transport === "http" && !transportState.hasHttp) {
-      throw new Error("SDK not initialized. Please call initSDK with http config.");
-    }
-    const meta = args.callOptions || args.wsOptions ? {
-      ...args.meta ?? {},
-      ...args.callOptions ? { callOptions: args.callOptions } : {},
-      ...args.wsOptions ? { wsOptions: args.wsOptions } : {}
-    } : args.meta;
-    return unifiedClient.call(endpoint, args.requestParam, meta);
-  }
-  const serviceInstance = serviceInstances[args.service];
-  const method = serviceInstance?.[args.functionName];
-  if (typeof method === "function") {
-    if (args.callOptions !== void 0) {
-      return method(args.requestParam, args.callOptions);
-    }
-    return method(args.requestParam);
-  }
-  if (!rpcClient) {
-    throw new Error("SDK not initialized. Please call initSDK first.");
-  }
-  return rpcClient.call(args.functionName, args.service, args.requestParam, args.wsOptions);
-}
-function pickEndpoint(variants, transport, specDefaultTransport, service, functionName) {
-  const resolvedTransport = transport ?? specDefaultTransport ?? defaultTransport;
-  if (resolvedTransport !== "auto") {
-    const found = variants.get(resolvedTransport);
-    if (!found) {
-      throw new Error(
-        `Endpoint transport not found: ${service}.${functionName} (${resolvedTransport}). Available: ${Array.from(
-          variants.keys()
-        ).join(", ")}`
-      );
-    }
-    return found;
-  }
-  if (transportState.hasGrpc && variants.has("grpc")) return variants.get("grpc");
-  if (transportState.hasWs && variants.has("ws")) return variants.get("ws");
-  if (transportState.hasHttp && variants.has("http")) return variants.get("http");
-  const fallback = variants.values().next().value;
-  if (!fallback) {
-    throw new Error(`Endpoint not found: ${service}.${functionName}`);
-  }
-  return fallback;
-}
-
 // src/utils/adapters/web.ts
 var webStorage = {
   get(key) {
@@ -6341,6 +6346,176 @@ var setUniqueKeyStorage = (adapter) => {
 };
 var fetchGuid = () => fetchGuidImpl();
 
+// src/routing/router.ts
+var serviceInstances = {};
+var rpcClient;
+var unifiedClient;
+var endpointRegistry = /* @__PURE__ */ new Map();
+var endpointDefaultTransports = /* @__PURE__ */ new Map();
+var defaultTransport = "auto";
+var transportState = {
+  hasHttp: false,
+  hasWs: false,
+  hasGrpc: false
+};
+function resetRoutingState() {
+  serviceInstances = {};
+  rpcClient = void 0;
+  unifiedClient = void 0;
+  endpointRegistry.clear();
+  endpointDefaultTransports.clear();
+  defaultTransport = "auto";
+  transportState = { hasHttp: false, hasWs: false, hasGrpc: false };
+}
+function setServiceInstances(instances) {
+  serviceInstances = instances;
+}
+function setRpcClient(client) {
+  rpcClient = client;
+}
+function setUnifiedClient(client) {
+  unifiedClient = client;
+}
+function setTransportState(state) {
+  transportState = state;
+}
+function setDefaultTransport(transport) {
+  defaultTransport = transport;
+}
+function makeEndpointKey(service, functionName) {
+  return `${service}:${functionName}`;
+}
+function isEndpointSpec(value) {
+  return !!value && typeof value === "object" && "transport" in value;
+}
+function isEndpointGroup(value) {
+  return !!value && typeof value === "object" && "transports" in value;
+}
+function registerEndpointVariant(service, functionName, endpoint) {
+  const key = makeEndpointKey(service, functionName);
+  let byTransport = endpointRegistry.get(key);
+  if (!byTransport) {
+    byTransport = /* @__PURE__ */ new Map();
+    endpointRegistry.set(key, byTransport);
+  }
+  byTransport.set(endpoint.transport, endpoint);
+}
+function rebuildEndpointRegistry() {
+  endpointRegistry = /* @__PURE__ */ new Map();
+  endpointDefaultTransports = /* @__PURE__ */ new Map();
+  for (const [serviceName, service] of Object.entries(apiMap)) {
+    for (const [functionName, endpoint] of Object.entries(service)) {
+      if (isEndpointSpec(endpoint)) {
+        registerEndpointVariant(serviceName, functionName, endpoint);
+        continue;
+      }
+      if (isEndpointGroup(endpoint)) {
+        if (endpoint.defaultTransport) {
+          endpointDefaultTransports.set(
+            makeEndpointKey(serviceName, functionName),
+            endpoint.defaultTransport
+          );
+        }
+        for (const [transport, config] of Object.entries(endpoint.transports ?? {})) {
+          if (!config) continue;
+          if (transport === "http") {
+            registerEndpointVariant(serviceName, functionName, {
+              id: endpoint.id,
+              transport: "http",
+              http: config,
+              request: endpoint.request,
+              response: endpoint.response
+            });
+          } else if (transport === "ws") {
+            registerEndpointVariant(serviceName, functionName, {
+              id: endpoint.id,
+              transport: "ws",
+              ws: config,
+              request: endpoint.request,
+              response: endpoint.response
+            });
+          } else if (transport === "grpc") {
+            registerEndpointVariant(serviceName, functionName, {
+              id: endpoint.id,
+              transport: "grpc",
+              grpc: config,
+              request: endpoint.request,
+              response: endpoint.response
+            });
+          }
+        }
+        continue;
+      }
+    }
+  }
+}
+function requestApi(args) {
+  const key = makeEndpointKey(args.service, args.functionName);
+  const endpointVariants = endpointRegistry.get(key);
+  if (endpointVariants) {
+    if (!unifiedClient) {
+      throw new Error("SDK not initialized. Please call initSDK first.");
+    }
+    const specDefaultTransport = endpointDefaultTransports.get(key);
+    const endpoint = pickEndpoint(
+      endpointVariants,
+      args.transport,
+      specDefaultTransport,
+      args.service,
+      args.functionName
+    );
+    if (endpoint.transport === "grpc" && !transportState.hasGrpc) {
+      throw new Error("SDK not initialized. Please call initSDK with grpc config.");
+    }
+    if (endpoint.transport === "ws" && !transportState.hasWs) {
+      throw new Error("SDK not initialized. Please call initSDK with ws config.");
+    }
+    if (endpoint.transport === "http" && !transportState.hasHttp) {
+      throw new Error("SDK not initialized. Please call initSDK with http config.");
+    }
+    const meta = args.callOptions || args.wsOptions ? {
+      ...args.meta ?? {},
+      ...args.callOptions ? { callOptions: args.callOptions } : {},
+      ...args.wsOptions ? { wsOptions: args.wsOptions } : {}
+    } : args.meta;
+    return unifiedClient.call(endpoint, args.requestParam, meta);
+  }
+  const serviceInstance = serviceInstances[args.service];
+  const method = serviceInstance?.[args.functionName];
+  if (typeof method === "function") {
+    if (args.callOptions !== void 0) {
+      return method(args.requestParam, args.callOptions);
+    }
+    return method(args.requestParam);
+  }
+  if (!rpcClient) {
+    throw new Error("SDK not initialized. Please call initSDK first.");
+  }
+  return rpcClient.call(args.functionName, args.service, args.requestParam, args.wsOptions);
+}
+function pickEndpoint(variants, transport, specDefaultTransport, service, functionName) {
+  const resolvedTransport = transport ?? specDefaultTransport ?? defaultTransport;
+  if (resolvedTransport !== "auto") {
+    const found = variants.get(resolvedTransport);
+    if (!found) {
+      throw new Error(
+        `Endpoint transport not found: ${service}.${functionName} (${resolvedTransport}). Available: ${Array.from(
+          variants.keys()
+        ).join(", ")}`
+      );
+    }
+    return found;
+  }
+  if (transportState.hasGrpc && variants.has("grpc")) return variants.get("grpc");
+  if (transportState.hasWs && variants.has("ws")) return variants.get("ws");
+  if (transportState.hasHttp && variants.has("http")) return variants.get("http");
+  const fallback = variants.values().next().value;
+  if (!fallback) {
+    throw new Error(`Endpoint not found: ${service}.${functionName}`);
+  }
+  return fallback;
+}
+
 // src/index.ts
 var api;
 var apiErrorCenter;
@@ -6521,6 +6696,9 @@ function destroySDK() {
 function initSDK(config) {
   clearWsStatusBridge();
   wsStatusSnapshot = void 0;
+  if ("uniqueKeyStorage" in config) {
+    setUniqueKeyStorage(config.uniqueKeyStorage);
+  }
   api = new RequestApi({
     ...config
   });