@naanlang/naan 1.6.0 → 1.7.0

package/plugins/serviceAws/aws_dynamo.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2024 by Richard C. Zulch
+ * Copyright (c) 2021-2026 by Richard C. Zulch
  *
  */
 
@@ -562,7 +562,7 @@ closure DynaConverter(local conv) {
  *
  */
 
-closure DynaTable(dyna, tablename, options, local table) {
+closure DynaTable(dyna, tablename, options, local table, delayf, backoffMS) {
     global()
     table = new(object, this)
     table.name = tablename
@@ -577,6 +577,38 @@ closure DynaTable(dyna, tablename, options, local table) {
             debuglog("DynaTable: invalid (hashKey/rangeKey) option:", tablename, list(options.hashKey, options.rangeKey))
     }
 
+    // retrier
+    //
+    //     Perform exponential backoff when throttled, returning true for retry or false otherwise.
+    //
+    function retrier(error, local waitms, newbo) {
+        if !error
+            delayf = false
+        else if error.name == "ThrottlingException" {                       // retriable errors
+            if backoffMS > milliseconds()
+                return (true)                                               // use existing backoff
+            if !delayf
+                delayf = ExbackFactory(6,60)                                // 6s max backoff, 60s deadline
+            waitms = delayf()
+            if waitms {                                                     // returns false for no retry
+                newbo = milliseconds() + waitms                             // tick when proceeding is allowed
+                if !(backoffMS > newbo)
+                    backoffMS = newbo
+                true
+            }
+        }
+    }
+    
+    // delayer
+    //
+    //     Delay until the current backoff is complete.
+    //
+    function delayer(local waitms) {
+        waitms = backoffMS - milliseconds()
+        if waitms > 0
+            sleep(waitms + waitms * Math.random()/2)
+    }
+
     // info
     //
     //     Return info about the table, or an error, in standard (error, dictionary) tuple format.
@@ -694,16 +726,24 @@ closure DynaTable(dyna, tablename, options, local table) {
                 KeyType: "RANGE"
             })
         }
-        pending = new(nonce)
-        dyna.aws.createTable(params, function(error, data) {
-            if error {
-                dynaTableError = error
-                debuglog("aws.createTable failed", tablename, ErrorString(error))
-                error = Error("table.create(".concat(tablename, ") failed"), error)
-            }
-            pending.signal(list(error, data))
-        })
-        `(error, data) = pending.wait()
+
+        loop {
+            pending = new(nonce)
+            delayer()
+            dyna.aws.createTable(params, function(error, data) {
+                if error {
+                    dynaTableError = error
+                    if error.name != "ThrottlingException"
+                        debuglog("aws.createTable failed", tablename, ErrorString(error))
+                    error = Error("table.create(".concat(tablename, ") failed"), error)
+                }
+                pending.signal(list(error, data))
+            })
+            `(error, data) = pending.wait()
+            if !retrier(error)
+                break
+        }
+
         if error
             return(list(Error("aws.createTable failed", error)))
         start = milliseconds()
@@ -764,7 +804,8 @@ closure DynaTable(dyna, tablename, options, local table) {
     // The result is a standard result tuple `(error, record).
 
     //
-    table.getRecord = closure getRecord(hashValue, options, local params, rangeValue, pending) {
+    table.getRecord = closure getRecord(hashValue, options,
+        local params, rangeValue, pending, error, record) {
         if preflightError(this)
             return
         params = {
@@ -776,17 +817,25 @@ closure DynaTable(dyna, tablename, options, local table) {
         } else
             rangeValue = options
         params.Key = makeDynKey(list(hashValue, rangeValue))
-        pending = new(nonce)
-        dyna.aws.getItem(params, function(error, data) {
-            if error {
-                dynaTableError = error
-                debuglog("aws.getItem failed", tablename, ErrorString(error))
-                error = Error("table.getRecord(".concat(tablename, ") failed"), error)
-            } else
-                data = dyna.conv.recordDynToNaan(data.Item)
-            pending.signal(list(error, data))
-        })
-        pending.wait()
+
+        loop {
+            pending = new(nonce)
+            delayer()
+            dyna.aws.getItem(params, function(error, data) {
+                if error {
+                    dynaTableError = error
+                    if error.name != "ThrottlingException"
+                        debuglog("aws.getItem failed", tablename, ErrorString(error))
+                    error = Error("table.getRecord(".concat(tablename, ") failed"), error)
+                } else
+                    data = dyna.conv.recordDynToNaan(data.Item)
+                pending.signal(list(error, data))
+            })
+            `(error, record) = pending.wait()
+            if !retrier(error)
+                break
+        }
+        list(error, record)
     }
     
     //
@@ -794,23 +843,32 @@ closure DynaTable(dyna, tablename, options, local table) {
     //
     //     Put a record in the table, replacing any existing record with the same key.
         
-    table.putRecord = closure putRecord(record, local params, pending) {
+    table.putRecord = closure putRecord(record,
+        local params, pending, error) {
         if preflightError(this)
             return
         params = {
             TableName: tablename
             Item: dyna.conv.recordNaanToDyn(record)
         }
-        pending = new(nonce)
-        dyna.aws.putItem(params, function(error, data) {
-            if error {
-                dynaTableError = error
-                debuglog("aws.putItem failed", tablename, ErrorString(error))
-                error = Error("table.putRecord(".concat(tablename, ") failed"), error)
-            }
-            pending.signal(list(error, data))
-        })
-        pending.wait()
+
+        loop {
+            pending = new(nonce)
+            delayer()
+            dyna.aws.putItem(params, function(error, data) {
+                if error {
+                    dynaTableError = error
+                    if error.name != "ThrottlingException"
+                        debuglog("aws.putItem failed", tablename, ErrorString(error))
+                    error = Error("table.putRecord(".concat(tablename, ") failed"), error)
+                }
+                pending.signal(list(error, data))
+            })
+            `(error, record) = pending.wait()
+            if !retrier(error)
+                break
+        }
+        list(error, record)
     }
 
     //
@@ -831,7 +889,7 @@ closure DynaTable(dyna, tablename, options, local table) {
     // The result is a standard result tuple `(error, record).
         
     table.updateRecord = closure updateRecord(hashValue, rangeValue, options,
-        local error, params, pending) {
+        local error, params, pending, record) {
         if preflightError(this)
             return
         params = {
@@ -856,18 +914,25 @@ closure DynaTable(dyna, tablename, options, local table) {
             if !params.ReturnValues
                 params.ReturnValues = "NONE"
         }
-        pending = new(nonce)
-        dyna.aws.updateItem(params, function(error, data) {
-            if error {
-                dynaTableError = error
-                debuglog("aws.updateItem failed", tablename, ErrorString(error), Dialect.print(params))
-                error = Error("table.updateRecord(".concat(tablename, ") failed"), error)
-            }
-            else
-                data = dyna.conv.recordDynToNaan(data.Attributes)
-            pending.signal(list(error, data))
-        })
-        pending.wait()
+        loop {
+            pending = new(nonce)
+            delayer()
+            dyna.aws.updateItem(params, function(error, data) {
+                if error {
+                    dynaTableError = error
+                    if error.name != "ThrottlingException"
+                        debuglog("aws.updateItem failed", tablename, ErrorString(error), Dialect.print(params))
+                    error = Error("table.updateRecord(".concat(tablename, ") failed"), error)
+                }
+                else
+                    data = dyna.conv.recordDynToNaan(data.Attributes)
+                pending.signal(list(error, data))
+            })
+            `(error, record) = pending.wait()
+            if !retrier(error)
+                break
+        }
+        list(error, record)
     }
     
     //
@@ -881,7 +946,7 @@ closure DynaTable(dyna, tablename, options, local table) {
  
         
     table.deleteRecord = closure deleteRecord(hashValue, rangeValue, options,
-        local params, error, pending) {
+        local params, error, pending, record) {
         if preflightError(this)
             return
         params = {
@@ -902,16 +967,25 @@ closure DynaTable(dyna, tablename, options, local table) {
             if !params.ReturnValues
                 params.ReturnValues = "NONE"
         }
-        pending = new(nonce)
-        dyna.aws.deleteItem(params, function(error, data) {
-            if error {
-                dynaTableError = error
-                debuglog("aws.deleteItem failed", tablename, ErrorString(error))
-                error = Error("table.deleteRecord(".concat(tablename, ") failed"), error)
-            }
-            pending.signal(list(error, data))
-        })
-        pending.wait()
+
+        loop {
+            pending = new(nonce)
+            delayer()
+            dyna.aws.deleteItem(params, function(error, data) {
+                if error {
+                    dynaTableError = error
+                    if error.name != "ThrottlingException"
+                        debuglog("aws.deleteItem failed", tablename, ErrorString(error))
+                    error = Error("table.deleteRecord(".concat(tablename, ") failed"), error)
+                }
+                pending.signal(list(error, data))
+            })
+            pending.wait()
+            `(error, record) = pending.wait()
+            if !retrier(error)
+                break
+        }
+        list(error, record)
     }
 
     //
@@ -922,16 +996,23 @@ closure DynaTable(dyna, tablename, options, local table) {
     //
     closure dynQueryPager(procname, params, remaining, doneCB) {
         if !remaining
-            remaining = 10                                              // default retrieve limit
+            remaining = 10                                                  // default retrieve limit
         params.Limit = remaining
-        QueryPager(dyna.aws, procname, params, function(data, local processed) {
+        delayer()
+        QueryPager(dyna.aws, procname, params, function(error, data, local processed) {
+            if error {
+                if !retrier(error)
+                    return (false)
+                delayer()
+                return (true)
+            }
             processed = doneCB(data)
             if processed
                 remaining -= processed
             params.ExclusiveStartKey = data.LastEvaluatedKey
             if processed && remaining > 0 && data.LastEvaluatedKey {
-                params.Limit = remaining                                // set up for next iteration
-                true                                                    // continue looping
+                params.Limit = remaining                                    // set up for next iteration
+                true                                                        // continue looping
             }
         })
     }

package/plugins/serviceAws/aws_utils.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2025 by Richard C. Zulch
+ * Copyright (c) 2021-2026 by Richard C. Zulch
  *
  */
 
@@ -27,19 +27,14 @@ closure queryPager(apiobject, procname, params, xargs, doneCB, local pending, lo
         return (list(Error("queryPager method undefined:", procname)))
     pending = new(nonce)
     looping = true
-    while looping {                                                         // loop for multiple pages
+    while looping {                                                         // loop for multiple pages or retry
         pending.reset()
         xapply(apiobject, procname, append(cons(params, xargs), cons(function (error, data) {
-            if error {
-                qpPagerError = error
-                debuglog(procname, "failed", error)
-                looping = false
-                pending.signal(list(error))
-            }
-            else {
-                looping = doneCB(data)
+            looping = doneCB(error, data)
+            if looping || !error
                 pending.signal(list(false, {ok: true}))
-            }
+            else
+                pending.signal(list(error))
         })))
         result = pending.wait()
     }

package/plugins/serviceAws/serviceAws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2026 by Richard C. Zulch
  *
  */
 
@@ -23,7 +23,8 @@ function sawsInit(local manifest) {
 
     Naan.module.build(module.id, "serviceAws", function(modobj, compobj) {
         compobj.manifest = manifest
-        require("naanlib:frameworks/common").LiveImport()
+        require("naanlib:frameworks/common/utils.nlg")                      // get ExbackFactory
+        require("naanlib:frameworks/common").LiveImport()                   // applies to all exports
         require("./aws_utils.nlg")
         function sawsPostload() {
             if js.g

package/test/test_01_core.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2023 by Richard C. Zulch
+ * Copyright (c) 2017-2026 by Richard C. Zulch
  *
  */
 
@@ -881,7 +881,7 @@ RegisterTestCategory("core", [
 
     [ "unintern(true) === true", "false"],
 
-    [ "length(stacktrace());", "55" ],
+    [ "length(stacktrace());", "57" ],
     
     //
     // relate builtin

package/test/test_02_context.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2024 by Richard C. Zulch
+ * Copyright (c) 2017-2026 by Richard C. Zulch
  *
  */
 
@@ -38,7 +38,7 @@ RegisterTestCategory("context", [
     [ "function setNS(ns) { ns=reverse(ns),sudo(nsactive(reverse(ns, defNS))) };", "setNS" ],
     [ "x;", "x" ],
     [ "y;", "y" ],
-    [ "length(symlist(nsactive(true).0));", "173"],
+    [ "length(symlist(nsactive(true).0));", "175"],
     [ "testvar;", "testvar" ],
     [ "function setTestvar(v) { testvar=v };", "setTestvar" ],
     [ "naanvar;", "naanvar" ],
@@ -200,20 +200,20 @@ RegisterTestCategory("context", [
     [ "test2(4);", "10001|10001" ],
 
     [ "function test1(x) { if x > 10000 printline(x) else test2(x+1), undefined() };", "==> redefined: test1|test1" ],
-    [ "test2(5);", { errors: "exception: recursed 101" } ],
+    [ "test2(5);", { errors: "exception: recursed 99" } ],
 
     [ "function test1(x) { if x > 10000 printline(x) else loop test2(x+1) };", "==> redefined: test1|test1" ],
-    [ "test2(6);", { errors: "exception: recursed 102" } ],
+    [ "test2(6);", { errors: "exception: recursed 100" } ],
 
     [ "function test1(x) { if x > 10000 printline(x) else 0+test2(x+1) };", "==> redefined: test1|test1" ],
-    [ "test2(7);", { errors: "exception: recursed 149" } ],
+    [ "test2(7);", { errors: "exception: recursed 147" } ],
 
     [ "function test2(x) { testRecurCheck(x), if true test1(x+1) else print(x) };", "==> redefined: test2|test2" ],
-    [ "test2(8);", { errors: "exception: recursed 150" } ],
+    [ "test2(8);", { errors: "exception: recursed 148" } ],
 
     [ "function test1(x) { if x > 10000 printline(x) else loop test2(x+1, 4, 5) };", "==> redefined: test1|test1" ],
     [ "function test2(x,y,z) { testRecurCheck(x), loop if true { test1(x+1),break } else print(x) };", "==> redefined: test2|test2" ],
-    [ "test2(9);", { errors: "exception: recursed 51" } ],
+    [ "test2(9);", { errors: "exception: recursed 49" } ],
 
     [ "function test1 xt { if car(xt) > 10000 printline(xt) else test2(car(xt)+1) };", "==> redefined: test1|test1" ],
     [ "function test2 xt { testRecurCheck(car(xt)), test1(car(xt)+1) };", "==> redefined: test2|test2" ],
@@ -222,7 +222,7 @@ RegisterTestCategory("context", [
     [ "oo=new(object);", "Object{0}"],
     [ "oo.test1 = function test1(x) { if x > 10000 printline(x) else test2(x+1) };", "==> redefined: test1|test1"],
     [ "oo.test2 = function test2 xt { testRecurCheck(car(xt)), oo.test1(car(xt)+1) };", "==> redefined: test2|test2"],
-    [ "oo.test1(11);", { errors: "exception: recursed 154" } ],
+    [ "oo.test1(11);", { errors: "exception: recursed 152" } ],
 
     [ "function test1 xt { testRecurCheck(car(xt)), if car(xt) > 10000 printline(xt) else test1(car(xt)+1) };",
         "==> redefined: test1|test1" ],

package/test/test_03_jsinterop.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2025 by Richard C. Zulch
+ * Copyright (c) 2020-2026 by Richard C. Zulch
  *
  */
 
@@ -35,11 +35,11 @@ RegisterTestCategory("JSinterop", [
 
     [ "o(3);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
     }[    "prod"]],
     [ "o(Number);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
     }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],

package/test/test_07_lingo.nlg

@@ -474,7 +474,7 @@ RegisterTestCategory("Lingo", [
         { errors: "invalid iteration variable at (1, 5) found 3" } ],
     [ "for x in xnew() print(x);>", "Dictionary{6}"],
     [ "for x in Array(e, f, g) print(x);>", "efg|Dictionary{7}"],
-    [ "for x in false print(x);>", "Dictionary{5}"],
+    [ "for x in false print(x);>", "Dictionary{6}"],
     [ "for x in { } print(x);>", "Dictionary{7}"],
 
     //