Merge pull request #324 from ulixee/fixes

Fixes

Author: calebjclark

commons/ShutdownHandler.ts

@@ -6,7 +6,7 @@ type ShutdownSignal = NodeJS.Signals | 'exit';
 const { log } = logger(module);
 
 export default class ShutdownHandler {
-  public static exitOnSignal = true;
+  public static exitOnSignal = false;
 
   private static isRegistered = false;
   private static hasRunHandlers = false;

core/index.ts

@@ -13,6 +13,7 @@ import DefaultHumanEmulator from '@secret-agent/default-human-emulator';
 import extractPlugins from '@secret-agent/plugin-utils/lib/utils/extractPlugins';
 import requirePlugins from '@secret-agent/plugin-utils/lib/utils/requirePlugins';
 import { IPluginClass } from '@secret-agent/interfaces/IPlugin';
+import ShutdownHandler from '@secret-agent/commons/ShutdownHandler';
 import ConnectionToClient from './server/ConnectionToClient';
 import CoreServer from './server';
 import CoreProcess from './lib/CoreProcess';
@@ -118,7 +119,10 @@ export default class Core {
       sessionsDir: GlobalPool.sessionsDir,
     });
     // if started as a subprocess, send back the host
-    if (process.send) process.send(host);
+    if (process.send && process.connected) {
+      ShutdownHandler.exitOnSignal = true;
+      process.send(host);
+    }
   }
 
   public static async shutdown(force = false): Promise<void> {

core/lib/CoreProcess.ts

@@ -37,8 +37,11 @@ export default class CoreProcess {
   public static kill(signal?: NodeJS.Signals) {
     const child = this.child;
     if (child) {
+      child.unref();
       const closed = new Promise<void>(resolve => child.once('exit', () => setImmediate(resolve)));
-      if (!child.killed) child.kill(signal);
+      if (!child.killed) {
+        child.kill(signal);
+      }
       return closed;
     }
   }

core/lib/FrameNavigations.ts

@@ -10,9 +10,10 @@ import { IBoundLog } from '@secret-agent/interfaces/ILog';
 import Log from '@secret-agent/commons/Logger';
 import SessionState from './SessionState';
 
-interface IFrameNavigationEvents {
+export interface IFrameNavigationEvents {
   'navigation-requested': INavigation;
   'status-change': {
+    id: number;
     url: string;
     stateChanges: { [state: string]: Date };
     newStatus: NavigationState;
@@ -77,6 +78,7 @@ export default class FrameNavigations extends TypedEventEmitter<IFrameNavigation
     this.checkStoredNavigationReason(nextTop, url);
 
     const currentTop = this.top;
+    let shouldPublishLocationChange = false;
     // if in-page, set the state to match current top
     if (reason === 'inPage') {
       if (currentTop) {
@@ -93,12 +95,22 @@ export default class FrameNavigations extends TypedEventEmitter<IFrameNavigation
         nextTop.stateChanges.set(LoadStatus.ContentPaint, nextTop.initiatedTime);
         nextTop.resourceId.resolve(-1);
       }
+      shouldPublishLocationChange = true;
       nextTop.finalUrl = url;
     }
     this.history.push(nextTop);
 
     this.emit('navigation-requested', nextTop);
     this.captureNavigationUpdate(nextTop);
+    if (shouldPublishLocationChange) {
+      this.emit('status-change', {
+        id: nextTop.id,
+        newStatus: LoadStatus.ContentPaint,
+        url,
+        // @ts-ignore
+        stateChanges: Object.fromEntries(nextTop.stateChanges),
+      });
+    }
     return nextTop;
   }
 
@@ -295,6 +307,7 @@ export default class FrameNavigations extends TypedEventEmitter<IFrameNavigation
     navigation.stateChanges.set(newStatus, statusChangeDate ?? new Date());
 
     this.emit('status-change', {
+      id: navigation.id,
       url: navigation.finalUrl ?? navigation.requestedUrl,
       // @ts-ignore - Typescript refuses to recognize this function
       stateChanges: Object.fromEntries(navigation.stateChanges),

core/lib/FrameNavigationsObserver.ts

@@ -46,7 +46,12 @@ export default class FrameNavigationsObserver {
       last = command;
     }
     // handle cases like waitForLocation two times in a row
-    if (newCommand.name === 'waitForLocation' && last && last.name.startsWith('waitFor')) {
+    if (
+      newCommand.name === 'waitForLocation' &&
+      last &&
+      last.name.startsWith('waitFor') &&
+      last.name !== 'waitForMillis'
+    ) {
       this.defaultWaitForLocationCommandId = newCommand.id;
     }
   }
@@ -222,7 +227,12 @@ export default class FrameNavigationsObserver {
           previousLoadedUrl &&
           previousLoadedUrl !== history.finalUrl
         ) {
-          isLocationChange = true;
+          // Don't accept adding a slash as a page change
+          const isInPageUrlAdjust =
+            history.navigationReason === 'inPage' &&
+            history.finalUrl.replace(previousLoadedUrl, '').length <= 1;
+
+          if (!isInPageUrlAdjust) isLocationChange = true;
         }
 
         if (isLocationChange) {
@@ -236,7 +246,8 @@ export default class FrameNavigationsObserver {
       }
 
       if (
-        history.stateChanges.has(LoadStatus.HttpResponded) &&
+        (history.stateChanges.has(LoadStatus.HttpResponded) ||
+          history.stateChanges.has(LoadStatus.DomContentLoaded)) &&
         !history.stateChanges.has(LoadStatus.HttpRedirected)
       ) {
         previousLoadedUrl = history.finalUrl;

core/lib/Tab.ts

@@ -422,7 +422,7 @@ export default class Tab extends TypedEventEmitter<ITabEventParams> {
   }
 
   public takeScreenshot(options: IScreenshotOptions = {}): Promise<Buffer> {
-    options.rectangle.scale ??= 1;
+    if (options.rectangle) options.rectangle.scale ??= 1;
     return this.puppetPage.screenshot(options.format, options.rectangle, options.jpegQuality);
   }
 

puppet/lib/launchProcess.ts

@@ -22,6 +22,7 @@ import Log from '@secret-agent/commons/Logger';
 import ILaunchedProcess from '@secret-agent/interfaces/ILaunchedProcess';
 import Resolvable from '@secret-agent/commons/Resolvable';
 import * as Fs from 'fs';
+import ShutdownHandler from '@secret-agent/commons/ShutdownHandler';
 import { WebSocketTransport } from './WebSocketTransport';
 
 const { log } = Log(module);
@@ -106,6 +107,8 @@ export default async function launchProcess(
     runOnClose();
     if (dataDir) cleanDataDir(dataDir);
   });
+  process.on('uncaughtExceptionMonitor', () => close());
+  ShutdownHandler.register(close);
 
   const wsEndpoint = await websocketEndpointResolvable.promise;
   transport = new WebSocketTransport(wsEndpoint);