better-grpc 0.3.1 → 0.3.2

package/README.md

@@ -96,6 +96,16 @@ import { createGrpcClient } from 'better-grpc';
 const client = await createGrpcClient('localhost:50051', myClientImpl);
 ```
 
+By default, SSL/TLS is auto-detected based on the address (SSL for non-localhost addresses). You can explicitly specify credentials:
+
+```typescript
+// Force SSL/TLS connection
+const client = await createGrpcClient('my-server.com:50051', 'ssl', myClientImpl);
+
+// Force insecure (plaintext) connection
+const client = await createGrpcClient('my-server.com:50051', 'insecure', myClientImpl);
+```
+
 You can also override gRPC channel options (defaults are exported as `DEFAULT_OPTIONS`):
 
 ```typescript
@@ -293,12 +303,20 @@ Creates and starts a gRPC server. Returns service callables that can be invoked
 
 - `createGrpcClient(address: string, ...services: ServiceImpl[])`
 
-Creates and starts a gRPC client using `DEFAULT_OPTIONS`.
+Creates and starts a gRPC client using `DEFAULT_OPTIONS`. SSL/TLS is auto-detected based on the address (SSL for non-localhost addresses).
+
+- `createGrpcClient(address: string, credentials: "ssl" | "insecure", ...services: ServiceImpl[])`
+
+Creates and starts a gRPC client with explicit credential mode. Use `"ssl"` for TLS or `"insecure"` for plaintext connections.
 
 - `createGrpcClient(address: string, options: ChannelOptions, ...services: ServiceImpl[])`
 
 Creates and starts a gRPC client with custom gRPC channel options. `DEFAULT_OPTIONS` is exported for easy overrides.
 
+- `createGrpcClient(address: string, credentials: "ssl" | "insecure", options: ChannelOptions, ...services: ServiceImpl[])`
+
+Creates and starts a gRPC client with both explicit credentials and custom channel options.
+
 ### Server-side bidi listen
 
 For bidi streams, the server exposes a `.listen()` method to handle incoming connections:

package/dist/index.d.ts

@@ -100,6 +100,16 @@ type ServiceNameOf<T extends ServiceImpl<any, any>> = T extends ServiceImpl<infe
 type ServiceCallable<T, WithListen extends boolean = true> = T extends ServiceImpl<infer S, infer Mode> ? Mode extends "server" ? ClientCallable<InstanceType<S>, WithListen> : ServerCallable<InstanceType<S>> : never;
 
 declare const DEFAULT_OPTIONS: ChannelOptions;
+declare function createGrpcClient<T extends ServiceImpl<any, "client">[]>(address: string, credentials: "ssl" | "insecure", ...serviceImpls: T): Promise<{
+    [I in T[number] as ServiceNameOf<I>]: ServiceCallable<I>;
+} & {
+    clientID: string;
+}>;
+declare function createGrpcClient<T extends ServiceImpl<any, "client">[]>(address: string, credentials: "ssl" | "insecure", grpcOptions: ChannelOptions, ...serviceImpls: T): Promise<{
+    [I in T[number] as ServiceNameOf<I>]: ServiceCallable<I>;
+} & {
+    clientID: string;
+}>;
 declare function createGrpcClient<T extends ServiceImpl<any, "client">[]>(address: string, ...serviceImpls: T): Promise<{
     [I in T[number] as ServiceNameOf<I>]: ServiceCallable<I>;
 } & {

package/dist/index.js

@@ -24226,13 +24226,20 @@ var GrpcClient = class {
   pendingBidi = /* @__PURE__ */ new Map();
   // bidi that is waiting for context
   pendingBidiAck = /* @__PURE__ */ new Map();
-  constructor(address, grpcOptions, serviceImpls) {
+  constructor(address, credentialsArg, grpcOptions, serviceImpls) {
     this.clientID = crypto.randomUUID();
     this.address = address;
     this.serviceImpls = serviceImpls;
     this.proto = loadProtoFromString(buildProtoString(serviceImpls));
-    const useSSL = !address.includes("localhost") && !address.includes("127.0.0.1") && !address.includes("0.0.0.0");
-    const credentials = useSSL ? ChannelCredentials.createSsl() : ChannelCredentials.createInsecure();
+    let credentials;
+    if (credentialsArg === "ssl") {
+      credentials = ChannelCredentials.createSsl();
+    } else if (credentialsArg === "insecure") {
+      credentials = ChannelCredentials.createInsecure();
+    } else {
+      const useSSL = !address.includes("localhost") && !address.includes("127.0.0.1") && !address.includes("0.0.0.0");
+      credentials = useSSL ? ChannelCredentials.createSsl() : ChannelCredentials.createInsecure();
+    }
     this.channel = createChannel(address, credentials, grpcOptions);
     this.clientFactory = createClientFactory();
   }
@@ -24458,12 +24465,39 @@ var DEFAULT_OPTIONS = {
   "grpc.keepalive_timeout_ms": 1e4,
   "grpc.keepalive_permit_without_calls": 1
 };
-async function createGrpcClient(address, grpcOptionsOrServiceImpls, ...serviceImpls) {
-  const isServiceImpl = grpcOptionsOrServiceImpls instanceof Object && "type" in grpcOptionsOrServiceImpls && "serviceClass" in grpcOptionsOrServiceImpls;
-  const isChannelOptions = !isServiceImpl;
-  const grpcOptions = isChannelOptions ? grpcOptionsOrServiceImpls : DEFAULT_OPTIONS;
-  const allServiceImpls = isChannelOptions ? serviceImpls : [grpcOptionsOrServiceImpls, ...serviceImpls];
-  const grpcClientInstance = new GrpcClient(address, grpcOptions, allServiceImpls);
+async function createGrpcClient(address, credentialsOrOptionsOrServiceImpl, grpcOptionsOrServiceImpl, ...serviceImpls) {
+  const isServiceImpl = (val) => val instanceof Object && "type" in val && "serviceClass" in val;
+  const isCredentials = (val) => val === "ssl" || val === "insecure";
+  const isChannelOptions = (val) => val instanceof Object && !isServiceImpl(val);
+  let credentials;
+  let grpcOptions = DEFAULT_OPTIONS;
+  let allServiceImpls;
+  if (isCredentials(credentialsOrOptionsOrServiceImpl)) {
+    credentials = credentialsOrOptionsOrServiceImpl;
+    if (grpcOptionsOrServiceImpl === void 0) {
+      allServiceImpls = serviceImpls;
+    } else if (isServiceImpl(grpcOptionsOrServiceImpl)) {
+      allServiceImpls = [grpcOptionsOrServiceImpl, ...serviceImpls];
+    } else {
+      grpcOptions = grpcOptionsOrServiceImpl;
+      allServiceImpls = serviceImpls;
+    }
+  } else if (isServiceImpl(credentialsOrOptionsOrServiceImpl)) {
+    allServiceImpls = [credentialsOrOptionsOrServiceImpl];
+    if (grpcOptionsOrServiceImpl !== void 0) {
+      allServiceImpls.push(grpcOptionsOrServiceImpl, ...serviceImpls);
+    }
+  } else if (isChannelOptions(credentialsOrOptionsOrServiceImpl)) {
+    grpcOptions = credentialsOrOptionsOrServiceImpl;
+    if (grpcOptionsOrServiceImpl !== void 0) {
+      allServiceImpls = [grpcOptionsOrServiceImpl, ...serviceImpls];
+    } else {
+      allServiceImpls = serviceImpls;
+    }
+  } else {
+    allServiceImpls = serviceImpls;
+  }
+  const grpcClientInstance = new GrpcClient(address, credentials, grpcOptions, allServiceImpls);
   grpcClientInstance.start();
   await grpcClientInstance.waitUntilReady();
   grpcClientInstance.watching();