1.1.0

Author: MrRefactoring

.eslintrc

@@ -6,7 +6,7 @@
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
-    "project": "./tsconfig.tests.json"
+    "project": "./tsconfig.lint.json"
   },
   "plugins": [
     "import"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trello.js",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Simple Trello API Client",
   "author": "Vladislav Tupikin <[email protected]>",
   "license": "MIT",
@@ -12,9 +12,7 @@
     "doc": "typedoc --name \"Trello.js - API library\" --out docs ./src/index.ts --plugin typedoc-plugin-extras --footerDate --footerTime --footerTypedocVersion --favicon https://svgshare.com/i/bQb.svg",
     "lint": "eslint src tests --ext .ts",
     "lint:fix": "npm run lint -- --fix",
-    "test": "jest tests",
-    "test:verbose": "npm run test -- --verbose",
-    "test:coverage": "npm run test -- --coverage"
+    "test": "jest tests"
   },
   "jest": {
     "preset": "ts-jest",
@@ -31,23 +29,22 @@
   ],
   "devDependencies": {
     "@types/dotenv": "^8.2.0",
-    "@types/jest": "^27.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.1.0",
-    "@typescript-eslint/parser": "^5.1.0",
+    "@types/jest": "^27.0.3",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
     "dotenv": "^10.0.0",
-    "eslint": "^8.0.1",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.1",
+    "eslint": "^8.4.1",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.2",
-    "jest": "^27.3.1",
-    "ts-jest": "^27.0.7",
-    "typedoc": "^0.22.6",
+    "eslint-plugin-import": "^2.25.3",
+    "jest": "^27.4.3",
+    "ts-jest": "^27.1.1",
+    "typedoc": "^0.22.10",
     "typedoc-plugin-extras": "^2.2.1",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.2"
   },
   "dependencies": {
-    "axios": "^0.23.0",
-    "telemetry.trello.js": "<2"
+    "axios": "^0.24.0"
   }
 }

package.json

@@ -1,15 +1,12 @@
 import axios, { AxiosInstance } from 'axios';
-import { Telemetry, TelemetryClient } from 'telemetry.trello.js';
 import { Client } from './client';
 import { Callback, RequestConfig } from '../types';
 import { Config } from '../config';
 
 export class BaseClient implements Client {
   private instance: AxiosInstance;
-  private telemetryClient: TelemetryClient;
 
   constructor(private config: Config) {
-    this.telemetryClient = new TelemetryClient(config.telemetry);
     this.instance = axios.create({
       paramsSerializer: this.paramSerializer.bind(this),
       ...config.baseRequestConfig,
@@ -56,10 +53,9 @@ export class BaseClient implements Client {
       .replace(/%5D/gi, ']');
   }
 
-  async sendRequest<T>(requestConfig: RequestConfig, callback?: Callback<T> | undefined, telemetryData?: Partial<Telemetry>): Promise<T>;
-  async sendRequest<T>(requestConfig: RequestConfig, callback: Callback<T>, telemetryData?: Partial<Telemetry>): Promise<void>;
-  async sendRequest<T>(rawRequestConfig: RequestConfig, callback?: Callback<T>, telemetryData?: Partial<Telemetry>): Promise<T | void> {
-    const startDateTime = new Date();
+  async sendRequest<T>(requestConfig: RequestConfig, callback?: Callback<T> | undefined, telemetryData?: any): Promise<T>;
+  async sendRequest<T>(requestConfig: RequestConfig, callback: Callback<T>, telemetryData?: any): Promise<void>;
+  async sendRequest<T>(rawRequestConfig: RequestConfig, callback?: Callback<T>): Promise<T | void> {
     const requestConfig: RequestConfig = {
       ...rawRequestConfig,
       params: {
@@ -69,23 +65,6 @@ export class BaseClient implements Client {
       },
     };
 
-    const telemetry: Telemetry = {
-      authenticated: !!(this.config.key && this.config.token),
-      bodyExists: !!requestConfig.data,
-      callbackUsed: !!callback,
-      libVersion: '1.0.3',
-      libVersionHash: '55f9c405bd87ba23896f34011ffce8da',
-      methodName: telemetryData?.methodName || 'sendRequest',
-      onErrorMiddlewareUser: !!this.config.middlewares?.onError,
-      onResponseMiddlewareUsed: !!this.config.middlewares?.onResponse,
-      queryExists: !!requestConfig.params,
-      requestStartTime: startDateTime,
-      requestEndTime: new Date(),
-      requestStatusCode: 0,
-      timeout: this.config.baseRequestConfig?.timeout || this.instance.defaults.timeout || -1,
-      ...telemetryData,
-    };
-
     try {
       const response = await this.instance.request<T>(requestConfig);
 
@@ -96,8 +75,6 @@ export class BaseClient implements Client {
 
       this.config.middlewares?.onResponse?.(response.data);
 
-      telemetry.requestStatusCode = response.status;
-
       return responseHandler(response.data);
     } catch (e: any) {
       const callbackErrorHandler = callback && ((error: Config.Error) => callback(error));
@@ -109,13 +86,7 @@ export class BaseClient implements Client {
 
       this.config.middlewares?.onError?.(e);
 
-      telemetry.requestStatusCode = e.response?.status ?? 0;
-
       return errorHandler(e);
-    } finally {
-      telemetry.requestEndTime = new Date();
-
-      this.telemetryClient.sendTelemetry(telemetry);
     }
   }
 }

src/clients/baseClient.ts

@@ -1,10 +1,9 @@
-import { Telemetry } from 'telemetry.trello.js';
 import {
   Callback,
   RequestConfig,
 } from '../types';
 
 export interface Client {
-  sendRequest<T>(requestConfig: RequestConfig, callback?: Callback<T> | undefined, telemetryData?: Partial<Telemetry>): Promise<T>;
-  sendRequest<T>(requestConfig: RequestConfig, callback: Callback<T>, telemetryData?: Partial<Telemetry>): Promise<void>;
+  sendRequest<T>(requestConfig: RequestConfig, callback?: Callback<T> | undefined, telemetryData?: any): Promise<T>;
+  sendRequest<T>(requestConfig: RequestConfig, callback: Callback<T>, telemetryData?: any): Promise<void>;
 }

src/clients/client.ts

@@ -1,18 +1,19 @@
 import { AxiosError, AxiosRequestConfig } from 'axios';
-import { TelemetryConfig } from 'telemetry.trello.js';
 
 export interface Config {
   key: string;
   token: string;
   baseRequestConfig?: Config.BaseRequestConfig;
   middlewares?: Config.Middlewares;
+  /** @deprecated */
   telemetry?: Config.Telemetry;
 }
 
 export namespace Config {
   export type Error = AxiosError;
   export type BaseRequestConfig = AxiosRequestConfig;
-  export type Telemetry = boolean | TelemetryConfig;
+  /** @deprecated */
+  export type Telemetry = any;
 
   export interface Middlewares {
     onError?: Config.Middlewares.OnErrorHandler;

src/config.ts

@@ -1,6 +1,3 @@
 import * as dotenv from 'dotenv';
-import { TelemetryClient } from 'telemetry.trello.js';
 
 dotenv.config();
-
-TelemetryClient.prototype.sendTelemetry = () => Promise.resolve();