1.0.27

.gitignore

@@ -1,3 +1,4 @@
-docs/
-coverage/
+.yarn/
 node_modules/
+coverage/
+public/

.gitlab-ci.yml

@@ -1,53 +1,139 @@
-image: hosttoday/ht-docker-dbase
-services:
-  - docker:dind
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
 
 stages:
-  - build
-  - test
-  - release
-  - trigger
+- security
+- test
+- release
+- metadata
 
-before_script:
-  - npmci prepare docker-gitlab
-
-
-build:
-  stage: build
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
   script:
-    - npm install
-    - npm test
-    - npmci build docker
+  - npmci git mirror
   tags:
-    - lossless
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
   - priv
 
+# ====================
+# test stage
+# ====================
     
-test:
+testSTABLE:
+  image: hosttoday/ht-docker-dbase:npmci
   stage: test
   script:
-    - npmci test docker
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
+  - docker
   - priv
 
 release:
-  image: hosttoday/ht-docker-node:npmts
   stage: release
   script:
-    - npmci publish npm
+  - npmci node install stable
+  - npmci npm publish
   only:
   - tags
   tags:
-    - lossless
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
   - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
-    - lossless
-    - priv
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: metadata
+  script:
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+  tags:
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

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,11 +1,29 @@
-# dockersock
-easy communication with docker from node, TypeScript ready
+# @mojoio/dockersock
 
-## Status
-[![build status](https://gitlab.com/pushrocks/dockersock/badges/master/build.svg)](https://gitlab.com/pushrocks/dockersock/commits/master)
+easy communication with docker remote api from node, TypeScript ready
+
+## Availabililty
+
+[![npm](https://mojoio.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/mojoio/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/mojoio/dockersock)
+[![docs](https://mojoio.gitlab.io/assets/repo-button-docs.svg)](https://mojoio.gitlab.io/dockersock/)
+
+## Status for master
+
+[![build status](https://GitLab.com/mojoio/dockersock/badges/master/build.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![coverage report](https://GitLab.com/mojoio/dockersock/badges/master/coverage.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/dockersock.svg)](https://www.npmjs.com/package/dockersock)
+[![Dependency Status](https://david-dm.org/mojoio/dockersock.svg)](https://david-dm.org/mojoio/dockersock)
+[![bitHound Dependencies](https://www.bithound.io/github/mojoio/dockersock/badges/dependencies.svg)](https://www.bithound.io/github/mojoio/dockersock/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/mojoio/dockersock/badges/code.svg)](https://www.bithound.io/github/mojoio/dockersock)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
-We recommend the use of TypeScript for best Intellisense.
+
+Use TypeScript for best in class instellisense.
 
 ```TypeScript
 import {Dockersock} from "dockersock"; // require Dockersock class
@@ -24,5 +42,11 @@ myDockersock.startContainer({ // starts a already present container
 myDockersock.newContainer({ // start new Container, equals "docker run" shell command
     image: "someimagetag"
 })
-
 ```
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://mojo.io)

dist/dockersock.classes.dockersock.d.ts

@@ -1,26 +0,0 @@
-/// <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): 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): plugins.q.Promise<{}>;
-    stopContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    removeContainer(containerNameArg: any): plugins.q.Promise<{}>;
-    clean(): plugins.q.Promise<{}>;
-    callOnChange(cb: Function): void;
-    getChangeObservable(): Observable<{}>;
-    request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
-    requestStream(methodArg: any, routeArg: any, endArg?: boolean): plugins.q.Promise<{}>;
-}

dist/dockersock.plugins.d.ts

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

dist/dockersock.plugins.js

@@ -1,7 +0,0 @@
-"use strict";
-require("typings-global");
-exports.beautylog = require("beautylog");
-exports.q = require("q");
-exports.request = require("request");
-exports.rxjs = require("rxjs");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9

dist/index.d.ts

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

dist/index.js

@@ -1,5 +0,0 @@
-"use strict";
-require("typings-global");
-var dockersock_classes_dockersock_1 = require("./dockersock.classes.dockersock");
-exports.Dockersock = dockersock_classes_dockersock_1.Dockersock;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUF5QixpQ0FBaUMsQ0FBQztBQUFuRCxnRUFBa0QifQ==

docker-compose.yml

@@ -1,18 +1,18 @@
 nginx1 :
   image: "nginx"
   environment:
-      VIRTUAL_HOST: "test100.labkomp.de"
+      VIRTUAL_HOST: "test100.bleu.de"
   restart: always
   container_name: nginx1
 nginx2:
   image: nginx
   environment:
-    VIRTUAL_HOST: "test101.labkomp.de"
+    VIRTUAL_HOST: "test101.bleu.de"
   restart: always
   container_name: nginx2
-npmts-test-container:
-  image: "npmts-test-image"
-  volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock"
+nginx3:
+  image: nginx
+  environment:
+    VIRTUAL_HOST: "test101.bleu.de"
   restart: always
-  container_name: npmts-test-container
+  container_name: nginx3

npmextra.json

@@ -0,0 +1,15 @@
+{
+  "npmts": {
+    "mode": "default",
+    "coverageTreshold": 10
+  },
+  "npmdocker": {
+    "baseImage": "hosttoday/ht-docker-node:npmci",
+    "command":
+      "(ls -a && rm -r node_modules && yarn global add npmts && yarn install && npmts)",
+    "dockerSock": true
+  },
+  "npmci": {
+    "globalNpmTools": ["npmts", "npmdocker"]
+  }
+}

npmts.json

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

package.json

@@ -1,14 +1,12 @@
 {
-  "name": "dockersock",
-  "version": "1.0.13",
-  "description": "easy communication with docker from node, TypeScript ready",
+  "name": "@mojoio/docker",
+  "version": "1.0.27",
+  "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",
-    "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"
+    "test": "tsrun test/test.ts",
+    "build": "(npmts --notest && npmdocker)"
   },
   "repository": {
     "type": "git",
@@ -28,16 +26,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "@types/q": "*",
-    "beautylog": "^5.0.14",
-    "q": "^1.4.1",
-    "request": "^2.73.0",
-    "rxjs": "^5.0.0-beta.10",
-    "typings-global": "^1.0.6"
+    "@pushrocks/lik": "^3.0.4",
+    "@pushrocks/smartlog": "^2.0.9",
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartrequest": "^1.1.14",
+    "rxjs": "^6.3.3"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6",
-    "should": "^9.0.2",
-    "typings-test": "^1.0.1"
-  }
+    "@gitzone/tsrun": "^1.1.17",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.18",
+    "tslint": "^5.12.0",
+    "tslint-config-prettier": "^1.17.0"
+  },
+  "private": false
 }

test/test.d.ts

@@ -1,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,36 +0,0 @@
-"use strict";
-require("typings-test");
-require("should");
-const index_1 = require("../dist/index");
-describe("dockersock", function () {
-    describe(".Dockersock()", function () {
-        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((dataArg) => {
-                console.log(dataArg);
-                done();
-            });
-        });
-        it("should list detailed containers", function (done) {
-            this.timeout(5000);
-            testDockersock.listContainersDetailed()
-                .then((dataArg) => {
-                console.log(dataArg);
-                done();
-            });
-        });
-        it("should pull an image from imagetag", function (done) {
-            this.timeout(60000);
-            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
-                .then((dataArg) => {
-                done();
-            }, done);
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDZCQUE2QixDQUFDO2lCQUNsRCxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9

test/test.ts

@@ -1,36 +1,29 @@
-import "typings-test";
-import "should";
+import { expect, tap } from '@pushrocks/tapbundle';
+import { DockerHost } from '../ts/index';
 
-import {Dockersock} from "../dist/index"
+let testDockerHost: DockerHost;
 
-describe("dockersock",function(){
-    describe(".Dockersock()",function(){
-        let testDockersock:Dockersock;
-        it("should create a new Dockersock instance",function(){
-            testDockersock = new Dockersock();
-            testDockersock.should.be.instanceof(Dockersock);
-        });
-        it("should list containers",function(done){
-            testDockersock.listContainers()
-                .then((dataArg)=>{
-                    console.log(dataArg);
-                    done();
-                });
-        });
-        it("should list detailed containers",function(done){
-            this.timeout(5000);
-            testDockersock.listContainersDetailed()
-                .then((dataArg)=>{
-                    console.log(dataArg);
-                    done();
-                });
-        });
-        it("should pull an image from imagetag",function(done){
-            this.timeout(60000);
-            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
-                .then((dataArg)=>{
-                    done();
-                },done);
-        })
-    });
+tap.test('should create a new Dockersock instance', async () => {
+  testDockerHost = new DockerHost();
+  return expect(testDockerHost).to.be.instanceof(DockerHost);
 });
+
+tap.test('should list containers', async () => {
+  const containers = await testDockerHost.getContainers();
+  console.log(containers);
+});
+
+tap.skip.test('should pull an image from imagetag', async () => {
+  // await testDockerHost.pullImage('hosttoday/ht-docker-node:npmci');
+});
+
+tap.test('should return a change Objservable', async tools => {
+  const testObservable = await testDockerHost.getEventObservable();
+  const subscription = testObservable.subscribe(changeObject => {
+    console.log(changeObject);
+  });
+  await tools.delayFor(2000);
+  subscription.unsubscribe();
+});
+
+tap.start();

ts/docker.changes.ts

@@ -0,0 +1 @@
+import * as plugins from './dockersock.plugins';

ts/docker.classes.container.ts

@@ -0,0 +1,71 @@
+import * as plugins from './dockersock.plugins';
+import * as interfaces from './interfaces';
+
+import { DockerHost } from './docker.classes.host';
+
+export class DockerContainer {
+  // ======
+  // STATIC
+  // ======
+
+  /**
+   * get all containers
+   */
+  static async getContainers(dockerHostArg: DockerHost): Promise<DockerContainer[]> {
+    const result: DockerContainer[] = [];
+    const response = await dockerHostArg.request('GET', '/containers/json');
+    for (const containerResult of response.body) {
+      result.push(new DockerContainer(containerResult));
+    }
+    return result;
+  }
+
+  /**
+   *
+   * @param containerId
+   */
+  static async getContainerById(containerId: string) {}
+  static async create() {}
+
+  // ========
+  // INSTANCE
+  // ========
+
+  constructor(dockerContainerObjectArg: any) {
+    Object.keys(dockerContainerObjectArg).forEach(keyArg => {
+      this[keyArg] = dockerContainerObjectArg[keyArg];
+    });
+  }
+
+  Id: string;
+  Names: string[];
+  Image: string;
+  ImageID: string;
+  Command: string;
+  Created: number;
+  Ports: interfaces.TPorts;
+  Labels: interfaces.TLabels;
+  State: string;
+  Status: string;
+  HostConfig: any;
+  NetworkSettings: {
+    Networks: {
+      [key: string]: {
+        IPAMConfig: any;
+        Links: any;
+        Aliases: any;
+        NetworkID: string;
+        EndpointID: string;
+        Gateway: string;
+        IPAddress: string;
+        IPPrefixLen: number;
+        IPv6Gateway: string;
+        GlobalIPv6Address: string;
+        GlobalIPv6PrefixLen: number;
+        MacAddress: string;
+        DriverOpts: any;
+      };
+    };
+  };
+  Mounts: any;
+}

ts/docker.classes.host.ts

@@ -0,0 +1,88 @@
+import * as plugins from './dockersock.plugins';
+import { DockerContainer } from './docker.classes.container';
+
+export class DockerHost {
+  /**
+   * the path where the docker sock can be found
+   */
+  sockPath: string;
+
+  /**
+   * keeping track of currently active requests to safely end this module at any time
+   */
+  requestObjectmap = new plugins.lik.Objectmap<any>();
+
+  /**
+   * the constructor to instantiate a new docker sock instance
+   * @param pathArg
+   */
+  constructor(pathArg: string = 'http://unix:/var/run/docker.sock:') {
+    this.sockPath = pathArg;
+  }
+
+  /**
+   * authenticate against a registry
+   * @param userArg
+   * @param passArg
+   */
+  auth(registryArg: string, userArg: string, passArg: string) {
+    let done = plugins.smartpromise.defer();
+    this.request('POST', '');
+    return done.promise;
+  }
+
+  /**
+   *
+   */
+  async getContainers() {
+    const containerArray = await DockerContainer.getContainers(this);
+    return containerArray;
+  }
+
+  async getEventObservable(): Promise<plugins.rxjs.Observable<any>> {
+    const response = await this.requestStreaming('GET', '/events');
+    return plugins.rxjs.Observable.create(observer => {
+      response.on('data', data => {
+        observer.next(data.toString());
+      });
+      return () => {
+        response.emit('end');
+      };
+    });
+  }
+
+  /**
+   * fire a request
+   */
+  async request(methodArg: string, routeArg: string, dataArg = {}) {
+    const requestUrl = `${this.sockPath}${routeArg}`;
+    const response = await plugins.smartrequest.request(requestUrl, {
+      method: methodArg,
+      headers: {
+        'Content-Type': 'application/json',
+        Host: 'docker.sock'
+      },
+      requestBody: dataArg
+    });
+    return response;
+  }
+
+  async requestStreaming(methodArg: string, routeArg: string, dataArg = {}) {
+    const requestUrl = `${this.sockPath}${routeArg}`;
+    const response = await plugins.smartrequest.request(
+      requestUrl,
+      {
+        method: methodArg,
+        headers: {
+          // 'Content-Type': 'application/json',
+          Host: 'docker.sock'
+        },
+        requestBody: null
+      },
+      true
+    );
+    console.log(response.statusCode);
+    console.log(response.body);
+    return response;
+  }
+}

ts/docker.classes.image.ts

@@ -0,0 +1,14 @@
+import * as plugins from './dockersock.plugins';
+import { DockerHost } from './docker.classes.host';
+
+export class DockerImage {
+  /**
+   * the tags for an image
+   */
+  tags: string[] = [];
+
+  static async createFromRegsitry(dockerHostArg: DockerHost): Promise<DockerImage> {
+    const resultingImage = new DockerImage();
+    return resultingImage;
+  }
+}

ts/dockersock.classes.dockersock.ts

@@ -1,184 +0,0 @@
-import "typings-global"
-import * as plugins from "./dockersock.plugins";
-import {Observable} from "rxjs";
-
-export class Dockersock {
-    sockPath:string;
-    constructor(pathArg:string = "http://unix:/var/run/docker.sock:"){
-        this.sockPath = pathArg;
-    }
-
-    // methods
-    auth(userArg:string,passArg:string){
-        let done = plugins.q.defer();
-        this.request("POST","");
-        return done.promise;
-    }
-    listContainers() {
-        let done = plugins.q.defer();
-        this.request("GET","/containers")
-            .then(done.resolve);
-        return done.promise;
-    };
-    listContainersDetailed() {
-        let done = plugins.q.defer();
-        let detailedDataObject = [];
-        this.listContainers()
-            .then((dataArg) => {
-                let recursiveCounter = 0;
-                let makeDetailed = () => {
-                    if(typeof dataArg[recursiveCounter] != "undefined"){
-                        this.request("GET","/containers/" + dataArg[recursiveCounter].Id)
-                            .then((dataArg2) => {
-                                detailedDataObject.push(dataArg2);
-                                recursiveCounter++;
-                                // recursive call
-                                makeDetailed();
-                            });
-                    } else {
-                        done.resolve(detailedDataObject);
-                    }
-                };
-                makeDetailed();
-            });
-        return done.promise;
-    };
-    listContainersRunning() {
-        let done = plugins.q.defer();
-        return done.promise;
-    }
-    listContainersStopped() {
-        let done = plugins.q.defer();
-        return done.promise;
-    }
-    listImages() {
-        return this.request("GET","/images","?all=true");
-    }
-    listImagesDangling(){
-        return this.request("GET","/images","?dangling=true");
-    }
-    pullImage(imageLabel:string){
-        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(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;
-    };
-    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",()=> {
-            
-        });         
-    };
-    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 = "";
-        if(methodArg == "GET") suffix = "/json";
-        let options = {
-            method:methodArg,
-            url:this.sockPath + routeArg + suffix + queryArg,
-            headers:{
-                "Content-Type":"application/json"
-            },
-            body:jsonArg
-        };
-        plugins.request(options,(err, res, body) => {
-            if (!err && res.statusCode == 200) {
-                var responseObj = JSON.parse(body);
-                done.resolve(responseObj);
-            } else {
-                console.log(err);
-                console.log(res);
-                done.reject(err);
-            };
-        });
-        return done.promise;
-    }
-    requestStream(methodArg,routeArg,endArg:boolean = true){
-        let done = plugins.q.defer();
-        if(methodArg == "POST"){
-            let requestStream = plugins.request.post(this.sockPath + routeArg);
-            requestStream.on("response",(response) => {
-                    if(response.statusCode == 200){
-                        plugins.beautylog.ok("request returned status 200, so we are good!");
-                    } else {
-                        plugins.beautylog.error("request returned error: " + response.statusCode);
-                        done.reject(response);
-                    }
-                });
-            requestStream.on("data",(data:Buffer) => {
-                let status = JSON.parse(data.toString()).status;
-                plugins.beautylog.logReduced(status);
-            });
-            requestStream.on("end",()=> {
-                done.resolve();
-            });         
-        }
-        return done.promise;
-    }
-}

ts/dockersock.plugins.ts

@@ -1,5 +1,12 @@
-import "typings-global";
-export import beautylog = require("beautylog");
-export import q = require("q");
-export let request = require("request");
-export import rxjs = require("rxjs");
+// @pushrocks scope
+import * as lik from '@pushrocks/lik';
+import * as smartlog from '@pushrocks/smartlog';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
+
+export { lik, smartlog, smartpromise, smartrequest };
+
+// third party
+import * as rxjs from 'rxjs';
+
+export { rxjs };

ts/index.ts

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

ts/interfaces/index.ts

@@ -0,0 +1,2 @@
+export * from './label';
+export * from './port';

ts/interfaces/label.ts

@@ -0,0 +1,2 @@
+// tslint:disable-next-line: interface-over-type-literal
+export type TLabels = { [key: string]: string };

ts/interfaces/port.ts

@@ -0,0 +1,6 @@
+export interface IPort {
+  PrivatePort: 80;
+  Type: 'tcp';
+}
+
+export type TPorts = IPort[];

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}