mx-cloud 0.0.22 → 0.0.23

package/build/interpret.d.ts

@@ -160,5 +160,10 @@ export default class Interpreter extends EventEmitter {
      */
     run(page: Page, params?: ParamType): Promise<void>;
     stop(): Promise<void>;
+    /**
+     * Cleanup method to release resources and prevent memory leaks
+     * Call this when the interpreter is no longer needed
+     */
+    cleanup(): Promise<void>;
 }
 export {};

package/build/interpret.js

@@ -394,8 +394,9 @@ class Interpreter extends events_1.EventEmitter {
                     for (const link of links) {
                         // eslint-disable-next-line
                         this.concurrency.addJob(() => __awaiter(this, void 0, void 0, function* () {
+                            let newPage = null;
                             try {
-                                const newPage = yield context.newPage();
+                                newPage = yield context.newPage();
                                 yield newPage.goto(link);
                                 yield newPage.waitForLoadState('networkidle');
                                 yield this.runLoop(newPage, this.initializedWorkflow);
@@ -406,6 +407,16 @@ class Interpreter extends events_1.EventEmitter {
                                 // the interpreter by throwing).
                                 this.log(e, logger_1.Level.ERROR);
                             }
+                            finally {
+                                if (newPage && !newPage.isClosed()) {
+                                    try {
+                                        yield newPage.close();
+                                    }
+                                    catch (closeError) {
+                                        this.log('Failed to close enqueued page', logger_1.Level.WARN);
+                                    }
+                                }
+                            }
                         }));
                     }
                     yield page.close();
@@ -2224,9 +2235,10 @@ class Interpreter extends events_1.EventEmitter {
             * User-requested concurrency should be entirely managed by the concurrency manager,
             * e.g. via `enqueueLinks`.
             */
-            p.on('popup', (popup) => {
+            const popupHandler = (popup) => {
                 this.concurrency.addJob(() => this.runLoop(popup, workflowCopy));
-            });
+            };
+            p.on('popup', popupHandler);
             /* eslint no-constant-condition: ["warn", { "checkLoops": false }] */
             let loopIterations = 0;
             const MAX_LOOP_ITERATIONS = 1000; // Circuit breaker
@@ -2234,41 +2246,58 @@ class Interpreter extends events_1.EventEmitter {
             const MAX_CONSECUTIVE_FAILURES = 10;
             const startTime = Date.now();
             const MAX_EXECUTION_TIME = 30 * 60 * 1000; // 30 minutes max
+            // Cleanup function to remove popup listener
+            const cleanup = () => {
+                try {
+                    if (!p.isClosed()) {
+                        p.removeListener('popup', popupHandler);
+                    }
+                }
+                catch (cleanupError) {
+                }
+            };
             while (true) {
                 // Multiple circuit breakers to prevent infinite loops
                 if (++loopIterations > MAX_LOOP_ITERATIONS) {
                     this.log('Maximum loop iterations reached, terminating to prevent infinite loop', logger_1.Level.ERROR);
+                    cleanup();
                     return;
                 }
                 // Time-based circuit breaker
                 if (Date.now() - startTime > MAX_EXECUTION_TIME) {
                     this.log('Maximum execution time reached (30 minutes), terminating workflow', logger_1.Level.ERROR);
+                    cleanup();
                     return;
                 }
                 // Failure-based circuit breaker
                 if (consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
                     this.log('Too many consecutive failures, terminating to prevent hang', logger_1.Level.ERROR);
+                    cleanup();
                     return;
                 }
                 // Check abort flag immediately
                 if (this.isAborted) {
                     this.log('Workflow aborted in runLoop', logger_1.Level.WARN);
+                    cleanup();
                     return;
                 }
                 // Checks whether the page was closed from outside,
                 //  or the workflow execution has been stopped via `interpreter.stop()`
                 if (p.isClosed() || !this.stopper) {
+                    cleanup();
                     return;
                 }
                 try {
                     yield p.waitForLoadState();
                 }
                 catch (e) {
+                    cleanup();
                     yield p.close();
                     return;
                 }
                 if (workflowCopy.length === 0) {
                     this.log('All actions completed. Workflow finished.', logger_1.Level.LOG);
+                    cleanup();
                     return;
                 }
                 // const newSelectors = this.getSelectors(workflowCopy);
@@ -2359,6 +2388,7 @@ class Interpreter extends events_1.EventEmitter {
                 }
                 else {
                     //await this.disableAdBlocker(p);
+                    cleanup();
                     return;
                 }
             }
@@ -2444,5 +2474,47 @@ class Interpreter extends events_1.EventEmitter {
             }
         });
     }
+    /**
+     * Cleanup method to release resources and prevent memory leaks
+     * Call this when the interpreter is no longer needed
+     */
+    cleanup() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // Stop any running workflows first
+                if (this.stopper) {
+                    try {
+                        yield this.stop();
+                    }
+                    catch (error) {
+                        this.log(`Error stopping workflow during cleanup: ${error.message}`, logger_1.Level.WARN);
+                    }
+                }
+                // Clear ad-blocker resources
+                if (this.blocker) {
+                    try {
+                        this.blocker = null;
+                        this.log('Ad-blocker resources cleared', logger_1.Level.DEBUG);
+                    }
+                    catch (error) {
+                        this.log(`Error cleaning up ad-blocker: ${error.message}`, logger_1.Level.WARN);
+                    }
+                }
+                // Clear accumulated data to free memory
+                this.cumulativeResults = [];
+                this.autohealFailures = [];
+                this.namedResults = {};
+                this.serializableDataByType = { scrapeList: {}, scrapeSchema: {} };
+                // Reset state
+                this.isAborted = false;
+                this.initializedWorkflow = null;
+                this.log('Interpreter cleanup completed', logger_1.Level.DEBUG);
+            }
+            catch (error) {
+                this.log(`Error during interpreter cleanup: ${error.message}`, logger_1.Level.ERROR);
+                throw error;
+            }
+        });
+    }
 }
 exports.default = Interpreter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mx-cloud",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "mx cloud",
   "main": "build/index.js",
   "typings": "build/index.d.ts",