presidium 0.15.32 → 0.15.36

package/.github/workflows/nodejs.yml

@@ -14,24 +14,63 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    services:
+      dynamo:
+        image: amazon/dynamodb-local:1.15.0
+        ports:
+          - 8000:8000
+
+      registry:
+        image: registry:2.7
+        ports:
+          - 5000:5000
+        options: >-
+          --restart always
+          --name registry
+
+      mongo:
+        image: mongo:4.0.6
+        ports:
+          - 27017:27017
+
+      redis:
+        image: redis:6.0.9
+        ports:
+          - 6379:6379
+
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.9.3
+        ports:
+          - 9200:9200
+        options: >-
+          -m "512m"
+          -e "discovery.type=single-node"
+          -e "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+
+      gremlin:
+        image: tinkerpop/gremlin-server:3.4.4
+        ports:
+          - 8182:8182
+
+      minio:
+        image: minio/minio:edge-cicd
+        ports:
+          - 9000:9000
+        options: >-
+          -e "MINIO_ACCESS_KEY=minioadmin"
+          -e "MINIO_SECRET_KEY=minioadmin"
+
+      kinesis:
+        image: saidsef/aws-kinesis-local:latest
+        ports:
+          - 4567:4567
+
     strategy:
       matrix:
-        node-version: [14.x, 15.x, 16.x]
+        node-version: [14.x, 15.x, 16.x, 17.x]
 
     steps:
     - uses: actions/checkout@v2
-    - name: Run containers
-      run:
-        docker run -p 8000:8000 -d amazon/dynamodb-local:1.13.5
-        && docker run -p 5000:5000 -d --restart always --name registry registry:2.7
-        && docker run -p 27017:27017 -d mongo:4.0.6-xenial
-        && docker run -p 6379:6379 -d redis:6.0.9
-        && docker run -p 9200:9200 -d -m "512m" -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms256m -Xmx256m" docker.elastic.co/elasticsearch/elasticsearch:7.1.0
-        && docker run -p 8182:8182 -d tinkerpop/gremlin-server:3.4.4
-        && docker run -p 9000:9000 -d -e "MINIO_ACCESS_KEY=minioadmin" -e "MINIO_SECRET_KEY=minioadmin" minio/minio:edge-cicd server /data
-        && docker run -p 4567:4567 -d saidsef/aws-kinesis-local:latest
-        && docker pull node:15-alpine
-
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1

package/Docker.js

@@ -863,6 +863,7 @@ Docker.prototype.createService = function dockerCreateService(service, options)
         },
       },
 
+      // TODO options.mode global
       Mode: {
         Replicated: { Replicas: options.replicas ?? 1 }
       },
@@ -1135,6 +1136,18 @@ Docker.prototype.updateService = function dockerUpdateService(service, options)
   })
 }
 
+/**
+ * @name Docker.prototype.deleteService
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * new Docker().deleteService(id string) -> Promise<HttpResponse>
+ * ```
+ */
+Docker.prototype.deleteService = function deleteService(id) {
+  return this.http.delete(`/services/${id}`)
+}
+
 /**
  * @name Docker.prototype.listServices
  *
@@ -1188,6 +1201,23 @@ Docker.prototype.getServiceLogs = async function getServiceLogs(serviceId, optio
   }`)
 }
 
+/**
+ * @name Docker.prototype.listTasks
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * new Docker().listTasks(options {
+ *   service?: string,
+ *   node?: string,
+ * }) -> Promise<HttpResponse>
+ * ```
+ */
+Docker.prototype.listTasks = async function listTasks(options) {
+  return this.http.get(`/tasks?${
+    querystring.stringify(pick(['service', 'node'])(options))
+  }`)
+}
+
 /**
  * @name Docker.prototype.pruneImages
  *

package/Docker.test.js

@@ -15,372 +15,401 @@ const {
   curry, __,
 } = rubico
 
-module.exports = [
+const test = Test.all([
   Test('Docker - prune', Docker)
-    .case(async docker => {
-      {
-        const response = await docker.pruneContainers()
-        assert.equal(response.status, 200)
-      }
-      {
-        const response = await docker.pruneVolumes()
-        assert.equal(response.status, 200)
-      }
-      {
-        const response = await docker.pruneImages()
-        assert.equal(response.status, 200)
-      }
-      {
-        const response = await docker.pruneNetworks()
-        assert.equal(response.status, 200)
-      }
-    }),
+  .case(async docker => {
+    {
+      const response = await docker.pruneContainers()
+      assert.equal(response.status, 200)
+    }
+    {
+      const response = await docker.pruneVolumes()
+      assert.equal(response.status, 200)
+    }
+    {
+      const response = await docker.pruneImages()
+      assert.equal(response.status, 200)
+    }
+    {
+      const response = await docker.pruneNetworks()
+      assert.equal(response.status, 200)
+    }
+  }),
 
   Test('Docker - auth', Docker)
-    .case(async docker => {
-      const response = await docker.auth({
-        username: 'admin',
-        password: 'password',
-        email: 'hey@example.com',
-        serveraddress: 'localhost:5000',
-      })
-      assert.equal(response.status, 200)
-      const body = await pipe([
-        reduce((a, b) => a + b, ''),
-        JSON.parse,
-      ])(response.body)
-      this.identitytoken = get('IdentityToken')(body)
-      assert.equal(this.identitytoken, '')
-    }),
+  .case(async docker => {
+    const response = await docker.auth({
+      username: 'admin',
+      password: 'password',
+      email: 'hey@example.com',
+      serveraddress: 'localhost:5000',
+    })
+    assert.equal(response.status, 200)
+    const body = await pipe([
+      reduce((a, b) => a + b, ''),
+      JSON.parse,
+    ])(response.body)
+    this.identitytoken = get('IdentityToken')(body)
+    assert.equal(this.identitytoken, '')
+  }),
 
   Test('Docker - image', Docker)
-    .case(async function (docker) {
-      {
-        const response = await docker.buildImage('presidium-test:ayo', pathResolve(__dirname), {
-          archive: {
-            Dockerfile: `
-  FROM node:15-alpine
-  WORKDIR /opt
-  COPY . .
-  EXPOSE 8888`,
-          },
-          platform: 'linux/x86_64',
-        })
-        assert.equal(response.status, 200)
-        response.body.pipe(process.stdout)
-        await new Promise(resolve => {
-          response.body.on('end', resolve)
-        })
-      }
-      {
-        const response = await docker.listImages()
-        assert.equal(response.status, 200)
-        const body = await response.json()
-        assert(body.length > 1)
-        this.initialBodyLength = body.length
-      }
-      {
-        const response = await docker.tagImage('presidium-test:ayo', {
-          tag: 'ayo',
-          repo: 'localhost:5000/presidium-test',
-        })
-        response.body.pipe(process.stdout)
-        await new Promise(resolve => {
-          response.body.on('end', resolve)
-        })
-      }
-      {
-        const response = await docker.pushImage('presidium-test:ayo', 'localhost:5000', {
-          identitytoken: this.identitytoken,
-        })
-        response.body.pipe(process.stdout)
-        await new Promise(resolve => {
-          response.body.on('end', resolve)
-        })
-      }
-      {
-        const response = await docker.inspectImage('localhost:5000/presidium-test:ayo')
-        assert.equal(response.status, 200)
-      }
-      {
-        const responses = await Promise.all([
-          docker.removeImage('presidium-test:ayo'),
-          docker.removeImage('localhost:5000/presidium-test:ayo'),
-        ])
-        for (const response of responses) {
-          const response = await docker.removeImage('presidium-test:ayo')
-          assert(response.status == 200 || response.status == 404)
-        }
+  .case(async function (docker) {
+    {
+      const response = await docker.buildImage('presidium-test:ayo', pathResolve(__dirname), {
+        archive: {
+          Dockerfile: `
+FROM node:15-alpine
+WORKDIR /opt
+COPY . .
+EXPOSE 8888`,
+        },
+        platform: 'linux/x86_64',
+      })
+      assert.equal(response.status, 200)
+      response.body.pipe(process.stdout)
+      await new Promise(resolve => {
+        response.body.on('end', resolve)
+      })
+    }
+    {
+      const response = await docker.listImages()
+      assert.equal(response.status, 200)
+      const body = await response.json()
+      assert(body.length > 1)
+      this.initialBodyLength = body.length
+    }
+    {
+      const response = await docker.tagImage('presidium-test:ayo', {
+        tag: 'ayo',
+        repo: 'localhost:5000/presidium-test',
+      })
+      response.body.pipe(process.stdout)
+      await new Promise(resolve => {
+        response.body.on('end', resolve)
+      })
+    }
+    {
+      const response = await docker.pushImage('presidium-test:ayo', 'localhost:5000', {
+        identitytoken: this.identitytoken,
+      })
+      response.body.pipe(process.stdout)
+      await new Promise(resolve => {
+        response.body.on('end', resolve)
+      })
+    }
+    {
+      const response = await docker.inspectImage('localhost:5000/presidium-test:ayo')
+      assert.equal(response.status, 200)
+    }
+    {
+      const responses = await Promise.all([
+        docker.removeImage('presidium-test:ayo'),
+        docker.removeImage('localhost:5000/presidium-test:ayo'),
+      ])
+      for (const response of responses) {
+        const response = await docker.removeImage('presidium-test:ayo')
+        assert(response.status == 200 || response.status == 404)
       }
-    }),
+    }
+  }),
 
   Test('Docker - container', Docker)
-    .case(async function (docker) {
-      {
-        const createResponse = await docker.createContainer({
-          name: 'test-alpine-3',
-          image: 'node:15-alpine',
-          cmd: ['node', '-e', 'console.log(\'heyy\')'],
-          rm: true,
-        })
-        assert(createResponse.ok)
-        const containerId = (await createResponse.json()).Id
-        const attachResponse = await docker.attachContainer(containerId),
-          startResponse = await docker.startContainer(containerId)
-        assert(startResponse.ok)
-        assert(attachResponse.ok)
-
-        const body = await attachResponse.buffer()
-        assert.equal(body.constructor, Buffer)
-        assert.strictEqual(body[0], 1) // stdout
-        assert.strictEqual(body[1], 0) // empty
-        assert.strictEqual(body[2], 0) // empty
-        assert.strictEqual(body[3], 0) // empty
-        assert.strictEqual(body[4], 0) // SIZE1
-        assert.strictEqual(body[5], 0) // SIZE2
-        assert.strictEqual(body[6], 0) // SIZE3
-        assert.strictEqual(body[7], 5) // SIZE4
-        assert.strictEqual(body.slice(8).toString(), 'heyy\n')
-
-        this.removedContainerId = containerId
-      }
+  .case(async function (docker) {
+    {
+      const createResponse = await docker.createContainer({
+        name: 'test-alpine-3',
+        image: 'node:15-alpine',
+        cmd: ['node', '-e', 'console.log(\'heyy\')'],
+        rm: true,
+      })
+      assert(createResponse.ok)
+      const containerId = (await createResponse.json()).Id
+      const attachResponse = await docker.attachContainer(containerId),
+        startResponse = await docker.startContainer(containerId)
+      assert(startResponse.ok)
+      assert(attachResponse.ok)
 
-      {
-        const createResponse = await docker.createContainer({
-          name: 'test-alpine-1',
-          image: 'node:15-alpine',
-          cmd: ['node', '-e', 'console.log(\'hey\')'],
-          workdir: '/opt/heyo',
-          expose: [22, 8888, '8889/udp'],
-          env: { HEY: 'hey' },
-          volume: ['/opt/my-volume'],
-          mounts: [{
-            source: 'other-volume',
-            target: '/opt/other-volume',
-            readonly: true,
-          }],
-          memory: 512e6, // bytes
-          restart: 'on-failure:5',
-
-          healthCmd: ['echo', 'ok'],
-          healthInterval: 1e9,
-          healthTimeout: 30e9,
-          healthRetries: 10,
-          healthStartPeriod: 5e9,
-
-          publish: {
-            23: 22, // hostPort -> containerPort[/protocol]
-            8888: '8000/tcp',
-          },
-          logDriver: 'json-file',
-          logDriverOptions: {
-            'max-file': '10',
-            'max-size': '100m',
-          },
-        })
-        assert(createResponse.ok)
-        const containerId = (await createResponse.json()).Id
-        this.containerId = containerId
-        const attachResponse = await docker.attachContainer(containerId),
-          startResponse = await docker.startContainer(containerId)
-        assert(startResponse.ok)
-        assert(attachResponse.ok)
-
-        const body = await attachResponse.buffer()
-        assert.equal(body.constructor, Buffer)
-        assert.strictEqual(body[0], 1) // stdout
-        assert.strictEqual(body[1], 0) // empty
-        assert.strictEqual(body[2], 0) // empty
-        assert.strictEqual(body[3], 0) // empty
-        assert.strictEqual(body[4], 0) // SIZE1
-        assert.strictEqual(body[5], 0) // SIZE2
-        assert.strictEqual(body[6], 0) // SIZE3
-        assert.strictEqual(body[7], 4) // SIZE4
-        assert.strictEqual(body.slice(8).toString(), 'hey\n')
-      }
+      const body = await attachResponse.buffer()
+      assert.equal(body.constructor, Buffer)
+      assert.strictEqual(body[0], 1) // stdout
+      assert.strictEqual(body[1], 0) // empty
+      assert.strictEqual(body[2], 0) // empty
+      assert.strictEqual(body[3], 0) // empty
+      assert.strictEqual(body[4], 0) // SIZE1
+      assert.strictEqual(body[5], 0) // SIZE2
+      assert.strictEqual(body[6], 0) // SIZE3
+      assert.strictEqual(body[7], 5) // SIZE4
+      assert.strictEqual(body.slice(8).toString(), 'heyy\n')
 
-      {
-        const createResponse = await docker.createContainer({
-          name: 'test-alpine-2',
-          image: 'node:15-alpine',
-          cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey0\')).listen(2999)'],
-          rm: true,
-        })
-        assert(createResponse.ok)
-        const containerId = (await createResponse.json()).Id
-        assert((await docker.startContainer(containerId)).ok)
-        const execResponse = await docker.execContainer(containerId, ['node', '-e', 'console.log(\'heyyy\')'])
-        const body = await execResponse.buffer()
-        assert.equal(body.constructor, Buffer)
-        assert.strictEqual(body[0], 1) // stdout
-        assert.strictEqual(body[1], 0) // empty
-        assert.strictEqual(body[2], 0) // empty
-        assert.strictEqual(body[3], 0) // empty
-        assert.strictEqual(body[4], 0) // SIZE1
-        assert.strictEqual(body[5], 0) // SIZE2
-        assert.strictEqual(body[6], 0) // SIZE3
-        assert.strictEqual(body[7], 6) // SIZE4
-        assert.strictEqual(body.slice(8).toString(), 'heyyy\n')
-        await docker.stopContainer(containerId, { time: 1 })
-      }
+      this.removedContainerId = containerId
+    }
 
-      {
-        const response = await docker.inspectContainer(this.containerId)
-        assert.equal(response.status, 200)
-        const body = await response.json()
-        assert.equal(body.Config.Image, 'node:15-alpine')
-        assert.deepEqual(body.Config.Volumes, { '/opt/my-volume': {} })
-        assert.equal(body.Config.WorkingDir, '/opt/heyo')
-        assert.deepEqual(body.Config.ExposedPorts, { '22/tcp': {}, '8888/tcp': {}, '8889/udp': {} })
-        assert.equal(body.HostConfig.Memory, 512e6)
-        assert.deepEqual(body.HostConfig.PortBindings, {
-          '22/tcp': [{ HostIp: '', HostPort: '23' }],
-          '8000/tcp': [{ HostIp: '', HostPort: '8888' }]
-        })
-        assert.deepEqual(body.HostConfig.LogConfig, {
-          Type: 'json-file',
-          Config: {
-            'max-file': '10',
-            'max-size': '100m',
-          },
-        })
-        assert.deepEqual(body.Config.Healthcheck, {
-          Test: ['CMD', 'echo', 'ok'],
-          Interval: 1000000000,
-          Timeout: 30000000000,
-          StartPeriod: 5000000000,
-          Retries: 10,
-        })
-        assert.deepEqual(body.HostConfig.Mounts, [{
-          Type: 'volume',
-          Source: 'other-volume',
-          Target: '/opt/other-volume',
-          ReadOnly: true
-        }])
-      }
+    {
+      const createResponse = await docker.createContainer({
+        name: 'test-alpine-1',
+        image: 'node:15-alpine',
+        cmd: ['node', '-e', 'console.log(\'hey\')'],
+        workdir: '/opt/heyo',
+        expose: [22, 8888, '8889/udp'],
+        env: { HEY: 'hey' },
+        volume: ['/opt/my-volume'],
+        mounts: [{
+          source: 'other-volume',
+          target: '/opt/other-volume',
+          readonly: true,
+        }],
+        memory: 512e6, // bytes
+        restart: 'on-failure:5',
 
-      {
-        const containersResponse = await docker.listContainers()
-        assert.equal(containersResponse.status, 200)
-        const body = await containersResponse.json()
-        assert(!body.map(get('Id')).includes(this.removedContainerId))
-      }
-    }),
+        healthCmd: ['echo', 'ok'],
+        healthInterval: 1e9,
+        healthTimeout: 30e9,
+        healthRetries: 10,
+        healthStartPeriod: 5e9,
+
+        publish: {
+          23: 22, // hostPort -> containerPort[/protocol]
+          8888: '8000/tcp',
+        },
+        logDriver: 'json-file',
+        logDriverOptions: {
+          'max-file': '10',
+          'max-size': '100m',
+        },
+      })
+      assert(createResponse.ok)
+      const containerId = (await createResponse.json()).Id
+      this.containerId = containerId
+      const attachResponse = await docker.attachContainer(containerId),
+        startResponse = await docker.startContainer(containerId)
+      assert(startResponse.ok)
+      assert(attachResponse.ok)
+
+      const body = await attachResponse.buffer()
+      assert.equal(body.constructor, Buffer)
+      assert.strictEqual(body[0], 1) // stdout
+      assert.strictEqual(body[1], 0) // empty
+      assert.strictEqual(body[2], 0) // empty
+      assert.strictEqual(body[3], 0) // empty
+      assert.strictEqual(body[4], 0) // SIZE1
+      assert.strictEqual(body[5], 0) // SIZE2
+      assert.strictEqual(body[6], 0) // SIZE3
+      assert.strictEqual(body[7], 4) // SIZE4
+      assert.strictEqual(body.slice(8).toString(), 'hey\n')
+    }
+
+    {
+      const createResponse = await docker.createContainer({
+        name: 'test-alpine-2',
+        image: 'node:15-alpine',
+        cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey0\')).listen(2999)'],
+        rm: true,
+      })
+      assert(createResponse.ok)
+      const containerId = (await createResponse.json()).Id
+      assert((await docker.startContainer(containerId)).ok)
+      const execResponse = await docker.execContainer(containerId, ['node', '-e', 'console.log(\'heyyy\')'])
+      const body = await execResponse.buffer()
+      assert.equal(body.constructor, Buffer)
+      assert.strictEqual(body[0], 1) // stdout
+      assert.strictEqual(body[1], 0) // empty
+      assert.strictEqual(body[2], 0) // empty
+      assert.strictEqual(body[3], 0) // empty
+      assert.strictEqual(body[4], 0) // SIZE1
+      assert.strictEqual(body[5], 0) // SIZE2
+      assert.strictEqual(body[6], 0) // SIZE3
+      assert.strictEqual(body[7], 6) // SIZE4
+      assert.strictEqual(body.slice(8).toString(), 'heyyy\n')
+      await docker.stopContainer(containerId, { time: 1 })
+    }
+
+    {
+      const response = await docker.inspectContainer(this.containerId)
+      assert.equal(response.status, 200)
+      const body = await response.json()
+      assert.equal(body.Config.Image, 'node:15-alpine')
+      assert.deepEqual(body.Config.Volumes, { '/opt/my-volume': {} })
+      assert.equal(body.Config.WorkingDir, '/opt/heyo')
+      assert.deepEqual(body.Config.ExposedPorts, { '22/tcp': {}, '8888/tcp': {}, '8889/udp': {} })
+      assert.equal(body.HostConfig.Memory, 512e6)
+      assert.deepEqual(body.HostConfig.PortBindings, {
+        '22/tcp': [{ HostIp: '', HostPort: '23' }],
+        '8000/tcp': [{ HostIp: '', HostPort: '8888' }]
+      })
+      assert.deepEqual(body.HostConfig.LogConfig, {
+        Type: 'json-file',
+        Config: {
+          'max-file': '10',
+          'max-size': '100m',
+        },
+      })
+      assert.deepEqual(body.Config.Healthcheck, {
+        Test: ['CMD', 'echo', 'ok'],
+        Interval: 1000000000,
+        Timeout: 30000000000,
+        StartPeriod: 5000000000,
+        Retries: 10,
+      })
+      assert.deepEqual(body.HostConfig.Mounts, [{
+        Type: 'volume',
+        Source: 'other-volume',
+        Target: '/opt/other-volume',
+        ReadOnly: true
+      }])
+    }
+
+    {
+      const containersResponse = await docker.listContainers()
+      assert.equal(containersResponse.status, 200)
+      const body = await containersResponse.json()
+      assert(!body.map(get('Id')).includes(this.removedContainerId))
+    }
+  }),
 
   Test('Docker - swarm and service', Docker)
-    .case(async function (docker) {
-      {
-        const response = await docker.leaveSwarm({ force: true })
-        assert([200, 503].includes(response.status))
-      }
-      {
-        const response = await docker.initSwarm('[::1]:2377')
-        assert.equal(response.status, 200)
-      }
-      {
-        const response = await docker.inspectSwarm()
-        assert.equal(response.status, 200)
-        const body = await response.json()
-        assert.equal(typeof body.JoinTokens.Worker, 'string')
-        assert.equal(typeof body.JoinTokens.Manager, 'string')
-        this.workerJoinToken = body.JoinTokens.Worker
-      }
+  .case(async function (docker) {
+    { // initial leaveSwarm
+      const response = await docker.leaveSwarm({ force: true })
+      assert([200, 503].includes(response.status))
+    }
 
-      {
-        const response = await docker.createService('hey1', {
-          image: 'node:15-alpine',
-          replicas: 2,
-          cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey1\')).listen(3000)'],
-          workdir: '/opt/heyo',
-          env: { HEY: 'hey' },
-          mounts: [{
-            source: 'other-volume',
-            target: '/opt/other-volume',
-            readonly: true,
-          }],
-          memory: 512e6, // bytes
-          restart: 'on-failure:5',
-
-          healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3000'],
-          healthInterval: 1e9,
-          healthTimeout: 30e9,
-          healthRetries: 10,
-          healthStartPeriod: 5e9,
-
-          publish: {
-            23: 22, // hostPort -> containerPort[/protocol]
-            8080: 3000,
-          },
-
-          logDriver: 'json-file',
-          logDriverOptions: {
-            'max-file': '10',
-            'max-size': '100m',
-          },
-        })
-        assert.equal(response.status, 201)
-        const body = await response.json()
-        this.serviceId = body.ID
-      }
+    { // initSwarm
+      const response = await docker.initSwarm('[::1]:2377')
+      assert.equal(response.status, 200)
+    }
 
-      {
-        const response = await docker.createService('hey2', {
-          image: 'node:15-alpine',
-          replicas: 2,
-          cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey2\')).listen(3001)'],
-          workdir: '/opt/heyo',
-          env: { HEY: 'hey' },
-          mounts: [{
-            source: 'other-volume',
-            target: '/opt/other-volume',
-            readonly: true,
-          }],
-          memory: 512e6, // bytes
-          restart: 'on-failure',
-          publish: { 8081: 3001 },
-
-          healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3001'],
-        })
-        assert.equal(response.status, 201)
-      }
-      {
-        const response = await docker.listServices()
-        assert.equal(response.status, 200)
-        const body = await response.json()
-        assert.equal(body.length, 2)
-      }
-      {
-        const response = await docker.inspectService(this.serviceId)
-        assert.equal(response.status, 200)
-      }
+    { // inspectSwarm
+      const response = await docker.inspectSwarm()
+      assert.equal(response.status, 200)
+      const body = await response.json()
+      assert.equal(typeof body.JoinTokens.Worker, 'string')
+      assert.equal(typeof body.JoinTokens.Manager, 'string')
+      this.workerJoinToken = body.JoinTokens.Worker
+    }
 
-      {
-        const response = await docker.leaveSwarm()
-        assert.equal(response.status, 503)
-        assert((await response.json()).message.startsWith('You are attempting to leave'))
-      }
-      {
-        const response = await docker.leaveSwarm({ force: true })
-        assert.equal(response.status, 200)
-      }
+    { // create a service
+      const response = await docker.createService('hey1', {
+        image: 'node:15-alpine',
+        replicas: 2,
+        cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey1\')).listen(3000)'],
+        workdir: '/opt/heyo',
+        env: { HEY: 'hey' },
+        mounts: [{
+          source: 'other-volume',
+          target: '/opt/other-volume',
+          readonly: true,
+        }],
+        memory: 512e6, // bytes
+        restart: 'on-failure:5',
 
-      await Promise.all([ // TODO figure out a real test for join. Checking for the 503 is ok but is both slow and not a 200
-        docker.joinSwarm('[::1]:2377', this.workerJoinToken, {
-          listenAddr: 'hey',
-        }).then(async response => {
-          console.log('hey1', await response.text())
-          // assert.equal(response.status, 503)
-          assert.equal(response.status, 400)
-        }),
-        docker.joinSwarm('[::1]:2377', this.workerJoinToken, {
-          advertiseAddr: '[::1]:2377',
-          listenAddr: 'hey',
-          dataPathAddr: '127.0.0.1',
-        }).then(async response => {
-          console.log('hey2', await response.text())
-          // assert.equal(response.status, 503)
-          assert.equal(response.status, 400)
-        }),
-      ])
-    }),
-]
+        healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3000'],
+        healthInterval: 1e9,
+        healthTimeout: 30e9,
+        healthRetries: 10,
+        healthStartPeriod: 5e9,
+
+        publish: {
+          // 23: 22, // hostPort -> containerPort[/protocol]
+          8080: 3000,
+        },
+
+        logDriver: 'json-file',
+        logDriverOptions: {
+          'max-file': '10',
+          'max-size': '100m',
+        },
+      })
+      assert.equal(response.status, 201)
+      const body = await response.json()
+      this.serviceId = body.ID
+    }
+
+    { // create another service
+      const response = await docker.createService('hey2', {
+        image: 'node:15-alpine',
+        replicas: 2,
+        cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey2\')).listen(3001)'],
+        workdir: '/opt/heyo',
+        env: { HEY: 'hey' },
+        mounts: [{
+          source: 'other-volume',
+          target: '/opt/other-volume',
+          readonly: true,
+        }],
+        memory: 512e6, // bytes
+        restart: 'on-failure',
+        publish: { 8081: 3001 },
+
+        healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3001'],
+      })
+      assert.equal(response.status, 201)
+    }
+
+    { // listServices
+      const response = await docker.listServices()
+      assert.equal(response.status, 200)
+      const body = await response.json()
+      assert.equal(body.length, 2)
+    }
+
+    { // listTasks
+      const response = await docker.listTasks()
+      const body = await response.json()
+      assert.equal(body.length, 4) // 2 for hey1, 2 for hey2
+    }
+
+    { // inspectService
+      const response = await docker.inspectService(this.serviceId)
+      assert.equal(response.status, 200)
+    }
+
+    { // deleteService
+      const response = await docker.deleteService(this.serviceId)
+      assert.equal(response.status, 200)
+    }
+
+    { // listServices again
+      const response = await docker.listServices()
+      assert.equal(response.status, 200)
+      const body = await response.json()
+      assert.equal(body.length, 1)
+    }
+
+    { // leaveSwarm without forcing
+      const response = await docker.leaveSwarm()
+      assert.equal(response.status, 503)
+      assert((await response.json()).message.startsWith('You are attempting to leave'))
+    }
+
+    { // force leaveSwarm
+      const response = await docker.leaveSwarm({ force: true })
+      assert.equal(response.status, 200)
+    }
+
+    await Promise.all([ // TODO figure out a real test for join. Checking for the 503 is ok but is both slow and not a 200
+      docker.joinSwarm('[::1]:2377', this.workerJoinToken, {
+        listenAddr: 'hey',
+      }).then(async response => {
+        console.log('hey1', await response.text())
+        // assert.equal(response.status, 503)
+        assert.equal(response.status, 400)
+      }),
+      docker.joinSwarm('[::1]:2377', this.workerJoinToken, {
+        advertiseAddr: '[::1]:2377',
+        listenAddr: 'hey',
+        dataPathAddr: '127.0.0.1',
+      }).then(async response => {
+        console.log('hey2', await response.text())
+        // assert.equal(response.status, 503)
+        assert.equal(response.status, 400)
+      }),
+    ])
+  }),
+])
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/DockerService.js

@@ -47,7 +47,7 @@ const dockerServiceOptions = [
  *   name: string,
  *   image: string,
  *   replicas: 1|number,
- *   restart: 'no'|'on-failure[:<max-retries>]'|'always'|'unless-stopped',
+ *   restart: 'no'|'on-failure[:<max-retries>]'|'any',
  *   restartDelay: 10e9|number, // nanoseconds to delay between restarts
  *   logDriver: 'json-file'|'syslog'|'journald'|'gelf'|'fluentd'|'awslogs'|'splunk'|'none',
  *   logDriverOptions: Object<string>,
@@ -155,7 +155,7 @@ DockerService.prototype.synchronize = function dockerServiceSynchronize() {
  *
  *   image: string,
  *   replicas: 1|number,
- *   restart: 'no'|'on-failure[:<max-retries>]'|'always'|'unless-stopped',
+ *   restart: 'no'|'on-failure[:<max-retries>]'|'any',
  *   restartDelay: 10e9|number, // nanoseconds to delay between restarts
  *   logDriver: 'json-file'|'syslog'|'journald'|'gelf'|'fluentd'|'awslogs'|'splunk'|'none',
  *   logDriverOptions: Object<string>,

package/DynamoStream.js

@@ -42,6 +42,8 @@ const {
  * https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDBStreams.html
  *
  * DynamoStream -> Stream Headers -> Stream ARNs
+ *
+ * `eventName` enumeration: `INSERT`, `MODIFY`, `REMOVE`
  */
 
 const DynamoStream = function (options) {

package/DynamoTable.js

@@ -146,6 +146,8 @@ DynamoTable.prototype.putItem = async function dynamoTablePutItem(item, options)
     ...options,
   }).promise().catch(error => {
     error.tableName = this.name
+    error.method = 'putItem'
+    error.item = item
     throw error
   })
 }
@@ -172,6 +174,8 @@ DynamoTable.prototype.getItem = async function dynamoTableGetItem(key) {
     return result
   }).catch(error => {
     error.tableName = this.name
+    error.method = 'getItem'
+    error.key = key
     throw error
   })
 }
@@ -233,6 +237,9 @@ DynamoTable.prototype.updateItem = async function dynamoTableUpdateItem(
     ...options,
   }).promise().catch(error => {
     error.tableName = this.name
+    error.method = 'updateItem'
+    error.key = key
+    error.updates = updates
     throw error
   })
 }
@@ -276,6 +283,9 @@ DynamoTable.prototype.incrementItem = async function incrementItem(
     ...options,
   }).promise().catch(error => {
     error.tableName = this.name
+    error.method = 'incrementItem'
+    error.key = key
+    error.incrementUpdates = incrementUpdates
     throw error
   })
 }
@@ -303,6 +313,8 @@ DynamoTable.prototype.deleteItem = async function dynamoTableDeleteItem(key, opt
     ...options,
   }).promise().catch(error => {
     error.tableName = this.name
+    error.method = 'deleteItem'
+    error.key = key
     throw error
   })
 }
@@ -335,6 +347,7 @@ DynamoTable.prototype.scan = async function scan(options = {}) {
     },
   }).promise().catch(error => {
     error.tableName = this.name
+    error.method = 'scan'
     throw error
   })
 }

package/TranscribeStream.js

@@ -184,6 +184,7 @@ TranscribeStream.prototype.sendAudioChunk = function (chunk) {
 
 TranscribeStream.prototype.close = function () {
   this.websocket.close()
+  this.emit('close')
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.15.32",
+  "version": "0.15.36",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",