1.2.0

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

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

.gitlab-ci.yml

@@ -1,119 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
-
-stages:
-- security
-- test
-- release
-- metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-  - npmci git mirror
-  tags:
-  - 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
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - priv
-
-testBuild:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-
-release:
-  stage: release
-  script:
-  - npmci node install stable
-  - npmci npm publish
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-  - docker
-  - priv
-
-trigger:
-  stage: metadata
-  script:
-  - npmci trigger
-  only:
-  - tags
-  tags:
-  - docker
-  - notpriv
-
-pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
-  stage: metadata
-  script:
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public
-  allow_failure: true

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

.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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,38 +0,0 @@
-# @mojoio/docker
-unofficial docker engine api abstraction package written in TypeScript
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/docker)
-* [gitlab.com (source)](https://gitlab.com/mojoio/docker)
-* [github.com (source mirror)](https://github.com/mojoio/docker)
-* [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)
-[![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)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-```typescript
-import { DockerHost } from '@mojoio/docker'; // require Dockersock class
-
-const run = async () => {
-  const myDockerHost = new DockerHost(); // optional: you can pass a domain to the contructor, defaults to  /var/run/docker.sock
-
-  const containers = await myDockerHost.getContainers(); // promise, resolve with an array of DockerContainers
-};
-```
-
-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)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -10,13 +10,28 @@
     "npmRegistryUrl": "registry.npmjs.org"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "mojoio",
       "gitrepo": "docker",
-      "shortDescription": "unofficial docker engine api abstraction package written in TypeScript",
+      "description": "Provides easy communication with Docker remote API from Node.js, with TypeScript support.",
       "npmPackagename": "@mojoio/docker",
-      "license": "MIT"
+      "license": "MIT",
+      "keywords": [
+        "Docker",
+        "API",
+        "Node.js",
+        "TypeScript",
+        "Containers",
+        "Images",
+        "Networks",
+        "Services",
+        "Secrets"
+      ]
     }
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package.json

@@ -1,62 +1,75 @@
 {
-  "name": "@mojoio/docker",
+  "name": "@apiclient.xyz/docker",
-  "version": "1.0.73",
+  "version": "1.2.0",
-  "description": "easy communication with docker remote api from node, TypeScript ready",
+  "description": "Provides easy communication with Docker remote API from Node.js, with TypeScript support.",
   "private": false,
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "tstest test/",
+    "test": "(tstest test/ --web)",
-    "build": "tsbuild"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@gitlab.com/pushrocks/dockersock.git"
+    "url": "git+https://gitlab.com/mojoio/docker.git"
   },
   "keywords": [
-    "docker",
+    "Docker",
-    "sock",
+    "API",
-    "container",
+    "Node.js",
-    "request",
+    "TypeScript",
-    "api"
+    "Containers",
+    "Images",
+    "Networks",
+    "Services",
+    "Secrets"
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/dockersock/issues"
+    "url": "https://gitlab.com/mojoio/docker/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/dockersock#README",
+  "homepage": "https://gitlab.com/mojoio/docker#readme",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
+    "@push.rocks/lik": "^6.0.15",
-    "@pushrocks/smartfile": "^7.0.4",
+    "@push.rocks/smartarchive": "^4.0.36",
-    "@pushrocks/smartjson": "^3.0.8",
+    "@push.rocks/smartbucket": "^3.0.10",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@push.rocks/smartfile": "^11.0.20",
-    "@pushrocks/smartnetwork": "^1.1.14",
+    "@push.rocks/smartjson": "^5.0.20",
-    "@pushrocks/smartpath": "^4.0.1",
+    "@push.rocks/smartlog": "^3.0.7",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@push.rocks/smartnetwork": "^3.0.0",
-    "@pushrocks/smartrequest": "^1.1.26",
+    "@push.rocks/smartpath": "^5.0.18",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartversion": "^2.0.4",
+    "@push.rocks/smartrequest": "^2.0.22",
-    "rxjs": "^6.5.3"
+    "@push.rocks/smartstream": "^3.0.44",
+    "@push.rocks/smartstring": "^4.0.15",
+    "@push.rocks/smartunique": "^3.0.9",
+    "@push.rocks/smartversion": "^3.0.5",
+    "@tsclass/tsclass": "^4.0.54",
+    "rxjs": "^7.5.7"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@git.zone/tsbuild": "^2.1.80",
-    "@gitzone/tsrun": "^1.2.8",
+    "@git.zone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.24",
+    "@git.zone/tstest": "^1.0.90",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@push.rocks/tapbundle": "^5.0.23",
-    "@types/node": "^12.7.4",
+    "@types/node": "20.14.2"
-    "tslint": "^5.19.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -0,0 +1,152 @@
+# @apiclient.xyz/docker
+
+easy communication with docker remote api from node, TypeScript ready
+
+## Install
+
+To install @apiclient.xyz/docker, you can use npm (npm package manager). Run the following command in your terminal:
+
+```bash
+npm install @apiclient.xyz/docker --save
+```
+
+This command installs the package and adds it as a dependency to your project's `package.json` file.
+
+## Usage
+
+The `@apiclient.xyz/docker` package provides a TypeScript-ready interface for interacting with Docker's Remote API directly from Node.js applications. It leverages TypeScript for strong type definitions, ensuring more reliable and maintainable code.
+
+### Prerequisites
+
+Before you begin, ensure:
+
+- You have Docker installed and running on your machine or a remote server.
+- You are familiar with TypeScript and have it set up in your development environment.
+
+### Getting Started
+
+First, import the required classes from the package:
+
+```typescript
+import { DockerHost, DockerContainer, DockerService, DockerNetwork } from '@apiclient.xyz/docker';
+```
+
+### Instantiate DockerHost
+
+Start by creating a `DockerHost` instance. This class is the entry point to communicate with the Docker Remote API.
+
+```typescript
+// Connect to local Docker instance
+const localDockerHost = new DockerHost();
+
+// Or specify a custom path or URL to a Docker host
+const remoteDockerHost = new DockerHost('tcp://<REMOTE_DOCKER_HOST>:2375');
+```
+
+### Working with Containers
+
+#### List All Containers
+
+```typescript
+async function listAllContainers() {
+  const containers = await localDockerHost.getContainers();
+  console.log(containers);
+}
+
+listAllContainers();
+```
+
+#### Create and Remove a Container
+
+```typescript
+import { IContainerCreationDescriptor } from '@apiclient.xyz/docker';
+
+async function createAndRemoveContainer() {
+  const containerDescriptor: IContainerCreationDescriptor = {
+    Hostname: 'test-container',
+    Domainname: '',
+    // Additional settings here
+  };
+
+  // Create container
+  const container = await DockerContainer.create(localDockerHost, containerDescriptor);
+  console.log(`Container Created: ${container.Id}`);
+
+  // Remove container
+  await container.remove();
+  console.log(`Container Removed: ${container.Id}`);
+}
+
+createAndRemoveContainer();
+```
+
+### Working with Docker Services
+
+#### Create a Docker Service
+
+```typescript
+import { IServiceCreationDescriptor } from '@apiclient.xyz/docker';
+
+async function createDockerService() {
+  const serviceDescriptor: IServiceCreationDescriptor = {
+    name: 'my-service',
+    image: 'nginx:latest', // Docker Image
+    // Additional settings
+  };
+  
+  const service = await DockerService.createService(localDockerHost, serviceDescriptor);
+  console.log(`Service Created: ${service.Id}`);
+}
+
+createDockerService();
+```
+
+### Working with Docker Networks
+
+#### Listing and Creating Networks
+
+```typescript
+async function listAndCreateNetwork() {
+  // List all networks
+  const networks = await localDockerHost.getNetworks();
+  console.log(networks);
+  
+  // Create a new network
+  const network = await DockerNetwork.createNetwork(localDockerHost, {
+    Name: 'my-network'
+    // Additional settings
+  });
+  console.log(`Network Created: ${network.Id}`);
+}
+
+listAndCreateNetwork();
+```
+
+### Advanced Usage
+
+You can leverage the full potential of the Docker Remote API with `@apiclient.xyz/docker`. This includes managing images, volumes, swarms, and more. The package's design is consistent and intuitive, making it easy to extend your usage as needed.
+
+Remember, the Docker Remote API offers extensive capabilities. Always refer to the [Docker API documentation](https://docs.docker.com/engine/api/latest/) for a comprehensive list of endpoints and actions you can perform.
+
+### Conclusion
+
+`@apiclient.xyz/docker` simplifies interaction with Docker's Remote API in TypeScript projects, providing strong typing and asynchronous operations. Whether you're managing containers, images, services or networks, it offers a comprehensive toolset to perform these tasks seamlessly.
+
+## License and Legal Information
+
+This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+
+### Company Information
+
+Task Venture Capital GmbH  
+Registered at District court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

scripts/testauth.ts

@@ -1,5 +1,5 @@
 import * as docker from '../ts';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smartstring from '@push.rocks/smartstring';
 
 const run  = async () => {
   const dockerHost = new docker.DockerHost();

test/test.nonci.node.ts

@@ -1,11 +1,16 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
-import * as docker from '../ts/index';
+
+import * as plugins from '../ts/plugins.js';
+import * as paths from '../ts/paths.js';
+
+import * as docker from '../ts/index.js';
 
 let testDockerHost: docker.DockerHost;
 
 tap.test('should create a new Dockersock instance', async () => {
-  testDockerHost = new docker.DockerHost('http://unix:/var/run/docker.sock:');
+  testDockerHost = new docker.DockerHost({});
-  return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
+  await testDockerHost.start();
+  return expect(testDockerHost).toBeInstanceOf(docker.DockerHost);
 });
 
 tap.test('should create a docker swarm', async () => {
@@ -26,10 +31,10 @@ tap.test('should list networks', async () => {
 
 tap.test('should create a network', async () => {
   const newNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
-    Name: 'webgateway'
+    Name: 'webgateway',
   });
-  expect(newNetwork).to.be.instanceOf(docker.DockerNetwork);
+  expect(newNetwork).toBeInstanceOf(docker.DockerNetwork);
-  expect(newNetwork.Name).to.equal('webgateway');
+  expect(newNetwork.Name).toEqual('webgateway');
 });
 
 tap.test('should remove a network', async () => {
@@ -40,16 +45,18 @@ tap.test('should remove a network', async () => {
 // Images
 tap.test('should pull an image from imagetag', async () => {
   const image = await docker.DockerImage.createFromRegistry(testDockerHost, {
-    imageUrl: 'hosttoday/ht-docker-node',
+    creationObject: {
-    imageTag: 'alpine'
+      imageUrl: 'hosttoday/ht-docker-node',
+      imageTag: 'alpine',
+    },
   });
-  expect(image).to.be.instanceOf(docker.DockerImage);
+  expect(image).toBeInstanceOf(docker.DockerImage);
   console.log(image);
 });
 
-tap.test('should return a change Observable', async tools => {
+tap.test('should return a change Observable', async (tools) => {
   const testObservable = await testDockerHost.getEventObservable();
-  const subscription = testObservable.subscribe(changeObject => {
+  const subscription = testObservable.subscribe((changeObject) => {
     console.log(changeObject);
   });
   await tools.delayFor(2000);
@@ -62,7 +69,7 @@ tap.test('should create a secret', async () => {
     name: 'testSecret',
     version: '1.0.3',
     contentArg: `{ "hi": "wow"}`,
-    labels: {}
+    labels: {},
   });
   console.log(mySecret);
 });
@@ -77,34 +84,34 @@ tap.test('should activate swarm mode', async () => {
   await testDockerHost.activateSwarm();
 });
 
-tap.test('should list all services', async tools => {
+tap.test('should list all services', async (tools) => {
   const services = await testDockerHost.getServices();
   console.log(services);
 });
 
 tap.test('should create a service', async () => {
   const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
-    Name: 'testNetwork'
+    Name: 'testNetwork',
   });
   const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
-    name: 'serviceSecret',
+    name: 'testSecret',
     version: '0.0.1',
     labels: {},
-    contentArg: '{"hi": "wow"}'
+    contentArg: '{"hi": "wow"}',
   });
   const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
-    imageUrl: 'nginx:latest'
+    creationObject: {
+      imageUrl: 'code.foss.global/host.today/ht-docker-node:latest',
+    }
   });
   const testService = await docker.DockerService.createService(testDockerHost, {
     image: testImage,
-    labels: {
+    labels: {},
-      testlabel: 'hi'
-    },
     name: 'testService',
     networks: [testNetwork],
     networkAlias: 'testService',
     secrets: [testSecret],
-    ports: []
+    ports: ['3000:80'],
   });
 
   await testService.remove();
@@ -112,4 +119,38 @@ tap.test('should create a service', async () => {
   await testSecret.remove();
 });
 
-tap.start();
+tap.skip.test('should export images', async (toolsArg) => {
+  const done = toolsArg.defer();
+  const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
+    creationObject: {
+      imageUrl: 'code.foss.global/host.today/ht-docker-node:latest',
+    }
+  });
+  const fsWriteStream = plugins.smartfile.fsStream.createWriteStream(
+    plugins.path.join(paths.nogitDir, 'testimage.tar')
+  );
+  const exportStream = await testImage.exportToTarStream();
+  exportStream.pipe(fsWriteStream).on('finish', () => {
+    done.resolve();
+  });
+  await done.promise;
+});
+
+tap.skip.test('should import images', async (toolsArg) => {
+  const done = toolsArg.defer();
+  const fsReadStream = plugins.smartfile.fsStream.createReadStream(
+    plugins.path.join(paths.nogitDir, 'testimage.tar')
+  );
+  await docker.DockerImage.createFromTarStream(testDockerHost, {
+    tarStream: fsReadStream,
+    creationObject: {
+      imageUrl: 'code.foss.global/host.today/ht-docker-node:latest',
+    }
+  })
+});
+
+tap.test('should expose a working DockerImageStore', async () => {
+  await testDockerHost.imageStore.storeImage('hello', plugins.smartfile.fsStream.createReadStream(plugins.path.join(paths.nogitDir, 'testimage.tar')));
+})
+
+export default tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@apiclient.xyz/docker',
+  version: '1.2.0',
+  description: 'Provides easy communication with Docker remote API from Node.js, with TypeScript support.'
+}

ts/classes.container.ts

@@ -1,7 +1,8 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './classes.host.js';
+import { logger } from './logger.js';
 
 export class DockerContainer {
   // STATIC
@@ -37,22 +38,19 @@ export class DockerContainer {
   ) {
     // check for unique hostname
     const existingContainers = await DockerContainer.getContainers(dockerHost);
-    const sameHostNameContainer = existingContainers.find(container => {
+    const sameHostNameContainer = existingContainers.find((container) => {
       // TODO implement HostName Detection;
       return false;
     });
     const response = await dockerHost.request('POST', '/containers/create', {
       Hostname: containerCreationDescriptor.Hostname,
       Domainname: containerCreationDescriptor.Domainname,
-      User: 'root'
+      User: 'root',
     });
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log('info', 'Container created successfully');
+      logger.log('info', 'Container created successfully');
     } else {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('error', 'There has been a problem when creating the container');
-        'error',
-        'There has been a problem when creating the container'
-      );
     }
   }
 
@@ -94,7 +92,7 @@ export class DockerContainer {
   public Mounts: any;
   constructor(dockerHostArg: DockerHost, dockerContainerObjectArg: any) {
     this.dockerHost = dockerHostArg;
-    Object.keys(dockerContainerObjectArg).forEach(keyArg => {
+    Object.keys(dockerContainerObjectArg).forEach((keyArg) => {
       this[keyArg] = dockerContainerObjectArg[keyArg];
     });
   }

ts/classes.host.ts

@@ -1,7 +1,12 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import { DockerContainer } from './docker.classes.container';
+import * as paths from './paths.js';
-import { DockerNetwork } from './docker.classes.network';
+import { DockerContainer } from './classes.container.js';
-import { DockerService } from './docker.classes.service';
+import { DockerNetwork } from './classes.network.js';
+import { DockerService } from './classes.service.js';
+import { logger } from './logger.js';
+import path from 'path';
+import { DockerImageStore } from './classes.imagestore.js';
+import { DockerImage } from './classes.image.js';
 
 export interface IAuthData {
   serveraddress: string;
@@ -9,27 +14,61 @@ export interface IAuthData {
   password: string;
 }
 
+export interface IDockerHostConstructorOptions {
+  dockerSockPath?: string;
+  imageStoreDir?: string;
+}
+
 export class DockerHost {
+  public options: IDockerHostConstructorOptions;
+
   /**
    * the path where the docker sock can be found
    */
   public socketPath: string;
   private registryToken: string = '';
+  public imageStore: DockerImageStore;
 
   /**
    * the constructor to instantiate a new docker sock instance
    * @param pathArg
    */
-  constructor(pathArg?: string) {
+  constructor(optionsArg: IDockerHostConstructorOptions) {
+    this.options = {
+      ...{
+        imageStoreDir: plugins.path.join(paths.nogitDir, 'temp-docker-image-store'),
+      },
+      ...optionsArg,
+    }
     let pathToUse: string;
-    if (pathArg) {
+    if (optionsArg.dockerSockPath) {
-      pathToUse = pathArg;
+      pathToUse = optionsArg.dockerSockPath;
+    } else if (process.env.DOCKER_HOST) {
+      pathToUse = process.env.DOCKER_HOST;
     } else if (process.env.CI) {
       pathToUse = 'http://docker:2375/';
     } else {
       pathToUse = 'http://unix:/var/run/docker.sock:';
     }
+    if (pathToUse.startsWith('unix:///')) {
+      pathToUse = pathToUse.replace('unix://', 'http://unix:');
+    }
+    if (pathToUse.endsWith('.sock')) {
+      pathToUse = pathToUse.replace('.sock', '.sock:');
+    }
+    console.log(`using docker sock at ${pathToUse}`);
     this.socketPath = pathToUse;
+    this.imageStore = new DockerImageStore(this, {
+      bucketDir: null,
+      localDirPath: this.options.imageStoreDir,
+    })
+  }
+
+  public async start() {
+    await this.imageStore.start();
+  }
+  public async stop() {
+    await this.imageStore.stop();
   }
 
   /**
@@ -44,27 +83,28 @@ export class DockerHost {
       throw new Error(response.body.Status);
     }
     console.log(response.body.Status);
-    this.registryToken = plugins.smartstring.base64.encode(
+    this.registryToken = plugins.smartstring.base64.encode(plugins.smartjson.stringify(authData));
-      plugins.smartjson.Smartjson.stringify(authData, {})
-    );
   }
 
   /**
    * gets the token from the .docker/config.json file for GitLab registry
    */
-  public async getGitlabComTokenFromDockerConfig() {
+  public async getAuthTokenFromDockerConfig(registryUrlArg: string) {
     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 gitlabAuthBase64 = configObject.auths[registryUrlArg].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'
+      serveraddress: registryUrlArg,
     });
   }
 
+  // ==============
+  // NETWORKS
+  // ==============
   /**
    * gets all networks
    */
@@ -73,9 +113,23 @@ export class DockerHost {
   }
 
   /**
-   *
+   * create a network
    */
+  public async createNetwork(optionsArg: Parameters<typeof DockerNetwork.createNetwork>[1]) {
+    return await DockerNetwork.createNetwork(this, optionsArg);
+  }
 
+  /**
+   * get a network by name
+   */
+  public async getNetworkByName(networkNameArg: string) {
+    return await DockerNetwork.getNetworkByName(this, networkNameArg);
+  }
+
+
+  // ==============
+  // CONTAINERS
+  // ==============
   /**
    * gets all containers
    */
@@ -84,6 +138,10 @@ export class DockerHost {
     return containerArray;
   }
 
+  // ==============
+  // SERVICES
+  // ==============
+
   /**
    * gets all services
    */
@@ -92,13 +150,31 @@ export class DockerHost {
     return serviceArray;
   }
 
+  // ==============
+  // IMAGES
+  // ==============
+
+  /**
+   * get all images
+   */
+  public async getImages() {
+    return await DockerImage.getImages(this);
+  }
+
+  /**
+   * get an image by name
+   */
+  public async getImageByName(imageNameArg: string) {
+    return await DockerImage.getImageByName(this, imageNameArg);
+  }
+
   /**
    *
    */
   public async getEventObservable(): Promise<plugins.rxjs.Observable<any>> {
     const response = await this.requestStreaming('GET', '/events');
-    return plugins.rxjs.Observable.create(observer => {
+    return plugins.rxjs.Observable.create((observer) => {
-      response.on('data', data => {
+      response.on('data', (data) => {
         const eventString = data.toString();
         try {
           const eventObject = JSON.parse(eventString);
@@ -135,12 +211,12 @@ export class DockerHost {
       DataPathPort: 4789,
       DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'],
       SubnetSize: 24,
-      ForceNewCluster: false
+      ForceNewCluster: false,
     });
     if (response.statusCode === 200) {
-      plugins.smartlog.defaultLogger.log('info', 'created Swam succesfully');
+      logger.log('info', 'created Swam succesfully');
     } else {
-      plugins.smartlog.defaultLogger.log('error', 'could not initiate swarm');
+      logger.log('error', 'could not initiate swarm');
     }
   }
 
@@ -154,10 +230,10 @@ export class DockerHost {
       headers: {
         'Content-Type': 'application/json',
         'X-Registry-Auth': this.registryToken,
-        Host: 'docker.sock'
+        Host: 'docker.sock',
       },
       requestBody: dataArg,
-      keepAlive: false
+      keepAlive: false,
     });
     if (response.statusCode !== 200) {
       console.log(response.body);
@@ -165,7 +241,7 @@ export class DockerHost {
     return response;
   }
 
-  public async requestStreaming(methodArg: string, routeArg: string, dataArg = {}) {
+  public async requestStreaming(methodArg: string, routeArg: string, readStream?: plugins.smartstream.stream.Readable) {
     const requestUrl = `${this.socketPath}${routeArg}`;
     const response = await plugins.smartrequest.request(
       requestUrl,
@@ -174,12 +250,25 @@ export class DockerHost {
         headers: {
           'Content-Type': 'application/json',
           'X-Registry-Auth': this.registryToken,
-          Host: 'docker.sock'
+          Host: 'docker.sock',
         },
         requestBody: null,
-        keepAlive: false
+        keepAlive: false,
       },
-      true
+      true,
+      (readStream ? reqArg => {
+        let counter = 0;
+        const smartduplex = new plugins.smartstream.SmartDuplex({
+          writeFunction: async (chunkArg) => {
+            if (counter % 1000 === 0) {
+              console.log(`posting chunk ${counter}`);
+            }
+            counter++;
+            return chunkArg;
+          }
+        });
+        readStream.pipe(smartduplex).pipe(reqArg);
+      } : null),
     );
     console.log(response.statusCode);
     console.log(response.body);

ts/classes.image.ts

@@ -1,7 +1,11 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './classes.host.js';
+import { logger } from './logger.js';
 
+/**
+ * represents a docker image on the remote docker host
+ */
 export class DockerImage {
   // STATIC
   public static async getImages(dockerHost: DockerHost) {
@@ -13,9 +17,9 @@ export class DockerImage {
     return images;
   }
 
-  public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
+  public static async getImageByName(dockerHost: DockerHost, imageNameArg: string) {
     const images = await this.getImages(dockerHost);
-    const result = images.find(image => {
+    const result = images.find((image) => {
       if (image.RepoTags) {
         return image.RepoTags.includes(imageNameArg);
       } else {
@@ -27,7 +31,9 @@ export class DockerImage {
 
   public static async createFromRegistry(
     dockerHostArg: DockerHost,
-    creationObject: interfaces.IImageCreationDescriptor
+    optionsArg: {
+      creationObject: interfaces.IImageCreationDescriptor
+    }
   ): Promise<DockerImage> {
     // lets create a sanatized imageUrlObject
     const imageUrlObject: {
@@ -35,9 +41,9 @@ export class DockerImage {
       imageTag: string;
       imageOriginTag: string;
     } = {
-      imageUrl: creationObject.imageUrl,
+      imageUrl: optionsArg.creationObject.imageUrl,
-      imageTag: creationObject.imageTag,
+      imageTag: optionsArg.creationObject.imageTag,
-      imageOriginTag: null
+      imageOriginTag: null,
     };
     if (imageUrlObject.imageUrl.includes(':')) {
       const imageUrl = imageUrlObject.imageUrl.split(':')[0];
@@ -63,17 +69,27 @@ export class DockerImage {
       )}&tag=${encodeURIComponent(imageUrlObject.imageTag)}`
     );
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('info', `Successfully pulled image ${imageUrlObject.imageUrl} from the registry`);
-        'info',
+      const image = await DockerImage.getImageByName(dockerHostArg, imageUrlObject.imageOriginTag);
-        `Successfully pulled image ${imageUrlObject.imageUrl} from the registry`
-      );
-      const image = await DockerImage.findImageByName(dockerHostArg, imageUrlObject.imageOriginTag);
       return image;
     } else {
-      plugins.smartlog.defaultLogger.log('error', `Failed at the attempt of creating a new image`);
+      logger.log('error', `Failed at the attempt of creating a new image`);
     }
   }
 
+  /**
+   * 
+   * @param dockerHostArg
+   * @param tarStreamArg
+   */
+  public static async createFromTarStream(dockerHostArg: DockerHost, optionsArg: {
+    creationObject: interfaces.IImageCreationDescriptor,
+    tarStream: plugins.smartstream.stream.Readable,
+  }) {
+    const response = await dockerHostArg.requestStreaming('POST', '/images/load', optionsArg.tarStream);
+    return response;
+  }
+
   public static async tagImageByIdOrName(
     dockerHost: DockerHost,
     idOrNameArg: string,
@@ -110,7 +126,7 @@ export class DockerImage {
 
   constructor(dockerHostArg, dockerImageObjectArg: any) {
     this.dockerHost = dockerHostArg;
-    Object.keys(dockerImageObjectArg).forEach(keyArg => {
+    Object.keys(dockerImageObjectArg).forEach((keyArg) => {
       this[keyArg] = dockerImageObjectArg[keyArg];
     });
   }
@@ -128,7 +144,9 @@ export class DockerImage {
    */
   public async pullLatestImageFromRegistry(): Promise<boolean> {
     const updatedImage = await DockerImage.createFromRegistry(this.dockerHost, {
-      imageUrl: this.RepoTags[0]
+      creationObject: {
+        imageUrl: this.RepoTags[0],
+      },
     });
     Object.assign(this, updatedImage);
     // TODO: Compare image digists before and after
@@ -137,6 +155,39 @@ export class DockerImage {
 
   // get stuff
   public async getVersion() {
-    return this.Labels.version;
+    if (this.Labels && this.Labels.version) {
+      return this.Labels.version;
+    } else {
+      return '0.0.0';
+    }
+  }
+
+  /**
+   * exports an image to a tar ball
+   */
+  public async exportToTarStream(): Promise<plugins.smartstream.stream.Readable> {
+    console.log(`Exporting image ${this.RepoTags[0]} to tar stream.`);
+    const response = await this.dockerHost.requestStreaming('GET', `/images/${encodeURIComponent(this.RepoTags[0])}/get`);
+    let counter = 0;
+    const webduplexStream = new plugins.smartstream.SmartDuplex({
+      writeFunction: async (chunk, tools) => {
+        if (counter % 1000 === 0)
+          console.log(`Got chunk: ${counter}`);
+        counter++;
+        return chunk;
+      }
+    });
+    response.on('data', (chunk) => {
+      if (!webduplexStream.write(chunk)) {
+        response.pause();
+        webduplexStream.once('drain', () => {
+          response.resume();
+        })
+      };
+    });
+    response.on('end', () => {
+      webduplexStream.end();
+    })
+    return webduplexStream;
   }
 }

ts/classes.imagestore.ts

@@ -0,0 +1,108 @@
+import * as plugins from './plugins.js';
+import * as paths from './paths.js';
+import { logger } from './logger.js';
+import type { DockerHost } from './classes.host.js';
+
+export interface IDockerImageStoreConstructorOptions {
+  /**
+   * used for preparing images for longer term storage
+   */
+  localDirPath: string;
+  /**
+   * a smartbucket dir for longer term storage.
+   */
+  bucketDir: plugins.smartbucket.Directory;
+}
+
+export class DockerImageStore {
+  public options: IDockerImageStoreConstructorOptions;
+
+  constructor(dockerHost: DockerHost, optionsArg: IDockerImageStoreConstructorOptions) {
+    this.options = optionsArg;
+  }
+
+  // Method to store tar stream
+  public async storeImage(imageName: string, tarStream: plugins.smartstream.stream.Readable): Promise<void> {
+    logger.log('info', `Storing image ${imageName}...`);
+    const uniqueProcessingId = plugins.smartunique.shortId();
+
+    const initialTarDownloadPath = plugins.path.join(this.options.localDirPath, `${uniqueProcessingId}.tar`);
+    const extractionDir = plugins.path.join(this.options.localDirPath, uniqueProcessingId);
+    // Create a write stream to store the tar file
+    const writeStream = plugins.smartfile.fsStream.createWriteStream(initialTarDownloadPath);
+
+    // lets wait for the write stream to finish
+    await new Promise((resolve, reject) => {
+      tarStream.pipe(writeStream);
+      writeStream.on('finish', resolve);
+      writeStream.on('error', reject);
+    });
+    logger.log('info', `Image ${imageName} stored locally for processing. Extracting...`);
+
+    // lets process the image
+    const tarArchive = await plugins.smartarchive.SmartArchive.fromArchiveFile(initialTarDownloadPath);
+    await tarArchive.exportToFs(extractionDir);
+    logger.log('info', `Image ${imageName} extracted.`);
+    await plugins.smartfile.fs.remove(initialTarDownloadPath);
+    logger.log('info', `deleted original tar to save space.`);
+    logger.log('info', `now repackaging for s3...`);
+    const smartfileIndexJson = await plugins.smartfile.SmartFile.fromFilePath(plugins.path.join(extractionDir, 'index.json'));
+    const smartfileManifestJson = await plugins.smartfile.SmartFile.fromFilePath(plugins.path.join(extractionDir, 'manifest.json'));
+    const smartfileOciLayoutJson = await plugins.smartfile.SmartFile.fromFilePath(plugins.path.join(extractionDir, 'oci-layout'));
+    const smartfileRepositoriesJson = await plugins.smartfile.SmartFile.fromFilePath(plugins.path.join(extractionDir, 'repositories'));
+    const indexJson = JSON.parse(smartfileIndexJson.contents.toString());
+    const manifestJson = JSON.parse(smartfileManifestJson.contents.toString());
+    const ociLayoutJson = JSON.parse(smartfileOciLayoutJson.contents.toString());
+    const repositoriesJson = JSON.parse(smartfileRepositoriesJson.contents.toString());
+
+    indexJson.manifests[0].annotations['io.containerd.image.name'] = imageName;
+    manifestJson[0].RepoTags[0] = imageName;
+    const repoFirstKey = Object.keys(repositoriesJson)[0];
+    const repoFirstValue = repositoriesJson[repoFirstKey];
+    repositoriesJson[imageName] = repoFirstValue;
+    delete repositoriesJson[repoFirstKey];
+
+    smartfileIndexJson.contents = Buffer.from(JSON.stringify(indexJson, null, 2));
+    smartfileManifestJson.contents = Buffer.from(JSON.stringify(manifestJson, null, 2));
+    smartfileOciLayoutJson.contents = Buffer.from(JSON.stringify(ociLayoutJson, null, 2));
+    smartfileRepositoriesJson.contents = Buffer.from(JSON.stringify(repositoriesJson, null, 2));
+    await Promise.all([
+      smartfileIndexJson.write(),
+      smartfileManifestJson.write(),
+      smartfileOciLayoutJson.write(),
+      smartfileRepositoriesJson.write(),
+    ]);
+
+    logger.log('info', 'repackaging archive for s3...');
+    const tartools = new plugins.smartarchive.TarTools();
+    const newTarPack = await tartools.packDirectory(extractionDir);
+    const finalTarName = `${uniqueProcessingId}.processed.tar`;
+    const finalTarPath = plugins.path.join(this.options.localDirPath, finalTarName);
+    const finalWriteStream = plugins.smartfile.fsStream.createWriteStream(finalTarPath);
+    await new Promise((resolve, reject) => {
+      newTarPack.finalize();
+      newTarPack.pipe(finalWriteStream);
+      finalWriteStream.on('finish', resolve);
+      finalWriteStream.on('error', reject);
+    });
+    logger.log('ok', `Repackaged image ${imageName} for s3.`);
+    await plugins.smartfile.fs.remove(extractionDir);
+  }
+
+  public async start() {
+    await plugins.smartfile.fs.ensureEmptyDir(this.options.localDirPath);
+  }
+
+  public async stop() {}
+
+  // Method to retrieve tar stream
+  public async getImage(imageName: string): Promise<plugins.smartstream.stream.Readable> {
+    const imagePath = plugins.path.join(this.options.localDirPath, `${imageName}.tar`);
+
+    if (!(await plugins.smartfile.fs.fileExists(imagePath))) {
+      throw new Error(`Image ${imageName} does not exist.`);
+    }
+
+    return plugins.smartfile.fsStream.createReadStream(imagePath);
+  }
+}

ts/classes.network.ts

@@ -1,7 +1,9 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './classes.host.js';
+import { DockerService } from './classes.service.js';
+import { logger } from './logger.js';
 
 export class DockerNetwork {
   public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> {
@@ -17,7 +19,7 @@ export class DockerNetwork {
 
   public static async getNetworkByName(dockerHost: DockerHost, dockerNetworkNameArg: string) {
     const networks = await DockerNetwork.getNetworks(dockerHost);
-    return networks.find(dockerNetwork => dockerNetwork.Name === dockerNetworkNameArg);
+    return networks.find((dockerNetwork) => dockerNetwork.Name === dockerNetworkNameArg);
   }
 
   public static async createNetwork(
@@ -29,28 +31,25 @@ export class DockerNetwork {
       CheckDuplicate: true,
       Driver: 'overlay',
       EnableIPv6: false,
-      IPAM: {
+      /* IPAM: {
         Driver: 'default',
         Config: [
           {
-            Subnet: '172.20.10.0/16',
+            Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`,
-            IPRange: '172.20.10.0/24',
+            IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`,
-            Gateway: '172.20.10.11'
+            Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11`
           }
         ]
-      },
+      }, */
-      Internal: true,
+      Internal: false,
       Attachable: true,
-      Ingress: false
+      Ingress: false,
     });
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log('info', 'Created network successfully');
+      logger.log('info', 'Created network successfully');
       return await DockerNetwork.getNetworkByName(dockerHost, networkCreationDescriptor.Name);
     } else {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('error', 'There has been an error creating the wanted network');
-        'error',
-        'There has been an error creating the wanted network'
-      );
       return null;
     }
   }
@@ -90,4 +89,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/classes.secret.ts

@@ -1,8 +1,8 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './classes.host.js';
 
 // interfaces
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class DockerSecret {
   // STATIC
@@ -19,12 +19,12 @@ export class DockerSecret {
 
   public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) {
     const secrets = await this.getSecrets(dockerHostArg);
-    return secrets.find(secret => secret.ID === idArg);
+    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);
+    return secrets.find((secret) => secret.Spec.Name === nameArg);
   }
 
   public static async createSecret(
@@ -33,12 +33,12 @@ export class DockerSecret {
   ) {
     const labels: interfaces.TLabels = {
       ...secretDescriptor.labels,
-      version: secretDescriptor.version
+      version: secretDescriptor.version,
     };
     const response = await dockerHostArg.request('POST', '/secrets/create', {
       Name: secretDescriptor.name,
       Labels: labels,
-      Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg)
+      Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg),
     });
 
     const newSecretInstance = new DockerSecret(dockerHostArg);
@@ -76,7 +76,7 @@ export class DockerSecret {
       {
         Name: this.Spec.Name,
         Labels: this.Spec.Labels,
-        Data: plugins.smartstring.base64.encode(contentArg)
+        Data: plugins.smartstring.base64.encode(contentArg),
       }
     );
   }

ts/classes.service.ts

@@ -1,9 +1,10 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './classes.host.js';
-import { DockerImage } from './docker.classes.image';
+import { DockerImage } from './classes.image.js';
-import { DockerSecret } from './docker.classes.secret';
+import { DockerSecret } from './classes.secret.js';
+import { logger } from './logger.js';
 
 export class DockerService {
   // STATIC
@@ -23,7 +24,7 @@ export class DockerService {
     networkName: string
   ): Promise<DockerService> {
     const allServices = await DockerService.getServices(dockerHost);
-    const wantedService = allServices.find(service => {
+    const wantedService = allServices.find((service) => {
       return service.Spec.Name === networkName;
     });
     return wantedService;
@@ -37,17 +38,14 @@ export class DockerService {
     serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
   ): Promise<DockerService> {
     // lets get the image
-    plugins.smartlog.defaultLogger.log(
+    logger.log('info', `now creating service ${serviceCreationDescriptor.name}`);
-      'info',
-      `now creating service ${serviceCreationDescriptor.name}`
-    );
 
     // await serviceCreationDescriptor.image.pullLatestImageFromRegistry();
     const serviceVersion = await serviceCreationDescriptor.image.getVersion();
 
     const labels: interfaces.TLabels = {
       ...serviceCreationDescriptor.labels,
-      version: serviceVersion
+      version: serviceVersion,
     };
 
     const mounts: Array<{
@@ -69,10 +67,22 @@ export class DockerService {
         Source: '/var/run/docker.sock',
         Consistency: 'default',
         ReadOnly: false,
-        Type: 'bind'
+        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[];
@@ -81,7 +91,7 @@ export class DockerService {
     for (const network of serviceCreationDescriptor.networks) {
       networkArray.push({
         Target: network.Name,
-        Aliases: [serviceCreationDescriptor.networkAlias]
+        Aliases: [serviceCreationDescriptor.networkAlias],
       });
     }
 
@@ -92,8 +102,8 @@ export class DockerService {
       const containerPort = portArray[1];
       ports.push({
         Protocol: 'tcp',
-        PublishedPort: parseInt(containerPort, 10),
+        PublishedPort: parseInt(hostPort, 10),
-        TargetPort: parseInt(hostPort, 10)
+        TargetPort: parseInt(containerPort, 10),
       });
     }
 
@@ -105,16 +115,22 @@ export class DockerService {
           Name: 'secret.json', // TODO: make sure that works with multiple secrets
           UID: '33',
           GID: '33',
-          Mode: 384
+          Mode: 384,
         },
         SecretID: secret.ID,
-        SecretName: secret.Spec.Name
+        SecretName: secret.Spec.Name,
       });
     }
 
     // lets configure limits
+
+    const memoryLimitMB =
+      serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.memorySizeMB
+        ? serviceCreationDescriptor.resources.memorySizeMB
+        : 1000;
+
     const limits = {
-      MemoryBytes: 1000 * 1000000
+      MemoryBytes: memoryLimitMB * 1000000,
     };
 
     if (serviceCreationDescriptor.resources) {
@@ -128,25 +144,35 @@ export class DockerService {
           Image: serviceCreationDescriptor.image.RepoTags[0],
           Labels: labels,
           Secrets: secretArray,
-          Mounts: mounts
+          Mounts: mounts,
+          /* DNSConfig: {
+            Nameservers: ['1.1.1.1']
+          } */
         },
         UpdateConfig: {
           Parallelism: 0,
           Delay: 0,
           FailureAction: 'pause',
           Monitor: 15000000000,
-          MaxFailureRatio: 0.15
+          MaxFailureRatio: 0.15,
         },
         ForceUpdate: 1,
         Resources: {
-          Limits: limits
+          Limits: limits,
-        }
+        },
+        LogDriver: {
+          Name: 'json-file',
+          Options: {
+            'max-file': '3',
+            'max-size': '10M',
+          },
+        },
       },
       Labels: labels,
       Networks: networkArray,
       EndpointSpec: {
-        Ports: ports
+        Ports: ports,
-      }
+      },
     });
 
     const createdService = await DockerService.getServiceByName(
@@ -206,7 +232,9 @@ export class DockerService {
 
     await this.reReadFromDockerEngine();
     const dockerImage = await DockerImage.createFromRegistry(this.dockerHostRef, {
-      imageUrl: this.Spec.TaskTemplate.ContainerSpec.Image
+      creationObject: {
+        imageUrl: this.Spec.TaskTemplate.ContainerSpec.Image,
+      }
     });
 
     const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);

ts/docker.plugins.ts

@@ -1,36 +0,0 @@
-// 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,
-  smartfile,
-  smartjson,
-  smartlog,
-  smartnetwork,
-  smartpath,
-  smartpromise,
-  smartrequest,
-  smartstring,
-  smartversion
-};
-
-// third party
-import * as rxjs from 'rxjs';
-
-export { rxjs };

ts/index.ts

@@ -1,6 +1,7 @@
-export * from './docker.classes.host';
+export * from './classes.host.js';
-export * from './docker.classes.container';
+export * from './classes.container.js';
-export * from './docker.classes.image';
+export * from './classes.image.js';
-export * from './docker.classes.network';
+export * from './classes.imagestore.js';
-export * from './docker.classes.secret';
+export * from './classes.network.js';
-export * from './docker.classes.service';
+export * from './classes.secret.js';
+export * from './classes.service.js';

ts/interfaces/container.ts

@@ -1,4 +1,4 @@
-import { DockerNetwork } from '../docker.classes.network';
+import { DockerNetwork } from '../classes.network.js';
 
 export interface IContainerCreationDescriptor {
   Hostname: string;

ts/interfaces/index.ts

@@ -1,7 +1,7 @@
-export * from './container';
+export * from './container.js';
-export * from './image';
+export * from './image.js';
-export * from './label';
+export * from './label.js';
-export * from './network';
+export * from './network.js';
-export * from './port';
+export * from './port.js';
-export * from './secret';
+export * from './secret.js';
-export * from './service';
+export * from './service.js';

ts/interfaces/secret.ts

@@ -1,4 +1,4 @@
-import * as interfaces from './';
+import * as interfaces from './index.js';
 
 export interface ISecretCreationDescriptor {
   name: string;

ts/interfaces/service.ts

@@ -1,7 +1,9 @@
-import * as interfaces from './';
+import * as plugins from '../plugins.js';
-import { DockerNetwork } from '../docker.classes.network';
+
-import { DockerSecret } from '../docker.classes.secret';
+import * as interfaces from './index.js';
-import { DockerImage } from '../docker.classes.image';
+import { DockerNetwork } from '../classes.network.js';
+import { DockerSecret } from '../classes.secret.js';
+import { DockerImage } from '../classes.image.js';
 
 export interface IServiceCreationDescriptor {
   name: string;
@@ -13,6 +15,7 @@ export interface IServiceCreationDescriptor {
   ports: string[];
   accessHostDockerSock?: boolean;
   resources?: {
-    memorySizeMB: number
+    memorySizeMB?: number;
+    volumeMounts?: plugins.tsclass.container.IVolumeMount[];
   };
 }

ts/logger.ts

@@ -0,0 +1,5 @@
+import * as plugins from './plugins.js';
+import { commitinfo } from './00_commitinfo_data.js';
+
+export const logger = plugins.smartlog.Smartlog.createForCommitinfo(commitinfo);
+logger.enableConsole();

ts/paths.ts

@@ -0,0 +1,9 @@
+import * as plugins from './plugins.js';
+
+export const packageDir = plugins.path.resolve(
+  plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
+  '../'
+);
+
+export const nogitDir = plugins.path.resolve(packageDir, '.nogit/');
+plugins.smartfile.fs.ensureDir(nogitDir);

ts/plugins.ts

@@ -0,0 +1,47 @@
+// node native path
+import * as path from 'path';
+
+export { path };
+
+// @pushrocks scope
+import * as lik from '@push.rocks/lik';
+import * as smartarchive from '@push.rocks/smartarchive';
+import * as smartbucket from '@push.rocks/smartbucket';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smartjson from '@push.rocks/smartjson';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartnetwork from '@push.rocks/smartnetwork';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartstring from '@push.rocks/smartstring';
+import * as smartstream from '@push.rocks/smartstream';
+import * as smartunique from '@push.rocks/smartunique';
+import * as smartversion from '@push.rocks/smartversion';
+
+export {
+  lik,
+  smartarchive,
+  smartbucket,
+  smartfile,
+  smartjson,
+  smartlog,
+  smartnetwork,
+  smartpath,
+  smartpromise,
+  smartrequest,
+  smartstring,
+  smartstream,
+  smartunique,
+  smartversion,
+};
+
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };
+
+// third party
+import * as rxjs from 'rxjs';
+
+export { rxjs };

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}