@webiny/api-scheduler-server 0.0.0-unstable.9f53ea597d → 6.6.0-alpha.0

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.
@@ -3,24 +3,35 @@ import type { Logger } from "@webiny/api-core/features/logger/abstractions.js";
3
3
  export interface IPendingAction {
4
4
  id: string;
5
5
  namespace: string;
6
+ tenant: string;
6
7
  scheduledFor: Date;
7
8
  }
8
9
  export interface IBreeSchedulerServiceParams {
9
10
  logger: Logger.Interface;
10
- onTrigger: (id: string, namespace: string) => Promise<void>;
11
+ onTrigger: (id: string, namespace: string, tenant: string) => Promise<void>;
11
12
  }
13
+ /**
14
+ * One-shot bree job per scheduled action — mirrors EventBridge behaviour. This is a single-process,
15
+ * long-lived root SINGLETON (started once at boot): it holds the live timers for ALL tenants, so each
16
+ * job records its own tenant and `onTrigger` is fired with it (the trigger runs outside any request,
17
+ * so the tenant can't be read from a request context).
18
+ */
12
19
  export declare class BreeSchedulerService implements SchedulerService.Interface {
13
20
  private readonly bree;
14
- private readonly namespaces;
21
+ private readonly jobs;
15
22
  private readonly logger;
16
23
  private readonly onTrigger;
17
24
  constructor(params: IBreeSchedulerServiceParams);
18
- start(pendingActions?: IPendingAction[]): Promise<void>;
25
+ start(): Promise<void>;
19
26
  stop(): Promise<void>;
20
27
  create(params: ISchedulerServiceCreateParams): Promise<void>;
21
28
  update(params: ISchedulerServiceUpdateParams): Promise<void>;
22
29
  delete(params: SchedulerService.DeleteParams): Promise<void>;
23
30
  exists(params: SchedulerService.ExistsParams): Promise<boolean>;
24
- private recover;
31
+ /**
32
+ * (Re)arm timers for a batch of persisted pending actions — called at boot (per tenant) to restore
33
+ * schedules after a restart. Overdue actions fire immediately.
34
+ */
35
+ recover(pendingActions: IPendingAction[]): Promise<void>;
25
36
  private safeRemove;
26
37
  }
@@ -1,12 +1,10 @@
1
1
  import bree from "bree";
2
- import { dirname, join } from "node:path";
3
2
  import { fileURLToPath } from "node:url";
4
3
  import { WebinyError } from "@webiny/error";
5
- const jobsDir = join(dirname(fileURLToPath(import.meta.url)), "jobs");
6
- const workerPath = join(jobsDir, "pollWorker.js");
4
+ const workerPath = fileURLToPath(new URL("./jobs/pollWorker.js", import.meta.url));
7
5
  class BreeSchedulerService {
8
6
  constructor(params){
9
- this.namespaces = new Map();
7
+ this.jobs = new Map();
10
8
  this.logger = params.logger;
11
9
  this.onTrigger = params.onTrigger;
12
10
  this.bree = new bree({
@@ -14,16 +12,15 @@ class BreeSchedulerService {
14
12
  jobs: [],
15
13
  logger: false,
16
14
  workerMessageHandler: async ({ name })=>{
17
- const namespace = this.namespaces.get(name);
18
- if (!namespace) return;
19
- this.namespaces.delete(name);
20
- await this.onTrigger(name, namespace);
15
+ const job = this.jobs.get(name);
16
+ if (!job) return;
17
+ this.jobs.delete(name);
18
+ await this.onTrigger(name, job.namespace, job.tenant);
21
19
  }
22
20
  });
23
21
  }
24
- async start(pendingActions) {
22
+ async start() {
25
23
  await this.bree.start();
26
- if (pendingActions) await this.recover(pendingActions);
27
24
  }
28
25
  async stop() {
29
26
  await this.bree.stop();
@@ -40,7 +37,10 @@ class BreeSchedulerService {
40
37
  tenant
41
38
  });
42
39
  if (exists) return this.update(params);
43
- this.namespaces.set(id, namespace);
40
+ this.jobs.set(id, {
41
+ namespace,
42
+ tenant
43
+ });
44
44
  await this.bree.add({
45
45
  name: id,
46
46
  date: scheduleFor,
@@ -65,16 +65,19 @@ class BreeSchedulerService {
65
65
  }
66
66
  async exists(params) {
67
67
  const { id } = params;
68
- return this.namespaces.has(id);
68
+ return this.jobs.has(id);
69
69
  }
70
70
  async recover(pendingActions) {
71
71
  const now = new Date();
72
72
  for (const action of pendingActions){
73
73
  if (action.scheduledFor <= now) {
74
- await this.onTrigger(action.id, action.namespace);
74
+ await this.onTrigger(action.id, action.namespace, action.tenant);
75
75
  continue;
76
76
  }
77
- this.namespaces.set(action.id, action.namespace);
77
+ this.jobs.set(action.id, {
78
+ namespace: action.namespace,
79
+ tenant: action.tenant
80
+ });
78
81
  await this.bree.add({
79
82
  name: action.id,
80
83
  date: action.scheduledFor,
@@ -84,7 +87,7 @@ class BreeSchedulerService {
84
87
  }
85
88
  }
86
89
  async safeRemove(id) {
87
- this.namespaces.delete(id);
90
+ this.jobs.delete(id);
88
91
  try {
89
92
  await this.bree.stop(id);
90
93
  } catch {
@@ -1 +1 @@
1
- {"version":3,"file":"BreeSchedulerService.js","sources":["../src/BreeSchedulerService.ts"],"sourcesContent":["import Bree from \"bree\";\nimport { dirname, join } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { WebinyError } from \"@webiny/error\";\nimport {\n type ISchedulerServiceCreateParams,\n type ISchedulerServiceUpdateParams,\n SchedulerService\n} from \"@webiny/api-scheduler/shared/abstractions.js\";\nimport type { Logger } from \"@webiny/api-core/features/logger/abstractions.js\";\n\nconst jobsDir = join(dirname(fileURLToPath(import.meta.url)), \"jobs\");\nconst workerPath = join(jobsDir, \"pollWorker.js\");\n\nexport interface IPendingAction {\n id: string;\n namespace: string;\n scheduledFor: Date;\n}\n\nexport interface IBreeSchedulerServiceParams {\n logger: Logger.Interface;\n onTrigger: (id: string, namespace: string) => Promise<void>;\n}\n\n/* One-shot bree job per scheduled action — mirrors EventBridge behavior. */\nexport class BreeSchedulerService implements SchedulerService.Interface {\n private readonly bree;\n private readonly namespaces = new Map<string, string>();\n private readonly logger;\n private readonly onTrigger;\n\n public constructor(params: IBreeSchedulerServiceParams) {\n this.logger = params.logger;\n this.onTrigger = params.onTrigger;\n\n this.bree = new Bree({\n root: false,\n jobs: [],\n logger: false,\n workerMessageHandler: async ({ name }) => {\n const namespace = this.namespaces.get(name);\n if (!namespace) {\n return;\n }\n\n this.namespaces.delete(name);\n await this.onTrigger(name, namespace);\n }\n });\n }\n\n public async start(pendingActions?: IPendingAction[]): Promise<void> {\n await this.bree.start();\n\n if (pendingActions) {\n await this.recover(pendingActions);\n }\n }\n\n public async stop(): Promise<void> {\n await this.bree.stop();\n }\n\n public async create(params: ISchedulerServiceCreateParams): Promise<void> {\n const { id, namespace, scheduleFor, tenant } = params;\n\n if (scheduleFor <= new Date()) {\n throw new WebinyError(\n `Cannot create a schedule for \"${id}\" with date in the past`,\n \"INVALID_SCHEDULE_DATE\",\n { scheduleFor, id }\n );\n }\n\n const exists = await this.exists({\n id,\n namespace,\n tenant\n });\n if (exists) {\n return this.update(params);\n }\n\n this.namespaces.set(id, namespace);\n\n await this.bree.add({\n name: id,\n date: scheduleFor,\n path: workerPath\n });\n\n await this.bree.start(id);\n }\n\n public async update(params: ISchedulerServiceUpdateParams): Promise<void> {\n const { id, scheduleFor } = params;\n\n if (scheduleFor <= new Date()) {\n throw new WebinyError(\n `Cannot update an existing schedule for \"${id}\" with date in the past`,\n \"INVALID_SCHEDULE_DATE\",\n { scheduleFor, id }\n );\n }\n\n await this.safeRemove(id);\n await this.create(params);\n }\n\n public async delete(params: SchedulerService.DeleteParams): Promise<void> {\n const { id } = params;\n const exists = await this.exists(params);\n if (!exists) {\n throw new WebinyError(`Cannot delete schedule \"${id}\" because it does not exist.`);\n }\n\n await this.safeRemove(id);\n }\n\n public async exists(params: SchedulerService.ExistsParams): Promise<boolean> {\n const { id } = params;\n return this.namespaces.has(id);\n }\n\n private async recover(pendingActions: IPendingAction[]): Promise<void> {\n const now = new Date();\n\n for (const action of pendingActions) {\n if (action.scheduledFor <= now) {\n /* Overdue — execute immediately. */\n await this.onTrigger(action.id, action.namespace);\n continue;\n }\n\n this.namespaces.set(action.id, action.namespace);\n\n await this.bree.add({\n name: action.id,\n date: action.scheduledFor,\n path: workerPath\n });\n\n await this.bree.start(action.id);\n }\n }\n\n private async safeRemove(id: string): Promise<void> {\n this.namespaces.delete(id);\n\n try {\n await this.bree.stop(id);\n } catch {\n this.logger.debug(`Could not stop bree job \"${id}\" — it may have already fired.`);\n }\n\n try {\n await this.bree.remove(id);\n } catch {\n this.logger.debug(\n `Could not remove bree job \"${id}\" — it may have already been removed.`\n );\n }\n }\n}\n"],"names":["jobsDir","join","dirname","fileURLToPath","workerPath","BreeSchedulerService","params","Map","Bree","name","namespace","pendingActions","id","scheduleFor","tenant","Date","WebinyError","exists","now","action"],"mappings":"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"}
1
+ {"version":3,"file":"BreeSchedulerService.js","sources":["../src/BreeSchedulerService.ts"],"sourcesContent":["import Bree from \"bree\";\nimport { fileURLToPath } from \"node:url\";\nimport { WebinyError } from \"@webiny/error\";\nimport {\n type ISchedulerServiceCreateParams,\n type ISchedulerServiceUpdateParams,\n SchedulerService\n} from \"@webiny/api-scheduler/shared/abstractions.js\";\nimport type { Logger } from \"@webiny/api-core/features/logger/abstractions.js\";\n\n// bree loads this file at runtime via `new Worker(path)`. Referencing it through `new URL` (rather\n// than path.join) makes the app bundler emit pollWorker into build/ as an asset, resolved relative\n// to this module (the server build sets assetPrefix \"auto\"); fileURLToPath then hands bree a plain\n// path string. Un-bundled (dev), import.meta.url is real and it resolves to the dist/jobs file.\nconst workerPath = fileURLToPath(new URL(\"./jobs/pollWorker.js\", import.meta.url));\n\nexport interface IPendingAction {\n id: string;\n namespace: string;\n tenant: string;\n scheduledFor: Date;\n}\n\ninterface IScheduledJob {\n namespace: string;\n tenant: string;\n}\n\nexport interface IBreeSchedulerServiceParams {\n logger: Logger.Interface;\n onTrigger: (id: string, namespace: string, tenant: string) => Promise<void>;\n}\n\n/**\n * One-shot bree job per scheduled action — mirrors EventBridge behaviour. This is a single-process,\n * long-lived root SINGLETON (started once at boot): it holds the live timers for ALL tenants, so each\n * job records its own tenant and `onTrigger` is fired with it (the trigger runs outside any request,\n * so the tenant can't be read from a request context).\n */\nexport class BreeSchedulerService implements SchedulerService.Interface {\n private readonly bree;\n private readonly jobs = new Map<string, IScheduledJob>();\n private readonly logger;\n private readonly onTrigger;\n\n public constructor(params: IBreeSchedulerServiceParams) {\n this.logger = params.logger;\n this.onTrigger = params.onTrigger;\n\n this.bree = new Bree({\n root: false,\n jobs: [],\n logger: false,\n workerMessageHandler: async ({ name }) => {\n const job = this.jobs.get(name);\n if (!job) {\n return;\n }\n\n this.jobs.delete(name);\n await this.onTrigger(name, job.namespace, job.tenant);\n }\n });\n }\n\n public async start(): Promise<void> {\n await this.bree.start();\n }\n\n public async stop(): Promise<void> {\n await this.bree.stop();\n }\n\n public async create(params: ISchedulerServiceCreateParams): Promise<void> {\n const { id, namespace, scheduleFor, tenant } = params;\n\n if (scheduleFor <= new Date()) {\n throw new WebinyError(\n `Cannot create a schedule for \"${id}\" with date in the past`,\n \"INVALID_SCHEDULE_DATE\",\n { scheduleFor, id }\n );\n }\n\n const exists = await this.exists({\n id,\n namespace,\n tenant\n });\n if (exists) {\n return this.update(params);\n }\n\n this.jobs.set(id, { namespace, tenant });\n\n await this.bree.add({\n name: id,\n date: scheduleFor,\n path: workerPath\n });\n\n await this.bree.start(id);\n }\n\n public async update(params: ISchedulerServiceUpdateParams): Promise<void> {\n const { id, scheduleFor } = params;\n\n if (scheduleFor <= new Date()) {\n throw new WebinyError(\n `Cannot update an existing schedule for \"${id}\" with date in the past`,\n \"INVALID_SCHEDULE_DATE\",\n { scheduleFor, id }\n );\n }\n\n await this.safeRemove(id);\n await this.create(params);\n }\n\n public async delete(params: SchedulerService.DeleteParams): Promise<void> {\n const { id } = params;\n const exists = await this.exists(params);\n if (!exists) {\n throw new WebinyError(`Cannot delete schedule \"${id}\" because it does not exist.`);\n }\n\n await this.safeRemove(id);\n }\n\n public async exists(params: SchedulerService.ExistsParams): Promise<boolean> {\n const { id } = params;\n return this.jobs.has(id);\n }\n\n /**\n * (Re)arm timers for a batch of persisted pending actions — called at boot (per tenant) to restore\n * schedules after a restart. Overdue actions fire immediately.\n */\n public async recover(pendingActions: IPendingAction[]): Promise<void> {\n const now = new Date();\n\n for (const action of pendingActions) {\n if (action.scheduledFor <= now) {\n /* Overdue — execute immediately. */\n await this.onTrigger(action.id, action.namespace, action.tenant);\n continue;\n }\n\n this.jobs.set(action.id, { namespace: action.namespace, tenant: action.tenant });\n\n await this.bree.add({\n name: action.id,\n date: action.scheduledFor,\n path: workerPath\n });\n\n await this.bree.start(action.id);\n }\n }\n\n private async safeRemove(id: string): Promise<void> {\n this.jobs.delete(id);\n\n try {\n await this.bree.stop(id);\n } catch {\n this.logger.debug(`Could not stop bree job \"${id}\" — it may have already fired.`);\n }\n\n try {\n await this.bree.remove(id);\n } catch {\n this.logger.debug(\n `Could not remove bree job \"${id}\" — it may have already been removed.`\n );\n }\n }\n}\n"],"names":["workerPath","fileURLToPath","URL","BreeSchedulerService","params","Map","Bree","name","job","id","namespace","scheduleFor","tenant","Date","WebinyError","exists","pendingActions","now","action"],"mappings":"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"}
package/index.d.ts CHANGED
@@ -1 +1,2 @@
1
- export { registerSchedulerServerExtension } from "./context.js";
1
+ export { BreeSchedulerService } from "./BreeSchedulerService.js";
2
+ export type { IPendingAction, IBreeSchedulerServiceParams } from "./BreeSchedulerService.js";
package/index.js CHANGED
@@ -1 +1 @@
1
- export { registerSchedulerServerExtension } from "./context.js";
1
+ export { BreeSchedulerService } from "./BreeSchedulerService.js";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/api-scheduler-server",
3
- "version": "0.0.0-unstable.9f53ea597d",
3
+ "version": "6.6.0-alpha.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./index.js",
@@ -18,16 +18,14 @@
18
18
  "description": "Server-side cron-based implementation for the Webiny action scheduler.",
19
19
  "license": "MIT",
20
20
  "dependencies": {
21
- "@webiny/api": "0.0.0-unstable.9f53ea597d",
22
- "@webiny/api-core": "0.0.0-unstable.9f53ea597d",
23
- "@webiny/api-headless-cms": "0.0.0-unstable.9f53ea597d",
24
- "@webiny/api-scheduler": "0.0.0-unstable.9f53ea597d",
25
- "@webiny/error": "0.0.0-unstable.9f53ea597d",
21
+ "@webiny/api-core": "6.6.0-alpha.0",
22
+ "@webiny/api-scheduler": "6.6.0-alpha.0",
23
+ "@webiny/error": "6.6.0-alpha.0",
26
24
  "bree": "9.2.9"
27
25
  },
28
26
  "devDependencies": {
29
- "@webiny/build-tools": "0.0.0-unstable.9f53ea597d",
30
- "@webiny/project-utils": "0.0.0-unstable.9f53ea597d",
27
+ "@webiny/build-tools": "6.6.0-alpha.0",
28
+ "@webiny/project-utils": "6.6.0-alpha.0",
31
29
  "typescript": "7.0.2",
32
30
  "vitest": "4.1.10"
33
31
  },
package/context.d.ts DELETED
@@ -1,3 +0,0 @@
1
- import type { CmsContext } from "@webiny/api-headless-cms/types/index.js";
2
- import { ContextPlugin } from "@webiny/api";
3
- export declare const registerSchedulerServerExtension: () => ContextPlugin<CmsContext>;
package/context.js DELETED
@@ -1,44 +0,0 @@
1
- import { SchedulerService } from "@webiny/api-scheduler/shared/abstractions.js";
2
- import { ExecuteScheduledActionUseCase } from "@webiny/api-scheduler/features/ExecuteScheduledAction/index.js";
3
- import { ListScheduledActionsUseCase } from "@webiny/api-scheduler/features/ListScheduledActions/index.js";
4
- import { Logger } from "@webiny/api-core/features/logger/abstractions.js";
5
- import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
6
- import { BreeSchedulerService } from "./BreeSchedulerService.js";
7
- import { ContextPlugin } from "@webiny/api";
8
- const registerSchedulerServerExtension = ()=>{
9
- const plugin = new ContextPlugin(async (context)=>{
10
- const tenantContext = context.container.resolve(TenantContext);
11
- const tenant = tenantContext.getTenant();
12
- if (!tenant) return;
13
- const logger = context.container.resolve(Logger);
14
- const executeScheduledAction = context.container.resolve(ExecuteScheduledActionUseCase);
15
- const service = new BreeSchedulerService({
16
- logger,
17
- onTrigger: async (id, namespace)=>{
18
- const result = await executeScheduledAction.execute({
19
- id,
20
- namespace,
21
- tenant: tenant.id
22
- });
23
- if (result.isFail()) logger.error(`Scheduled action "${id}" execution failed: ${result.error.message}`);
24
- }
25
- });
26
- context.container.registerInstance(SchedulerService, service);
27
- const listScheduledActions = context.container.resolve(ListScheduledActionsUseCase);
28
- const listResult = await listScheduledActions.execute({
29
- where: {},
30
- limit: 1000
31
- });
32
- const pendingActions = listResult.isOk() ? listResult.value.items.map((action)=>({
33
- id: action.id,
34
- namespace: action.namespace,
35
- scheduledFor: action.scheduledFor
36
- })) : void 0;
37
- await service.start(pendingActions);
38
- });
39
- plugin.name = "scheduler.server.extension";
40
- return plugin;
41
- };
42
- export { registerSchedulerServerExtension };
43
-
44
- //# sourceMappingURL=context.js.map
package/context.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"context.js","sources":["../src/context.ts"],"sourcesContent":["import type { CmsContext } from \"@webiny/api-headless-cms/types/index.js\";\nimport { SchedulerService } from \"@webiny/api-scheduler/shared/abstractions.js\";\nimport { ExecuteScheduledActionUseCase } from \"@webiny/api-scheduler/features/ExecuteScheduledAction/index.js\";\nimport { ListScheduledActionsUseCase } from \"@webiny/api-scheduler/features/ListScheduledActions/index.js\";\nimport { Logger } from \"@webiny/api-core/features/logger/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { BreeSchedulerService } from \"~/BreeSchedulerService.js\";\nimport { ContextPlugin } from \"@webiny/api\";\n\nexport const registerSchedulerServerExtension = () => {\n const plugin = new ContextPlugin<CmsContext>(async context => {\n const tenantContext = context.container.resolve(TenantContext);\n\n const tenant = tenantContext.getTenant();\n if (!tenant) {\n return;\n }\n\n const logger = context.container.resolve(Logger);\n const executeScheduledAction = context.container.resolve(ExecuteScheduledActionUseCase);\n\n const service = new BreeSchedulerService({\n logger,\n onTrigger: async (id, namespace) => {\n const result = await executeScheduledAction.execute({\n id,\n namespace,\n tenant: tenant.id\n });\n\n if (result.isFail()) {\n logger.error(\n `Scheduled action \"${id}\" execution failed: ${result.error.message}`\n );\n }\n }\n });\n\n context.container.registerInstance(SchedulerService, service);\n\n const listScheduledActions = context.container.resolve(ListScheduledActionsUseCase);\n const listResult = await listScheduledActions.execute({\n where: {},\n limit: 1000\n });\n\n const pendingActions = listResult.isOk()\n ? listResult.value.items.map(action => ({\n id: action.id,\n namespace: action.namespace,\n scheduledFor: action.scheduledFor\n }))\n : undefined;\n\n await service.start(pendingActions);\n });\n\n plugin.name = \"scheduler.server.extension\";\n\n return plugin;\n};\n"],"names":["registerSchedulerServerExtension","plugin","ContextPlugin","context","tenantContext","TenantContext","tenant","logger","Logger","executeScheduledAction","ExecuteScheduledActionUseCase","service","BreeSchedulerService","id","namespace","result","SchedulerService","listScheduledActions","ListScheduledActionsUseCase","listResult","pendingActions","action","undefined"],"mappings":";;;;;;;AASO,MAAMA,mCAAmC;IAC5C,MAAMC,SAAS,IAAIC,cAA0B,OAAMC;QAC/C,MAAMC,gBAAgBD,QAAQ,SAAS,CAAC,OAAO,CAACE;QAEhD,MAAMC,SAASF,cAAc,SAAS;QACtC,IAAI,CAACE,QACD;QAGJ,MAAMC,SAASJ,QAAQ,SAAS,CAAC,OAAO,CAACK;QACzC,MAAMC,yBAAyBN,QAAQ,SAAS,CAAC,OAAO,CAACO;QAEzD,MAAMC,UAAU,IAAIC,qBAAqB;YACrCL;YACA,WAAW,OAAOM,IAAIC;gBAClB,MAAMC,SAAS,MAAMN,uBAAuB,OAAO,CAAC;oBAChDI;oBACAC;oBACA,QAAQR,OAAO,EAAE;gBACrB;gBAEA,IAAIS,OAAO,MAAM,IACbR,OAAO,KAAK,CACR,CAAC,kBAAkB,EAAEM,GAAG,oBAAoB,EAAEE,OAAO,KAAK,CAAC,OAAO,EAAE;YAGhF;QACJ;QAEAZ,QAAQ,SAAS,CAAC,gBAAgB,CAACa,kBAAkBL;QAErD,MAAMM,uBAAuBd,QAAQ,SAAS,CAAC,OAAO,CAACe;QACvD,MAAMC,aAAa,MAAMF,qBAAqB,OAAO,CAAC;YAClD,OAAO,CAAC;YACR,OAAO;QACX;QAEA,MAAMG,iBAAiBD,WAAW,IAAI,KAChCA,WAAW,KAAK,CAAC,KAAK,CAAC,GAAG,CAACE,CAAAA,SAAW;gBAClC,IAAIA,OAAO,EAAE;gBACb,WAAWA,OAAO,SAAS;gBAC3B,cAAcA,OAAO,YAAY;YACrC,MACAC;QAEN,MAAMX,QAAQ,KAAK,CAACS;IACxB;IAEAnB,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}