@live-change/email-service 0.9.94 → 0.9.96

package/browser.js

@@ -17,11 +17,13 @@ async function newBrowser() {
   console.log("New browser", config)
   //process.exit(0)
   if(config.browser.webSocketDebuggerUrl) {
-    const browser = await chromium.connect({ wsEndpoint: config.browser.webSocketDebuggerUrl })
+    //const browser = await chromium.connect({ wsEndpoint: config.browser.webSocketDebuggerUrl }, { timeout: 60000 })
+    const browser = await chromium.connect(config.browser.webSocketDebuggerUrl, { timeout: 10000 })
     return browser
   } else if(config.browser.url) {
     const browserInfo = await got.post(config.browser.url + '/json/version').json()
-    const browser = await chromium.connect({ wsEndpoint: browserInfo.webSocketDebuggerUrl })
+    //const browser = await chromium.connect({ wsEndpoint: browserInfo.webSocketDebuggerUrl } { timeout: 60000 })
+    const browser = await chromium.connect(browserInfo.webSocketDebuggerUrl, { timeout: 10000 })
     return browser
   } if(config.browser.host) {
     const ip = await dns.resolve4(config.browser.host)
@@ -30,7 +32,7 @@ async function newBrowser() {
     const browserInfo = await got.post(browserInfoUrl).json()
     console.log("Browser info", browserInfo)
     try {
-      const browser = await chromium.connectOverCDP(browserInfo.webSocketDebuggerUrl)
+      const browser = await chromium.connectOverCDP(browserInfo.webSocketDebuggerUrl,  { timeout: 10000 })
       return browser
     } catch (error) {
       console.error("Failed to connect to browser", error)
@@ -54,4 +56,20 @@ export async function runWithBrowser(func) {
       await browser.close()
     }
   })
-}
+}
+
+export async function runWithPage(func) {
+  return await browserQueue.add(async () => {
+    const browser = await newBrowser()
+    const context = await browser.newContext()
+    const page = await context.newPage()
+    try {
+      const result = await func(page)
+      return result
+    } finally {
+      await page.close()
+      await context.close()
+      await browser.close()
+    }
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/email-service",
-  "version": "0.9.94",
+  "version": "0.9.96",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.9.94",
+    "@live-change/framework": "^0.9.96",
     "got": "^11.8.6",
     "html-to-text": "8.1.0",
     "inline-css": "4.0.2",
@@ -32,6 +32,6 @@
     "postcss-calc": "10.1.1",
     "postcss-custom-properties": "14.0.4"
   },
-  "gitHead": "8e5736f32c407eb6fb8d6d5cf8cbae2ad558a7a2",
+  "gitHead": "2cf1a814dac25095e89760ea62e0f207fb8c7cfa",
   "type": "module"
 }

package/render.js

@@ -11,7 +11,7 @@ import { ObservableValue } from '@live-change/dao'
 import definition from './definition.js'
 import config from './config.js'
 
-import { runWithBrowser } from './browser.js'
+import { runWithPage } from './browser.js'
 
 const publicDir = config.publicDir || 'front/public/'
 
@@ -173,12 +173,10 @@ async function processImageAttachments(images, url) {
 
 async function renderEmailWithBrowser(url) {
   
-  return await runWithBrowser(async (browser) => {
-    const page = await browser.newPage()
+  const email =await runWithPage(async (page) => {    
     console.log("RENDER EMAIL WITH BROWSER", url)
     await page.goto(url)
-
-    const email = await page.evaluate(() => {
+    return await page.evaluate(() => {
       const ALLOWED_CSS_PROPERTIES = new Set([
         'background',
         'background-blend-mode',
@@ -397,27 +395,27 @@ async function renderEmailWithBrowser(url) {
 
       return email
     })
+  })
 
-    // process element to remove unwanted attributes and extract images using jsdom
-    const dom = new JSDOM(email.html)
-    const images = new Map()
-    const messageElements = dom.window.document.querySelectorAll("[data-html]")
-    for(let messageElement of messageElements) {
-      processElement(messageElement, images)
-    }
-    email.html = dom.serialize()
-    dom.window.close()
+  // process element to remove unwanted attributes and extract images using jsdom
+  const dom = new JSDOM(email.html)
+  const images = new Map()
+  const messageElements = dom.window.document.querySelectorAll("[data-html]")
+  for(let messageElement of messageElements) {
+    processElement(messageElement, images)
+  }
+  email.html = dom.serialize()
+  dom.window.close()
 
-    console.log("IMAGES", Array.from(images.entries()))
-    const imageAttachments = await processImageAttachments(images, url)
-  
-    email.attachments = email.attachments || []
-    email.attachments.push(...imageAttachments)
-  
-    console.log("EMAIL", email)
+  console.log("IMAGES", Array.from(images.entries()))
+  const imageAttachments = await processImageAttachments(images, url)
 
-    return email
-  })
+  email.attachments = email.attachments || []
+  email.attachments.push(...imageAttachments)
+
+  console.log("EMAIL", email)
+
+  return email
 }
 
 export { renderEmailWithJuice, renderEmailWithBrowser }