1.0.93

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -20,17 +20,20 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -38,38 +41,41 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
-  - notpriv
+    - priv
 
 testBuild:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -81,9 +87,11 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,20 +102,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.snyk

@@ -0,0 +1,9 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-HTTPSPROXYAGENT-469131:
+    - '@pushrocks/smartnetwork > speedtest-net > https-proxy-agent':
+        reason: None given
+        expires: '2019-11-04T13:59:28.695Z'
+patch: {}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -10,6 +10,7 @@
     "npmRegistryUrl": "registry.npmjs.org"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "mojoio",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@mojoio/docker",
-  "version": "1.0.45",
+  "version": "1.0.93",
   "description": "easy communication with docker remote api from node, TypeScript ready",
   "private": false,
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "tstest test/",
     "build": "tsbuild"
@@ -27,28 +27,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.10",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "@pushrocks/smartrequest": "^1.1.16",
-    "rxjs": "^6.5.2"
+    "@pushrocks/lik": "^3.0.19",
+    "@pushrocks/smartfile": "^7.0.11",
+    "@pushrocks/smartjson": "^3.0.10",
+    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartnetwork": "^1.1.18",
+    "@pushrocks/smartpath": "^4.0.1",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartrequest": "^1.1.47",
+    "@pushrocks/smartstring": "^3.0.18",
+    "@pushrocks/smartversion": "^2.0.4",
+    "@tsclass/tsclass": "^3.0.13",
+    "rxjs": "^6.5.4"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.22",
     "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.11",
-    "@types/node": "^12.7.1",
-    "tslint": "^5.18.0",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^13.9.3",
+    "tslint": "^6.1.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ unofficial docker engine api abstraction package written in TypeScript
 * [docs (typedoc)](https://mojoio.gitlab.io/docker/)
 
 ## Status for master
-[![build status](https://gitlab.com/mojoio/docker/badges/master/build.svg)](https://gitlab.com/mojoio/docker/commits/master)
+[![pipeline status](https://gitlab.com/mojoio/docker/badges/master/pipeline.svg)](https://gitlab.com/mojoio/docker/commits/master)
 [![coverage report](https://gitlab.com/mojoio/docker/badges/master/coverage.svg)](https://gitlab.com/mojoio/docker/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/docker.svg)](https://www.npmjs.com/package/@mojoio/docker)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/docker/badge.svg)](https://snyk.io/test/npm/@mojoio/docker)
@@ -30,6 +30,10 @@ const run = async () => {
 };
 ```
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

scripts/testauth.ts

@@ -0,0 +1,11 @@
+import * as docker from '../ts';
+import * as smartstring from '@pushrocks/smartstring';
+
+const run  = async () => {
+  const dockerHost = new docker.DockerHost();
+  await docker.DockerImage.createFromRegistry(dockerHost, {
+    imageUrl: 'registry.gitlab.com/servezone/private/cloudly:latest'
+  });
+};
+
+run();

test/test.ts

@@ -1,14 +1,17 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as docker from '../ts/index';
-import { DockerService } from '../ts/index';
 
 let testDockerHost: docker.DockerHost;
 
 tap.test('should create a new Dockersock instance', async () => {
-  testDockerHost = new docker.DockerHost();
+  testDockerHost = new docker.DockerHost('http://unix:/var/run/docker.sock:');
   return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
 });
 
+tap.test('should create a docker swarm', async () => {
+  await testDockerHost.activateSwarm();
+});
+
 // Containers
 tap.test('should list containers', async () => {
   const containers = await testDockerHost.getContainers();
@@ -53,13 +56,29 @@ tap.test('should return a change Observable', async tools => {
   subscription.unsubscribe();
 });
 
+// SECRETS
+tap.test('should create a secret', async () => {
+  const mySecret = await docker.DockerSecret.createSecret(testDockerHost, {
+    name: 'testSecret',
+    version: '1.0.3',
+    contentArg: `{ "hi": "wow"}`,
+    labels: {}
+  });
+  console.log(mySecret);
+});
+
+tap.test('should remove a secret by name', async () => {
+  const mySecret = await docker.DockerSecret.getSecretByName(testDockerHost, 'testSecret');
+  await mySecret.remove();
+});
+
 // SERVICES
 tap.test('should activate swarm mode', async () => {
   await testDockerHost.activateSwarm();
 });
 
 tap.test('should list all services', async tools => {
-  const services = await docker.DockerService.getServices(testDockerHost);
+  const services = await testDockerHost.getServices();
   console.log(services);
 });
 
@@ -67,14 +86,28 @@ tap.test('should create a service', async () => {
   const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
     Name: 'testNetwork'
   });
-  await DockerService.createService(testDockerHost, {
-    Image: 'nginx:latest',
-    Labels: {    
-      'testlabel': 'hi'
-    },
-    Name: 'testService',
-    networks: [testNetwork]
+  const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
+    name: 'testSecret',
+    version: '0.0.1',
+    labels: {},
+    contentArg: '{"hi": "wow"}'
   });
+  const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
+    imageUrl: 'registry.gitlab.com/hosttoday/ht-docker-static'
+  });
+  const testService = await docker.DockerService.createService(testDockerHost, {
+    image: testImage,
+    labels: {},
+    name: 'testService',
+    networks: [testNetwork],
+    networkAlias: 'testService',
+    secrets: [testSecret],
+    ports: ['3000:80']
+  });
+
+  await testService.remove();
+  await testNetwork.remove();
+  await testSecret.remove();
 });
 
 tap.start();

ts/docker.classes.host.ts

@@ -1,19 +1,35 @@
 import * as plugins from './docker.plugins';
 import { DockerContainer } from './docker.classes.container';
 import { DockerNetwork } from './docker.classes.network';
+import { DockerService } from './docker.classes.service';
+
+export interface IAuthData {
+  serveraddress: string;
+  username: string;
+  password: string;
+}
 
 export class DockerHost {
   /**
    * the path where the docker sock can be found
    */
   public socketPath: string;
+  private registryToken: string = '';
 
   /**
    * the constructor to instantiate a new docker sock instance
    * @param pathArg
    */
-  constructor(pathArg: string = 'http://unix:/var/run/docker.sock:') {
-    this.socketPath = pathArg;
+  constructor(pathArg?: string) {
+    let pathToUse: string;
+    if (pathArg) {
+      pathToUse = pathArg;
+    } else if (process.env.CI) {
+      pathToUse = 'http://docker:2375/';
+    } else {
+      pathToUse = 'http://unix:/var/run/docker.sock:';
+    }
+    this.socketPath = pathToUse;
   }
 
   /**
@@ -21,9 +37,32 @@ export class DockerHost {
    * @param userArg
    * @param passArg
    */
-  public async auth(registryArg: string, userArg: string, passArg: string) {
-    // TODO: implement Docker Registry authentication
-    await this.request('POST', '');
+  public async auth(authData: IAuthData) {
+    const response = await this.request('POST', '/auth', authData);
+    if (response.body.Status !== 'Login Succeeded') {
+      console.log(`Login failed with ${response.body.Status}`);
+      throw new Error(response.body.Status);
+    }
+    console.log(response.body.Status);
+    this.registryToken = plugins.smartstring.base64.encode(
+      plugins.smartjson.Smartjson.stringify(authData, {})
+    );
+  }
+
+  /**
+   * gets the token from the .docker/config.json file for GitLab registry
+   */
+  public async getGitlabComTokenFromDockerConfig() {
+    const dockerConfigPath = plugins.smartpath.get.home('~/.docker/config.json');
+    const configObject = plugins.smartfile.fs.toObjectSync(dockerConfigPath);
+    const gitlabAuthBase64 = configObject.auths['registry.gitlab.com'].auth;
+    const gitlabAuth: string = plugins.smartstring.base64.decode(gitlabAuthBase64);
+    const gitlabAuthArray = gitlabAuth.split(':');
+    await this.auth({
+      username: gitlabAuthArray[0],
+      password: gitlabAuthArray[1],
+      serveraddress: 'registry.gitlab.com'
+    });
   }
 
   /**
@@ -33,6 +72,10 @@ export class DockerHost {
     return await DockerNetwork.getNetworks(this);
   }
 
+  /**
+   *
+   */
+
   /**
    * gets all containers
    */
@@ -41,6 +84,14 @@ export class DockerHost {
     return containerArray;
   }
 
+  /**
+   * gets all services
+   */
+  public async getServices() {
+    const serviceArray = await DockerService.getServices(this);
+    return serviceArray;
+  }
+
   /**
    *
    */
@@ -66,9 +117,21 @@ export class DockerHost {
    * activates docker swarm
    */
   public async activateSwarm(addvertisementIpArg?: string) {
+    // determine advertisement address
+    let addvertisementIp: string;
+    if (addvertisementIpArg) {
+      addvertisementIp = addvertisementIpArg;
+    } else {
+      const smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
+      const defaultGateway = await smartnetworkInstance.getDefaultGateway();
+      if (defaultGateway) {
+        addvertisementIp = defaultGateway.ipv4.address;
+      }
+    }
+
     const response = await this.request('POST', '/swarm/init', {
       ListenAddr: '0.0.0.0:2377',
-      AdvertiseAddr: addvertisementIpArg ? `${addvertisementIpArg}:2377` : undefined,
+      AdvertiseAddr: addvertisementIp,
       DataPathPort: 4789,
       DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'],
       SubnetSize: 24,
@@ -90,9 +153,11 @@ export class DockerHost {
       method: methodArg,
       headers: {
         'Content-Type': 'application/json',
+        'X-Registry-Auth': this.registryToken,
         Host: 'docker.sock'
       },
-      requestBody: dataArg
+      requestBody: dataArg,
+      keepAlive: false
     });
     if (response.statusCode !== 200) {
       console.log(response.body);
@@ -107,10 +172,12 @@ export class DockerHost {
       {
         method: methodArg,
         headers: {
-          // 'Content-Type': 'application/json',
+          'Content-Type': 'application/json',
+          'X-Registry-Auth': this.registryToken,
           Host: 'docker.sock'
         },
-        requestBody: null
+        requestBody: null,
+        keepAlive: false
       },
       true
     );

ts/docker.classes.image.ts

@@ -15,16 +15,20 @@ export class DockerImage {
 
   public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
     const images = await this.getImages(dockerHost);
-    return images.find(image => {
+    const result = images.find(image => {
+      if (image.RepoTags) {
         return image.RepoTags.includes(imageNameArg);
+      } else {
+        return false;
+      }
     });
+    return result;
   }
 
   public static async createFromRegistry(
     dockerHostArg: DockerHost,
     creationObject: interfaces.IImageCreationDescriptor
   ): Promise<DockerImage> {
-
     // lets create a sanatized imageUrlObject
     const imageUrlObject: {
       imageUrl: string;
@@ -40,11 +44,10 @@ export class DockerImage {
       const imageTag = imageUrlObject.imageUrl.split(':')[1];
       if (imageUrlObject.imageTag) {
         throw new Error(
-          `imageUrl ${imageUrlObject.imageUrl} can't be tagged with ${
-            imageUrlObject.imageTag
-          } because it is already tagged with ${imageTag}`
+          `imageUrl ${imageUrlObject.imageUrl} can't be tagged with ${imageUrlObject.imageTag} because it is already tagged with ${imageTag}`
         );
       } else {
+        imageUrlObject.imageUrl = imageUrl;
         imageUrlObject.imageTag = imageTag;
       }
     } else if (!imageUrlObject.imageTag) {
@@ -113,15 +116,13 @@ export class DockerImage {
   }
 
   /**
-   * returns a boolean wether the image has a upstream image
+   * tag an image
+   * @param newTag
    */
-  public isUpstreamImage(): boolean {
-    // TODO: implement isUpastreamImage
-    return this.RepoTags.length > 0;
+  public async tagImage(newTag) {
+    throw new Error('.tagImage is not yet implemented');
   }
 
-  public tagImage(newTag) {}
-
   /**
    * pulls the latest version from the registry
    */
@@ -133,4 +134,13 @@ export class DockerImage {
     // TODO: Compare image digists before and after
     return true;
   }
+
+  // get stuff
+  public async getVersion() {
+    if (this.Labels && this.Labels.version) {
+      return this.Labels.version;
+    } else {
+      return '0.0.0';
+    }
+  }
 }

ts/docker.classes.network.ts

@@ -2,13 +2,16 @@ import * as plugins from './docker.plugins';
 import * as interfaces from './interfaces';
 
 import { DockerHost } from './docker.classes.host';
+import { DockerService } from './docker.classes.service';
 
 export class DockerNetwork {
   public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> {
     const dockerNetworks: DockerNetwork[] = [];
     const response = await dockerHost.request('GET', '/networks');
     for (const networkObject of response.body) {
-      dockerNetworks.push(new DockerNetwork(dockerHost, networkObject));
+      const dockerNetwork = new DockerNetwork(dockerHost);
+      Object.assign(dockerNetwork, networkObject);
+      dockerNetworks.push(dockerNetwork);
     }
     return dockerNetworks;
   }
@@ -27,17 +30,17 @@ export class DockerNetwork {
       CheckDuplicate: true,
       Driver: 'overlay',
       EnableIPv6: false,
-      IPAM: {
+      /* IPAM: {
         Driver: 'default',
         Config: [
           {
-            Subnet: '172.20.10.0/16',
-            IPRange: '172.20.10.0/24',
-            Gateway: '172.20.10.11'
+            Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`,
+            IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`,
+            Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11`
           }
         ]
-      },
-      Internal: true,
+      }, */
+      Internal: false,
       Attachable: true,
       Ingress: false
     });
@@ -78,11 +81,8 @@ export class DockerNetwork {
     ];
   };
 
-  constructor(dockerHostArg: DockerHost, dockerNetworkObjectArg: any) {
+  constructor(dockerHostArg: DockerHost) {
     this.dockerHost = dockerHostArg;
-    Object.keys(dockerNetworkObjectArg).forEach(keyArg => {
-      this[keyArg] = dockerNetworkObjectArg[keyArg];
-    });
   }
 
   /**
@@ -91,4 +91,30 @@ export class DockerNetwork {
   public async remove() {
     const response = await this.dockerHost.request('DELETE', `/networks/${this.Id}`);
   }
+
+  public async getContainersOnNetwork(): Promise<
+    Array<{
+      Name: string;
+      EndpointID: string;
+      MacAddress: string;
+      IPv4Address: string;
+      IPv6Address: string;
+    }>
+  > {
+    const returnArray = [];
+    const response = await this.dockerHost.request('GET', `/networks/${this.Id}`);
+    for (const key of Object.keys(response.body.Containers)) {
+      returnArray.push(response.body.Containers[key]);
+    }
+
+    return returnArray;
+  }
+
+  public async getContainersOnNetworkForService(serviceArg: DockerService) {
+    const containersOnNetwork = await this.getContainersOnNetwork();
+    const containersOfService = containersOnNetwork.filter(container => {
+      return container.Name.startsWith(serviceArg.Spec.Name);
+    });
+    return containersOfService;
+  }
 }

ts/docker.classes.secret.ts

@@ -0,0 +1,92 @@
+import * as plugins from './docker.plugins';
+import { DockerHost } from './docker.classes.host';
+
+// interfaces
+import * as interfaces from './interfaces';
+
+export class DockerSecret {
+  // STATIC
+  public static async getSecrets(dockerHostArg: DockerHost) {
+    const response = await dockerHostArg.request('GET', '/secrets');
+    const secrets: DockerSecret[] = [];
+    for (const secret of response.body) {
+      const dockerSecretInstance = new DockerSecret(dockerHostArg);
+      Object.assign(dockerSecretInstance, secret);
+      secrets.push(dockerSecretInstance);
+    }
+    return secrets;
+  }
+
+  public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) {
+    const secrets = await this.getSecrets(dockerHostArg);
+    return secrets.find(secret => secret.ID === idArg);
+  }
+
+  public static async getSecretByName(dockerHostArg: DockerHost, nameArg: string) {
+    const secrets = await this.getSecrets(dockerHostArg);
+    return secrets.find(secret => secret.Spec.Name === nameArg);
+  }
+
+  public static async createSecret(
+    dockerHostArg: DockerHost,
+    secretDescriptor: interfaces.ISecretCreationDescriptor
+  ) {
+    const labels: interfaces.TLabels = {
+      ...secretDescriptor.labels,
+      version: secretDescriptor.version
+    };
+    const response = await dockerHostArg.request('POST', '/secrets/create', {
+      Name: secretDescriptor.name,
+      Labels: labels,
+      Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg)
+    });
+
+    const newSecretInstance = new DockerSecret(dockerHostArg);
+    Object.assign(newSecretInstance, response.body);
+    Object.assign(
+      newSecretInstance,
+      await DockerSecret.getSecretByID(dockerHostArg, newSecretInstance.ID)
+    );
+    return newSecretInstance;
+  }
+
+  // INSTANCE
+  public ID: string;
+  public Spec: {
+    Name: string;
+    Labels: interfaces.TLabels;
+  };
+  public Version: {
+    Index: string;
+  };
+
+  public dockerHost: DockerHost;
+  constructor(dockerHostArg: DockerHost) {
+    this.dockerHost = dockerHostArg;
+  }
+
+  /**
+   * updates a secret
+   */
+  public async update(contentArg: string) {
+    const route = `/secrets/${this.ID}/update?=version=${this.Version.Index}`;
+    const response = await this.dockerHost.request(
+      'POST',
+      `/secrets/${this.ID}/update?version=${this.Version.Index}`,
+      {
+        Name: this.Spec.Name,
+        Labels: this.Spec.Labels,
+        Data: plugins.smartstring.base64.encode(contentArg)
+      }
+    );
+  }
+
+  public async remove() {
+    await this.dockerHost.request('DELETE', `/secrets/${this.ID}`);
+  }
+
+  // get things
+  public async getVersion() {
+    return this.Spec.Labels.version;
+  }
+}

ts/docker.classes.service.ts

@@ -3,6 +3,7 @@ import * as interfaces from './interfaces';
 
 import { DockerHost } from './docker.classes.host';
 import { DockerImage } from './docker.classes.image';
+import { DockerSecret } from './docker.classes.secret';
 
 export class DockerService {
   // STATIC
@@ -10,50 +11,239 @@ export class DockerService {
     const services: DockerService[] = [];
     const response = await dockerHost.request('GET', '/services');
     for (const serviceObject of response.body) {
-      services.push(new DockerService(dockerHost, serviceObject));
+      const dockerService = new DockerService(dockerHost);
+      Object.assign(dockerService, serviceObject);
+      services.push(dockerService);
     }
     return services;
   }
 
+  public static async getServiceByName(
+    dockerHost: DockerHost,
+    networkName: string
+  ): Promise<DockerService> {
+    const allServices = await DockerService.getServices(dockerHost);
+    const wantedService = allServices.find(service => {
+      return service.Spec.Name === networkName;
+    });
+    return wantedService;
+  }
+
   /**
    * creates a service
    */
   public static async createService(
     dockerHost: DockerHost,
     serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
-  ) {
+  ): Promise<DockerService> {
     // lets get the image
-    plugins.smartlog.defaultLogger.log('info', `downloading image for service ${serviceCreationDescriptor.Name}`);
-    const serviceImage = await DockerImage.createFromRegistry(dockerHost, {
-      imageUrl: serviceCreationDescriptor.Image
-    });
+    plugins.smartlog.defaultLogger.log(
+      'info',
+      `now creating service ${serviceCreationDescriptor.name}`
+    );
+
+    // await serviceCreationDescriptor.image.pullLatestImageFromRegistry();
+    const serviceVersion = await serviceCreationDescriptor.image.getVersion();
+
+    const labels: interfaces.TLabels = {
+      ...serviceCreationDescriptor.labels,
+      version: serviceVersion
+    };
+
+    const mounts: Array<{
+      /**
+       * the target inside the container
+       */
+      Target: string;
+      /**
+       * The Source from which to mount the data (Volume or host path)
+       */
+      Source: string;
+      Type: 'bind' | 'volume' | 'tmpfs' | 'npipe';
+      ReadOnly: boolean;
+      Consistency: 'default' | 'consistent' | 'cached' | 'delegated';
+    }> = [];
+    if (serviceCreationDescriptor.accessHostDockerSock) {
+      mounts.push({
+        Target: '/var/run/docker.sock',
+        Source: '/var/run/docker.sock',
+        Consistency: 'default',
+        ReadOnly: false,
+        Type: 'bind'
+      });
+    }
+
+    if (serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.volumeMounts) {
+      for(const volumeMount of serviceCreationDescriptor.resources.volumeMounts) {
+        mounts.push({
+          Target: volumeMount.containerFsPath,
+          Source: volumeMount.hostFsPath,
+          Consistency: 'default',
+          ReadOnly: false,
+          Type: 'bind'
+        });
+      }
+    }
+
+    const networkArray: Array<{
+      Target: string;
+      Aliases: string[];
+    }> = [];
 
-    const networkArray: any[] = [];
     for (const network of serviceCreationDescriptor.networks) {
       networkArray.push({
         Target: network.Name,
-        Aliases: []
+        Aliases: [serviceCreationDescriptor.networkAlias]
       });
     }
 
-    dockerHost.request('POST', '/services/create', {
-      Name: serviceCreationDescriptor.Name,
+    const ports = [];
+    for (const port of serviceCreationDescriptor.ports) {
+      const portArray = port.split(':');
+      const hostPort = portArray[0];
+      const containerPort = portArray[1];
+      ports.push({
+        Protocol: 'tcp',
+        PublishedPort: parseInt(hostPort, 10),
+        TargetPort: parseInt(containerPort, 10)
+      });
+    }
+
+    // lets configure secrets
+    const secretArray: any[] = [];
+    for (const secret of serviceCreationDescriptor.secrets) {
+      secretArray.push({
+        File: {
+          Name: 'secret.json', // TODO: make sure that works with multiple secrets
+          UID: '33',
+          GID: '33',
+          Mode: 384
+        },
+        SecretID: secret.ID,
+        SecretName: secret.Spec.Name
+      });
+    }
+
+    // lets configure limits
+
+    const memoryLimitMB =
+      serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.memorySizeMB
+        ? serviceCreationDescriptor.resources.memorySizeMB
+        : 1000;
+
+    const limits = {
+      MemoryBytes: memoryLimitMB * 1000000
+    };
+
+    if (serviceCreationDescriptor.resources) {
+      limits.MemoryBytes = serviceCreationDescriptor.resources.memorySizeMB * 1000000;
+    }
+
+    const response = await dockerHost.request('POST', '/services/create', {
+      Name: serviceCreationDescriptor.name,
       TaskTemplate: {
         ContainerSpec: {
-          Image: serviceCreationDescriptor.Image,
-          Labels: serviceCreationDescriptor.Labels
+          Image: serviceCreationDescriptor.image.RepoTags[0],
+          Labels: labels,
+          Secrets: secretArray,
+          Mounts: mounts
+          /* DNSConfig: {
+            Nameservers: ['1.1.1.1']
+          } */
+        },
+        UpdateConfig: {
+          Parallelism: 0,
+          Delay: 0,
+          FailureAction: 'pause',
+          Monitor: 15000000000,
+          MaxFailureRatio: 0.15
+        },
+        ForceUpdate: 1,
+        Resources: {
+          Limits: limits
+        },
+        LogDriver: {
+          Name: 'json-file',
+          Options: {
+            'max-file': '3',
+            'max-size': '10M'
+          }
         }
       },
-      Labels: serviceCreationDescriptor.Labels,
-      Networks: networkArray
+      Labels: labels,
+      Networks: networkArray,
+      EndpointSpec: {
+        Ports: ports
+      }
     });
+
+    const createdService = await DockerService.getServiceByName(
+      dockerHost,
+      serviceCreationDescriptor.name
+    );
+    return createdService;
   }
 
   // INSTANCE
-  public dockerHost: DockerHost;
+  public dockerHostRef: DockerHost;
 
-  constructor(dockerHostArg: DockerHost, serviceObject) {
-    this.dockerHost = dockerHostArg;
-    Object.assign(this, serviceObject);
+  public ID: string;
+  public Version: { Index: number };
+  public CreatedAt: string;
+  public UpdatedAt: string;
+  public Spec: {
+    Name: string;
+    Labels: interfaces.TLabels;
+    TaskTemplate: {
+      ContainerSpec: {
+        Image: string;
+        Isolation: string;
+        Secrets: Array<{
+          File: {
+            Name: string;
+            UID: string;
+            GID: string;
+            Mode: number;
+          };
+          SecretID: string;
+          SecretName: string;
+        }>;
+      };
+      ForceUpdate: 0;
+    };
+    Mode: {};
+    Networks: [any[]];
+  };
+  public Endpoint: { Spec: {}; VirtualIPs: [any[]] };
+
+  constructor(dockerHostArg: DockerHost) {
+    this.dockerHostRef = dockerHostArg;
+  }
+
+  public async remove() {
+    await this.dockerHostRef.request('DELETE', `/services/${this.ID}`);
+  }
+
+  public async reReadFromDockerEngine() {
+    const dockerData = await this.dockerHostRef.request('GET', `/services/${this.ID}`);
+    // TODO: Better assign: Object.assign(this, dockerData);
+  }
+
+  public async needsUpdate(): Promise<boolean> {
+    // TODO: implement digest based update recognition
+
+    await this.reReadFromDockerEngine();
+    const dockerImage = await DockerImage.createFromRegistry(this.dockerHostRef, {
+      imageUrl: this.Spec.TaskTemplate.ContainerSpec.Image
+    });
+
+    const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);
+    const serviceVersion = new plugins.smartversion.SmartVersion(this.Spec.Labels.version);
+    if (imageVersion.greaterThan(serviceVersion)) {
+      console.log(`service ${this.Spec.Name}  needs to be updated`);
+      return true;
+    } else {
+      console.log(`service ${this.Spec.Name} is up to date.`);
+    }
   }
 }

ts/docker.plugins.ts

@@ -1,12 +1,41 @@
+// node native path
+import * as path from 'path';
+
+export { path };
+
 // @pushrocks scope
 import * as lik from '@pushrocks/lik';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartjson from '@pushrocks/smartjson';
 import * as smartlog from '@pushrocks/smartlog';
+import * as smartnetwork from '@pushrocks/smartnetwork';
+import * as smartpath from '@pushrocks/smartpath';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartstring from '@pushrocks/smartstring';
+import * as smartversion from '@pushrocks/smartversion';
 
 smartlog.defaultLogger.enableConsole();
 
-export { lik, smartlog, smartpromise, smartrequest };
+export {
+  lik,
+  smartfile,
+  smartjson,
+  smartlog,
+  smartnetwork,
+  smartpath,
+  smartpromise,
+  smartrequest,
+  smartstring,
+  smartversion
+};
+
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+};
 
 // third party
 import * as rxjs from 'rxjs';

ts/index.ts

@@ -2,4 +2,5 @@ export * from './docker.classes.host';
 export * from './docker.classes.container';
 export * from './docker.classes.image';
 export * from './docker.classes.network';
+export * from './docker.classes.secret';
 export * from './docker.classes.service';

ts/interfaces/index.ts

@@ -3,4 +3,5 @@ export * from './image';
 export * from './label';
 export * from './network';
 export * from './port';
+export * from './secret';
 export * from './service';

ts/interfaces/secret.ts

@@ -0,0 +1,8 @@
+import * as interfaces from './';
+
+export interface ISecretCreationDescriptor {
+  name: string;
+  version: string;
+  contentArg: any;
+  labels: interfaces.TLabels;
+}

ts/interfaces/service.ts

@@ -1,9 +1,21 @@
+import * as plugins from '../docker.plugins';
+
 import * as interfaces from './';
 import { DockerNetwork } from '../docker.classes.network';
+import { DockerSecret } from '../docker.classes.secret';
+import { DockerImage } from '../docker.classes.image';
 
 export interface IServiceCreationDescriptor {
-  Name: string;
-  Image: string;
-  Labels: interfaces.TLabels;
+  name: string;
+  image: DockerImage;
+  labels: interfaces.TLabels;
   networks: DockerNetwork[];
+  networkAlias: string;
+  secrets: DockerSecret[];
+  ports: string[];
+  accessHostDockerSock?: boolean;
+  resources?: {
+    memorySizeMB?: number;
+    volumeMounts: plugins.tsclass.container.IVolumeMount[]
+  };
 }