replace request with smartrequest

ts/smartfile.plugins.ts

@@ -4,7 +4,7 @@ export import fsExtra = require('fs-extra')
 export let glob = require('glob')
 export import path = require('path')
 export import q = require('smartq')
-export let request = require('request')
+export import smartrequest = require('smartrequest')
 export let requireReload = require('require-reload')
 export import smartpath = require('smartpath')
 export let vinylFile = require('vinyl-file')

ts/smartfile.remote.ts

@@ -2,34 +2,33 @@ import 'typings-global'
 import plugins = require('./smartfile.plugins')
 import SmartfileInterpreter = require('./smartfile.interpreter')
 
-export let toFs = function(from: string,toPath: string) {
-    let done = plugins.q.defer()
-    let stream = plugins.request(from).pipe(plugins.fsExtra.createWriteStream(toPath))
-    stream.on('finish',function(){
-        done.resolve(toPath)
-    })
-    return done.promise
-}
+/* export let toFs = function (from: string, toPath: string) {
+  let done = plugins.q.defer()
+  let stream = plugins.smartrequest(from).pipe(plugins.fsExtra.createWriteStream(toPath))
+  stream.on('finish', function () {
+    done.resolve(toPath)
+  })
+  return done.promise
+} */
 
 /**
  *
  * @param fromArg
  * @returns {any}
  */
-export let toObject = function(fromArg: string){
-    let done = plugins.q.defer()
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        let returnObject
-        if (!error && response.statusCode === 200) {
-            returnObject = SmartfileInterpreter.objectFile(bodyString,SmartfileInterpreter.filetype(fromArg))
-            done.resolve(returnObject)
-        } else {
-            console.log('could not get remote file from ' + fromArg)
-            returnObject = undefined
-            done.reject(returnObject)
-        }
-    })
-    return done.promise
+export let toObject = function (fromArg: string) {
+  let done = plugins.q.defer()
+  plugins.smartrequest.request(fromArg, {
+    method: 'get'
+  }).then((res: any) => {
+    if (res.statusCode === 200) {
+      done.resolve(res.body)
+    } else {
+      console.log('could not get remote file from ' + fromArg)
+      done.reject(new Error('could not get remote file from ' + fromArg))
+    }
+  })
+  return done.promise
 }
 
 /**
@@ -38,15 +37,14 @@ export let toObject = function(fromArg: string){
  * @returns {any}
  */
 export let toString = (fromArg: string) => {
-    let done = plugins.q.defer()
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        if (!error && response.statusCode === 200) {
-            done.resolve(bodyString)
-        } else {
-            console.error('could not get remote file from ' + fromArg)
-            bodyString = undefined
-            done.reject(bodyString)
-        }
-    })
-    return done.promise
+  let done = plugins.q.defer()
+  plugins.smartrequest.get(fromArg).then((res: any) => {
+    if (res.statusCode === 200) {
+      done.resolve(res.body)
+    } else {
+      console.error('could not get remote file from ' + fromArg)
+      done.reject(new Error('could not get remote file from ' + fromArg))
+    }
+  })
+  return done.promise
 }