@digitraffic/common 2022.10.31-3 → 2022.11.1-1

package/dist/utils/base64.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+/**
+ * Decode given string from base64 to ascii
+ * @param str string
+ */
+export declare function decodeBase64ToAscii(str: string): string;
+/**
+ * Decode given string from base64 to given encoding
+ * @param str
+ * @param encoding
+ */
+export declare function decodeBase64(str: string, encoding: BufferEncoding): string;

package/dist/utils/base64.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,GAAW;IAC3C,OAAO,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAFD,kDAEC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAwB;IAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC;AAFD,oCAEC"}

package/dist/utils/date-utils.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Counts difference in milliseconds between dates.
+ * @param start
+ * @param end
+ */
+export declare function countDiffMs(start: Date, end: Date): number;
+/**
+ * Counts difference in seconds between dates.
+ * @param start
+ * @param end
+ */
+export declare function countDiffInSeconds(start: Date, end: Date): number;
+/**
+ * Converts ISO 8601 date-time -string to Date object
+ * @param isoString to convert
+ */
+export declare function dateFromIsoString(isoString: string): Date;

package/dist/utils/date-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"date-utils.js","sourceRoot":"","sources":["../../src/utils/date-utils.ts"],"names":[],"mappings":";;;AACA;;;;GAIG;AACH,SAAgB,WAAW,CAAC,KAAW,EAAE,GAAS;IAC9C,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;AAC3C,CAAC;AAFD,kCAEC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,KAAW,EAAE,GAAS;IACrD,OAAO,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,GAAC,IAAI,CAAC;AACxC,CAAC;AAFD,gDAEC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,SAAiB;IAC/C,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,CAAC,MAAM,YAAY,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE;QACtD,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;KAC7D;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAND,8CAMC"}

package/dist/utils/geojson-types.d.ts

@@ -0,0 +1,14 @@
+/**
+ * GeoJSON types
+ */
+import { LineString, Point, Position } from "geojson";
+export declare class GeoJsonPoint implements Point {
+    readonly type = "Point";
+    readonly coordinates: Position;
+    constructor(coordinates: Position);
+}
+export declare class GeoJsonLineString implements LineString {
+    readonly type = "LineString";
+    readonly coordinates: Position[];
+    constructor(coordinates: Position[]);
+}

package/dist/utils/geojson-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geojson-types.js","sourceRoot":"","sources":["../../src/utils/geojson-types.ts"],"names":[],"mappings":";;;AAKA,MAAa,YAAY;IAIrB,YAAY,WAAqB;QAHxB,SAAI,GAAG,OAAO,CAAC;QAIpB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;CACJ;AAPD,oCAOC;AAED,MAAa,iBAAiB;IAI1B,YAAY,WAAuB;QAH1B,SAAI,GAAG,YAAY,CAAC;QAIzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;CACJ;AAPD,8CAOC"}

package/dist/utils/geometry.d.ts

@@ -0,0 +1,36 @@
+/**
+ * GeoJSON functions and tools
+ */
+import { Feature, FeatureCollection, Geometry, Position } from "geojson";
+export declare const SRID_WGS84 = 4326;
+/**
+ * Creates WKT geometry from GeoJSON geometry
+ * @param geometry GeoJson geometry to convert to WKT
+ */
+export declare function createGeometry(geometry: Geometry): string;
+/**
+ * Create a GeoJSON FeatureCollection from a list of GeoJSON features with a 'last updated' property
+ * @param features List of Features
+ * @param lastUpdated Last updated date
+ */
+export declare function createFeatureCollection(features: Feature[], lastUpdated: Date | null): FeatureCollection;
+export declare function isValidGeoJson<T>(json: T): boolean;
+export declare function isFeatureCollection<T>(json: T): boolean;
+/**
+ * Calculates distance between two GeoJSON points (WGS84)
+ * @param pos1
+ * @param pos2
+ */
+export declare function distanceBetweenPositionsInKm(pos1: Position, pos2: Position): number;
+export declare function areDistinctPositions(previous: Position, next: Position): boolean;
+/**
+ * Calculates distance between two GeoJSON points (WGS84)
+ * @param pos1
+ * @param pos2
+ */
+export declare function distanceBetweenPositionsInM(pos1: Position, pos2: Position): number;
+export declare function createGmlLineString(geometry: Geometry, srsName?: string): {
+    srsName: string;
+    posList: string;
+};
+export declare function positionToList(position: Position, precision?: number): string;

package/dist/utils/geometry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../src/utils/geometry.ts"],"names":[],"mappings":"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"}

package/dist/utils/retry.d.ts

@@ -0,0 +1,13 @@
+export declare enum RetryLogError {
+    LOG_ALL_AS_ERRORS = 0,
+    LOG_LAST_RETRY_AS_ERROR_OTHERS_AS_WARNS = 1,
+    NO_LOGGING = 2
+}
+/**
+ * Utility function for retrying async functions.
+ * @param asyncFn Function
+ * @param retries Amount of retries, default is 3. If set to <= 0, no retries will be done. Using non-finite numbers will throw an error. The maximum allowed retry count is 100.
+ * @param logError Logging options
+ * @return Promise return value
+ */
+export declare function retry<T>(asyncFn: () => Promise<T>, retries?: number, logError?: RetryLogError): Promise<T>;

package/dist/utils/retry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/utils/retry.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,2EAAiB,CAAA;IACjB,uHAAuC,CAAA;IACvC,6DAAU,CAAA;AACd,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAED;;;;;;GAMG;AACI,KAAK,UAAU,KAAK,CAAI,OAAyB,EACpD,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,aAAa,CAAC,uCAAuC;IAEhE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACxD;IACD,IAAI,OAAO,GAAG,GAAG,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC9D;IACD,IAAI;QACA,OAAO,MAAM,OAAO,EAAE,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACZ,MAAM,gBAAgB,GAAG,OAAO,GAAG,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,oBAAoB,CAAC;QAC1C,IAAI,QAAQ,KAAK,aAAa,CAAC,iBAAiB,EAAE;YAC9C,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;SACtC;aAAM,IAAI,QAAQ,KAAK,aAAa,CAAC,uCAAuC,EAAE;YAC3E,IAAI,gBAAgB,GAAG,CAAC,EAAE;gBACtB,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;aACtC;iBAAM;gBACH,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;aACrC;SACJ;QAED,IAAI,gBAAgB,GAAG,CAAC,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACtC;QACD,OAAO,CAAC,IAAI,CAAC,oEAAoE,EAAE,gBAAgB,CAAC,CAAC;QACrG,OAAO,KAAK,CAAC,OAAO,EAChB,gBAAgB,EAChB,QAAQ,CAAC,CAAC;KACjB;AACL,CAAC;AAnCD,sBAmCC"}

package/dist/utils/slack.d.ts

@@ -0,0 +1,5 @@
+export declare class SlackApi {
+    private readonly url;
+    constructor(url: string);
+    notify(text: string): Promise<void>;
+}

package/dist/utils/slack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slack.js","sourceRoot":"","sources":["../../src/utils/slack.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,QAAQ;IAIjB,YAAY,GAAW;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,IAAI;YACA,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAC9C,MAAM,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,IAAI;aACP,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;IACL,CAAC;CAEJ;AAnBD,4BAmBC"}

package/dist/utils/utils.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Check if arrays have only elements that also exists also in other array.
+ * Individual element count doesn't matter.
+ * Function works only for primitive types and for other it just checks the reference to object.
+ *
+ * Some examples
+ * bothArraysHasSameValues( [a, b], [b, a] )    => true
+ * bothArraysHasSameValues( [a, a], [a, a, a] ) => true
+ * bothArraysHasSameValues( [a, b], [a] )       => false
+ *
+ * Object references:
+ * const o1 = { a: 1, b: 2};
+ * const o2 = { a: 1, b: 2};
+ * // Arrays has references to same objects
+ * bothArraysHasSameValues([o1], [o1]))         => true
+ * Arrays have references to different objects
+ * bothArraysHasSameValues([o1], [o2]))         => false
+ *
+ * @param a first array to compare
+ * @param b second array to compare
+ */
+import { Either } from "../types/either";
+export declare function bothArraysHasSameValues(a: null | undefined | unknown[], b: null | undefined | unknown[]): boolean;
+/**
+ * Returns the last item on the array.  If the array is empty, throws an error!
+ */
+export declare function getLast<T>(array: T[], sortFunction?: (a: T) => number): T;
+/**
+ * Returns the first item on the array.  If the array is empty, throws an error!
+ */
+export declare function getFirst<T>(array: T[], sortFunction?: (a: T) => number): T;
+/**
+ * Gets environment variable. Throws error if variable is not found.
+ *
+ * @param key Environment key
+ * @return string
+ */
+export declare function getEnvVariable(key: string): string;
+/**
+ * Gets environment variable. Safe version returns object with either ok or error status.
+ * Easier to use for recovery than catching an error.
+ *
+ * @param key Environment key
+ * @return Either<string>
+ */
+export declare function getEnvVariableSafe(key: string): Either<string>;

package/dist/utils/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;AAuBA,SAAgB,uBAAuB,CACnC,CAA+B,EAC/B,CAA+B;IAE/B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KAChB;SAAM,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC;KACf;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;QACzB,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9D,CAAC;AAfD,0DAeC;AAED;;GAEG;AACH,SAAgB,OAAO,CAAI,KAAU,EAAE,YAA+B;IAClE,OAAO,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACtD,CAAC;AAFD,0BAEC;AAED;;GAEG;AACH,SAAgB,QAAQ,CAAI,KAAU,EAAE,YAA+B;IACnE,OAAO,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACrD,CAAC;AAFD,4BAEC;AAED,SAAS,cAAc,CACnB,QAAiB,EACjB,KAAU,EACV,YAA+B;IAE/B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CACX,aAAa,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAC/D,CAAC;KACL;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAE9C,IAAI,YAAY,EAAE;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC;KAC1C;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,GAAW;IACtC,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACnC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC;AACxB,CAAC;AAND,wCAMC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,KAAK,KAAK,SAAS,EAAE;QACrB,OAAO;YACH,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,gCAAgC,GAAG,iBAAiB;SAChE,CAAC;KACL;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACnC,CAAC;AATD,gDASC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2022.10.31-3",
+  "version": "2022.11.1-1",
   "description": "",
   "repository": {
     "type": "git",

package/src/aws/infra/stack/rest_apis.ts

@@ -4,48 +4,70 @@ import {
     GatewayResponse,
     ResponseType,
     EndpointType,
-    RestApiProps, JsonSchema, Model, CfnDocumentationPart, Resource,
-} from 'aws-cdk-lib/aws-apigateway';
-import {PolicyDocument, PolicyStatement, Effect, AnyPrincipal} from 'aws-cdk-lib/aws-iam';
-import {Construct} from "constructs";
-import {DigitrafficStack} from "./stack";
-import {createDefaultUsagePlan, createUsagePlan} from "../usage-plans";
-import {ModelWithReference} from "../../types/model-with-reference";
-import {getModelReference} from "../../../utils/api-model";
-import {MediaType} from "../../types/mediatypes";
-import {DocumentationPart, DocumentationProperties} from "../documentation";
-
-import R = require('ramda');
+    RestApiProps,
+    JsonSchema,
+    Model,
+    CfnDocumentationPart,
+    Resource,
+} from "aws-cdk-lib/aws-apigateway";
+import {
+    PolicyDocument,
+    PolicyStatement,
+    Effect,
+    AnyPrincipal,
+} from "aws-cdk-lib/aws-iam";
+import { Construct } from "constructs";
+import { DigitrafficStack } from "./stack";
+import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans";
+import { ModelWithReference } from "../../types/model-with-reference";
+import { getModelReference } from "../../../utils/api-model";
+import { MediaType } from "../../types/mediatypes";
+import { DocumentationPart, DocumentationProperties } from "../documentation";
+
+import R = require("ramda");
 
 export class DigitrafficRestApi extends RestApi {
     readonly apiKeyIds: string[];
     readonly enableDocumentation: boolean;
 
     constructor(
-        stack: DigitrafficStack, apiId: string, apiName: string, allowFromIpAddresses?: string[] | undefined, config?: Partial<RestApiProps>,
+        stack: DigitrafficStack,
+        apiId: string,
+        apiName: string,
+        allowFromIpAddresses?: string[] | undefined,
+        config?: Partial<RestApiProps>
     ) {
-        const policyDocument = allowFromIpAddresses == null ? createDefaultPolicyDocument() : createIpRestrictionPolicyDocument(allowFromIpAddresses);
+        const policyDocument =
+            allowFromIpAddresses == null
+                ? createDefaultPolicyDocument()
+                : createIpRestrictionPolicyDocument(allowFromIpAddresses);
 
         // override default config with given extra config
-        const apiConfig = {...{
-            deployOptions: {
-                loggingLevel: MethodLoggingLevel.ERROR,
+        const apiConfig = {
+            ...{
+                deployOptions: {
+                    loggingLevel: MethodLoggingLevel.ERROR,
+                },
+                restApiName: apiName,
+                endpointTypes: [EndpointType.REGIONAL],
+                policy: policyDocument,
             },
-            restApiName: apiName,
-            endpointTypes: [EndpointType.REGIONAL],
-            policy: policyDocument,
-        }, ...config};
+            ...config,
+        };
 
         super(stack, apiId, apiConfig);
 
         this.apiKeyIds = [];
-        this.enableDocumentation = stack.configuration.stackFeatures?.enableDocumentation ?? true;
+        this.enableDocumentation =
+            stack.configuration.stackFeatures?.enableDocumentation ?? true;
 
         add404Support(this, stack);
     }
 
     hostname(): string {
-        return `${this.restApiId}.execute-api.${(this.stack as DigitrafficStack).region}.amazonaws.com`;
+        return `${this.restApiId}.execute-api.${
+            (this.stack as DigitrafficStack).region
+        }.amazonaws.com`;
     }
 
     createUsagePlan(apiKeyId: string, apiKeyName: string): string {
@@ -65,32 +87,44 @@ export class DigitrafficRestApi extends RestApi {
     }
 
     addJsonModel(modelName: string, schema: JsonSchema) {
-        return this.getModelWithReference(this.addModel(modelName, {
-            contentType: MediaType.APPLICATION_JSON,
-            modelName,
-            schema,
-        }));
+        return this.getModelWithReference(
+            this.addModel(modelName, {
+                contentType: MediaType.APPLICATION_JSON,
+                modelName,
+                schema,
+            })
+        );
     }
 
     addCSVModel(modelName: string) {
-        return this.getModelWithReference(this.addModel(modelName, {
-            contentType: MediaType.TEXT_CSV,
-            modelName,
-            schema: {},
-        }));
+        return this.getModelWithReference(
+            this.addModel(modelName, {
+                contentType: MediaType.TEXT_CSV,
+                modelName,
+                schema: {},
+            })
+        );
     }
 
     private getModelWithReference(model: Model): ModelWithReference {
-        return R.assoc('modelReference', getModelReference(model.modelId, this.restApiId), model) as ModelWithReference;
+        return R.assoc(
+            "modelReference",
+            getModelReference(model.modelId, this.restApiId),
+            model
+        ) as ModelWithReference;
     }
 
     private addDocumentationPart(
-        resource: Resource, parameterName: string, resourceName: string, type: string, properties: DocumentationProperties,
+        resource: Resource,
+        parameterName: string,
+        resourceName: string,
+        type: string,
+        properties: DocumentationProperties
     ) {
         const location: CfnDocumentationPart.LocationProperty = {
             type,
             path: resource.path,
-            name: type !== 'METHOD' ? parameterName : undefined,
+            name: type !== "METHOD" ? parameterName : undefined,
         };
 
         new CfnDocumentationPart(this.stack, resourceName, {
@@ -100,11 +134,20 @@ export class DigitrafficRestApi extends RestApi {
         });
     }
 
-    documentResource(resource: Resource, ...documentationPart: DocumentationPart[]) {
-        if(this.enableDocumentation) {
-            documentationPart.forEach(dp => this.addDocumentationPart(
-                resource, dp.parameterName, `${resource.path}.${dp.parameterName}.Documentation`, dp.type, dp.documentationProperties,
-            ));
+    documentResource(
+        resource: Resource,
+        ...documentationPart: DocumentationPart[]
+    ) {
+        if (this.enableDocumentation) {
+            documentationPart.forEach((dp) =>
+                this.addDocumentationPart(
+                    resource,
+                    dp.parameterName,
+                    `${resource.path}.${dp.parameterName}.Documentation`,
+                    dp.type,
+                    dp.documentationProperties
+                )
+            );
         } else {
             console.info("Skipping documentation for %s", resource.path);
         }
@@ -119,25 +162,33 @@ export class DigitrafficRestApi extends RestApi {
  * @param stack Construct
  */
 export function add404Support(restApi: RestApi, stack: Construct) {
-    new GatewayResponse(stack, `MissingAuthenticationTokenResponse-${restApi.restApiName}`, {
-        restApi,
-        type: ResponseType.MISSING_AUTHENTICATION_TOKEN,
-        statusCode: '404',
-        templates: {
-            'application/json': '{"message": "Not found"}',
-        },
-    });
+    new GatewayResponse(
+        stack,
+        `MissingAuthenticationTokenResponse-${restApi.restApiName}`,
+        {
+            restApi,
+            type: ResponseType.MISSING_AUTHENTICATION_TOKEN,
+            statusCode: "404",
+            templates: {
+                [MediaType.APPLICATION_JSON]: '{"message": "Not found"}',
+            },
+        }
+    );
 }
 
 export function add401Support(restApi: RestApi, stack: Construct) {
-    new GatewayResponse(stack, `AuthenticationFailedResponse-${restApi.restApiName}`, {
-        restApi,
-        type: ResponseType.UNAUTHORIZED,
-        statusCode: "401",
-        responseHeaders: {
-            'WWW-Authenticate': "'Basic'",
-        },
-    });
+    new GatewayResponse(
+        stack,
+        `AuthenticationFailedResponse-${restApi.restApiName}`,
+        {
+            restApi,
+            type: ResponseType.UNAUTHORIZED,
+            statusCode: "401",
+            responseHeaders: {
+                "WWW-Authenticate": "'Basic'",
+            },
+        }
+    );
 }
 
 /**
@@ -149,23 +200,36 @@ export function add401Support(restApi: RestApi, stack: Construct) {
  * @param restApi RestApi
  * @param stack Construct
  */
-export function setReturnCodeForMissingAuthenticationToken(returnCode: number,
+export function setReturnCodeForMissingAuthenticationToken(
+    returnCode: number,
     message: string,
     restApi: RestApi,
-    stack: Construct) {
-
-    new GatewayResponse(stack, `MissingAuthenticationTokenResponse-${restApi.restApiName}`, {
-        restApi,
-        type: ResponseType.MISSING_AUTHENTICATION_TOKEN,
-        statusCode: `${returnCode}`,
-        templates: {
-            'application/json': `{"message": ${message}}`,
-        },
-    });
+    stack: Construct
+) {
+    new GatewayResponse(
+        stack,
+        `MissingAuthenticationTokenResponse-${restApi.restApiName}`,
+        {
+            restApi,
+            type: ResponseType.MISSING_AUTHENTICATION_TOKEN,
+            statusCode: `${returnCode}`,
+            templates: {
+                [MediaType.APPLICATION_JSON]: `{"message": ${message}}`,
+            },
+        }
+    );
 }
 
-export function createRestApi(stack: Construct, apiId: string, apiName: string, allowFromIpAddresses?: string[] | undefined): RestApi {
-    const policyDocument = allowFromIpAddresses == null ? createDefaultPolicyDocument() : createIpRestrictionPolicyDocument(allowFromIpAddresses);
+export function createRestApi(
+    stack: Construct,
+    apiId: string,
+    apiName: string,
+    allowFromIpAddresses?: string[] | undefined
+): RestApi {
+    const policyDocument =
+        allowFromIpAddresses == null
+            ? createDefaultPolicyDocument()
+            : createIpRestrictionPolicyDocument(allowFromIpAddresses);
     const restApi = new RestApi(stack, apiId, {
         deployOptions: {
             loggingLevel: MethodLoggingLevel.ERROR,
@@ -183,40 +247,29 @@ export function createDefaultPolicyDocument() {
         statements: [
             new PolicyStatement({
                 effect: Effect.ALLOW,
-                actions: [
-                    "execute-api:Invoke",
-                ],
-                resources: [
-                    "*",
-                ],
-                principals: [
-                    new AnyPrincipal(),
-                ],
+                actions: ["execute-api:Invoke"],
+                resources: ["*"],
+                principals: [new AnyPrincipal()],
             }),
         ],
     });
 }
 
-
-export function createIpRestrictionPolicyDocument(allowFromIpAddresses: string[]): PolicyDocument {
+export function createIpRestrictionPolicyDocument(
+    allowFromIpAddresses: string[]
+): PolicyDocument {
     return new PolicyDocument({
         statements: [
             new PolicyStatement({
                 effect: Effect.ALLOW,
                 conditions: {
-                    "IpAddress": {
+                    IpAddress: {
                         "aws:SourceIp": allowFromIpAddresses,
                     },
                 },
-                actions: [
-                    "execute-api:Invoke",
-                ],
-                resources: [
-                    "*",
-                ],
-                principals: [
-                    new AnyPrincipal(),
-                ],
+                actions: ["execute-api:Invoke"],
+                resources: ["*"],
+                principals: [new AnyPrincipal()],
             }),
         ],
     });

package/src/aws/infra/stack/stack-checking-aspect.ts

@@ -10,7 +10,7 @@ import { LogRetention } from "aws-cdk-lib/aws-logs";
 import IntegrationProperty = CfnMethod.IntegrationProperty;
 
 const MAX_CONCURRENCY_LIMIT = 100;
-const NODE_RUNTIME = Runtime.NODEJS_14_X.name;
+const NODE_RUNTIMES = [Runtime.NODEJS_14_X.name, Runtime.NODEJS_16_X.name];
 
 enum ResourceType {
     stackName = "STACK_NAME",
@@ -141,7 +141,10 @@ export class StackCheckingAspect implements IAspect {
                 );
             }
 
-            if (node.runtime !== NODE_RUNTIME) {
+            if (
+                node.runtime !== undefined &&
+                !NODE_RUNTIMES.includes(node.runtime)
+            ) {
                 this.addAnnotation(
                     node,
                     ResourceType.functionRuntime,

package/src/aws/runtime/environment.ts

@@ -1,7 +1,11 @@
-export function envValue(key: string): string {
+export function envValue(key: string, defaultValue?: string): string {
     const value = process.env[key];
 
     if (value == null) {
+        if (defaultValue) {
+            return defaultValue;
+        }
+
         throw new Error(`Missing environment value ${key}`);
     }
 

package/src/aws/types/mediatypes.ts

@@ -1,6 +1,6 @@
 // charset=UTF-8 is deprecated but mobile applications sometimes needs it
 export enum MediaType {
-    APPLICATION_JSON = "application/json;charset=UTF-8",
+    APPLICATION_JSON = "application/json",
     APPLICATION_XML = "application/xml",
     APPLICATION_GEOJSON = "application/geo+json;charset=UTF-8",
     IMAGE_SVG = "image/svg+xml",
@@ -8,4 +8,5 @@ export enum MediaType {
     TEXT_PLAIN = "text/plain",
     TEXT_HTML = "text/html",
     TEXT_CSV = "text/csv",
+    APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8",
 }

package/src/database/database.ts

@@ -1,6 +1,7 @@
 import { IDatabase, ITask } from "pg-promise";
 import { DatabaseEnvironmentKeys } from "../aws/runtime/secrets/dbsecret";
 import { getEnvVariable, getEnvVariableSafe } from "../utils/utils";
+import { envValue } from "../aws/runtime/environment";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const pgp = require("pg-promise")();
@@ -66,20 +67,18 @@ async function doInDatabase<T>(
     readonly: boolean,
     fn: (db: DTDatabase) => Promise<T>
 ): Promise<T> {
-    const db_application = getEnvVariableSafe(
-        DatabaseEnvironmentKeys.DB_APPLICATION
+    const db_application = envValue(
+        DatabaseEnvironmentKeys.DB_APPLICATION,
+        "unknown-cdk-application"
     );
-    const db_ro_uri = getEnvVariableSafe(DatabaseEnvironmentKeys.DB_RO_URI);
-    const db_uri =
-        db_ro_uri.result === "ok"
-            ? db_ro_uri.value
-            : getEnvVariable(DatabaseEnvironmentKeys.DB_URI);
+    const db_uri = readonly
+        ? envValue(DatabaseEnvironmentKeys.DB_RO_URI)
+        : envValue(DatabaseEnvironmentKeys.DB_URI);
+
     const db = initDbConnection(
         getEnvVariable(DatabaseEnvironmentKeys.DB_USER),
         getEnvVariable(DatabaseEnvironmentKeys.DB_PASS),
-        db_application.result === "ok"
-            ? db_application.value
-            : "unknown-cdk-application",
+        db_application,
         db_uri
     );
     try {

package/src/test/db-testutils.ts

@@ -1,5 +1,10 @@
 import { DTDatabase, initDbConnection } from "../database/database";
 import { DatabaseEnvironmentKeys } from "../aws/runtime/secrets/dbsecret";
+import { Countable } from "../database/models";
+
+export async function assertCount(db: DTDatabase, sql: string, count: number) {
+    await db.one(sql).then((x: Countable) => expect(x.count).toEqual(count));
+}
 
 export function dbTestBase(
     fn: (db: DTDatabase) => void,

package/.editorconfig

@@ -1,9 +0,0 @@
-[*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=true
-indent_style=space
-indent_size=4
-
-[{*.json,*.yml,*.yaml}]
-indent_size=2

package/.eslintignore

@@ -1,4 +0,0 @@
-*.js
-cdk.out
-dist
-output