better-grpc 0.1.0 → 0.2.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { pushable } from 'it-pushable';
-import { ChannelCredentials, createChannel, createClientFactory, createServer } from 'nice-grpc';
+import { ChannelCredentials, createChannel, createClientFactory, createServer, Metadata } from 'nice-grpc';
 import { decode, encode } from '@msgpack/msgpack';
 
 var __create = Object.create;
@@ -348,7 +348,7 @@ var require_metadata = __commonJS({
         }
       }
     }
-    var Metadata = class _Metadata {
+    var Metadata2 = class _Metadata {
       constructor(options = {}) {
         this.internalRepr = /* @__PURE__ */ new Map();
         this.opaqueData = /* @__PURE__ */ new Map();
@@ -540,7 +540,7 @@ var require_metadata = __commonJS({
         return result;
       }
     };
-    exports2.Metadata = Metadata;
+    exports2.Metadata = Metadata2;
     var bufToString = (val) => {
       return Buffer.isBuffer(val) ? val.toString("base64") : val;
     };
@@ -7715,7 +7715,7 @@ var require_root = __commonJS({
     var util = require_util();
     var Type;
     var parse2;
-    var common2;
+    var common;
     function Root2(options) {
       Namespace.call(this, "", options);
       this.deferred = [];
@@ -7762,7 +7762,7 @@ var require_root = __commonJS({
         var idx = filename2.lastIndexOf("google/protobuf/");
         if (idx > -1) {
           var altname = filename2.substring(idx);
-          if (altname in common2) return altname;
+          if (altname in common) return altname;
         }
         return null;
       }
@@ -7799,14 +7799,14 @@ var require_root = __commonJS({
           return;
         }
         self2.files.push(filename2);
-        if (filename2 in common2) {
+        if (filename2 in common) {
           if (sync) {
-            process2(filename2, common2[filename2]);
+            process2(filename2, common[filename2]);
           } else {
             ++queued;
             setTimeout(function() {
               --queued;
-              process2(filename2, common2[filename2]);
+              process2(filename2, common[filename2]);
             });
           }
           return;
@@ -7946,7 +7946,7 @@ var require_root = __commonJS({
     Root2._configure = function(Type_, parse_, common_) {
       Type = Type_;
       parse2 = parse_;
-      common2 = common_;
+      common = common_;
     };
   }
 });
@@ -9910,16 +9910,16 @@ var require_parse = __commonJS({
 // node_modules/protobufjs/src/common.js
 var require_common = __commonJS({
   "node_modules/protobufjs/src/common.js"(exports2, module2) {
-    module2.exports = common2;
+    module2.exports = common;
     var commonRe = /\/|\./;
-    function common2(name, json) {
+    function common(name, json) {
       if (!commonRe.test(name)) {
         name = "google/protobuf/" + name + ".proto";
         json = { nested: { google: { nested: { protobuf: { nested: json } } } } };
       }
-      common2[name] = json;
+      common[name] = json;
     }
-    common2("any", {
+    common("any", {
       /**
        * Properties of a google.protobuf.Any message.
        * @interface IAny
@@ -9942,7 +9942,7 @@ var require_common = __commonJS({
       }
     });
     var timeType;
-    common2("duration", {
+    common("duration", {
       /**
        * Properties of a google.protobuf.Duration message.
        * @interface IDuration
@@ -9964,7 +9964,7 @@ var require_common = __commonJS({
         }
       }
     });
-    common2("timestamp", {
+    common("timestamp", {
       /**
        * Properties of a google.protobuf.Timestamp message.
        * @interface ITimestamp
@@ -9975,7 +9975,7 @@ var require_common = __commonJS({
        */
       Timestamp: timeType
     });
-    common2("empty", {
+    common("empty", {
       /**
        * Properties of a google.protobuf.Empty message.
        * @interface IEmpty
@@ -9985,7 +9985,7 @@ var require_common = __commonJS({
         fields: {}
       }
     });
-    common2("struct", {
+    common("struct", {
       /**
        * Properties of a google.protobuf.Struct message.
        * @interface IStruct
@@ -10077,7 +10077,7 @@ var require_common = __commonJS({
         }
       }
     });
-    common2("wrappers", {
+    common("wrappers", {
       /**
        * Properties of a google.protobuf.DoubleValue message.
        * @interface IDoubleValue
@@ -10214,7 +10214,7 @@ var require_common = __commonJS({
         }
       }
     });
-    common2("field_mask", {
+    common("field_mask", {
       /**
        * Properties of a google.protobuf.FieldMask message.
        * @interface IDoubleValue
@@ -10232,8 +10232,8 @@ var require_common = __commonJS({
         }
       }
     });
-    common2.get = function get(file) {
-      return common2[file] || null;
+    common.get = function get(file) {
+      return common[file] || null;
     };
   }
 });
@@ -24041,10 +24041,19 @@ var require_src3 = __commonJS({
 
 // src/core/rpc-signatures.ts
 function server() {
-  return {
+  const descriptor = {
     serviceType: "server",
     methodType: "unary"
   };
+  const contextFn = (context) => {
+    descriptor.config = {
+      metadata: context.metadata !== void 0,
+      ack: false
+    };
+    return descriptor;
+  };
+  Object.assign(contextFn, descriptor);
+  return contextFn;
 }
 function client() {
   return {
@@ -24052,6 +24061,21 @@ function client() {
     methodType: "unary"
   };
 }
+function bidi(..._) {
+  const descriptor = {
+    serviceType: "bidi",
+    methodType: "bidi"
+  };
+  const configFn = (config) => {
+    descriptor.config = {
+      metadata: config.metadata !== void 0,
+      ack: config.ack ?? false
+    };
+    return descriptor;
+  };
+  Object.assign(configFn, descriptor);
+  return configFn;
+}
 
 // src/core/service.ts
 var ServiceImpl = class {
@@ -24112,18 +24136,18 @@ function loadProtoFromString(source) {
 function encodeRequestMessage(id, value) {
   return {
     id,
-    value: encode(value)
+    value: value === void 0 ? void 0 : encode(value)
   };
 }
 function decodeRequestMessage(message) {
   const id = message.id;
-  const mapData = message.value === void 0 ? [] : decode(message.value);
+  const mapData = message.value === void 0 ? void 0 : decode(message.value);
   return [id, mapData];
 }
 function encodeResponseMessage(id, value) {
   return {
     id,
-    value: encode(value)
+    value: value === void 0 ? void 0 : encode(value)
   };
 }
 function decodeResponseMessage(message) {
@@ -24131,6 +24155,18 @@ function decodeResponseMessage(message) {
   const mapData = message.value === void 0 ? void 0 : decode(message.value);
   return [id, mapData];
 }
+function encodeMetadata(raw) {
+  const m = new Metadata();
+  m.set("better-grpc", JSON.stringify(raw));
+  return m;
+}
+function decodeMetadata(metadata) {
+  const betterGrpcMetadata = metadata.get("better-grpc");
+  if (!betterGrpcMetadata) {
+    throw new Error("Failed to decode metadata: 'better-grpc' key not found in gRPC metadata");
+  }
+  return JSON.parse(betterGrpcMetadata);
+}
 
 // src/runtime/proto-builder.ts
 function buildProtoString(services) {
@@ -24179,6 +24215,11 @@ var GrpcClient = class {
   clientFactory;
   proto;
   clients = /* @__PURE__ */ new Map();
+  pushableStreams = {};
+  pendingStreams = /* @__PURE__ */ new Map();
+  pendingBidi = /* @__PURE__ */ new Map();
+  // bidi that is waiting for context
+  pendingBidiAck = /* @__PURE__ */ new Map();
   constructor(address, serviceImpls) {
     this.address = address;
     this.serviceImpls = serviceImpls;
@@ -24203,27 +24244,90 @@ var GrpcClient = class {
       this.clients.set(serviceImpl.serviceClass.serviceName, client2);
     }
   }
+  setStream(serviceName, methodName, stream) {
+    if (!this.pushableStreams[serviceName]) {
+      this.pushableStreams[serviceName] = {};
+    }
+    this.pushableStreams[serviceName][methodName.toUpperCase()] = stream;
+    if (this.pendingStreams.has(`${serviceName}.${methodName.toUpperCase()}`)) {
+      const resolve = this.pendingStreams.get(`${serviceName}.${methodName.toUpperCase()}`);
+      resolve?.(stream);
+      this.pendingStreams.delete(`${serviceName}.${methodName.toUpperCase()}`);
+    }
+  }
+  async getStream(serviceName, methodName) {
+    const stream = this.pushableStreams[serviceName]?.[methodName.toUpperCase()];
+    if (!stream) {
+      return new Promise((resolve) => {
+        this.pendingStreams.set(`${serviceName}.${methodName.toUpperCase()}`, resolve);
+      });
+    }
+    return stream;
+  }
   watching() {
     for (const serviceImpl of this.serviceImpls) {
       const client2 = this.clients.get(serviceImpl.serviceClass.serviceName);
       for (const [name, descriptor] of Object.entries(serviceImpl.methods())) {
-        switch (descriptor.serviceType) {
-          case "client":
-            switch (descriptor.methodType) {
-              case "unary": {
-                const incomingStream = pushable({ objectMode: true });
-                const incomingMessages = client2[name.toUpperCase()](incomingStream);
-                (async () => {
+        switch (`${descriptor.serviceType}:${descriptor.methodType}`) {
+          case "client:unary": {
+            const incomingStream = pushable({ objectMode: true });
+            const incomingMessages = client2[name.toUpperCase()](incomingStream);
+            (async () => {
+              try {
+                for await (const message of incomingMessages) {
+                  const [id, value] = decodeRequestMessage(message);
+                  const responseValue = await serviceImpl.implementation[name](...value ?? []);
+                  incomingStream.push(encodeResponseMessage(id, responseValue));
+                }
+              } finally {
+                incomingStream.end();
+              }
+            })();
+            break;
+          }
+          case "bidi:bidi": {
+            const setupBidi = (context) => {
+              const outStream = pushable({ objectMode: true });
+              const inStream = pushable({ objectMode: true });
+              this.setStream(
+                `${serviceImpl.serviceClass.serviceName}_OUT`,
+                name.toUpperCase(),
+                outStream
+              );
+              this.setStream(`${serviceImpl.serviceClass.serviceName}_IN`, name.toUpperCase(), inStream);
+              const incomingMessages = context ? client2[name.toUpperCase()](outStream, { metadata: encodeMetadata(context.metadata) }) : client2[name.toUpperCase()](outStream);
+              (async () => {
+                try {
                   for await (const message of incomingMessages) {
                     const [id, value] = decodeRequestMessage(message);
-                    const responseValue = await serviceImpl.implementation[name](...value);
-                    incomingStream.push(encodeResponseMessage(id, responseValue));
+                    if (id && descriptor.config?.ack && value === void 0) {
+                      this.pendingBidiAck.get(id)?.();
+                      this.pendingBidiAck.delete(id);
+                    } else {
+                      inStream.push(value ?? []);
+                      if (id && descriptor.config?.ack) {
+                        outStream.push(encodeRequestMessage(id, void 0));
+                      }
+                    }
                   }
-                })();
-                break;
-              }
+                } finally {
+                  inStream.end();
+                  outStream.end();
+                }
+              })();
+            };
+            if (descriptor.config?.metadata) {
+              (async () => {
+                const context = await new Promise((resolve) => {
+                  this.pendingBidi.set(`${serviceImpl.serviceClass.serviceName}.${name}`, resolve);
+                });
+                setupBidi(context);
+              })();
+            } else {
+              setupBidi(void 0);
             }
             break;
+          }
         }
       }
     }
@@ -24233,13 +24337,72 @@ var GrpcClient = class {
       const serviceCallableInstance = {};
       for (const [name, descriptor] of Object.entries(serviceImpl.methods())) {
         switch (`${descriptor.serviceType}:${descriptor.methodType}`) {
-          case "server:unary":
-            serviceCallableInstance[name] = async (...args) => {
-              const response = await this.clients.get(serviceImpl.serviceClass.serviceName)[name.toUpperCase()](encodeRequestMessage(void 0, args));
-              const [_, value] = decodeResponseMessage(response);
-              return value;
+          case "server:unary": {
+            if (descriptor.config?.metadata) {
+              serviceCallableInstance[name] = (...args) => {
+                return {
+                  withMeta: async (metadata) => {
+                    const response = await this.clients.get(serviceImpl.serviceClass.serviceName)[name.toUpperCase()](encodeRequestMessage(void 0, args), {
+                      metadata: encodeMetadata(metadata)
+                    });
+                    const [_, value] = decodeResponseMessage(response);
+                    return value;
+                  }
+                };
+              };
+            } else {
+              serviceCallableInstance[name] = async (...args) => {
+                const response = await this.clients.get(serviceImpl.serviceClass.serviceName)[name.toUpperCase()](encodeRequestMessage(void 0, args));
+                const [_, value] = decodeResponseMessage(response);
+                return value;
+              };
+            }
+            break;
+          }
+          case "bidi:bidi": {
+            async function* generator(client2) {
+              const inStream = await client2.getStream(
+                `${serviceImpl.serviceClass.serviceName}_IN`,
+                name.toUpperCase()
+              );
+              yield* inStream;
+            }
+            const emitFn = async (...args) => {
+              const outStream = await this.getStream(
+                `${serviceImpl.serviceClass.serviceName}_OUT`,
+                name.toUpperCase()
+              );
+              const ackId = descriptor.config?.ack ? crypto.randomUUID() : void 0;
+              outStream.push(encodeRequestMessage(ackId, args));
+              if (ackId) {
+                return new Promise((resolve) => {
+                  this.pendingBidiAck.set(ackId, resolve);
+                });
+              }
             };
+            const context = {
+              context: async (ctx) => {
+                const resolve = this.pendingBidi.get(`${serviceImpl.serviceClass.serviceName}.${name}`);
+                if (resolve) {
+                  resolve(ctx);
+                  this.pendingBidi.delete(`${serviceImpl.serviceClass.serviceName}.${name}`);
+                }
+              }
+            };
+            const hybrid = Object.assign(emitFn, {
+              [Symbol.asyncIterator]: () => {
+                const iterator = generator(this);
+                return {
+                  next: iterator.next.bind(iterator),
+                  return: iterator.return.bind(iterator),
+                  throw: iterator.throw.bind(iterator)
+                };
+              }
+            });
+            Object.assign(hybrid, context);
+            serviceCallableInstance[name] = hybrid;
             break;
+          }
         }
       }
       Object.defineProperty(this, serviceImpl.serviceClass.serviceName, {
@@ -24291,9 +24454,10 @@ function createServiceImpl(serviceImpl, grpcServer) {
   for (const [name, descriptor] of Object.entries(serviceImpl.methods())) {
     switch (`${descriptor.serviceType}:${descriptor.methodType}`) {
       case "server:unary":
-        grpcImpl[name.toUpperCase()] = async (req) => {
+        grpcImpl[name.toUpperCase()] = async (req, ctx) => {
           const [_, value] = decodeRequestMessage(req);
-          const result = await serviceImpl.implementation[name](...value);
+          const args = descriptor.config?.metadata ? [{ metadata: decodeMetadata(ctx.metadata) }, ...value ?? []] : value ?? [];
+          const result = await serviceImpl.implementation[name](...args);
           return encodeResponseMessage(void 0, result);
         };
         break;
@@ -24302,19 +24466,55 @@ function createServiceImpl(serviceImpl, grpcServer) {
           const stream = pushable({ objectMode: true });
           grpcServer.setStream(serviceImpl.serviceClass.serviceName, name, stream);
           (async () => {
-            for await (const message of incomingStream) {
-              const [id, value] = decodeResponseMessage(message);
-              if (id) {
-                grpcServer.resolveResponse(id, value);
-              } else {
-                throw new Error(`Invalid response message: ${message}`);
+            try {
+              for await (const message of incomingStream) {
+                const [id, value] = decodeResponseMessage(message);
+                if (id) {
+                  grpcServer.resolveResponse(id, value);
+                } else {
+                  throw new Error(`Invalid response message: ${message}`);
+                }
               }
+            } finally {
+              stream.end();
             }
-            stream.end();
           })();
           yield* stream;
         };
         break;
+      case "bidi:bidi":
+        grpcImpl[name.toUpperCase()] = async function* (incomingStream, ctx) {
+          if (descriptor.config?.metadata) {
+            grpcServer.setContext(serviceImpl.serviceClass.serviceName, name, {
+              metadata: decodeMetadata(ctx.metadata)
+            });
+          }
+          const outStream = pushable({ objectMode: true });
+          const inStream = pushable({ objectMode: true });
+          grpcServer.setStream(`${serviceImpl.serviceClass.serviceName}_OUT`, name, outStream);
+          grpcServer.setStream(`${serviceImpl.serviceClass.serviceName}_IN`, name, inStream);
+          (async () => {
+            try {
+              for await (const message of incomingStream) {
+                const [id, value] = decodeResponseMessage(message);
+                if (id && descriptor.config?.ack && value === void 0) {
+                  grpcServer.pendingBidiAck.get(id)?.();
+                  grpcServer.pendingBidiAck.delete(id);
+                } else {
+                  inStream.push(value ?? []);
+                  if (id && descriptor.config?.ack) {
+                    outStream.push(encodeRequestMessage(id, void 0));
+                  }
+                }
+              }
+            } finally {
+              inStream.end();
+              outStream.end();
+            }
+          })();
+          yield* outStream;
+        };
+        break;
       default:
         throw new Error(`Unknown method descriptor: ${descriptor} for ${name}`);
     }
@@ -24331,6 +24531,9 @@ var GrpcServer = class {
   pushableStreams = {};
   pendingRequests = /* @__PURE__ */ new Map();
   pendingStreams = /* @__PURE__ */ new Map();
+  contexts = /* @__PURE__ */ new Map();
+  pendingContext = /* @__PURE__ */ new Map();
+  pendingBidiAck = /* @__PURE__ */ new Map();
   constructor(address, serviceImpls) {
     this.address = address;
     this.serviceImpls = serviceImpls;
@@ -24347,6 +24550,9 @@ var GrpcServer = class {
     await this.grpcServer.listen(this.address);
   }
   setStream(serviceName, methodName, stream) {
+    if (!this.pushableStreams[serviceName]) {
+      this.pushableStreams[serviceName] = {};
+    }
     this.pushableStreams[serviceName][methodName.toUpperCase()] = stream;
     if (this.pendingStreams.has(`${serviceName}.${methodName.toUpperCase()}`)) {
       const resolve = this.pendingStreams.get(`${serviceName}.${methodName.toUpperCase()}`);
@@ -24355,7 +24561,7 @@ var GrpcServer = class {
     }
   }
   async getStream(serviceName, methodName) {
-    const stream = this.pushableStreams[serviceName][methodName.toUpperCase()];
+    const stream = this.pushableStreams[serviceName]?.[methodName.toUpperCase()];
     if (!stream) {
       return new Promise((resolve) => {
         this.pendingStreams.set(`${serviceName}.${methodName.toUpperCase()}`, resolve);
@@ -24363,6 +24569,23 @@ var GrpcServer = class {
     }
     return stream;
   }
+  setContext(serviceName, methodName, context) {
+    this.contexts.set(`${serviceName}.${methodName.toUpperCase()}`, context);
+    if (this.pendingContext.has(`${serviceName}.${methodName.toUpperCase()}`)) {
+      const resolve = this.pendingContext.get(`${serviceName}.${methodName.toUpperCase()}`);
+      resolve?.(context);
+      this.pendingContext.delete(`${serviceName}.${methodName.toUpperCase()}`);
+    }
+  }
+  async getContext(serviceName, methodName) {
+    const context = this.contexts.get(`${serviceName}.${methodName.toUpperCase()}`);
+    if (!context) {
+      return new Promise((resolve) => {
+        this.pendingContext.set(`${serviceName}.${methodName.toUpperCase()}`, resolve);
+      });
+    }
+    return context;
+  }
   resolveResponse(id, value) {
     const resolve = this.pendingRequests.get(id);
     if (!resolve) {
@@ -24386,6 +24609,44 @@ var GrpcServer = class {
               });
             };
             break;
+          case "bidi:bidi": {
+            async function* generator(server2) {
+              const inStream = await server2.getStream(
+                `${serviceImpl.serviceClass.serviceName}_IN`,
+                name.toUpperCase()
+              );
+              yield* inStream;
+            }
+            const emitFn = async (...args) => {
+              const outStream = await this.getStream(
+                `${serviceImpl.serviceClass.serviceName}_OUT`,
+                name.toUpperCase()
+              );
+              const ackId = descriptor.config?.ack ? crypto.randomUUID() : void 0;
+              outStream.push(encodeRequestMessage(ackId, args));
+              if (ackId) {
+                return new Promise((resolve) => {
+                  this.pendingBidiAck.set(ackId, resolve);
+                });
+              }
+            };
+            const context = {
+              context: this.getContext(serviceImpl.serviceClass.serviceName, name)
+            };
+            const hybrid = Object.assign(emitFn, {
+              [Symbol.asyncIterator]: () => {
+                const iterator = generator(this);
+                return {
+                  next: iterator.next.bind(iterator),
+                  return: iterator.return.bind(iterator),
+                  throw: iterator.throw.bind(iterator)
+                };
+              }
+            });
+            Object.assign(hybrid, context);
+            serviceCallableInstance[name] = hybrid;
+            break;
+          }
         }
       }
       Object.defineProperty(this, serviceImpl.serviceClass.serviceName, {
@@ -24449,6 +24710,6 @@ long/umd/index.js:
    *)
 */
 
-export { Service, client, createGrpcClient, createGrpcServer, server };
+export { Service, bidi, client, createGrpcClient, createGrpcServer, server };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map