From 4781f04ca4eb5c54f253b94b53a23e619e7fd730 Mon Sep 17 00:00:00 2001 From: Chaiwat Ekkaewnumchai Date: Thu, 5 Sep 2019 02:46:27 -0700 Subject: [PATCH] Convert Flipper plugin "Network" to TypeScript Summary: _typescript_ Reviewed By: danielbuechele Differential Revision: D17053118 fbshipit-source-id: 1ad6e9db7e6338165070c782ab9e7d2d600a62b7 --- src/plugins/network/RequestDetails.js | 2 +- .../__tests__/requestToCurlCommand.node.js | 2 +- src/plugins/network/index.js | 3 +- src/plugins/network/types.js | 53 ------------------- src/plugins/network/types.tsx | 53 +++++++++++++++++++ src/plugins/network/utils.js | 2 +- 6 files changed, 57 insertions(+), 58 deletions(-) delete mode 100644 src/plugins/network/types.js create mode 100644 src/plugins/network/types.tsx diff --git a/src/plugins/network/RequestDetails.js b/src/plugins/network/RequestDetails.js index 08834e2e3..310481987 100644 --- a/src/plugins/network/RequestDetails.js +++ b/src/plugins/network/RequestDetails.js @@ -11,7 +11,7 @@ import type { Header, Insights, RetryInsights, -} from './types.js'; +} from './types.tsx'; import { Component, diff --git a/src/plugins/network/__tests__/requestToCurlCommand.node.js b/src/plugins/network/__tests__/requestToCurlCommand.node.js index 1e35a5620..aa0e9128c 100644 --- a/src/plugins/network/__tests__/requestToCurlCommand.node.js +++ b/src/plugins/network/__tests__/requestToCurlCommand.node.js @@ -6,7 +6,7 @@ */ import {convertRequestToCurlCommand} from '../utils.js'; -import type {Request} from '../types.js'; +import type {Request} from '../types.tsx'; test('convertRequestToCurlCommand: simple GET', () => { const request: Request = { diff --git a/src/plugins/network/index.js b/src/plugins/network/index.js index 9491436d7..d0852e85a 100644 --- a/src/plugins/network/index.js +++ b/src/plugins/network/index.js @@ -26,7 +26,7 @@ import { SearchableTable, FlipperPlugin, } from 'flipper'; -import type {Request, RequestId, Response} from './types.js'; +import type {Request, RequestId, Response} from './types.tsx'; import { convertRequestToCurlCommand, getHeaderValue, @@ -150,7 +150,6 @@ export default class extends FlipperPlugin { persistedState: PersistedState, ): Array => { const responses = persistedState ? persistedState.responses || [] : []; - // $FlowFixMe Object.values returns Array, but we know it is Array const r: Array = Object.values(responses); return ( diff --git a/src/plugins/network/types.js b/src/plugins/network/types.js deleted file mode 100644 index ad8adcf53..000000000 --- a/src/plugins/network/types.js +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018-present Facebook. - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * @format - */ - -export type RequestId = string; - -export type Request = {| - id: RequestId, - timestamp: number, - method: string, - url: string, - headers: Array
, - data: ?string, -|}; - -export type Response = {| - id: RequestId, - timestamp: number, - status: number, - reason: string, - headers: Array
, - data: ?string, - insights: ?Insights, -|}; - -export type Header = {| - key: string, - value: string, -|}; - -export type RetryInsights = {| - count: number, - limit: number, - timeSpent: number, -|}; - -export type Insights = {| - dnsLookupTime: ?number, - connectTime: ?number, - sslHandshakeTime: ?number, - preTransferTime: ?number, - redirectsTime: ?number, - timeToFirstByte: ?number, - transferTime: ?number, - postProcessingTime: ?number, - // Amount of transferred data can be different from total size of payload. - bytesTransfered: ?number, - transferSpeed: ?number, - retries: ?RetryInsights, -|}; diff --git a/src/plugins/network/types.tsx b/src/plugins/network/types.tsx new file mode 100644 index 000000000..9cad08035 --- /dev/null +++ b/src/plugins/network/types.tsx @@ -0,0 +1,53 @@ +/** + * Copyright 2018-present Facebook. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * @format + */ + +export type RequestId = string; + +export type Request = { + id: RequestId; + timestamp: number; + method: string; + url: string; + headers: Array
; + data: string | null | undefined; +}; + +export type Response = { + id: RequestId; + timestamp: number; + status: number; + reason: string; + headers: Array
; + data: string | null | undefined; + insights: Insights | null | undefined; +}; + +export type Header = { + key: string; + value: string; +}; + +export type RetryInsights = { + count: number; + limit: number; + timeSpent: number; +}; + +export type Insights = { + dnsLookupTime: number | null | undefined; + connectTime: number | null | undefined; + sslHandshakeTime: number | null | undefined; + preTransferTime: number | null | undefined; + redirectsTime: number | null | undefined; + timeToFirstByte: number | null | undefined; + transferTime: number | null | undefined; + postProcessingTime: number | null | undefined; + // Amount of transferred data can be different from total size of payload. + bytesTransfered: number | null | undefined; + transferSpeed: number | null | undefined; + retries: RetryInsights | null | undefined; +}; diff --git a/src/plugins/network/utils.js b/src/plugins/network/utils.js index 391e6f5f9..332caf76c 100644 --- a/src/plugins/network/utils.js +++ b/src/plugins/network/utils.js @@ -7,7 +7,7 @@ // $FlowFixMe import pako from 'pako'; -import type {Request, Response, Header} from './types.js'; +import type {Request, Response, Header} from './types.tsx'; export function getHeaderValue(headers: Array
, key: string): string { for (const header of headers) {