From 144f963d8aeb4430a8d8e5cc60ae67a261e7af84 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Mon, 18 Jul 2016 02:50:28 +0200 Subject: [PATCH] fixed request for newer docker --- dist/dockersock.classes.dockersock.d.ts | 2 +- dist/dockersock.classes.dockersock.js | 60 ++++++++++++++++--------- npmts.json => npmextra.json | 0 ts/dockersock.classes.dockersock.ts | 54 ++++++++++++++-------- 4 files changed, 75 insertions(+), 41 deletions(-) rename npmts.json => npmextra.json (100%) diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index 11e88c7..e937ec2 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -22,5 +22,5 @@ export declare class Dockersock { callOnChange(cb: Function): void; getChangeObservable(): Observable<{}>; request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; - requestStream(methodArg: any, routeArg: any, endArg?: boolean): plugins.q.Promise<{}>; + requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; } diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index b552767..66cfb41 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -155,7 +155,8 @@ class Dockersock { method: methodArg, url: this.sockPath + routeArg + suffix + queryArg, headers: { - "Content-Type": "application/json" + "Content-Type": "application/json", + "Host": "docker.sock" }, body: jsonArg }; @@ -174,29 +175,46 @@ class Dockersock { }); return done.promise; } - requestStream(methodArg, routeArg, endArg = true) { + requestStream(methodArg, routeArg, queryArg = "", dataArg = {}) { let done = plugins.q.defer(); - if (methodArg == "POST") { - let requestStream = plugins.request.post(this.sockPath + routeArg); - requestStream.on("response", (response) => { - if (response.statusCode == 200) { - plugins.beautylog.ok("request returned status 200, so we are good!"); - } - else { - plugins.beautylog.error("request returned error: " + response.statusCode); - done.reject(response); - } - }); - requestStream.on("data", (data) => { - let status = JSON.parse(data.toString()).status; - plugins.beautylog.logReduced(status); - }); - requestStream.on("end", () => { + let jsonArg = JSON.stringify(dataArg); + let suffix = ""; + let options = { + method: methodArg, + url: this.sockPath + routeArg + suffix + queryArg, + headers: { + "Content-Type": "application/json", + "Host": "docker.sock" + }, + body: jsonArg + }; + let requestStream = plugins.request(options, (err, res, body) => { + if (!err && res.statusCode == 200) { done.resolve(); - }); - } + } + else { + console.log(err); + console.log(res); + done.reject(err); + } + ; + }); + requestStream.on("response", (response) => { + if (response.statusCode == 200) { + plugins.beautylog.ok("request returned status 200, so we are good!"); + } + else { + plugins.beautylog.error("request returned error: " + response.statusCode); + done.reject(response); + } + }); + requestStream.on("data", (data) => { + let status; + status = JSON.parse(data.toString()).status; + plugins.beautylog.logReduced(status); + }); return done.promise; } } exports.Dockersock = Dockersock; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockersock.classes.dockersock.js","sourceRoot":"","sources":["../ts/dockersock.classes.dockersock.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockersock.classes.dockersock.js","sourceRoot":"","sources":["../ts/dockersock.classes.dockersock.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/npmts.json b/npmextra.json similarity index 100% rename from npmts.json rename to npmextra.json diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index d181899..bbe95bb 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -144,7 +144,8 @@ export class Dockersock { method:methodArg, url:this.sockPath + routeArg + suffix + queryArg, headers:{ - "Content-Type":"application/json" + "Content-Type":"application/json", + "Host":"docker.sock" }, body:jsonArg }; @@ -161,26 +162,41 @@ export class Dockersock { }); return done.promise; } - requestStream(methodArg,routeArg,endArg:boolean = true){ + requestStream(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){ let done = plugins.q.defer(); - if(methodArg == "POST"){ - let requestStream = plugins.request.post(this.sockPath + routeArg); - requestStream.on("response",(response) => { - if(response.statusCode == 200){ - plugins.beautylog.ok("request returned status 200, so we are good!"); - } else { - plugins.beautylog.error("request returned error: " + response.statusCode); - done.reject(response); - } - }); - requestStream.on("data",(data:Buffer) => { - let status = JSON.parse(data.toString()).status; - plugins.beautylog.logReduced(status); - }); - requestStream.on("end",()=> { + let jsonArg:string = JSON.stringify(dataArg); + let suffix:string = ""; + let options = { + method:methodArg, + url:this.sockPath + routeArg + suffix + queryArg, + headers:{ + "Content-Type":"application/json", + "Host":"docker.sock" + }, + body:jsonArg + }; + let requestStream = plugins.request(options,(err, res, body) => { + if (!err && res.statusCode == 200) { done.resolve(); - }); - } + } else { + console.log(err); + console.log(res); + done.reject(err); + }; + }); + requestStream.on("response",(response) => { + if(response.statusCode == 200){ + plugins.beautylog.ok("request returned status 200, so we are good!"); + } else { + plugins.beautylog.error("request returned error: " + response.statusCode); + done.reject(response); + } + }); + requestStream.on("data",(data:Buffer) => { + let status; + status = JSON.parse(data.toString()).status; + plugins.beautylog.logReduced(status); + }); return done.promise; } } \ No newline at end of file