1.0.33

.gitlab-ci.yml

@@ -26,16 +26,28 @@ mirror:
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
     - docker
+  allow_failure: true
 
 # ====================
 # test stage

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.12",
+  "version": "1.0.33",
   "private": false,
   "description": "a smart server side renderer supporting shadow dom",
   "main": "dist_ts/index.js",
@@ -10,23 +10,23 @@
   "scripts": {
     "test": "(tstest test/ --web)",
     "build": "(tsbuild --web)",
-    "format": "(gitzone format)"
+    "serve": "tsrun scripts/serve.ts"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.26",
-    "@gitzone/tstest": "^1.0.43",
+    "@gitzone/tstest": "^1.0.54",
     "@pushrocks/smartserve": "^1.1.41",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.0.27",
+    "@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": "^7.0.12",
+    "@pushrocks/smartfile": "^8.0.10",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
-    "@pushrocks/smartpuppeteer": "^1.0.15",
+    "@pushrocks/smartpuppeteer": "^1.0.26",
-    "@pushrocks/smarttime": "^3.0.24"
+    "@pushrocks/smarttime": "^3.0.38"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -9,26 +9,17 @@ 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://central.eu/article/5e76873b9cf69b7bf6bc78bc/Introducing%3A%20central.eu'
-  );
-});
-
-tap.skip.test('should render lossless.com', async () => {
   await testSSRInstance.renderPage('https://lossless.com');
 });
 
-tap.skip.test('should render https://lossless.gmbh', async () => {
+tap.test('should render lossless.com', async () => {
-  const renderedPage = await testSSRInstance.renderPage('https://lossless.gmbh');
+  await testSSRInstance.renderPage('https://lossless.com');
 });
 
-tap.test('should stop the smartssr instance', async () => {
+tap.test('should render https://lossless.gmbh', async () => {
-  await testSSRInstance.stop();
+  const renderedPage = await testSSRInstance.renderPage('https://lossless.gmbh');
+  console.log(renderedPage);
 });
 
 tap.start();

ts/smartssr.classes.smartssr.ts

@@ -11,7 +11,6 @@ export interface ISmartSSROptions {
  *
  */
 export class SmartSSR {
-  public browser: plugins.smartpuppeteer.puppeteer.Browser;
   public options: ISmartSSROptions;
 
   constructor(optionsArg?: ISmartSSROptions) {
@@ -23,62 +22,55 @@ export class SmartSSR {
     };
   }
 
-  public async start() {
-    this.browser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance();
-  }
-  public async stop() {
-    if (this.browser) {
-      await plugins.smartdelay.delayFor(3000);
-      await this.browser.close();
-      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.createIncognitoBrowserContext();
+    const browser = new plugins.smartpuppeteer.IncognitoBrowser();
-    const page = await context.newPage();
+    const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
-    page.on('console', (msg) => {
+    let renderedPageString: string;
-      console.log(`${urlArg}: ${msg.text()}`);
+    let screenshotBuffer: Buffer;
-    });
+    await browser.start();
+    try {
+      const context = await browser.getNewIncognitoContext();
+      const page = await context.newPage();
 
-    page.on('load', async (...args) => {
+      // lets protect against left open tabs
-      await plugins.smartdelay.delayFor(5000);
+      plugins.smartdelay.delayFor(30000).then(async () => {
-      let screenshotBuffer: Buffer;
+        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();
-      const renderedPageString = pageContent;
+      renderedPageString = pageContent;
       resultDeferred.resolve(renderedPageString);
+      renderTimeMeasurement.stop();
 
-      if (this.options.debug) {
+      // lets clean up async
-        plugins.smartfile.memory.toFsSync(
+      await page.close();
-          renderedPageString,
+      await context.close();
-          plugins.path.join(paths.noGitDir, 'test.html')
+    } catch (e) {
-        );
+      console.log(e);
-        const fs = await import('fs');
+    }
-        fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
+    await browser.stop();
-      }
-    });
-
-    const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
-    renderTimeMeasurement.start();
-    await page.goto(urlArg);
-    const result = await resultDeferred.promise;
-    renderTimeMeasurement.stop();
-
-    // lets clean up async
-    context.close();
 
     overallTimeMeasurement.stop();
     console.log(
@@ -87,6 +79,17 @@ export class SmartSSR {
     console.log(
       `The rendering alone took ${renderTimeMeasurement.milliSeconds} milliseconds for ${urlArg}`
     );
-    return result;
+
+    // debug
+    if (this.options.debug) {
+      plugins.smartfile.memory.toFsSync(
+        renderedPageString,
+        plugins.path.join(paths.noGitDir, 'test.html')
+      );
+      const fs = await import('fs');
+      fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
+    }
+
+    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;
     }
@@ -39,31 +39,54 @@ export function serializeFunction(rootNode) {
       const nodeUUID = uuidv4();
 
       nodeArg.classList.add(nodeUUID);
+
+      // find all slots
       const slots = nodeArg.shadowRoot.querySelectorAll('slot');
 
       // handle slot element
-      slots.forEach((slot) => {
+      const slotsForMove: HTMLSlotElement[] = [];
-        nodeArg.childNodes.forEach((lightNode) => slot.parentNode.insertBefore(lightNode, slot));
+      slots.forEach((slot: any) => {
-        slot.parentNode.removeChild(slot);
+        slotsForMove.push(slot);
       });
 
+      for (const slot of slotsForMove) {
+        const slottedLightNodesForMove: any[] = [];
+        slot.assignedNodes().forEach((lightNode) => slottedLightNodesForMove.push(lightNode));
+        slottedLightNodesForMove.forEach((lightNode) =>
+          slot.parentNode.insertBefore(lightNode, slot)
+        );
+      }
+
       // lets modify the css
       const childNodes = nodeArg.shadowRoot.childNodes;
       // tslint:disable-next-line: prefer-for-of
       const noteForAppending: HTMLElement[] = [];
-      childNodes.forEach((childNode) => {
+
+      // lets care about static css first
+      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);
+          noteForAppending.push(styleTag);
+        }
+      }
+
+      childNodes.forEach((childNode: ChildNode) => {
         if (childNode instanceof HTMLElement) {
           if (childNode.tagName === 'STYLE') {
             childNode.textContent = prependCss(nodeUUID, childNode.textContent);
           } else {
-            if (nodeArg.tagName?.includes('ARTICLEGRID')) {
-              console.log('hello ' + childNode.id);
-            }
             serializeNode(childNode, logThis);
           }
           noteForAppending.push(childNode);
         }
       });
+      while (nodeArg.firstChild) {
+        nodeArg.removeChild(nodeArg.firstChild);
+      }
       noteForAppending.forEach((childNode) => {
         nodeArg.append(childNode);
       });