Use new protobuf lib

CHANGELOG.md

@@ -1,5 +1,9 @@
 # vNext
 
+# v0.17.0
+
+-   (bc) Use new protobuf lib
+
 # v0.16.0
 
 -   (feature) Add wait condition to `getData` of delivery client

package.json

@@ -20,24 +20,27 @@
     "files": [
         "dist/**/*"
     ],
+    "engines": {
+        "node": ">=16"
+    },
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "dependencies": {
-        "@fraym/projections-proto": "^1.0.0",
+        "@fraym/proto": "^0.3.0",
         "@graphql-tools/graphql-file-loader": "^7.5.17",
         "@graphql-tools/load": "^7.8.14",
-        "@grpc/grpc-js": "^1.8.18",
+        "@grpc/grpc-js": "^1.9.7",
         "dotenv": "^16.3.1",
-        "graphql": "^16.7.1",
+        "graphql": "^16.8.1",
         "yargs": "^17.7.2"
     },
     "devDependencies": {
         "@becklyn/prettier": "^1.0.2",
-        "@types/uuid": "^9.0.2",
-        "@types/yargs": "^17.0.24",
+        "@types/uuid": "^9.0.6",
+        "@types/yargs": "^17.0.29",
         "prettier": "^2.8.8",
-        "typescript": "^5.1.6",
-        "uuid": "^9.0.0"
+        "typescript": "^5.2.2",
+        "uuid": "^9.0.1"
     },
     "prettier": "@becklyn/prettier"
 }

src/delivery/auth.ts

@@ -1,4 +1,4 @@
-import { AuthData as PbAuthData } from "@fraym/projections-proto";
+import { AuthData as PbAuthData } from "@fraym/proto/freym/projections/delivery";
 
 export interface AuthData {
     tenantId: string;

src/delivery/client.ts

@@ -1,4 +1,4 @@
-import { DeliveryServiceClient } from "@fraym/projections-proto";
+import { ServiceClient } from "@fraym/proto/freym/projections/delivery";
 import { credentials } from "@grpc/grpc-js";
 import { DeliveryClientConfig, useDeliveryConfigDefaults } from "../config/config";
 import { Filter } from "./filter";
@@ -52,15 +52,11 @@ export interface DeliveryClient {
 
 export const newDeliveryClient = async (config?: DeliveryClientConfig): Promise<DeliveryClient> => {
     config = useDeliveryConfigDefaults(config);
-    const serviceClient = new DeliveryServiceClient(
-        config.serverAddress,
-        credentials.createInsecure(),
-        {
-            "grpc.keepalive_time_ms": config.keepaliveInterval,
-            "grpc.keepalive_timeout_ms": config.keepaliveTimeout,
-            "grpc.keepalive_permit_without_calls": 1,
-        }
-    );
+    const serviceClient = new ServiceClient(config.serverAddress, credentials.createInsecure(), {
+        "grpc.keepalive_time_ms": config.keepaliveInterval,
+        "grpc.keepalive_timeout_ms": config.keepaliveTimeout,
+        "grpc.keepalive_permit_without_calls": 1,
+    });
 
     const getData = async <T extends {}>(
         projection: string,

src/delivery/delete.ts

@@ -1,4 +1,4 @@
-import { DeliveryServiceClient } from "@fraym/projections-proto";
+import { ServiceClient } from "@fraym/proto/freym/projections/delivery";
 
 import { AuthData, getProtobufAuthData } from "./auth";
 import { EventMetadata } from "./eventMetadata";
@@ -10,7 +10,7 @@ export const deleteProjectionData = async (
     dataId: string,
     filter: Filter,
     eventMetadata: EventMetadata,
-    serviceClient: DeliveryServiceClient
+    serviceClient: ServiceClient
 ): Promise<number> => {
     return new Promise<number>((resolve, reject) => {
         serviceClient.deleteData(

src/delivery/filter.ts

@@ -1,4 +1,4 @@
-import { DataFilter } from "@fraym/projections-proto";
+import { DataFilter } from "@fraym/proto/freym/projections/delivery";
 
 export interface Filter {
     fields: Record<string, FieldFilter>;

src/delivery/getData.ts

@@ -1,4 +1,4 @@
-import { DeliveryServiceClient } from "@fraym/projections-proto";
+import { ServiceClient } from "@fraym/proto/freym/projections/delivery";
 import { AuthData, getProtobufAuthData } from "./auth";
 import { Filter, getProtobufDataFilter } from "./filter";
 import { Wait, getProtobufDataWait } from "./wait";
@@ -9,7 +9,7 @@ export const getProjectionData = async <T extends {}>(
     dataId: string,
     filter: Filter,
     returnEmptyDataIfNotFound: boolean,
-    serviceClient: DeliveryServiceClient,
+    serviceClient: ServiceClient,
     wait?: Wait
 ): Promise<T | null> => {
     return new Promise<T | null>((resolve, reject) => {

src/delivery/getDataList.ts

@@ -1,4 +1,4 @@
-import { DeliveryServiceClient } from "@fraym/projections-proto";
+import { ServiceClient } from "@fraym/proto/freym/projections/delivery";
 import { AuthData, getProtobufAuthData } from "./auth";
 import { Filter, getProtobufDataFilter } from "./filter";
 import { getProtobufDataOrder, Order } from "./order";
@@ -17,7 +17,7 @@ export const getProjectionDataList = async <T extends {}>(
     page: number,
     filter: Filter,
     order: Order[],
-    serviceClient: DeliveryServiceClient
+    serviceClient: ServiceClient
 ): Promise<GetProjectionDataList<T> | null> => {
     return new Promise<GetProjectionDataList<T> | null>((resolve, reject) => {
         serviceClient.getDataList(

src/delivery/order.ts

@@ -1,4 +1,4 @@
-import { DataOrder } from "@fraym/projections-proto";
+import { DataOrder } from "@fraym/proto/freym/projections/delivery";
 
 export interface Order {
     field: string;

src/delivery/upsert.ts

@@ -1,4 +1,4 @@
-import { DeliveryServiceClient } from "@fraym/projections-proto";
+import { ServiceClient } from "@fraym/proto/freym/projections/delivery";
 import { AuthData, getProtobufAuthData } from "./auth";
 import { EventMetadata } from "./eventMetadata";
 
@@ -32,7 +32,7 @@ export const upsertProjectionData = async <T extends {}>(
     dataId: string,
     payload: Record<string, any>,
     eventMetadata: EventMetadata,
-    serviceClient: DeliveryServiceClient
+    serviceClient: ServiceClient
 ): Promise<UpsertResponse<T>> => {
     const usedPayload: Record<string, string> = {};
 

src/delivery/wait.ts

@@ -1,4 +1,4 @@
-import { DataWait } from "@fraym/projections-proto";
+import { DataWait } from "@fraym/proto/freym/projections/delivery";
 import { Filter, getProtobufDataFilter } from "./filter";
 
 export interface Wait {