mirakurun 3.9.0-beta.1 → 3.9.0-beta.13

package/CHANGELOG.md

@@ -8,6 +8,7 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
 
 ### Server Changes
 
+- **config/server**: Add `disableWebUI` (Env: `DISABLE_WEB_UI` for Docker) to disable Web UI.
 - **config/server**: Change several default values based on typical usage.
   - `programGCInterval`: `900000` (15 mins) → `3600000` (1 hour)
   - `epgGatheringInterval`: `900000` (15 mins) → `1800000` (30 mins)
@@ -15,34 +16,46 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
 - **config/server**: Remove `overflowTimeLimit`.
 - **ts-filter**: Remove own overflow handling as it no longer makes sense.
 - **ts-filter**: Fix memory leak when comparing CRC of broken PAT packet processing. (bug)
+- **ts-filter**: Fix a problem in which the _close() function sometimes didn't call properly when the tuner was intercepted. (bug)
 - **ts-filter**: Change EIT\[p/f\] information to use in EPG.
+- **tuner-device**: Fixed a problem which the command didn't respawn ​correctly when it terminated unexpectedly. (bug)
 - **epg**: Add support for multiple EIT types.
 - **epg**: Fix wrong event group processing. (bug)
 - **epg**: Add support for event relay.
 - **epg**: Add support for multi track audios.
 - **epg**: Improve performance of parsing start_time of events.
-- **epg**: Change to run asynchronously to reduce load.
 - **program**: Add event group type as `type` to `db.ProgramRelatedItem` of `db.Program`.
 - **program**: Fixed a problem in the implementation of conflict detection. (bug)
 - **program**: Reduced the frequent repeated update events.
 - **program**: Removed the `audio` property and added the `audios` property to support multi track audios. (**breaking change**)
+- **program**: Fix program overlapping when re-scheduled. (bug)
+- **program**: Removed the `redefine` event and added the `remove` event. (**breaking change**)
 - **api/iptv**: Fixed a problem with Kodi 19's IPTV feature that caused channel selection to take a long time. [#101](https://github.com/Chinachu/Mirakurun/pull/101)
 - **api/getLogoImage**: Add `Cache-Control` header to cache logo images.
 - **api/restart**: Improved the restart speed on Docker. (approx. 2 secs)
 - **rpc**: Added a WebSocket RPC interface. (experimental)
 - **ui**: Now using RPC interface.
-- **ui**: Fix "EPG Gathering Network IDs" hex strings to upper case.
-- **ui**: Add "EPG Gathering Interval" setting in Config/Server.
+- **ui/status**: Fix "EPG Gathering Network IDs" hex strings to upper case.
+- **ui/status**: Fix handle tuner updates to correctly. (bug) [#109](https://github.com/Chinachu/Mirakurun/pull/109)
+- **ui/config**: Add "EPG Gathering Interval" setting in Config/Server.
+- **ui/heart**: Add confirmation before accessing opencollective. [#106](https://github.com/Chinachu/Mirakurun/issues/106)
+
+### Client Changes
+
+- Add [AbortSignal](https://nodejs.org/api/globals.html#class-abortsignal) option for `getChannelStream()`, `getServiceStreamByChannel()` `getServiceStream()`, `getProgramStream()`.
+- Fix set priority correctly. (bug)
 
 ### Docker Changes
 
-- Update base image to `node:16.6.2-buster-slim`.
+- Update base image to `node:16.12.0-buster-slim`.
 - Fixed the exit signal handling properly.
 - When a `SIGHUP` is received in a container, only the node process can be restarted quickly.
 
 ### Other Changes
 
+- **package**: Drop engine support `node@12`.
 - **package**: Update dependencies.
+- Reimplemented certain processes in C++.
 
 ## 3.8.0 (2021-08-10)
 

package/README.md

@@ -58,7 +58,7 @@ see: [doc/Platforms.md](doc/Platforms.md)
 
 ## Requirements / Supported Platforms
 
-* [Node.js](http://nodejs.org/) 12, 14, 16
+* [Node.js](http://nodejs.org/) 14, 16
 * Linux w/ [PM2](http://pm2.keymetrics.io/) or [Docker](https://hub.docker.com/r/chinachu/mirakurun)
 
 see: [doc/Platforms.md](doc/Platforms.md)

package/api.d.ts

@@ -220,7 +220,7 @@ export interface Event {
 
 export type EventResource = "program" | "service" | "tuner";
 
-export type EventType = "create" | "update" | "redefine";
+export type EventType = "create" | "update" | "remove";
 
 export interface ConfigServer {
     path?: string;
@@ -229,7 +229,6 @@ export interface ConfigServer {
     disableIPv6?: boolean;
     logLevel?: LogLevel;
     maxLogHistory?: number;
-    highWaterMark?: number;
     maxBufferBytesBeforeReady?: number;
     eventEndTimeout?: number;
     programGCInterval?: number;
@@ -237,6 +236,7 @@ export interface ConfigServer {
     epgRetrievalTime?: number;
     logoDataInterval?: number;
     disableEITParsing?: boolean;
+    disableWebUI?: boolean;
 }
 
 export enum LogLevel {

package/api.yml

@@ -448,7 +448,7 @@ definitions:
     enum:
       - create
       - update
-      - redefine
+      - remove
 
   # config --------------------------------------------------------------------
 
@@ -472,8 +472,6 @@ definitions:
       maxLogHistory:
         type: integer
         minimum: 0
-      highWaterMark:
-        type: integer
       maxBufferBytesBeforeReady:
         type: integer
       eventEndTimeout:
@@ -489,6 +487,8 @@ definitions:
         type: integer
       disableEITParsing:
         type: boolean
+      disableWebUI:
+        type: boolean
 
   ConfigTuners:
     type: array

package/doc/Configuration.md

@@ -19,7 +19,6 @@ path: /var/run/mirakurun.sock # string or ~ (null) *Ignored in Docker
 port: 40772 # integer or ~ (null) *Ignored in Docker
 hostname: localhost
 disableIPv6: false # boolean *Ignored in Docker
-highWaterMark: 25165824 # integer (bytes)
 maxBufferBytesBeforeReady: 8388608 # integer (bytes)
 eventEndTimeout: 1000 # integer (ms)
 programGCInterval: 3600000 # integer (ms)
@@ -27,6 +26,7 @@ epgGatheringInterval: 1800000 # integer (ms)
 epgRetrievalTime: 600000 # integer (ms)
 logoDataInterval: 604800000 # integer (ms)
 disableEITParsing: false # boolean
+disableWebUI: false # boolean
 ```
 
 ### Environment Values (Docker)
@@ -35,8 +35,6 @@ disableEITParsing: false # boolean
 HOSTNAME
 LOG_LEVEL
 MAX_LOG_HISTORY
-HIGH_WATER_MARK
-OVERFLOW_TIME_LIMIT
 MAX_BUFFER_BYTES_BEFORE_READY
 EVENT_END_TIMEOUT
 PROGRAM_GC_INTERVAL
@@ -44,6 +42,7 @@ EPG_GATHERING_INTERVAL
 EPG_RETRIEVAL_TIME
 LOGO_DATA_INTERVAL
 DISABLE_EIT_PARSING
+DISABLE_WEB_UI
 ```
 
 ## tuners.yml

package/doc/Platforms.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-**Bold** is the recommended. also, **Node.js** `^12 || ^14 || ^16` needed.
+**Bold** is the recommended. also, **Node.js** `^14.17.0 || ^16` needed.
 
 * [**Docker on Linux**](#docker-on-linux)
   * [Docker Engine](https://docs.docker.com/engine/install/) `>=18.06.0`
@@ -144,6 +144,9 @@ $ vim /usr/local/mirakurun/config/tuners.yml
 ### Install / Update
 
 ```sh
+# for building C++ addons (Debian / Ubuntu)
+sudo apt install build-essential
+
 # PM2 (Process Manager)
 sudo npm install pm2 -g
 

package/docker/docker-compose.yml

@@ -18,7 +18,7 @@ services:
       # DEBUG: "true"
     ports:
       - 40772:40772
-      - 9229:9229
+      # - 9229:9229
     devices:
       - /dev/bus:/dev/bus
       - /dev/dvb:/dev/dvb

package/lib/Mirakurun/Channel.d.ts

@@ -1,9 +1,6 @@
 import * as common from "./common";
 import ChannelItem from "./ChannelItem";
 export default class Channel {
-    static get(type: common.ChannelType, channel: string): ChannelItem;
-    static findByType(type: common.ChannelType): ChannelItem[];
-    static all(): ChannelItem[];
     private _items;
     private _epgGatheringInterval;
     constructor();

package/lib/Mirakurun/Channel.js

@@ -5,7 +5,6 @@ const _1 = require("./_");
 const status_1 = require("./status");
 const queue_1 = require("./queue");
 const ChannelItem_1 = require("./ChannelItem");
-const Tuner_1 = require("./Tuner");
 class Channel {
     constructor() {
         this._items = [];
@@ -15,15 +14,6 @@ class Channel {
             setTimeout(this._epgGatherer.bind(this), 1000 * 60);
         }
     }
-    static get(type, channel) {
-        return _1.default.channel.get(type, channel);
-    }
-    static findByType(type) {
-        return _1.default.channel.findByType(type);
-    }
-    static all() {
-        return _1.default.channel.items;
-    }
     get items() {
         return this._items;
     }
@@ -98,7 +88,7 @@ class Channel {
             if (channel.isDisabled === true) {
                 return;
             }
-            if (Tuner_1.default.typeExists(channel.type) === false) {
+            if (_1.default.tuner.typeExists(channel.type) === false) {
                 return;
             }
             const pre = this.get(channel.type, channel.channel);
@@ -154,7 +144,7 @@ class Channel {
                     }
                     log.info("Network#%d EPG gathering has started", networkId);
                     try {
-                        await Tuner_1.default.getEPG(service.channel);
+                        await _1.default.tuner.getEPG(service.channel);
                         log.info("Network#%d EPG gathering has finished", networkId);
                     }
                     catch (e) {

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":";;AAgBA,6BAA6B;AAC7B,0BAAoB;AACpB,qCAA8B;AAC9B,mCAA4B;AAC5B,+CAAwC;AAExC,MAAqB,OAAO;IAKxB;QAHQ,WAAM,GAAkB,EAAE,CAAC;QAC3B,0BAAqB,GAAW,UAAC,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,IAAI,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;QAI3F,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,UAAC,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,KAAK,IAAI,EAAE;YAC5C,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;SACvD;IACL,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAiB;QAEjB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;IACL,CAAC;IAED,GAAG,CAAC,IAAwB,EAAE,OAAe;QAEzC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACxB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE;gBACpE,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACzB;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAwB;QAE/B,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACxB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC9B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9B;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK;QAET,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAEjC,MAAM,QAAQ,GAAG,UAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAE5B,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,GAAG,CAAC,KAAK,CAAC,6DAA6D,EAAE,CAAC,CAAC,CAAC;gBAC5E,OAAO;aACV;YAED,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;gBACnG,GAAG,CAAC,KAAK,CAAC,kEAAkE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC/F,OAAO;aACV;YAED,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACrC,GAAG,CAAC,KAAK,CAAC,qEAAqE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBACxC,GAAG,CAAC,IAAI,CAAC,8FAA8F,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnH,OAAQ,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;aAChD;YAED,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE;gBAC5D,GAAG,CAAC,KAAK,CAAC,uEAAuE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;gBACpD,GAAG,CAAC,KAAK,CAAC,mEAAmE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAChE,GAAG,CAAC,KAAK,CAAC,kEAAkE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC/F,OAAO;aACV;YAED,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,GAAG,IAAI,OAAO,CAAC,QAAQ,KAAK,GAAG,EAAE;gBAC1E,GAAG,CAAC,KAAK,CAAC,sEAAsE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE;gBAC5D,GAAG,CAAC,KAAK,CAAC,uEAAuE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE;gBAC5D,GAAG,CAAC,KAAK,CAAC,uEAAuE,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpG,OAAO;aACV;YAED,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;gBAC7B,OAAO;aACV;YAED,IAAI,UAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;gBAC5C,OAAO;aACV;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,GAAG,EAAE;gBACL,IAAI,OAAO,CAAC,SAAS,EAAE;oBACnB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACrC;aACJ;iBAAM;gBACH,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE;oBAChB,OAAQ,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;iBAC/D;gBACD,IAAI,CAAC,GAAG,CAAC,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAC,CAAC;aACtC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,YAAY;QAEhB,eAAK,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAEjB,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,UAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAE7E,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAE3B,MAAM,QAAQ,GAAG,UAAC,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAEtD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvB,OAAO;iBACV;gBACD,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAE5B,eAAK,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;oBAEjB,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;wBAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBACvB,IAAI,GAAG,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE;4BACzD,GAAG,CAAC,IAAI,CAAC,gEAAgE,EAAE,SAAS,CAAC,CAAC;4BACtF,OAAO;yBACV;wBACD,IAAI,GAAG,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;4BACjD,GAAG,CAAC,IAAI,CAAC,kFAAkF,EAAE,SAAS,CAAC,CAAC;4BACxG,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;yBAC5B;6BAAM;4BACH,MAAM,eAAe,GAAG,UAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,SAAS,EAAE,GAAG,CAAC;iCACnE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;4BAClE,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;gCAC9B,MAAM,eAAe,GAAG,UAAC,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gCAC7D,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oCAC5B,GAAG,CAAC,IAAI,CAAC,+DAA+D,EAAE,SAAS,CAAC,CAAC;oCACrF,OAAO;iCACV;gCACD,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;6BAC5B;yBACJ;qBACJ;oBAED,IAAI,gBAAM,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;wBAChC,GAAG,CAAC,IAAI,CAAC,mEAAmE,EAAE,SAAS,CAAC,CAAC;wBACzF,OAAO;qBACV;oBAED,GAAG,CAAC,IAAI,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAC;oBAE5D,IAAI;wBACA,MAAM,UAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBACtC,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,SAAS,CAAC,CAAC;qBAChE;oBAAC,OAAO,CAAC,EAAE;wBACR,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;qBACtE;gBACL,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,SAAS,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YAEH,eAAK,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACjB,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAlMD,0BAkMC"}

package/lib/Mirakurun/ChannelItem.d.ts

@@ -3,6 +3,7 @@ import * as stream from "stream";
 import * as common from "./common";
 import * as config from "./config";
 import ServiceItem from "./ServiceItem";
+import TSFilter from "./TSFilter";
 export default class ChannelItem {
     private _name;
     private _type;
@@ -24,6 +25,6 @@ export default class ChannelItem {
     toJSON(): config.Channel;
     addService(serviceId: number): void;
     getServices(): ServiceItem[];
-    getStream(user: common.User): Promise<stream.Readable>;
+    getStream(user: common.User, output: stream.Writable): Promise<TSFilter>;
     serviceScan(add: boolean): void;
 }

package/lib/Mirakurun/ChannelItem.js

@@ -95,8 +95,8 @@ class ChannelItem {
     getServices() {
         return _1.default.service.findByChannel(this);
     }
-    getStream(user) {
-        return _1.default.tuner.getChannelStream(this, user);
+    getStream(user, output) {
+        return _1.default.tuner.initChannelStream(this, user, output);
     }
     serviceScan(add) {
         log.debug("ChannelItem#'%s' service scan has queued", this._name);

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":"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"}

package/lib/Mirakurun/EPG.d.ts

@@ -1,9 +1,6 @@
+import { EIT } from "@chinachu/aribts/lib/table/eit";
 export default class EPG {
     private _epg;
-    private _queue;
-    private _running;
-    private _end;
-    write(eit: any): void;
+    write(eit: EIT): void;
     end(): void;
-    private _run;
 }

package/lib/Mirakurun/EPG.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Program_1 = require("./Program");
 const common_1 = require("./common");
 const _1 = require("./_");
-const aribts = require("aribts");
-const TsChar = aribts.TsChar;
+const aribts_1 = require("@chinachu/aribts");
 const STREAM_CONTENT = {
     1: "mpeg2",
     5: "h.264",
@@ -72,31 +71,8 @@ const ISO_639_LANG_CODE = {
 class EPG {
     constructor() {
         this._epg = {};
-        this._queue = [];
-        this._running = false;
-        this._end = false;
     }
     write(eit) {
-        if (!this._epg) {
-            return;
-        }
-        this._queue.push(eit);
-        if (!this._running) {
-            this._run();
-        }
-    }
-    end() {
-        this._end = true;
-        if (this._epg && this._queue.length === 0 && this._running === false) {
-            delete this._epg;
-        }
-    }
-    async _run() {
-        if (!this._epg || this._running || this._queue.length === 0) {
-            return;
-        }
-        this._running = true;
-        const eit = this._queue.shift();
         const networkId = eit.original_network_id;
         if (!this._epg[networkId]) {
             this._epg[networkId] = {};
@@ -108,7 +84,7 @@ class EPG {
         for (const e of eit.events) {
             let state;
             if (!service[e.event_id]) {
-                const id = Program_1.getProgramItemId(networkId, eit.service_id, e.event_id);
+                const id = (0, Program_1.getProgramItemId)(networkId, eit.service_id, e.event_id);
                 let programItem = _1.default.program.get(id);
                 if (!programItem) {
                     if (UNKNOWN_START_TIME.compare(e.start_time) === 0) {
@@ -119,8 +95,8 @@ class EPG {
                         eventId: e.event_id,
                         serviceId: eit.service_id,
                         networkId: networkId,
-                        startAt: getTime(e.start_time),
-                        duration: UNKNOWN_DURATION.compare(e.duration) === 0 ? 1 : getTimeFromBCD24(e.duration),
+                        startAt: (0, common_1.getTimeFromMJD)(e.start_time),
+                        duration: UNKNOWN_DURATION.compare(e.duration) === 0 ? 1 : (0, common_1.getTimeFromBCD24)(e.duration),
                         isFree: e.free_CA_mode === 0,
                         _pf: eit.table_id === 0x4E || eit.table_id === 0x4F || undefined
                     };
@@ -161,8 +137,8 @@ class EPG {
                     state.version[eit.table_id] = eit.version_number;
                     if (UNKNOWN_START_TIME.compare(e.start_time) !== 0) {
                         _1.default.program.set(state.program.id, {
-                            startAt: getTime(e.start_time),
-                            duration: UNKNOWN_DURATION.compare(e.duration) === 0 ? 1 : getTimeFromBCD24(e.duration),
+                            startAt: (0, common_1.getTimeFromMJD)(e.start_time),
+                            duration: UNKNOWN_DURATION.compare(e.duration) === 0 ? 1 : (0, common_1.getTimeFromBCD24)(e.duration),
                             isFree: e.free_CA_mode === 0,
                             _pf: eit.table_id === 0x4E || eit.table_id === 0x4F || undefined
                         });
@@ -177,8 +153,8 @@ class EPG {
                         }
                         state.short.version[eit.table_id] = eit.version_number;
                         _1.default.program.set(state.program.id, {
-                            name: new TsChar(d.event_name_char).decode(),
-                            description: new TsChar(d.text_char).decode()
+                            name: new aribts_1.TsChar(d.event_name_char).decode(),
+                            description: new aribts_1.TsChar(d.text_char).decode()
                         });
                         break;
                     case 0x4E:
@@ -208,15 +184,15 @@ class EPG {
                                 for (const desc of descs) {
                                     const key = desc.item_description_length === 0
                                         ? current
-                                        : new TsChar(desc.item_description_char).decode();
+                                        : new aribts_1.TsChar(desc.item_description_char).decode();
                                     current = key;
                                     extended[key] = extended[key] ?
                                         Buffer.concat([extended[key], desc.item_char]) :
-                                        Buffer.from(desc.item_char);
+                                        desc.item_char;
                                 }
                             }
                             for (const key of Object.keys(extended)) {
-                                extended[key] = new TsChar(extended[key]).decode();
+                                extended[key] = new aribts_1.TsChar(extended[key]).decode();
                             }
                             _1.default.program.set(state.program.id, {
                                 extended: extended
@@ -279,11 +255,11 @@ class EPG {
                                 repeat: d.repeat_label,
                                 pattern: d.program_pattern,
                                 expiresAt: d.expire_date_valid_flag === 1 ?
-                                    getTime(Buffer.from(d.expire_date.toString(16), "hex")) :
+                                    (0, common_1.getTimeFromMJD)(Buffer.from(d.expire_date.toString(16), "hex")) :
                                     -1,
                                 episode: d.episode_number,
                                 lastEpisode: d.last_episode_number,
-                                name: new TsChar(d.series_name_char).decode()
+                                name: new aribts_1.TsChar(d.series_name_char).decode()
                             }
                         });
                         break;
@@ -301,14 +277,11 @@ class EPG {
                         break;
                 }
             }
-            await common_1.sleep(10);
-        }
-        this._running = false;
-        if (this._end && this._queue.length === 0) {
-            this.end();
         }
-        if (this._queue.length > 0) {
-            this._run();
+    }
+    end() {
+        if (this._epg) {
+            delete this._epg;
         }
     }
 }
@@ -330,19 +303,6 @@ function isOutOfDateLv2(eit, versionDict, lv2) {
     }
     return versionDict[eit.table_id][lv2] !== eit.version_number;
 }
-function getTime(buffer) {
-    const mjd = (buffer[0] << 8) | buffer[1];
-    const h = (buffer[2] >> 4) * 10 + (buffer[2] & 0x0F);
-    const i = (buffer[3] >> 4) * 10 + (buffer[3] & 0x0F);
-    const s = (buffer[4] >> 4) * 10 + (buffer[4] & 0x0F);
-    return ((mjd - 40587) * 86400 + ((h - 9) * 60 * 60) + (i * 60) + s) * 1000;
-}
-function getTimeFromBCD24(buffer) {
-    let time = ((buffer[0] >> 4) * 10 + (buffer[0] & 0x0F)) * 3600;
-    time += ((buffer[1] >> 4) * 10 + (buffer[1] & 0x0F)) * 60;
-    time += (buffer[2] >> 4) * 10 + (buffer[2] & 0x0F);
-    return time * 1000;
-}
 function getGenre(content) {
     return {
         lv1: content.content_nibble_level_1,

package/lib/Mirakurun/EPG.js.map

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

package/lib/Mirakurun/Event.d.ts

@@ -6,7 +6,7 @@ export interface EventMessage<T = any> {
     readonly time: number;
 }
 export declare type EventResource = "program" | "service" | "tuner";
-export declare type EventType = "create" | "update" | "redefine";
+export declare type EventType = "create" | "update" | "remove";
 export default class Event extends EventEmitter {
     static get log(): EventMessage[];
     static onEvent(listener: (message: EventMessage) => void): void;

package/lib/Mirakurun/Program.d.ts

@@ -1,10 +1,6 @@
 import * as db from "./db";
 export declare function getProgramItemId(networkId: number, serviceId: number, eventId: number): number;
 export default class Program {
-    static get(id: number): db.Program;
-    static exists(id: number): boolean;
-    static findByQuery(query: object): db.Program[];
-    static all(): db.Program[];
     private _itemMap;
     private _saveTimerId;
     private _emitTimerId;
@@ -12,7 +8,7 @@ export default class Program {
     private _emitPrograms;
     private _programGCInterval;
     constructor();
-    get items(): db.Program[];
+    get itemMap(): Map<number, db.Program>;
     add(item: db.Program, firstAdd?: boolean): void;
     get(id: number): db.Program | null;
     set(id: number, props: Partial<db.Program>): void;
@@ -21,10 +17,10 @@ export default class Program {
     findByQuery(query: object): db.Program[];
     findByNetworkId(networkId: number): db.Program[];
     findByNetworkIdAndTime(networkId: number, time: number): db.Program[];
-    findConflicts(networkId: number, serviceId: number, start: number, end: number, _pf?: true): db.Program[];
     findByNetworkIdAndReplace(networkId: number, programs: db.Program[]): void;
     save(): void;
     private _load;
+    private _findAndRemoveConflicts;
     private _emit;
     private _save;
     private _gc;