@naanlang/naan 1.2.0 → 1.3.0

package/plugins/serviceYC/yc_function.nlg

@@ -0,0 +1,163 @@
+/*
+ * yc_function.nlg
+ * serviceYC
+ *
+ *     Access to serverless function management services for YC.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2022 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * YCFunction
+ *
+ *     YCFunction manipulation functions.
+ *
+ */
+
+closure YCFunction(local ycfun) {
+    ycfun = new(object, this)
+
+    //
+    // login
+    //
+    ycfun.login = closure login(creds) {
+        ycfun.creds = creds
+        list(false, { ok: true })
+    }
+    
+    //
+    // getFunction
+    //
+    // Get basic function info like:
+    //  {
+    //      id           : "d4er5sq67r5j47nno6nb",
+    //      folderId     : "b1gjjahqm5u9tjolom9l",
+    //      createdAt    : "2022-08-30T00:57:18.024Z",
+    //      name         : "hello-world",
+    //      description  : "A quick first function.",
+    //      logGroupId   : "ckgbmh6df6dt92pphc6b",
+    //      httpInvokeUrl: "https://functions.yandexcloud.net/d4er5sq67r5j47nno6nb",
+    //      status       : "ACTIVE"
+    //  }
+    //
+    ycfun.getFunction = closure getFunction(funcID, local url, error, data) {
+        debuglog("YCFunction.getFunction", funcID)
+        url = "https://serverless-functions.api.cloud.yandex.net/functions/v1/functions/".concat(funcID)
+        `(error, data) = YcRequest(url, ycfun.creds, {
+            query: { x: 1 }
+        })
+        if error
+            debuglog("YCFunction.getFunction failed:", ErrorString(error))
+        list(error, data)
+    }
+
+    //
+    // getVersionByTag
+    //
+    // Get info about a specific function version using its tag, e.g. $latest:
+    //  {
+    //      resources       : { memory: "134217728" },
+    //      tags            : ["$latest"],
+    //      id              : "d4evm4lsi91hqkv78ane",
+    //      functionId      : "d4er5sq67r5j47nno6nb",
+    //      createdAt       : "2022-08-31T03:32:59.577Z",
+    //      runtime         : "nodejs16",
+    //      entrypoint      : "index.handler",
+    //      executionTimeout: "3s",
+    //      serviceAccountId: "aje9s3df60gofsddio0c",
+    //      imageSize       : "4096",
+    //      status          : "ACTIVE",
+    //      logGroupId      : "ckgbmh6df6dt92pphc6b" }
+    //  }
+    //
+    ycfun.getVersionByTag = closure getVersionByTag(funcID, tag, local url, error, data) {
+        url = "https://serverless-functions.api.cloud.yandex.net/functions/v1/versions:byTag".concat(
+            EncodeQuery("?", {
+                functionId: funcID
+                tag: tag
+            }))
+        `(error, data) = YcRequest(url, ycfun.creds, {
+            query: { x: 1 }
+        })
+        if error
+            debuglog("YCFunction.getVersionByTag failed:", ErrorString(error))
+        list(error, data)
+    }
+
+    //
+    // invokeFunction
+    //
+    // Invoke a public cloud function. It is impossible to invoke a private cloud function from 
+    // browsers because the function cannot respond to a CORS authorization request using the OPTIONS
+    // method without an authorization header that cannot be added to the preflight.
+    //
+    ycfun.invokeFunction = closure invokeFunction(funcID, local url, error, data) {
+        url = "https://functions.yandexcloud.net/".concat(funcID)
+        `(error, data) = https.HttpsApiRequest(url, {
+            query: { x: 1 }
+        })
+        if error
+            debuglog("YCFunction.invokeFunction failed:", ErrorString(error))
+        list(error, data)
+    }
+
+    //
+    // updateFunctionCode
+    //
+    //
+    ycfun.updateFunctionCode = closure updateFunctionCode(info, bucket, key, sha256,
+        local url, params, error, data) {
+        params = {
+            function_id:        info.functionId
+            functionID:         info.functionId
+            runtime:            info.runtime
+            description:        "Updated: ".concat(Date())
+            entrypoint:         info.entrypoint
+            resources:          info.resources
+            executionTimeout:   info.executionTimeout
+            serviceAccountId:   info.serviceAccountId
+            package: {
+                bucketName:     bucket
+                objectName:     key
+                sha256:         sha256
+            }
+        }
+        if info.environment
+            params.environment = info.environment
+        if info.logOptions
+            params.logOptions = info.logOptions
+        url = "https://serverless-functions.api.cloud.yandex.net/functions/v1/versions"
+        `(error, data) = YcRequest(url, ycfun.creds, {
+            putdata: params
+        })
+        if error
+            debuglog("YCFunction.updateFunctionCode failed:", ErrorString(error))
+        list(error, data)
+    }
+
+    // finis
+    ycfun
+}
+
+
+/*
+ * ycFunctionInit
+ *
+ *     Initialize the module.
+ *
+ */
+
+function ycFunctionInit(local manifest) {
+    manifest = `(YCFunction, ycFunctionInit)
+
+    Naan.module.build(module.id, "yc_function", function(modobj, compobj) {
+        require("./serviceYC.nlg")
+        compobj.manifest = manifest
+        modobj.exports.YCFunction = YCFunction
+    })
+
+} ();

package/plugins/serviceYC/yc_vm.nlg

@@ -0,0 +1,207 @@
+/*
+ * yc_vm.nlg
+ * serviceYC
+ *
+ *     YC VM inquiry and control.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2024 by Richard C. Zulch
+ *
+ */
+
+vmState = false;
+
+/*
+ * VmControl
+ *
+ * When run on a YC VM instance, this class can acquire useful VM information and perform selected
+ * operations. At the present time it can obtain the identity document with instanceID, auth token,
+ * and shut down the VM.
+ *
+ */
+
+closure VmControl(local ycvm) {
+    global(https, nodeHttp, vmState)
+    if vmState.ycvm
+        return (vmState.ycvm)                                               // singleton
+    ycvm = new(object, this)
+    vmState = new(nonce)                                                    // don't save with state
+    vmState.ycvm = ycvm
+
+    // httpLocalRequest
+    //
+    // Make a simple GET request for the Docker's 169.254.169.254 metadata interface. This is not
+    // supported by the standard NaaN framework HttpsApiRequest because it is HTTP and returns JSON
+    // without bothering to set a contentType advising this.
+    //
+    
+    closure httpLocalRequest(url, params, local pending, chunks, request) {
+        pending = new(nonce)
+        chunks = []
+        request = nodeHttp.request(url, params, closure (response) {
+            response.on("data", function (chunk) {
+                chunks.push(chunk)
+            })
+            response.on("end", function (local content, error) {
+                content = js.g.Buffer.concat(chunks)
+                if response.statusCode < 200 || response.statusCode >= 299 {    // 299 is "cancelled"
+                    debuglog("httpRequest status:", url, response.statusCode, "message:", content)
+                    pending.signal(list(Error("httpRequest statusCode:", url, response.statusCode, {
+                        status: response.statusCode
+                    }), false, { status: response.statusCode }))
+                    return
+                }
+                if response.complete {
+                    try {
+                        content = js.g.JSON.parse(content.toString())
+                    } catch {
+                        error = Error("httpRequest decode:", url, exception)
+                    }
+                }
+                else
+                    error = Error("httpRequest terminated prematurely:", url, response.statusCode)
+                pending.signal(list(error, content, {
+                    headers: response.headers
+                    status: response.statusCode
+                    contentType: response.headers["content-type"]
+                }))
+            })
+        })
+        request.on("error", function hre(error) {
+            debuglog("httpRequest error:", url, "error:", error)
+            error = Error("httpRequest failed:", url, error)
+            pending.signal(list(error))
+        })
+        request.end()
+        pending.wait()
+    }
+
+    // getIdentityDoc
+    //
+    // Ask the VM for its identity document. This information does not change.
+    //
+    // How to get instanceID from "identity document":
+    //  curl -H Metadata-Flavor:Google 169.254.169.254/computeMetadata/v1/instance/vendor/identity/document
+    //      {"instanceId":"epd15j0nbbp0mgs9p9ra","productCodes":null,"imageId":"fd8ru2jkl1laurb1emo7", \
+    //      "productIds":["f2eo49853qme9iril0tp"],"createdAt":"2024-06-15T18:12:50Z","version":"2023-03-01"}
+    //
+    closure getIdentityDoc(local error, idDoc) {
+        if ycvm.idDoc
+            return (list(false, ycvm.idDoc))
+        `(error, idDoc) = httpLocalRequest("http://169.254.169.254/computeMetadata/v1/instance/vendor/identity/document", {
+            headers: {
+                "Metadata-Flavor": "Google"
+            }
+        })
+        if error
+            list(error)
+        else
+            list(false, ycvm.idDoc = idDoc)
+    }
+
+    // getAuthDoc
+    //
+    // Ask the VM for an auth token so we can call YC APIs using the VM's permissions. This expires
+    // so we keep track of when to call it again.
+    //
+    // How to get auth token:
+    //  curl -H Metadata-Flavor:Google 169.254.169.254/computeMetadata/v1/instance/service-accounts/default/token
+    //      {"access_token":"t1.9euelZqVjY2Tk8rIlYyQnpGPjZbJmO3rnpWazpqcmJ6dnJKLzoqKlJeOmpHl9PdVKkhM-e8lZC_l3fT \
+    //      3FVlFTPnvJWQv5c3n9euelZqLlJaSnZaUypaYzc_Pnc2Mme_8xeuelZqLlJaSnZaUypaYzc_Pnc2Mmb3rnpWanZ2WnpaPysfNzc \
+    //      eUy8zOmI-13oac0ZyQko-Ki5rRi5nSnJCSj4qLmtKSmouem56LntKMng.-wi4CzEJbPX5ume3Ma_P7nZG-g0YRCQ2P4l2koIRYV \
+    //      drsy9QGHR5JEx2zD--xtvXGBBCbZNo-I41GdjEb_IPCg","expires_in":41998,"token_type":"Bearer"}
+    //
+    closure getAuthDoc(local now, error, authDoc, expireTime) {
+        now = milliseconds()
+        if ycvm.authDoc && ycvm.authDocExpire > milliseconds()
+            return (list(false, ycvm.authDoc))                              // use cached credential
+        `(error, authDoc) = httpLocalRequest("http://169.254.169.254/computeMetadata/v1/instance/service-accounts/default/token", {
+            headers: {
+                "Metadata-Flavor": "Google"
+            }
+        })
+        if authDoc {
+            expireTime = now + (authDoc.expires_in - 3600) * 1000           // give us 1 hour of margin
+            if !expireTime || expireTime < now + 3600000 {                  // if not at least one hour from now
+                debuglog("YcVmControl.getAuthDoc: invalid credential expires_in", authDoc.expires_in)
+                expireTime = now + 3600000
+            }
+            ycvm.authDocExpire = expireTime
+            ycvm.authDoc = authDoc
+        }
+        if error
+            list(error)
+        else
+            list(false, authDoc)
+    }
+    
+    // authHeader
+    //
+    // Return authorization header for the VM to be used in API requests to YC, as a result tuple.
+    // The returned header is a list: (`Authorization, "Bearer <token>")
+    //
+    ycvm.authHeader = closure authHeader(error, authDoc) {
+        `(error, authDoc) = getAuthDoc()
+        if error
+            list(error)
+        else
+            list(false, list(`Authorization, "${authDoc.token_type} ${authDoc.access_token}"))
+    }
+    
+    // shutdownVM
+    //
+    // Tell YC to shutdown our VM.
+    //
+    //  curl -X POST -H "Authorization:Bearer <token>" \
+    //      https://compute.api.cloud.yandex.net/compute/v1/instances/epd15j0nbbp0mgs9p9ra:stop
+    //  {
+    //      "done": false,
+    //      "metadata": {
+    //          "@type": "type.googleapis.com/yandex.cloud.compute.v1.StopInstanceMetadata",
+    //          "instanceId": "epd15j0nbbp0mgs9p9ra"
+    //      },
+    //      "id": "epdnbllb1cgtmukpt1aq",
+    //      "description": "Stop instance",
+    //      "createdAt": "2024-06-15T19:47:40.315889611Z",
+    //      "createdBy": "aje1ecgabcmt1uukhqen",
+    //      "modifiedAt": "2024-06-15T19:47:40.315889611Z"
+    //  }
+    //
+    ycvm.shutdownVM = closure shutdownVM(local error, idDoc, header, data) {
+        `(error, idDoc) = getIdentityDoc()
+        if !error
+            `(error, header) = authHeader()
+        if !error
+            `(error, data) = https.HttpsApiRequest("https://compute.api.cloud.yandex.net/compute/v1/instances/${idDoc.instanceId}:stop", {
+                method: "POST"
+                headers: [ header ]
+            })
+        if error
+            list(error)
+        else
+            list(false, data)
+    }
+
+    // finis
+    
+    ycvm
+};
+
+
+/*
+ * ycvmInit
+ *
+ *     Initialize the module.
+ *
+ */
+
+function ycvmInit(local manifest) {
+    manifest = `(vmState, VmControl, ycvmInit)
+
+    Naan.module.build(module.id, "yc_vm", function(modobj, compobj) {
+        require("./serviceYC.nlg")
+        compobj.manifest = manifest
+        module.exports.VmControl = VmControl
+    })
+} ();

package/test/test_02_context.nlg

@@ -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));", "172"],
+    [ "length(symlist(nsactive(true).0));", "171"],
     [ "testvar;", "testvar" ],
     [ "function setTestvar(v) { testvar=v };", "setTestvar" ],
     [ "naanvar;", "naanvar" ],

package/test/test_03_jsinterop.nlg

@@ -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: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[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: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
     }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],

package/test/test_05_strings.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2023 by Richard C. Zulch
+ * Copyright (c) 2017-2024 by Richard C. Zulch
  *
  */
 
@@ -52,11 +52,14 @@ RegisterTestCategory("strings", [
     // template strings
     //
 
-    [ "'$${4+3}';", '"7"' ],                                                // these have an extra $escape
+    [ "'$${4+3}';", '"7"' ],                                                // needs extra $escape to be source
     [ "'$$${4+3}';", '"$${4+3}"' ],
     [ "'a$${4+3}b';", '"a7b"' ],
-    [ "'$${}';", '' ],
-    [ "'$${';", '' ],                                                       // ### should be "${"
+    [ "'$${}';", { errors: "incomplete expression at (1, 3) found ;" } ],
+    [ "'$${';", '"${"' ],
+    [ "'$$${';", '"$${"' ],
+    [ "'a$${\"\"}z';", '"az"'],
+    [ "'a$$${}z';", '"a$${}z"'],
     [ "quote('a$${4*5}b');>", '(strcat "a" (* 4 5) "b")' ],
 
 

package/test/test_07_lingo.nlg

@@ -192,7 +192,7 @@ RegisterTestCategory("Lingo", [
     [ "macro(x){x.c=5}({a:3,b:4});", { errors: "can't modify NaanConst::Dictionary{2} from Test-Lingo" } ],
     [ "macro(x){x[1]=6}([3,4,5]);", { errors: "can't modify NaanConst::Array[3] from Test-Lingo" } ],
 
-    [ "js.*;", '("n", "o", "i", "d", "g", "r", "t")' ],
+    [ "js.*;", '("n", "o", "i", "d", "g", "r", "t", "k")' ],
     
     [ "[1,2,3].concat(4,5,6);", "[1, 2, 3, 4, 5, 6]" ],
     [ "[1,2,3].concat([4,5,6]);", "[1, 2, 3, 4, 5, 6]" ],