@elastic/synthetics 1.25.0 → 1.26.1

package/src/plugins/network.ts

@@ -64,18 +64,22 @@ export class NetworkManager {
    * to not result in exception
    */
   private _addBarrier(page: Page, promise: Promise<void>) {
-    if (!page) return;
+    if (!page) {
+      promise.catch(error => {
+        log(`Plugins: failed to collect network metadata: ${error}`);
+      });
+      return;
+    }
     const race = Promise.race([
-      new Promise<void>(resolve =>
-        page.on('close', () => {
-          this._barrierPromises.delete(race);
-          resolve();
-        })
-      ),
+      new Promise<void>(resolve => page.once('close', () => resolve())),
       promise,
     ]);
     this._barrierPromises.add(race);
-    race.then(() => this._barrierPromises.delete(race));
+    race
+      .catch(error => {
+        log(`Plugins: failed to collect network metadata: ${error}`);
+      })
+      .finally(() => this._barrierPromises.delete(race));
   }
 
   private _nullableFrameBarrier(req: Request): Frame | null {
@@ -98,10 +102,10 @@ export class NetworkManager {
     /**
      * Listen for all network events from PW context
      */
-    context.on('request', this._onRequest.bind(this));
-    context.on('response', this._onResponse.bind(this));
-    context.on('requestfinished', this._onRequestCompleted.bind(this));
-    context.on('requestfailed', this._onRequestCompleted.bind(this));
+    context.on('request', this._onRequest);
+    context.on('response', this._onResponse);
+    context.on('requestfinished', this._onRequestCompleted);
+    context.on('requestfailed', this._onRequestCompleted);
   }
 
   private _findNetworkEntry(
@@ -110,7 +114,7 @@ export class NetworkManager {
     return request[NETWORK_ENTRY_SUMBOL];
   }
 
-  private _onRequest(request: Request) {
+  private _onRequest = (request: Request) => {
     const url = request.url();
     /**
      * Data URI should not show up as network requests
@@ -165,9 +169,9 @@ export class NetworkManager {
 
     request[NETWORK_ENTRY_SUMBOL] = networkEntry;
     this.results.push(networkEntry);
-  }
+  };
 
-  private async _onResponse(response: Response) {
+  private _onResponse = async (response: Response) => {
     const request = response.request();
     const networkEntry = this._findNetworkEntry(request);
     if (!networkEntry) return;
@@ -220,9 +224,9 @@ export class NetworkManager {
         if (details) networkEntry.response.securityDetails = details;
       })
     );
-  }
+  };
 
-  private async _onRequestCompleted(request: Request) {
+  private _onRequestCompleted = async (request: Request) => {
     const networkEntry = this._findNetworkEntry(request);
     if (!networkEntry) return;
 
@@ -255,9 +259,18 @@ export class NetworkManager {
         };
       })
     );
-  }
+  };
 
   async stop() {
+    /**
+     * First detach the listeners so that no new network events are recorded
+     */
+    const context = this.driver.context;
+    context.off('request', this._onRequest);
+    context.off('response', this._onResponse);
+    context.off('requestfinished', this._onRequestCompleted);
+    context.off('requestfailed', this._onRequestCompleted);
+
     /**
      * Waiting for all network events is error prone and might hang the tests
      * from getting closed forever when there are upstream bugs in browsers or
@@ -266,11 +279,6 @@ export class NetworkManager {
     if (this._barrierPromises.size > 0) {
       log(`Plugins: dropping ${this._barrierPromises.size} network events`);
     }
-    const context = this.driver.context;
-    context.off('request', this._onRequest.bind(this));
-    context.off('response', this._onResponse.bind(this));
-    context.off('requestfinished', this._onRequestCompleted.bind(this));
-    context.off('requestfailed', this._onRequestCompleted.bind(this));
     this._barrierPromises.clear();
     log(`Plugins: stopped collecting network events`);
     return this.results;

package/src/push/run-local.ts

@@ -74,21 +74,30 @@ async function runNpmInstall(directory) {
 
 async function runTest(directory, schema: MonitorSchema) {
   return new Promise<void>((resolve, reject) => {
-    const runTest = spawn(
-      'npx',
-      [
-        '@elastic/synthetics',
-        '.',
-        '--playwright-options',
-        JSON.stringify(schema.playwrightOptions),
-        '--params',
-        JSON.stringify(schema.params),
-      ],
-      {
-        cwd: directory,
-        stdio: 'inherit',
+    const args = [
+      '@elastic/synthetics',
+      '.',
+      '--playwright-options',
+      JSON.stringify(schema.playwrightOptions),
+      '--params',
+      JSON.stringify(schema.params),
+    ];
+    const allowlist = schema.certificateErrorSpkiAllowlist;
+    if (allowlist != null) {
+      const entries = Array.isArray(allowlist) ? allowlist : [allowlist];
+      const pemEntries = entries
+        .map(entry =>
+          Buffer.isBuffer(entry) ? entry.toString('utf-8') : entry
+        )
+        .filter((entry): entry is string => Boolean(entry));
+      if (pemEntries.length > 0) {
+        args.push('--certificate-error-spki-allowlist', ...pemEntries);
       }
-    );
+    }
+    const runTest = spawn('npx', args, {
+      cwd: directory,
+      stdio: 'inherit',
+    });
 
     runTest.on('close', resolve);
     runTest.on('error', err => {

package/.husky/install.mjs

@@ -1,7 +0,0 @@
-// Skip if husky is not installed (CI, production, embedded installs with --omit=dev)
-try {
-  const husky = await import('husky');
-  husky.default();
-} catch (e) {
-  if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e;
-}