chore: organise imports (#38)

src/envMapper.ts

@@ -1,8 +1,4 @@
-import {
-  EnvironmentConfig,
-  EnvironmentWorkerConfig,
-  EnvironmentImporterConfig,
-} from './typings'
+import { EnvironmentConfig, EnvironmentImporterConfig, EnvironmentWorkerConfig } from './types'
 
 class EnvMapper {
   toEnvironmental(

src/typings.ts → src/types.ts

@@ -390,3 +390,4 @@ declare const process: {
 }
 
 export { Logger }
+

src/types/BaseGateway.ts

@@ -1,4 +1,4 @@
-import { WorkerConfig } from '../typings'
+import { WorkerConfig } from '../types'
 
 export default abstract class BaseGateway {
   abstract start(prefix: string, config: WorkerConfig): Promise<void>

src/types/BaseLines.ts

@@ -1,6 +1,6 @@
+import { Logger } from '../types'
 import Connection from '../waka-worker/db/connection'
 import DataAccess from '../waka-worker/lines/dataAccess'
-import { Logger } from '../typings'
 
 export interface BaseLinesProps {
   logger: Logger

src/types/BaseRealtime.ts

@@ -1,13 +1,6 @@
 import { Response } from 'express'
+import { Logger, WakaRequest, WakaTripUpdate, WakaVehicleInfo, WakaVehiclePosition } from '../types'
 import Connection from '../waka-worker/db/connection'
-import {
-  WakaRequest,
-  Logger,
-  WakaVehicleInfo,
-  WakaVehiclePosition,
-  WakaTripUpdate,
-} from '../typings'
-import { TripUpdate, VehiclePosition } from '../gtfs'
 
 export default abstract class BaseRealtime {
   connection: Connection

src/types/BaseStops.ts

@@ -1,4 +1,4 @@
-import { Logger, AklTimes } from '../typings'
+import { AklTimes, Logger } from '../types'
 
 export interface BaseStopsProps {
   logger: Logger

src/waka-orchestrator/adaptors/gatewayEcs.ts

@@ -1,10 +1,10 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
 
 import AWS from 'aws-sdk'
-import logger from '../logger'
 import EnvMapper from '../../envMapper'
-import { EcsGatewayConfig, WorkerConfig } from '../../typings'
+import { EcsGatewayConfig, WorkerConfig } from '../../types'
 import BaseGateway from '../../types/BaseGateway'
+import logger from '../logger'
 
 const envConvert = (env: any) =>
   JSON.stringify(

src/waka-orchestrator/adaptors/gatewayLocal.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express'
-import logger from '../logger'
-import WakaWorker from '../../waka-worker'
-import { WorkerConfig } from '../../typings'
+import { WorkerConfig } from '../../types'
 import BaseGateway from '../../types/BaseGateway'
 import WakaRealtime from '../../waka-realtime'
+import WakaWorker from '../../waka-worker'
+import logger from '../logger'
 
 class GatewayLocal extends BaseGateway {
   router: Router

src/waka-orchestrator/adaptors/keyvalueDynamo.ts

@@ -1,7 +1,7 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
 import AWS from 'aws-sdk'
-import logger from '../logger'
 import BaseKeyvalue from '../../types/BaseKeyvalue'
+import logger from '../logger'
 
 interface KeyvalueDynamoProps {
   name: string

src/waka-orchestrator/adaptors/keyvalueLocal.ts

@@ -1,7 +1,7 @@
-import * as path from 'path'
 import fs from 'fs'
-import logger from '../logger'
+import * as path from 'path'
 import BaseKeyvalue from '../../types/BaseKeyvalue'
+import logger from '../logger'
 
 interface KeyValueLocalProps {
   name: string

src/waka-orchestrator/api/index.ts

@@ -1,13 +1,13 @@
-import { join } from 'path'
-import { readFile } from 'fs'
 import { Router, static as _static } from 'express'
-
-import logger from '../logger'
-import KeyvalueLocal from '../adaptors/keyvalueLocal'
+import { readFile } from 'fs'
+import { join } from 'path'
+import cityMetadataJSON from '../../cityMetadata.json'
+import { WakaConfig } from '../../types'
 import KeyvalueDynamo from '../adaptors/keyvalueDynamo'
+import KeyvalueLocal from '../adaptors/keyvalueLocal'
+import logger from '../logger'
 import VersionManager from '../versionManager'
-import { WakaConfig } from '../../typings'
-import cityMetadataJSON from '../../cityMetadata.json'
+
 
 interface PrivateApiProps {
   config: WakaConfig

src/waka-orchestrator/configManager.ts

@@ -1,8 +1,8 @@
-import logger from './logger'
-import KeyvalueLocal from './adaptors/keyvalueLocal'
-import KeyvalueDynamo from './adaptors/keyvalueDynamo'
-import { WakaConfig } from '../typings'
+import { WakaConfig } from '../types'
 import BaseKeyvalue from '../types/BaseKeyvalue'
+import KeyvalueDynamo from './adaptors/keyvalueDynamo'
+import KeyvalueLocal from './adaptors/keyvalueLocal'
+import logger from './logger'
 
 class ConfigManager {
   config: WakaConfig

src/waka-orchestrator/index.ts

@@ -1,18 +1,18 @@
-import { Router, Request, Response } from 'express'
-
-import { spawn, ChildProcessWithoutNullStreams } from 'child_process'
-import path from 'path'
+import { ChildProcessWithoutNullStreams, spawn } from 'child_process'
+import { Request, Response, Router } from 'express'
 import proxy from 'express-http-proxy'
 import fs from 'fs'
-
-import logger from './logger'
-import GatewayLocal from './adaptors/gatewayLocal'
+import path from 'path'
+import BaseGateway from '../types/BaseGateway'
+import { WakaConfig } from '../types'
 import GatewayEcs from './adaptors/gatewayEcs'
+import GatewayLocal from './adaptors/gatewayLocal'
+import PrivateApi from './api'
+import logger from './logger'
 import UpdateManager from './updaters'
 import VersionManager from './versionManager'
-import PrivateApi from './api'
-import { WakaConfig } from '../typings'
-import BaseGateway from '../types/BaseGateway'
+
+
 
 const proxyPort = '9002'
 

src/waka-orchestrator/standalone.ts

@@ -1,12 +1,11 @@
-import Express from 'express'
 import * as bodyParser from 'body-parser'
-import * as morgan from 'morgan'
+import Express from 'express'
 import 'source-map-support/register'
-
-import ConfigManager from './configManager'
 import WakaOrchestrator from '.'
+import ConfigManager from './configManager'
 import logger from './logger'
 
+
 const start = async () => {
   const app = Express()
   app.use(bodyParser.json())

src/waka-orchestrator/updaters/au-syd.ts

@@ -1,9 +1,9 @@
 import axios from 'axios'
 import { pRateLimit, RedisQuotaManager } from 'p-ratelimit'
-import logger from '../logger'
-import { TfNSWUpdaterProps, WakaConfig } from '../../typings'
+import { TfNSWUpdaterProps, WakaConfig } from '../../types'
 import { isKeyof } from '../../utils'
 import WakaRedis from '../../waka-realtime/Redis'
+import logger from '../logger'
 
 const tfnswmodes = {
   buses1: { endpoint: 'buses/SMBSC001' },

src/waka-orchestrator/updaters/basic.ts

@@ -1,14 +1,14 @@
+import axios from 'axios'
+import csvparse from 'csv-parse'
+import extract from 'extract-zip'
 import * as fs from 'fs'
+import moment from 'moment-timezone'
 import * as os from 'os'
 import * as path from 'path'
-import axios from 'axios'
-import extract from 'extract-zip'
-import csvparse from 'csv-parse'
 import transform from 'stream-transform'
-import moment from 'moment-timezone'
-import logger from '../logger'
-import { BasicUpdaterProps } from '../../typings'
+import { BasicUpdaterProps } from '../../types'
 import { prefixToTimezone } from '../../utils'
+import logger from '../logger'
 
 class BasicUpdater {
   prefix: string

src/waka-orchestrator/updaters/index.ts

@@ -1,10 +1,10 @@
+import { WakaConfig } from '../../types'
 import logger from '../logger'
-import BasicUpdater from './basic'
-import ATUpdater from './nz-akl'
-import TfNSWUpdater from './au-syd'
 import VersionManager from '../versionManager'
+import TfNSWUpdater from './au-syd'
+import BasicUpdater from './basic'
 import Fargate from './fargate'
-import { WakaConfig } from '../../typings'
+import ATUpdater from './nz-akl'
 
 interface UpdateManagerProps {
   config: WakaConfig

src/waka-orchestrator/updaters/nz-akl.ts

@@ -1,7 +1,7 @@
-import moment from 'moment-timezone'
 import axios from 'axios'
+import moment from 'moment-timezone'
+import { ATUpdaterProps } from '../../types'
 import logger from '../logger'
-import { ATUpdaterProps } from '../../typings'
 
 class ATUpdater {
   apiKey: string

src/waka-orchestrator/versionManager.ts

@@ -1,12 +1,12 @@
 import { ConnectionPool, VarChar } from 'mssql'
-import logger from './logger'
-import KeyvalueLocal from './adaptors/keyvalueLocal'
-import KeyvalueDynamo from './adaptors/keyvalueDynamo'
 import EnvMapper from '../envMapper'
-import GatewayLocal from './adaptors/gatewayLocal'
-import GatewayEcs from './adaptors/gatewayEcs'
-import { DBConfig, WakaConfig, Version } from '../typings'
+import { DBConfig, Version, WakaConfig } from '../types'
 import BaseKeyvalue from '../types/BaseKeyvalue'
+import GatewayEcs from './adaptors/gatewayEcs'
+import GatewayLocal from './adaptors/gatewayLocal'
+import KeyvalueDynamo from './adaptors/keyvalueDynamo'
+import KeyvalueLocal from './adaptors/keyvalueLocal'
+import logger from './logger'
 
 interface VersionManagerProps {
   gateway: GatewayLocal

src/waka-realtime/BaseRealtime.ts

@@ -1,15 +1,10 @@
-import path from 'path'
 import { AxiosInstance } from 'axios'
+import path from 'path'
 import { oc } from 'ts-optchain'
-import WakaRedis from './Redis'
-import { Logger } from '../typings'
-import {
-  VehiclePosition,
-  AlertFeedEntity,
-  PositionFeedEntity,
-  UpdateFeedEntity,
-} from '../gtfs'
+import { AlertFeedEntity, PositionFeedEntity, UpdateFeedEntity, VehiclePosition } from '../gtfs'
+import { Logger } from '../types'
 import { check } from '../utils'
+import WakaRedis from './Redis'
 
 export const PROTOBUF_PATH = [
   path.join(__dirname, 'protos', 'gtfs-realtime.proto'),

src/waka-realtime/CombinedFeed.ts

@@ -1,13 +1,13 @@
 import Protobuf from 'protobufjs'
 import {
-  FeedMessage,
   AlertFeedEntity,
-  UpdateFeedEntity,
+  FeedMessage,
   PositionFeedEntity,
+  UpdateFeedEntity,
 } from '../gtfs'
 import BaseRealtime, { PROTOBUF_PATH } from './BaseRealtime'
 
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
 
 abstract class CombinedFeed extends BaseRealtime {
   start = async () => {

src/waka-realtime/MultiCombinedFeed.ts

@@ -1,12 +1,6 @@
 import Protobuf from 'protobufjs'
-import {
-  FeedMessage,
-  AlertFeedEntity,
-  UpdateFeedEntity,
-  PositionFeedEntity,
-} from '../gtfs'
-import BaseRealtime, { PROTOBUF_PATH, BaseRealtimeProps } from './BaseRealtime'
-import SingleEndpoint from './SingleEndpoint'
+import { AlertFeedEntity, FeedMessage, PositionFeedEntity, UpdateFeedEntity } from '../gtfs'
+import BaseRealtime, { BaseRealtimeProps, PROTOBUF_PATH } from './BaseRealtime'
 
 export interface MultiEndpointProps extends BaseRealtimeProps {
   rateLimiter: <T>(fn: () => Promise<T>) => Promise<T>

src/waka-realtime/MultiEndpoint.ts

@@ -1,10 +1,6 @@
 import Protobuf from 'protobufjs'
+import { AlertFeedMessage, PositionFeedMessage, UpdateFeedMessage } from '../gtfs'
 import BaseRealtime, { BaseRealtimeProps, PROTOBUF_PATH } from './BaseRealtime'
-import {
-  PositionFeedMessage,
-  UpdateFeedMessage,
-  AlertFeedMessage,
-} from '../gtfs'
 
 export interface MultiEndpointProps extends BaseRealtimeProps {
   rateLimiter: <T>(fn: () => Promise<T>) => Promise<T>

src/waka-realtime/Redis.ts

@@ -1,7 +1,7 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
 import Redis from 'ioredis'
-import { TripUpdate, VehiclePosition, Alert } from '../gtfs'
-import { Logger, RedisConfig } from '../typings'
+import { Alert, TripUpdate, VehiclePosition } from '../gtfs'
+import { Logger, RedisConfig } from '../types'
 
 interface WakaRedisProps {
   prefix: string

src/waka-realtime/SingleEndpoint.ts

@@ -1,10 +1,6 @@
 import Protobuf from 'protobufjs'
+import { AlertFeedMessage, PositionFeedMessage, UpdateFeedMessage } from '../gtfs'
 import BaseRealtime, { BaseRealtimeProps, PROTOBUF_PATH } from './BaseRealtime'
-import {
-  PositionFeedMessage,
-  UpdateFeedMessage,
-  AlertFeedMessage,
-} from '../gtfs'
 
 export interface SingleEndpointProps extends BaseRealtimeProps {
   vehiclePositionEndpoint: string

src/waka-realtime/index.ts

@@ -1,19 +1,15 @@
-import { pRateLimit, QuotaManager, RedisQuotaManager, Quota } from 'p-ratelimit'
-
-import WakaRedis from './Redis'
-
+import { pRateLimit, Quota, QuotaManager, RedisQuotaManager } from 'p-ratelimit'
+import { Logger, RedisConfig } from '../types'
 import { isKeyof } from '../utils'
-import { Logger, RedisConfig } from '../typings'
-
-import createLogger from './logger'
 import BaseRealtime from './BaseRealtime'
-
-import AucklandRealtime from './regions/nz-akl'
-import ChristchurchRealtime from './regions/nz-chc'
+import createLogger from './logger'
+import WakaRedis from './Redis'
 import CanberraRealtime from './regions/au-cbr'
 import SydneyRealtime from './regions/au-syd'
-import NYCRealtime from './regions/us-nyc'
+import AucklandRealtime from './regions/nz-akl'
+import ChristchurchRealtime from './regions/nz-chc'
 import BostonRealtime from './regions/us-bos'
+import NYCRealtime from './regions/us-nyc'
 import SanFranciscoRealtime from './regions/us-sfo'
 
 const Regions = {

src/waka-realtime/regions/au-cbr.ts

@@ -1,7 +1,7 @@
 import axios from 'axios'
+import { Logger } from '../../types'
 import CombinedFeed from '../CombinedFeed'
 import Redis from '../Redis'
-import { Logger } from '../../typings'
 
 interface CanberraRealtimeProps {
   wakaRedis: Redis

src/waka-realtime/regions/au-syd.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
+import { Logger } from '../../types'
 import MultiEndpoint from '../MultiEndpoint'
-import { Logger } from '../../typings'
 import Redis from '../Redis'
 
 const modes = [

src/waka-realtime/regions/nz-akl.ts

@@ -1,7 +1,7 @@
 import axios from 'axios'
-import SingleEndpoint from '../SingleEndpoint'
+import { Logger } from '../../types'
 import Redis from '../Redis'
-import { Logger } from '../../typings'
+import SingleEndpoint from '../SingleEndpoint'
 
 interface AucklandRealtimeProps {
   wakaRedis: Redis