mirakurun 4.0.0-beta.13 → 4.0.0-beta.15

package/CHANGELOG.md

@@ -6,13 +6,42 @@ see [Commit Logs](https://github.com/Chinachu/Mirakurun/commits/master) to check
 
 **Important Notice**: Mirakurun 4.0.0 includes significant performance improvements, enhanced EPG processing, asynchronous file I/O operations, and new features. As announced in 3.9.0, the experimental Win32 support has been completely removed.
 
+## 4.0.0-beta.15 (2025-03-30)
+
+Bugfix of `@4.0.0-beta.14`.
+
+## 4.0.0-beta.14 (2025-03-30)
+
+### Key Changes
+
+- **Job/Queue**: Improved background job mechanism for like EPG updates.
+  - **Users can now request EPG updates at any time.**
+  - Job execution schedules can now be set in a **cron-like format**.
+  - <u>Jobs are now executed in parallel</u> according to the number of CPU cores and resource availability.
+  - At the moment, the number of parallel executions is `Math.max(1, Math.floor(os.cpus().length / 2))`, but it will be made configurable in the future.
+
+### Server Changes
+
+- **Config**:
+  - Added: `programGCJobSchedule`, `epgGatheringJobSchedule` server configs.
+  - Removed: `programGCInterval`, `epgGatheringInterval` server configs. (*breaking change*)
+  - Settings are not migrated. If you have customized, you must re-configure them in cron-like format, which can be changed from the Web UI.
+  - see: [Configuration](doc/Configuration.md) ([日本語](doc/Configuration.ja.md))
+- **API**:
+  - Added: `runJobSchedule`, `abortJob` operations.
+- **UI**:
+  - Added: **Jobs** view.
+  - Update: **Config** view.
+
 ## 4.0.0-beta.13 (2025-03-29)
 
 ### Docker Changes
 
-- Added `DISABLE_PCSCD` environment variable to disable pcscd service
-- Added `DISABLE_B25_TEST` environment variable to disable B25 test decoder installation
+- Added `DISABLE_PCSCD` environment variable to disable pcscd service.
+- Added `DISABLE_B25_TEST` environment variable to disable B25 test decoder installation.
 - Updated `docker-compose.yml` - For testing purposes, all devices can be accessed without setting "devices" by default.
+  - **The previous default setting required a restart of the container when the card reader's USB was unplugged and plugged in, but the new default setting restores it automatically.** please check the [docker-compose.yml](docker/docker-compose.yml).
+  - **以前のデフォルト設定では、カードリーダーの USB を抜き差しすると、コンテナの再起動が必要でしたが、今回のデフォルト設定では、自動的に復旧するようになりました。** 設定例は [docker-compose.yml](docker/docker-compose.yml) をご確認ください。
 
 ## 4.0.0-beta.12 (2025-03-21)
 

package/api.d.ts

@@ -216,6 +216,37 @@ export interface TunerProcess {
     pid: number;
 }
 
+export interface JobScheduleItem {
+    key: string;
+    schedule: string;
+    job: Pick<JobItem, "key" | "name">;
+}
+
+export interface JobItem {
+    key: string;
+    name: string;
+    id: string;
+    status: "queued" | "standby" | "running" | "finished";
+    retryCount: number;
+
+    retryOnAbort?: boolean;
+    retryOnFail?: boolean;
+    retryMax?: number;
+    retryDelay?: number;
+
+    isAborting: boolean;
+    hasAborted?: boolean;
+    hasSkipped?: boolean;
+    hasFailed?: boolean;
+    error?: string;
+
+    createdAt: number;
+    updatedAt: number;
+    startedAt?: number;
+    finishedAt?: number;
+    duration?: number;
+}
+
 export interface Event<T = any> {
     resource: EventResource;
     type: EventType;
@@ -223,7 +254,7 @@ export interface Event<T = any> {
     time: UnixtimeMS;
 }
 
-export type EventResource = "program" | "service" | "tuner";
+export type EventResource = "program" | "service" | "tuner" | "job" | "job_schedule";
 
 export type EventType = "create" | "update" | "remove";
 
@@ -236,8 +267,8 @@ export interface ConfigServer {
     maxLogHistory?: number;
     maxBufferBytesBeforeReady?: number;
     eventEndTimeout?: number;
-    programGCInterval?: number;
-    epgGatheringInterval?: number;
+    programGCJobSchedule?: string;
+    epgGatheringJobSchedule?: string;
     epgRetrievalTime?: number;
     logoDataInterval?: number;
     disableEITParsing?: boolean;

package/api.yml

@@ -406,6 +406,86 @@ definitions:
       pid:
         type: integer
 
+  # job -----------------------------------------------------------------------
+
+  JobScheduleItem:
+    type: object
+    required:
+      - key
+      - schedule
+      - job
+    properties:
+      key:
+        type: string
+      schedule:
+        type: string
+      job:
+        type: object
+        required:
+          - key
+          - name
+        properties:
+          key:
+            type: string
+          name:
+            type: string
+
+  JobItem:
+    type: object
+    required:
+      - key
+      - name
+      - id
+      - status
+      - retryCount
+      - isAborting
+      - createdAt
+      - updatedAt
+    properties:
+      key:
+        type: string
+      name:
+        type: string
+      id:
+        type: string
+      status:
+        type: string
+        enum:
+          - queued
+          - standby
+          - running
+          - finished
+      retryCount:
+        type: integer
+      retryOnAbort:
+        type: boolean
+      retryOnFail:
+        type: boolean
+      retryMax:
+        type: integer
+      retryDelay:
+        type: integer
+      isAborting:
+        type: boolean
+      hasAborted:
+        type: boolean
+      hasSkipped:
+        type: boolean
+      hasFailed:
+        type: boolean
+      error:
+        type: string
+      createdAt:
+        $ref: '#/definitions/UnixtimeMS'
+      updatedAt:
+        $ref: '#/definitions/UnixtimeMS'
+      startedAt:
+        $ref: '#/definitions/UnixtimeMS'
+      finishedAt:
+        $ref: '#/definitions/UnixtimeMS'
+      duration:
+        type: integer
+
   # event ---------------------------------------------------------------------
 
   Event:
@@ -466,10 +546,10 @@ definitions:
       eventEndTimeout:
         type: integer
         minimum: 0
-      programGCInterval:
-        type: integer
-      epgGatheringInterval:
-        type: integer
+      programGCJobSchedule:
+        type: string
+      epgGatheringJobSchedule:
+        type: string
       epgRetrievalTime:
         type: integer
       logoDataInterval:

package/doc/Configuration.ja.md

@@ -1,3 +1,5 @@
+[**English**](Configuration.md) | [**日本語**](Configuration.ja.md)
+
 # 設定
 
 - 🗒️[server.yml](#serveryml) - サーバー設定
@@ -26,8 +28,8 @@
 | `disableIPv6` | - | Boolean | `false` | IPv6の無効化 **※Docker では常に無効** |
 | `maxBufferBytesBeforeReady` | `MAX_BUFFER_BYTES_BEFORE_READY` | Integer | `8388608` | 準備完了前の最大バッファサイズ (バイト)<br>**※番組開始の頭が欠ける場合は増やす** |
 | `eventEndTimeout` | `EVENT_END_TIMEOUT` | Integer | `1000` | イベント終了タイムアウト (ミリ秒)<br>**※番組終了が誤判定される場合は長くする** |
-| `programGCInterval` | `PROGRAM_GC_INTERVAL` | Integer | `3600000` | 番組一覧の GC 間隔 (ミリ秒) |
-| `epgGatheringInterval` | `EPG_GATHERING_INTERVAL` | Integer | `1800000` | EPG 収集間隔 (ミリ秒) |
+| `programGCJobSchedule` | `PROGRAM_GC_JOB_SCHEDULE` | String | `45 * * * *` | 番組一覧の GC スケジュール (cron 風形式) |
+| `epgGatheringJobSchedule` | `EPG_GATHERING_JOB_SCHEDULE` | String | `20,50 * * * *` | EPG 収集スケジュール (cron 風形式) |
 | `epgRetrievalTime` | `EPG_RETRIEVAL_TIME` | Integer | `600000` | EPG 取得時間 (ミリ秒) |
 | `logoDataInterval` | `LOGO_DATA_INTERVAL` | Integer | `604800000` | ロゴデータ更新間隔 (ミリ秒) |
 | `disableEITParsing` | `DISABLE_EIT_PARSING` | Boolean | `false` | ⚠️EIT パースの無効化 |

package/doc/Configuration.md

@@ -1,3 +1,5 @@
+[**English**](Configuration.md) | [**日本語**](Configuration.ja.md)
+
 # Configuration
 
 - 🗒️[server.yml](#serveryml) - Server Configuration
@@ -26,8 +28,8 @@
 | `disableIPv6` | - | Boolean | `false` | Disable IPv6 **※Always disabled in Docker** |
 | `maxBufferBytesBeforeReady` | `MAX_BUFFER_BYTES_BEFORE_READY` | Integer | `8388608` | Maximum buffer size before ready (bytes)<br>**※Increase if the beginning of the program is missing** |
 | `eventEndTimeout` | `EVENT_END_TIMEOUT` | Integer | `1000` | Event end timeout (milliseconds)<br>**※Increase if program end is incorrectly detected** |
-| `programGCInterval` | `PROGRAM_GC_INTERVAL` | Integer | `3600000` | Program list GC interval (milliseconds) |
-| `epgGatheringInterval` | `EPG_GATHERING_INTERVAL` | Integer | `1800000` | EPG gathering interval (milliseconds) |
+| `programGCJobSchedule` | `PROGRAM_GC_JOB_SCHEDULE` | String | `45 * * * *` | Program list GC schedule (cron-like format) |
+| `epgGatheringJobSchedule` | `EPG_GATHERING_JOB_SCHEDULE` | String | `20,50 * * * *` | EPG gathering schedule (cron-like format) |
 | `epgRetrievalTime` | `EPG_RETRIEVAL_TIME` | Integer | `600000` | EPG retrieval time (milliseconds) |
 | `logoDataInterval` | `LOGO_DATA_INTERVAL` | Integer | `604800000` | Logo data update interval (milliseconds) |
 | `disableEITParsing` | `DISABLE_EIT_PARSING` | Boolean | `false` | ⚠️Disable EIT parsing |

package/doc/Platforms.ja.md

@@ -1,3 +1,5 @@
+[**English**](Platforms.md) | [**日本語**](Platforms.ja.md)
+
 # プラットフォーム / 環境構築手順
 
 ## 概要
@@ -10,7 +12,7 @@
   - **Ubuntu Server 24.10** / 他
   - ⚠️注意: デスクトップ環境 / VM (仮想マシン) はサポートせず、不安定です!
 
-- [Linux + PM2 (レガシー)](#linux-w-pm2-legacy)
+- [Linux + PM2 (レガシー)](#linux--pm2-レガシー)
   - [Node.js](https://nodejs.org/en/download) `^18 || ^20 || ^22`
   - [PM2](https://pm2.keymetrics.io/)
 
@@ -140,7 +142,7 @@ docker compose logs [-f]
 ### ⚡設定
 
 - 主要な設定は Web UI から変更できます
-- 全ての設定は [Configuration.md](Configuration.md) を参照してください
+- 全ての設定は [Configuration.md](Configuration.ja.md) を参照してください
 
 ```
 vim /opt/mirakurun/config/server.yml
@@ -176,7 +178,7 @@ vim /opt/mirakurun/config/channels.yml
   - `bin/`
   - `bin/startup` - カスタム起動スクリプト (オプション)
 
-## PM2を使用したLinux (レガシー)
+## Linux + PM2 (レガシー)
 
 この方法は推奨されませんが、一部の古いユースケースの為に残されています。
 PM2 に特別対応するコードはすでに削除されており、エクスペリエンスは低下します。

package/doc/Platforms.md

@@ -1,3 +1,5 @@
+[**English**](Platforms.md) | [**日本語**](Platforms.ja.md)
+
 # Notes and Instructions on Platform Support
 
 ## Overview

package/lib/Mirakurun/Channel.d.ts

@@ -2,7 +2,7 @@ import * as apid from "../../api";
 import ChannelItem from "./ChannelItem";
 export declare class Channel {
     private _items;
-    private _epgGatheringInterval;
+    private _startup;
     constructor();
     get items(): ChannelItem[];
     add(item: ChannelItem): void;

package/lib/Mirakurun/Channel.js

@@ -37,18 +37,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channel = void 0;
+const common = __importStar(require("./common"));
 const log = __importStar(require("./log"));
 const _1 = __importDefault(require("./_"));
 const status_1 = __importDefault(require("./status"));
-const queue_1 = __importDefault(require("./queue"));
 const ChannelItem_1 = __importDefault(require("./ChannelItem"));
 class Channel {
     _items = [];
-    _epgGatheringInterval = _1.default.config.server.epgGatheringInterval || 1000 * 60 * 30;
+    _startup = true;
     constructor() {
         this._load();
         if (_1.default.config.server.disableEITParsing !== true) {
-            setTimeout(this._epgGatherer.bind(this), 1000 * 60);
+            const epgJob = {
+                key: "EPG.Gatherer",
+                name: "EPG Gatherer",
+                fn: () => this._epgGatherer()
+            };
+            _1.default.job.add({
+                ...epgJob,
+                readyFn: async () => {
+                    await common.sleep(1000 * 60);
+                    return true;
+                }
+            });
+            _1.default.job.addSchedule({
+                key: epgJob.key,
+                schedule: _1.default.config.server.epgGatheringJobSchedule || "20,50 * * * *",
+                job: epgJob
+            });
         }
     }
     get items() {
@@ -145,38 +161,54 @@ class Channel {
             if (_1.default.tuner.typeExists(channel.type) === false) {
                 return;
             }
-            const pre = this.get(channel.type, channel.channel);
-            if (pre) {
+            if (!this.get(channel.type, channel.channel)) {
                 if (channel.serviceId) {
-                    pre.addService(channel.serviceId);
-                }
-            }
-            else {
-                if (channel.type !== "GR") {
                     channel.name = `${channel.type}:${channel.channel}`;
                 }
                 this.add(new ChannelItem_1.default(channel));
             }
         });
     }
-    _epgGatherer() {
-        queue_1.default.add(async () => {
-            const networkIds = [...new Set(_1.default.service.items.map(item => item.networkId))];
-            networkIds.forEach(networkId => {
-                const services = _1.default.service.findByNetworkId(networkId);
-                if (services.length === 0) {
-                    return;
-                }
-                const service = services[0];
-                queue_1.default.add(async () => {
+    async _epgGatherer() {
+        const startup = this._startup;
+        if (this._startup === true) {
+            this._startup = false;
+        }
+        const networkIds = [...new Set(_1.default.service.items.map(item => item.networkId))];
+        for (const networkId of networkIds) {
+            const services = _1.default.service.findByNetworkId(networkId);
+            if (services.length === 0) {
+                continue;
+            }
+            const service = services[0];
+            _1.default.job.add({
+                key: `EPG.Gather.NID.${networkId}`,
+                name: `EPG Gather Network#${networkId}`,
+                fn: async () => {
+                    log.info("Network#%d EPG gathering has started", networkId);
+                    try {
+                        await _1.default.tuner.getEPG(service.channel);
+                        log.info("Network#%d EPG gathering has finished", networkId);
+                    }
+                    catch (e) {
+                        log.warn("Network#%d EPG gathering has failed [%s]", networkId, e);
+                        throw new Error("EPG gathering failed");
+                    }
+                },
+                readyFn: async () => {
+                    await common.sleep(100);
+                    if (status_1.default.epg[networkId] === true) {
+                        log.info("Network#%d EPG gathering is already in progress on another stream", networkId);
+                        return false;
+                    }
                     if (service.epgReady === true) {
                         const now = Date.now();
-                        if (now - service.epgUpdatedAt < this._epgGatheringInterval) {
-                            log.info("Network#%d EPG gathering has skipped by `epgGatheringInterval`", networkId);
-                            return;
+                        if (startup && now - service.epgUpdatedAt < 1000 * 60 * 10) {
+                            log.info("Network#%d EPG gathering has skipped because EPG is already up to date (in 10 mins)", networkId);
+                            return false;
                         }
-                        if (now - service.epgUpdatedAt > 1000 * 60 * 60 * 6) {
-                            log.info("Network#%d EPG gathering is resuming forcibly because reached maximum pause time", networkId);
+                        if (now - service.epgUpdatedAt > 1000 * 60 * 60 * 12) {
+                            log.info("Network#%d EPG gathering is resuming forcibly because reached maximum pause time (12 hours)", networkId);
                             service.epgReady = false;
                         }
                         else {
@@ -186,31 +218,16 @@ class Channel {
                                 const networkPrograms = _1.default.program.findByNetworkId(networkId);
                                 if (networkPrograms.length > 0) {
                                     log.info("Network#%d EPG gathering has skipped because broadcast is off", networkId);
-                                    return;
+                                    return false;
                                 }
                                 service.epgReady = false;
                             }
                         }
+                        return _1.default.tuner.readyForJob(service.channel);
                     }
-                    if (status_1.default.epg[networkId] === true) {
-                        log.info("Network#%d EPG gathering is already in progress on another stream", networkId);
-                        return;
-                    }
-                    log.info("Network#%d EPG gathering has started", networkId);
-                    try {
-                        await _1.default.tuner.getEPG(service.channel);
-                        log.info("Network#%d EPG gathering has finished", networkId);
-                    }
-                    catch (e) {
-                        log.warn("Network#%d EPG gathering has failed [%s]", networkId, e);
-                    }
-                });
-                log.debug("Network#%d EPG gathering has queued", networkId);
-            });
-            queue_1.default.add(async () => {
-                setTimeout(this._epgGatherer.bind(this), this._epgGatheringInterval);
+                }
             });
-        });
+        }
     }
 }
 exports.Channel = Channel;

package/lib/Mirakurun/Channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../src/Mirakurun/Channel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../src/Mirakurun/Channel.ts"],"names":[],"mappings":"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"}

package/lib/Mirakurun/ChannelItem.d.ts

@@ -10,8 +10,6 @@ export default class ChannelItem {
     readonly tsmfRelTs: number;
     readonly commandVars: apid.ConfigChannelsItem["commandVars"];
     constructor(config: apid.ConfigChannelsItem);
-    addService(serviceId: number): void;
     getServices(): ServiceItem[];
     getStream(user: common.User, output: stream.Writable): Promise<TSFilter>;
-    serviceScan(add: boolean): void;
 }

package/lib/Mirakurun/ChannelItem.js

@@ -1,45 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = __importDefault(require("./_"));
-const queue_1 = __importDefault(require("./queue"));
-const log = __importStar(require("./log"));
-const ServiceItem_1 = __importDefault(require("./ServiceItem"));
 class ChannelItem {
     name;
     type;
@@ -52,47 +16,6 @@ class ChannelItem {
         this.channel = config.channel;
         this.tsmfRelTs = config.tsmfRelTs;
         this.commandVars = config.commandVars;
-        if (config.serviceId) {
-            this.addService(config.serviceId);
-        }
-        setTimeout(() => {
-            if (!config.serviceId && this.getServices().length === 0) {
-                this.serviceScan(true);
-            }
-            else {
-                setTimeout(() => this.serviceScan(false), 180000);
-            }
-        }, 3000);
-    }
-    addService(serviceId) {
-        if (!_1.default.service) {
-            process.nextTick(() => this.addService(serviceId));
-            return;
-        }
-        if (_1.default.service.findByChannel(this).some(service => service.serviceId === serviceId) === true) {
-            return;
-        }
-        log.debug("ChannelItem#'%s' serviceId=%d check has queued", this.name, serviceId);
-        queue_1.default.add(async () => {
-            log.info("ChannelItem#'%s' serviceId=%d check has started", this.name, serviceId);
-            let services;
-            try {
-                services = await _1.default.tuner.getServices(this);
-            }
-            catch (e) {
-                log.warn("ChannelItem#'%s' serviceId=%d check has failed [%s]", this.name, serviceId, e);
-                setTimeout(() => this.addService(serviceId), 180000);
-                return;
-            }
-            const service = services.find(service => service.serviceId === serviceId);
-            if (!service) {
-                log.warn("ChannelItem#'%s' serviceId=%d check has failed [no service]", this.name, serviceId);
-                setTimeout(() => this.addService(serviceId), 3600000);
-                return;
-            }
-            log.debug("ChannelItem#'%s' serviceId=%d: %s", this.name, serviceId, JSON.stringify(service, null, "  "));
-            _1.default.service.add(new ServiceItem_1.default(this, service.networkId, service.serviceId, service.name, service.type, service.logoId));
-        });
     }
     getServices() {
         return _1.default.service.findByChannel(this);
@@ -100,37 +23,6 @@ class ChannelItem {
     getStream(user, output) {
         return _1.default.tuner.initChannelStream(this, user, output);
     }
-    serviceScan(add) {
-        log.debug("ChannelItem#'%s' service scan has queued", this.name);
-        queue_1.default.add(async () => {
-            log.info("ChannelItem#'%s' service scan has started", this.name);
-            let services;
-            try {
-                services = await _1.default.tuner.getServices(this);
-            }
-            catch (e) {
-                log.warn("ChannelItem#'%s' service scan has failed [%s]", this.name, e);
-                setTimeout(() => this.serviceScan(add), add ? 180000 : 3600000);
-                return;
-            }
-            log.debug("ChannelItem#'%s' services: %s", this.name, JSON.stringify(services, null, "  "));
-            services.forEach(service => {
-                const item = _1.default.service.get(service.networkId, service.serviceId);
-                if (item !== null) {
-                    item.name = service.name;
-                    item.type = service.type;
-                    if (service.logoId > -1) {
-                        item.logoId = service.logoId;
-                    }
-                    item.remoteControlKeyId = service.remoteControlKeyId;
-                }
-                else if (add === true) {
-                    _1.default.service.add(new ServiceItem_1.default(this, service.networkId, service.serviceId, service.name, service.type, service.logoId, service.remoteControlKeyId));
-                }
-            });
-            log.info("ChannelItem#'%s' service scan has finished", this.name);
-        });
-    }
 }
 exports.default = ChannelItem;
 //# sourceMappingURL=ChannelItem.js.map

package/lib/Mirakurun/ChannelItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChannelItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ChannelItem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChannelItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ChannelItem.ts"],"names":[],"mappings":";;;;;AAgBA,2CAAoB;AAMpB,MAAqB,WAAW;IACnB,IAAI,CAAS;IACb,IAAI,CAAmB;IACvB,OAAO,CAAS;IAChB,SAAS,CAAS;IAClB,WAAW,CAAyC;IAE7D,YAAY,MAA+B;QACvC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IAC1C,CAAC;IAED,WAAW;QACP,OAAO,UAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,SAAS,CAAC,IAAiB,EAAE,MAAuB;QAChD,OAAO,UAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;CACJ;AAtBD,8BAsBC"}