fix: use options nobomfile for sasjs server mp_abort, also doc update in mf_existvarlist

all.sas

@@ -324,9 +324,6 @@ https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md#functionex
 
       %put %mf_existVarList(sashelp.class, age sex name dummyvar);
 
-  <h4> SAS Macros </h4>
-  @li mf_abort.sas
-
   @param libds 2 part dataset or view reference
   @param varlist space separated variable names
 
@@ -2200,16 +2197,20 @@ Usage:
     recognise this and fetch the log of the parent session instead)
   @li STP environments must finish cleanly to avoid the log being sent to
     _webout.  To assist with this, we also run stpsrvset('program error', 0)
-    and set SYSCC=0.  We take a unique "soft abort" approach - we open a macro
+    and set SYSCC=0.
+    Where possible, we take a unique "soft abort" approach - we open a macro
     but don't close it!  This works everywhere EXCEPT inside a \%include inside
     a macro.  For that, we recommend you use mp_include.sas to perform the
     include, and then call \%mp_abort(mode=INCLUDE) from the source program (ie,
     OUTSIDE of the top-parent macro).
+    The soft abort has also been found to be ineffective in 9.4m6 windows
+    environments and above, so in these cases, endsas is used.
 
 
-  @param mac= to contain the name of the calling macro
+  @param mac= (mp_abort.sas) To contain the name of the calling macro. Do not
+    use &sysmacroname as this will always resolve to MP_ABORT.
   @param msg= message to be returned
-  @param iftrue= supply a condition under which the macro should be executed.
+  @param iftrue= (1=1) Supply a condition for which the macro should be executed
   @param errds= (work.mp_abort_errds) There is no clean way to end a process
     within a %include called within a macro.  Furthermore, there is no way to
     test if a macro is called within a %include.  To handle this particular
@@ -2230,11 +2231,12 @@ Usage:
     @li REGULAR (default)
     @li INCLUDE
 
+  @version 9.4
+  @author Allan Bowe
+
   <h4> Related Macros </h4>
   @li mp_include.sas
 
-  @version 9.4
-  @author Allan Bowe
   @cond
 **/
 
@@ -2243,7 +2245,8 @@ Usage:
   , mode=REGULAR
 )/*/STORE SOURCE*/;
 
-  %global sysprocessmode sysprocessname;
+  %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc;
+  %local fref fid i;
 
   %if not(%eval(%unquote(&iftrue))) %then %return;
 
@@ -2337,8 +2340,8 @@ Usage:
     %end;
 
     %if %symexist(SYS_JES_JOB_URI) %then %do;
-      /* setup webout */
+      /* setup webout for Viya */
-      OPTIONS NOBOMFILE;
+      options nobomfile;
       %if "X&SYS_JES_JOB_URI.X"="XX" %then %do;
           filename _webout temp lrecl=999999 mod;
       %end;
@@ -2347,11 +2350,24 @@ Usage:
           name="_webout.json" lrecl=999999 mod;
       %end;
     %end;
+    %else %if %sysfunc(filename(fref,&sasjs_stpsrv_header_loc))=0 %then %do;
+      options nobomfile;
+      /* set up http header for SASjs Server */
+      %let fid=%sysfunc(fopen(&fref,A));
+      %if &fid=0 %then %do;
+        %put %str(ERR)OR: %sysfunc(sysmsg());
+        %return;
+      %end;
+      %let rc=%sysfunc(fput(&fid,%str(Content-Type: application/json)));
+      %let rc=%sysfunc(fwrite(&fid));
+      %let rc=%sysfunc(fclose(&fid));
+      %let rc=%sysfunc(filename(&fref));
+    %end;
 
     /* send response in SASjs JSON format */
     data _null_;
       file _webout mod lrecl=32000 encoding='utf-8';
-      length msg syswarningtext syserrortext $32767 ;
+      length msg syswarningtext syserrortext $32767 mode $10 ;
       sasdatetime=datetime();
       msg=symget('msg');
     %if &logline>0 %then %do;
@@ -2367,7 +2383,8 @@ Usage:
       msg=cats('"',msg,'"');
       if symexist('_debug') then debug=quote(trim(symget('_debug')));
       else debug='""';
-      put '>>weboutBEGIN<<';
+      if symget('sasjsprocessmode')='Stored Program' then mode='SASJS';
+      if mode ne 'SASJS' then put '>>weboutBEGIN<<';
       put '{"SYSDATE" : "' "&SYSDATE" '"';
       put ',"SYSTIME" : "' "&SYSTIME" '"';
       put ',"sasjsAbort" : [{';
@@ -2399,8 +2416,8 @@ Usage:
       syswarningtext=quote(trim(symget('syswarningtext')));
       put ",""SYSWARNINGTEXT"" : " syswarningtext;
       put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
-      put "}" @;
+      put "}" ;
-      put '>>weboutEND<<';
+      if mode ne 'SASJS' then put '>>weboutEND<<';
     run;
 
     %put _all_;
@@ -2411,22 +2428,30 @@ Usage:
         rc=stpsrvset('program error', 0);
         call symputx("syscc",0,"g");
       run;
-      /**
+      %if &sysscp=WIN
-        * endsas kills 9.4m3 deployments by orphaning multibridges.
+      and "%substr(%str(&sysvlong         ),1,8)"="9.04.01M"
-        * Abort variants are ungraceful (non zero return code)
+      and "%substr(%str(&sysvlong         ),9,1)">"5" %then %do;
-        * This approach lets SAS run silently until the end :-)
+        /* skip approach (below) does not work in windows m6+ envs */
-        * Caution - fails when called within a %include within a macro
+        endsas;
-        * Use mp_include() to handle this.
+      %end;
-        */
+      %else %do;
-      filename skip temp;
+        /**
-      data _null_;
+          * endsas kills 9.4m3 deployments by orphaning multibridges.
-        file skip;
+          * Abort variants are ungraceful (non zero return code)
-        put '%macro skip();';
+          * This approach lets SAS run silently until the end :-)
-        comment '%mend skip; -> fix lint ';
+          * Caution - fails when called within a %include within a macro
-        put '%macro skippy();';
+          * Use mp_include() to handle this.
-        comment '%mend skippy; -> fix lint ';
+          */
-      run;
+        filename skip temp;
-      %inc skip;
+        data _null_;
+          file skip;
+          put '%macro skip();';
+          comment '%mend skip; -> fix lint ';
+          put '%macro skippy();';
+          comment '%mend skippy; -> fix lint ';
+        run;
+        %inc skip;
+      %end;
     %end;
     %else %if "&sysprocessmode " = "SAS Compute Server " %then %do;
       /* endsas kills the session making it harder to fetch results */
@@ -16214,17 +16239,15 @@ filename __outdoc clear;
 
   Usage:
 
-    options ps=max nonotes nosource;
+      options ps=max nonotes nosource;
-    %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
+      %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
-    options notes source;
+      options notes source;
 
   @param [in] root= the parent folder under which to return all contents
   @param [out] outds= the dataset to create that contains the list of
     directories
   @param [in] mDebug= set to 1 to show debug messages in the log
 
-  <h4> SAS Macros </h4>
-
   @version 9.4
   @author Allan Bowe
 
@@ -17163,6 +17186,7 @@ filename __mc2 clear;
 
   <h4> SAS Macros </h4>
   @li mf_getuniquefileref.sas
+  @li mp_abort.sas
 
   @author Allan Bowe
 
@@ -17212,11 +17236,10 @@ data _null_;
   else put (_all_)(=);
 run;
 
-%if &tsuri=stopifempty %then %do;
+%mp_abort(iftrue= (&tsuri=stopifempty)
-  %put %str(WARN)ING:  &tree&name.(StoredProcess) not found!;
+  ,mac=mm_getstpcode
-  %return;
+  ,msg=%str(&tree&name.(StoredProcess) not found!)
-%end;
+)
-
 
 /**
   * Now we can extract the textstore
@@ -26979,8 +27002,8 @@ Usage:
 %if &platform=SASJS %then %do;
   %ms_getfile(&loc..sas, outref=&outref)
 %end;
-%else %if &platform=SAS9 %then %do;
+%else %if &platform=SAS9 or &platform=SASMETA %then %do;
-  %mm_getstpcode(tree=&loc,outloc=&outref)
+  %mm_getstpcode(tree=&loc,outref=&outref)
 %end;
 %else %if &platform=SASVIYA %then %do;
   /* extract name & path from &loc */

base/mf_existvarlist.sas

@@ -6,9 +6,6 @@
 
       %put %mf_existVarList(sashelp.class, age sex name dummyvar);
 
-  <h4> SAS Macros </h4>
-  @li mf_abort.sas
-
   @param libds 2 part dataset or view reference
   @param varlist space separated variable names
 

base/mp_abort.sas

@@ -15,16 +15,20 @@
     recognise this and fetch the log of the parent session instead)
   @li STP environments must finish cleanly to avoid the log being sent to
     _webout.  To assist with this, we also run stpsrvset('program error', 0)
-    and set SYSCC=0.  We take a unique "soft abort" approach - we open a macro
+    and set SYSCC=0.
+    Where possible, we take a unique "soft abort" approach - we open a macro
     but don't close it!  This works everywhere EXCEPT inside a \%include inside
     a macro.  For that, we recommend you use mp_include.sas to perform the
     include, and then call \%mp_abort(mode=INCLUDE) from the source program (ie,
     OUTSIDE of the top-parent macro).
+    The soft abort has also been found to be ineffective in 9.4m6 windows
+    environments and above, so in these cases, endsas is used.
 
 
-  @param mac= to contain the name of the calling macro
+  @param mac= (mp_abort.sas) To contain the name of the calling macro. Do not
+    use &sysmacroname as this will always resolve to MP_ABORT.
   @param msg= message to be returned
-  @param iftrue= supply a condition under which the macro should be executed.
+  @param iftrue= (1=1) Supply a condition for which the macro should be executed
   @param errds= (work.mp_abort_errds) There is no clean way to end a process
     within a %include called within a macro.  Furthermore, there is no way to
     test if a macro is called within a %include.  To handle this particular
@@ -45,11 +49,12 @@
     @li REGULAR (default)
     @li INCLUDE
 
+  @version 9.4
+  @author Allan Bowe
+
   <h4> Related Macros </h4>
   @li mp_include.sas
 
-  @version 9.4
-  @author Allan Bowe
   @cond
 **/
 
@@ -58,7 +63,8 @@
   , mode=REGULAR
 )/*/STORE SOURCE*/;
 
-  %global sysprocessmode sysprocessname;
+  %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc;
+  %local fref fid i;
 
   %if not(%eval(%unquote(&iftrue))) %then %return;
 
@@ -152,8 +158,8 @@
     %end;
 
     %if %symexist(SYS_JES_JOB_URI) %then %do;
-      /* setup webout */
+      /* setup webout for Viya */
-      OPTIONS NOBOMFILE;
+      options nobomfile;
       %if "X&SYS_JES_JOB_URI.X"="XX" %then %do;
           filename _webout temp lrecl=999999 mod;
       %end;
@@ -162,11 +168,24 @@
           name="_webout.json" lrecl=999999 mod;
       %end;
     %end;
+    %else %if %sysfunc(filename(fref,&sasjs_stpsrv_header_loc))=0 %then %do;
+      options nobomfile;
+      /* set up http header for SASjs Server */
+      %let fid=%sysfunc(fopen(&fref,A));
+      %if &fid=0 %then %do;
+        %put %str(ERR)OR: %sysfunc(sysmsg());
+        %return;
+      %end;
+      %let rc=%sysfunc(fput(&fid,%str(Content-Type: application/json)));
+      %let rc=%sysfunc(fwrite(&fid));
+      %let rc=%sysfunc(fclose(&fid));
+      %let rc=%sysfunc(filename(&fref));
+    %end;
 
     /* send response in SASjs JSON format */
     data _null_;
       file _webout mod lrecl=32000 encoding='utf-8';
-      length msg syswarningtext syserrortext $32767 ;
+      length msg syswarningtext syserrortext $32767 mode $10 ;
       sasdatetime=datetime();
       msg=symget('msg');
     %if &logline>0 %then %do;
@@ -182,7 +201,8 @@
       msg=cats('"',msg,'"');
       if symexist('_debug') then debug=quote(trim(symget('_debug')));
       else debug='""';
-      put '>>weboutBEGIN<<';
+      if symget('sasjsprocessmode')='Stored Program' then mode='SASJS';
+      if mode ne 'SASJS' then put '>>weboutBEGIN<<';
       put '{"SYSDATE" : "' "&SYSDATE" '"';
       put ',"SYSTIME" : "' "&SYSTIME" '"';
       put ',"sasjsAbort" : [{';
@@ -214,8 +234,8 @@
       syswarningtext=quote(trim(symget('syswarningtext')));
       put ",""SYSWARNINGTEXT"" : " syswarningtext;
       put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
-      put "}" @;
+      put "}" ;
-      put '>>weboutEND<<';
+      if mode ne 'SASJS' then put '>>weboutEND<<';
     run;
 
     %put _all_;
@@ -226,22 +246,30 @@
         rc=stpsrvset('program error', 0);
         call symputx("syscc",0,"g");
       run;
-      /**
+      %if &sysscp=WIN
-        * endsas kills 9.4m3 deployments by orphaning multibridges.
+      and "%substr(%str(&sysvlong         ),1,8)"="9.04.01M"
-        * Abort variants are ungraceful (non zero return code)
+      and "%substr(%str(&sysvlong         ),9,1)">"5" %then %do;
-        * This approach lets SAS run silently until the end :-)
+        /* skip approach (below) does not work in windows m6+ envs */
-        * Caution - fails when called within a %include within a macro
+        endsas;
-        * Use mp_include() to handle this.
+      %end;
-        */
+      %else %do;
-      filename skip temp;
+        /**
-      data _null_;
+          * endsas kills 9.4m3 deployments by orphaning multibridges.
-        file skip;
+          * Abort variants are ungraceful (non zero return code)
-        put '%macro skip();';
+          * This approach lets SAS run silently until the end :-)
-        comment '%mend skip; -> fix lint ';
+          * Caution - fails when called within a %include within a macro
-        put '%macro skippy();';
+          * Use mp_include() to handle this.
-        comment '%mend skippy; -> fix lint ';
+          */
-      run;
+        filename skip temp;
-      %inc skip;
+        data _null_;
+          file skip;
+          put '%macro skip();';
+          comment '%mend skip; -> fix lint ';
+          put '%macro skippy();';
+          comment '%mend skippy; -> fix lint ';
+        run;
+        %inc skip;
+      %end;
     %end;
     %else %if "&sysprocessmode " = "SAS Compute Server " %then %do;
       /* endsas kills the session making it harder to fetch results */

meta/mm_getfoldertree.sas

@@ -8,17 +8,15 @@
 
   Usage:
 
-    options ps=max nonotes nosource;
+      options ps=max nonotes nosource;
-    %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
+      %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
-    options notes source;
+      options notes source;
 
   @param [in] root= the parent folder under which to return all contents
   @param [out] outds= the dataset to create that contains the list of
     directories
   @param [in] mDebug= set to 1 to show debug messages in the log
 
-  <h4> SAS Macros </h4>
-
   @version 9.4
   @author Allan Bowe
 

meta/mm_getstpcode.sas

@@ -21,6 +21,7 @@
 
   <h4> SAS Macros </h4>
   @li mf_getuniquefileref.sas
+  @li mp_abort.sas
 
   @author Allan Bowe
 
@@ -70,11 +71,10 @@ data _null_;
   else put (_all_)(=);
 run;
 
-%if &tsuri=stopifempty %then %do;
+%mp_abort(iftrue= (&tsuri=stopifempty)
-  %put %str(WARN)ING:  &tree&name.(StoredProcess) not found!;
+  ,mac=mm_getstpcode
-  %return;
+  ,msg=%str(&tree&name.(StoredProcess) not found!)
-%end;
+)
-
 
 /**
   * Now we can extract the textstore

xplatform/mx_getcode.sas

@@ -34,8 +34,8 @@
 %if &platform=SASJS %then %do;
   %ms_getfile(&loc..sas, outref=&outref)
 %end;
-%else %if &platform=SAS9 %then %do;
+%else %if &platform=SAS9 or &platform=SASMETA %then %do;
-  %mm_getstpcode(tree=&loc,outloc=&outref)
+  %mm_getstpcode(tree=&loc,outref=&outref)
 %end;
 %else %if &platform=SASVIYA %then %do;
   /* extract name & path from &loc */