From 2ef5b8cb2dea6a9baa53d62f10ce10a4d84dc3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20J=2E=20Over=C3=A5?= <k@rl.run>
Date: Wed, 5 Dec 2018 16:36:34 +0100
Subject: [PATCH] Update eureka-js-client to 4.4 typing

---
 .../eureka-js-client-tests.ts                 | 24 +++++++++++++++++++
 types/eureka-js-client/index.d.ts             | 11 ++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/types/eureka-js-client/eureka-js-client-tests.ts b/types/eureka-js-client/eureka-js-client-tests.ts
index 109dab0278..b4b5c5f54e 100644
--- a/types/eureka-js-client/eureka-js-client-tests.ts
+++ b/types/eureka-js-client/eureka-js-client-tests.ts
@@ -19,3 +19,27 @@ const client = new Eureka({
     port: 32768,
   }
 });
+
+// example configuration against newer Eureka (https://www.npmjs.com/package/eureka-js-client#400-bad-request-errors-from-eureka-server)
+const newerClient = new Eureka({
+  // application instance information
+  instance: {
+    app: 'jqservice',
+    hostName: 'localhost',
+    ipAddr: '127.0.0.1',
+    port: {
+      $: 443,
+      '@enabled': true
+    },
+    vipAddress: 'jq.test.something.com',
+    dataCenterInfo: {
+      '@class': 'com.netflix.appinfo.InstanceInfo$DefaultDataCenterInfo',
+      name: 'MyOwn',
+    },
+  },
+  eureka: {
+    // eureka server host / port
+    host: '192.168.99.100',
+    port: 32768,
+  }
+});
diff --git a/types/eureka-js-client/index.d.ts b/types/eureka-js-client/index.d.ts
index bfd9f10666..693e1b8ec8 100644
--- a/types/eureka-js-client/index.d.ts
+++ b/types/eureka-js-client/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for eureka-js-client 4.3
+// Type definitions for eureka-js-client 4.4
 // Project: https://github.com/jquatier/eureka-js-client
-// Definitions by: Ilko Hoffmann <https://github.com/Schnillz>
+// Definitions by: Ilko Hoffmann <https://github.com/Schnillz>, Karl O. <https://github.com/karl-run>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class Eureka {
@@ -26,7 +26,7 @@ export namespace EurekaClient {
         ipAddr: string;
         vipAddress: string;
         dataCenterInfo: DataCenterInfo;
-        port?: number;
+        port?: number | LegacyPortWrapper;
         instanceId?: string;
         appGroupName?: string;
         sid?: string;
@@ -61,6 +61,10 @@ export namespace EurekaClient {
         useLocalMetadata?: boolean;
         preferIpAddress?: boolean;
     }
+    interface LegacyPortWrapper {
+        '$': number;
+        '@enabled': boolean;
+    }
     interface PortWrapper {
         enabled: boolean;
         port: number;
@@ -71,5 +75,6 @@ export namespace EurekaClient {
     }
     interface DataCenterInfo {
         name: DataCenterName;
+        '@class'?: string;
     }
 }