1.0.31

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.26",
+  "version": "1.0.31",
   "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,50 +22,36 @@ 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 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) {
+        try {
-        page.close();
+          await browser.stop();
-        context.close();
+        } catch {}
-        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 screenshotBuffer: Buffer;
-
       if (this.options.debug) {
         screenshotBuffer = await page.screenshot({
           encoding: 'binary',
@@ -75,15 +60,17 @@ export class SmartSSR {
 
       await page.$eval('body', serializeFunction);
       const pageContent = await page.content();
-    const renderedPageString = pageContent;
+      renderedPageString = pageContent;
       resultDeferred.resolve(renderedPageString);
-
-    const result = await resultDeferred.promise;
       renderTimeMeasurement.stop();
 
       // lets clean up async
       await page.close();
       await context.close();
+    } catch (e) {
+      console.log(e);
+    }
+    await browser.stop();
 
     overallTimeMeasurement.stop();
     console.log(
@@ -103,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

@@ -63,11 +63,16 @@ export function serializeFunction(rootNode) {
       const noteForAppending: HTMLElement[] = [];
 
       // lets care about static css first
-      if ((nodeArg.constructor as any).styles?.cssText) {
+      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, (nodeArg.constructor as any).styles.cssText);
+          styleTag.textContent = prependCss(nodeUUID, objectArg.cssText);
           noteForAppending.push(styleTag);
         }
+      }
 
       childNodes.forEach((childNode) => {
         if (childNode instanceof HTMLElement) {