@naanlang/naan 1.4.3 → 1.4.4

package/lib/env_node.js

@@ -110,11 +110,13 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     {                                                                       // Node REPL does too much crap
     }
     
-    if (process.stdin.isTTY && !options.replDisable)
+    if (process.stdin.isTTY)
     {                                                                       // must have TTY for local REPL
         replServer = repl.start({ prompt: '', eval: myEval});
     
         replServer.on('line', function(cmd) {                               // process raw command line
+            if (options.replDisable)
+                return;
             if (cmd.charAt(0) != ".") {
                 textToRemoteTerm("\x1b[90m\x1b[3m".concat(cmd, "\x1b[0m\n"));
                 naanlib.textLine(cmd + "\n");
@@ -126,9 +128,13 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         //
     
         replServer._events.SIGINT = function () {
-            naanlib.escape();
+            if (options.replDisable) {
+                console.log("^C");
+                process.exit();
+            } else
+                naanlib.escape();
         };
-    
+
         //
         // Hook an exit command
         //

package/lib/node_repl_init.nlg

@@ -6,11 +6,11 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2018-2021 by Richard C. Zulch
+ * Copyright (c) 2018-2025 by Richard C. Zulch
  *
  */
 
-loglevel(2);
+loglevel(3);
 
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.4.3",
+    "version": "1.4.4",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/plugins/nodeLib/node_util.nlg

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2025 by Richard C. Zulch
  *
  */
 
@@ -13,12 +13,11 @@
 /*
  * MultipartBody
  *
- * column positioning:                          //                          //                      !
  *     Create a multipart Form body from the specified dictionary, returning a buffer. Any xobject in
  * the dictionary is coded as an octet. If you want a different filename, include an options object
  * that defines that filename.
  *
- *The result is a dictionary as follows:
+ *The return value is a dictionary as follows:
  *  {
  *      body: <Buffer>
  *      header: {
@@ -29,11 +28,17 @@
  *
  */
 
-function MultipartBody(dict, options, local boundary, parts, key, data, filename) {
+function MultipartBody(dict, options,
+    local boundary, parts, key, data, item, filename) {
     boundary = "xx-xx-xx-xx-xx"
     parts = []
     for `(key, data) in dict {
-        if xobject(data) {
+        if Array.isArray(data) {                                            // PHP-style arrays
+            for item in data
+                parts.push(xnew(js.g.Buffer.from, "--".concat(boundary, "\r\n",
+                    "Content-Disposition: form-data; name=\"", key, "[]",
+                    "\"; \r\n\r\n", item, "\r\n"), "utf8"))
+        } else if xobject(data) {                                           // binary file data
             if options[key]
                 filename = options[key]
             else
@@ -43,8 +48,7 @@ function MultipartBody(dict, options, local boundary, parts, key, data, filename
                 "Content-Type:application/octet-stream\r\n\r\n"), "utf8"))
             parts.push(xnew(js.g.Buffer.from, data, "binary"))
             parts.push(xnew(js.g.Buffer.from, "\r\n", "utf8"))
-        }
-        else {
+        } else {                                                            // ordinary data
             parts.push(xnew(js.g.Buffer.from, "--".concat(boundary, "\r\n",
                 "Content-Disposition: form-data; name=\"", key,
                 "\"; \r\n\r\n", data, "\r\n"), "utf8"))
@@ -165,8 +169,11 @@ function nodeUtilInit(local manifest) {
     Naan.module.build(module.id, "node_util", function(modobj, compobj) {
         require("nodeLib.nlg")
         compobj.manifest = manifest
+        modobj.exports.MultipartBody = MultipartBody
+        modobj.exports.EncodeQuery = EncodeQuery
         modobj.exports.JsonParse = JsonParse
         modobj.exports.JsonStringify = JsonStringify
+        modobj.exports.RandomBytes = RandomBytes
         modobj.exports.UUID = UUID
         function postload() {
             nodeFs = js.r("fs")

package/plugins/openSearch/os_dynamo.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023 by Richard C. Zulch
+ * Copyright (c) 2023-2025 by Richard C. Zulch
  *
  */
 
@@ -65,7 +65,7 @@ closure OSDynIndexer(index, table, options,
     // Update ids into the database, returning a nonce signaled with error array.
     //
     closure updateRecordIDs(docs, ids, writeID) {
-        asyncArray(docs, 10, function(entry, index, cancel, local error) {
+        asyncArray(docs, 10, closure(entry, index, cancel, local error) {
             ignore(error)
             `(error) = table.updateRecord(
                 entry[table.hashKey],
@@ -78,11 +78,11 @@ closure OSDynIndexer(index, table, options,
     //
     // Batch index documents into OpenSearch, returning a nonce signaled with ids array.
     //
-    closure batchIndex(records, local pending, docs) {
+    closure batchIndex(records, local pending) {
         pending = new(nonce)
-        docs = records.map(function(record) {
+        docs = asyncArray(records, 10, closure(record) {
             options.converter(record)
-        })
+        }).wait()
         future(function(local error, ids) {
             `(error, ids) = index.write(docs)
             pending.signal(list(error, records, ids))

package/plugins/serviceAws/aws_dynamo.nlg

@@ -946,7 +946,7 @@ closure DynaTable(dyna, tablename, options, local table) {
     //      range:          <key-expression>                                // range of keys to retrieve
     //      filter:         <key-expression>                                // conditions for items to return
     //      reverse:        <boolean>                                       // reverse order
-    //      project:        <array>                                         // project only specified attributes
+    //      project:        <array> | `count                                // project only specified attributes
     //      paging:         <exclusive start key>                           // for paging; updated each call
     //      consistentRead: <boolean>                                       // true to use consistent read
     //      limit:          <number>                                        // maximum count of results
@@ -962,6 +962,7 @@ closure DynaTable(dyna, tablename, options, local table) {
             TableName: tablename
         }
         hashKey = table.hashKey
+        output = []
         if options.indexName {
             params.IndexName = options.indexName
             if options.indexHashKey
@@ -989,15 +990,23 @@ closure DynaTable(dyna, tablename, options, local table) {
         }
         if options.reverse
             params.ScanIndexForward = false
-        if options.project
+        if options.project == `count {
+            params.Select = "COUNT"
+            output = {
+                Count: 0
+                ScannedCount: 0
+            }
+        } else if options.project
             params.ProjectionExpression = options.project.join(", ")
         if options.paging
             params.ExclusiveStartKey = options.paging
         if options.consistentRead
             params.ConsistentRead = options.consistentRead
-        output = []
         `(error) = dynQueryPager(`query, params, options.limit, function(data) {
-            if data.Count > 0
+            if dictionary(output) {
+                output.Count += data.Count
+                output.ScannedCount += data.ScannedCount
+            } else if data.Count > 0
                 output = output.concat(dyna.conv.recordDynToNaan(data.Items))
             data.Count
         })
@@ -1016,7 +1025,7 @@ closure DynaTable(dyna, tablename, options, local table) {
     //  {
     //      index:          <string>                                        // index name in table
     //      filter:         <key-expression>                                // conditions for items to return
-    //      project:        <array>                                         // project only specified attributes
+    //      project:        <array> | `count                                // project only specified attributes
     //      paging:         <exclusive start key>                           // for paging; updated each call
     //      consistentRead: <boolean>                                       // true to use consistent read
     //      limit:          <number>                                        // maximum count of results
@@ -1040,15 +1049,23 @@ closure DynaTable(dyna, tablename, options, local table) {
             if error
                 return (list(Error("table.scanRecords filter:", error)))
         }
-        if options.project
+        if options.project == `count {
+            params.Select = "COUNT"
+            output = {
+                Count: 0
+                ScannedCount: 0
+            }
+        } else if options.project
             params.ProjectionExpression = options.project.join(", ")
         if options.paging
             params.ExclusiveStartKey = options.paging
         if options.consistentRead
             params.ConsistentRead = options.consistentRead
-        output = []
         `(error) = dynQueryPager(`scan, params, options.limit, function(data) {
-            if data.Count >= 0
+            if dictionary(output) {
+                output.Count += data.Count
+                output.ScannedCount += data.ScannedCount
+            } else if data.Count >= 0
                 output = output.concat(dyna.conv.recordDynToNaan(data.Items))
             data.Count
         })

package/plugins/serviceAws/aws_vm.nlg

@@ -0,0 +1,198 @@
+/*
+ * aws_vm.nlg
+ * serviceAws
+ *
+ * VM controller under AWS.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2024-2025 by Richard C. Zulch
+ *
+ */
+
+vmState = false;
+
+/*
+ * VmControl
+ *
+ *     VM control object for AWS.
+ *
+ */
+
+closure VmControl(creds, local dokon) {
+    global(js, http, vmState)
+    if vmState.dokon
+        return (vmState.dokon)                                              // singleton
+    dokon = new(object, this)
+    vmState = new(nonce)                                                    // don't save with state
+    vmState.dokon = dokon
+
+    // detachVM
+    //
+    // Tell AWS to detach a VM from its scalability group. Returns a tuple with:
+    //  {
+    //      Activities: [
+    //          {
+    //              ActivityId: "STRING_VALUE",
+    //              AutoScalingGroupName: "STRING_VALUE",
+    //              Description: "STRING_VALUE",
+    //              Cause: "STRING_VALUE",
+    //              StartTime: new Date("TIMESTAMP"),
+    //              EndTime: new Date("TIMESTAMP"),
+    //              StatusCode: "PendingSpotBidPlacement" || "WaitingForSpotInstanceRequestId"
+    //                  || "WaitingForSpotInstanceId" || "WaitingForInstanceId" || "PreInService"
+    //                  || "InProgress" || "WaitingForELBConnectionDraining" || "MidLifecycleAction"
+    //                  || "WaitingForInstanceWarmup" || "Successful" || "Failed" || "Cancelled"
+    //                  || "WaitingForConnectionDraining",
+    //              StatusMessage: "STRING_VALUE",
+    //              Progress: Number("int"),
+    //              Details: "STRING_VALUE",
+    //              AutoScalingGroupState: "STRING_VALUE",
+    //              AutoScalingGroupARN: "STRING_VALUE",
+    //          }
+    //      ]
+    //  }
+    closure detachVM(instanceID, local error, ascSdk, params, asclient, response) {
+        `(error, ascSdk) = await(js.i("@aws-sdk/client-auto-scaling"))
+        if error
+            return (list(error))
+        params = { }
+        params.region = creds.region
+        params.credentials = {
+            accessKeyId:        creds.keyID
+            secretAccessKey:    creds.keySecret
+        }
+        if creds.endpoint
+            params.endpoint = creds.endpoint
+        asclient = xnew(ascSdk.AutoScalingClient, params)
+        `(error, response) = await(asclient.send(xnew(ascSdk.DetachInstancesCommand, {
+            AutoScalingGroupName: creds.ec2AsgName
+            InstanceIds: [ instanceID ]
+            ShouldDecrementDesiredCapacity: false
+        })))
+        list(error, response)
+    }
+
+    // terminateVM
+    //
+    // Tell AWS to terminate a VM, ours in point of fact. Returns a tuple with:
+    //  {
+    //      TerminatingInstances: [
+    //          {
+    //              InstanceId: "STRING_VALUE"
+    //              CurrentState: { // InstanceState
+    //                  Code: Number("int"),
+    //                  Name: "pending" || "running" || "shutting-down" || "terminated"
+    //                      || "stopping" || "stopped",
+    //              }
+    //              PreviousState: {
+    //                  Code: Number("int"),
+    //                  Name: "pending" || "running" || "shutting-down" || "terminated"
+    //                      || "stopping" || "stopped",
+    //              }
+    //          }
+    //      ]
+    //  }
+    //
+    closure terminateVM(instanceID, local error, ec2sdk, params, ec2client, response) {
+        `(error, ec2sdk) = await(js.i("@aws-sdk/client-ec2"))
+        if error
+            return (list(error))
+        params = { }
+        params.region = creds.region
+        params.credentials = {
+            accessKeyId:        creds.keyID
+            secretAccessKey:    creds.keySecret
+        }
+        if creds.endpoint
+            params.endpoint = creds.endpoint
+        ec2client = xnew(ec2sdk.EC2Client, params)
+        `(error, response) = await(ec2client.send(xnew(ec2sdk.TerminateInstancesCommand,
+            {  InstanceIds: [ instanceID ] })))
+        list(error, response)
+    }
+
+    // getHostname
+    //
+    // Ask the VM for its FQDN.
+    //
+    //  TOKEN="`curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"`"
+    //  curl -H "X-aws-ec2-metadata-token: $TOKEN" 'http://169.254.169.254/latest/meta-data/hostname'
+    //      => ip-172-31-80-96.ec2.internal
+    //
+    dokon.getHostname = closure getHostname(local error, token, hostname) {
+        `(error, token) = http.HttpRequest("http://169.254.169.254/latest/api/token", {
+            headers: {
+                "X-aws-ec2-metadata-token-ttl-seconds": "2160"
+            }
+            method: "PUT"
+        })
+        if !error
+            `(error, hostname) = http.HttpRequest("http://169.254.169.254/latest/meta-data/hostname", {
+                headers: {
+                    "X-aws-ec2-metadata-token": token
+                }
+            })
+        if error
+            list(error)
+        else
+            list(false, hostname)
+    }
+
+    // vmShutdown
+    //
+    // Get our AWS EC2 VM instance ID and then request that it be shut down.
+    //
+    // How to get auth token:
+    //  curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"
+	//      =>  AQAEAJHVrb_zRdju_A3tYBJLtKHsjej5GFVsDu1VuBCErP8MNVOr0Q==
+    //
+    // How to get instance-id:
+    //  curl -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/instance-id
+    //      =>  i-008dc3846da316a93
+    //
+
+    dokon.shutdown = closure shutdown(local error, token, instanceID, response) {
+        `(error, token) = http.HttpRequest("http://169.254.169.254/latest/api/token", {
+            headers: {
+                "X-aws-ec2-metadata-token-ttl-seconds": "2160"
+            }
+            method: "PUT"
+        })
+        if !error
+            `(error, instanceID) = http.HttpRequest("http://169.254.169.254/latest/meta-data/instance-id", {
+                headers: {
+                    "X-aws-ec2-metadata-token": token
+                }
+            })
+        if !error
+            `(error, response) = detachVM(instanceID)
+        if !error
+            `(error, response) = terminateVM(instanceID)
+        if error
+            list(error)
+        else
+            list(false, response)
+    }
+
+    // finis
+    dokon
+};
+
+
+/*
+ * vmConInit
+ *
+ *     Initialize the component.
+ *
+ */
+
+function vmConInit(local manifest) {
+    manifest = `(VmControl, vmConInit)
+    Naan.module.build(module.id, "aws_vm", function(modobj, compobj) {
+        require("./serviceAws.nlg")
+        compobj.manifest = manifest
+        http = require("naanlib:frameworks/node/http_request.nlg")
+        module.exports.VmControl = VmControl
+    })
+} ();

package/plugins/serviceGC/gc_api.nlg

@@ -83,6 +83,7 @@ closure GcApi(options, local gcapi, cacert, renew, access_token, expires_at) {
         `(error, data, status) = https.HttpsApiRequest(url, {
             putdata: put || undefined
             cacert: cacert || undefined
+            debug: options.debug || undefined
             headers: [
                 `(Accept, "application/json"),
                 list(`Authorization, "Bearer ".concat(access_token))

package/plugins/serviceNexara/serviceNexara.nlg

@@ -0,0 +1,32 @@
+/*
+ * serviceNexara.nlg
+ * serviceNexara
+ *
+ * Nexara speech recognition.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2025 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * senexInit
+ *
+ *     Initialize the module.
+ *
+ */
+
+function senexInit(local manifest) {
+    manifest = `(senexInit)
+    Naan.module.build(module.id, "serviceNexara", function(modobj, compobj) {
+        compobj.manifest = manifest
+        require("naanlib:frameworks/common").LiveImport()
+        nodeLib = require("naanlib:plugins/nodeLib/node_util.nlg")
+        if js.g
+            https = require("naanlib:frameworks/node/https_request.nlg")
+        else
+            https = require("naanlib:frameworks/browser/https_request.nlg")
+    })
+} ();

package/plugins/serviceNexara/speechrec.nlg

@@ -0,0 +1,160 @@
+/*
+ * speechrec.nlg
+ * Nexara
+ *
+ *     Access to Nexara speech to text recognition.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2025 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * NexaraSpeechRec
+ *
+ * Speech recognition object.
+ *
+ */
+
+closure NexaraSpeechRec(local nxspr) {
+    global(https, nodeLib)
+    nxspr = new(object, this)
+    nxspr.recogURL = "https://api.nexara.ru/api/v1/audio/transcriptions"
+
+    // login
+    //
+    // creds:
+    //  {
+    //      apiKey:     <string>                // e.g. nx-xxxxx
+    //  }
+    //
+    nxspr.login = closure login(creds) {
+        nxspr.creds = creds
+        list(false, { ok: true })
+    }
+
+    // recog
+    //
+    // Recognize text from the specified audio.
+    //
+    // Available options are:
+    //  {
+    //      language:   <string>                // optional: e.g. "ru-RU", "en-US"
+    //      model:      <string>                // optional: e.g. "whisper-1"
+    //      debug:      <boolean>               // extra debug logging for https request
+    //  }
+    //
+    // This returns an Operation object containing the ID of the asynchronous recognition operation:
+    //  {
+    //      done:       true                    // recognition complete
+    //      createdAt:  <date>                  // when operation started
+    //      modifiedAt: <date>                  // last modified
+    //      response: {
+    //          "@type":    <string>            // gRPC type
+    //          chunks:     <array>             // array of chunks
+    //      }
+    //  }
+    //
+    nxspr.recog = closure recog(audioBlob, options, local start, params, form, error, data) {
+        start = Date()
+        params = {
+            language: options.language.substring(0,2) || undefined
+            model: options.model || "whisper-1"
+            response_format: "verbose_json",
+            timestamp_granularities: ["word", "segment"]
+            file: audioBlob
+        }
+        form = nodeLib.MultipartBody(params)
+        `(error, data) = https.HttpsApiRequest(nxspr.recogURL, {
+            method: "POST"
+            putdata: form.body
+            headers: [
+                list("Authorization", "Bearer ".concat(nxspr.creds.apiKey))
+                list("Content-Type", form.headers."Content-Type")
+                list("Content-Length", form.headers."Content-Length")
+            ]
+            debug: options.debug || undefined
+        })
+        if error
+            list(Error("NexaraSpeechRec.recog failed:", error))
+        else if !(data.segments.length > 0) {
+            debuglog("NexaraSpeechRec.recog: no valid segments returned.")
+            printline("Nexara response:", Dialect.print(new(data)))
+            list(Error("NexaraSpeechRec.recog empty result"))
+        } else {
+            if options.dump
+                printline(Dialect.print(new(data)))
+            list(false, {
+                done: true
+                createdAt: start
+                modifiedAt: Date()
+                response: nexaraToYCSK(data)
+            })
+        }
+    }
+    
+    // nexaraToYCSK
+    //
+    // Convert a Nexara response to a Yandex SpeechKit structure. Hey, it was first.
+    //
+    function nexaraToYCSK(resp,
+        local output, wordx, segment, chunk, word, wordet) {
+        output = {
+            \@type: "type.googleapis.com/yandex.cloud.ai.stt.v2.LongRunningRecognitionResponse"
+            chunks: []
+            language: resp.language
+        }
+        wordx = 0
+        for segment in resp.segments {
+            if segment.text == ""
+                continue                                                    // empty segment
+            chunk = {
+                channelTag: "1"
+                alternatives: [
+                    {
+                        words: []
+                        text: segment.text
+                    }
+                ]
+            }
+            for word in segment.text.split(" ") {
+                wordet = resp.words[wordx++]
+                if wordet.word != word {
+                    debuglog("nexaraToYCSK: expected ${word} but got ${wordet.word}")
+                    return (false)
+                }
+                chunk.alternatives.0.words.push({
+                    word: wordet.word
+                    startTime: wordet.start.toFixed(3).concat("s")
+                    endTime: wordet.end.toFixed(3).concat("s")
+                })
+            }
+            output.chunks.push(chunk)
+        }
+        output
+    }
+
+    // finis
+    nxspr
+}
+
+
+/*
+ * nexaraInit
+ *
+ *     Initialize the module.
+ *
+ */
+
+function nexaraInit(local manifest) {
+    manifest = `(NexaraSpeechRec, nexaraInit)
+
+    Naan.module.build(module.id, "speechrec", function(modobj, compobj) {
+        require("./serviceNexara.nlg")
+        compobj.manifest = manifest
+        modobj.exports.NexaraSpeechRec = NexaraSpeechRec
+    })
+
+} ();

package/plugins/serviceYC/serviceYC.nlg

@@ -50,9 +50,8 @@ function seycInit(local manifest) {
     Naan.module.build(module.id, "serviceYC", function(modobj, compobj) {
         compobj.manifest = manifest
         require("naanlib:frameworks/common").LiveImport()
-        if js.g {
-            nodeHttp = js.r("http")
-            https = require("naanlib:frameworks/node/https_request.nlg") }
+        if js.g
+            https = require("naanlib:frameworks/node/https_request.nlg")
         else
             https = require("naanlib:frameworks/browser/https_request.nlg")
         module.exports.YcRequest = YcRequest

package/plugins/serviceYC/yc_speechrec.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2024 by Richard C. Zulch
+ * Copyright (c) 2024-2025 by Richard C. Zulch
  *
  */
 
@@ -18,7 +18,8 @@
  *
  */
 
-closure YCSpeechRec(options, local ycspr) {
+closure YCSpeechRec(local ycspr) {
+    global(https)
     ycspr = new(object, this)
     ycspr.recogURL = "https://transcribe.api.cloud.yandex.net/speech/stt/v2/longRunningRecognize"
     ycspr.checkURL = "https://operation.api.cloud.yandex.net/operations/"
@@ -55,7 +56,7 @@ closure YCSpeechRec(options, local ycspr) {
     //      }
     //  }
     //
-    ycspr.startRecog = closure startRecog(audioURI, options, local error, data) {
+    ycspr.startRecog = closure startRecog(audioURI, options, local params, error, data) {
         params = {
             config: {
                 specification: {