[strict[ ScreenCaptureButton

Summary: _typescript_

Reviewed By: jknoxville

Differential Revision: D17282357

fbshipit-source-id: 6ddd912978faa30195f59971f19d29d3ea79342b

package.json

@@ -51,6 +51,7 @@
   "devDependencies": {
     "@jest-runner/electron": "^2.0.1",
     "@types/deep-equal": "^1.0.1",
+    "@types/expand-tilde": "^2.0.0",
     "@types/fs-extra": "^8.0.0",
     "@types/invariant": "^2.2.30",
     "@types/jest": "^24.0.16",

src/chrome/ScreenCaptureButtons.tsx

@@ -119,8 +119,8 @@ class ScreenCaptureButtons extends Component<Props, State> {
       reportPlatformFailures(
         selectedDevice
           .screenshot()
-          .then((buffer: Buffer) => writeBufferToFile(pngPath, buffer))
+          .then(buffer => writeBufferToFile(pngPath, buffer))
-          .then((path: string) => openFile(path)),
+          .then(path => openFile(path)),
         'captureScreenshot',
       );
     }
@@ -206,13 +206,15 @@ class ScreenCaptureButtons extends Component<Props, State> {
     dst: string,
   ): Promise<string> => {
     return new Promise((resolve, reject) => {
-      return device.adb.pull(device.serial, src).then(stream => {
+      return device.adb
-        stream.on('end', () => {
+        .pull(device.serial, src)
-          resolve(dst);
+        .then((stream: NodeJS.ReadStream) => {
+          stream.on('end', () => {
+            resolve(dst);
+          });
+          stream.on('error', reject);
+          stream.pipe(fs.createWriteStream(dst));
         });
-        stream.on('error', reject);
-        stream.pipe(fs.createWriteStream(dst));
-      });
     });
   };
 
@@ -236,7 +238,7 @@ class ScreenCaptureButtons extends Component<Props, State> {
     return device.adb
       .shell(device.serial, command)
       .then(adb.util.readAll)
-      .then(output => output.toString().trim());
+      .then((output: Buffer) => output.toString().trim());
   };
 
   onRecordingClicked = () => {

src/utils/screenshot.tsx

@@ -11,7 +11,10 @@ import fs from 'fs';
  * Writes a buffer to a specified file path.
  * Returns a Promise which resolves to the file path.
  */
-export const writeBufferToFile = (filePath: string, buffer: Buffer) => {
+export const writeBufferToFile = (
+  filePath: string,
+  buffer: Buffer,
+): Promise<string> => {
   return new Promise((resolve, reject) => {
     fs.writeFile(filePath, buffer, err => {
       if (err) {

types/adbkit-fb.d.tsx

@@ -15,7 +15,7 @@ interface Util {
 }
 
 declare module 'adbkit-fb' {
-  const util: any;
+  const util: Util;
   const adbkit: any;
   export interface Client {
     listDevices: () => Promise<Device[]>;

yarn.lock

@@ -1077,6 +1077,11 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/expand-tilde@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/expand-tilde/-/expand-tilde-2.0.0.tgz#c01a706675b9d60931bf6a7dc7dfa45d63540c97"
+  integrity sha512-17h/6MRHoetV2QVUVnUfrmaFCXNIFJ3uDJmXlklX2xDtlEb1W0OXLgP+qwND2Ibg/PtQfQi0vx19KGuPayjLiw==
+
 "@types/fs-extra@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.0.tgz#d3e2c313ca29f95059f198dd60d1f774642d4b25"