From 120ad9a7da0a60550d9964c714c22aa4b5fb38cd Mon Sep 17 00:00:00 2001
From: Allan Bowe <allnbwe@gmail.com>
Date: Fri, 11 Jun 2021 00:09:16 +0300
Subject: [PATCH] fix: supporting bell cand escape characters when creating
 viya jobs / services with macro

---
 all.sas                      | 40 ++++++++++++++++++++++++++++++++++++
 sasjs/sasjsconfig.json       |  9 +++++---
 viya/mv_createjob.sas        | 24 ++++++++++++++++++++++
 viya/mv_createwebservice.sas | 16 +++++++++++++++
 4 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/all.sas b/all.sas
index 8b78765..2ed6e28 100644
--- a/all.sas
+++ b/all.sas
@@ -13425,6 +13425,30 @@ run;
         rc =fput(fileid,'\');rc =fwrite(fileid);
         rc =fput(fileid,'\');rc =fwrite(fileid);
       end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
       else do;
         rc =fput(fileid,rec);
         rc =fwrite(fileid);
@@ -14170,6 +14194,22 @@ run;
         rc =fput(fileid,'0');rc =fwrite(fileid);
         rc =fput(fileid,'1');rc =fwrite(fileid);
       end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
       else do;
         rc =fput(fileid,rec);
         rc =fwrite(fileid);
diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json
index 96d4481..ef34a51 100644
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -30,13 +30,16 @@
       "name": "viya",
       "serverUrl": "https://sas.analytium.co.uk",
       "serverType": "SASVIYA",
+      "allowInsecureRequests": false,
       "appLoc": "/Public/temp/macrocore",
-      "deployConfig": {
-        "deployServicePack": true
-      },
       "macroFolders": [
         "tests/viya"
       ],
+      "programFolders": [],
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": []
+      },
       "contextName": "SAS Job Execution compute context"
     },
     {
diff --git a/viya/mv_createjob.sas b/viya/mv_createjob.sas
index 4186cff..1df0471 100644
--- a/viya/mv_createjob.sas
+++ b/viya/mv_createjob.sas
@@ -237,6 +237,30 @@ run;
         rc =fput(fileid,'\');rc =fwrite(fileid);
         rc =fput(fileid,'\');rc =fwrite(fileid);
       end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
       else do;
         rc =fput(fileid,rec);
         rc =fwrite(fileid);
diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas
index 662955c..b1dd5ae 100644
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -675,6 +675,22 @@ run;
         rc =fput(fileid,'0');rc =fwrite(fileid);
         rc =fput(fileid,'1');rc =fwrite(fileid);
       end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
       else do;
         rc =fput(fileid,rec);
         rc =fwrite(fileid);