@lwrjs/core 0.9.0-alpha.0 → 0.9.0-alpha.2

package/build/cjs/tools/server-warmup.cjs

@@ -47,6 +47,6 @@ async function warmupServer(config, internalRequestKey) {
     debug: false,
     serverMode
   };
-  await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
+  await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
   import_shared_utils.logger.info("[Server Warmup] complete");
 }

package/build/cjs/tools/static-generation.cjs

@@ -58,14 +58,14 @@ var SiteGenerator = class {
       debug: false,
       serverMode
     };
-    await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
+    await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
     this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
-    this.copyAssets(assets, outputDir);
+    this.copyAssets(assets, outputDir, basePath);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
     import_shared_utils.logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
   }
-  async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
+  async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap = new Map()) {
     if (!staticSiteGenerator.locales) {
       staticSiteGenerator.locales = ["en-US"];
     }
@@ -73,7 +73,7 @@ var SiteGenerator = class {
     for (const locale of staticSiteGenerator.locales) {
       for (const route of routes) {
         const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
-        await generateUrl(route.path, siteConfig);
+        await generateUrl(basePath + route.path, siteConfig);
       }
       if (staticSiteGenerator._additionalRoutePaths) {
         for (const uri of staticSiteGenerator._additionalRoutePaths) {
@@ -315,11 +315,11 @@ var SiteGenerator = class {
     });
     import_fs_extra.default.writeFileSync(serveJsonPath, JSON.stringify({rewrites, directoryListing: false, renderSingle: true}, null, 1));
   }
-  copyAssets(assets, outputDir) {
+  copyAssets(assets, outputDir, basePath) {
     for (const asset of assets) {
       try {
         const assetSrcDir = asset.dir || asset.file;
-        const assetOutputDir = (0, import_path.join)(outputDir, asset.urlPath);
+        const assetOutputDir = (0, import_path.join)(outputDir, basePath ? basePath + asset.urlPath : asset.urlPath);
         if (assetSrcDir && import_fs_extra.default.existsSync(assetSrcDir)) {
           import_fs_extra.default.copySync(assetSrcDir, assetOutputDir);
         } else {

package/build/cjs/tools/utils/network-dispatcher.cjs

@@ -28,7 +28,7 @@ __export(exports, {
 });
 var import_http = __toModule(require("http"));
 var import_https = __toModule(require("https"));
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var NetworkDispatcher = class {
   constructor(port, internalRequestKey) {
     this.port = port || 3e3;
@@ -39,7 +39,11 @@ var NetworkDispatcher = class {
     this.internalRequestKey = internalRequestKey || "";
   }
   dispatchUrl(url, method, lang) {
-    const options = {
+    const options = this.createRequestOptions(url, method, lang);
+    return this.handleRequest(options, url, method, lang);
+  }
+  createRequestOptions(url, method, lang) {
+    return {
       method,
       host: "localhost",
       port: this.port,
@@ -50,41 +54,53 @@ var NetworkDispatcher = class {
         "lwr-metadata-request": this.internalRequestKey
       }
     };
+  }
+  handleRequest(options, url, method, lang) {
     return new Promise((resolve, reject) => {
       const httpClient = options.port == 443 ? import_https.default : import_http.default;
       const bodyChunks = [];
+      import_shared_utils.logger.verbose(`[NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
       const req = httpClient.request(options, (res) => {
         res.on("data", (chunk) => {
           bodyChunks.push(chunk);
         });
         res.on("end", () => {
-          const body = Buffer.concat(bodyChunks).toString();
-          try {
-            const jsonResponse = JSON.parse(body);
-            resolve(jsonResponse);
-          } catch (e) {
-            console.error(`[ERROR][NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`);
-            if (e instanceof import_diagnostics.DiagnosticsError) {
-              console.log("LWR Diagnostic Error: ");
-              console.log(e.diagnostics);
-              console.log(e.stack);
+          import_shared_utils.logger.verbose(`[END][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
+          if (!res.statusCode || res.statusCode >= 200 && res.statusCode < 300) {
+            const body = Buffer.concat(bodyChunks).toString();
+            try {
+              const jsonResponse = JSON.parse(body);
+              resolve(jsonResponse);
+            } catch (err) {
+              if (import_shared_utils.logger.currentLevel == import_shared_utils.DEBUG || import_shared_utils.logger.currentLevel == import_shared_utils.VERBOSE) {
+                import_shared_utils.logger.warn(`[NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`, err);
+              } else {
+                import_shared_utils.logger.warn(`[NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`);
+              }
+              resolve({});
+            }
+          } else if (res.statusCode === 301 || res.statusCode === 302) {
+            if (res.headers?.location && (0, import_shared_utils.isModuleOrBundleUrl)(res.headers?.location)) {
+              import_shared_utils.logger.debug(`[NetworkDispatcher] Follow redirect: [${method}][${lang}][${res.statusCode}] ${url} -> ${res.headers.location}`);
+              const location = res.headers.location;
+              return this.handleRequest(this.createRequestOptions(location, method, lang), location, method, lang).then((resRedirect) => resolve(resRedirect)).catch((rejectRedirect) => reject(rejectRedirect));
             } else {
-              console.error(e);
+              import_shared_utils.logger.warn(`Redirect not followed: [${method}][${lang}][${res.statusCode}] ${url} -> ${res.headers.location}`);
+              resolve({});
             }
+          } else {
+            import_shared_utils.logger.warn(`Unexpected status code: [${method}][${lang}][${res.statusCode}] ${url}`);
             resolve({});
           }
         });
       });
       req.on("error", (err) => {
-        console.error(`[ERROR][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
-        if (err instanceof import_diagnostics.DiagnosticsError) {
-          console.log("LWR Diagnostic Error: ");
-          console.log(err.diagnostics);
-          console.log(err.stack);
+        if (import_shared_utils.logger.currentLevel == import_shared_utils.DEBUG || import_shared_utils.logger.currentLevel == import_shared_utils.VERBOSE) {
+          import_shared_utils.logger.warn(`[NetworkDispatcher] Request Failed: [${method}][${lang}] ${url}`, err);
         } else {
-          console.error(err);
+          import_shared_utils.logger.warn(`[NetworkDispatcher] Request  Failed: [${method}][${lang}] ${url}`);
         }
-        reject(err);
+        resolve({});
       });
       req.end();
     });

package/build/es/tools/server-warmup.js

@@ -21,7 +21,7 @@ export async function warmupServer(config, internalRequestKey) {
         serverMode,
     };
     // For each locale, generate all the modules
-    await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
+    await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
     logger.info('[Server Warmup] complete');
 }
 //# sourceMappingURL=server-warmup.js.map

package/build/es/tools/static-generation.d.ts

@@ -13,7 +13,7 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    generateRoutes(runtimeEnvironment: RuntimeEnvironment, staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], dispatcher: LwrDispatcher, outputDir: string, urlRewriteMap?: Map<string, string>): Promise<void>;
+    generateRoutes(runtimeEnvironment: RuntimeEnvironment, staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], basePath: string, dispatcher: LwrDispatcher, outputDir: string, urlRewriteMap?: Map<string, string>): Promise<void>;
     /**
      * Creates a function to dispatch the root requests for a given view url
      */

package/build/es/tools/static-generation.js

@@ -39,11 +39,11 @@ export default class SiteGenerator {
             serverMode,
         };
         // For each locale, generate all the modules
-        await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
+        await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
         // Write redirect files
         this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
         // Copy over assets
-        this.copyAssets(assets, outputDir);
+        this.copyAssets(assets, outputDir, basePath);
         const endTime = performance.now();
         const timeDiff = (endTime - startTime) / 1000;
         logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
@@ -51,7 +51,7 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
+    async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap = new Map()) {
         if (!staticSiteGenerator.locales) {
             staticSiteGenerator.locales = ['en-US'];
         }
@@ -62,7 +62,7 @@ export default class SiteGenerator {
             for (const route of routes) {
                 const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
                 // eslint-disable-next-line no-await-in-loop
-                await generateUrl(route.path, siteConfig);
+                await generateUrl(basePath + route.path, siteConfig);
             }
             // Generate any additional urls
             if (staticSiteGenerator._additionalRoutePaths) {
@@ -458,11 +458,11 @@ export default class SiteGenerator {
      * @param assets AssetConfig
      *
      */
-    copyAssets(assets, outputDir) {
+    copyAssets(assets, outputDir, basePath) {
         for (const asset of assets) {
             try {
                 const assetSrcDir = asset.dir || asset.file;
-                const assetOutputDir = join(outputDir, asset.urlPath);
+                const assetOutputDir = join(outputDir, basePath ? basePath + asset.urlPath : asset.urlPath);
                 if (assetSrcDir && fs.existsSync(assetSrcDir)) {
                     fs.copySync(assetSrcDir, assetOutputDir);
                 }

package/build/es/tools/utils/network-dispatcher.d.ts

@@ -7,5 +7,7 @@ export default class NetworkDispatcher implements LwrDispatcher {
     pool: http.Agent;
     constructor(port: number, internalRequestKey: string);
     dispatchUrl(url: string, method: string, lang: string): Promise<FsContext>;
+    private createRequestOptions;
+    private handleRequest;
 }
 //# sourceMappingURL=network-dispatcher.d.ts.map

package/build/es/tools/utils/network-dispatcher.js

@@ -1,6 +1,6 @@
 import http from 'http';
 import https from 'https';
-import { DiagnosticsError } from '@lwrjs/diagnostics';
+import { DEBUG, isModuleOrBundleUrl, logger, VERBOSE } from '@lwrjs/shared-utils';
 export default class NetworkDispatcher {
     constructor(port, internalRequestKey) {
         this.port = port || 3000;
@@ -11,7 +11,11 @@ export default class NetworkDispatcher {
         this.internalRequestKey = internalRequestKey || '';
     }
     dispatchUrl(url, method, lang) {
-        const options = {
+        const options = this.createRequestOptions(url, method, lang);
+        return this.handleRequest(options, url, method, lang);
+    }
+    createRequestOptions(url, method, lang) {
+        return {
             method: method,
             host: 'localhost',
             port: this.port,
@@ -23,46 +27,65 @@ export default class NetworkDispatcher {
                 'lwr-metadata-request': this.internalRequestKey,
             },
         };
+    }
+    handleRequest(options, url, method, lang) {
         return new Promise((resolve, reject) => {
             const httpClient = options.port == 443 ? https : http;
             const bodyChunks = [];
-            // console.log(`[INFO][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
+            logger.verbose(`[NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
             const req = httpClient.request(options, (res) => {
                 res.on('data', (chunk) => {
                     bodyChunks.push(chunk);
                 });
                 res.on('end', () => {
-                    // console.log(`[END][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
-                    const body = Buffer.concat(bodyChunks).toString();
-                    try {
-                        const jsonResponse = JSON.parse(body);
-                        resolve(jsonResponse);
+                    logger.verbose(`[END][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
+                    if (!res.statusCode || (res.statusCode >= 200 && res.statusCode < 300)) {
+                        const body = Buffer.concat(bodyChunks).toString();
+                        try {
+                            const jsonResponse = JSON.parse(body);
+                            resolve(jsonResponse);
+                        }
+                        catch (err) {
+                            if (logger.currentLevel == DEBUG || logger.currentLevel == VERBOSE) {
+                                logger.warn(`[NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`, err);
+                            }
+                            else {
+                                logger.warn(`[NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`);
+                            }
+                            resolve({});
+                        }
                     }
-                    catch (e) {
-                        console.error(`[ERROR][NetworkDispatcher] unexpected response body: [${method}][${lang}] ${url}: '${body}'`);
-                        if (e instanceof DiagnosticsError) {
-                            console.log('LWR Diagnostic Error: ');
-                            console.log(e.diagnostics);
-                            console.log(e.stack);
+                    else if (res.statusCode === 301 || res.statusCode === 302) {
+                        // Lets follw if we know it is a module or bundle refrence
+                        if (res.headers?.location && isModuleOrBundleUrl(res.headers?.location)) {
+                            logger.debug(`[NetworkDispatcher] Follow redirect: [${method}][${lang}][${res.statusCode}] ${url} -> ${res.headers.location}`);
+                            const location = res.headers.location;
+                            return (this.handleRequest(this.createRequestOptions(location, method, lang), location, method, lang)
+                                // Send nested response to the resolve or reject functions defined above
+                                .then((resRedirect) => resolve(resRedirect))
+                                // Should not happen since we are just warning on error
+                                .catch((rejectRedirect) => reject(rejectRedirect)));
                         }
                         else {
-                            console.error(e);
+                            logger.warn(`Redirect not followed: [${method}][${lang}][${res.statusCode}] ${url} -> ${res.headers.location}`);
+                            resolve({});
                         }
+                    }
+                    // if any other status codes are returned, those needed to be added here
+                    else {
+                        logger.warn(`Unexpected status code: [${method}][${lang}][${res.statusCode}] ${url}`);
                         resolve({});
                     }
                 });
             });
             req.on('error', (err) => {
-                console.error(`[ERROR][NetworkDispatcher] Request: [${method}][${lang}] ${url}`);
-                if (err instanceof DiagnosticsError) {
-                    console.log('LWR Diagnostic Error: ');
-                    console.log(err.diagnostics);
-                    console.log(err.stack);
+                if (logger.currentLevel == DEBUG || logger.currentLevel == VERBOSE) {
+                    logger.warn(`[NetworkDispatcher] Request Failed: [${method}][${lang}] ${url}`, err);
                 }
                 else {
-                    console.error(err);
+                    logger.warn(`[NetworkDispatcher] Request  Failed: [${method}][${lang}] ${url}`);
                 }
-                reject(err);
+                resolve({});
             });
             req.end();
         });

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.0",
+    "version": "0.9.0-alpha.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,32 +32,32 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.0",
-        "@lwrjs/asset-registry": "0.9.0-alpha.0",
-        "@lwrjs/asset-transformer": "0.9.0-alpha.0",
-        "@lwrjs/base-template-engine": "0.9.0-alpha.0",
-        "@lwrjs/base-view-provider": "0.9.0-alpha.0",
-        "@lwrjs/base-view-transformer": "0.9.0-alpha.0",
-        "@lwrjs/client-modules": "0.9.0-alpha.0",
-        "@lwrjs/compiler": "0.9.0-alpha.0",
-        "@lwrjs/config": "0.9.0-alpha.0",
-        "@lwrjs/diagnostics": "0.9.0-alpha.0",
-        "@lwrjs/fs-asset-provider": "0.9.0-alpha.0",
-        "@lwrjs/html-view-provider": "0.9.0-alpha.0",
-        "@lwrjs/loader": "0.9.0-alpha.0",
-        "@lwrjs/lwc-module-provider": "0.9.0-alpha.0",
-        "@lwrjs/lwc-ssr": "0.9.0-alpha.0",
-        "@lwrjs/markdown-view-provider": "0.9.0-alpha.0",
-        "@lwrjs/module-bundler": "0.9.0-alpha.0",
-        "@lwrjs/module-registry": "0.9.0-alpha.0",
-        "@lwrjs/npm-module-provider": "0.9.0-alpha.0",
-        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.0",
-        "@lwrjs/o11y": "0.9.0-alpha.0",
-        "@lwrjs/resource-registry": "0.9.0-alpha.0",
-        "@lwrjs/router": "0.9.0-alpha.0",
-        "@lwrjs/server": "0.9.0-alpha.0",
-        "@lwrjs/shared-utils": "0.9.0-alpha.0",
-        "@lwrjs/view-registry": "0.9.0-alpha.0",
+        "@lwrjs/app-service": "0.9.0-alpha.2",
+        "@lwrjs/asset-registry": "0.9.0-alpha.2",
+        "@lwrjs/asset-transformer": "0.9.0-alpha.2",
+        "@lwrjs/base-template-engine": "0.9.0-alpha.2",
+        "@lwrjs/base-view-provider": "0.9.0-alpha.2",
+        "@lwrjs/base-view-transformer": "0.9.0-alpha.2",
+        "@lwrjs/client-modules": "0.9.0-alpha.2",
+        "@lwrjs/compiler": "0.9.0-alpha.2",
+        "@lwrjs/config": "0.9.0-alpha.2",
+        "@lwrjs/diagnostics": "0.9.0-alpha.2",
+        "@lwrjs/fs-asset-provider": "0.9.0-alpha.2",
+        "@lwrjs/html-view-provider": "0.9.0-alpha.2",
+        "@lwrjs/loader": "0.9.0-alpha.2",
+        "@lwrjs/lwc-module-provider": "0.9.0-alpha.2",
+        "@lwrjs/lwc-ssr": "0.9.0-alpha.2",
+        "@lwrjs/markdown-view-provider": "0.9.0-alpha.2",
+        "@lwrjs/module-bundler": "0.9.0-alpha.2",
+        "@lwrjs/module-registry": "0.9.0-alpha.2",
+        "@lwrjs/npm-module-provider": "0.9.0-alpha.2",
+        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.2",
+        "@lwrjs/o11y": "0.9.0-alpha.2",
+        "@lwrjs/resource-registry": "0.9.0-alpha.2",
+        "@lwrjs/router": "0.9.0-alpha.2",
+        "@lwrjs/server": "0.9.0-alpha.2",
+        "@lwrjs/shared-utils": "0.9.0-alpha.2",
+        "@lwrjs/view-registry": "0.9.0-alpha.2",
         "fs-extra": "^10.1.0",
         "ms": "^2.1.3",
         "path-to-regexp": "^6.2.0",
@@ -65,7 +65,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.0",
+        "@lwrjs/types": "0.9.0-alpha.2",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -74,5 +74,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "6890d8619b295a49ee1ed8253a372337d83863be"
+    "gitHead": "bcf63de23d1a2a53fb0e961dba4396e8753710dd"
 }