1.0.30

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.26",
+  "version": "1.0.30",
   "private": false,
   "description": "a smart server side renderer supporting shadow dom",
   "main": "dist_ts/index.js",
@@ -10,7 +10,7 @@
   "scripts": {
     "test": "(tstest test/ --web)",
     "build": "(tsbuild --web)",
-    "format": "(gitzone format)"
+    "serve": "tsrun scripts/serve.ts"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",

test/test.ts

@@ -9,12 +9,8 @@ tap.test('should create a valid smartssr instance', async () => {
   });
 });
 
-tap.test('should start the smartssr instance', async () => {
-  await testSSRInstance.start();
-});
-
 tap.test('should render central.eu', async (tools) => {
-  await testSSRInstance.renderPage('https://in.work');
+  await testSSRInstance.renderPage('https://lossless.com');
 });
 
 tap.skip.test('should render lossless.com', async () => {
@@ -26,8 +22,4 @@ tap.skip.test('should render https://lossless.gmbh', async () => {
   console.log(renderedPage);
 });
 
-tap.test('should stop the smartssr instance', async () => {
-  await testSSRInstance.stop();
-});
-
 tap.start();

ts/smartssr.classes.smartssr.ts

@@ -11,7 +11,6 @@ export interface ISmartSSROptions {
  *
  */
 export class SmartSSR {
-  public browser: plugins.smartpuppeteer.IncognitoBrowser;
   public options: ISmartSSROptions;
 
   constructor(optionsArg?: ISmartSSROptions) {
@@ -23,67 +22,63 @@ export class SmartSSR {
     };
   }
 
-  public async start() {
-    this.browser = new plugins.smartpuppeteer.IncognitoBrowser();
-    await this.browser.start();
-  }
-  public async stop() {
-    if (this.browser) {
-      await plugins.smartdelay.delayFor(3000);
-      await this.browser.stop();
-      this.browser = null;
-    } else {
-      console.log('browser was not in started mode');
-    }
-  }
-
   public async renderPage(urlArg: string) {
     const overallTimeMeasurement = new plugins.smarttime.HrtMeasurement();
     overallTimeMeasurement.start();
     const resultDeferred = plugins.smartpromise.defer<string>();
-    const context = await this.browser.getNewIncognitoContext();
+    const browser = new plugins.smartpuppeteer.IncognitoBrowser();
-    const page = await context.newPage();
+    const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
+    let renderedPageString: string;
+    let screenshotBuffer: Buffer;
+    await browser.start();
+    try {
+      const context = await browser.getNewIncognitoContext();
+      const page = await context.newPage();
 
-    // lets protext against left open tabs
+      // lets protect against left open tabs
-    plugins.smartdelay.delayFor(30000).then(() => {
+      plugins.smartdelay.delayFor(30000).then(async () => {
-      if (!page.isClosed) {
+        if (!page.isClosed) {
-        page.close();
+          try {
-        context.close();
+            await page.close();
-        throw new Error(`failed to render ${urlArg}`);
+            await context.close();
+          } catch (e) {
+            console.log(e);
+          } finally {
+            await browser.stop();
+          }
+          throw new Error(`failed to render ${urlArg}`);
+        }
+      });
+
+      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',
+        });
       }
 
-    });
+      await page.$eval('body', serializeFunction);
+      const pageContent = await page.content();
+      renderedPageString = pageContent;
+      resultDeferred.resolve(renderedPageString);
+      renderTimeMeasurement.stop();
 
-    page.on('console', (msg) => {
+      // lets clean up async
-      console.log(`${urlArg}: ${msg.text()}`);
+      await page.close();
-    });
+      await context.close();
-
+    } catch (e) {
-    const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
+      console.log(e);
-    renderTimeMeasurement.start();
-    await page.goto(urlArg, {
-      waitUntil: 'networkidle2',
-      timeout: 30000,
-    });
-
-    let screenshotBuffer: Buffer;
-
-    if (this.options.debug) {
-      screenshotBuffer = await page.screenshot({
-        encoding: 'binary',
-      });
     }
-
+    await browser.stop();
-    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();
 
     overallTimeMeasurement.stop();
     console.log(
@@ -103,6 +98,6 @@ export class SmartSSR {
       fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
     }
 
-    return result;
+    return resultDeferred.promise;
   }
 }

ts/smartssr.function.serialize.ts

@@ -63,10 +63,15 @@ export function serializeFunction(rootNode) {
       const noteForAppending: HTMLElement[] = [];
 
       // lets care about static css first
-      if ((nodeArg.constructor as any).styles?.cssText) {
+      if (
-        const styleTag = document.createElement('style');
+        (nodeArg.constructor as any).styles &&
-        styleTag.textContent = prependCss(nodeUUID, (nodeArg.constructor as any).styles.cssText);
+        (nodeArg.constructor as any).styles instanceof Array
-        noteForAppending.push(styleTag);
+      ) {
+        for (const objectArg of (nodeArg.constructor as any).styles) {
+          const styleTag = document.createElement('style');
+          styleTag.textContent = prependCss(nodeUUID, objectArg.cssText);
+          noteForAppending.push(styleTag);
+        }
       }
 
       childNodes.forEach((childNode) => {