1.0.14

dist/dockersock.classes.dockersock.d.ts

@@ -1,17 +1,26 @@
+/// <reference types="q" />
 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;
+    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(): plugins.q.Promise<{}>;
+    pullImage(imageLabelArg: string): plugins.q.Promise<{}>;
+    createContainer(optionsArg: any, pullFirstArg?: boolean): plugins.q.Promise<{}>;
     getContainerId(): void;
-    startContainer(containerNameArg: any): any;
+    startContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    stopContainer(): any;
+    stopContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    clean(): any;
+    removeContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    getChange(): void;
+    clean(): plugins.q.Promise<{}>;
-    request(methodArg: string, routeArg: string, dataArg?: {}): any;
+    callOnChange(cb: Function): void;
+    getChangeObservable(): Observable<{}>;
+    request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
+    requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
 }

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 request = require("request");
+export import rxjs = require("rxjs");

dist/dockersock.plugins.js

@@ -3,5 +3,5 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLFdBQVcsU0FBUyxDQUFDLENBQUM7QUFDN0IsWUFBSSxXQUFXLE1BQU0sQ0FBQyxDQUFDIn0=

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

npmextra.json

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

npmts.json

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

package.json

@@ -1,8 +1,9 @@
 {
   "name": "dockersock",
-  "version": "1.0.3",
+  "version": "1.0.14",
   "description": "easy communication with docker 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",
     "build": "docker build -t npmts-test-image .",
@@ -27,10 +28,12 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "beautylog": "^5.0.10",
+    "@types/q": "*",
+    "beautylog": "^5.0.14",
     "q": "^1.4.1",
-    "request": "^2.72.0",
+    "request": "^2.73.0",
-    "typings-global": "^1.0.3"
+    "rxjs": "^5.0.0-beta.10",
+    "typings-global": "^1.0.6"
   },
   "devDependencies": {
     "npmts-g": "^5.2.6",

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,12 +19,18 @@ 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(60000);
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
+                .then((dataArg) => {
+                done();
+            }, done);
         });
     });
-
+});
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUVQLENBQUMsQ0FGYztBQUVmLHNCQUF5QixlQUV6QixDQUFDLENBRnVDO0FBRXhDLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixJQUFJLGNBQXlCLENBQUM7UUFDOUIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO1lBQ3pDLGNBQWMsR0FBRyxJQUFJLGtCQUFVLEVBQUUsQ0FBQztZQUNsQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsa0JBQVUsQ0FBQyxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdCQUF3QixFQUFDLFVBQVMsSUFBSTtZQUNyQyxjQUFjLENBQUMsY0FBYyxFQUFFO2lCQUMxQixJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQyxVQUFTLElBQUk7WUFDOUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixjQUFjLENBQUMsc0JBQXNCLEVBQUU7aUJBQ2xDLElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIlxuXG5pbXBvcnQge0RvY2tlcnNvY2t9IGZyb20gXCIuLi9kaXN0L2luZGV4XCJcblxuZGVzY3JpYmUoXCJkb2NrZXJzb2NrXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5Eb2NrZXJzb2NrKClcIixmdW5jdGlvbigpe1xuICAgICAgICBsZXQgdGVzdERvY2tlcnNvY2s6RG9ja2Vyc29jaztcbiAgICAgICAgaXQoXCJzaG91bGQgY3JlYXRlIGEgbmV3IERvY2tlcnNvY2sgaW5zdGFuY2VcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2sgPSBuZXcgRG9ja2Vyc29jaygpO1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2suc2hvdWxkLmJlLmluc3RhbmNlb2YoRG9ja2Vyc29jayk7XG4gICAgICAgIH0pO1xuICAgICAgICBpdChcInNob3VsZCBsaXN0IGNvbnRhaW5lcnNcIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgIHRlc3REb2NrZXJzb2NrLmxpc3RDb250YWluZXJzKClcbiAgICAgICAgICAgICAgICAudGhlbigoZGF0YUFyZyk9PntcbiAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coZGF0YUFyZyk7XG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIGxpc3QgZGV0YWlsZWQgY29udGFpbmVyc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDUwMDApO1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2subGlzdENvbnRhaW5lcnNEZXRhaWxlZCgpXG4gICAgICAgICAgICAgICAgLnRoZW4oKGRhdGFBcmcpPT57XG4gICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKGRhdGFBcmcpO1xuICAgICAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgIH0pO1xufSk7Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDO2lCQUNoRCxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9

test/test.ts

@@ -1,5 +1,5 @@
 import "typings-test";
-import "should"
+import "should";
 
 import {Dockersock} from "../dist/index"
 
@@ -25,5 +25,12 @@ describe("dockersock",function(){
                     done();
                 });
         });
+        it("should pull an image from imagetag",function(done){
+            this.timeout(60000);
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
+                .then((dataArg)=>{
+                    done();
+                },done);
+        })
     });
 });

test/testEnv.sh

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

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;
@@ -51,38 +52,104 @@ export class Dockersock {
         return done.promise;
     }
     listImages() {
-        let done = plugins.q.defer();
+        return this.request("GET","/images","?all=true");
-        return done.promise;
     }
+    listImagesDangling(){
+        return this.request("GET","/images","?dangling=true");
+    }
+    pullImage(imageLabelArg:string){
+        let imageLabel = encodeURI(imageLabelArg);
+        return this.requestStream("POST","/images/create?fromImage=" + imageLabel);
+    };
+    createContainer(optionsArg,pullFirstArg:boolean = true){
+        let done = plugins.q.defer();
+        let create = () => {
+            return this.request("POST","/containers/create","",optionsArg);
+        }
+        if(pullFirstArg){
+            this.pullImage(optionsArg.Image)
+                .then(create)
+                .then(done.resolve);
+        } else {
+            create()
+                .then(done.resolve)
+        }
+        return done.promise;
+    };
     getContainerId(){
 
-    }
+    };
     startContainer(containerNameArg){
         return this.request("POST","/containers/"+ containerNameArg +"/start");
     };
-    stopContainer(){
+    stopContainer(containerNameArg){
         return this.request("POST","/containers/"+ containerNameArg +"/stop");
-    }
+    };
+    removeContainer(containerNameArg){
+        return this.request("DELETE","/containers/" + containerNameArg + "?v=1");
+    };
     clean() {
         let done = plugins.q.defer();
         return done.promise;
     };
-    getChange(){
+    callOnChange(cb:Function){
+        let cbPromise;
+        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) => {
+            let status = JSON.parse(data.toString()).status;
+            plugins.beautylog.logReduced(status);
+            if(typeof cbPromise == "undefined" || cbPromise.state == "pending"){
+                cbPromise = cb();
+            } else if (changeBuffered) {
+                changeBuffered = true;
+                cbPromise.then(() => {
+                    changeBuffered = false;
+                    cbPromise = cb();
+                });
+            }
+        });
+        requestStream.on("end",()=> {
             
+        });         
     };
-    request(methodArg:string,routeArg:string,dataArg = {}){
+    getChangeObservable(){
+        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);
+                }
+            });
+        let changeObservable = Observable.fromEvent(requestStream,"data");
+        requestStream.on("end",()=> {
+            
+        });
+        return changeObservable;
+    }
+    request(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){
         let done = plugins.q.defer();
         let jsonArg:string = JSON.stringify(dataArg);
-        let suffix:string = ""
+        let suffix:string = "";
         if(methodArg == "GET") suffix = "/json";
         let options = {
             method:methodArg,
-            url:this.sockPath + routeArg + suffix,
+            url:this.sockPath + routeArg + suffix + queryArg,
             headers:{
-                "Content-Type":"application/json"
+                "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);
@@ -95,4 +162,41 @@ export class Dockersock {
         });
         return done.promise;
     }
+    requestStream(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){
+        let done = plugins.q.defer();
+        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;
+    }
 }

ts/dockersock.plugins.ts

@@ -1,4 +1,5 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let q = require("q");
+export import q = require("q");
-export let request = require("request");
+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";