tune-sdk 0.3.4 → 0.3.6

package/dist/tune.js

@@ -1605,6 +1605,7 @@ async function text2ast(text, ctx, resolve) {
       })(ctx.stack || []);
       var resolved;
       resolved = await ctx.resolve(name);
+      if (!Array.isArray(resolved)) resolved = [resolved];
       if (proc) {
         while (pargs = proc.shift()) {
           var pname;
@@ -1616,7 +1617,16 @@ async function text2ast(text, ctx, resolve) {
           if (!p) throw new TuneError(("'" + pname + "' processor not found"), filename, row, col);
           if ((typeof p.exec !== "function")) throw new TuneError(("'" + pname + "' does not have exec function"), filename, row, col);
           try {
-            resolved = await p.exec.call(ctx, resolved, pargs[0], ctx);
+            (function(it) {
+              it = it.flat(Infinity);
+              it = it.filter((function(item) {
+                return (item !== "ignore");
+              }));
+              it = (resolved = it);
+              return it;
+            })(await Promise.all(resolved.map((function(r) {
+              return p.exec.call(ctx, r, pargs[0], ctx);
+            }))));
           } catch (e) {
             var err;
             err = new TuneError(e.message, (p.fullname || p.name), undefined, undefined, [], e);
@@ -1629,7 +1639,7 @@ async function text2ast(text, ctx, resolve) {
           }
         }
       }
-      _ref0 = (Array.isArray(resolved) ? resolved : [resolved]);
+      _ref0 = resolved.concat();
       for (_i0 = 0, _len = _ref0.length; _i0 < _len; ++_i0) {
         resolved = _ref0[_i0];
         if (!resolved) throw new TuneError(("'" + name + "' not found"), filename, row, col);
@@ -2290,7 +2300,7 @@ function text2run(text, ctx, opts) {
 }
 text2run;
 async function file2run(args, params, ctx) {
-  var lctx, text, stop, errors, turnsSaved, node, longFormatRegex, isLong, initialText, response, res, r, chunk, iterg8EYRCS, _ref;
+  var lctx, text, stop, errors, turnsSaved, node, longFormatRegex, isLong, initialText, response, res, r, chunk, itergXF7bT2, _ref;
   var lctx;
   lctx = ctx.clone();
   if (params) lctx.ms.unshift(envmd(params));
@@ -2382,7 +2392,7 @@ async function file2run(args, params, ctx) {
       hookTurnEnd: save
     });
     chunk = {};
-    iterg8EYRCS = new AsyncIter();
+    itergXF7bT2 = new AsyncIter();
     (async function($lastRes) {
       var _ref;
       try {
@@ -2390,20 +2400,20 @@ async function file2run(args, params, ctx) {
           chunk = await r.next();
           res = (chunk.value || "");
           $lastRes = transformOutput(res) || $lastRes;
-          iterg8EYRCS.result = {
+          itergXF7bT2.result = {
             value: $lastRes
           }
         }
-        _ref = iterg8EYRCS.result = {
+        _ref = itergXF7bT2.result = {
           value: $lastRes,
           done: true
         }
       } catch (e) {
-        _ref = (iterg8EYRCS.err = e);
+        _ref = (itergXF7bT2.err = e);
       }
       return _ref;
     })();
-    _ref = iterg8EYRCS;
+    _ref = itergXF7bT2;
   }
   return _ref;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tune-sdk",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "chat with llm in a text file. core package",
   "main": "dist/tune.js",
   "module": "dist/tune.mjs",

package/src/contextws.js

@@ -72,7 +72,6 @@ function ContextWebsocket(url, { debug } = {}) {
   assert(typeof url !== 'undefined', 'url is not set');
 
   socket = new WebSocket(url);
-  console.log(socket)
 
   this.socket = socket;
   this.callbacks = Object.create(null);
@@ -105,7 +104,7 @@ ContextWebsocket.prototype._onClose = function () {
 
 ContextWebsocket.prototype._send = async function (payload) {
   const data = JSON.stringify(payload);
-  this.debug('==>', data);
+  this.debug('tune ==>', data);
   await this.ready;
   this.socket.send(data);
 };
@@ -135,7 +134,7 @@ ContextWebsocket.prototype._onMessage = function (event) {
     return;
   }
 
-  this.debug('<==', msg);
+  this.debug('tune <==', msg);
   if (!msg || !msg.id) return;
 
   const cb = this.callbacks[msg.id];
@@ -176,6 +175,7 @@ ContextWebsocket.prototype.read = function (name, binary) {
   return this._call('read', [name, binary], false);
 };
 
+
 ContextWebsocket.prototype.write = function (name, content) {
   return this._call('write', [name, content], false);
 };
@@ -197,5 +197,12 @@ if (typeof module !== 'undefined' && module.exports) {
   module.exports = ContextWebsocket;
 } else {
   window.ContextWebsocket = ContextWebsocket;
-  window.ctx = new ContextWebsocket(window.location.origin.replace(/^http/, 'ws'));
+  window.ctx = new ContextWebsocket(window.location.origin.replace(/^http/, 'ws'), { debug: console.debug });
+  window.addEventListener('error', async (event) => {
+    window.ctx._call('log', [event.error?.stack || event.message ], false);
+  })
+  window.addEventListener('unhandledrejection', async (event) => {
+    const err = event.reason instanceof Error ? event.reason : new Error(String(event.reason));
+    window.ctx._call('log', [err.stack || err.message], false);
+  });
 }

package/src/man.js

@@ -66,7 +66,7 @@ module.exports = ({ mount } = {}) => {
           type: "text",
           name: `${mount}/`,
           source: "docs",
-          read: async () => mans.map(man => `${man.name} - ${man.description}`).join("\n")
+          read: async () => mans.map(man => `${mount}/${man.name} - ${man.description}`).join("\n")
         })
       }
 
@@ -108,7 +108,7 @@ module.exports = ({ mount } = {}) => {
       return {
         type: "text",
         name,
-        read: async () => mans.map(man => `${man.name} - ${man.description}`).join("\n")
+        read: async () => mans.map(man => `${mount}/${man.name} - ${man.description}`).join("\n")
       }
     }
 

package/src/ws.js

@@ -1,9 +1,27 @@
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const WebSocket = require('ws');
 const mime = require('mime-types');
 
+// skips loopback, docker (172.x, 192.168.x docker ranges), and common vpn (tun/tap) interfaces
+function getPublicIPv4() {
+  const ifaces = os.networkInterfaces();
+  const skipNames = /^(docker|br-|veth|tun|tap|vmnet|vbox)/i;
+  const skipRanges = /^(172\.(1[6-9]|2\d|3[01])\.|10\.)/; // docker bridge ranges
+
+  for (const [name, addrs] of Object.entries(ifaces)) {
+    if (skipNames.test(name)) continue;
+    for (const addr of addrs) {
+      if (addr.family === 'IPv4' && !addr.internal && !skipRanges.test(addr.address)) {
+        return addr.address;
+      }
+    }
+  }
+  return 'localhost';
+}
+
 function makeServer({ port, static, root, ctx }) {
   root = path.join(root || process.cwd());
 
@@ -46,6 +64,7 @@ function makeServer({ port, static, root, ctx }) {
       let lctx = ctx.clone()
       let { id, method, args, ...rest } = JSON.parse(msg.toString());
       let result = { id }
+      console.log("[context]", method, ...args)
       if (method === "read") {
         const [ name, binary ] = args
         let content = await lctx.read(name, binary)
@@ -104,6 +123,9 @@ function makeServer({ port, static, root, ctx }) {
             }
           })()
         }
+      } else if (method === "log") {
+        console.log("[browser]:", ...args)
+        result.done = true
       } else {
         result.error = { message: `method not found ${method}`}
       }
@@ -115,7 +137,8 @@ function makeServer({ port, static, root, ctx }) {
     if (Number.isNaN(parseInt(port))) {
       console.log(`listening ${port}`);
     } else {
-      console.log(`listening http://localhost:${port}`);
+      const host = getPublicIPv4();
+      console.log(`listening http://${host}:${port}`);
     }
   });
 }