Use published spec

package.json

@@ -25,8 +25,9 @@
     "test": "ava --serial --verbose"
   },
   "homepage": "https://github.com/netlify/node-client",
-  "main": "lib/index.js",
+  "main": "src/index.js",
   "dependencies": {
+    "@netlify/open-api": "^0.1.0",
     "js-yaml": "^3.12.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.flatten": "^4.4.0",

src/generate-method.js

@@ -22,7 +22,7 @@ module.exports = method => {
     Object.values(method.parameters.path).forEach(param => {
       const val = params[param.name] || params[camelCase(param.name)]
       if (existy(val)) {
-        path.replace(`{${param.name}}`, val)
+        path = path.replace(`{${param.name}}`, val)
       } else if (param.required) {
         throw new Error(`Missing required param ${param.name}`)
       }
@@ -34,18 +34,44 @@ module.exports = method => {
       if (existy(val)) {
         if (!qs) qs = {}
         qs[param.name] = val
+      } else if (param.required) {
+        throw new Error(`Missing required param ${param.name}`)
       }
     })
     if (qs) path = path += `?${queryString.stringify(qs)}`
 
     let body
+
     if (params.body) {
       body = params.body
+      Object.values(method.parameters.body).forEach(param => {
+        const type = get(param, 'schema.format')
+        if (type === 'binary') {
+          opts.headers['Content-Type'] = 'application/octet-stream'
+        }
+      })
     }
-    delete params.body
 
     opts.headers = Object.assign({}, this.defaultHeaders, opts.headers)
+
     if (body) opts.json = body
-    return await r2[method.verb](path, opts).response
+    const req = await r2[method.verb](path, opts)
+    const response = await req.response
+
+    if (response.status >= 400) {
+      const err = new Error(response.statusText)
+      err.status = response.status
+      err.response = response
+      err.path = path
+      err.opts = opts
+      throw err
+    }
+    const status = {
+      status: response.status,
+      statusText: response.statusText
+    }
+    const json = await req.json
+    Object.setPrototypeOf(json, status)
+    return json
   }
 }

src/index.js

@@ -1,38 +1,7 @@
 const NetlifyApiBase = require('./base')
-const { methods } = require('./load-swagger')
-const request = require('request')
 
 class NetlifyApi extends NetlifyApiBase {
   // Override to support streaming file reading
-  async uploadDeployFile(deployId, path, readStream) {
-    const reqOpts = {
-      url: methods.uploadDeployFile.path.replace('{deploy_id}', deployId).replace('{path}', path),
-      headers: Object.assign({}, this.defaultHeaders, {
-        'Content-Type': 'application/octet-stream'
-      }),
-      body: readStream
-    }
-
-    return new Promise((resolve, reject) => {
-      request.put(reqOpts, (err, res, body) => {
-        if (err) return reject(err)
-
-        if (res.statusCode >= 400) {
-          const apiError = new Error('There was an error with one of the file uploads')
-          apiError.response = res
-          return reject(apiError)
-        }
-
-        try {
-          body = JSON.parse(body)
-        } catch (_) {
-          // Ignore if body can't parse
-        }
-
-        resolve({ res, body })
-      })
-    })
-  }
 }
 
 module.exports = NetlifyApi

src/index.test.js

@@ -30,10 +30,9 @@ test.serial('can make basic requests', async t => {
 
   await server.listen(port)
 
-  const response = await client.createTicket()
-  const json = await response.json()
-  t.is(response.status, 200)
-  t.deepEqual(json, { foo: 'bar' })
+  const body = await client.createTicket()
+  t.is(body.status, 200)
+  t.deepEqual(body, { foo: 'bar' })
 
   await server.close()
 })
@@ -54,9 +53,8 @@ test.serial('can make requests with a body', async t => {
       another: 'one'
     }
   })
-  const json = await response.json()
   t.is(response.status, 200)
-  t.deepEqual(json, { foo: 'bar' })
+  t.deepEqual(response, { foo: 'bar' })
 
   await server.close()
 })

src/load-swagger.js

@@ -1,8 +1,4 @@
-const fs = require('fs')
-const path = require('path')
-const yaml = require('js-yaml')
-const swaggerYaml = fs.readFileSync(path.join(__dirname, 'swagger.yml'), 'utf8')
-const dfn = yaml.safeLoad(swaggerYaml)
+const dfn = require('@netlify/open-api')
 const { sortParams, mergeParams } = require('./util')
 const methods = []