@naanlang/naan 1.0.5 → 1.0.7

package/frameworks/browser/browser.nlg

@@ -11,6 +11,64 @@
  */
 
 
+/*
+ * FileReader
+ *
+ *     Read file(s) from the browser's host machine. This is passed a File object and returns a
+ * nearly-standard (error, blob, size) tuple. If progress is specified then this function is called
+ * with a percentage of completion from zero to 100 if available, or true otherwise. The progress
+ * callback is called with "false" when completed, with or without success
+ *
+ */
+
+closure FileReader(file, progress, local pending, freader, result) {
+    pending = new(nonce)
+    freader = xnew(window.FileReader)
+    freader.addEventListener("load", function(event, local blob) {
+        blob = xnew(window.Blob, [freader.result], {
+            type: file.type
+        })
+        pending.signal(list(false, blob, event.total))
+    })
+    freader.addEventListener("error", function(error) {
+        pending.signal(list(error))
+    })
+    freader.AddEventListener("progress", function(event) {
+        if event.lengthComputable && event.total
+            progress(toint((event.loaded * 100) / event.total))
+        else
+            progress(true)
+    })
+    freader.readAsArrayBuffer(file)
+    result = pending.wait()
+    progress(false)
+    result
+};
+
+
+/*
+ * FileDownload
+ *
+ *     Download a file from the browser, returning a standard error tuple.
+ *
+ */
+
+closure FileDownload(file, progress, local error, blob, sizez, url, link) {
+    `(error, blob, size) = FileReader(file, progress)
+    if error
+        list(error)
+    else {
+        url = window.URL.createObjectURL(blob)
+        link = document.createElement("a")
+        link.href = url
+        link.download = file.name
+        link.click()
+        window.URL.revokeObjectURL(url)
+        list(false, file.name)
+    }
+};
+
+
 /*
  * brorInit
  *
@@ -20,11 +78,18 @@
  */
 
 function brorInit(local manifest) {
-    manifest = `(brorInit)
+    manifest = `(FileReader, FileDownload, brorInit)
 
     Naan.module.build(module.id, "browser", function(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
-        runningExecutors = require("../running/executors.nlg")
+        modobj.exports.FileReader = FileReader
+        modobj.exports.FileDownload = FileDownload
+
+        function brorReload() {
+            window = js.w
+            document = window.document
+        }()
+        module.reload = brorReload
     })
 } ();

package/frameworks/browser/https_request.nlg

@@ -72,7 +72,7 @@ closure HttpsApiRequest(url, options,
     //
     // perform the fetch and return when complete
     //
-    `(error, response) = await(js.w.fetch(urlq, fetchOptions))
+    `(error, response) = await(window.fetch(urlq, fetchOptions))
     if error
         return (list(Error("HttpsApiRequest fetch failed:", error, url)))
     contentType = response.headers.get("content-type")
@@ -113,7 +113,7 @@ function https_browserInit(local manifest) {
     manifest = `(HttpsApiRequest, https_browserInit)
 
     Naan.module.build(module.id, "https_request", function(modobj, compobj) {
-        require("./browser.nlg")
+        require("browser.nlg")
         compobj.manifest = manifest
         modobj.exports.HttpsApiRequest = HttpsApiRequest
     })

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.5-2";
+var CurrentCacheName = "Naanlang-1.0.7+2";
 
 
 //
@@ -89,11 +89,11 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.5-2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.5-2")
+        console.log("[1.0.7+2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.7+2")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.5-2"
+                version: "1.0.7+2"
             });
         Reaper();                                                           // clean up obsolete info
         
@@ -107,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.5-2] msg received:", msg.text);
+                console.log("[1.0.7+2] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -118,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.5-2",
+                text: "port received by 1.0.7+2",
             });
             */
         if (--pending === 0)
@@ -135,7 +135,7 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.5-2] requesting new msgport for", client.id);
+            console.log("[1.0.7+2] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -181,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.5-2] source gone:", sourceId);
+                console.log("[1.0.7+2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.5-2] client gone:", clientId);
+                console.log("[1.0.7+2] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -220,13 +220,13 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.5-2] deleting old cache:', cacheName);
+                        console.log('[1.0.7+2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.5-2] claiming clients');
+            console.log('[1.0.7+2] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -269,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.5-2",
+                version: "1.0.7+2",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -317,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.5-2] install");
+    console.log("[1.0.7+2] install");
     self.skipWaiting();
 });
 
@@ -339,7 +339,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(event.request.url);
             var nocache = event.request.method != "GET"
-                || url.search.length !== 0
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "cb-1.0.7+2"
                 || event.request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.5-2] fetch failed", e);
+                    console.log("[1.0.7+2] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -385,14 +385,14 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.5-2] activate");
+    console.log("[1.0.7+2] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.0.5-2] matching clients:', urls.join(', '));
+        console.log('[1.0.7+2] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -21,7 +21,7 @@
 closure TermHost(track, api, name, workerID, options,
     local target, nlregex, clientID, serverID)
 {
-    target = runningExecutors.ExecutorBase(track, "Host", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Host", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
     nlregex = RegExp("\\n", "g")
@@ -35,7 +35,7 @@ closure TermHost(track, api, name, workerID, options,
     closure connect(local pending) {
         if target.ws
             return
-        target.ws = xnew(js.w.WebSocket,"ws://".concat(js.w.location.host)) // ### use api parameter
+        target.ws = xnew(window.WebSocket,"ws://".concat(window.location.host)) // ### use api parameter
         pending = new(nonce)
     
         // onopen
@@ -52,7 +52,7 @@ closure TermHost(track, api, name, workerID, options,
         
         target.ws.onmessage = function onmessage(e, message, local msg) {
             try {
-                message = new(js.w.JSON.parse(e.data))
+                message = new(window.JSON.parse(e.data))
             } catch {
                 if true {
                     debuglog("can't decode incoming ws message:", exception)
@@ -169,7 +169,7 @@ closure TermHost(track, api, name, workerID, options,
     //     Send a message to the worker controller.
 
     target.sendControl = function sendControl(workerOp, payload) {
-        target.ws.send(js.w.JSON.stringify({
+        target.ws.send(window.JSON.stringify({
             guid: api.guid
             clientID: clientID
             serverID: serverID
@@ -368,23 +368,23 @@ closure TermLocal(track, name, workerID, options,
         options = new(options)
     else
         options = { }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     nlregex = RegExp("\\n", "g")
     target.workerID = workerID
     target.msgQueue = []
     if workerID == "NaanIDE-Debug" {
-        target.worker = js.w.open(js.w.location.href, "_blank")
+        target.worker = window.open(window.location.href, "_blank")
         target.worker.addEventListener("beforeunload", function(e) {        // our target is closing
             destroy()
         })
-        js.w.addEventListener("beforeunload", function(e) {                 // we are closing
+        window.addEventListener("beforeunload", function(e) {               // we are closing
             // ### tell target we are closing (if needed)
         })
-        listener = js.w
+        listener = window
     } else {
-        if not js.w.Worker
+        if not window.Worker
             return (list(Error("Local environment does not support workers")))
-        target.worker = xnew(js.w.Worker, "env_webworker.js")
+        target.worker = xnew(window.Worker, "env_webworker.js")
         listener = target.worker
     }
 
@@ -460,6 +460,8 @@ closure TermLocal(track, name, workerID, options,
             target.statusCB(target, msg.status)
         else if msg.id == "debugout"
             target.debugger.debugData(target, msg.data)
+        else if msg.id == "download"
+            FileDownload(xnew(window.File, msg.bits, msg.name, msg.options))
         else if msg.id == "loaded" {
             if !target.started
                 target.worker.postMessage({
@@ -610,7 +612,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         track.update(target)
         return (target)
     }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     target.name = name
     target.title = title
     target.workerID = workerID
@@ -778,7 +780,7 @@ closure termInstallVirtualWatcher(track, naancont) {
         }
     }
     
-    runningExecutors.TaskOnMessageHook(watchVsites)
+    require("../running/executors.nlg").TaskOnMessageHook(watchVsites)
 };
 
 

package/frameworks/browser/workers.nlg

@@ -29,7 +29,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
     closure updateReg(local mchan) {
         if !serv.sw
             return
-        mchan = xnew(js.w.MessageChannel)
+        mchan = xnew(window.MessageChannel)
         serv.msgport = mchan.port2
         serv.msgport.onmessage = workerMsg.proc
         serv.sw.postMessage({
@@ -112,13 +112,13 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
         serv.scope = scope
         if !scope
             return (makeResult(Error("service worker scope required")))
-        if !js.w.navigator.serviceWorker
+        if !window.navigator.serviceWorker
             return (makeResult(Error("service workers not supported")))
-        js.w.navigator.serviceWorker.addEventListener("message", function(event) {
+        window.navigator.serviceWorker.addEventListener("message", function(event) {
             if event.data.msg == "Naan_need_fetch_port"
                 updateReg()
         })
-        await(js.w.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
+        await(window.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
             return (reg.update())
         }).then(function (reg) {
             serv.reg = reg
@@ -211,7 +211,7 @@ closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
             }
             
             // read resource
-            filepath = xnew(js.w.URL, data.request.url).pathname
+            filepath = xnew(window.URL, data.request.url).pathname
             filepath = DecodeURIComponent(filepath)                         // "/run/<scope>/path..."
             filepath = filepath.slice(4)                                    // "/<scope>/path..."
             error = true                                                    // stays true iff not in scope
@@ -308,7 +308,7 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
     trope = findTrackedScope(track, scope)
     if trope
         return (list(false, trope))
-    trope = runningExecutors.ExecutorBase(track, "ServiceWorkers", scope)
+    trope = require("../running/executors.nlg").ExecutorBase(track, "ServiceWorkers", scope)
     serviceWorker.register(scope, closure(filepath, scope, init,
         local options, mimeType, error, data) {
         mimeType = {

package/frameworks/client/apiclient.nlg

@@ -37,7 +37,7 @@ closure MakeNideAPIclient(url, guid, local client) {
         request.addEventListener("error", function reqFailed(event, local errtext) {
             if request.status == 0
                 errtext = "connectivity"
-            ellse
+            else
                 errtext = "request failed"
             error = Error(errtext, {
                 status: request.status

package/frameworks/client/psm_client.nlg

@@ -136,10 +136,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // readLines
     //
     // Read a lines of a file at the specified path with options:
-    //      matchRE:        -- JavaScript regex
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
+    //      matchRE:                            -- JavaScript regex
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
     // When using a matchRE, the return value is an array of [ lineNumber, text ] pairs if
     // returnText is specified, or just an array of one-based line numbers otherwise.
     //
@@ -288,6 +288,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Search the specified file or recursive directory.
     
     view.dirSearch = function dirSearch(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "dirSearch", options, false, callback)
     }
 
@@ -357,6 +361,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Grep the specified file or recursive directory.
     
     view.grepLines = function grepLines(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "grepLines", options, false, callback)
     }
 

package/frameworks/common/common.nlg

@@ -143,7 +143,7 @@ function JsonStringify(data) {
 jsScripts = { };                                                            // script values become false on reload
  
 function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
-    if jsScripts[jsScripts]
+    if jsScripts[libpath]
         return                                                              // already loaded
     if libpath.startsWith("/")
         fpath = libpath
@@ -155,10 +155,10 @@ function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
-        scriptTag.src = js.w.location.origin.concat(fpath)
+        scriptTag.src = js.w.location.origin.concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
-            pending.signal(JSZipLib)
+            pending.signal(js.w[globalID])
             true
         }
         scriptTag.onerror = function (event) {
@@ -303,7 +303,8 @@ JSONparse = false;
 Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
-    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
+    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsonParse, JsonStringify, JsLoadScript,
+        LoadComponentOnDemand, LiveExport, comrInit)
 
     Naan.module.build(module.id, "common", closure(modobj, compobj) {
         compobj.manifest = manifest
@@ -373,10 +374,17 @@ function comrInit(local manifest) {
                     result
             }
             //
-            // DecodeBase64url - decode base64url to original string
+            // EncodeBase64url - decode base64url to original string
             // See https://en.wikipedia.org/wiki/Base64 for details on variants
             //
-            DecodeBase64url = function decodeBase64url(base64url, local padding) {
+            EncodeBase64url = function encodeBase64url(data) {
+                data = EncodeBase64(data)
+                data.replace(RegExp("[+]", "g"), '-').replace(RegExp("/", "g"), '_')
+            }
+            //
+            // DecodeBase64url - decode base64url to original string
+            //
+            DecodeBase64url = function decodeBase64url(base64url) {
                 base64url = base64url.replace(RegExp("-", "g"), '+').replace(RegExp("_", "g"), '/')
                 DecodeBase64(base64url)
             }
@@ -411,7 +419,9 @@ function comrInit(local manifest) {
                 }
                 //
                 // MD5 functions
-                JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                if symbol(NideBuild) {                                      // execute if we are not building
+                    JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                }
                 //
                 // hasMD5 in hex
                 HashMD5 = function browserMD5(data, raw) {
@@ -526,6 +536,7 @@ function comrInit(local manifest) {
             modobj.exports.JsonStringify = JsonStringify
             modobj.exports.JsonParse = JsonParse
             modobj.exports.Uint8ArrayFromString = Uint8ArrayFromString
+            modobj.exports.EncodeBase64url = EncodeBase64url
             modobj.exports.DecodeBase64url = DecodeBase64url
             modobj.exports.HashMD5 = HashMD5
             modobj.exports.HashMD5_base64 = HashMD5_base64

package/frameworks/node/apiserver.nlg

@@ -171,8 +171,8 @@ closure MakeAPI(port, options, callback, local chroot, server) {
             res.status(403).send("unauthorized")
         timeoutms = toint(req.query.timeout)
         after = toint(req.query.after)
-        if not integer(timeoutms) or timeoutms > 10000
-            res.status(400).send("timeout is integer milliseconds no greater than 10000")
+        if not integer(timeoutms) or timeoutms > 7200000
+            res.status(400).send("timeout is integer milliseconds no greater than 7200000")
         else if not integer(after)
             res.status(400).send("after must be an integer")
         else {

package/frameworks/node/filesystem.nlg

@@ -181,11 +181,11 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // readLines
     //
     // Read the contents of a file into an array of lines with the following options:
-    //      pattern:        -- only return lines matching pattern
-    //      fixed           -- pattern is a fixed string, not a regular expression
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
+    //      pattern:                            -- only return lines matching pattern
+    //      fixed                               -- pattern is a fixed string, not a regular expression
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
     //
 
     files.readLines = closure readLines(path, options, callback,
@@ -748,21 +748,31 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // dirSearch
     //
     // Search the files in a directory for a pattern.
-    
+    //
+    // Most options are handled by readLines, but the following is done here:
+    //      excludeDirs: [dirnames]             -- exclude the specified directory names
+
     files.dirSearch = closure dirSearch(path, options, callback,
-        local error, localpaths, output) {
+        local error, localpaths, dexmatch, item, output) {
         if !callback
             return (syncAdapter(dirSearch, path, options))
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
+        if options.excludeDirs.0 {                                          // match all provided paths
+            dexmatch = []
+            for item in options.excludeDirs                                 // escape all special characters
+                dexmatch.push(item.replace(RegExp("[^A-Za-z0-9-_\n]","g"), "\\$&"))
+            dexmatch = RegExp(dexmatch.join("|"))
+        }
         output = []
         debuglog("dirSearch begins", localpath)
         asyncArray(localpaths, 10, closure(localpath, index, elements, local error, direnum, node, lines, line) {
             `(error, direnum) = dirList(localpath, { })
             if direnum.children
                 for node in direnum.children
-                    localpaths.push(JSpath.join(localpath, node.name))    // more files or directories to examine
+                    if !dexmatch || !node.name.match(dexmatch)
+                        localpaths.push(JSpath.join(localpath, node.name))  // more files or directories to examine
             else {
                `(error, lines) = readLines(localpath, options)
                if error && localpaths.length == 1 {
@@ -986,22 +996,29 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //
     // Return an array of text matches in a file or recursive directory of files with the following
     // options:
-    //      pattern:        -- pattern to find
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
-    //      maxCount:       -- integer maximum number of results (default 10,000)
+    //      pattern:                            -- pattern to find
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
+    //      excludeDirs: [dirnames]             -- exclude the specified directory names
+    //      maxCount:                           -- integer maximum number of results (default 10,000)
     // grep-specific options:
-    //      ignoreBinary:   -- ignore binary files
+    //      ignoreBinary:                       -- ignore binary files
     //
     files.grepLines = closure grepLines(path, options, callback,
-        local error, localpath, cmdargs, execOptions, grep, result, lineRE, maxcount) {
+        local error, localpath, cmdargs, item, execOptions, grep, result, lineRE, maxcount) {
         if !callback
             return (syncAdapter(grepLines, path, options))
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
         cmdargs = ["-rn"]                                                   // recursively search directories for files; report line numbers
+        if options.excludeDirs.0 {                                          // exclude a directory
+            for item in options.excludeDirs {
+                cmdargs.push("--exclude-dir")
+                cmdargs.push(item)
+            }
+        }
         if options.ignoreCase
             cmdargs.push("-i")
         if options.invert

package/frameworks/node/psm_server.nlg

@@ -204,6 +204,7 @@ closure psmsFsView(rootpath, local view, gitter) {
                 
         // op: dirSearch
         function dirSearchApi() {
+            req.query.excludeDirs = JSONparse(req.query.excludeDirs)
             res.send(new(array, view.dirSearch(path, req.query)))
         }
 
@@ -239,6 +240,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         
         // op: grepLines
         function grepLinesApi() {
+            req.query.excludeDirs = JSONparse(req.query.excludeDirs)
             res.send(new(array, view.grepLines(path, req.query)))
         }
         
@@ -289,8 +291,15 @@ closure psmsFsView(rootpath, local view, gitter) {
             gitLog:         gitLogApi
             gitShowFile:    gitShowFileApi
         }[req.query.op]
-        if proc
-            proc()
+        if proc {
+            try {
+                proc()
+            } catch {
+                if true {
+                    res.status(400).send("psm op failed: ".concat(req.query.op, ": ", exception))
+                }
+            }
+        }
         else
             res.status(400).send("invalid psm op: ".concat(req.query.op))
     }