Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/v1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export type ZedDefaultClientInterface = OmitBaseMethods<
OmitBaseMethods<SchemaServiceClient, grpc.Client> &
OmitBaseMethods<WatchServiceClient, grpc.Client> &
OmitBaseMethods<ExperimentalServiceClient, grpc.Client> &
OmitBaseMethods<WatchPermissionsServiceClient, grpc.Client> &
OmitBaseMethods<WatchPermissionSetsServiceClient, grpc.Client> &
Pick<grpc.Client, "close">;

// The promisified version of the interface
Expand All @@ -36,6 +38,8 @@ export type ZedPromiseClientInterface =
PromisifiedClient<SchemaServiceClient> &
PromisifiedClient<WatchServiceClient> &
PromisifiedClient<ExperimentalServiceClient> &
PromisifiedClient<WatchPermissionsServiceClient> &
PromisifiedClient<WatchPermissionSetsServiceClient> &
Pick<ZedDefaultClientInterface, "close">;

// A combined client containing the root gRPC client methods and a promisified set at a "promises" key
Expand Down Expand Up @@ -124,9 +128,14 @@ class ZedClient implements ProxyHandler<ZedDefaultClientInterface> {
}

close = () => {
[this.acl, this.ns, this.watch, this.experimental].forEach((client) =>
client?.close(),
);
[
this.acl,
this.ns,
this.watch,
this.experimental,
this.watchPermissions,
this.watchPermissionSets,
].forEach((client) => client?.close());
};

get(_target: object, name: string | symbol) {
Expand Down