v1.1.24 — release

Author: vanbaalon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wstp-node",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "description": "Native Node.js addon for Wolfram/Mathematica WSTP \u2014 kernel sessions with evaluation queue, streaming Print/messages, Dialog subsessions, and side-channel WstpReader",
   "main": "build/Release/wstp.node",
   "types": "index.d.ts",

src/drain.cc

@@ -673,17 +673,6 @@ EvalResult DrainToEvalResult(WSLINK lp, EvalOptions* opts) {
     DiagLog("[Drain] DrainToEvalResult entered, rejectDialog=" +
             std::to_string(opts ? opts->rejectDialog : false) +
             " interactive=" + std::to_string(opts ? opts->interactive : false));
-    // Diagnostic: poll for 3s to see if kernel will ever respond
-    for (int i = 0; i < 60; ++i) {
-        if (WSReady(lp)) {
-            DiagLog("[Drain] data arrived after " + std::to_string(i * 50) + "ms");
-            break;
-        }
-        std::this_thread::sleep_for(std::chrono::milliseconds(50));
-    }
-    if (!WSReady(lp)) {
-        DiagLog("[Drain] WARNING: no data from kernel after 3s poll");
-    }
     EvalResult r;
 
     // Parse "In[42]:=" → 42
@@ -752,8 +741,20 @@ EvalResult DrainToEvalResult(WSLINK lp, EvalOptions* opts) {
                 while (sp < raw.size() && raw[sp] == ' ') ++sp;
                 raw = raw.substr(sp);
                 for (size_t i = 0; i < raw.size(); ) {
-                    if (raw.compare(i, 4, NL) == 0) { msg += ' '; i += 4; }
-                    else { msg += raw[i++]; }
+                    // Decode WL octal escapes: \NNN → actual byte (UTF-8 passthrough).
+                    // \012 (newline) is converted to space to keep lines compact.
+                    if (i + 3 < raw.size() && raw[i] == '\\' &&
+                        raw[i+1] >= '0' && raw[i+1] <= '7' &&
+                        raw[i+2] >= '0' && raw[i+2] <= '7' &&
+                        raw[i+3] >= '0' && raw[i+3] <= '7') {
+                        unsigned char byte =
+                            static_cast<unsigned char>((raw[i+1]-'0')*64 + (raw[i+2]-'0')*8 + (raw[i+3]-'0'));
+                        if (byte == 0x0A) msg += ' ';  // newline → space
+                        else              msg += static_cast<char>(byte);
+                        i += 4;
+                    } else {
+                        msg += raw[i++];
+                    }
                 }
                 // Both outer and dialog messages go onto r.messages.
                 r.messages.push_back(msg);

src/wstp_expr.cc

@@ -35,19 +35,26 @@ WExpr ReadExprRaw(WSLINK lp, int depth) {
         return e;
     }
     if (type == WSTKSTR) {
-        const char* s = nullptr;
-        if (!WSGetString(lp, &s))
-            return WExpr::mkError("WSGetString failed");
-        WExpr e; e.kind = WExpr::String; e.strVal = s;
-        WSReleaseString(lp, s);
+        // Use UTF-8 variant so Wolfram char escapes like \|01F605 and \[Alpha]
+        // are decoded to actual UTF-8 bytes instead of being returned verbatim.
+        const unsigned char* s = nullptr;
+        int bytes = 0, chars = 0;
+        if (!WSGetUTF8String(lp, &s, &bytes, &chars))
+            return WExpr::mkError("WSGetUTF8String failed");
+        WExpr e; e.kind = WExpr::String;
+        e.strVal.assign(reinterpret_cast<const char*>(s), bytes);
+        WSReleaseUTF8String(lp, s, bytes);
         return e;
     }
     if (type == WSTKSYM) {
-        const char* s = nullptr;
-        if (!WSGetSymbol(lp, &s))
-            return WExpr::mkError("WSGetSymbol failed");
-        WExpr e; e.kind = WExpr::Symbol; e.strVal = s;
-        WSReleaseSymbol(lp, s);
+        // UTF-8 variant — decodes \|NNNN / \[Name] into UTF-8 bytes.
+        const unsigned char* s = nullptr;
+        int bytes = 0, chars = 0;
+        if (!WSGetUTF8Symbol(lp, &s, &bytes, &chars))
+            return WExpr::mkError("WSGetUTF8Symbol failed");
+        WExpr e; e.kind = WExpr::Symbol;
+        e.strVal.assign(reinterpret_cast<const char*>(s), bytes);
+        WSReleaseUTF8Symbol(lp, s, bytes);
         return e;
     }
     if (type == WSTKFUNC) {

tests/_test_rule.js

@@ -0,0 +1,22 @@
+const path = require('path');
+const addonPath = path.join(__dirname, '..', 'build', 'Release', 'wstp_addon.node');
+const wstp = require(addonPath);
+
+const kernelPath = '/Applications/Wolfram 3.app/Contents/MacOS/WolframKernel';
+const client = new wstp.WstpClient(kernelPath);
+client.start();
+setTimeout(() => {
+    client.evaluate('"\[Rule]" // ToCharacterCode', (r) => {
+        console.log("Rule codepoint:", JSON.stringify(r));
+        client.evaluate('ToString[MakeBoxes[a -> b, TraditionalForm], InputForm]', (r2) => {
+            console.log("boxStr:", JSON.stringify(r2));
+            const s = r2?.value ?? r2;
+            // print hex of each character
+            if (typeof s === 'string') {
+                const buf = Buffer.from(s, 'utf8');
+                console.log("hex:", buf.toString('hex'));
+            }
+            client.stop();
+        });
+    });
+}, 2000);