chore: use @types/superagent

imhoffd · imhoffd · commit cb6e73894581 · 2019-07-09T15:04:38.000-05:00
diff --git a/packages/ionic/package.json b/packages/ionic/package.json
@@ -87,6 +87,7 @@
     "@types/os-name": "^3.1.0",
     "@types/semver": "^6.0.0",
     "@types/split2": "^2.1.6",
+    "@types/superagent": "^4.1.3",
     "@types/tar": "^4.0.0",
     "@types/through2": "^2.0.33",
     "@types/uuid": "^3.4.3",
diff --git a/packages/ionic/src/commands/package/build.ts b/packages/ionic/src/commands/package/build.ts
@@ -341,7 +341,7 @@ Customizing the build:
 
     if (!filename) {
       req.on('response', res => {
-        const contentDisposition = res.headers['content-disposition'];
+        const contentDisposition = res.header['content-disposition'];
         filename = contentDisposition ? contentDisposition.split('=')[1] : 'output.bin';
       });
     }
diff --git a/packages/ionic/src/lib/http.ts b/packages/ionic/src/lib/http.ts
@@ -234,7 +234,7 @@ export function createFatalAPIFormat(req: SuperAgentRequest, res: APIResponse):
 
 export function formatSuperAgentError(e: SuperAgentError): string {
   const res = e.response;
-  const req = res.request;
+  const req = (res as any).request; // TODO: `req` and `request` exist: https://visionmedia.github.io/superagent/docs/test.html
   const statusCode = e.response.status;
 
   let f = '';
diff --git a/packages/ionic/src/lib/integrations/cordova/resources.ts b/packages/ionic/src/lib/integrations/cordova/resources.ts
@@ -179,10 +179,10 @@ export async function transformResourceImage(env: IonicEnvironment, resource: Im
         'encoding': 'png',
       })
       .on('response', res => {
-        debug('response %d received for %s: (id: %s)', res.statusCode, resource.name, resource.imageId);
+        debug('response %d received for %s: (id: %s)', res.status, resource.name, resource.imageId);
 
-        if (res.statusCode !== 200) {
-          const generalErrorMsg = !res.statusCode || res.statusCode >= 500
+        if (res.status !== 200) {
+          const generalErrorMsg = !res.status || res.status >= 500
             ? 'the server may be experiencing difficulties right now--please try again later.'
             : 'the server marked a source image as invalid for this resource.';
 
@@ -198,7 +198,7 @@ export async function transformResourceImage(env: IonicEnvironment, resource: Im
             try {
               serverMsg = JSON.parse(serverMsg).Error;
             } catch (e) {
-              serverMsg = formatResponseError(req, res.statusCode, serverMsg);
+              serverMsg = formatResponseError(req, res.status, serverMsg);
             }
 
             result.error = new Error(
diff --git a/packages/ionic/src/lib/utils/http.ts b/packages/ionic/src/lib/utils/http.ts
@@ -39,8 +39,8 @@ export async function createRequest(method: HttpMethod, url: string, { proxy, ss
     const superagentProxy = await import('superagent-proxy');
     superagentProxy(superagent);
 
-    if (req.proxy) {
-      req.proxy(proxy);
+    if ((req as any).proxy) { // TODO: create/use `@types/superagent-proxy`
+      (req as any).proxy(proxy);
     } else {
       debug(`Cannot install proxy--req.proxy not defined`);
     }
@@ -77,16 +77,16 @@ export async function download(req: SuperAgentRequest, ws: NodeJS.WritableStream
   return new Promise<void>((resolve, reject) => {
     req
       .on('response', res => {
-        if (res.statusCode !== 200) {
+        if (res.status !== 200) {
           reject(new Error(
-            `Encountered bad status code (${res.statusCode}) for ${req.url}\n` +
+            `Encountered bad status code (${res.status}) for ${req.url}\n` +
             `This could mean the server is experiencing difficulties right now--please try again later.`
           ));
         }
 
         if (progress) {
           let loaded = 0;
-          const total = Number(res.headers['content-length']);
+          const total = Number(res.header['content-length']);
           res.on('data', chunk => {
             loaded += chunk.length;
             progress(loaded, total);
diff --git a/types/superagent.d.ts b/types/superagent.d.ts

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ Customizing the build:`
`341`	`341`
`342`	`342`	`if (!filename) {`
`343`	`343`	`req.on('response', res => {`
`344`		`- const contentDisposition = res.headers['content-disposition'];`
	`344`	`+ const contentDisposition = res.header['content-disposition'];`
`345`	`345`	`filename = contentDisposition ? contentDisposition.split('=')[1] : 'output.bin';`
`346`	`346`	`});`
`347`	`347`	`}`