diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index 1ea1246..7d7dd1f 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -1,22 +1,26 @@ +/// import "typings-global"; +import * as plugins from "./dockersock.plugins"; +import { Observable } from "rxjs"; export declare class Dockersock { sockPath: string; constructor(pathArg?: string); - auth(userArg: string, passArg: string): any; - listContainers(): any; - listContainersDetailed(): any; - listContainersRunning(): any; - listContainersStopped(): any; - listImages(): any; - listImagesDangling(): any; - pullImage(imageLabel: string): any; - createContainer(optionsArg: any, pullFirstArg?: boolean): any; + auth(userArg: string, passArg: string): plugins.q.Promise<{}>; + listContainers(): plugins.q.Promise<{}>; + listContainersDetailed(): plugins.q.Promise<{}>; + listContainersRunning(): plugins.q.Promise<{}>; + listContainersStopped(): plugins.q.Promise<{}>; + listImages(): plugins.q.Promise<{}>; + listImagesDangling(): plugins.q.Promise<{}>; + pullImage(imageLabel: string): plugins.q.Promise<{}>; + createContainer(optionsArg: any, pullFirstArg?: boolean): plugins.q.Promise<{}>; getContainerId(): void; - startContainer(containerNameArg: any): any; - stopContainer(containerNameArg: any): any; - removeContainer(containerNameArg: any): any; - clean(): any; + startContainer(containerNameArg: any): plugins.q.Promise<{}>; + stopContainer(containerNameArg: any): plugins.q.Promise<{}>; + removeContainer(containerNameArg: any): plugins.q.Promise<{}>; + clean(): plugins.q.Promise<{}>; callOnChange(cb: Function): void; - request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): any; - requestStream(methodArg: any, routeArg: any, endArg?: boolean): any; + getChangeObservable(): Observable<{}>; + request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; + requestStream(methodArg: any, routeArg: any, endArg?: boolean): plugins.q.Promise<{}>; } diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index 7db6999..b2669c6 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -1,6 +1,7 @@ "use strict"; require("typings-global"); var plugins = require("./dockersock.plugins"); +var rxjs_1 = require("rxjs"); var Dockersock = (function () { function Dockersock(pathArg) { if (pathArg === void 0) { pathArg = "http://unix:/var/run/docker.sock:"; } @@ -132,6 +133,21 @@ var Dockersock = (function () { }); }; ; + Dockersock.prototype.getChangeObservable = function () { + var requestStream = plugins.request.get(this.sockPath + "/events"); + requestStream.on("response", function (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); + } + }); + var changeObservable = rxjs_1.Observable.fromEvent(requestStream, "data"); + requestStream.on("end", function () { + }); + return changeObservable; + }; Dockersock.prototype.request = function (methodArg, routeArg, queryArg, dataArg) { if (queryArg === void 0) { queryArg = ""; } if (dataArg === void 0) { dataArg = {}; } @@ -167,13 +183,13 @@ var Dockersock = (function () { var done = plugins.q.defer(); if (methodArg == "POST") { var requestStream = plugins.request.post(this.sockPath + routeArg); - requestStream.on("response", function (response) { + requestStream.on("response", function (response, err) { 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(); + done.reject(err); } }); requestStream.on("data", function (data) { @@ -189,5 +205,4 @@ var Dockersock = (function () { return Dockersock; }()); exports.Dockersock = Dockersock; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["dockersock.classes.dockersock.ts"],"names":[],"mappings":"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","file":"dockersock.classes.dockersock.js","sourcesContent":["import \"typings-global\"\nimport * as plugins from \"./dockersock.plugins\";\n\nexport class Dockersock {\n    sockPath:string;\n    constructor(pathArg:string = \"http://unix:/var/run/docker.sock:\"){\n        this.sockPath = pathArg;\n    }\n\n    // methods\n    auth(userArg:string,passArg:string){\n        let done = plugins.q.defer();\n        this.request(\"POST\",\"\");\n        return done.promise;\n    }\n    listContainers() {\n        let done = plugins.q.defer();\n        this.request(\"GET\",\"/containers\")\n            .then(done.resolve);\n        return done.promise;\n    };\n    listContainersDetailed() {\n        let done = plugins.q.defer();\n        let detailedDataObject = [];\n        this.listContainers()\n            .then((dataArg) => {\n                let recursiveCounter = 0;\n                let makeDetailed = () => {\n                    if(typeof dataArg[recursiveCounter] != \"undefined\"){\n                        this.request(\"GET\",\"/containers/\" + dataArg[recursiveCounter].Id)\n                            .then((dataArg2) => {\n                                detailedDataObject.push(dataArg2);\n                                recursiveCounter++;\n                                // recursive call\n                                makeDetailed();\n                            });\n                    } else {\n                        done.resolve(detailedDataObject);\n                    }\n                };\n                makeDetailed();\n            });\n        return done.promise;\n    };\n    listContainersRunning() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listContainersStopped() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listImages() {\n        return this.request(\"GET\",\"/images\",\"?all=true\");\n    }\n    listImagesDangling(){\n        return this.request(\"GET\",\"/images\",\"?dangling=true\");\n    }\n    pullImage(imageLabel:string){\n        return this.requestStream(\"POST\",\"/images/create?fromImage=\" + imageLabel);\n    };\n    createContainer(optionsArg,pullFirstArg:boolean = true){\n        let done = plugins.q.defer();\n        let create = () => {\n            return this.request(\"POST\",\"/containers/create\",\"\",optionsArg);\n        }\n        if(pullFirstArg){\n            this.pullImage(optionsArg.Image)\n                .then(create)\n                .then(done.resolve);\n        } else {\n            create()\n                .then(done.resolve)\n        }\n        return done.promise;\n    };\n    getContainerId(){\n\n    };\n    startContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/start\");\n    };\n    stopContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/stop\");\n    };\n    removeContainer(containerNameArg){\n        return this.request(\"DELETE\",\"/containers/\" + containerNameArg + \"?v=1\");\n    };\n    clean() {\n        let done = plugins.q.defer();\n        return done.promise;\n    };\n    callOnChange(cb:Function){\n        let cbPromise;\n        let changeBuffered:boolean = false; // when cb is running then buffer any consequent change\n        let requestStream = plugins.request.get(this.sockPath + \"/events\");\n        requestStream.on(\"response\",(response) => {\n                if(response.statusCode == 200){\n                    plugins.beautylog.ok(\"request returned status 200, so we are good!\");\n                } else {\n                    plugins.beautylog.error(\"request returned error: \" + response.statusCode);\n                }\n            });\n        requestStream.on(\"data\",(data:Buffer) => {\n            let status = JSON.parse(data.toString()).status;\n            plugins.beautylog.logReduced(status);\n            if(typeof cbPromise == \"undefined\" || cbPromise.state == \"pending\"){\n                cbPromise = cb();\n            } else if (changeBuffered) {\n                changeBuffered = true;\n                cbPromise.then(() => {\n                    changeBuffered = false;\n                    cbPromise = cb();\n                });\n            }\n        });\n        requestStream.on(\"end\",()=> {\n            \n        });         \n    };\n    request(methodArg:string,routeArg:string,queryArg:string = \"\", dataArg = {}){\n        let done = plugins.q.defer();\n        let jsonArg:string = JSON.stringify(dataArg);\n        let suffix:string = \"\";\n        if(methodArg == \"GET\") suffix = \"/json\";\n        let options = {\n            method:methodArg,\n            url:this.sockPath + routeArg + suffix + queryArg,\n            headers:{\n                \"Content-Type\":\"application/json\"\n            },\n            body:jsonArg\n        };\n        plugins.request(options,(err, res, body) => {\n            if (!err && res.statusCode == 200) {\n                var responseObj = JSON.parse(body);\n                done.resolve(responseObj);\n            } else {\n                console.log(err);\n                console.log(res);\n                done.reject(err);\n            };\n        });\n        return done.promise;\n    }\n    requestStream(methodArg,routeArg,endArg:boolean = true){\n        let done = plugins.q.defer();\n        if(methodArg == \"POST\"){\n            let requestStream = plugins.request.post(this.sockPath + routeArg);\n            requestStream.on(\"response\",(response) => {\n                    if(response.statusCode == 200){\n                        plugins.beautylog.ok(\"request returned status 200, so we are good!\");\n                    } else {\n                        plugins.beautylog.error(\"request returned error: \" + response.statusCode);\n                        done.reject();\n                    }\n                });\n            requestStream.on(\"data\",(data:Buffer) => {\n                let status = JSON.parse(data.toString()).status;\n                plugins.beautylog.logReduced(status);\n            });\n            requestStream.on(\"end\",()=> {\n                done.resolve();\n            });         \n        }\n        return done.promise;\n    }\n}"]} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockersock.classes.dockersock.js","sourceRoot":"","sources":["../ts/dockersock.classes.dockersock.ts"],"names":[],"mappings":";AAAA,QAAO,gBACP,CAAC,CADsB;AACvB,IAAY,OAAO,WAAM,sBAAsB,CAAC,CAAA;AAChD,qBAAyB,MAAM,CAAC,CAAA;AAEhC;IAEI,oBAAY,OAAoD;QAApD,uBAAoD,GAApD,6CAAoD;QAC5D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,UAAU;IACV,yBAAI,GAAJ,UAAK,OAAc,EAAC,OAAc;QAC9B,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,EAAE,CAAC,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,mCAAc,GAAd;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,aAAa,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,2CAAsB,GAAtB;QAAA,iBAsBC;QArBG,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,EAAE;aAChB,IAAI,CAAC,UAAC,OAAO;YACV,IAAI,gBAAgB,GAAG,CAAC,CAAC;YACzB,IAAI,YAAY,GAAG;gBACf,EAAE,CAAA,CAAC,OAAO,OAAO,CAAC,gBAAgB,CAAC,IAAI,WAAW,CAAC,CAAA,CAAC;oBAChD,KAAI,CAAC,OAAO,CAAC,KAAK,EAAC,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC;yBAC5D,IAAI,CAAC,UAAC,QAAQ;wBACX,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAClC,gBAAgB,EAAE,CAAC;wBACnB,iBAAiB;wBACjB,YAAY,EAAE,CAAC;oBACnB,CAAC,CAAC,CAAC;gBACX,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC,CAAC;YACF,YAAY,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACP,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,0CAAqB,GAArB;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,0CAAqB,GAArB;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,+BAAU,GAAV;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,SAAS,EAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IACD,uCAAkB,GAAlB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,SAAS,EAAC,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IACD,8BAAS,GAAT,UAAU,UAAiB;QACvB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAC,2BAA2B,GAAG,UAAU,CAAC,CAAC;IAC/E,CAAC;;IACD,oCAAe,GAAf,UAAgB,UAAU,EAAC,YAA2B;QAAtD,iBAcC;QAd0B,4BAA2B,GAA3B,mBAA2B;QAClD,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,MAAM,GAAG;YACT,MAAM,CAAC,KAAI,CAAC,OAAO,CAAC,MAAM,EAAC,oBAAoB,EAAC,EAAE,EAAC,UAAU,CAAC,CAAC;QACnE,CAAC,CAAA;QACD,EAAE,CAAA,CAAC,YAAY,CAAC,CAAA,CAAC;YACb,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;iBAC3B,IAAI,CAAC,MAAM,CAAC;iBACZ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,EAAE;iBACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC3B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,mCAAc,GAAd;IAEA,CAAC;;IACD,mCAAc,GAAd,UAAe,gBAAgB;QAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,cAAc,GAAE,gBAAgB,GAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;;IACD,kCAAa,GAAb,UAAc,gBAAgB;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,cAAc,GAAE,gBAAgB,GAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;;IACD,oCAAe,GAAf,UAAgB,gBAAgB;QAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC,cAAc,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC;IAC7E,CAAC;;IACD,0BAAK,GAAL;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,iCAAY,GAAZ,UAAa,EAAW;QACpB,IAAI,SAAS,CAAC;QACd,IAAI,cAAc,GAAW,KAAK,CAAC,CAAC,uDAAuD;QAC3F,IAAI,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;QACnE,aAAa,CAAC,EAAE,CAAC,UAAU,EAAC,UAAC,QAAQ;YAC7B,EAAE,CAAA,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAA,CAAC;gBAC3B,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,8CAA8C,CAAC,CAAC;YACzE,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC9E,CAAC;QACL,CAAC,CAAC,CAAC;QACP,aAAa,CAAC,EAAE,CAAC,MAAM,EAAC,UAAC,IAAW;YAChC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YAChD,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACrC,EAAE,CAAA,CAAC,OAAO,SAAS,IAAI,WAAW,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,CAAA,CAAC;gBAChE,SAAS,GAAG,EAAE,EAAE,CAAC;YACrB,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACxB,cAAc,GAAG,IAAI,CAAC;gBACtB,SAAS,CAAC,IAAI,CAAC;oBACX,cAAc,GAAG,KAAK,CAAC;oBACvB,SAAS,GAAG,EAAE,EAAE,CAAC;gBACrB,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAC;QAEvB,CAAC,CAAC,CAAC;IACP,CAAC;;IACD,wCAAmB,GAAnB;QACI,IAAI,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;QACnE,aAAa,CAAC,EAAE,CAAC,UAAU,EAAC,UAAC,QAAQ;YAC7B,EAAE,CAAA,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAA,CAAC;gBAC3B,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,8CAA8C,CAAC,CAAC;YACzE,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC9E,CAAC;QACL,CAAC,CAAC,CAAC;QACP,IAAI,gBAAgB,GAAG,iBAAU,CAAC,SAAS,CAAC,aAAa,EAAC,MAAM,CAAC,CAAC;QAClE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAC;QAEvB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC;IAC5B,CAAC;IACD,4BAAO,GAAP,UAAQ,SAAgB,EAAC,QAAe,EAAC,QAAoB,EAAE,OAAY;QAAlC,wBAAoB,GAApB,aAAoB;QAAE,uBAAY,GAAZ,YAAY;QACvE,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,OAAO,GAAU,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,MAAM,GAAU,EAAE,CAAC;QACvB,EAAE,CAAA,CAAC,SAAS,IAAI,KAAK,CAAC;YAAC,MAAM,GAAG,OAAO,CAAC;QACxC,IAAI,OAAO,GAAG;YACV,MAAM,EAAC,SAAS;YAChB,GAAG,EAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ;YAChD,OAAO,EAAC;gBACJ,cAAc,EAAC,kBAAkB;aACpC;YACD,IAAI,EAAC,OAAO;SACf,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,OAAO,EAAC,UAAC,GAAG,EAAE,GAAG,EAAE,IAAI;YACnC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;gBAChC,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YAAA,CAAC;QACN,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,kCAAa,GAAb,UAAc,SAAS,EAAC,QAAQ,EAAC,MAAqB;QAArB,sBAAqB,GAArB,aAAqB;QAClD,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,EAAE,CAAA,CAAC,SAAS,IAAI,MAAM,CAAC,CAAA,CAAC;YACpB,IAAI,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;YACnE,aAAa,CAAC,EAAE,CAAC,UAAU,EAAC,UAAC,QAAQ,EAAC,GAAG;gBACjC,EAAE,CAAA,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAA,CAAC;oBAC3B,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,8CAA8C,CAAC,CAAC;gBACzE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YACP,aAAa,CAAC,EAAE,CAAC,MAAM,EAAC,UAAC,IAAW;gBAChC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;gBAChD,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAC;gBACnB,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,iBAAC;AAAD,CAAC,AAnLD,IAmLC;AAnLY,kBAAU,aAmLtB,CAAA"} \ No newline at end of file diff --git a/dist/dockersock.plugins.d.ts b/dist/dockersock.plugins.d.ts index 3a9ed6d..885d58c 100644 --- a/dist/dockersock.plugins.d.ts +++ b/dist/dockersock.plugins.d.ts @@ -1,4 +1,5 @@ import "typings-global"; export import beautylog = require("beautylog"); -export declare let q: any; +export import q = require("q"); export declare let request: any; +export import rxjs = require("rxjs"); diff --git a/dist/dockersock.plugins.js b/dist/dockersock.plugins.js index ede496b..27deb63 100644 --- a/dist/dockersock.plugins.js +++ b/dist/dockersock.plugins.js @@ -3,5 +3,5 @@ require("typings-global"); exports.beautylog = require("beautylog"); exports.q = require("q"); exports.request = require("request"); - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImRvY2tlcnNvY2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNwQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMiLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7Il19 +exports.rxjs = require("rxjs"); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index 035764c..59825cd 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2,5 +2,4 @@ require("typings-global"); var dockersock_classes_dockersock_1 = require("./dockersock.classes.dockersock"); exports.Dockersock = dockersock_classes_dockersock_1.Dockersock; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsOENBQXlCLGlDQUFpQyxDQUFDO0FBQW5ELGdFQUFrRCIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQge0RvY2tlcnNvY2t9IGZyb20gXCIuL2RvY2tlcnNvY2suY2xhc3Nlcy5kb2NrZXJzb2NrXCIiXX0= +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUF5QixpQ0FBaUMsQ0FBQztBQUFuRCxnRUFBa0QifQ== \ No newline at end of file diff --git a/package.json b/package.json index db16ec9..2dadea7 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,13 @@ }, "homepage": "https://gitlab.com/pushrocks/dockersock#README", "dependencies": { + "@types/es6-promise": "0.0.27-alpha", + "@types/q": "0.0.26-alpha", "beautylog": "^5.0.12", + "es6-promise": "^3.2.1", "q": "^1.4.1", "request": "^2.72.0", + "rxjs": "^5.0.0-beta.10", "typings-global": "^1.0.3" }, "devDependencies": { diff --git a/test/test.js b/test/test.js index 0f98eab..dff36ee 100644 --- a/test/test.js +++ b/test/test.js @@ -25,7 +25,7 @@ describe("dockersock", function () { }); }); it("should pull an image from imagetag", function (done) { - this.timeout(30000); + this.timeout(60000); testDockersock.pullImage("hosttoday%2Fht-docker-dbase") .then(function (dataArg) { done(); @@ -33,5 +33,4 @@ describe("dockersock", function () { }); }); }); - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUVQLENBQUMsQ0FGYztBQUVmLHNCQUF5QixlQUV6QixDQUFDLENBRnVDO0FBRXhDLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixJQUFJLGNBQXlCLENBQUM7UUFDOUIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO1lBQ3pDLGNBQWMsR0FBRyxJQUFJLGtCQUFVLEVBQUUsQ0FBQztZQUNsQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsa0JBQVUsQ0FBQyxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdCQUF3QixFQUFDLFVBQVMsSUFBSTtZQUNyQyxjQUFjLENBQUMsY0FBYyxFQUFFO2lCQUMxQixJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQyxVQUFTLElBQUk7WUFDOUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixjQUFjLENBQUMsc0JBQXNCLEVBQUU7aUJBQ2xDLElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLG9DQUFvQyxFQUFDLFVBQVMsSUFBSTtZQUNqRCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3BCLGNBQWMsQ0FBQyxTQUFTLENBQUMsNkJBQTZCLENBQUM7aUJBQ2xELElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFDaEIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLXRlc3RcIjtcbmltcG9ydCBcInNob3VsZFwiXG5cbmltcG9ydCB7RG9ja2Vyc29ja30gZnJvbSBcIi4uL2Rpc3QvaW5kZXhcIlxuXG5kZXNjcmliZShcImRvY2tlcnNvY2tcIixmdW5jdGlvbigpe1xuICAgIGRlc2NyaWJlKFwiLkRvY2tlcnNvY2soKVwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGxldCB0ZXN0RG9ja2Vyc29jazpEb2NrZXJzb2NrO1xuICAgICAgICBpdChcInNob3VsZCBjcmVhdGUgYSBuZXcgRG9ja2Vyc29jayBpbnN0YW5jZVwiLGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jayA9IG5ldyBEb2NrZXJzb2NrKCk7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jay5zaG91bGQuYmUuaW5zdGFuY2VvZihEb2NrZXJzb2NrKTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIGxpc3QgY29udGFpbmVyc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2subGlzdENvbnRhaW5lcnMoKVxuICAgICAgICAgICAgICAgIC50aGVuKChkYXRhQXJnKT0+e1xuICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhkYXRhQXJnKTtcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICB9KTtcbiAgICAgICAgaXQoXCJzaG91bGQgbGlzdCBkZXRhaWxlZCBjb250YWluZXJzXCIsZnVuY3Rpb24oZG9uZSl7XG4gICAgICAgICAgICB0aGlzLnRpbWVvdXQoNTAwMCk7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jay5saXN0Q29udGFpbmVyc0RldGFpbGVkKClcbiAgICAgICAgICAgICAgICAudGhlbigoZGF0YUFyZyk9PntcbiAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coZGF0YUFyZyk7XG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIHB1bGwgYW4gaW1hZ2UgZnJvbSBpbWFnZXRhZ1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDMwMDAwKTtcbiAgICAgICAgICAgIHRlc3REb2NrZXJzb2NrLnB1bGxJbWFnZShcImhvc3R0b2RheSUyRmh0LWRvY2tlci1kYmFzZVwiKVxuICAgICAgICAgICAgICAgIC50aGVuKChkYXRhQXJnKT0+e1xuICAgICAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICAgICAgfSxkb25lKTtcbiAgICAgICAgfSlcbiAgICB9KTtcbn0pOyJdfQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixzQkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLFVBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDZCQUE2QixDQUFDO2lCQUNsRCxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index 969be75..8ab491e 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -1,5 +1,6 @@ import "typings-global" import * as plugins from "./dockersock.plugins"; +import {Observable} from "rxjs"; export class Dockersock { sockPath:string; @@ -118,9 +119,7 @@ export class Dockersock { }); }; - getChangeEmitter(){ - class EventEmitter extends plugins.events.EventEmitter {}; - let emitterInstance = new EventEmitter(); + getChangeObservable(){ let requestStream = plugins.request.get(this.sockPath + "/events"); requestStream.on("response",(response) => { if(response.statusCode == 200){ @@ -129,15 +128,11 @@ export class Dockersock { plugins.beautylog.error("request returned error: " + response.statusCode); } }); - requestStream.on("data",(data:Buffer) => { - let status = JSON.parse(data.toString()).status; - plugins.beautylog.logReduced(status); - emitterInstance.emit("change",data); - }); + let changeObservable = Observable.fromEvent(requestStream,"data"); requestStream.on("end",()=> { }); - return emitterInstance; + return changeObservable; } request(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){ let done = plugins.q.defer(); @@ -168,12 +163,12 @@ export class Dockersock { let done = plugins.q.defer(); if(methodArg == "POST"){ let requestStream = plugins.request.post(this.sockPath + routeArg); - requestStream.on("response",(response) => { + requestStream.on("response",(response,err) => { 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(); + done.reject(err); } }); requestStream.on("data",(data:Buffer) => { diff --git a/ts/dockersock.plugins.ts b/ts/dockersock.plugins.ts index a38787c..8a5cda7 100644 --- a/ts/dockersock.plugins.ts +++ b/ts/dockersock.plugins.ts @@ -1,6 +1,5 @@ import "typings-global"; export import beautylog = require("beautylog"); -export import events = require("events"); -export let q = require("q"); +export import q = require("q"); export let request = require("request"); -eventEmitter. \ No newline at end of file +export import rxjs = require("rxjs"); \ No newline at end of file