1.0.32

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.28",
+  "version": "1.0.32",
   "private": false,
   "description": "a smart server side renderer supporting shadow dom",
   "main": "dist_ts/index.js",
@@ -13,19 +13,19 @@
     "serve": "tsrun scripts/serve.ts"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.26",
     "@gitzone/tstest": "^1.0.54",
     "@pushrocks/smartserve": "^1.1.41",
     "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^15.3.0",
+    "@types/node": "^16.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartfile": "^8.0.10",
-    "@pushrocks/smartpromise": "^3.1.5",
-    "@pushrocks/smartpuppeteer": "^1.0.21",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartpuppeteer": "^1.0.25",
     "@pushrocks/smarttime": "^3.0.38"
   },
   "files": [

ts/smartssr.classes.smartssr.ts

@@ -27,50 +27,49 @@ export class SmartSSR {
     overallTimeMeasurement.start();
     const resultDeferred = plugins.smartpromise.defer<string>();
     const browser = new plugins.smartpuppeteer.IncognitoBrowser();
-    await browser.start();
-    const context = await browser.getNewIncognitoContext();
-    const page = await context.newPage();
-
-    // lets protext against left open tabs
-    plugins.smartdelay.delayFor(30000).then(() => {
-      if (!page.isClosed) {
-        page.close();
-        context.close();
-        throw new Error(`failed to render ${urlArg}`);
-      }
-      
-    });
-
-    page.on('console', (msg) => {
-      console.log(`${urlArg}: ${msg.text()}`);
-    });
-
     const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
-    renderTimeMeasurement.start();
-    await page.goto(urlArg, {
-      waitUntil: 'networkidle2',
-      timeout: 30000,
-    });
-
+    let renderedPageString: string;
     let screenshotBuffer: Buffer;
+    await browser.start();
+    try {
+      const context = await browser.getNewIncognitoContext();
+      const page = await context.newPage();
 
-    if (this.options.debug) {
-      screenshotBuffer = await page.screenshot({
-        encoding: 'binary',
+      // lets protect against left open tabs
+      plugins.smartdelay.delayFor(30000).then(async () => {
+        try {
+          await browser.stop();
+        } catch {}
       });
+
+      page.on('console', (msg) => {
+        console.log(`${urlArg}: ${msg.text()}`);
+      });
+
+      renderTimeMeasurement.start();
+      await page.goto(urlArg, {
+        waitUntil: 'networkidle2',
+        timeout: 30000,
+      });
+
+      if (this.options.debug) {
+        screenshotBuffer = await page.screenshot({
+          encoding: 'binary',
+        }) as Buffer;
+      }
+
+      await page.$eval('body', serializeFunction);
+      const pageContent = await page.content();
+      renderedPageString = pageContent;
+      resultDeferred.resolve(renderedPageString);
+      renderTimeMeasurement.stop();
+
+      // lets clean up async
+      await page.close();
+      await context.close();
+    } catch (e) {
+      console.log(e);
     }
-
-    await page.$eval('body', serializeFunction);
-    const pageContent = await page.content();
-    const renderedPageString = pageContent;
-    resultDeferred.resolve(renderedPageString);
-
-    const result = await resultDeferred.promise;
-    renderTimeMeasurement.stop();
-
-    // lets clean up async
-    await page.close();
-    await context.close();
     await browser.stop();
 
     overallTimeMeasurement.stop();
@@ -91,6 +90,6 @@ export class SmartSSR {
       fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
     }
 
-    return result;
+    return resultDeferred.promise;
   }
 }

ts/smartssr.function.serialize.ts

@@ -1,5 +1,5 @@
 declare var document: Document;
-export function serializeFunction(rootNode) {
+export function serializeFunction(rootNode: Node) {
   const uuidv4 = () => {
     return 'unixxxxxxxxxxx'.replace(/[xy]/g, (c) => {
       const r = (Math.random() * 16) | 0;
@@ -26,7 +26,7 @@ export function serializeFunction(rootNode) {
   };
   const loopProtection: any[] = [];
 
-  function serializeNode(nodeArg: HTMLElement, logThis = false) {
+  function serializeNode(nodeArg: HTMLElement | any, logThis = false) {
     if (loopProtection.includes(nodeArg)) {
       return;
     }
@@ -45,12 +45,12 @@ export function serializeFunction(rootNode) {
 
       // handle slot element
       const slotsForMove: HTMLSlotElement[] = [];
-      slots.forEach((slot) => {
+      slots.forEach((slot: any) => {
         slotsForMove.push(slot);
       });
 
       for (const slot of slotsForMove) {
-        const slottedLightNodesForMove = [];
+        const slottedLightNodesForMove: any[] = [];
         slot.assignedNodes().forEach((lightNode) => slottedLightNodesForMove.push(lightNode));
         slottedLightNodesForMove.forEach((lightNode) =>
           slot.parentNode.insertBefore(lightNode, slot)
@@ -63,7 +63,10 @@ export function serializeFunction(rootNode) {
       const noteForAppending: HTMLElement[] = [];
 
       // lets care about static css first
-      if ((nodeArg.constructor as any).styles && (nodeArg.constructor as any).styles instanceof Array) {
+      if (
+        (nodeArg.constructor as any).styles &&
+        (nodeArg.constructor as any).styles instanceof Array
+      ) {
         for (const objectArg of (nodeArg.constructor as any).styles) {
           const styleTag = document.createElement('style');
           styleTag.textContent = prependCss(nodeUUID, objectArg.cssText);
@@ -71,7 +74,7 @@ export function serializeFunction(rootNode) {
         }
       }
 
-      childNodes.forEach((childNode) => {
+      childNodes.forEach((childNode: ChildNode) => {
         if (childNode instanceof HTMLElement) {
           if (childNode.tagName === 'STYLE') {
             childNode.textContent = prependCss(nodeUUID, childNode.textContent);