presidium 0.20.0 → 0.20.2

package/Docker.js

@@ -1114,20 +1114,25 @@ Docker.prototype.getServiceLogs = async function getServiceLogs(serviceId, optio
   }`)
 }
 
+const toArray = value => Array.isArray(value) ? value : [value]
+
 /**
  * @name Docker.prototype.listTasks
  *
  * @synopsis
  * ```coffeescript [specscript]
  * new Docker().listTasks(options {
- *   service?: string,
- *   node?: string,
+ *   desiredState: 'running'|'shutdown'|'accepted'
  * }) -> Promise<HttpResponse>
  * ```
  */
-Docker.prototype.listTasks = async function listTasks(options) {
+Docker.prototype.listTasks = async function listTasks(options = {}) {
   return this.http.get(`/tasks?${
-    querystring.stringify(pick(['service', 'node'])(options))
+    querystring.stringify({
+      filters: JSON.stringify(filter({
+        'desired-state': toArray(options.desiredState),
+      }, value => value != null)),
+    })
   }`)
 }
 

package/Docker.test.js

@@ -410,6 +410,12 @@ EXPOSE 8888`,
       assert.equal(body.length, 3) // 2 for hey1, 1 for hey2 (global)
     }
 
+    { // listTasks filter
+      const response = await docker.listTasks({ desiredState: 'accepted' })
+      const body = await response.json()
+      assert.equal(body.length, 0)
+    }
+
     { // deleteService
       const response = await docker.deleteService(this.serviceId1)
       assert.equal(response.status, 200)

package/DockerImage.js

@@ -13,7 +13,10 @@ const stream = require('stream')
 const pathJoin = require('./internal/pathJoin')
 const parseJSON = require('./internal/parseJSON')
 
-const passthrough = target => transform(Transducer.passthrough, target)
+const passthrough = target => transform(
+  Transducer.map(chunk => chunk.toString('utf8')),
+  target,
+)
 
 const PassThroughStream = stream.PassThrough
 

package/DockerImage.test.js

@@ -15,6 +15,7 @@ const charCode = string => string.charCodeAt(0)
 const test = new Test('DockerImage', DockerImage)
   .case('doesnot:exist', async function (dneImage) {
     const data = await dneImage.inspect()
+    console.log(data)
     assert(data.message.toLowerCase().startsWith('no such image'), data.message)
   })
   .case('node:15-alpine', async function (alpineImage) {

package/DynamoIndexQueryIterator.js

@@ -8,8 +8,8 @@
  *   keyConditionExpression string,
  *   queryValues object,
  *   options? {
+ *     batchLimit?: number,
  *     limit?: number,
- *     scanIndexForward?: boolean, // true for ASC, false for DESC
  *   },
  * ) -> AsyncGenerator<DynamoItem>
  * ```
@@ -18,28 +18,31 @@ const DynamoIndexQueryIterator = async function* (
   dynamoIndex, keyConditionExpression, queryValues, options = {}
 ) {
   const {
-    limit = 1000,
-    scanIndexForward = true,
+    batchLimit = 1000,
+    limit = Infinity,
   } = options
 
+  let numYielded = 0
   let response = await dynamoIndex.query(
     keyConditionExpression,
     queryValues,
-    { limit, scanIndexForward },
+    { limit: Math.min(batchLimit, limit - numYielded), ...options },
   )
   yield* response.Items
+  numYielded += response.Items.length
 
-  while (response.LastEvaluatedKey != null) {
+  while (response.LastEvaluatedKey != null && numYielded < limit) {
     response = await dynamoIndex.query(
       keyConditionExpression,
       queryValues,
       {
-        limit,
-        scanIndexForward,
+        limit: Math.min(batchLimit, limit - numYielded),
         exclusiveStartKey: response.LastEvaluatedKey,
+        ...options,
       },
     )
     yield* response.Items
+    numYielded += response.Items.length
   }
 }
 

package/DynamoIndexQueryIterator.test.js

@@ -40,7 +40,6 @@ const test = new Test('DynamoIndexQueryIterator', async function () {
       testStatusCreateTimeIndex,
       'status = :status AND createTime > :createTime',
       { status: 'pending', createTime: 0 },
-      { limit: 10, scanIndexForward: true },
     )
     for await (const item of iter) {
       array.push(map(item, Dynamo.attributeValueToJSON))
@@ -55,7 +54,22 @@ const test = new Test('DynamoIndexQueryIterator', async function () {
       testStatusCreateTimeIndex,
       'status = :status AND createTime > :createTime',
       { status: 'pending', createTime: 0 },
-      { limit: 10, scanIndexForward: false },
+      { batchLimit: 10, scanIndexForward: true },
+    )
+    for await (const item of iter) {
+      array.push(map(item, Dynamo.attributeValueToJSON))
+    }
+    assert.equal(array.length, 50)
+    assert.equal(array[0].id, '0')
+  }
+
+  {
+    const array = []
+    const iter = DynamoIndexQueryIterator(
+      testStatusCreateTimeIndex,
+      'status = :status AND createTime > :createTime',
+      { status: 'pending', createTime: 0 },
+      { batchLimit: 10, scanIndexForward: false },
     )
     for await (const item of iter) {
       array.push(map(item, Dynamo.attributeValueToJSON))
@@ -63,6 +77,22 @@ const test = new Test('DynamoIndexQueryIterator', async function () {
     assert.equal(array.length, 50)
     assert.equal(array[0].id, '49')
   }
+
+  {
+    const array = []
+    const iter = DynamoIndexQueryIterator(
+      testStatusCreateTimeIndex,
+      'status = :status AND createTime > :createTime',
+      { status: 'pending', createTime: 0 },
+      { batchLimit: 10, limit: 30, scanIndexForward: true },
+    )
+    for await (const item of iter) {
+      array.push(map(item, Dynamo.attributeValueToJSON))
+    }
+    assert.equal(array.length, 30)
+    assert.equal(array[0].id, '0')
+  }
+
 }).case()
 
 if (process.argv[1] == __filename) {

package/package.json

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