@social-mail/social-mail-web-server 1.8.367 → 1.8.368

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.367",
+  "version": "1.8.368",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -38,7 +38,7 @@
     "console-log-colors": "^0.4.0",
     "decimal.js": "^10.6.0",
     "dns2": "^2.1.0",
-    "firebase-admin": "^13.4.0",
+    "firebase-admin": "^13.5.0",
     "heic-convert": "^2.1.0",
     "iconv-lite": "^0.6.3",
     "ip": "^2.0.1",
@@ -59,7 +59,7 @@
     "socket.io": "^4.7.2",
     "stripe": "^17.3.1",
     "tesseract.js": "^5.1.1",
-    "tldts": "^7.0.17",
+    "tldts": "7.0.13",
     "tmp": "^0.2.1",
     "tmp-promise": "^3.0.3",
     "twilio": "^5.6.0",

package/src/server/services/dom/BlogContentTransformer.tsx

@@ -53,8 +53,8 @@ export default class BlogContentTransformer {
 
         const { urlService } = this;
 
-        await t.run(async (c) => {
 
+        for(const c of t.all()) {
             const { node, element } = c;
 
             if (c.isTextNode) {
@@ -125,7 +125,9 @@ export default class BlogContentTransformer {
                 }
             }
 
-        });
+        }
+
+        await t.commit();
 
         if (trackerUrl) {
             const clean = t.root;

package/src/server/services/dom/HtmlTransform.tsx

@@ -120,13 +120,14 @@ export class TransformContext {
         e.setAttribute(attributeName, src);
     }
 
-    async [Symbol.asyncDispose]() {
+    async commit() {
         for (const a of this.queueActions) {
             const r = a();
             if((r as any)?.then) {
                 await r;
             }
         }
+        this.queueActions.length = 0;
     }
 }
 
@@ -140,6 +141,8 @@ export default class HtmlTransform {
         return this.root.outerHTML;
     }
 
+    private context: TransformContext;
+
     constructor(html: string, public readonly url = defaultUrl) {
         const window = new JSDOM('', { url }).window as WindowLike;
         const purify = DOMPurify(window);
@@ -148,20 +151,18 @@ export default class HtmlTransform {
             RETURN_DOM: true
         }) as HTMLElement;
         this.document = window.document;
+        this.context = new TransformContext(this);
     }
 
-    async run(transformer: (c: TransformContext) => void | Promise<void>) {
-
-        await using c = new TransformContext(this.document);
-
-        for (const node of descendentIterator(this.root)) {
-            c.node = node;
-            const r = transformer(c);
-            if ((r as any)?.then) {
-                await r;
-            }
+    *all() {
+        for(const node of descendentIterator(this.root)) {
+            this.context.node = node;
+            yield this.context;
         }
+    }
 
+    async commit() {
+        await this.context.commit();
     }
 
 }