chore: Enable typescript strict mode (aws-observability#237)

williazz · Sep 28, 2022 · e858cf9 · e858cf9
1 parent b775969
commit e858cf9
Show file tree

Hide file tree

Showing 25 changed files with 282 additions and 207 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -100,6 +100,7 @@ module.exports = {
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-misused-new': 'error',
         '@typescript-eslint/no-namespace': 'error',
+        '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/no-parameter-properties': 'off',
         '@typescript-eslint/no-shadow': [
             'off',
@@ -128,6 +129,7 @@ module.exports = {
         '@typescript-eslint/require-await': 'warn',
         '@typescript-eslint/no-unsafe-member-access': 'warn',
         '@typescript-eslint/no-this-alias': 'warn',
+        '@typescript-eslint/no-unnecessary-type-assertion': 'off',
         '@typescript-eslint/member-ordering': 'off',
         '@typescript-eslint/triple-slash-reference': [
             'error',

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/CommandQueue.ts b/src/CommandQueue.ts
@@ -2,6 +2,20 @@ import { CredentialProvider, Credentials } from '@aws-sdk/types';
 import { PartialConfig, Orchestration } from './orchestration/Orchestration';
 import { getRemoteConfig } from './remote-config/remote-config';
 
+export type CommandFunction = (payload?: any) => void;
+
+interface CommandFunctions {
+    setAwsCredentials: CommandFunction;
+    recordPageView: CommandFunction;
+    recordError: CommandFunction;
+    registerDomEvents: CommandFunction;
+    dispatch: CommandFunction;
+    dispatchBeacon: CommandFunction;
+    enable: CommandFunction;
+    disable: CommandFunction;
+    allowCookies: CommandFunction;
+}
+
 /**
  * An AWS RUM Client command.
  */
@@ -32,7 +46,7 @@ export type AwsRumClientInit = {
 export class CommandQueue {
     private orchestration!: Orchestration;
 
-    private commandHandlerMap = {
+    private commandHandlerMap: CommandFunctions = {
         setAwsCredentials: (
             payload: Credentials | CredentialProvider
         ): void => {
@@ -93,7 +107,9 @@ export class CommandQueue {
      * Add a command to the command queue.
      */
     public async push(command: Command) {
-        const commandHandler = this.commandHandlerMap[command.c];
+        const commandHandler = this.commandHandlerMap[
+            command.c as keyof CommandFunctions
+        ];
         if (commandHandler) {
             commandHandler(command.p);
         } else {
@@ -110,7 +126,7 @@ export class CommandQueue {
         );
 
         // Overwrite the global API to use CommandQueue
-        window[awsRum.n] = (c: string, p: any) => {
+        (window as any)[awsRum.n] = (c: string, p: any) => {
             this.push({ c, p });
         };
 

diff --git a/src/dispatch/Authentication.ts b/src/dispatch/Authentication.ts
@@ -12,7 +12,7 @@ export class Authentication {
     private credentials: Credentials | undefined;
 
     constructor(config: Config) {
-        const region: string = config.identityPoolId.split(':')[0];
+        const region: string = config.identityPoolId!.split(':')[0];
         this.config = config;
         this.stsClient = new StsClient({
             fetchRequestHandler: new FetchHttpHandler(),
@@ -70,7 +70,7 @@ export class Authentication {
                 // The credentials have expired.
                 return reject();
             }
-            resolve(this.credentials);
+            resolve(this.credentials!);
         });
     };
 
@@ -83,7 +83,7 @@ export class Authentication {
         return new Promise<Credentials>((resolve, reject) => {
             let credentials;
             try {
-                credentials = JSON.parse(localStorage.getItem(CRED_KEY));
+                credentials = JSON.parse(localStorage.getItem(CRED_KEY)!);
             } catch (e) {
                 // Error retrieving, decoding or parsing the cred string -- abort
                 return reject();
@@ -113,14 +113,14 @@ export class Authentication {
     private AnonymousCognitoCredentialsProvider = async (): Promise<Credentials> => {
         return this.cognitoIdentityClient
             .getId({
-                IdentityPoolId: this.config.identityPoolId
+                IdentityPoolId: this.config.identityPoolId as string
             })
             .then((getIdResponse) =>
                 this.cognitoIdentityClient.getOpenIdToken(getIdResponse)
             )
             .then((getOpenIdTokenResponse) =>
                 this.stsClient.assumeRoleWithWebIdentity({
-                    RoleArn: this.config.guestRoleArn,
+                    RoleArn: this.config.guestRoleArn as string,
                     RoleSessionName: 'cwr',
                     WebIdentityToken: getOpenIdTokenResponse.Token
                 })

diff --git a/src/dispatch/CognitoIdentityClient.ts b/src/dispatch/CognitoIdentityClient.ts
@@ -54,7 +54,7 @@ export class CognitoIdentityClient {
                 response.body
                     .getReader()
                     .read()
-                    .then(({ value }) =>
+                    .then(({ value }: { value: number[] }) =>
                         JSON.parse(String.fromCharCode.apply(null, value))
                     )
             )
@@ -76,7 +76,7 @@ export class CognitoIdentityClient {
                 response.body
                     .getReader()
                     .read()
-                    .then(({ value }) =>
+                    .then(({ value }: { value: number[] }) =>
                         JSON.parse(String.fromCharCode.apply(null, value))
                     )
             )
@@ -100,7 +100,7 @@ export class CognitoIdentityClient {
                 return response.body
                     .getReader()
                     .read()
-                    .then(({ value }) => {
+                    .then(({ value }: { value: number[] }) => {
                         const { IdentityId, Credentials } = JSON.parse(
                             String.fromCharCode.apply(null, value)
                         );