presidium 0.15.16 → 0.15.17

package/DynamoStream.js

@@ -60,6 +60,7 @@ const DynamoStream = function (options) {
   this.shardIteratorType = options.shardIteratorType ?? 'LATEST'
   this.shardUpdatePeriod = options.shardUpdatePeriod ?? 30000
   this.listStreamsLimit = options.listStreamsLimit ?? 100
+  this.debug = options.debug ?? false
   this.client = new DynamoDBStreams({
     apiVersion: '2012-08-10',
     accessKeyId: 'id',
@@ -129,12 +130,14 @@ DynamoStream.prototype.getRecords = async function* getRecords(
     ShardId: Shard.ShardId,
     StreamArn: Shard.Stream.StreamArn,
     ShardIteratorType: Shard.ShardIteratorType,
+
+    /*
     ...(
-      this.shardIteratorType == 'AFTER_SEQUENCE_NUMBER'
-      || this.shardIteratorType == 'AT_SEQUENCE_NUMBER'
-    ) ? {
-      SequenceNumber: Shard.SequenceNumberRange.StartingSequenceNumber,
-    } : {},
+      Shard.ShardIteratorType == 'AFTER_SEQUENCE_NUMBER'
+      || Shard.ShardIteratorType == 'AT_SEQUENCE_NUMBER'
+    ) ? { SequenceNumber: Shard.SequenceNumber } : {},
+    */
+
   }).promise().then(get('ShardIterator'))
   let records = await this.client.getRecords({
     ShardIterator: startingShardIterator,
@@ -156,10 +159,13 @@ const SymbolUpdateShards = Symbol('UpdateShards')
 
 DynamoStream.prototype[Symbol.asyncIterator] = async function* () {
   let shards = await pipe([
-    transform(map(identity), []),
+    always(this.getStreams()),
     flatMap(Stream => this.getShards(Stream)),
-    map(assign({ ShardIteratorType: always(this.shardIteratorType) })),
-  ])(this.getStreams())
+    map(assign({
+      ShardIteratorType: always(this.shardIteratorType),
+    })),
+    transform(map(identity), []),
+  ])()
   let muxAsyncIterator = Mux.race(shards.map(Shard => this.getRecords(Shard)))
   let iterationPromise = muxAsyncIterator.next()
   let shardUpdatePromise = new Promise(resolve => setTimeout(
@@ -172,16 +178,24 @@ DynamoStream.prototype[Symbol.asyncIterator] = async function* () {
     ])
     if (iteration == SymbolUpdateShards) {
       const latestShards = await pipe([
-        transform(map(identity), []),
+        always(this.getStreams()),
         flatMap(Stream => this.getShards(Stream)),
-      ])(this.getStreams())
+        transform(map(identity), []),
+      ])()
       const newShards = pipe([
+        always(shards),
         differenceWith(
           (ShardA, ShardB) => ShardA.ShardId == ShardB.ShardId,
           latestShards,
         ),
-        map(assign({ ShardIteratorType: always('TRIM_HORIZON') })),
-      ])(shards)
+        map(assign({
+          ShardIteratorType: always('TRIM_HORIZON'),
+        })),
+      ])()
+
+      if (this.debug) {
+        console.log('Latest shards:', latestShards)
+      }
 
       shards = latestShards
       muxAsyncIterator = newShards.length == 0 ? muxAsyncIterator : Mux.race([

package/DynamoStream.test.js

@@ -223,52 +223,6 @@ const test = Test('DynamoStream', DynamoStream)
   myStream.close()
 })
 
-.case({
-  table: 'my-table',
-  endpoint: 'http://localhost:8000',
-  listStreamsLimit: 1,
-  shardIteratorType: 'AFTER_SEQUENCE_NUMBER',
-  debug: true,
-}, async function (myStream) {
-  await myStream.ready
-
-  const table = this.table
-  await table.putItem({
-    id: '1',
-    status: 'waitlist',
-    createTime: 1000,
-    name: 'George',
-  })
-  await table.putItem({
-    id: '2',
-    status: 'waitlist',
-    createTime: 1001,
-    name: 'geo',
-  })
-  await table.putItem({
-    id: '3',
-    status: 'waitlist',
-    createTime: 1002,
-    name: 'john',
-  })
-  await table.putItem({
-    id: '4',
-    status: 'approved',
-    createTime: 1003,
-    name: 'sally',
-  })
-  await table.putItem({
-    id: '5',
-    status: 'approved',
-    createTime: 1004,
-    name: 'sally',
-  })
-
-  const first5 = await asyncIterableTake(5)(myStream)
-  assert.strictEqual(first5.length, 5)
-  myStream.close()
-})
-
 .case({
   table: 'my-table',
   endpoint: 'http://localhost:8000',

package/package.json

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