1.0.18

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-dbase
+image: hosttoday/ht-docker-dbase:npmts
 services:
   - docker:dind
 
@@ -43,6 +43,7 @@ release:
     - priv
 
 trigger:
+  image: hosttoday/ht-docker-node:npmts
   stage: trigger
   script:
     - npmci trigger

Dockerfile

@@ -1,6 +0,0 @@
-FROM hosttoday/ht-docker-node:npmts
-RUN mkdir app-node
-COPY ./ /app-node/
-WORKDIR /app-node
-ENV CI true
-CMD ["npmts"]

README.md

@@ -1,5 +1,5 @@
 # dockersock
-easy communication with docker from node, TypeScript ready
+easy communication with docker remote api from node, TypeScript ready
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/dockersock/badges/master/build.svg)](https://gitlab.com/pushrocks/dockersock/commits/master)

dist/dockersock.classes.dockersock.d.ts

@@ -1,22 +1,28 @@
+/// <reference types="q" />
 import "typings-global";
+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): any;
+    auth(userArg: string, passArg: string): plugins.q.Promise<{}>;
-    listContainers(): any;
+    listContainers(): plugins.q.Promise<{}>;
-    listContainersDetailed(): any;
+    listContainersDetailed(): plugins.q.Promise<{}>;
-    listContainersRunning(): any;
+    listContainersRunning(): plugins.q.Promise<{}>;
-    listContainersStopped(): any;
+    listContainersStopped(): plugins.q.Promise<{}>;
-    listImages(): any;
+    listImages(): plugins.q.Promise<{}>;
-    listImagesDangling(): any;
+    listImagesDangling(): plugins.q.Promise<{}>;
-    pullImage(imageLabel: string): any;
+    pullImage(imageLabelArg: string): plugins.q.Promise<{}>;
-    createContainer(optionsArg: any, pullFirstArg?: boolean): any;
+    createContainer(optionsArg: any, pullFirstArg?: boolean): plugins.q.Promise<{}>;
     getContainerId(): void;
-    startContainer(containerNameArg: any): any;
+    startContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    stopContainer(containerNameArg: any): any;
+    stopContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    removeContainer(containerNameArg: any): any;
+    removeContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    clean(): any;
+    clean(): plugins.q.Promise<{}>;
     callOnChange(cb: Function): void;
-    request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): any;
+    getChangeObservable(): Observable<{}>;
-    requestStream(methodArg: any, routeArg: any, endArg?: boolean): any;
+    request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
+    requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
+    endRequests(): void;
 }

dist/dockersock.plugins.d.ts

@@ -1,4 +1,6 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export declare let q: any;
+export import lik = require("lik");
-export declare let request: any;
+export import q = require("q");
+export import request = require("request");
+export import rxjs = require("rxjs");

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;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImRvY2tlcnNvY2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNwQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMiLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFdBQUcsV0FBVyxLQUFLLENBQUMsQ0FBQztBQUNyQixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDakIsZUFBTyxXQUFXLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9

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;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUEyQixpQ0FBaUMsQ0FBQztBQUFwRCxnRUFBb0QifQ==
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsOENBQXlCLGlDQUFpQyxDQUFDO0FBQW5ELGdFQUFrRCIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQge0RvY2tlcnNvY2t9IGZyb20gXCIuL2RvY2tlcnNvY2suY2xhc3Nlcy5kb2NrZXJzb2NrXCIiXX0=

npmextra.json

@@ -0,0 +1,11 @@
+{
+    "npmts":{
+        "mode":"default",
+        "coverageTreshold":10
+    },
+    "npmdocker":{
+        "baseImage":"hosttoday/ht-docker-node:npmts",
+        "command":"npmts",
+        "dockerSock":"true"
+    }
+}

npmts.json

@@ -1,4 +0,0 @@
-{
-    "mode":"default",
-    "coverageTreshold":10
-}

package.json

@@ -1,14 +1,11 @@
 {
   "name": "dockersock",
-  "version": "1.0.7",
+  "version": "1.0.18",
-  "description": "easy communication with docker from node, TypeScript ready",
+  "description": "easy communication with docker remote api from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "npmts --notest && npm run build && npm run startdocker && npm run cleanup",
+    "test": "npmdocker"
-    "build": "docker build -t npmts-test-image .",
-    "startdocker": "docker run -v /var/run/docker.sock:/var/run/docker.sock --name npmts-test-container npmts-test-image",
-    "cleanup": "docker rm npmts-test-container && docker rmi npmts-test-image"
   },
   "repository": {
     "type": "git",
@@ -28,14 +25,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "beautylog": "^5.0.12",
+    "@types/q": "^0.0.27",
+    "@types/request": "^0.0.27",
+    "beautylog": "^5.0.18",
+    "lik": "^1.0.7",
     "q": "^1.4.1",
-    "request": "^2.72.0",
+    "request": "^2.74.0",
-    "typings-global": "^1.0.3"
+    "rxjs": "^5.0.0-beta.10",
+    "typings-global": "^1.0.6"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6",
+    "npmts-g": "^5.2.8",
-    "should": "^9.0.2",
+    "should": "^10.0.0",
     "typings-test": "^1.0.1"
   }
 }

test/test.js

@@ -1,17 +1,17 @@
 "use strict";
 require("typings-test");
 require("should");
-var index_1 = require("../dist/index");
+const index_1 = require("../dist/index");
 describe("dockersock", function () {
     describe(".Dockersock()", function () {
-        var testDockersock;
+        let testDockersock;
         it("should create a new Dockersock instance", function () {
             testDockersock = new index_1.Dockersock();
             testDockersock.should.be.instanceof(index_1.Dockersock);
         });
         it("should list containers", function (done) {
             testDockersock.listContainers()
-                .then(function (dataArg) {
+                .then((dataArg) => {
                 console.log(dataArg);
                 done();
             });
@@ -19,19 +19,24 @@ describe("dockersock", function () {
         it("should list detailed containers", function (done) {
             this.timeout(5000);
             testDockersock.listContainersDetailed()
-                .then(function (dataArg) {
+                .then((dataArg) => {
                 console.log(dataArg);
                 done();
             });
         });
         it("should pull an image from imagetag", function (done) {
-            this.timeout(30000);
+            this.timeout(60000);
-            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
-                .then(function (dataArg) {
+                .then((dataArg) => {
+                done();
+            });
+        });
+        it("should return a change Objservable", function (done) {
+            this.timeout(10000);
+            testDockersock.getChangeObservable();
+            testDockersock.endRequests();
             done();
-            }, done);
         });
     });
 });
-
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBMkIsZUFBZSxDQUFDLENBQUE7QUFFM0MsUUFBUSxDQUFDLFlBQVksRUFBRTtJQUNuQixRQUFRLENBQUMsZUFBZSxFQUFFO1FBQ3RCLElBQUksY0FBMEIsQ0FBQztRQUMvQixFQUFFLENBQUMseUNBQXlDLEVBQUU7WUFDMUMsY0FBYyxHQUFHLElBQUksa0JBQVUsRUFBRSxDQUFDO1lBQ2xDLGNBQWMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxrQkFBVSxDQUFDLENBQUM7UUFDcEQsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsd0JBQXdCLEVBQUUsVUFBVSxJQUFJO1lBQ3ZDLGNBQWMsQ0FBQyxjQUFjLEVBQUU7aUJBQzFCLElBQUksQ0FBQyxDQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLGlDQUFpQyxFQUFFLFVBQVUsSUFBSTtZQUNoRCxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxzQkFBc0IsRUFBRTtpQkFDbEMsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsVUFBVSxJQUFJO1lBQ25ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsY0FBYyxDQUFDLFNBQVMsQ0FBQywyQkFBMkIsQ0FBQztpQkFDaEQsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsVUFBVSxJQUFJO1lBQ25ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsY0FBYyxDQUFDLG1CQUFtQixFQUFFLENBQUM7WUFDckMsY0FBYyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQzdCLElBQUksRUFBRSxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIn0=
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUVQLENBQUMsQ0FGYztBQUVmLHNCQUF5QixlQUV6QixDQUFDLENBRnVDO0FBRXhDLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixJQUFJLGNBQXlCLENBQUM7UUFDOUIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO1lBQ3pDLGNBQWMsR0FBRyxJQUFJLGtCQUFVLEVBQUUsQ0FBQztZQUNsQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsa0JBQVUsQ0FBQyxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdCQUF3QixFQUFDLFVBQVMsSUFBSTtZQUNyQyxjQUFjLENBQUMsY0FBYyxFQUFFO2lCQUMxQixJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQyxVQUFTLElBQUk7WUFDOUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixjQUFjLENBQUMsc0JBQXNCLEVBQUU7aUJBQ2xDLElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLG9DQUFvQyxFQUFDLFVBQVMsSUFBSTtZQUNqRCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3BCLGNBQWMsQ0FBQyxTQUFTLENBQUMsNkJBQTZCLENBQUM7aUJBQ2xELElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFDaEIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLXRlc3RcIjtcbmltcG9ydCBcInNob3VsZFwiXG5cbmltcG9ydCB7RG9ja2Vyc29ja30gZnJvbSBcIi4uL2Rpc3QvaW5kZXhcIlxuXG5kZXNjcmliZShcImRvY2tlcnNvY2tcIixmdW5jdGlvbigpe1xuICAgIGRlc2NyaWJlKFwiLkRvY2tlcnNvY2soKVwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGxldCB0ZXN0RG9ja2Vyc29jazpEb2NrZXJzb2NrO1xuICAgICAgICBpdChcInNob3VsZCBjcmVhdGUgYSBuZXcgRG9ja2Vyc29jayBpbnN0YW5jZVwiLGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jayA9IG5ldyBEb2NrZXJzb2NrKCk7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jay5zaG91bGQuYmUuaW5zdGFuY2VvZihEb2NrZXJzb2NrKTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIGxpc3QgY29udGFpbmVyc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2subGlzdENvbnRhaW5lcnMoKVxuICAgICAgICAgICAgICAgIC50aGVuKChkYXRhQXJnKT0+e1xuICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhkYXRhQXJnKTtcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICB9KTtcbiAgICAgICAgaXQoXCJzaG91bGQgbGlzdCBkZXRhaWxlZCBjb250YWluZXJzXCIsZnVuY3Rpb24oZG9uZSl7XG4gICAgICAgICAgICB0aGlzLnRpbWVvdXQoNTAwMCk7XG4gICAgICAgICAgICB0ZXN0RG9ja2Vyc29jay5saXN0Q29udGFpbmVyc0RldGFpbGVkKClcbiAgICAgICAgICAgICAgICAudGhlbigoZGF0YUFyZyk9PntcbiAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coZGF0YUFyZyk7XG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIHB1bGwgYW4gaW1hZ2UgZnJvbSBpbWFnZXRhZ1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDMwMDAwKTtcbiAgICAgICAgICAgIHRlc3REb2NrZXJzb2NrLnB1bGxJbWFnZShcImhvc3R0b2RheSUyRmh0LWRvY2tlci1kYmFzZVwiKVxuICAgICAgICAgICAgICAgIC50aGVuKChkYXRhQXJnKT0+e1xuICAgICAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICAgICAgfSxkb25lKTtcbiAgICAgICAgfSlcbiAgICB9KTtcbn0pOyJdfQ==

test/test.ts

@@ -1,36 +1,42 @@
 import "typings-test";
-import "should"
+import "should";
 
-import {Dockersock} from "../dist/index"
+import { Dockersock } from "../dist/index";
 
-describe("dockersock",function(){
+describe("dockersock", function () {
-    describe(".Dockersock()",function(){
+    describe(".Dockersock()", function () {
-        let testDockersock:Dockersock;
+        let testDockersock: Dockersock;
-        it("should create a new Dockersock instance",function(){
+        it("should create a new Dockersock instance", function () {
             testDockersock = new Dockersock();
             testDockersock.should.be.instanceof(Dockersock);
         });
-        it("should list containers",function(done){
+        it("should list containers", function (done) {
             testDockersock.listContainers()
-                .then((dataArg)=>{
+                .then((dataArg) => {
                     console.log(dataArg);
                     done();
                 });
         });
-        it("should list detailed containers",function(done){
+        it("should list detailed containers", function (done) {
             this.timeout(5000);
             testDockersock.listContainersDetailed()
-                .then((dataArg)=>{
+                .then((dataArg) => {
                     console.log(dataArg);
                     done();
                 });
         });
-        it("should pull an image from imagetag",function(done){
+        it("should pull an image from imagetag", function (done) {
-            this.timeout(30000);
+            this.timeout(60000);
-            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
-                .then((dataArg)=>{
+                .then((dataArg) => {
+                    done();
+                });
+        });
+        it("should return a change Objservable", function (done) {
+            this.timeout(10000);
+            testDockersock.getChangeObservable();
+            testDockersock.endRequests();
             done();
-                },done);
         })
     });
 });

test/testEnv.sh

@@ -1,2 +0,0 @@
-docker build -t dockersock-image .
-docker-compose up

ts/dockersock.classes.dockersock.ts

@@ -1,21 +1,23 @@
 import "typings-global"
 import * as plugins from "./dockersock.plugins";
+import { Observable } from "rxjs";
 
 export class Dockersock {
-    sockPath:string;
+    sockPath: string;
-    constructor(pathArg:string = "http://unix:/var/run/docker.sock:"){
+    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;
     };
@@ -26,8 +28,8 @@ export class Dockersock {
             .then((dataArg) => {
                 let recursiveCounter = 0;
                 let makeDetailed = () => {
-                    if(typeof dataArg[recursiveCounter] != "undefined"){
+                    if (typeof dataArg[recursiveCounter] != "undefined") {
-                        this.request("GET","/containers/" + dataArg[recursiveCounter].Id)
+                        this.request("GET", "/containers/" + dataArg[recursiveCounter].Id)
                             .then((dataArg2) => {
                                 detailedDataObject.push(dataArg2);
                                 recursiveCounter++;
@@ -51,20 +53,21 @@ export class Dockersock {
         return done.promise;
     }
     listImages() {
-        return this.request("GET","/images","?all=true");
+        return this.request("GET", "/images", "?all=true");
     }
-    listImagesDangling(){
+    listImagesDangling() {
-        return this.request("GET","/images","?dangling=true");
+        return this.request("GET", "/images", "?dangling=true");
     }
-    pullImage(imageLabel:string){
+    pullImage(imageLabelArg: string) {
-        return this.requestStream("POST","/images/create?fromImage=" + imageLabel);
+        let imageLabel = encodeURI(imageLabelArg);
+        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);
@@ -74,37 +77,37 @@ export class Dockersock {
         }
         return done.promise;
     };
-    getContainerId(){
+    getContainerId() {
 
     };
-    startContainer(containerNameArg){
+    startContainer(containerNameArg) {
-        return this.request("POST","/containers/"+ containerNameArg +"/start");
+        return this.request("POST", "/containers/" + containerNameArg + "/start");
     };
-    stopContainer(containerNameArg){
+    stopContainer(containerNameArg) {
-        return this.request("POST","/containers/"+ containerNameArg +"/stop");
+        return this.request("POST", "/containers/" + containerNameArg + "/stop");
     };
-    removeContainer(containerNameArg){
+    removeContainer(containerNameArg) {
-        return this.request("DELETE","/containers/" + containerNameArg + "?v=1");
+        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) => {
+        requestStream.on("response", (response) => {
-                if(response.statusCode == 200){
+            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("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;
@@ -114,24 +117,56 @@ export class Dockersock {
                 });
             }
         });
-        requestStream.on("end",()=> {
+        requestStream.on("end", () => {
 
         });
     };
-    request(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){
+    getChangeObservable() {
-        let done = plugins.q.defer();
-        let jsonArg:string = JSON.stringify(dataArg);
-        let suffix:string = "";
-        if(methodArg == "GET") suffix = "/json";
         let options = {
-            method:methodArg,
+            method: "GET",
-            url:this.sockPath + routeArg + suffix + queryArg,
+            url: this.sockPath + "/events",
-            headers:{
+            headers: {
-                "Content-Type":"application/json"
+                "Content-Type": "application/json",
-            },
+                "Host": "docker.sock"
-            body:jsonArg
+            }
         };
-        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) => {
+            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 = {}) {
+        let done = plugins.q.defer();
+        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"
+            },
+            body: jsonArg
+        };
+        //console.log(options);
+        plugins.request(options, (err, res, body) => {
             if (!err && res.statusCode == 200) {
                 var responseObj = JSON.parse(body);
                 done.resolve(responseObj);
@@ -143,26 +178,53 @@ 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 jsonArg: string = JSON.stringify(dataArg);
-            let requestStream = plugins.request.post(this.sockPath + routeArg);
+        let suffix: string = "";
-            requestStream.on("response",(response) => {
+        let options = {
-                    if(response.statusCode == 200){
+            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) => {
+            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();
+                done.reject(response);
             }
         });
-            requestStream.on("data",(data:Buffer) => {
+        requestStream.on("data", (data: Buffer) => {
-                let status = JSON.parse(data.toString()).status;
+            let status;
+            status = JSON.parse(data.toString()).status;
             plugins.beautylog.logReduced(status);
         });
-            requestStream.on("end",()=> {
+        requestStream.on("end", () => {
-                done.resolve();
+            this.requestObjectmap.remove(requestStream);
         });
-        }
         return done.promise;
-    }
+    };
+    endRequests() {
+        setTimeout(() => {
+            this.requestObjectmap.forEach((itemArg: plugins.request.Request) => {
+                itemArg.emit("end");
+            });
+            this.requestObjectmap.wipe();
+        }, 5000);
+    };
 }

ts/dockersock.plugins.ts

@@ -1,4 +1,6 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let q = require("q");
+export import lik = require("lik");
-export let request = require("request");
+export import q = require("q");
+export import request = require("request");
+export import rxjs = require("rxjs");

ts/index.ts

@@ -1,2 +1,2 @@
 import "typings-global";
-export {Dockersock} from "./dockersock.classes.dockersock"
+export { Dockersock } from "./dockersock.classes.dockersock";