1.0.37

.gitlab-ci.yml

@@ -12,30 +12,38 @@ stages:
   - release
   - metadata
 
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
-  stage: security
+# security stage
-  script:
+# ====================
-    - npmci git mirror
+auditProductionDependencies:
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-audit:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm install --ignore-scripts
+     - npmci command pnpm audit --audit-level=high --prod
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
   tags:
+    - lossless
     - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command pnpm audit --audit-level=high --dev
+  tags:
+    - lossless
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -44,7 +52,6 @@ audit:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
@@ -55,10 +62,9 @@ testStable:
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
-    - npmci command npm run build
+    - npmci npm build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -84,10 +90,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -107,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartssr",
-      "shortDescription": "a smart server side renderer supporting shadow dom",
+      "description": "a smart server side renderer supporting shadow dom",
       "npmPackagename": "@pushrocks/smartssr",
       "license": "MIT",
       "projectDomain": "push.rocks"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.16",
+  "version": "1.0.37",
   "private": false,
   "description": "a smart server side renderer supporting shadow dom",
   "main": "dist_ts/index.js",
@@ -9,24 +9,27 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild --web --allowimplicitany)",
-    "format": "(gitzone format)"
+    "serve": "tsrun scripts/serve.ts",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.43",
+    "@gitzone/tsrun": "^1.2.39",
-    "@pushrocks/smartserve": "^1.1.41",
+    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/smartserve": "^2.0.33",
-    "@types/node": "^14.0.27",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.16.3",
     "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartfile": "^7.0.12",
+    "@pushrocks/smartfile": "^10.0.7",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpuppeteer": "^1.0.15",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smarttime": "^3.0.24"
+    "@pushrocks/smartpuppeteer": "^2.0.2",
+    "@pushrocks/smarttime": "^4.0.1"
   },
   "files": [
     "ts/**/*",
@@ -42,5 +45,6 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "type": "module"
 }

readme.md

@@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt
 PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartssr)](https://lossless.cloud)
 PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartssr)](https://lossless.cloud)
 BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartssr)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -33,7 +32,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,5 +1,5 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartssr from '../ts/index';
+import * as smartssr from '../ts/index.js';
 
 let testSSRInstance: smartssr.SmartSSR;
 
@@ -9,26 +9,17 @@ tap.test('should create a valid smartssr instance', async () => {
   });
 });
 
-tap.test('should start the smartssr instance', async () => {
+tap.test('should render central.eu', async (tools) => {
-  await testSSRInstance.start();
+  await testSSRInstance.renderPage('https://lossless.com');
-});
-
-tap.skip.test('should render central.eu', async (tools) => {
-  await testSSRInstance.renderPage(
-    'https://central.eu/article/5e76873b9cf69b7bf6bc78bc/Introducing%3A%20central.eu'
-  );
 });
 
 tap.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 https://lossless.gmbh', async () => {
   const renderedPage = await testSSRInstance.renderPage('https://lossless.gmbh');
-});
+  console.log(renderedPage);
-
-tap.test('should stop the smartssr instance', async () => {
-  await testSSRInstance.stop();
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartssr',
+  version: '1.0.37',
+  description: 'a smart server side renderer supporting shadow dom'
+}

ts/index.ts

@@ -1 +1 @@
-export * from './smartssr.classes.smartssr';
+export * from './smartssr.classes.smartssr.js';

ts/smartssr.classes.smartssr.ts

@@ -1,7 +1,7 @@
-import * as plugins from './smartssr.plugins';
+import * as plugins from './smartssr.plugins.js';
-import * as paths from './smartssr.paths';
+import * as paths from './smartssr.paths.js';
 
-import { serializeFunction } from './smartssr.function.serialize';
+import { serializeFunction } from './smartssr.function.serialize.js';
 
 export interface ISmartSSROptions {
   debug: boolean;
@@ -11,7 +11,6 @@ export interface ISmartSSROptions {
  *
  */
 export class SmartSSR {
-  public browser: plugins.smartpuppeteer.puppeteer.Browser;
   public options: ISmartSSROptions;
 
   constructor(optionsArg?: ISmartSSROptions) {
@@ -23,54 +22,57 @@ 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();
-    page.on('console', (msg) => {
-      console.log(`${urlArg}: ${msg.text()}`);
-    });
-
     const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
-    renderTimeMeasurement.start();
+    let renderedPageString: string;
-    await page.goto(urlArg, {
-      waitUntil: 'networkidle2',
-    });
-
     let screenshotBuffer: Buffer;
+    await browser.start();
+    try {
+      const context = await browser.getNewIncognitoContext();
+      const page = await context.newPage();
 
-    if (this.options.debug) {
+      // lets protect against left open tabs
-      screenshotBuffer = await page.screenshot({
+      plugins.smartdelay.delayFor(30000).then(async () => {
-        encoding: 'binary',
+        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 browser.stop();
+      return;
     }
-
+    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
-    context.close();
 
     overallTimeMeasurement.stop();
     console.log(
@@ -90,6 +92,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;
     }
@@ -39,26 +39,42 @@ export function serializeFunction(rootNode) {
       const nodeUUID = uuidv4();
 
       nodeArg.classList.add(nodeUUID);
+
+      // find all slots
       const slots = nodeArg.shadowRoot.querySelectorAll('slot');
 
       // 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));
+        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);
@@ -68,6 +84,9 @@ export function serializeFunction(rootNode) {
           noteForAppending.push(childNode);
         }
       });
+      while (nodeArg.firstChild) {
+        nodeArg.removeChild(nodeArg.firstChild);
+      }
       noteForAppending.forEach((childNode) => {
         nodeArg.append(childNode);
       });

ts/smartssr.paths.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartssr.plugins';
+import * as plugins from './smartssr.plugins.js';
 
-export const packageDir = plugins.path.join(__dirname, '../');
+export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
 export const noGitDir = plugins.path.join(packageDir, './.nogit');
 plugins.smartfile.fs.ensureDirSync(noGitDir);

ts/smartssr.plugins.ts

@@ -7,7 +7,8 @@ export { path };
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpuppeteer from '@pushrocks/smartpuppeteer';
+import * as smartpath from '@pushrocks/smartpath';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smarttime from '@pushrocks/smarttime';
 
-export { smartdelay, smartfile, smartpuppeteer, smartpromise, smarttime };
+export { smartdelay, smartfile, smartpath, smartpuppeteer, smartpromise, smarttime };

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}