From 68142ab010ebed4ead30d8f4ff5c1ba4dd242554 Mon Sep 17 00:00:00 2001
From: Devendra Gaud <devendragaud01@gmail.com>
Date: Wed, 14 Aug 2024 06:44:11 +0000
Subject: [PATCH] package and version updated

---
 package.json |  4 ++--
 src/index.ts | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 5e18b7d..f67f468 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@grpc/proto-loader": "^0.3.0",
-    "grpc": "^1.15.1"
+    "@grpc/grpc-js": "^1.11.1",
+    "@grpc/proto-loader": "^0.7.13"
   },
   "devDependencies": {
     "@types/node": "^10.11.3"
diff --git a/src/index.ts b/src/index.ts
index fadfd9c..62533e1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,10 +1,9 @@
-import * as grpc from "grpc";
-import * as http from "http";
+import {GrpcObject, ServiceClientConstructor, ProtobufTypeDefinition, loadPackageDefinition, credentials, ServiceError} from "@grpc/grpc-js";
 import { loadSync } from "@grpc/proto-loader";
 
 const GRPC_SERVER = process.env.DWARF_GRPC_SERVER;
 const PROTO_PATH = __dirname + "./../dwarf.proto";
-let dwarfProto: grpc.GrpcObject;
+let dwarfProto: GrpcObject | ServiceClientConstructor | ProtobufTypeDefinition;
 
 if (!GRPC_SERVER) {
   console.warn("You must set a GRPC server. Dwarf will not work.");
@@ -13,13 +12,12 @@ if (!GRPC_SERVER) {
 export interface ServerResponse {
   urls: string[];
 }
-
-export function grpcObj(): grpc.GrpcObject {
+function grpcObj(): GrpcObject | ServiceClientConstructor | ProtobufTypeDefinition {
   if (dwarfProto) {
     return dwarfProto;
   }
 
-  dwarfProto = grpc.loadPackageDefinition(loadSync(PROTO_PATH)).pb;
+  dwarfProto = loadPackageDefinition(loadSync(PROTO_PATH)).pb;
 
   return dwarfProto;
 }
@@ -27,12 +25,12 @@ export function grpcObj(): grpc.GrpcObject {
 export function shorten(urls: string[]) {
   return new Promise((resolve, reject) => {
     const Proto = grpcObj();
-    const client = new Proto.Dwarf(
+    const client = new (Proto as any).Dwarf(
       GRPC_SERVER,
-      grpc.credentials.createInsecure()
+      credentials.createInsecure()
     );
 
-    client.Create({ urls }, (err: Error, res: ServerResponse) => {
+    client.Create({ urls }, (err: ServiceError | null, res: ServerResponse) => {
       if (err) {
         reject(err);
       } else {