From 6a8751afd25991ca762dc67182af4b0efc909aa8 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sun, 31 Jul 2016 21:05:41 +0200 Subject: [PATCH] now has possibility to end streaming requests --- .gitlab-ci.yml | 1 + dist/dockersock.classes.dockersock.d.ts | 2 + dist/dockersock.classes.dockersock.js | 16 ++- dist/dockersock.plugins.d.ts | 1 + dist/dockersock.plugins.js | 3 +- package.json | 9 +- test/test.js | 12 +- test/test.ts | 10 +- ts/dockersock.classes.dockersock.ts | 181 +++++++++++++----------- ts/dockersock.plugins.ts | 1 + 10 files changed, 143 insertions(+), 93 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9027b7..eda8a77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,7 @@ release: - priv trigger: + image: hosttoday/ht-docker-node:npmts stage: trigger script: - npmci trigger diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index e937ec2..f997df5 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -4,6 +4,7 @@ import * as plugins from "./dockersock.plugins"; import { Observable } from "rxjs"; export declare class Dockersock { sockPath: string; + requestObjectmap: plugins.lik.Objectmap; constructor(pathArg?: string); auth(userArg: string, passArg: string): plugins.q.Promise<{}>; listContainers(): plugins.q.Promise<{}>; @@ -23,4 +24,5 @@ export declare class Dockersock { getChangeObservable(): Observable<{}>; request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; + endRequests(): void; } diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index 0319b77..cbf319d 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -4,6 +4,7 @@ const plugins = require("./dockersock.plugins"); const rxjs_1 = require("rxjs"); class Dockersock { constructor(pathArg = "http://unix:/var/run/docker.sock:") { + this.requestObjectmap = new plugins.lik.Objectmap(); this.sockPath = pathArg; } // methods @@ -149,6 +150,7 @@ class Dockersock { ; }); requestStream.on("response", (response) => { + this.requestObjectmap.add(response); if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); } @@ -158,6 +160,7 @@ class Dockersock { }); let changeObservable = rxjs_1.Observable.fromEvent(requestStream, "data"); requestStream.on("end", () => { + this.requestObjectmap.remove(requestStream); }); return changeObservable; } @@ -215,6 +218,7 @@ class Dockersock { } ; }); + this.requestObjectmap.add(requestStream); requestStream.on("response", (response) => { if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); @@ -229,8 +233,18 @@ class Dockersock { status = JSON.parse(data.toString()).status; plugins.beautylog.logReduced(status); }); + requestStream.on("end", () => { + this.requestObjectmap.remove(requestStream); + }); return done.promise; } + ; + endRequests() { + this.requestObjectmap.forEach((itemArg) => { + itemArg.emit("end"); + }); + this.requestObjectmap.wipe(); + } } 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/dist/dockersock.plugins.d.ts b/dist/dockersock.plugins.d.ts index 23a3be6..446b8b8 100644 --- a/dist/dockersock.plugins.d.ts +++ b/dist/dockersock.plugins.d.ts @@ -1,5 +1,6 @@ import "typings-global"; export import beautylog = require("beautylog"); +export import lik = require("lik"); export import q = require("q"); export import request = require("request"); export import rxjs = require("rxjs"); diff --git a/dist/dockersock.plugins.js b/dist/dockersock.plugins.js index 6f70d42..e39bcbb 100644 --- a/dist/dockersock.plugins.js +++ b/dist/dockersock.plugins.js @@ -1,7 +1,8 @@ "use strict"; require("typings-global"); exports.beautylog = require("beautylog"); +exports.lik = require("lik"); exports.q = require("q"); exports.request = require("request"); exports.rxjs = require("rxjs"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLFdBQVcsU0FBUyxDQUFDLENBQUM7QUFDN0IsWUFBSSxXQUFXLE1BQU0sQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFdBQUcsV0FBVyxLQUFLLENBQUMsQ0FBQztBQUNyQixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDakIsZUFBTyxXQUFXLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/package.json b/package.json index edd2b40..d55686d 100644 --- a/package.json +++ b/package.json @@ -27,15 +27,16 @@ "dependencies": { "@types/q": "^0.0.27", "@types/request": "^0.0.27", - "beautylog": "^5.0.14", + "beautylog": "^5.0.18", + "lik": "^1.0.7", "q": "^1.4.1", - "request": "^2.73.0", + "request": "^2.74.0", "rxjs": "^5.0.0-beta.10", "typings-global": "^1.0.6" }, "devDependencies": { - "npmts-g": "^5.2.6", - "should": "^9.0.2", + "npmts-g": "^5.2.8", + "should": "^10.0.0", "typings-test": "^1.0.1" } } diff --git a/test/test.js b/test/test.js index 4973f13..b0a6741 100644 --- a/test/test.js +++ b/test/test.js @@ -29,8 +29,16 @@ describe("dockersock", function () { testDockersock.pullImage("hosttoday/ht-docker-dbase") .then((dataArg) => { done(); - }, done); + }); + }); + it("should return a change Objservable", function (done) { + this.timeout(10000); + testDockersock.getChangeObservable(); + setTimeout(() => { + testDockersock.endRequests(); + done(); + }, 5000); }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDO2lCQUNoRCxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDO2lCQUNoRCxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUNyQyxVQUFVLENBQUM7Z0JBQ1AsY0FBYyxDQUFDLFdBQVcsRUFBRSxDQUFDO2dCQUM3QixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsRUFBQyxJQUFJLENBQUMsQ0FBQztRQUNaLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 4e56c9e..71e6824 100644 --- a/test/test.ts +++ b/test/test.ts @@ -30,7 +30,15 @@ describe("dockersock",function(){ testDockersock.pullImage("hosttoday/ht-docker-dbase") .then((dataArg)=>{ done(); - },done); + }); + }); + it("should return a change Objservable",function(done){ + this.timeout(10000); + testDockersock.getChangeObservable(); + setTimeout(() => { + testDockersock.endRequests(); + done(); + },5000); }) }); }); \ No newline at end of file diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index 535e345..d8b9939 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -1,22 +1,23 @@ import "typings-global" import * as plugins from "./dockersock.plugins"; -import {Observable} from "rxjs"; +import { Observable } from "rxjs"; export class Dockersock { - sockPath:string; - constructor(pathArg:string = "http://unix:/var/run/docker.sock:"){ + sockPath: string; + requestObjectmap: plugins.lik.Objectmap = new plugins.lik.Objectmap(); + constructor(pathArg: string = "http://unix:/var/run/docker.sock:") { this.sockPath = pathArg; } // methods - auth(userArg:string,passArg:string){ + auth(userArg: string, passArg: string) { let done = plugins.q.defer(); - this.request("POST",""); + this.request("POST", ""); return done.promise; } listContainers() { let done = plugins.q.defer(); - this.request("GET","/containers") + this.request("GET", "/containers") .then(done.resolve); return done.promise; }; @@ -27,8 +28,8 @@ export class Dockersock { .then((dataArg) => { let recursiveCounter = 0; let makeDetailed = () => { - if(typeof dataArg[recursiveCounter] != "undefined"){ - this.request("GET","/containers/" + dataArg[recursiveCounter].Id) + if (typeof dataArg[recursiveCounter] != "undefined") { + this.request("GET", "/containers/" + dataArg[recursiveCounter].Id) .then((dataArg2) => { detailedDataObject.push(dataArg2); recursiveCounter++; @@ -52,21 +53,21 @@ export class Dockersock { return done.promise; } listImages() { - return this.request("GET","/images","?all=true"); + return this.request("GET", "/images", "?all=true"); } - listImagesDangling(){ - return this.request("GET","/images","?dangling=true"); + listImagesDangling() { + return this.request("GET", "/images", "?dangling=true"); } - pullImage(imageLabelArg:string){ + pullImage(imageLabelArg: string) { let imageLabel = encodeURI(imageLabelArg); - return this.requestStream("POST","/images/create?fromImage=" + imageLabel); + return this.requestStream("POST", "/images/create?fromImage=" + imageLabel); }; - createContainer(optionsArg,pullFirstArg:boolean = true){ + createContainer(optionsArg, pullFirstArg: boolean = true) { let done = plugins.q.defer(); let create = () => { - return this.request("POST","/containers/create","",optionsArg); + return this.request("POST", "/containers/create", "", optionsArg); } - if(pullFirstArg){ + if (pullFirstArg) { this.pullImage(optionsArg.Image) .then(create) .then(done.resolve); @@ -76,37 +77,37 @@ export class Dockersock { } return done.promise; }; - getContainerId(){ + getContainerId() { }; - startContainer(containerNameArg){ - return this.request("POST","/containers/"+ containerNameArg +"/start"); + startContainer(containerNameArg) { + return this.request("POST", "/containers/" + containerNameArg + "/start"); }; - stopContainer(containerNameArg){ - return this.request("POST","/containers/"+ containerNameArg +"/stop"); + stopContainer(containerNameArg) { + return this.request("POST", "/containers/" + containerNameArg + "/stop"); }; - removeContainer(containerNameArg){ - return this.request("DELETE","/containers/" + containerNameArg + "?v=1"); + removeContainer(containerNameArg) { + return this.request("DELETE", "/containers/" + containerNameArg + "?v=1"); }; clean() { let done = plugins.q.defer(); return done.promise; }; - callOnChange(cb:Function){ + callOnChange(cb: Function) { let cbPromise; - let changeBuffered:boolean = false; // when cb is running then buffer any consequent change + let changeBuffered: boolean = false; // when cb is running then buffer any consequent change let requestStream = plugins.request.get(this.sockPath + "/events"); - 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); - } - }); - requestStream.on("data",(data:Buffer) => { + 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); + } + }); + requestStream.on("data", (data: Buffer) => { let status = JSON.parse(data.toString()).status; plugins.beautylog.logReduced(status); - if(typeof cbPromise == "undefined" || cbPromise.state == "pending"){ + if (typeof cbPromise == "undefined" || cbPromise.state == "pending") { cbPromise = cb(); } else if (changeBuffered) { changeBuffered = true; @@ -116,54 +117,56 @@ export class Dockersock { }); } }); - requestStream.on("end",()=> { - - }); + requestStream.on("end", () => { + + }); }; - getChangeObservable(){ + getChangeObservable() { let options = { - method:"GET", - url:this.sockPath + "/events", - headers:{ - "Content-Type":"application/json", - "Host":"docker.sock" + method: "GET", + url: this.sockPath + "/events", + headers: { + "Content-Type": "application/json", + "Host": "docker.sock" } }; - let requestStream = plugins.request(options,(err, res, body) => { + let requestStream = plugins.request(options, (err, res, body) => { if (!err && res.statusCode == 200) { } else { console.log(err); console.log(res); }; }); - 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); - } - }); - let changeObservable = Observable.fromEvent(requestStream,"data"); - requestStream.on("end",()=> { + requestStream.on("response", (response) => { + this.requestObjectmap.add(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); + } + }); + let changeObservable = Observable.fromEvent(requestStream, "data"); + requestStream.on("end", () => { + this.requestObjectmap.remove(requestStream); }); return changeObservable; } - request(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){ + request(methodArg: string, routeArg: string, queryArg: string = "", dataArg = {}) { let done = plugins.q.defer(); - let jsonArg:string = JSON.stringify(dataArg); - let suffix:string = ""; - if(methodArg == "GET") suffix = "/json"; + let jsonArg: string = JSON.stringify(dataArg); + let suffix: string = ""; + if (methodArg == "GET") suffix = "/json"; let options = { - method:methodArg, - url:this.sockPath + routeArg + suffix + queryArg, - headers:{ - "Content-Type":"application/json", - "Host":"docker.sock" + method: methodArg, + url: this.sockPath + routeArg + suffix + queryArg, + headers: { + "Content-Type": "application/json", + "Host": "docker.sock" }, - body:jsonArg + body: jsonArg }; //console.log(options); - plugins.request(options,(err, res, body) => { + plugins.request(options, (err, res, body) => { if (!err && res.statusCode == 200) { var responseObj = JSON.parse(body); done.resolve(responseObj); @@ -175,20 +178,20 @@ export class Dockersock { }); return done.promise; } - requestStream(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){ + requestStream(methodArg: string, routeArg: string, queryArg: string = "", dataArg = {}) { let done = plugins.q.defer(); - let jsonArg:string = JSON.stringify(dataArg); - let suffix:string = ""; + 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" + method: methodArg, + url: this.sockPath + routeArg + suffix + queryArg, + headers: { + "Content-Type": "application/json", + "Host": "docker.sock" }, - body:jsonArg + body: jsonArg }; - let requestStream = plugins.request(options,(err, res, body) => { + let requestStream = plugins.request(options, (err, res, body) => { if (!err && res.statusCode == 200) { done.resolve(); } else { @@ -197,19 +200,29 @@ export class Dockersock { 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) => { + requestStream.on("response", (response) => { + this.requestObjectmap.add(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); }); + requestStream.on("end", () => { + this.requestObjectmap.remove(requestStream); + }); return done.promise; - } + }; + endRequests() { + this.requestObjectmap.forEach((itemArg: plugins.request.Request) => { + itemArg.emit("end"); + }); + this.requestObjectmap.wipe(); + }; } \ No newline at end of file diff --git a/ts/dockersock.plugins.ts b/ts/dockersock.plugins.ts index e844842..b025c69 100644 --- a/ts/dockersock.plugins.ts +++ b/ts/dockersock.plugins.ts @@ -1,5 +1,6 @@ import "typings-global"; export import beautylog = require("beautylog"); +export import lik = require("lik"); export import q = require("q"); export import request = require("request"); export import rxjs = require("rxjs"); \ No newline at end of file