Merge pull request #1405 from sasjs/issue-1403

Dynamic AppLoc for Streaming Apps

Author: allanbowe

package-lock.json

@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@sasjs/adapter": "4.11.3",
-    "@sasjs/core": "4.57.2",
+    "@sasjs/core": "4.58.1",
     "@sasjs/lint": "2.4.3",
     "@sasjs/utils": "3.5.2",
     "adm-zip": "0.5.10",

package.json

@@ -166,25 +166,8 @@ async function getBuildInfo(target: Target, streamWeb: boolean) {
       macroCorePath
     )
 
-    // The gsubScript is used to perform the replacement of the appLoc within
-    // the deployed index.html file.  This only happens when deploying using the
-    // SAS Program (build.sas) approach.
-    const gsubScript = await readFile(
-      `${process.sasjsConstants.macroCorePath}/base/mp_replace.sas`
-    )
-    buildConfig += `${gsubScript}\n`
-    const dependencyFilePathsForGsubScript = await getDependencyPaths(
-      gsubScript,
-      macroFolders,
-      macroCorePath
-    )
-
     dependencyFilePaths = [
-      ...new Set([
-        ...dependencyFilePaths,
-        ...dependencyFilePathsForCreateFile,
-        ...dependencyFilePathsForGsubScript
-      ])
+      ...new Set([...dependencyFilePaths, ...dependencyFilePathsForCreateFile])
     ]
   }
 
@@ -286,15 +269,26 @@ async function getCreateFileScript(serverType: ServerType) {
 export function getWebServiceScriptInvocation(
   serverType: ServerType,
   isSASFile: boolean = true,
-  encoded: boolean = false
+  encoded: boolean = false,
+  fileName?: string
 ) {
   const encodedParam = encoded ? ', intype=BASE64' : ''
 
   switch (serverType) {
     case ServerType.SasViya:
+      let swapString = ''
+
+      if (fileName) {
+        const extension = fileName?.split('.').pop()?.toLowerCase() || ''
+
+        if (['html', 'css', 'js'].includes(extension)) {
+          swapString = `,swap=compiled_apploc apploc`
+        }
+      }
+
       return isSASFile
         ? `%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode,replace=yes)`
-        : `%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode${encodedParam})`
+        : `%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode${encodedParam}${swapString})`
     case ServerType.Sas9:
       return isSASFile
         ? `%mm_createwebservice(path=&appLoc/&path, name=&service, code=sascode, server=&serverName, replace=yes)`
@@ -458,7 +452,7 @@ ${content}\n
 run;
 ${
   serverType !== ServerType.Sasjs
-    ? getWebServiceScriptInvocation(serverType, false, true)
+    ? getWebServiceScriptInvocation(serverType, false, true, fileName)
     : ''
 }
 filename filecode clear;

src/commands/build/build.ts

@@ -15,33 +15,6 @@ data _null_;
 run;
 `
 const SASViyaCode = (streamServiceName: string) => `
-
-/**
-  * The streamService we just deployed (as a _FILE) had the compile-time appLoc
-  * In this section we replace with the deploy-time appLoc
-  */
-
-filename _homein filesrvc
-  folderPath="&apploc/services"
-  filename="${streamServiceName}.html"
-  recfm=v
-  lrecl=1048544;
-
-%let local_file=%sysfunc(pathname(work))/service.html;
-filename _homeout "&local_file";
-
-data _null_;
-  rc=fcopy('_homein','_homeout');
-  put rc=;
-run;
-
-%mp_replace(infile="&local_file", findvar=compiled_apploc, replacevar=apploc)
-
-data _null_;
-  rc=fcopy('_homeout','_homein');
-  put rc=;
-run;
-
 /* Tell the user where the app was deployed so they can open it */
 options notes;
 data _null_;

src/commands/build/internal/getLaunchPageCode.ts

@@ -250,7 +250,9 @@ describe('deploy', () => {
           }
         })
 
-        await deploy(target, true)
+        await deploy(target, true).catch((err) => {
+          // error is expected, nothing to do
+        })
 
         expect(process.logger.error).toHaveBeenCalledWith(
           `Unable to process script located at ${path.join(