From eecf5dc7d6bbb2878da626f183289b9df291b53d Mon Sep 17 00:00:00 2001 From: Matt Davidson Date: Fri, 27 Dec 2019 15:50:15 +1100 Subject: [PATCH] chore: organise imports (#38) --- src/envMapper.ts | 6 +----- src/{typings.ts => types.ts} | 1 + src/types/BaseGateway.ts | 2 +- src/types/BaseLines.ts | 2 +- src/types/BaseRealtime.ts | 9 +-------- src/types/BaseStops.ts | 2 +- src/waka-orchestrator/adaptors/gatewayEcs.ts | 4 ++-- .../adaptors/gatewayLocal.ts | 6 +++--- .../adaptors/keyvalueDynamo.ts | 2 +- .../adaptors/keyvalueLocal.ts | 4 ++-- src/waka-orchestrator/api/index.ts | 14 ++++++------- src/waka-orchestrator/configManager.ts | 8 ++++---- src/waka-orchestrator/index.ts | 20 +++++++++---------- src/waka-orchestrator/standalone.ts | 7 +++---- src/waka-orchestrator/updaters/au-syd.ts | 4 ++-- src/waka-orchestrator/updaters/basic.ts | 12 +++++------ src/waka-orchestrator/updaters/index.ts | 8 ++++---- src/waka-orchestrator/updaters/nz-akl.ts | 4 ++-- src/waka-orchestrator/versionManager.ts | 12 +++++------ src/waka-realtime/BaseRealtime.ts | 13 ++++-------- src/waka-realtime/CombinedFeed.ts | 6 +++--- src/waka-realtime/MultiCombinedFeed.ts | 10 ++-------- src/waka-realtime/MultiEndpoint.ts | 6 +----- src/waka-realtime/Redis.ts | 4 ++-- src/waka-realtime/SingleEndpoint.ts | 6 +----- src/waka-realtime/index.ts | 18 +++++++---------- src/waka-realtime/regions/au-cbr.ts | 2 +- src/waka-realtime/regions/au-syd.ts | 2 +- src/waka-realtime/regions/nz-akl.ts | 4 ++-- src/waka-realtime/regions/nz-chc.ts | 4 ++-- src/waka-realtime/regions/us-bos.ts | 4 ++-- src/waka-realtime/regions/us-nyc.ts | 4 ++-- src/waka-realtime/regions/us-sfo.ts | 5 ++--- src/waka-realtime/standalone.ts | 4 ++-- src/waka-worker/db/connection.ts | 2 +- src/waka-worker/db/storage.ts | 8 ++++---- src/waka-worker/index.ts | 15 +++++++------- src/waka-worker/lines/index.ts | 20 +++++++++---------- src/waka-worker/lines/regions/nz-akl.ts | 2 +- src/waka-worker/lines/regions/nz-chc.ts | 2 +- src/waka-worker/lines/regions/nz-otg.ts | 1 - src/waka-worker/realtime/index.ts | 13 ++++++------ src/waka-worker/realtime/regions/au-cbr.ts | 4 ++-- src/waka-worker/realtime/regions/au-syd.ts | 14 ++++--------- src/waka-worker/realtime/regions/generic.ts | 20 +++++++------------ src/waka-worker/realtime/regions/nz-akl.ts | 13 ++++-------- src/waka-worker/realtime/regions/nz-wlg.ts | 17 +++++----------- src/waka-worker/standalone.ts | 6 +++--- src/waka-worker/stops/dataAccess.ts | 8 +------- src/waka-worker/stops/regions/nz-akl.ts | 2 +- src/waka-worker/stops/search.ts | 6 +++--- src/waka-worker/stops/station.ts | 14 ++++++------- 52 files changed, 159 insertions(+), 227 deletions(-) rename src/{typings.ts => types.ts} (99%) diff --git a/src/envMapper.ts b/src/envMapper.ts index fc751f4f..9559cb2b 100644 --- a/src/envMapper.ts +++ b/src/envMapper.ts @@ -1,8 +1,4 @@ -import { - EnvironmentConfig, - EnvironmentWorkerConfig, - EnvironmentImporterConfig, -} from './typings' +import { EnvironmentConfig, EnvironmentImporterConfig, EnvironmentWorkerConfig } from './types' class EnvMapper { toEnvironmental( diff --git a/src/typings.ts b/src/types.ts similarity index 99% rename from src/typings.ts rename to src/types.ts index c280bb68..2cb5cc51 100644 --- a/src/typings.ts +++ b/src/types.ts @@ -390,3 +390,4 @@ declare const process: { } export { Logger } + diff --git a/src/types/BaseGateway.ts b/src/types/BaseGateway.ts index ca97a16e..70a9e97a 100644 --- a/src/types/BaseGateway.ts +++ b/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 diff --git a/src/types/BaseLines.ts b/src/types/BaseLines.ts index 44f05306..7fa6c9f8 100644 --- a/src/types/BaseLines.ts +++ b/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 diff --git a/src/types/BaseRealtime.ts b/src/types/BaseRealtime.ts index 58727c6f..b054958a 100644 --- a/src/types/BaseRealtime.ts +++ b/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 diff --git a/src/types/BaseStops.ts b/src/types/BaseStops.ts index de75ec57..b2cb51ba 100644 --- a/src/types/BaseStops.ts +++ b/src/types/BaseStops.ts @@ -1,4 +1,4 @@ -import { Logger, AklTimes } from '../typings' +import { AklTimes, Logger } from '../types' export interface BaseStopsProps { logger: Logger diff --git a/src/waka-orchestrator/adaptors/gatewayEcs.ts b/src/waka-orchestrator/adaptors/gatewayEcs.ts index b238536f..9997a1c6 100644 --- a/src/waka-orchestrator/adaptors/gatewayEcs.ts +++ b/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( diff --git a/src/waka-orchestrator/adaptors/gatewayLocal.ts b/src/waka-orchestrator/adaptors/gatewayLocal.ts index 384b1527..49f93e08 100644 --- a/src/waka-orchestrator/adaptors/gatewayLocal.ts +++ b/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 diff --git a/src/waka-orchestrator/adaptors/keyvalueDynamo.ts b/src/waka-orchestrator/adaptors/keyvalueDynamo.ts index a1b1f3d1..79f7da4e 100644 --- a/src/waka-orchestrator/adaptors/keyvalueDynamo.ts +++ b/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 diff --git a/src/waka-orchestrator/adaptors/keyvalueLocal.ts b/src/waka-orchestrator/adaptors/keyvalueLocal.ts index 6870894c..14dfed1b 100644 --- a/src/waka-orchestrator/adaptors/keyvalueLocal.ts +++ b/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 diff --git a/src/waka-orchestrator/api/index.ts b/src/waka-orchestrator/api/index.ts index 8fd16df0..8348175c 100644 --- a/src/waka-orchestrator/api/index.ts +++ b/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 diff --git a/src/waka-orchestrator/configManager.ts b/src/waka-orchestrator/configManager.ts index bc3da3aa..8ee8ed24 100644 --- a/src/waka-orchestrator/configManager.ts +++ b/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 diff --git a/src/waka-orchestrator/index.ts b/src/waka-orchestrator/index.ts index b7dfb0cc..5df55737 100644 --- a/src/waka-orchestrator/index.ts +++ b/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' diff --git a/src/waka-orchestrator/standalone.ts b/src/waka-orchestrator/standalone.ts index 2c4f76a4..c28feb07 100644 --- a/src/waka-orchestrator/standalone.ts +++ b/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()) diff --git a/src/waka-orchestrator/updaters/au-syd.ts b/src/waka-orchestrator/updaters/au-syd.ts index 3fe7dc21..ed4b688b 100644 --- a/src/waka-orchestrator/updaters/au-syd.ts +++ b/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' }, diff --git a/src/waka-orchestrator/updaters/basic.ts b/src/waka-orchestrator/updaters/basic.ts index a3c6a23e..6ae5e652 100644 --- a/src/waka-orchestrator/updaters/basic.ts +++ b/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 diff --git a/src/waka-orchestrator/updaters/index.ts b/src/waka-orchestrator/updaters/index.ts index 14acf79a..264536dc 100644 --- a/src/waka-orchestrator/updaters/index.ts +++ b/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 diff --git a/src/waka-orchestrator/updaters/nz-akl.ts b/src/waka-orchestrator/updaters/nz-akl.ts index 2ceacef9..764e4c96 100644 --- a/src/waka-orchestrator/updaters/nz-akl.ts +++ b/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 diff --git a/src/waka-orchestrator/versionManager.ts b/src/waka-orchestrator/versionManager.ts index 3f38ec9c..fae95752 100644 --- a/src/waka-orchestrator/versionManager.ts +++ b/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 diff --git a/src/waka-realtime/BaseRealtime.ts b/src/waka-realtime/BaseRealtime.ts index ce2c729d..272a1f2d 100644 --- a/src/waka-realtime/BaseRealtime.ts +++ b/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'), diff --git a/src/waka-realtime/CombinedFeed.ts b/src/waka-realtime/CombinedFeed.ts index 307ad35c..f02c9595 100644 --- a/src/waka-realtime/CombinedFeed.ts +++ b/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 () => { diff --git a/src/waka-realtime/MultiCombinedFeed.ts b/src/waka-realtime/MultiCombinedFeed.ts index c5d965fd..25750e25 100644 --- a/src/waka-realtime/MultiCombinedFeed.ts +++ b/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: (fn: () => Promise) => Promise diff --git a/src/waka-realtime/MultiEndpoint.ts b/src/waka-realtime/MultiEndpoint.ts index 278144e2..81487053 100644 --- a/src/waka-realtime/MultiEndpoint.ts +++ b/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: (fn: () => Promise) => Promise diff --git a/src/waka-realtime/Redis.ts b/src/waka-realtime/Redis.ts index 143fc286..4bfa83d0 100644 --- a/src/waka-realtime/Redis.ts +++ b/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 diff --git a/src/waka-realtime/SingleEndpoint.ts b/src/waka-realtime/SingleEndpoint.ts index 4b2d30d0..6ea57061 100644 --- a/src/waka-realtime/SingleEndpoint.ts +++ b/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 diff --git a/src/waka-realtime/index.ts b/src/waka-realtime/index.ts index 24947673..2540508c 100644 --- a/src/waka-realtime/index.ts +++ b/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 = { diff --git a/src/waka-realtime/regions/au-cbr.ts b/src/waka-realtime/regions/au-cbr.ts index f86bdd3e..81d6f939 100644 --- a/src/waka-realtime/regions/au-cbr.ts +++ b/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 diff --git a/src/waka-realtime/regions/au-syd.ts b/src/waka-realtime/regions/au-syd.ts index f490ae57..799fda83 100644 --- a/src/waka-realtime/regions/au-syd.ts +++ b/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 = [ diff --git a/src/waka-realtime/regions/nz-akl.ts b/src/waka-realtime/regions/nz-akl.ts index 9560383f..4114a6db 100644 --- a/src/waka-realtime/regions/nz-akl.ts +++ b/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 diff --git a/src/waka-realtime/regions/nz-chc.ts b/src/waka-realtime/regions/nz-chc.ts index c68ec1b7..98dea467 100644 --- a/src/waka-realtime/regions/nz-chc.ts +++ b/src/waka-realtime/regions/nz-chc.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 ChristchurchRealtimeProps { wakaRedis: Redis diff --git a/src/waka-realtime/regions/us-bos.ts b/src/waka-realtime/regions/us-bos.ts index ef60e801..97190c0f 100644 --- a/src/waka-realtime/regions/us-bos.ts +++ b/src/waka-realtime/regions/us-bos.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 BostonRealtimeProps { wakaRedis: Redis diff --git a/src/waka-realtime/regions/us-nyc.ts b/src/waka-realtime/regions/us-nyc.ts index 9b79702b..48287b4b 100644 --- a/src/waka-realtime/regions/us-nyc.ts +++ b/src/waka-realtime/regions/us-nyc.ts @@ -1,7 +1,7 @@ import axios from 'axios' -import { Logger } from '../../typings' -import Redis from '../Redis' +import { Logger } from '../../types' import MultiCombinedFeed from '../MultiCombinedFeed' +import Redis from '../Redis' interface NYCRealtimeProps { wakaRedis: Redis diff --git a/src/waka-realtime/regions/us-sfo.ts b/src/waka-realtime/regions/us-sfo.ts index 2119fb68..d6cbe1f7 100644 --- a/src/waka-realtime/regions/us-sfo.ts +++ b/src/waka-realtime/regions/us-sfo.ts @@ -1,8 +1,7 @@ import axios from 'axios' -import SingleEndpoint from '../SingleEndpoint' -import Redis from '../Redis' -import { Logger } from '../../typings' +import { Logger } from '../../types' import MultiEndpoint from '../MultiEndpoint' +import Redis from '../Redis' interface SanFranciscoRealtimeProps { wakaRedis: Redis diff --git a/src/waka-realtime/standalone.ts b/src/waka-realtime/standalone.ts index 39a5c3ef..7a8b5328 100644 --- a/src/waka-realtime/standalone.ts +++ b/src/waka-realtime/standalone.ts @@ -1,12 +1,12 @@ import 'dotenv' import 'source-map-support/register' - // this only supports dynamo, because the local dev experience is different import KeyvalueDynamo from '../waka-orchestrator/adaptors/keyvalueDynamo' - import WakaRealtime from './index' import createLogger from './logger' + + const prefix = process.env.PREFIX const kvPrefix = process.env.KEYVALUE_PREFIX || 'waka' const kvRegion = process.env.KEYVALUE_REGION || 'us-west-2' diff --git a/src/waka-worker/db/connection.ts b/src/waka-worker/db/connection.ts index a4813d55..fe7da2a2 100644 --- a/src/waka-worker/db/connection.ts +++ b/src/waka-worker/db/connection.ts @@ -1,5 +1,5 @@ import { ConnectionPool } from 'mssql' -import { DBConfig, Logger } from '../../typings' +import { DBConfig, Logger } from '../../types' interface ConnectionProps { logger: Logger diff --git a/src/waka-worker/db/storage.ts b/src/waka-worker/db/storage.ts index 32a71c4b..6de9a2cc 100644 --- a/src/waka-worker/db/storage.ts +++ b/src/waka-worker/db/storage.ts @@ -1,10 +1,10 @@ +import AWS from 'aws-sdk' +import { PutObjectRequest } from 'aws-sdk/clients/s3' +import axios from 'axios' import FormData from 'form-data' import { createReadStream } from 'fs' -import axios from 'axios' -import { PutObjectRequest } from 'aws-sdk/clients/s3' -import AWS from 'aws-sdk' import { ServerResponse } from 'http' -import { Logger } from '../../typings' +import { Logger } from '../../types' interface StorageProps { backing?: 'aws' | 'local' diff --git a/src/waka-worker/index.ts b/src/waka-worker/index.ts index 58c7eaba..78b031d4 100644 --- a/src/waka-worker/index.ts +++ b/src/waka-worker/index.ts @@ -1,17 +1,16 @@ import { Router } from 'express' -import * as morgan from 'morgan' -import createLogger from './logger' import cityMetadataJSON from '../cityMetadata.json' +import { Logger, WorkerConfig } from '../types' +import BaseStops from '../types/BaseStops' +import WakaRedis from '../waka-realtime/Redis' import Connection from './db/connection' import Lines from './lines' -import Search from './stops/search' -import Station from './stops/station' +import createLogger from './logger' +import Realtime from './realtime' import StopsNZAKL from './stops/regions/nz-akl' import StopsNZWLG from './stops/regions/nz-wlg' -import Realtime from './realtime' -import { WorkerConfig, Logger } from '../typings' -import BaseStops from '../types/BaseStops' -import WakaRedis from '../waka-realtime/Redis' +import Search from './stops/search' +import Station from './stops/station' class WakaWorker { config: WorkerConfig diff --git a/src/waka-worker/lines/index.ts b/src/waka-worker/lines/index.ts index e59ee0d9..d785a33a 100644 --- a/src/waka-worker/lines/index.ts +++ b/src/waka-worker/lines/index.ts @@ -1,20 +1,20 @@ -import * as sql from 'mssql' import { Request, Response } from 'express' +import * as sql from 'mssql' import cityMetadataJSON from '../../cityMetadata.json' -import StopsDataAccess from '../stops/dataAccess' +import { Logger, WakaRequest } from '../../types' +import BaseLines from '../../types/BaseLines' +import { isKeyof, sortFn } from '../../utils' +import WakaRedis from '../../waka-realtime/Redis' +import Connection from '../db/connection' import Storage from '../db/storage' - +import StopsDataAccess from '../stops/dataAccess' +import Search from '../stops/search' import SydneyLines from './regions/au-syd' +import GenericLines from './regions/generic' import AucklandLines from './regions/nz-akl' import ChristchurchLines from './regions/nz-chc' import WellingtonLines from './regions/nz-wlg' -import GenericLines from './regions/generic' -import Connection from '../db/connection' -import Search from '../stops/search' -import { Logger, WakaRequest } from '../../typings' -import { isKeyof, sortFn } from '../../utils' -import BaseLines from '../../types/BaseLines' -import WakaRedis from '../../waka-realtime/Redis' + const regions = { 'au-syd': SydneyLines, diff --git a/src/waka-worker/lines/regions/nz-akl.ts b/src/waka-worker/lines/regions/nz-akl.ts index 1688fb32..fcdff755 100644 --- a/src/waka-worker/lines/regions/nz-akl.ts +++ b/src/waka-worker/lines/regions/nz-akl.ts @@ -1,4 +1,4 @@ -import BaseLines, { BaseLinesProps } from '../../../types/BaseLines' +import BaseLines from '../../../types/BaseLines' import { parseRoutes } from '../helpers' class LinesNZAKL extends BaseLines { diff --git a/src/waka-worker/lines/regions/nz-chc.ts b/src/waka-worker/lines/regions/nz-chc.ts index 857c3f80..ddbe7bbf 100644 --- a/src/waka-worker/lines/regions/nz-chc.ts +++ b/src/waka-worker/lines/regions/nz-chc.ts @@ -1,4 +1,4 @@ -import BaseLines, { BaseLinesProps } from '../../../types/BaseLines' +import BaseLines from '../../../types/BaseLines' import { parseRoutes } from '../helpers' class LinesNZCHC extends BaseLines { diff --git a/src/waka-worker/lines/regions/nz-otg.ts b/src/waka-worker/lines/regions/nz-otg.ts index ca05a192..efb19ad6 100644 --- a/src/waka-worker/lines/regions/nz-otg.ts +++ b/src/waka-worker/lines/regions/nz-otg.ts @@ -1,4 +1,3 @@ -import connection from '../../db/connection' import BaseLines, { BaseLinesProps } from '../../../types/BaseLines' class OtagoLines extends BaseLines { diff --git a/src/waka-worker/realtime/index.ts b/src/waka-worker/realtime/index.ts index 57c3ee18..b43d6345 100644 --- a/src/waka-worker/realtime/index.ts +++ b/src/waka-worker/realtime/index.ts @@ -1,14 +1,13 @@ import { Response } from 'express' -import RealtimeAUSYD from './regions/au-syd' -import RealtimeNZAKL from './regions/nz-akl' -import RealtimeNZWLG from './regions/nz-wlg' -import Connection from '../db/connection' -import CanberraRealtime from './regions/au-cbr' -import { WakaRequest, Logger, RedisConfig } from '../../typings' +import { Logger, WakaRequest } from '../../types' import BaseRealtime from '../../types/BaseRealtime' -import GenericRealtime from './regions/generic' import { isKeyof } from '../../utils' import WakaRedis from '../../waka-realtime/Redis' +import Connection from '../db/connection' +import RealtimeAUSYD from './regions/au-syd' +import GenericRealtime from './regions/generic' +import RealtimeNZAKL from './regions/nz-akl' +import RealtimeNZWLG from './regions/nz-wlg' const regions = { 'au-syd': RealtimeAUSYD, diff --git a/src/waka-worker/realtime/regions/au-cbr.ts b/src/waka-worker/realtime/regions/au-cbr.ts index 7bc7223d..08ed8dae 100644 --- a/src/waka-worker/realtime/regions/au-cbr.ts +++ b/src/waka-worker/realtime/regions/au-cbr.ts @@ -1,7 +1,7 @@ +import { Logger } from '../../../types' +import Connection from '../../db/connection' import ProtobufRealtime from '../ProtobufRealtime' -import { Logger } from '../../../typings' -import Connection from '../../db/connection' interface CanberraRealtimeProps { logger: Logger diff --git a/src/waka-worker/realtime/regions/au-syd.ts b/src/waka-worker/realtime/regions/au-syd.ts index 884bab8b..7a1fbe69 100644 --- a/src/waka-worker/realtime/regions/au-syd.ts +++ b/src/waka-worker/realtime/regions/au-syd.ts @@ -2,19 +2,13 @@ import { Response } from 'express' import { VarChar } from 'mssql' import { oc } from 'ts-optchain' -import Connection from '../../db/connection' -import { - WakaRequest, - Logger, - WakaTripUpdate, - WakaVehicleInfo, - StopTime, -} from '../../../typings' - +import { StopTimeUpdate } from '../../../gtfs' +import { Logger, StopTime, WakaRequest, WakaTripUpdate, WakaVehicleInfo } from '../../../types' import BaseRealtime from '../../../types/BaseRealtime' import WakaRedis from '../../../waka-realtime/Redis' +import Connection from '../../db/connection' import StopsDataAccess from '../../stops/dataAccess' -import { StopTimeUpdate } from '../../../gtfs' + interface RealtimeAUSYDProps { connection: Connection diff --git a/src/waka-worker/realtime/regions/generic.ts b/src/waka-worker/realtime/regions/generic.ts index 771c7e15..78615442 100644 --- a/src/waka-worker/realtime/regions/generic.ts +++ b/src/waka-worker/realtime/regions/generic.ts @@ -1,21 +1,15 @@ import { Response } from 'express' +import moment from 'moment-timezone' import { VarChar } from 'mssql' import { oc } from 'ts-optchain' -import moment from 'moment-timezone' -import Connection from '../../db/connection' -import { - WakaRequest, - Logger, - WakaTripUpdate, - WakaVehicleInfo, - DBStopTime, -} from '../../../typings' - +import { TripUpdate } from '../../../gtfs' +import { Logger, WakaRequest, WakaTripUpdate, WakaVehicleInfo } from '../../../types' import BaseRealtime from '../../../types/BaseRealtime' -import StopsDataAccess from '../../stops/dataAccess' -import WakaRedis from '../../../waka-realtime/Redis' import { prefixToTimezone } from '../../../utils' -import { TripUpdate } from '../../../gtfs' +import WakaRedis from '../../../waka-realtime/Redis' +import Connection from '../../db/connection' +import StopsDataAccess from '../../stops/dataAccess' + interface GenericRealtimeProps { connection: Connection diff --git a/src/waka-worker/realtime/regions/nz-akl.ts b/src/waka-worker/realtime/regions/nz-akl.ts index 2b400328..1b235add 100644 --- a/src/waka-worker/realtime/regions/nz-akl.ts +++ b/src/waka-worker/realtime/regions/nz-akl.ts @@ -2,17 +2,12 @@ import * as Logger from 'bunyan' import { Response } from 'express' import { VarChar } from 'mssql' import { oc } from 'ts-optchain' -import doubleDeckers from './nz-akl-doubledecker.json' -import Connection from '../../db/connection' -import { - WakaRequest, - RedisConfig, - WakaVehiclePosition, - WakaTripUpdate, -} from '../../../typings' +import { TripUpdate } from '../../../gtfs' +import { RedisConfig, WakaRequest, WakaVehiclePosition } from '../../../types' import BaseRealtime from '../../../types/BaseRealtime' import WakaRedis from '../../../waka-realtime/Redis' -import { TripUpdate } from '../../../gtfs' +import Connection from '../../db/connection' +import doubleDeckers from './nz-akl-doubledecker.json' interface RealtimeNZAKLProps { connection: Connection diff --git a/src/waka-worker/realtime/regions/nz-wlg.ts b/src/waka-worker/realtime/regions/nz-wlg.ts index de5a4d71..c8041810 100644 --- a/src/waka-worker/realtime/regions/nz-wlg.ts +++ b/src/waka-worker/realtime/regions/nz-wlg.ts @@ -1,19 +1,12 @@ import axios from 'axios' -import sql from 'mssql' -import momenttz from 'moment-timezone' -import moment from 'moment' import * as Logger from 'bunyan' import { Response } from 'express' -import { - WakaRequest, - MetlinkService, - MetlinkUpdate, - MetlinkStop, - MetlinkNotice, - DBStopTime, -} from '../../../typings' -import Connection from '../../db/connection' +import moment from 'moment' +import momenttz from 'moment-timezone' +import sql from 'mssql' +import { DBStopTime, MetlinkNotice, MetlinkService, MetlinkStop, MetlinkUpdate, WakaRequest } from '../../../types' import BaseRealtime from '../../../types/BaseRealtime' +import Connection from '../../db/connection' import StopsDataAccess from '../../stops/dataAccess' const tripsUrl = 'https://www.metlink.org.nz/api/v1/StopDepartures/' diff --git a/src/waka-worker/standalone.ts b/src/waka-worker/standalone.ts index 856ebc3a..85910b55 100644 --- a/src/waka-worker/standalone.ts +++ b/src/waka-worker/standalone.ts @@ -1,9 +1,9 @@ -import Express from 'express' -import 'dotenv' import * as bodyParser from 'body-parser' +import 'dotenv' +import Express from 'express' import 'source-map-support/register' -import EnvMapper from '../envMapper' import WakaWorker from '.' +import EnvMapper from '../envMapper' declare const process: { env: { diff --git a/src/waka-worker/stops/dataAccess.ts b/src/waka-worker/stops/dataAccess.ts index de36d61f..80c8c2b0 100644 --- a/src/waka-worker/stops/dataAccess.ts +++ b/src/waka-worker/stops/dataAccess.ts @@ -1,12 +1,6 @@ import * as sql from 'mssql' +import { DBStopTime, RouteInfo, StopTime, TripInfo, TripRow } from '../../types' import Connection from '../db/connection' -import { - RouteInfo, - StopTime, - TripRow, - TripInfo, - DBStopTime, -} from '../../typings' interface StopsDataAccessProps { connection: Connection diff --git a/src/waka-worker/stops/regions/nz-akl.ts b/src/waka-worker/stops/regions/nz-akl.ts index f1a89ec0..69cdcd55 100644 --- a/src/waka-worker/stops/regions/nz-akl.ts +++ b/src/waka-worker/stops/regions/nz-akl.ts @@ -1,6 +1,6 @@ import axios from 'axios' import { oc } from 'ts-optchain' -import { AklTimes } from '../../../typings' +import { AklTimes } from '../../../types' import BaseStops, { BaseStopsProps } from '../../../types/BaseStops' const pricingHtml = ` diff --git a/src/waka-worker/stops/search.ts b/src/waka-worker/stops/search.ts index ec85991a..b80d82be 100644 --- a/src/waka-worker/stops/search.ts +++ b/src/waka-worker/stops/search.ts @@ -1,10 +1,10 @@ -import * as sql from 'mssql' import * as Logger from 'bunyan' import { Response } from 'express' +import * as sql from 'mssql' import { oc } from 'ts-optchain' -import Connection from '../db/connection' -import { WakaRequest, StopRouteType } from '../../typings' +import { StopRouteType, WakaRequest } from '../../types' import BaseStops from '../../types/BaseStops' +import Connection from '../db/connection' interface SearchProps { logger: Logger diff --git a/src/waka-worker/stops/station.ts b/src/waka-worker/stops/station.ts index 1c9a0c59..48b1f1c3 100644 --- a/src/waka-worker/stops/station.ts +++ b/src/waka-worker/stops/station.ts @@ -1,14 +1,14 @@ -import moment from 'moment-timezone' -import { Response } from 'express' import * as Logger from 'bunyan' +import { Response } from 'express' +import moment from 'moment-timezone' import { oc } from 'ts-optchain' -import StopsDataAccess from './dataAccess' -import Connection from '../db/connection' -import { WakaRequest, DBStopTime, WakaTripUpdate } from '../../typings' -import Lines from '../lines' +import { DBStopTime, WakaRequest, WakaTripUpdate } from '../../types' import BaseStops from '../../types/BaseStops' -import WakaRedis from '../../waka-realtime/Redis' import { prefixToTimezone } from '../../utils' +import WakaRedis from '../../waka-realtime/Redis' +import Connection from '../db/connection' +import Lines from '../lines' +import StopsDataAccess from './dataAccess' interface StationProps { logger: Logger