Updated packages (#2165)

* Updated packages

* Updated packages

* Fixed formatting

* Fixed tests

src/utils/ApacheMd5.ts

@@ -96,7 +96,6 @@ export default class ApacheMd5 {
         let final = crypto
             .createHash('md5')
             .update(password + salt + password, 'ascii')
-            //@ts-ignore
             .digest(DIGEST_ENCODING)
 
         for (let pl = password.length; pl > 0; pl -= 16) {
@@ -111,11 +110,9 @@ export default class ApacheMd5 {
             }
         }
 
-        //@ts-ignore
         final = crypto
             .createHash('md5')
             .update(ctx, 'ascii')
-            //@ts-ignore
             .digest(DIGEST_ENCODING)
 
         // 1000 loop.
@@ -147,7 +144,6 @@ export default class ApacheMd5 {
             final = crypto
                 .createHash('md5')
                 .update(ctxl, 'ascii')
-                //@ts-ignore
                 .digest(DIGEST_ENCODING)
         }
 

src/utils/CaptainConstants.ts

@@ -208,7 +208,7 @@ function overrideConfigFromFile(fileName: string) {
             }
 
             console.log(`Overriding ${prop} from ${fileName}`)
-            // @ts-ignore
+            // @ts-expect-error "this actually works"
             configs[prop] = overridingValuesConfigs[prop]
         }
     }

src/utils/CaptainInstaller.ts

@@ -1,5 +1,5 @@
-import externalIp = require('public-ip')
 import DockerApi from '../docker/DockerApi'
+import { IAppEnvVar, IAppPort } from '../models/AppDefinition'
 import BackupManager from '../user/system/BackupManager'
 import CaptainConstants from './CaptainConstants'
 import EnvVar from './EnvVars'
@@ -198,6 +198,11 @@ function printTroubleShootingUrl() {
 
 let myIp4: string
 
+async function initializeExternalIp() {
+    const externalIp = await import('public-ip')
+    return externalIp
+}
+
 export function install() {
     const backupManger = new BackupManager()
 
@@ -222,12 +227,15 @@ export function install() {
             return checkSystemReq()
         })
         .then(function () {
+            return initializeExternalIp()
+        })
+        .then(function (externalIp) {
             if (EnvVar.MAIN_NODE_IP_ADDRESS) {
                 return EnvVar.MAIN_NODE_IP_ADDRESS
             }
 
             try {
-                const externalIpFetched = externalIp.v4()
+                const externalIpFetched = externalIp.publicIpv4()
                 if (externalIpFetched) {
                     return externalIpFetched
                 }

src/utils/GitHelper.ts

@@ -1,7 +1,7 @@
 import * as childProcess from 'child_process'
 import * as fs from 'fs-extra'
 import * as path from 'path'
-import * as git from 'simple-git/promise'
+import git from 'simple-git'
 import * as util from 'util'
 import * as uuid from 'uuid'
 import CaptainConstants from './CaptainConstants'

src/utils/Logger.ts

@@ -1,4 +1,4 @@
-import * as moment from 'moment'
+import moment from 'moment'
 import { AnyError } from '../models/OtherTypes'
 import CaptainConstants from './CaptainConstants'
 

src/utils/MigrateCaptainDuckDuck.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs-extra'
 import * as path from 'path'
 import DataStore from '../datastore/DataStore'
 import DockerApi from '../docker/DockerApi'
+import { IAppVersion } from '../models/AppDefinition'
 import { IRegistryTypes } from '../models/IRegistryInfo'
 import Authenticator from '../user/Authenticator'
 import CaptainConstants from './CaptainConstants'

src/utils/TemplateHelperVersionPrinter.ts

@@ -1,5 +1,6 @@
 import request = require('request')
 import ApiStatusCodes from '../api/ApiStatusCodes'
+import { IHashMapGeneric } from '../models/ICacheGeneric'
 import { ITemplate } from '../models/OtherTypes'
 import Logger from './Logger'