creevey 0.10.0-beta.44 → 0.10.0-beta.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/dist/server/index.js +2 -2
  2. package/dist/server/index.js.map +1 -1
  3. package/dist/server/master/api.d.ts +5 -10
  4. package/dist/server/master/api.js +19 -18
  5. package/dist/server/master/api.js.map +1 -1
  6. package/dist/server/master/handlers/capture-handler.d.ts +5 -2
  7. package/dist/server/master/handlers/capture-handler.js +6 -16
  8. package/dist/server/master/handlers/capture-handler.js.map +1 -1
  9. package/dist/server/master/handlers/ping-handler.d.ts +2 -2
  10. package/dist/server/master/handlers/ping-handler.js +2 -1
  11. package/dist/server/master/handlers/ping-handler.js.map +1 -1
  12. package/dist/server/master/handlers/static-handler.d.ts +1 -2
  13. package/dist/server/master/handlers/static-handler.js +10 -20
  14. package/dist/server/master/handlers/static-handler.js.map +1 -1
  15. package/dist/server/master/handlers/stories-handler.d.ts +4 -2
  16. package/dist/server/master/handlers/stories-handler.js +13 -27
  17. package/dist/server/master/handlers/stories-handler.js.map +1 -1
  18. package/dist/server/master/server.js +182 -70
  19. package/dist/server/master/server.js.map +1 -1
  20. package/dist/server/playwright/docker-file.js +2 -2
  21. package/dist/server/playwright/docker-file.js.map +1 -1
  22. package/dist/server/playwright/internal.js +3 -1
  23. package/dist/server/playwright/internal.js.map +1 -1
  24. package/dist/server/selenium/internal.js +3 -1
  25. package/dist/server/selenium/internal.js.map +1 -1
  26. package/package.json +3 -3
  27. package/src/server/index.ts +2 -2
  28. package/src/server/master/api.ts +24 -27
  29. package/src/server/master/handlers/capture-handler.ts +5 -24
  30. package/src/server/master/handlers/ping-handler.ts +4 -3
  31. package/src/server/master/handlers/static-handler.ts +10 -21
  32. package/src/server/master/handlers/stories-handler.ts +12 -40
  33. package/src/server/master/server.ts +194 -78
  34. package/src/server/playwright/docker-file.ts +2 -2
  35. package/src/server/playwright/internal.ts +3 -1
  36. package/src/server/selenium/internal.ts +3 -1
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.default = default_1;
7
7
  const cluster_1 = __importDefault(require("cluster"));
8
8
  const path_1 = __importDefault(require("path"));
9
- const shelljs_1 = require("shelljs");
9
+ const shelljs_1 = __importDefault(require("shelljs"));
10
10
  const detect_1 = require("package-manager-detector/detect");
11
11
  const commands_1 = require("package-manager-detector/commands");
12
12
  const config_js_1 = require("./config.js");
@@ -107,7 +107,7 @@ async function default_1(options) {
107
107
  if (remoteUrl && localUrl != remoteUrl)
108
108
  (0, logger_js_1.logger)().info(`On your network - ${remoteUrl}`);
109
109
  (0, logger_js_1.logger)().info('Waiting Storybook...');
110
- const storybook = (0, shelljs_1.exec)(storybookCommand, { async: true });
110
+ const storybook = shelljs_1.default.exec(storybookCommand, { async: true });
111
111
  (0, messages_js_1.subscribeOn)('shutdown', () => {
112
112
  if (storybook.pid)
113
113
  void (0, utils_js_1.killTree)(storybook.pid);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,12 @@
1
- import Runner from './runner.js';
2
- import { TestsManager } from './testsManager.js';
3
- import HyperExpress from 'hyper-express';
4
- interface CustomWSServer {
5
- clients: Set<HyperExpress.Websocket>;
6
- publish: (message: string) => void;
7
- }
1
+ import { Data, WebSocket, WebSocketServer } from 'ws';
2
+ import type { TestsManager } from './testsManager.js';
3
+ import type Runner from './runner.js';
8
4
  export declare class CreeveyApi {
9
5
  private runner;
10
6
  private testsManager;
11
7
  private wss;
12
8
  constructor(testsManager: TestsManager, runner?: Runner);
13
- subscribe(wss: CustomWSServer): void;
14
- handleMessage(ws: HyperExpress.Websocket, message: string | Buffer): void;
9
+ subscribe(wss: WebSocketServer): void;
10
+ handleMessage(ws: WebSocket, message: Data): void;
15
11
  private broadcastUpdate;
16
12
  }
17
- export {};
@@ -1,13 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CreeveyApi = void 0;
4
+ const ws_1 = require("ws");
4
5
  const logger_js_1 = require("../logger.js");
5
- // Helper function for HyperExpress WebSocket broadcasting
6
- function broadcastHyperExpress(wss, message) {
7
- const serializedMessage = JSON.stringify(message);
8
- wss.publish(serializedMessage);
6
+ function broadcast(wss, message) {
7
+ wss.clients.forEach((ws) => {
8
+ if (ws.readyState === ws_1.WebSocket.OPEN) {
9
+ ws.send(JSON.stringify(message));
10
+ }
11
+ });
12
+ }
13
+ function send(ws, message) {
14
+ if (ws.readyState === ws_1.WebSocket.OPEN) {
15
+ ws.send(JSON.stringify(message));
16
+ }
9
17
  }
10
- // The class-based implementation of CreeveyApi
18
+ // The class-based implementation of CreeveyApi for native WebSockets
11
19
  class CreeveyApi {
12
20
  runner = null;
13
21
  testsManager;
@@ -36,23 +44,16 @@ class CreeveyApi {
36
44
  }
37
45
  handleMessage(ws, message) {
38
46
  if (typeof message != 'string') {
39
- if (Buffer.isBuffer(message)) {
40
- message = message.toString('utf-8');
41
- }
42
- else {
43
- (0, logger_js_1.logger)().info('unhandled message', message);
44
- return;
45
- }
47
+ (0, logger_js_1.logger)().info('unhandled message', message);
48
+ return;
46
49
  }
47
50
  const command = JSON.parse(message);
48
- const sendResponse = (response) => {
49
- ws.send(JSON.stringify(response));
50
- };
51
51
  if (this.runner) {
52
52
  // Normal mode handling with runner
53
53
  switch (command.type) {
54
54
  case 'status': {
55
- sendResponse({ type: 'status', payload: this.runner.status });
55
+ const status = this.runner.status;
56
+ send(ws, { type: 'status', payload: status });
56
57
  return;
57
58
  }
58
59
  case 'start': {
@@ -86,7 +87,7 @@ class CreeveyApi {
86
87
  }
87
88
  case 'status': {
88
89
  // In update mode, respond with static status including tests data
89
- sendResponse({
90
+ send(ws, {
90
91
  type: 'status',
91
92
  payload: {
92
93
  isRunning: false,
@@ -109,7 +110,7 @@ class CreeveyApi {
109
110
  if (!this.wss)
110
111
  return;
111
112
  const message = { type: 'update', payload };
112
- broadcastHyperExpress(this.wss, message);
113
+ broadcast(this.wss, message);
113
114
  }
114
115
  }
115
116
  exports.CreeveyApi = CreeveyApi;
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/server/master/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/server/master/api.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,5 @@
1
- import { Request, Response } from 'hyper-express';
2
- export declare function captureHandler(request: Request, response: Response): Promise<void>;
1
+ import { CaptureOptions } from '../../../types.js';
2
+ export declare function captureHandler({ workerId, options }: {
3
+ workerId: number;
4
+ options?: CaptureOptions;
5
+ }): void;
@@ -7,29 +7,19 @@ exports.captureHandler = captureHandler;
7
7
  const cluster_1 = __importDefault(require("cluster"));
8
8
  const messages_js_1 = require("../../messages.js");
9
9
  const types_js_1 = require("../../../types.js");
10
- async function captureHandler(request, response) {
11
- const { workerId, options } = await request.json({
12
- workerId: 0,
13
- options: undefined,
14
- });
10
+ function captureHandler({ workerId, options }) {
15
11
  const worker = Object.values(cluster_1.default.workers ?? {})
16
12
  .filter(types_js_1.isDefined)
17
13
  .find((worker) => worker.process.pid == workerId);
18
14
  // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
19
15
  if (!worker) {
20
- response.send();
21
16
  return;
22
17
  }
23
- await new Promise((resolve) => {
24
- const unsubscribe = (0, messages_js_1.subscribeOnWorker)(worker, 'stories', (message) => {
25
- if (message.type != 'capture')
26
- return;
27
- unsubscribe();
28
- resolve();
29
- });
30
- (0, messages_js_1.sendStoriesMessage)(worker, { type: 'capture', payload: options });
18
+ const unsubscribe = (0, messages_js_1.subscribeOnWorker)(worker, 'stories', (message) => {
19
+ if (message.type != 'capture')
20
+ return;
21
+ unsubscribe();
31
22
  });
32
- // TODO Pass screenshot result to show it in inspector
33
- response.send('Ok');
23
+ (0, messages_js_1.sendStoriesMessage)(worker, { type: 'capture', payload: options });
34
24
  }
35
25
  //# sourceMappingURL=capture-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"capture-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/capture-handler.ts"],"names":[],"mappings":";;;;;AAKA,wCAiCC;AArCD,sDAA8B;AAC9B,mDAA0E;AAC1E,gDAA8D;AAEvD,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,QAAkB;IACvE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAM9C;QACA,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,SAAS;KACnB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAO,CAAC,OAAO,IAAI,EAAE,CAAC;SAChD,MAAM,CAAC,oBAAS,CAAC;SACjB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IAEpD,qHAAqH;IACrH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAClC,MAAM,WAAW,GAAG,IAAA,+BAAiB,EAAC,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YACnE,IAAI,OAAO,CAAC,IAAI,IAAI,SAAS;gBAAE,OAAO;YACtC,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,IAAA,gCAAkB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"capture-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/capture-handler.ts"],"names":[],"mappings":";;;;;AAIA,wCAeC;AAnBD,sDAA8B;AAC9B,mDAA0E;AAC1E,gDAA8D;AAE9D,SAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAkD;IAClG,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAO,CAAC,OAAO,IAAI,EAAE,CAAC;SAChD,MAAM,CAAC,oBAAS,CAAC;SACjB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IAEpD,qHAAqH;IACrH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,+BAAiB,EAAC,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QACnE,IAAI,OAAO,CAAC,IAAI,IAAI,SAAS;YAAE,OAAO;QACtC,WAAW,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,IAAA,gCAAkB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;AACpE,CAAC"}
@@ -1,2 +1,2 @@
1
- import { Request, Response } from 'hyper-express';
2
- export declare function pingHandler(_request: Request, response: Response): void;
1
+ import { IncomingMessage, ServerResponse } from 'http';
2
+ export declare function pingHandler(_request: IncomingMessage, response: ServerResponse): void;
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.pingHandler = pingHandler;
4
4
  function pingHandler(_request, response) {
5
- response.send('pong');
5
+ response.setHeader('Content-Type', 'text/plain');
6
+ response.end('pong');
6
7
  }
7
8
  //# sourceMappingURL=ping-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ping-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/ping-handler.ts"],"names":[],"mappings":";;AAEA,kCAEC;AAFD,SAAgB,WAAW,CAAC,QAAiB,EAAE,QAAkB;IAC/D,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"ping-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/ping-handler.ts"],"names":[],"mappings":";;AAEA,kCAGC;AAHD,SAAgB,WAAW,CAAC,QAAyB,EAAE,QAAwB;IAC7E,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACjD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC"}
@@ -1,2 +1 @@
1
- import { Request, Response } from 'hyper-express';
2
- export declare function createStaticFileHandler(baseDir: string, pathPrefix?: string): (request: Request, response: Response) => void;
1
+ export declare function staticHandler(baseDir: string, pathPrefix?: string): (requestedPath: string) => string | undefined;
@@ -3,29 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createStaticFileHandler = createStaticFileHandler;
6
+ exports.staticHandler = staticHandler;
7
7
  const path_1 = __importDefault(require("path"));
8
8
  const fs_1 = __importDefault(require("fs"));
9
- const logger_js_1 = require("../../logger.js");
10
- function createStaticFileHandler(baseDir, pathPrefix) {
11
- return (request, response) => {
12
- try {
13
- const decodedPath = decodeURIComponent(request.path);
14
- const relativePath = pathPrefix ? decodedPath.replace(pathPrefix, '') : decodedPath;
15
- let filePath = path_1.default.join(baseDir, relativePath || 'index.html');
16
- // If the path points to a directory, append index.html
17
- if (fs_1.default.existsSync(filePath) && fs_1.default.statSync(filePath).isDirectory()) {
18
- filePath = path_1.default.join(filePath, 'index.html');
19
- }
20
- if (!fs_1.default.existsSync(filePath)) {
21
- response.status(404).send('File not found');
22
- return;
23
- }
24
- response.sendFile(filePath);
9
+ function staticHandler(baseDir, pathPrefix) {
10
+ return (requestedPath) => {
11
+ const relativePath = pathPrefix ? requestedPath.replace(pathPrefix, '') : requestedPath;
12
+ let filePath = path_1.default.join(baseDir, relativePath || 'index.html');
13
+ // If the path points to a directory, append index.html
14
+ if (fs_1.default.existsSync(filePath) && fs_1.default.statSync(filePath).isDirectory()) {
15
+ filePath = path_1.default.join(filePath, 'index.html');
25
16
  }
26
- catch (error) {
27
- (0, logger_js_1.logger)().error('Error serving file', error);
28
- response.status(500).send('Internal server error');
17
+ if (!fs_1.default.existsSync(filePath)) {
18
+ return undefined;
29
19
  }
30
20
  };
31
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"static-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/static-handler.ts"],"names":[],"mappings":";;;;;AAKA,0DAuBC;AA3BD,gDAAwB;AACxB,4CAAoB;AACpB,+CAAyC;AAEzC,SAAgB,uBAAuB,CAAC,OAAe,EAAE,UAAmB;IAC1E,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAQ,EAAE;QACpD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YACpF,IAAI,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,YAAY,CAAC,CAAC;YAEhE,uDAAuD;YACvD,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnE,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"static-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/static-handler.ts"],"names":[],"mappings":";;;;;AAGA,sCAcC;AAjBD,gDAAwB;AACxB,4CAAoB;AAEpB,SAAgB,aAAa,CAAC,OAAe,EAAE,UAAmB;IAChE,OAAO,CAAC,aAAqB,EAAsB,EAAE;QACnD,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QACxF,IAAI,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,YAAY,CAAC,CAAC;QAEhE,uDAAuD;QACvD,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACnE,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
@@ -1,2 +1,4 @@
1
- import { Request, Response } from 'hyper-express';
2
- export declare function createStoriesHandler(): (request: Request, response: Response) => Promise<void>;
1
+ import { StoryInput } from '../../../types.js';
2
+ export declare function storiesHandler({ stories }: {
3
+ stories: [string, StoryInput[]][];
4
+ }): void;
@@ -3,36 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createStoriesHandler = createStoriesHandler;
6
+ exports.storiesHandler = storiesHandler;
7
7
  const cluster_1 = __importDefault(require("cluster"));
8
8
  const messages_js_1 = require("../../messages.js");
9
9
  const types_js_1 = require("../../../types.js");
10
10
  const index_js_1 = require("../../../shared/index.js");
11
- function createStoriesHandler() {
12
- let setStoriesCounter = 0;
13
- // TODO We need this handler for getting stories updates from a browser
14
- return async (request, response) => {
15
- const { setStoriesCounter: counter, stories } = await request.json({
16
- setStoriesCounter: 0,
17
- stories: [],
18
- });
19
- if (setStoriesCounter >= counter) {
20
- response.send();
21
- return;
22
- }
23
- const deserializedStories = stories.map(([file, stories]) => [
24
- file,
25
- stories.map(index_js_1.deserializeStory),
26
- ]);
27
- setStoriesCounter = counter;
28
- (0, messages_js_1.emitStoriesMessage)({ type: 'update', payload: deserializedStories });
29
- Object.values(cluster_1.default.workers ?? {})
30
- .filter(types_js_1.isDefined)
31
- .filter((worker) => worker.isConnected())
32
- .forEach((worker) => {
33
- (0, messages_js_1.sendStoriesMessage)(worker, { type: 'update', payload: deserializedStories });
34
- });
35
- response.send();
36
- };
11
+ function storiesHandler({ stories }) {
12
+ const deserializedStories = stories.map(([file, stories]) => [
13
+ file,
14
+ stories.map(index_js_1.deserializeStory),
15
+ ]);
16
+ (0, messages_js_1.emitStoriesMessage)({ type: 'update', payload: deserializedStories });
17
+ Object.values(cluster_1.default.workers ?? {})
18
+ .filter(types_js_1.isDefined)
19
+ .filter((worker) => worker.isConnected())
20
+ .forEach((worker) => {
21
+ (0, messages_js_1.sendStoriesMessage)(worker, { type: 'update', payload: deserializedStories });
22
+ });
37
23
  }
38
24
  //# sourceMappingURL=stories-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"stories-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/stories-handler.ts"],"names":[],"mappings":";;;;;AAMA,oDAyCC;AA9CD,sDAA8B;AAC9B,mDAA2E;AAC3E,gDAA0D;AAC1D,uDAA4D;AAE5D,SAAgB,oBAAoB;IAClC,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,uEAAuE;IACvE,OAAO,KAAK,EAAE,OAAgB,EAAE,QAAkB,EAAiB,EAAE;QACnE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAShE;YACA,iBAAiB,EAAE,CAAC;YACpB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,IAAI,iBAAiB,IAAI,OAAO,EAAE,CAAC;YACjC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAyB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YACnF,IAAI;YACJ,OAAO,CAAC,GAAG,CAAC,2BAAgB,CAAC;SAC9B,CAAC,CAAC;QAEH,iBAAiB,GAAG,OAAO,CAAC;QAC5B,IAAA,gCAAkB,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAErE,MAAM,CAAC,MAAM,CAAC,iBAAO,CAAC,OAAO,IAAI,EAAE,CAAC;aACjC,MAAM,CAAC,oBAAS,CAAC;aACjB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;aACxC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClB,IAAA,gCAAkB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"stories-handler.js","sourceRoot":"","sources":["../../../../src/server/master/handlers/stories-handler.ts"],"names":[],"mappings":";;;;;AAKA,wCAcC;AAnBD,sDAA8B;AAC9B,mDAA2E;AAC3E,gDAA0D;AAC1D,uDAA4D;AAE5D,SAAgB,cAAc,CAAC,EAAE,OAAO,EAAyC;IAC/E,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAyB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QACnF,IAAI;QACJ,OAAO,CAAC,GAAG,CAAC,2BAAgB,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAA,gCAAkB,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAErE,MAAM,CAAC,MAAM,CAAC,iBAAO,CAAC,OAAO,IAAI,EAAE,CAAC;SACjC,MAAM,CAAC,oBAAS,CAAC;SACjB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;SACxC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAClB,IAAA,gCAAkB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACP,CAAC"}