Compare commits

...

6 Commits

Author SHA1 Message Date
b0e17be31e 1.0.7 2020-03-01 13:50:29 +00:00
a5151b6c89 fix(core): update 2020-03-01 13:50:28 +00:00
c8fc842869 1.0.6 2020-03-01 13:41:21 +00:00
2b2a0ee758 fix(core): update 2020-03-01 13:41:20 +00:00
c5740db2cd 1.0.5 2020-02-25 07:48:54 +00:00
989634d276 fix(core): update 2020-02-25 07:48:54 +00:00
7 changed files with 57 additions and 48 deletions

63
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartssr", "name": "@pushrocks/smartssr",
"version": "1.0.4", "version": "1.0.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -157,9 +157,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "12.12.27", "version": "12.12.28",
"resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.12.27.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.12.28.tgz",
"integrity": "sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A==" "integrity": "sha512-g73GJYJDXgf0jqg+P9S8h2acWbDXNkoCX8DLtJVu7Fkn788pzQ/oJsrdJz/2JejRf/SjfZaAhsw+3nd1D5EWGg=="
} }
} }
}, },
@ -276,14 +276,14 @@
"integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg==" "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg=="
}, },
"@pushrocks/smartpuppeteer": { "@pushrocks/smartpuppeteer": {
"version": "1.0.14", "version": "1.0.15",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpuppeteer/-/smartpuppeteer-1.0.14.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpuppeteer/-/smartpuppeteer-1.0.15.tgz",
"integrity": "sha512-/YEEEpzVW8DgMJg2SfbM3FW6XmFCyCkBHkFIcAsTNRuWqxAqn91GsrNsCePFq+oCmKpZlPDxbLClxwAwIj/COw==", "integrity": "sha512-hGa8lxQ4yXzLu9/+zin0/KUERo29PUYPumYPAnO8WjU0vRUOmOy2ABSkKfTRl86yiEyFV5tUlf5GPQeg03XNNg==",
"requires": { "requires": {
"@pushrocks/smartdelay": "^2.0.6", "@pushrocks/smartdelay": "^2.0.6",
"@pushrocks/smartenv": "^4.0.8", "@pushrocks/smartenv": "^4.0.8",
"@types/puppeteer": "^1.20.2", "@types/puppeteer": "^2.0.0",
"puppeteer": "^2.0.0" "puppeteer": "^2.1.1"
} }
}, },
"@pushrocks/smartrequest": { "@pushrocks/smartrequest": {
@ -326,7 +326,6 @@
"version": "3.0.12", "version": "3.0.12",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.12.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.12.tgz",
"integrity": "sha512-NoMt1NUhNqcF5y7fCTHoC3d/+MobzgNUg6yHbSGxFRaentQzCrMPNahQIVLbrAStf03LUUBePUjSRdPYucP1gw==", "integrity": "sha512-NoMt1NUhNqcF5y7fCTHoC3d/+MobzgNUg6yHbSGxFRaentQzCrMPNahQIVLbrAStf03LUUBePUjSRdPYucP1gw==",
"dev": true,
"requires": { "requires": {
"@pushrocks/smartpromise": "^3.0.2", "@pushrocks/smartpromise": "^3.0.2",
"@types/cron": "^1.7.1", "@types/cron": "^1.7.1",
@ -385,10 +384,9 @@
} }
}, },
"@types/cron": { "@types/cron": {
"version": "1.7.1", "version": "1.7.2",
"resolved": "https://verdaccio.lossless.one/@types%2fcron/-/cron-1.7.1.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fcron/-/cron-1.7.2.tgz",
"integrity": "sha512-48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==", "integrity": "sha512-AEpNLRcsVSc5AdseJKNHpz0d4e8+ow+abTaC0fKDbAU86rF1evoFF0oC2fV9FdqtfVXkG2LKshpLTJCFOpyvTg==",
"dev": true,
"requires": { "requires": {
"@types/node": "*", "@types/node": "*",
"moment": ">=2.14.0" "moment": ">=2.14.0"
@ -427,8 +425,7 @@
"@types/luxon": { "@types/luxon": {
"version": "1.21.0", "version": "1.21.0",
"resolved": "https://verdaccio.lossless.one/@types%2fluxon/-/luxon-1.21.0.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fluxon/-/luxon-1.21.0.tgz",
"integrity": "sha512-Zhrf65tpjOlVIYrUhX9eu1VzRo8iixQDLFPbfqFxPpG4pBTNNPZ2BFhYE0IAsDfW9GWg+RcrUqiLwrGJH4rq4w==", "integrity": "sha512-Zhrf65tpjOlVIYrUhX9eu1VzRo8iixQDLFPbfqFxPpG4pBTNNPZ2BFhYE0IAsDfW9GWg+RcrUqiLwrGJH4rq4w=="
"dev": true
}, },
"@types/mime-types": { "@types/mime-types": {
"version": "2.1.0", "version": "2.1.0",
@ -442,14 +439,14 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "10.17.15", "version": "13.7.4",
"resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-10.17.15.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.7.4.tgz",
"integrity": "sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==" "integrity": "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw=="
}, },
"@types/puppeteer": { "@types/puppeteer": {
"version": "1.20.3", "version": "2.0.0",
"resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-1.20.3.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-2.0.0.tgz",
"integrity": "sha512-U1H7E4wHDsPe2s7wa2fpUD4kPYmu3n4hYRmlFK4WgKQxXE1ctY2h9Exely8GXs7743gLvrnzuX7aJuyG0SEMIQ==", "integrity": "sha512-QPHXIcaPcijMbvizoM7PRL97Rm+aM8J2DmgTz2tt79b15PqbyeaCppYonvPLHQ/Q5ea92BUHDpv4bsqtiTy8kQ==",
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }
@ -750,7 +747,6 @@
"version": "1.8.2", "version": "1.8.2",
"resolved": "https://verdaccio.lossless.one/cron/-/cron-1.8.2.tgz", "resolved": "https://verdaccio.lossless.one/cron/-/cron-1.8.2.tgz",
"integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==", "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
"dev": true,
"requires": { "requires": {
"moment-timezone": "^0.5.x" "moment-timezone": "^0.5.x"
} }
@ -1113,8 +1109,7 @@
"luxon": { "luxon": {
"version": "1.22.0", "version": "1.22.0",
"resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.22.0.tgz", "resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.22.0.tgz",
"integrity": "sha512-3sLvlfbFo+AxVEY3IqxymbumtnlgBwjDExxK60W3d+trrUzErNAz/PfvPT+mva+vEUrdIodeCOs7fB6zHtRSrw==", "integrity": "sha512-3sLvlfbFo+AxVEY3IqxymbumtnlgBwjDExxK60W3d+trrUzErNAz/PfvPT+mva+vEUrdIodeCOs7fB6zHtRSrw=="
"dev": true
}, },
"make-error": { "make-error": {
"version": "1.3.5", "version": "1.3.5",
@ -1190,14 +1185,12 @@
"moment": { "moment": {
"version": "2.24.0", "version": "2.24.0",
"resolved": "https://verdaccio.lossless.one/moment/-/moment-2.24.0.tgz", "resolved": "https://verdaccio.lossless.one/moment/-/moment-2.24.0.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
"dev": true
}, },
"moment-timezone": { "moment-timezone": {
"version": "0.5.27", "version": "0.5.28",
"resolved": "https://verdaccio.lossless.one/moment-timezone/-/moment-timezone-0.5.27.tgz", "resolved": "https://verdaccio.lossless.one/moment-timezone/-/moment-timezone-0.5.28.tgz",
"integrity": "sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==", "integrity": "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==",
"dev": true,
"requires": { "requires": {
"moment": ">= 2.9.0" "moment": ">= 2.9.0"
} }
@ -1635,9 +1628,9 @@
"dev": true "dev": true
}, },
"tslint": { "tslint": {
"version": "5.20.1", "version": "6.0.0",
"resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.20.1.tgz", "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-6.0.0.tgz",
"integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -1651,7 +1644,7 @@
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"resolve": "^1.3.2", "resolve": "^1.3.2",
"semver": "^5.3.0", "semver": "^5.3.0",
"tslib": "^1.8.0", "tslib": "^1.10.0",
"tsutils": "^2.29.0" "tsutils": "^2.29.0"
} }
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartssr", "name": "@pushrocks/smartssr",
"version": "1.0.4", "version": "1.0.7",
"private": false, "private": false,
"description": "a smart server side renderer supporting shadow dom", "description": "a smart server side renderer supporting shadow dom",
"main": "dist/index.js", "main": "dist/index.js",
@ -16,15 +16,16 @@
"@gitzone/tsbuild": "^2.0.22", "@gitzone/tsbuild": "^2.0.22",
"@gitzone/tstest": "^1.0.15", "@gitzone/tstest": "^1.0.15",
"@pushrocks/tapbundle": "^3.0.7", "@pushrocks/tapbundle": "^3.0.7",
"@types/node": "^10.11.7", "@types/node": "^13.7.4",
"tslint": "^5.11.0", "tslint": "^6.0.0",
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.6", "@pushrocks/smartdelay": "^2.0.6",
"@pushrocks/smartfile": "^7.0.8", "@pushrocks/smartfile": "^7.0.8",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.0.6",
"@pushrocks/smartpuppeteer": "^1.0.14" "@pushrocks/smartpuppeteer": "^1.0.15",
"@pushrocks/smarttime": "^3.0.12"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

View File

@ -19,11 +19,11 @@ tap.test('should render lossless.com', async () => {
await testSSRInstance.renderPage('https://lossless.com'); await testSSRInstance.renderPage('https://lossless.com');
}); });
tap.test('should render https://lossless.gmbh', async () => { tap.skip.test('should render https://lossless.gmbh', async () => {
await testSSRInstance.renderPage('https://lossless.gmbh'); const renderedPage = await testSSRInstance.renderPage('https://lossless.gmbh');
}); });
tap.test('should stop the smartssr instacne', async () => { tap.test('should stop the smartssr instance', async () => {
await testSSRInstance.stop(); await testSSRInstance.stop();
}); });

View File

@ -22,9 +22,14 @@ export class SmartSSR {
} }
public async renderPage(urlArg: string) { public async renderPage(urlArg: string) {
const overallTimeMeasurement = new plugins.smarttime.HrtMeasurement();
overallTimeMeasurement.start();
const resultDeferred = plugins.smartpromise.defer<string>(); const resultDeferred = plugins.smartpromise.defer<string>();
const page = await this.browser.newPage(); const context = await this.browser.createIncognitoBrowserContext();
page.on('console', (event: any) => console.log(event._text)); const page = await context.newPage();
page.on('console', msg => {
console.log(`${urlArg}: ${msg.text()}`);
});
page.on('load', async (...args) => { page.on('load', async (...args) => {
// await plugins.smartdelay.delayFor(2000); // await plugins.smartdelay.delayFor(2000);
@ -38,9 +43,18 @@ export class SmartSSR {
); );
}); });
const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
renderTimeMeasurement.start();
await page.goto(urlArg); await page.goto(urlArg);
const result = await resultDeferred.promise; const result = await resultDeferred.promise;
page.close(); renderTimeMeasurement.stop();
// lets clean up async
context.close();
overallTimeMeasurement.stop();
console.log(`Overall it took ${overallTimeMeasurement.milliSeconds} milliseconds to render ${urlArg}`);
console.log(`The rendering alone took ${renderTimeMeasurement.milliSeconds} milliseconds for ${urlArg}`)
return result; return result;
} }
} }

View File

@ -67,7 +67,7 @@ export function serializeFunction(rootNode) {
node.appendChild(templateDom); node.appendChild(templateDom);
} }
} catch (err) { } catch (err) {
console.log('error:', err); console.log('error:', err.message);
console.log(node.tagName); console.log(node.tagName);
} }
} }

View File

@ -2,4 +2,4 @@ import * as plugins from './smartssr.plugins';
export const packageDir = plugins.path.join(__dirname, '../'); export const packageDir = plugins.path.join(__dirname, '../');
export const noGitDir = plugins.path.join(packageDir, './.nogit'); export const noGitDir = plugins.path.join(packageDir, './.nogit');
plugins.smartfile.fs.ensureDirSync(noGitDir); plugins.smartfile.fs.ensureDirSync(noGitDir);

View File

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