@naanlang/naan 1.6.0 → 1.7.1

package/frameworks/client/psm_client.nlg

@@ -634,18 +634,14 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
             else {
                 api = connector.apis[creds.urlName]
                 if !api {                                                   // create API to remote server
-                    connector.apis[creds.urlName] = api = APIClient({
+                    api = APIClient(App.imp, {
                         url: creds.urlName
                         guid: creds.authSecret
-                        instanceID: creds.instanceID
                     })
-                    if creds.instanceID != api.instanceID {                 // update our client instanceID
-                        creds.instanceID = api.instanceID
-                        `(error) = connector.vault.updateResource(resID, creds)
-                    }
-                }
-            }
-        }
+                    `(error) = api.connect()
+                    if !error
+                        connector.apis[creds.urlName] = api
+                } } }
         if error
             list(error)
         else if service == "NideTerminal" {
@@ -653,11 +649,11 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
                 return (list(Error("NideTerminal not supported in this environment")))
             list(false, App.nide.track.spawn(App.nide.registerRemote(api),
                 args.0,                                                     // terminal display name
-                args.1))                                                    // options:
-                    // {
-                    //      workerID: "NideServer"  -- for main thread; other strings for worker threads
-                    //      type: "My Remotes"      -- display name of terminal group; e.g. URL
-                    // }
+                merge(args.1, {
+                    serverID: api.serverID                                  // server we found
+                    // workerID: "NideServer"  -- for main thread; other strings for worker threads
+                    // type: "My Remotes"      -- display name of terminal group; e.g. URL
+                })))                                                    // options:
         }
         else if service == "NideHostAPI"
             list(false, api)                                                // connect to the Host API

package/frameworks/client/relaycon.nlg

@@ -52,7 +52,7 @@ closure RelayCon(imp, options, local relay, nlregex)
         serverID: "Workers"
         workerID: "NideServer"
     }, options.config)
-    relay.instanceID = UUID()
+    relay.instanceID = imp.getUUID("RelayCon(${options.name}) instanceID")
     relay.exec = execsMod.ExecutorBase(false, "Host", options.name)
     nlregex = RegExp("\\n", "g")
 

package/frameworks/common/common.nlg

@@ -247,17 +247,21 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
 macro LiveExport() {
     global()
     closure (exporterMod, local importList) {
+        if !exporterMod
+            return (false)                                                  // no module (e.g. build time)
         importList = []
         //
         // LiveImport
-        // Return a new LiveImport function to be exported by the module who called MakeLiveImport.
+        // Return a new LiveImport function to be exported by the module who called LiveExport.
         //
-        macro LiveImport(fixproc, local importingMod, mdex, updater) {
+        macro LiveImport(fixproc, local importingMod, item, updater) {
             importingMod = car(nsrights().lookup("module"))
-            mdex = importList.indexOf(importingMod)
-            if mdex >= 0
-                updater = importList[mdex]                                  // already registered
-            else {
+            for item in importList
+                if item.proc.1.namespace === importingMod.namespace {
+                    updater = item
+                    break
+                }
+            if !updater {
                 updater = closure(importingMod, fixproc) {                  // create new updater
                     putproc(compress(updateImports), function updateImports(local goback) {
                         if importingMod !== exporterMod {
@@ -267,10 +271,10 @@ macro LiveExport() {
                         try {
                             call(fixproc, exporterMod)                      // let caller do any fixups
                         } catch {
-                            if (true)
-                                debuglog("LiveImport fixup failed in", nsrights(), "exception:", exception)
+                            debuglog("LiveImport fixup failed in", nsrights(), "exception:", exception)
+                        } finally {
+                            goback()
                         }
-                        goback()
                     })
                     updateImports
                 } (importingMod, eval(fixproc))

package/frameworks/node/apiserver.nlg

@@ -44,7 +44,7 @@ closure APIServer(options, local server, chroot) {
     server.guid = options.guid
     server.notifyq = []
     server.responseq = []
-    server.instanceID = UUID()
+    server.instanceID = App.imp.getUUID("APIServer instanceID")
     options = merge({
         relpath: ""
         name: "NaanServer"
@@ -126,7 +126,6 @@ closure APIServer(options, local server, chroot) {
             return (list(error))
         }
         server.hostfs = hostfs
-        server.workco = workerMod.WorkerController()
         server.Register(server.workco.serverID, server.workco)
 
         list(false, port)

package/frameworks/node/node.nlg

@@ -124,6 +124,7 @@ function nodrInit(local manifest) {
         throw("module frameworks/node cannot be used from a browser")
     Naan.module.build(module.id, "node", function(modobj, compobj) {
         require("../common/").LiveImport()
+        require("../common/events.nlg")
         commonWatching = require("../common/watching.nlg")
         compobj.manifest = manifest
         function nodrReload() {

package/frameworks/node/pty.nlg

@@ -102,8 +102,9 @@ closure ptyManagerMain(local ptym, pty) {
     //
     // Close the pty manager, killing any open spawned processes.
     //
-    ptym.close = closure close() {
-        // ### kill any open spawned processes
+    ptym.close = closure close(local worker) {
+        for worker in ptym.workers
+            worker.kill()
     }
 
     // spawn
@@ -111,14 +112,16 @@ closure ptyManagerMain(local ptym, pty) {
     // Spawn a new pty process, returning a result tuple. If executable is omitted then a shell is
     // spawned.
     // 
-    // options:
+    // options: (all optional)
     //  {
-    //      workerGUID: <string>                // if specified, kills pty process when worker terminates
+    //      cwd:        <string>                // current working directory
+    //      env:        <string>                // environment
+    //      raw:        <boolean>               // enable raw mode with ioctls
     //  }
     // 
     //
     ptym.spawn = closure spawn(executable, args, notify, options,
-        local ptySpawned, ptypro) {
+        local error, ptySpawned, ptypro) {
 
         if !executable {
             if os.platform() == "win32"
@@ -136,6 +139,10 @@ closure ptyManagerMain(local ptym, pty) {
             env: js.g.process.env
         }, options)
 
+        `(error) = open()                                                   // ensure we're open
+        if error
+            return (list(error))
+
         ptySpawned = pty.spawn(executable, args, {                          // spawn the pty process
             name: options.name
             cols: options.cols
@@ -147,7 +154,6 @@ closure ptyManagerMain(local ptym, pty) {
         ptypro = ptyProcess(ptySpawned, notify)
         ptym.workers.push({                                                 // track all pty processes
             pid: ptySpawned.pid
-            workerGUID: options.workerGUID || undefined
             ptySpawned: ptySpawned
         })
 
@@ -160,19 +166,6 @@ closure ptyManagerMain(local ptym, pty) {
             ptypro.killed(event)
         })
 
-        if options.workerGUID
-            WorkerController().watcher.watch(
-                function(action, worker, local ptydex) {                    // worker-owner of pty process died
-                    if action == "terminated" {
-                        ptydex = ptym.workers.findIndex(function(item) {
-                            options.workerGUID == item.workerGUID
-                        })
-                        if ptydex >= 0 {
-                            ptySpawned.kill()
-                            ptym.workers.splice(ptydex)
-                        }
-                    }
-                })
         list(false, ptypro)
     }
 
@@ -238,7 +231,14 @@ closure ptyProcess(ptySpawned, notify, local ptyp) {
     // Kill the spawned process.
     //
     ptyp.kill = closure kill(signame) {
-        ptySpawned.kill(signame)
+        if signame
+            ptySpawned.kill(signame)                                        // use caller signal
+        else {
+            ptySpawned.kill("SIGTERM")                                      // SIGTERM/SIGKILL sequence
+            sleep(1000)
+            if ptySpawned
+                ptySpawned.kill("SIGKILL")
+        }
     }
 
     // finis
@@ -268,7 +268,7 @@ closure ptyManagerWorker(local ptyw, mainContext, mainPty) {
         }
 
         if !mainContext {
-            `(error, main) = require("naanlib:frameworks/running/mainthread.nlg").MainThread()
+            `(error, main) = require("naanlib:frameworks/running/remote_req.nlg").MainThread()
             if !error
                 `(error, mainContext) = main.context()
             if error

package/frameworks/node/shell.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2024-2025 by Richard C. Zulch
+ * Copyright (c) 2024-2026 by Richard C. Zulch
  *
  */
 
@@ -28,7 +28,7 @@
  */
 
 closure ShellConnect(options, local shob, error, fs, xparser, shelly) {
-    global(js, compress)
+    global(js, compress, App)
     shob = new(object, this)
 
     // readline
@@ -78,6 +78,26 @@ closure ShellConnect(options, local shob, error, fs, xparser, shelly) {
         pending.wait()
     }
 
+    // pty
+    //
+    // Execute a shell command in a PTY terminal with optional current-working-directory.
+    //
+    shob.pty = closure pty(cmd, args, cwd, local exec, error, options, ptyp) {
+        exec = App.exec
+        if !exec
+            `(error, exec) = App.workerNub.execProxy()
+        if !error {
+            options = { input:"keyboard", output:"display", raw:true }
+            if cwd
+                options.spawn = { cwd: cwd }
+            `(error, ptyp) = exec.subprocess(cmd, args, options)
+        }
+        if ptyp
+            list(false, ptyp)
+        else
+            exec(cmd, args, cwd)
+    }
+
     // shellparser
     // intercept command-line parsing and look for a !shell escape
     function shellparser(source, grammar, operators, local token, text) {
@@ -89,7 +109,10 @@ closure ShellConnect(options, local shob, error, fs, xparser, shelly) {
                 atom: `;;
                 loc: tuple(0, text.length)
             })
-            exec("bash", ["-c", text], js.d)                                // default directory: js.d
+            if text == "\n"
+                pty()
+            else
+                exec("bash", ["-c", text], js.d)                            // default directory: js.d
 	    }
         else {
             source.tokenpush(token)