@lwrjs/lwc-ssr 0.8.0-alpha.13 → 0.8.0-alpha.15

package/build/cjs/moduleProvider/index.cjs

@@ -49,7 +49,7 @@ import Ctor, * as rootComponent from '${rootSpecifier}';
     const result = renderComponent('${(0, import_shared_utils.moduleSpecifierToKebabCase)(rootSpecifier)}', Ctor, props || {});
 
     // 3. relay results
-    globalThis.postMessage({ result, props, markup });
+    globalThis.resolver({ result, props, markup });
 })()`;
 }
 var LwcSsrModuleProvider = class {

package/build/cjs/viewTransformer/index.cjs

@@ -70,7 +70,7 @@ function lwcSsrViewTranformer(options, {moduleBundler}) {
             });
             stringBuilder.overwrite(startOffset, endOffset, html);
           }).catch((err) => {
-            import_shared_utils.logger.warn(`Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: `, err);
+            import_shared_utils.logger.warn(`Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: `, err.stack);
           });
         }));
         if (Object.keys(ssrProps).length) {

package/build/cjs/viewTransformer/sandbox-locker.cjs

@@ -0,0 +1,54 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/lwc-ssr/src/viewTransformer/sandbox-locker.ts
+__markAsModule(exports);
+__export(exports, {
+  default: () => runCode
+});
+var import_near_membrane_node = __toModule(require("@locker/near-membrane-node"));
+var import_node_fetch = __toModule(require("node-fetch"));
+function runCode(codes, context) {
+  return new Promise((resolve, reject) => {
+    let resolver;
+    const p = new Promise((r) => resolver = r);
+    function getContext() {
+      return context;
+    }
+    const endowments = Object.getOwnPropertyDescriptors({
+      getContext,
+      fetch: import_node_fetch.default,
+      resolver,
+      process,
+      setTimeout,
+      clearTimeout
+    });
+    const ve = (0, import_near_membrane_node.default)(globalThis, {endowments});
+    try {
+      ve.evaluate(codes.join("\n"));
+      p.then(resolve);
+    } catch (e) {
+      reject(e);
+    }
+  });
+}

package/build/cjs/viewTransformer/sandbox-worker.cjs

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/lwc-ssr/src/viewTransformer/sandbox-worker.ts
+__markAsModule(exports);
+__export(exports, {
+  default: () => runCode
+});
+var import_worker_threads = __toModule(require("worker_threads"));
+var HEADER = "/* This module is generated and meant to be used in a Server context */";
+var WORKER_CODE_SANDBOX_APIS = [
+  `const { parentPort, workerData } = require('worker_threads');`,
+  `globalThis.getContext = () => workerData;`,
+  `globalThis.fetch = require('node-fetch');`,
+  `globalThis.resolver = (...args) => parentPort.postMessage(...args);`
+];
+function runCode(codes, workerData) {
+  const workerCode = [HEADER, ...WORKER_CODE_SANDBOX_APIS, ...codes].join("\n");
+  return new Promise((resolve, reject) => {
+    const worker = new import_worker_threads.Worker(workerCode, {eval: true, workerData});
+    worker.on("message", resolve);
+    worker.on("error", reject);
+    worker.on("exit", (code) => {
+      if (code !== 0) {
+        reject(new Error(`SSR worker stopped with exit code: ${code}`));
+      }
+    });
+  });
+}

package/build/cjs/viewTransformer/sandbox.cjs

@@ -26,27 +26,11 @@ __markAsModule(exports);
 __export(exports, {
   default: () => runCode
 });
-var import_worker_threads = __toModule(require("worker_threads"));
-var HEADER = "/* This module is generated and meant to be used in a Server context */";
-var WORKER_CODE_SANDBOX_APIS = [
-  `const { parentPort, workerData } = require('worker_threads');`,
-  `globalThis.getContext = () => workerData;`,
-  `globalThis.fetch = require('node-fetch');`,
-  `globalThis.postMessage = (...args) => parentPort.postMessage(...args);`
-];
-function runCodeOnWorker(codes, workerData) {
-  const workerCode = [HEADER, ...WORKER_CODE_SANDBOX_APIS, ...codes].join("\n");
-  return new Promise((resolve, reject) => {
-    const worker = new import_worker_threads.Worker(workerCode, {eval: true, workerData});
-    worker.on("message", resolve);
-    worker.on("error", reject);
-    worker.on("exit", (code) => {
-      if (code !== 0) {
-        reject(new Error(`SSR worker stopped with exit code: ${code}`));
-      }
-    });
-  });
-}
+var import_sandbox_worker = __toModule(require("./sandbox-worker.cjs"));
+var import_sandbox_locker = __toModule(require("./sandbox-locker.cjs"));
 function runCode(codes, context) {
-  return runCodeOnWorker(codes, context);
+  if (process.env.LOCKER_SB === "true") {
+    return (0, import_sandbox_locker.default)(codes, context);
+  }
+  return (0, import_sandbox_worker.default)(codes, context);
 }

package/build/cjs/viewTransformer/ssr-element.cjs

@@ -28,6 +28,7 @@ __export(exports, {
 });
 var import_amd_utils = __toModule(require("./amd-utils.cjs"));
 var import_sandbox = __toModule(require("./sandbox.cjs"));
+var import_perf_hooks = __toModule(require("perf_hooks"));
 async function ssrElement({specifier, props: templateProps}, moduleBundler, {runtimeEnvironment, runtimeParams}) {
   const {format} = runtimeEnvironment;
   const {
@@ -49,9 +50,13 @@ async function ssrElement({specifier, props: templateProps}, moduleBundler, {run
     query: runtimeParams.query || {},
     locale: runtimeParams.locale || runtimeEnvironment.defaultLocale
   };
+  const startTime = import_perf_hooks.performance.now();
   const {result, props, markup} = format === "amd" ? await (0, import_sandbox.default)([
     ...await (0, import_amd_utils.default)(runtimeEnvironment, version.replace(/\./g, "_"), bundleSpecifier, bundleRecord.includedModules),
     code
   ], context) : await (0, import_sandbox.default)([code], context);
+  const endTime = import_perf_hooks.performance.now();
+  const timeDiff = endTime - startTime;
+  console.log(`[${specifier} SSR] complete in ${timeDiff} ms`);
   return {html: result, props, markup};
 }

package/build/es/moduleProvider/index.js

@@ -33,7 +33,7 @@ import Ctor, * as rootComponent from '${rootSpecifier}';
     const result = renderComponent('${moduleSpecifierToKebabCase(rootSpecifier)}', Ctor, props || {});
 
     // 3. relay results
-    globalThis.postMessage({ result, props, markup });
+    globalThis.resolver({ result, props, markup });
 })()`;
 }
 export default class LwcSsrModuleProvider {

package/build/es/viewTransformer/index.js

@@ -69,7 +69,7 @@ export default function lwcSsrViewTranformer(options, { moduleBundler }) {
                         stringBuilder.overwrite(startOffset, endOffset, html);
                     })
                         .catch((err) => {
-                        logger.warn(`Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: `, err);
+                        logger.warn(`Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: `, err.stack);
                     });
                 }));
                 if (Object.keys(ssrProps).length) {

package/build/es/viewTransformer/sandbox-locker.d.ts

@@ -0,0 +1,7 @@
+import { PageDataResponse, SsrRequestContext } from '@lwrjs/types';
+interface SandboxResults extends PageDataResponse {
+    result?: string;
+}
+export default function runCode(codes: string[], context: SsrRequestContext): Promise<SandboxResults>;
+export {};
+//# sourceMappingURL=sandbox-locker.d.ts.map

package/build/es/viewTransformer/sandbox-locker.js

@@ -0,0 +1,29 @@
+import createVirtualEnvironment from '@locker/near-membrane-node';
+import fetch from 'node-fetch';
+export default function runCode(codes, context) {
+    return new Promise((resolve, reject) => {
+        let resolver;
+        const p = new Promise((r) => (resolver = r));
+        function getContext() {
+            return context;
+        }
+        const endowments = Object.getOwnPropertyDescriptors({
+            getContext,
+            fetch,
+            resolver,
+            // for AMD loader ModuleRegistry
+            process,
+            setTimeout,
+            clearTimeout,
+        });
+        const ve = createVirtualEnvironment(globalThis, { endowments });
+        try {
+            ve.evaluate(codes.join('\n'));
+            p.then(resolve);
+        }
+        catch (e) {
+            reject(e);
+        }
+    });
+}
+//# sourceMappingURL=sandbox-locker.js.map

package/build/es/viewTransformer/sandbox-worker.d.ts

@@ -0,0 +1,12 @@
+import { PageDataResponse, SsrRequestContext } from '@lwrjs/types';
+interface SandboxResults extends PageDataResponse {
+    result?: string;
+}
+/**
+ * Run the SSR module code in a worker, and return the results to the main thread.
+ * @param codes - Code strings which SSR a root component
+ * @returns a promise to the SSRed code string, or an error message
+ */
+export default function runCode(codes: string[], workerData: SsrRequestContext): Promise<SandboxResults>;
+export {};
+//# sourceMappingURL=sandbox-worker.d.ts.map

package/build/es/viewTransformer/sandbox-worker.js

@@ -0,0 +1,38 @@
+import { Worker } from 'worker_threads';
+const HEADER = '/* This module is generated and meant to be used in a Server context */';
+/**
+ * Sandbox APIs
+ * @param globalThis.getContext
+ * function to provide prop request context object with properties such as props, params, and locale
+ *
+ * @param globalThis.fetch
+ * fetch function for external data fetching
+ *
+ * @param globalThis.postMessage
+ * postbacks from sandbox to main thread
+ */
+const WORKER_CODE_SANDBOX_APIS = [
+    `const { parentPort, workerData } = require('worker_threads');`,
+    `globalThis.getContext = () => workerData;`,
+    `globalThis.fetch = require('node-fetch');`,
+    `globalThis.resolver = (...args) => parentPort.postMessage(...args);`,
+];
+/**
+ * Run the SSR module code in a worker, and return the results to the main thread.
+ * @param codes - Code strings which SSR a root component
+ * @returns a promise to the SSRed code string, or an error message
+ */
+export default function runCode(codes, workerData) {
+    const workerCode = [HEADER, ...WORKER_CODE_SANDBOX_APIS, ...codes].join('\n');
+    return new Promise((resolve, reject) => {
+        const worker = new Worker(workerCode, { eval: true, workerData });
+        worker.on('message', resolve);
+        worker.on('error', reject);
+        worker.on('exit', (code) => {
+            if (code !== 0) {
+                reject(new Error(`SSR worker stopped with exit code: ${code}`));
+            }
+        });
+    });
+}
+//# sourceMappingURL=sandbox-worker.js.map

package/build/es/viewTransformer/sandbox.js

@@ -1,41 +1,9 @@
-import { Worker } from 'worker_threads';
-const HEADER = '/* This module is generated and meant to be used in a Server context */';
-/**
- * Sandbox APIs
- * @param globalThis.getContext
- * function to provide prop request context object with properties such as props, params, and locale
- *
- * @param globalThis.fetch
- * fetch function for external data fetching
- *
- * @param globalThis.postMessage
- * postbacks from sandbox to main thread
- */
-const WORKER_CODE_SANDBOX_APIS = [
-    `const { parentPort, workerData } = require('worker_threads');`,
-    `globalThis.getContext = () => workerData;`,
-    `globalThis.fetch = require('node-fetch');`,
-    `globalThis.postMessage = (...args) => parentPort.postMessage(...args);`,
-];
-/**
- * Run the SSR module code in a worker, and return the results to the main thread.
- * @param codes - Code strings which SSR a root component
- * @returns a promise to the SSRed code string, or an error message
- */
-function runCodeOnWorker(codes, workerData) {
-    const workerCode = [HEADER, ...WORKER_CODE_SANDBOX_APIS, ...codes].join('\n');
-    return new Promise((resolve, reject) => {
-        const worker = new Worker(workerCode, { eval: true, workerData });
-        worker.on('message', resolve);
-        worker.on('error', reject);
-        worker.on('exit', (code) => {
-            if (code !== 0) {
-                reject(new Error(`SSR worker stopped with exit code: ${code}`));
-            }
-        });
-    });
-}
+import runCodeOnWorker from './sandbox-worker.js';
+import runCodeOnLocker from './sandbox-locker.js';
 export default function runCode(codes, context) {
+    if (process.env.LOCKER_SB === 'true') {
+        return runCodeOnLocker(codes, context);
+    }
     return runCodeOnWorker(codes, context);
 }
 //# sourceMappingURL=sandbox.js.map

package/build/es/viewTransformer/ssr-element.js

@@ -1,5 +1,6 @@
 import getCode from './amd-utils.js';
 import runCode from './sandbox.js';
+import { performance } from 'perf_hooks';
 /**
  * Create a bundle for the given SSR module and run the code in a sandbox.
  * @param moduleInfo - specifier: The ID of the module, generated by "lwc-ssr/moduleProvider", which SSRs a component
@@ -34,12 +35,16 @@ export async function ssrElement({ specifier, props: templateProps }, moduleBund
         locale: runtimeParams.locale || runtimeEnvironment.defaultLocale,
     };
     // Get the SSR string and properties bag
+    const startTime = performance.now();
     const { result, props, markup } = format === 'amd'
         ? await runCode([
             ...(await getCode(runtimeEnvironment, version.replace(/\./g, '_'), bundleSpecifier, bundleRecord.includedModules)),
             code,
         ], context)
         : await runCode([code], context);
+    const endTime = performance.now();
+    const timeDiff = endTime - startTime;
+    console.log(`[${specifier} SSR] complete in ${timeDiff} ms`);
     return { html: result, props, markup };
 }
 //# sourceMappingURL=ssr-element.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.0-alpha.13",
+    "version": "0.8.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,14 +33,16 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.8.0-alpha.13",
-        "@lwrjs/shared-utils": "0.8.0-alpha.13"
+        "@locker/near-membrane-node": "^0.11.6",
+        "@lwrjs/diagnostics": "0.8.0-alpha.15",
+        "@lwrjs/shared-utils": "0.8.0-alpha.15",
+        "node-fetch": "^2.6.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.13"
+        "@lwrjs/types": "0.8.0-alpha.15"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "cc4bc856f34d2ec15df550503dd7463fa31b30e5"
+    "gitHead": "4e6550cae87627aab7d51d22a80c0012b397918d"
 }