creevey 0.9.0-beta.2 → 0.9.0-beta.20

package/lib/cjs/server/master/runner.js

@@ -4,84 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = require("fs");
-
 var _util = require("util");
-
 var _events = require("events");
-
 var _types = require("../../types");
-
 var _pool = _interopRequireDefault(require("./pool"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const copyFileAsync = (0, _util.promisify)(_fs.copyFile);
 const mkdirAsync = (0, _util.promisify)(_fs.mkdir);
-
 class Runner extends _events.EventEmitter {
+  pools = {};
+  tests = {};
   get isRunning() {
     return Object.values(this.pools).some(pool => pool.isRunning);
   }
-
   constructor(config) {
     super();
-
-    _defineProperty(this, "failFast", void 0);
-
-    _defineProperty(this, "screenDir", void 0);
-
-    _defineProperty(this, "reportDir", void 0);
-
-    _defineProperty(this, "browsers", void 0);
-
-    _defineProperty(this, "pools", {});
-
-    _defineProperty(this, "tests", {});
-
-    _defineProperty(this, "handlePoolMessage", message => {
-      const {
-        id,
-        status,
-        result
-      } = message;
-      const test = this.tests[id];
-      if (!test) return;
-      const {
-        browser,
-        testName,
-        storyPath,
-        storyId
-      } = test; // TODO Handle 'retrying' status
-
-      test.status = status == 'retrying' ? 'failed' : status;
-
-      if (!result) {
-        this.sendUpdate({
-          tests: {
-            [id]: {
-              id,
-              browser,
-              testName,
-              storyPath,
-              status: test.status,
-              storyId
-            }
-          }
-        });
-        return;
-      }
-
-      if (!test.results) {
-        test.results = [];
-      }
-
-      test.results.push(result);
+    this.failFast = config.failFast;
+    this.screenDir = config.screenDir;
+    this.reportDir = config.reportDir;
+    this.browsers = Object.keys(config.browsers);
+    this.browsers.map(browser => this.pools[browser] = new _pool.default(config, browser)).map(pool => pool.on('test', this.handlePoolMessage));
+  }
+  handlePoolMessage = message => {
+    const {
+      id,
+      status,
+      result
+    } = message;
+    const test = this.tests[id];
+    if (!test) return;
+    const {
+      browser,
+      testName,
+      storyPath,
+      storyId
+    } = test;
+    // TODO Handle 'retrying' status
+    test.status = status == 'retrying' ? 'failed' : status;
+    if (!result) {
       this.sendUpdate({
         tests: {
           [id]: {
@@ -90,56 +52,65 @@ class Runner extends _events.EventEmitter {
             testName,
             storyPath,
             status: test.status,
-            results: [result],
             storyId
           }
         }
       });
-      if (this.failFast && status == 'failed') this.stop();
-    });
-
-    _defineProperty(this, "handlePoolStop", () => {
-      if (!this.isRunning) {
-        this.sendUpdate({
-          isRunning: false
-        });
-        this.emit('stop');
+      return;
+    }
+    if (!test.results) {
+      test.results = [];
+    }
+    test.results.push(result);
+    this.sendUpdate({
+      tests: {
+        [id]: {
+          id,
+          browser,
+          testName,
+          storyPath,
+          status: test.status,
+          results: [result],
+          storyId
+        }
       }
     });
-
-    this.failFast = config.failFast;
-    this.screenDir = config.screenDir;
-    this.reportDir = config.reportDir;
-    this.browsers = Object.keys(config.browsers);
-    this.browsers.map(browser => this.pools[browser] = new _pool.default(config, browser)).map(pool => pool.on('test', this.handlePoolMessage));
-  }
-
+    if (this.failFast && status == 'failed') this.stop();
+  };
+  handlePoolStop = () => {
+    if (!this.isRunning) {
+      this.sendUpdate({
+        isRunning: false
+      });
+      this.emit('stop');
+    }
+  };
   async init() {
     await Promise.all(Object.values(this.pools).map(pool => pool.init()));
   }
-
   updateTests(testsDiff) {
     const tests = {};
     const removedTests = [];
     Object.entries(testsDiff).forEach(([id, newTest]) => {
       const oldTest = this.tests[id];
-
       if (newTest) {
         if (oldTest) {
-          this.tests[id] = { ...newTest,
+          this.tests[id] = {
+            ...newTest,
             retries: oldTest.retries,
             results: oldTest.results,
             approved: oldTest.approved
           };
-        } else this.tests[id] = newTest; // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+        } else this.tests[id] = newTest;
 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const {
           story,
           fn,
           ...restTest
         } = newTest;
-        tests[id] = { ...restTest,
+        tests[id] = {
+          ...restTest,
           status: 'unknown'
         };
       } else if (oldTest) {
@@ -165,7 +136,6 @@ class Runner extends _events.EventEmitter {
       removedTests
     });
   }
-
   start(ids) {
     if (this.isRunning) return;
     const testsToStart = ids.map(id => this.tests[id]).filter(_types.isDefined).filter(test => !test.skip);
@@ -178,7 +148,8 @@ class Runner extends _events.EventEmitter {
         browser,
         testName,
         storyPath
-      }) => ({ ...update,
+      }) => ({
+        ...update,
         [id]: {
           id,
           browser,
@@ -198,7 +169,8 @@ class Runner extends _events.EventEmitter {
       } = test;
       const restPath = [...storyPath, testName].filter(_types.isDefined);
       test.status = 'pending';
-      return { ...tests,
+      return {
+        ...tests,
         [browser]: [...(tests[browser] || []), {
           id,
           path: restPath
@@ -208,21 +180,19 @@ class Runner extends _events.EventEmitter {
     this.browsers.forEach(browser => {
       const pool = this.pools[browser];
       const tests = testsByBrowser[browser];
-
       if (tests && tests.length > 0 && pool.start(tests)) {
         pool.once('stop', this.handlePoolStop);
       }
     });
   }
-
   stop() {
     if (!this.isRunning) return;
     this.browsers.forEach(browser => this.pools[browser].stop());
   }
-
   get status() {
     const tests = {};
-    Object.values(this.tests).filter(_types.isDefined) // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    Object.values(this.tests).filter(_types.isDefined)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     .forEach(({
       story,
       fn,
@@ -234,7 +204,6 @@ class Runner extends _events.EventEmitter {
       browsers: this.browsers
     };
   }
-
   async approve({
     id,
     retry,
@@ -246,24 +215,18 @@ class Runner extends _events.EventEmitter {
     if (!result || !result.images) return;
     const images = result.images[image];
     if (!images) return;
-
     if (!test.approved) {
       test.approved = {};
     }
-
     const {
       browser,
       testName,
       storyPath
     } = test;
     const restPath = [...storyPath, testName].filter(_types.isDefined);
-
     const testPath = _path.default.join(...restPath, image == browser ? '' : browser);
-
     const srcImagePath = _path.default.join(this.reportDir, testPath, images.actual);
-
     const dstImagePath = _path.default.join(this.screenDir, testPath, `${image}.png`);
-
     await mkdirAsync(_path.default.join(this.screenDir, testPath), {
       recursive: true
     });
@@ -284,11 +247,8 @@ class Runner extends _events.EventEmitter {
       }
     });
   }
-
   sendUpdate(data) {
     this.emit('update', data);
   }
-
 }
-
 exports.default = Runner;

package/lib/cjs/server/master/server.js

@@ -4,43 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = server;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _http = _interopRequireDefault(require("http"));
-
 var _cluster = _interopRequireDefault(require("cluster"));
-
 var _koa = _interopRequireDefault(require("koa"));
-
 var _cors = _interopRequireDefault(require("@koa/cors"));
-
 var _koaStatic = _interopRequireDefault(require("koa-static"));
-
 var _koaMount = _interopRequireDefault(require("koa-mount"));
-
 var _koaBodyparser = _interopRequireDefault(require("koa-bodyparser"));
-
 var _ws = _interopRequireDefault(require("ws"));
-
 var _messages = require("../messages");
-
 var _types = require("../../types");
-
 var _logger = require("../logger");
-
 var _shared = require("../../shared");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function server(reportDir, port, ui) {
   let resolveApi = _types.noop;
   let setStoriesCounter = 0;
   const creeveyApi = new Promise(resolve => resolveApi = resolve);
   const app = new _koa.default();
-
   const server = _http.default.createServer(app.callback());
-
   const wss = new _ws.default.Server({
     server
   });
@@ -51,17 +34,14 @@ function server(reportDir, port, ui) {
       ctx.body = 'pong';
       return;
     }
-
     await next();
   });
-
   if (ui) {
     app.use(async (_, next) => {
       await creeveyApi;
       await next();
     });
   }
-
   app.use(async (ctx, next) => {
     if (ctx.method == 'POST' && ctx.path == '/stories') {
       const {
@@ -75,13 +55,12 @@ function server(reportDir, port, ui) {
         type: 'update',
         payload: deserializedStories
       });
-      Object.values(_cluster.default.workers).filter(_types.isDefined).filter(worker => worker.isConnected()).forEach(worker => (0, _messages.sendStoriesMessage)(worker, {
+      Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).filter(worker => worker.isConnected()).forEach(worker => (0, _messages.sendStoriesMessage)(worker, {
         type: 'update',
         payload: deserializedStories
       }));
       return;
     }
-
     await next();
   });
   app.use(async (ctx, next) => {
@@ -90,8 +69,8 @@ function server(reportDir, port, ui) {
         workerId,
         options
       } = ctx.request.body;
-      const worker = Object.values(_cluster.default.workers).filter(_types.isDefined).find(worker => worker.process.pid == workerId); // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
-
+      const worker = Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).find(worker => worker.process.pid == workerId);
+      // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
       if (!worker) return;
       await new Promise(resolve => {
         const unsubscribe = (0, _messages.subscribeOnWorker)(worker, 'stories', message => {
@@ -103,12 +82,11 @@ function server(reportDir, port, ui) {
           type: 'capture',
           payload: options
         });
-      }); // TODO Pass screenshot result to show it in inspector
-
+      });
+      // TODO Pass screenshot result to show it in inspector
       ctx.body = 'Ok';
       return;
     }
-
     await next();
   });
   app.use((0, _koaStatic.default)(_path.default.join(__dirname, '../../client/web')));
@@ -118,11 +96,14 @@ function server(reportDir, port, ui) {
   (0, _messages.subscribeOn)('shutdown', () => {
     server.close();
     wss.close();
+    wss.clients.forEach(ws => ws.close());
   });
   void creeveyApi.then(api => {
     api.subscribe(wss);
     wss.on('connection', ws => {
-      ws.on('message', message => api.handleMessage(ws, message));
+      ws.on('message', (message, isBinary) => {
+        api.handleMessage(ws, isBinary ? message : message.toString());
+      });
     });
   });
   return resolveApi;

package/lib/cjs/server/messages.js

@@ -3,72 +3,62 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.emitWorkerMessage = emitWorkerMessage;
+exports.emitDockerMessage = emitDockerMessage;
+exports.emitShutdownMessage = emitShutdownMessage;
 exports.emitStoriesMessage = emitStoriesMessage;
 exports.emitTestMessage = emitTestMessage;
 exports.emitWebpackMessage = emitWebpackMessage;
-exports.emitDockerMessage = emitDockerMessage;
-exports.emitShutdownMessage = emitShutdownMessage;
-exports.sendStoriesMessage = sendStoriesMessage;
-exports.sendTestMessage = sendTestMessage;
+exports.emitWorkerMessage = emitWorkerMessage;
 exports.sendDockerMessage = sendDockerMessage;
 exports.sendShutdownMessage = sendShutdownMessage;
+exports.sendStoriesMessage = sendStoriesMessage;
+exports.sendTestMessage = sendTestMessage;
 exports.subscribeOn = subscribeOn;
 exports.subscribeOnWorker = subscribeOnWorker;
-
 var _cluster = _interopRequireDefault(require("cluster"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function emitMessage(message) {
-  var _process$send, _process$send2, _process;
-
+  var _process$send, _process;
   if (_cluster.default.isWorker && !process.connected) return false;
-  return (_process$send = (_process$send2 = (_process = process).send) === null || _process$send2 === void 0 ? void 0 : _process$send2.call(_process, message)) !== null && _process$send !== void 0 ? _process$send : // @ts-expect-error: wrong typings `process.emit` return boolean
+  return ((_process$send = (_process = process).send) === null || _process$send === void 0 ? void 0 : _process$send.call(_process, message)) ??
+  // @ts-expect-error: wrong typings `process.emit` return boolean
   process.emit('message', message);
 }
-
 function emitWorkerMessage(message) {
   return emitMessage({
     scope: 'worker',
     ...message
   });
 }
-
 function emitStoriesMessage(message) {
   return emitMessage({
     scope: 'stories',
     ...message
   });
 }
-
 function emitTestMessage(message) {
   return emitMessage({
     scope: 'test',
     ...message
   });
 }
-
 function emitWebpackMessage(message) {
   return emitMessage({
     scope: 'webpack',
     ...message
   });
 }
-
 function emitDockerMessage(message) {
   return emitMessage({
     scope: 'docker',
     ...message
   });
 }
-
 function emitShutdownMessage() {
   return emitMessage({
     scope: 'shutdown'
   });
 }
-
 function createHandlers() {
   return Object.assign(Object.create(null), {
     worker: new Set(),
@@ -79,68 +69,51 @@ function createHandlers() {
     shutdown: new Set()
   });
 }
-
 const handlers = createHandlers();
-
 const handler = message => {
   switch (message.scope) {
     case 'worker':
       return handlers.worker.forEach(h => h(message));
-
     case 'stories':
       return handlers.stories.forEach(h => h(message));
-
     case 'test':
       return handlers.test.forEach(h => h(message));
-
     case 'webpack':
       return handlers.webpack.forEach(h => h(message));
-
     case 'docker':
       return handlers.docker.forEach(h => h(message));
-
     case 'shutdown':
       return handlers.shutdown.forEach(h => h(message));
   }
 };
-
 process.on('message', handler);
-
 function sendStoriesMessage(target, message) {
   var _target$send;
-
-  (_target$send = target.send) === null || _target$send === void 0 ? void 0 : _target$send.call(target, {
+  (_target$send = target.send) === null || _target$send === void 0 || _target$send.call(target, {
     scope: 'stories',
     ...message
   });
 }
-
 function sendTestMessage(target, message) {
   var _target$send2;
-
-  (_target$send2 = target.send) === null || _target$send2 === void 0 ? void 0 : _target$send2.call(target, {
+  (_target$send2 = target.send) === null || _target$send2 === void 0 || _target$send2.call(target, {
     scope: 'test',
     ...message
   });
 }
-
 function sendDockerMessage(target, message) {
   var _target$send3;
-
-  (_target$send3 = target.send) === null || _target$send3 === void 0 ? void 0 : _target$send3.call(target, {
+  (_target$send3 = target.send) === null || _target$send3 === void 0 || _target$send3.call(target, {
     scope: 'docker',
     ...message
   });
 }
-
 function sendShutdownMessage(target) {
   var _target$send4;
-
-  (_target$send4 = target.send) === null || _target$send4 === void 0 ? void 0 : _target$send4.call(target, {
+  (_target$send4 = target.send) === null || _target$send4 === void 0 || _target$send4.call(target, {
     scope: 'shutdown'
   });
 }
-
 function subscribeOn(scope, handler) {
   switch (scope) {
     case 'worker':
@@ -149,35 +122,30 @@ function subscribeOn(scope, handler) {
         handlers.worker.add(workerHandler);
         return () => handlers.worker.delete(workerHandler);
       }
-
     case 'stories':
       {
         const storiesHandler = handler;
         handlers.stories.add(storiesHandler);
         return () => handlers.stories.delete(storiesHandler);
       }
-
     case 'test':
       {
         const testHandler = handler;
         handlers.test.add(testHandler);
         return () => handlers.test.delete(testHandler);
       }
-
     case 'webpack':
       {
         const webpackHandler = handler;
         handlers.webpack.add(webpackHandler);
         return () => handlers.webpack.delete(webpackHandler);
       }
-
     case 'docker':
       {
         const dockerHandler = handler;
         handlers.docker.add(dockerHandler);
         return () => handlers.docker.delete(dockerHandler);
       }
-
     case 'shutdown':
       {
         const shutdownHandler = handler;
@@ -186,14 +154,9 @@ function subscribeOn(scope, handler) {
       }
   }
 }
-
 const workers = new Map();
-
 function subscribeOnWorker(worker, scope, handler) {
-  var _workers$get;
-
-  const workerHandlers = (_workers$get = workers.get(worker)) !== null && _workers$get !== void 0 ? _workers$get : createHandlers();
-
+  const workerHandlers = workers.get(worker) ?? createHandlers();
   if (!workers.has(worker)) {
     workers.set(worker, workerHandlers);
     worker.once('exit', () => workers.delete(worker));
@@ -201,25 +164,19 @@ function subscribeOnWorker(worker, scope, handler) {
       switch (message.scope) {
         case 'worker':
           return workerHandlers.worker.forEach(h => h(message));
-
         case 'stories':
           return workerHandlers.stories.forEach(h => h(message));
-
         case 'test':
           return workerHandlers.test.forEach(h => h(message));
-
         case 'webpack':
           return workerHandlers.webpack.forEach(h => h(message));
-
         case 'docker':
           return workerHandlers.docker.forEach(h => h(message));
-
         case 'shutdown':
           return workerHandlers.shutdown.forEach(h => h(message));
       }
     });
   }
-
   switch (scope) {
     case 'worker':
       {
@@ -227,35 +184,30 @@ function subscribeOnWorker(worker, scope, handler) {
         workerHandlers.worker.add(workerHandler);
         return () => workerHandlers.worker.delete(workerHandler);
       }
-
     case 'stories':
       {
         const storiesHandler = handler;
         workerHandlers.stories.add(storiesHandler);
         return () => workerHandlers.stories.delete(storiesHandler);
       }
-
     case 'test':
       {
         const testHandler = handler;
         workerHandlers.test.add(testHandler);
         return () => workerHandlers.test.delete(testHandler);
       }
-
     case 'webpack':
       {
         const webpackHandler = handler;
         workerHandlers.webpack.add(webpackHandler);
         return () => workerHandlers.webpack.delete(webpackHandler);
       }
-
     case 'docker':
       {
         const dockerHandler = handler;
         workerHandlers.docker.add(dockerHandler);
         return () => workerHandlers.docker.delete(dockerHandler);
       }
-
     case 'shutdown':
       {
         const shutdownHandler = handler;