@percy/core 1.10.1 → 1.10.3

package/dist/api.js

@@ -10,39 +10,9 @@ export function createPercyServer(percy, port) {
   let pkg = getPackageJSON(import.meta.url);
   let server = Server.createServer({
     port
-  }) // facilitate logger websocket connections
-  .websocket('/(logger)?', ws => {
-    var _percy$testing, _percy$testing2;
-
-    // support sabotaging remote logging connections in testing mode
-    if (((_percy$testing = percy.testing) === null || _percy$testing === void 0 ? void 0 : _percy$testing.remoteLogging) === false) return ws.terminate(); // track all remote logging connections in testing mode
-
-    if (percy.testing) ((_percy$testing2 = percy.testing).remoteLoggers || (_percy$testing2.remoteLoggers = new Set())).add(ws);
-    ws.addEventListener('close', () => {
-      var _percy$testing3, _percy$testing3$remot;
-
-      return (_percy$testing3 = percy.testing) === null || _percy$testing3 === void 0 ? void 0 : (_percy$testing3$remot = _percy$testing3.remoteLoggers) === null || _percy$testing3$remot === void 0 ? void 0 : _percy$testing3$remot.delete(ws);
-    }); // listen for messages with specific logging payloads
-
-    ws.addEventListener('message', ({
-      data
-    }) => {
-      let {
-        log,
-        messages = []
-      } = JSON.parse(data);
-
-      for (let m of messages) logger.instance.messages.add(m);
-
-      if (log) logger.instance.log(...log);
-    }); // respond with the current loglevel
-
-    ws.send(JSON.stringify({
-      loglevel: logger.loglevel()
-    }));
   }) // general middleware
   .route((req, res, next) => {
-    var _percy$testing4, _percy$testing7, _percy$testing7$api, _percy$testing8, _percy$testing8$api;
+    var _percy$testing, _percy$testing4, _percy$testing4$api, _percy$testing5, _percy$testing5$api;
 
     // treat all request bodies as json
     if (req.body) try {
@@ -51,17 +21,17 @@ export function createPercyServer(percy, port) {
 
     res.setHeader('Access-Control-Expose-Headers', '*, X-Percy-Core-Version'); // skip or change api version header in testing mode
 
-    if (((_percy$testing4 = percy.testing) === null || _percy$testing4 === void 0 ? void 0 : _percy$testing4.version) !== false) {
-      var _percy$testing5;
+    if (((_percy$testing = percy.testing) === null || _percy$testing === void 0 ? void 0 : _percy$testing.version) !== false) {
+      var _percy$testing2;
 
-      res.setHeader('X-Percy-Core-Version', ((_percy$testing5 = percy.testing) === null || _percy$testing5 === void 0 ? void 0 : _percy$testing5.version) ?? pkg.version);
+      res.setHeader('X-Percy-Core-Version', ((_percy$testing2 = percy.testing) === null || _percy$testing2 === void 0 ? void 0 : _percy$testing2.version) ?? pkg.version);
     } // track all api reqeusts in testing mode
 
 
     if (percy.testing && !req.url.pathname.startsWith('/test/')) {
-      var _percy$testing6;
+      var _percy$testing3;
 
-      ((_percy$testing6 = percy.testing).requests || (_percy$testing6.requests = [])).push({
+      ((_percy$testing3 = percy.testing).requests || (_percy$testing3.requests = [])).push({
         url: `${req.url.pathname}${req.url.search}`,
         method: req.method,
         body: req.body
@@ -69,32 +39,32 @@ export function createPercyServer(percy, port) {
     } // support sabotaging requests in testing mode
 
 
-    if (((_percy$testing7 = percy.testing) === null || _percy$testing7 === void 0 ? void 0 : (_percy$testing7$api = _percy$testing7.api) === null || _percy$testing7$api === void 0 ? void 0 : _percy$testing7$api[req.url.pathname]) === 'error') {
+    if (((_percy$testing4 = percy.testing) === null || _percy$testing4 === void 0 ? void 0 : (_percy$testing4$api = _percy$testing4.api) === null || _percy$testing4$api === void 0 ? void 0 : _percy$testing4$api[req.url.pathname]) === 'error') {
       next = () => {
         var _percy$testing$build;
 
         return Promise.reject(new Error(((_percy$testing$build = percy.testing.build) === null || _percy$testing$build === void 0 ? void 0 : _percy$testing$build.error) || 'testing'));
       };
-    } else if (((_percy$testing8 = percy.testing) === null || _percy$testing8 === void 0 ? void 0 : (_percy$testing8$api = _percy$testing8.api) === null || _percy$testing8$api === void 0 ? void 0 : _percy$testing8$api[req.url.pathname]) === 'disconnect') {
+    } else if (((_percy$testing5 = percy.testing) === null || _percy$testing5 === void 0 ? void 0 : (_percy$testing5$api = _percy$testing5.api) === null || _percy$testing5$api === void 0 ? void 0 : _percy$testing5$api[req.url.pathname]) === 'disconnect') {
       next = () => req.connection.destroy();
     } // return json errors
 
 
     return next().catch(e => {
-      var _percy$testing9;
+      var _percy$testing6;
 
       return res.json(e.status ?? 500, {
-        build: ((_percy$testing9 = percy.testing) === null || _percy$testing9 === void 0 ? void 0 : _percy$testing9.build) || percy.build,
+        build: ((_percy$testing6 = percy.testing) === null || _percy$testing6 === void 0 ? void 0 : _percy$testing6.build) || percy.build,
         error: e.message,
         success: false
       });
     });
   }) // healthcheck returns basic information
   .route('get', '/percy/healthcheck', (req, res) => {
-    var _percy$testing10;
+    var _percy$testing7;
 
     return res.json(200, {
-      build: ((_percy$testing10 = percy.testing) === null || _percy$testing10 === void 0 ? void 0 : _percy$testing10.build) ?? percy.build,
+      build: ((_percy$testing7 = percy.testing) === null || _percy$testing7 === void 0 ? void 0 : _percy$testing7.build) ?? percy.build,
       loglevel: percy.loglevel(),
       config: percy.config,
       success: true
@@ -138,34 +108,25 @@ export function createPercyServer(percy, port) {
     }
   }, res) => {
     body = Buffer.isBuffer(body) ? body.toString() : body;
-    let {
-      remoteLoggers
-    } = percy.testing;
 
     if (cmd === 'reset') {
       // the reset command will reset testing mode and clear any logs
-      percy.testing = remoteLoggers ? {
-        remoteLoggers
-      } : {};
+      percy.testing = {};
       logger.instance.messages.clear();
     } else if (cmd === 'version') {
       // the version command will update the api version header for testing
       percy.testing.version = body;
     } else if (cmd === 'error' || cmd === 'disconnect') {
-      var _percy$testing11;
+      var _percy$testing8;
 
       // the error or disconnect commands will cause specific endpoints to fail
-      ((_percy$testing11 = percy.testing).api || (_percy$testing11.api = {}))[body] = cmd;
+      ((_percy$testing8 = percy.testing).api || (_percy$testing8.api = {}))[body] = cmd;
     } else if (cmd === 'build-failure') {
       // the build-failure command will cause api errors to include a failed build
       percy.testing.build = {
         failed: true,
         error: 'Build failed'
       };
-    } else if (cmd === 'remote-logging') {
-      // the remote-logging command will toggle remote logging support
-      if (body === false) remoteLoggers === null || remoteLoggers === void 0 ? void 0 : remoteLoggers.forEach(ws => ws.terminate());
-      percy.testing.remoteLogging = body;
     } else {
       // 404 for unknown commands
       return res.send(404);

package/dist/server.js

@@ -19,7 +19,6 @@ function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.
 import fs from 'fs';
 import path from 'path';
 import http from 'http';
-import { WebSocketServer } from 'ws';
 import mime from 'mime-types';
 import disposition from 'content-disposition';
 import { pathToRegexp, match as pathToMatch, compile as makeToPath } from 'path-to-regexp'; // custom incoming message adds a `url` and `body` properties containing the parsed URL and message
@@ -117,10 +116,6 @@ var _sockets = /*#__PURE__*/new WeakMap();
 
 var _defaultPort = /*#__PURE__*/new WeakMap();
 
-var _up = /*#__PURE__*/new WeakMap();
-
-var _handleUpgrade = /*#__PURE__*/new WeakSet();
-
 var _routes = /*#__PURE__*/new WeakMap();
 
 var _route = /*#__PURE__*/new WeakSet();
@@ -140,8 +135,6 @@ export class Server extends http.Server {
 
     _classPrivateMethodInitSpec(this, _route);
 
-    _classPrivateMethodInitSpec(this, _handleUpgrade);
-
     _classPrivateFieldInitSpec(this, _sockets, {
       writable: true,
       value: new Set()
@@ -152,11 +145,6 @@ export class Server extends http.Server {
       value: void 0
     });
 
-    _classPrivateFieldInitSpec(this, _up, {
-      writable: true,
-      value: []
-    });
-
     _classPrivateFieldInitSpec(this, _routes, {
       writable: true,
       value: [{
@@ -186,10 +174,6 @@ export class Server extends http.Server {
 
     this.on('request', (req, res) => {
       req.on('end', () => _classPrivateMethodGet(this, _handleRequest, _handleRequest2).call(this, req, res));
-    }); // handle websocket upgrades
-
-    this.on('upgrade', (req, sock, head) => {
-      _classPrivateMethodGet(this, _handleUpgrade, _handleUpgrade2).call(this, req, sock, head);
     }); // track open connections to terminate when the server closes
 
     this.on('connection', socket => {
@@ -231,29 +215,8 @@ export class Server extends http.Server {
 
       super.close(resolve);
     });
-  } // handle websocket upgrades
-
+  } // initial routes include cors and 404 handling
 
-  websocket(pathname, handle) {
-    if (!handle) [pathname, handle] = [null, pathname];
-
-    _classPrivateFieldGet(this, _up).push({
-      match: pathname && pathToMatch(pathname),
-      handle: (req, sock, head) => new Promise(resolve => {
-        let wss = new WebSocketServer({
-          noServer: true,
-          clientTracking: false
-        });
-        wss.handleUpgrade(req, sock, head, resolve);
-      }).then(ws => handle(ws, req))
-    });
-
-    if (pathname) {
-      _classPrivateFieldGet(this, _up).sort((a, b) => (a.match ? -1 : 1) - (b.match ? -1 : 1));
-    }
-
-    return this;
-  }
 
   // set request routing and handling for pathnames and methods
   route(method, pathname, handle) {
@@ -312,14 +275,6 @@ export class Server extends http.Server {
 
 } // create a url rewriter from provided rewrite rules
 
-function _handleUpgrade2(req, sock, head) {
-  let up = _classPrivateFieldGet(this, _up).find(u => !u.match || u.match(req.url));
-
-  if (up) return up.handle(req, sock, head);
-  sock.write(`HTTP/1.1 400 ${http.STATUS_CODES[400]}\r\n` + 'Connection: close\r\n\r\n');
-  sock.destroy();
-}
-
 function _route2(route) {
   let i = _classPrivateFieldGet(this, _routes).findIndex(r => r.priority >= route.priority);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/core",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,10 +39,10 @@
     "test:types": "tsd"
   },
   "dependencies": {
-    "@percy/client": "1.10.1",
-    "@percy/config": "1.10.1",
-    "@percy/dom": "1.10.1",
-    "@percy/logger": "1.10.1",
+    "@percy/client": "1.10.3",
+    "@percy/config": "1.10.3",
+    "@percy/dom": "1.10.3",
+    "@percy/logger": "1.10.3",
     "content-disposition": "^0.5.4",
     "cross-spawn": "^7.0.3",
     "extract-zip": "^2.0.1",
@@ -53,5 +53,5 @@
     "rimraf": "^3.0.2",
     "ws": "^8.0.0"
   },
-  "gitHead": "3e16144300e8b49aab638ceb699630f4be71bb9f"
+  "gitHead": "a9858d20a9b9708da0464c0617b32b2ee1c97433"
 }