@naanlang/naan 1.4.2 → 1.4.4

package/plugins/serviceYC/yc_vm.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2024 by Richard C. Zulch
+ * Copyright (c) 2024-2025 by Richard C. Zulch
  *
  */
 
@@ -22,61 +22,13 @@ vmState = false;
  */
 
 closure VmControl(local ycvm) {
-    global(js, https, nodeHttp, vmState)
+    global(js, https, http, 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.
@@ -89,10 +41,11 @@ closure VmControl(local ycvm) {
     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", {
+        `(error, idDoc) = http.HttpRequest("http://169.254.169.254/computeMetadata/v1/instance/vendor/identity/document", {
             headers: {
                 "Metadata-Flavor": "Google"
             }
+            json: true
         })
         if error
             list(error)
@@ -116,10 +69,11 @@ closure VmControl(local ycvm) {
         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", {
+        `(error, authDoc) = http.HttpRequest("http://169.254.169.254/computeMetadata/v1/instance/service-accounts/default/token", {
             headers: {
                 "Metadata-Flavor": "Google"
             }
+            json: true
         })
         if authDoc {
             expireTime = now + (authDoc.expires_in - 3600) * 1000           // give us 1 hour of margin
@@ -135,7 +89,7 @@ closure VmControl(local ycvm) {
         else
             list(false, authDoc)
     }
-    
+
     // authHeader
     //
     // Return authorization header for the VM to be used in API requests to YC, as a result tuple.
@@ -148,7 +102,42 @@ closure VmControl(local ycvm) {
         else
             list(false, list(`Authorization, "${authDoc.token_type} ${authDoc.access_token}"))
     }
-    
+
+    // getHostname
+    //
+    // Ask the VM for its FQDN.
+    //
+    //  curl -H Metadata-Flavor:Google 169.254.169.254/computeMetadata/v1/instance/hostname
+    //      tutorbe-1.ru-central1.internal
+    //
+    ycvm.getHostname = closure getHostname(local error, hostname) {
+        `(error, hostname) = http.HttpRequest("http://169.254.169.254/computeMetadata/v1/instance/hostname", {
+            headers: [ list("Metadata-Flavor", "Google") ]
+        })
+        if error
+            list(error)
+        else
+            list(false, hostname)
+    }
+
+    // getUserData
+    //
+    // Ask the VM for its user-data configuration.
+    //
+    //  curl -H Metadata-Flavor:Google 169.254.169.254/computeMetadata/v1/instance/hostname
+    //      #cloud-config
+    //      <...yaml...>
+    //
+    ycvm.getUserData = closure getUserData(local error, userData) {
+        `(error, userData) = http.HttpRequest("http://169.254.169.254/latest/user-data", {
+            headers: [ list("Metadata-Flavor", "Google") ]
+        })
+        if error
+            list(error)
+        else
+            list(false, userData)
+    }
+
     // shutdownVM
     //
     // Tell YC to shutdown our VM.
@@ -202,6 +191,7 @@ function ycvmInit(local manifest) {
     Naan.module.build(module.id, "yc_vm", function(modobj, compobj) {
         require("./serviceYC.nlg")
         compobj.manifest = manifest
+        http = require("naanlib:frameworks/node/http_request.nlg")
         module.exports.VmControl = VmControl
     })
 } ();

package/test/test_01_core.nlg

@@ -558,42 +558,11 @@ RegisterTestCategory("core", [
     [ "function testret x { loop { loop { return(77) } } };", "testret" ],
     [ "testret();", "77" ],
 
-
     //
-    // objects
+    // dictionaries
     //
-    
-    [ "new();", "false" ],
-    [ "testo=new(object);", "Object{0}" ],
-    [ "testo.a=3;", "3" ],
-    [ "testo;", "Object{1}" ],
-    [ "testo.b=4;", "4" ],
-    [ "b=a;", "a" ],
-    [ "testo.b;", "4" ],
-    [ "testo;", "Object{2}" ],
-    [ "totuple(testo);>", "((\"a\" . 3) (\"b\" . 4))" ],
-    [ "testo1=new(testo);", "Object{2}" ],
-    [ "totuple(testo1);>", "((\"a\" . 3) (\"b\" . 4))" ],
-    [ "testo1.b=5;", "5" ],
-    [ "testo.b;", "4" ],
-    [ "testo.\"b\";", "4" ],
-    [ "xget(testo,\"b\");", "4" ],
-    [ "xget(testo,b);", "3" ],              // b has value `a, and test.a is 3
-    [ "testo.f = function(x) { x+1 };>", "(function lambda (x) (+ x 1))" ],
-    [ "testo.f(5);", "6" ],
-    [ "apply(deref(testo, \"f\"), list(6));", "7" ],
-    
-    [ "testo.length = 5;", "5" ],
-    [ "testo.length;", "5" ],
-    [ "length(testo);", "4" ],
-    [ "xget(testo, length);", "5" ],
-    [ "xkeys(testo);>", "(\"a\" \"b\" \"f\" \"length\")" ],
-    [ "totuple(testo);>", "((\"a\" . 3) (\"b\" . 4) (\"f\" function lambda (x) (+ x 1)) (\"length\" . 5))" ],
 
-    [ "testo1.4=c;", "c" ],
-    [ "testo1.4;", "c" ],
-    
-    [ "this = true;", { errors: "can't modify NaanCore::this from Test-core" } ],
+    [ "b=a;", "a" ],                                                        // testing eval here
 
     [ "joe={};", "{ }" ],
     [ "joe.sam=function(x) { print(x, \"|\", keys(joe)) };>", "(function lambda (x) (print x \"|\" (keys joe)))" ],
@@ -637,6 +606,46 @@ RegisterTestCategory("core", [
     ["merge(oo, list(1.0/3), {false:c});", "{ true: a, false: c }"],
     ["oo;", "{ true: a, 0.3333333333333333: b }"],
 
+    ["joe={a:3}; {b:joe} == {b:joe}", "{ a: 3 }|true"],
+    ["joe === joe", "true"],
+    ["{b:joe} === {b:joe}", "false"],
+
+
+    //
+    // objects
+    //
+    
+    [ "new();", "false" ],
+    [ "testo=new(object);", "Object{0}" ],
+    [ "testo.a=3;", "3" ],
+    [ "testo;", "Object{1}" ],
+    [ "testo.b=4;", "4" ],
+    [ "testo.b;", "4" ],
+    [ "testo;", "Object{2}" ],
+    [ "totuple(testo);>", "((\"a\" . 3) (\"b\" . 4))" ],
+    [ "testo1=new(testo);", "Object{2}" ],
+    [ "totuple(testo1);>", "((\"a\" . 3) (\"b\" . 4))" ],
+    [ "testo1.b=5;", "5" ],
+    [ "testo.b;", "4" ],
+    [ "testo.\"b\";", "4" ],
+    [ "xget(testo,\"b\");", "4" ],
+    [ "xget(testo,b);", "3" ],              // b has value `a, and test.a is 3
+    [ "testo.f = function(x) { x+1 };>", "(function lambda (x) (+ x 1))" ],
+    [ "testo.f(5);", "6" ],
+    [ "apply(deref(testo, \"f\"), list(6));", "7" ],
+    
+    [ "testo.length = 5;", "5" ],
+    [ "testo.length;", "5" ],
+    [ "length(testo);", "4" ],
+    [ "xget(testo, length);", "5" ],
+    [ "xkeys(testo);>", "(\"a\" \"b\" \"f\" \"length\")" ],
+    [ "totuple(testo);>", "((\"a\" . 3) (\"b\" . 4) (\"f\" function lambda (x) (+ x 1)) (\"length\" . 5))" ],
+
+    [ "testo1.4=c;", "c" ],
+    [ "testo1.4;", "c" ],
+    
+    [ "this = true;", { errors: "can't modify NaanCore::this from Test-core" } ],
+
     //
     // object getters/setters
     //

package/test/test_03_jsinterop.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -135,8 +135,8 @@ RegisterTestCategory("JSinterop", [
     "        print(\"in-\", x, \"-\", nthl.0)\n"
     "    } }" ],
 
-    [ "Array(0,1,2,3,4,5,6,7,8,9,10).filter(function&(nth) { stacktrap(nth,function&() { print(\"in-\",nth, \" \") }) });",
-        { text: "in-0 in-1 in-nth in-nth in-nth in-nth in-nth in-nth in-nth in-nth in-nth" } ],
+    [ "Array(0,1,2,3,4,5,6,7,8,9,10).filter(closure(nth) { stacktrap(nth,function() { print('in-', nth, space) }) });",
+        { text: "in-0 in-1 in-2 in-3 in-4 in-5 in-6 in-7 in-8 in-9 in-10" } ],
         
     [ "loop { stacktrap(0,function&(x) { print(\"loop-\",x) }), break };", "loop-Dictionary{0}|{ }" ],
     [ "loop { stacktrap(1,function&(x) { print(\"loop-\",x) }), break };", "loop-Dictionary{0}|{ }" ],