@digitraffic/common 2024.1.19-1 → 2024.1.23-1

package/src/aws/infra/stack/{monitoredfunction.ts → monitoredfunction.mts}

@@ -2,15 +2,15 @@ import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { Stack } from "aws-cdk-lib";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
-import { DigitrafficStack } from "./stack.js";
+import { DigitrafficStack } from "./stack.mjs";
 import { ITopic } from "aws-cdk-lib/aws-sns";
 import {
     databaseFunctionProps,
     LambdaEnvironment,
     MonitoredFunctionParameters,
-} from "./lambda-configs.js";
-import { DigitrafficLogSubscriptions } from "./subscription.js";
-import { TrafficType } from "../../../types/traffictype.js";
+} from "./lambda-configs.mjs";
+import { DigitrafficLogSubscriptions } from "./subscription.mjs";
+import { TrafficType } from "../../../types/traffictype.mjs";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/{rest_apis.ts → rest_apis.mts}

@@ -19,12 +19,12 @@ import {
     PolicyStatement,
 } from "aws-cdk-lib/aws-iam";
 import { Construct } from "constructs";
-import { getModelReference } from "../../../utils/api-model.js";
-import { MediaType } from "../../types/mediatypes.js";
-import { ModelWithReference } from "../../types/model-with-reference.js";
-import { DocumentationPart, DocumentationProperties } from "../documentation.js";
-import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans.js";
-import { DigitrafficStack } from "./stack.js";
+import { getModelReference } from "../../../utils/api-model.mjs";
+import { MediaType } from "../../types/mediatypes.mjs";
+import { ModelWithReference } from "../../types/model-with-reference.mjs";
+import { DocumentationPart, DocumentationProperties } from "../documentation.mjs";
+import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans.mjs";
+import { DigitrafficStack } from "./stack.mjs";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/{stack-checking-aspect.ts → stack-checking-aspect.mts}

@@ -1,7 +1,7 @@
 import { Annotations, IAspect, Stack } from "aws-cdk-lib";
 import { CfnFunction, Runtime } from "aws-cdk-lib/aws-lambda";
 import { CfnBucket } from "aws-cdk-lib/aws-s3";
-import { DigitrafficStack, SOLUTION_KEY } from "./stack.js";
+import { DigitrafficStack, SOLUTION_KEY } from "./stack.mjs";
 import { IConstruct } from "constructs";
 import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";

package/src/aws/infra/stack/{stack.ts → stack.mts}

@@ -5,10 +5,10 @@ import { StringParameter } from "aws-cdk-lib/aws-ssm";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
 
-import { StackCheckingAspect } from "./stack-checking-aspect.js";
+import { StackCheckingAspect } from "./stack-checking-aspect.mjs";
 import { Construct } from "constructs";
-import { TrafficType } from "../../../types/traffictype.js";
-import { DBLambdaEnvironment } from "./lambda-configs.js";
+import { TrafficType } from "../../../types/traffictype.mjs";
+import { DBLambdaEnvironment } from "./lambda-configs.mjs";
 
 const SSM_ROOT = "/digitraffic";
 export const SOLUTION_KEY = "Solution";

package/src/aws/infra/stack/{subscription.ts → subscription.mts}

@@ -1,8 +1,8 @@
 import { CfnSubscriptionFilter } from "aws-cdk-lib/aws-logs";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
-import { DigitrafficStack } from "./stack.js";
+import { DigitrafficStack } from "./stack.mjs";
 import { Construct } from "constructs";
-import { MonitoredFunction } from "./monitoredfunction.js";
+import { MonitoredFunction } from "./monitoredfunction.mjs";
 
 /**
  * Creates a subscription filter that subscribes to a Lambda Log Group and delivers the logs to another destination.

package/src/aws/infra/stacks/{db-dns-stack.ts → db-dns-stack.mts}

@@ -6,9 +6,9 @@ import {
     RecordTarget,
     RecordType,
 } from "aws-cdk-lib/aws-route53";
-import { InfraStackConfiguration } from "./intra-stack-configuration.js";
-import { importVpc } from "../import-util.js";
-import { getParameterValue } from "../stack/parameters.js";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { importVpc } from "../import-util.mjs";
+import { getParameterValue } from "../stack/parameters.mjs";
 
 const DEFAULT_RECORD_TTL = Duration.seconds(30);
 

package/src/aws/infra/stacks/{db-proxy-stack.ts → db-proxy-stack.mts}

@@ -7,10 +7,10 @@ import {
 } from "aws-cdk-lib/aws-rds";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { IVpc, SecurityGroup } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration.js";
-import { DbStack } from "./db-stack.js";
-import { exportValue, importVpc } from "../import-util.js";
-import { createParameter } from "../stack/parameters.js";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { DbStack } from "./db-stack.mjs";
+import { exportValue, importVpc } from "../import-util.mjs";
+import { createParameter } from "../stack/parameters.mjs";
 import { Stack, Duration } from "aws-cdk-lib/core";
 import { Construct } from "constructs/lib/construct.js";
 

package/src/aws/infra/stacks/{db-stack.ts → db-stack.mts}

@@ -19,10 +19,10 @@ import {
 } from "aws-cdk-lib/aws-rds";
 import { Construct } from "constructs/lib/construct.js";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
-import { InfraStackConfiguration } from "./intra-stack-configuration.js";
-import { exportValue, importVpc } from "../import-util.js";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { exportValue, importVpc } from "../import-util.mjs";
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib/core";
-import { createParameter } from "../stack/parameters.js";
+import { createParameter } from "../stack/parameters.mjs";
 
 export interface DbConfiguration {
     readonly cluster?: ClusterConfiguration;

package/src/aws/infra/stacks/{network-stack.ts → network-stack.mts}

@@ -1,6 +1,6 @@
 import { IpAddresses, IVpc, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration.js";
-import { exportValue } from "../import-util.js";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { exportValue } from "../import-util.mjs";
 import { Stack } from "aws-cdk-lib/core";
 import { Construct } from "constructs/lib/construct.js";
 

package/src/aws/runtime/{digitraffic-integration-response.ts → digitraffic-integration-response.mts}

@@ -1,9 +1,9 @@
 import { IntegrationResponse } from "aws-cdk-lib/aws-apigateway";
-import { MediaType } from "../types/mediatypes.js";
+import { MediaType } from "../types/mediatypes.mjs";
 import {
     getDeprecatedDefaultLambdaResponse,
     RESPONSE_DEFAULT_LAMBDA,
-} from "../infra/api/response.js";
+} from "../infra/api/response.mjs";
 
 export abstract class DigitrafficIntegrationResponse {
     static ok(mediaType: MediaType, sunset?: string): IntegrationResponse {

package/src/aws/runtime/{dt-logger-default.ts → dt-logger-default.mts}

@@ -1,9 +1,9 @@
-import { DtLogger } from "./dt-logger.js";
+import { DtLogger } from "./dt-logger.mjs";
 
 /**
  * You can use this for method name definition to match DtLogger LoggableType.method parameter.
  */
-export type { LoggerMethodType } from "./dt-logger.js";
+export type { LoggerMethodType } from "./dt-logger.mjs";
 
 /**
  * You can use this for your logging needs or create one locally and configure it as you wish.

package/src/aws/runtime/secrets/{dbsecret.ts → dbsecret.mts}

@@ -1,4 +1,4 @@
-import { GenericSecret } from "./secret.js";
+import { GenericSecret } from "./secret.mjs";
 
 export enum RdsProxySecretKey {
     username = "username",

package/src/aws/runtime/secrets/node-ttl.d.mts

@@ -0,0 +1,12 @@
+declare module 'node-ttl' {
+  class Ttl {
+    constructor({
+      ttl: number
+                })
+    push: (key: string, value: unknown) => boolean
+
+    get: <T>(key: string) => T
+  }
+
+  export=Ttl
+};

package/src/aws/runtime/secrets/{proxy-holder.ts → proxy-holder.mts}

@@ -1,7 +1,7 @@
-import { SecretHolder } from "./secret-holder.js";
-import { RdsProxySecretKey, RdsProxySecret } from "./dbsecret.js";
-import { getEnvVariable } from "../../../utils/utils.js";
-import { DatabaseEnvironmentKeys } from "../../../database/database.js";
+import { SecretHolder } from "./secret-holder.mjs";
+import { RdsProxySecretKey, RdsProxySecret } from "./dbsecret.mjs";
+import { getEnvVariable } from "../../../utils/utils.mjs";
+import { DatabaseEnvironmentKeys } from "../../../database/database.mjs";
 
 const RDS_PROXY_SECRET_KEYS = Object.values(RdsProxySecretKey);
 

package/src/aws/runtime/secrets/{rds-holder.ts → rds-holder.mts}

@@ -1,7 +1,7 @@
-import { SecretHolder } from "./secret-holder.js";
-import { RdsSecret, RdsSecretKey } from "./dbsecret.js";
-import { getEnvVariable } from "../../../utils/utils.js";
-import { DatabaseEnvironmentKeys } from "../../../database/database.js";
+import { SecretHolder } from "./secret-holder.mjs";
+import { RdsSecret, RdsSecretKey } from "./dbsecret.mjs";
+import { getEnvVariable } from "../../../utils/utils.mjs";
+import { DatabaseEnvironmentKeys } from "../../../database/database.mjs";
 
 const RDS_SECRET_KEYS = Object.values(RdsSecretKey);
 

package/src/aws/runtime/secrets/{secret-holder.ts → secret-holder.mts}

@@ -1,10 +1,11 @@
-import { GenericSecret, getSecret } from "./secret.js";
-import { checkExpectedSecretKeys } from "./dbsecret.js";
-import { getEnvVariable } from "../../../utils/utils.js";
-import { logger } from "../dt-logger-default.js";
+import { GenericSecret, getSecret } from "./secret.mjs";
+import { checkExpectedSecretKeys } from "./dbsecret.mjs";
+import { getEnvVariable } from "../../../utils/utils.mjs";
+import { logger } from "../dt-logger-default.mjs";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
-const NodeTtl = require("node-ttl");
+const NodeTtlImport = await import("node-ttl");
+//eslint-disable-next-line
+const NodeTtl = NodeTtlImport.default;
 
 const DEFAULT_PREFIX = "";
 const DEFAULT_SECRET_KEY = "SECRET";
@@ -96,14 +97,12 @@ export class SecretHolder<Secret extends GenericSecret> {
     }
 
     private async getSecret<S>(): Promise<S> {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         const secret: S | undefined = this.secretCache.get(DEFAULT_SECRET_KEY);
 
         if (!secret) {
             await this.initSecret();
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-        return secret ?? (this.secretCache.get(DEFAULT_SECRET_KEY) as S);
+        return secret ?? (this.secretCache.get(DEFAULT_SECRET_KEY));
     }
 }

package/src/aws/runtime/secrets/{secret.ts → secret.mts}

@@ -1,6 +1,6 @@
 import { SecretsManager } from "aws-sdk";
-import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils.js";
-import { EnvKeys } from "../environment.js";
+import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils.mjs";
+import { EnvKeys } from "../environment.mjs";
 
 // SECRET_OVERRIDE_AWS_REGION might not have been set before import of
 // secret, so we need to lazy initialize SecretsManager

package/src/database/{cached.ts → cached.mts}

@@ -1,5 +1,7 @@
-import { PreparedStatement } from "pg-promise";
-import { DTDatabase, DTTransaction } from "./database.js";
+import pg from "pg-promise";
+import { DTDatabase, DTTransaction } from "./database.mjs";
+
+const { PreparedStatement } = pg;
 
 export interface CachedValue<T> {
     content: T;

package/src/database/{database.ts → database.mts}

@@ -1,7 +1,7 @@
-import { IDatabase, ITask } from "pg-promise";
-import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.js";
-import { logger } from "../aws/runtime/dt-logger-default.js";
-import { logException } from "../utils/logging.js";
+import { type IDatabase, type ITask } from "pg-promise";
+import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.mjs";
+import { logger } from "../aws/runtime/dt-logger-default.mjs";
+import { logException } from "../utils/logging.mjs";
 
 export enum DatabaseEnvironmentKeys {
     DB_USER = "DB_USER",
@@ -11,8 +11,8 @@ export enum DatabaseEnvironmentKeys {
     DB_APPLICATION = "DB_APPLICATION",
 }
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-const pgp = require("pg-promise")();
+const pgpImport = await import("pg-promise");
+const pgp = pgpImport.default();
 
 // convert numeric types to number instead of string
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call

package/src/database/{last-updated.ts → last-updated.mts}

@@ -1,4 +1,4 @@
-import { DTDatabase, DTTransaction } from "./database.js";
+import { DTDatabase, DTTransaction } from "./database.mjs";
 
 export enum DataType {
     VS_DATEX2 = "VS_DATEX2",

package/src/index.mts

@@ -0,0 +1,2 @@
+export { DigitrafficStack } from "./aws/infra/stack/stack.mjs";
+

package/src/test/{db-testutils.ts → db-testutils.mts}

@@ -2,8 +2,8 @@ import {
     DatabaseEnvironmentKeys,
     DTDatabase,
     initDbConnection,
-} from "../database/database.js";
-import { Countable } from "../database/models.js";
+} from "../database/database.mjs";
+import { Countable } from "../database/models.mjs";
 
 export async function assertCount(db: DTDatabase, sql: string, count: number) {
     await db.one(sql).then((x: Countable) => expect(x.count).toEqual(count));

package/src/test/{secrets-manager.ts → secrets-manager.mts}

@@ -1,7 +1,7 @@
-import AWS = require("aws-sdk");
+const AWS = await import("aws-sdk");
 import * as sinon from "sinon";
-import { EnvKeys } from "../aws/runtime/environment.js";
-import { setEnvVariable } from "../utils/utils.js";
+import { EnvKeys } from "../aws/runtime/environment.mjs";
+import { setEnvVariable } from "../utils/utils.mjs";
 
 setEnvVariable(EnvKeys.AWS_REGION, "eu-west-1");
 const secretValue = sinon.stub();

package/src/types/{nullable.ts → nullable.mts}

@@ -1,4 +1,4 @@
-import { ValueOf } from "./util-types.js";
+import { ValueOf } from "./util-types.mjs";
 
 /**
  * Adds `null` as an accepted type to all properties in given type.

package/src/utils/{api-model.ts → api-model.mts}

@@ -6,7 +6,7 @@ import {
     JsonSchemaType,
     JsonSchemaVersion,
 } from 'aws-cdk-lib/aws-apigateway';
-import {ModelWithReference} from "../aws/types/model-with-reference.js";
+import {ModelWithReference} from "../aws/types/model-with-reference.mjs";
 
 /**
  * Get a reference to an OpenAPI model object in a REST API.

package/src/utils/{geometry.ts → geometry.mts}

@@ -3,7 +3,7 @@
  */
 import { Feature, FeatureCollection, Geometry, Position } from "geojson";
 import * as geoJsonValidator from "geojson-validation";
-import { logger } from "../aws/runtime/dt-logger-default.js";
+import { logger } from "../aws/runtime/dt-logger-default.mjs";
 
 export const SRID_WGS84 = 4326;
 

package/src/utils/{logging.ts → logging.mts}

@@ -1,6 +1,6 @@
 import { AxiosError } from "axios";
-import { DtLogger } from "../aws/runtime/dt-logger.js";
-import { getEnvVariableOrElse } from "./utils.js";
+import { DtLogger } from "../aws/runtime/dt-logger.mjs";
+import { getEnvVariableOrElse } from "./utils.mjs";
 
 const functionName = getEnvVariableOrElse("AWS_LAMBDA_FUNCTION_NAME", "test");
 

package/src/utils/{retry.ts → retry.mts}

@@ -1,6 +1,6 @@
-import { HttpError } from "../types/http-error.js";
-import { AsyncTimeoutError } from "../types/async-timeout-error.js";
-import { logger } from "../aws/runtime/dt-logger-default.js";
+import { HttpError } from "../types/http-error.mjs";
+import { AsyncTimeoutError } from "../types/async-timeout-error.mjs";
+import { logger } from "../aws/runtime/dt-logger-default.mjs";
 
 export enum RetryLogError {
     LOG_ALL_AS_ERRORS,

package/src/utils/{slack.ts → slack.mts}

@@ -1,6 +1,6 @@
 import axios from "axios";
-import { logger } from "../aws/runtime/dt-logger-default.js";
-import { logException } from "./logging.js";
+import { logger } from "../aws/runtime/dt-logger-default.mjs";
+import { logException } from "./logging.mjs";
 
 export class SlackApi {
     private readonly url: string;

package/src/utils/{utils.ts → utils.mts}

@@ -1,6 +1,6 @@
-import { AwsEnv } from "../types/aws-env.js";
-import { Either } from "../types/either.js";
-import { EnvKeys } from "../aws/runtime/environment.js";
+import { AwsEnv } from "../types/aws-env.mjs";
+import { Either } from "../types/either.mjs";
+import { EnvKeys } from "../aws/runtime/environment.mjs";
 
 /**
  * Check if arrays have only elements that also exists also in other array.

package/dist/aws/infra/canaries/canary-parameters.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=canary-parameters.js.map

package/dist/aws/infra/stacks/intra-stack-configuration.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=intra-stack-configuration.js.map

package/dist/aws/types/model-with-reference.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=model-with-reference.js.map

package/dist/aws/types/proxytypes.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=proxytypes.js.map

package/dist/database/models.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=models.js.map

package/dist/index.d.ts

@@ -1 +0,0 @@
-export { DigitrafficStack } from "./aws/infra/stack/stack.js";

package/dist/index.js

@@ -1,2 +0,0 @@
-export { DigitrafficStack } from "./aws/infra/stack/stack.js";
-//# sourceMappingURL=index.js.map

package/dist/marine/rtz.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=rtz.js.map

package/dist/types/aws-env.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=aws-env.js.map

package/dist/types/either.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=either.js.map

package/dist/types/nullable.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=nullable.js.map

package/dist/types/urn.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=urn.js.map

package/dist/types/util-types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=util-types.js.map

package/src/index.ts

@@ -1,2 +0,0 @@
-export { DigitrafficStack } from "./aws/infra/stack/stack.js";
-