mirakurun 3.9.0-beta.4 → 3.9.0-beta.8
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.
- package/CHANGELOG.md +6 -3
- package/api.d.ts +1 -1
- package/api.yml +2 -2
- package/doc/Configuration.md +2 -2
- package/doc/Platforms.md +3 -0
- package/lib/Mirakurun/Channel.d.ts +0 -3
- package/lib/Mirakurun/Channel.js +2 -12
- package/lib/Mirakurun/Channel.js.map +1 -1
- package/lib/Mirakurun/ChannelItem.d.ts +2 -1
- package/lib/Mirakurun/ChannelItem.js +2 -2
- package/lib/Mirakurun/ChannelItem.js.map +1 -1
- package/lib/Mirakurun/Program.d.ts +1 -5
- package/lib/Mirakurun/Program.js +5 -17
- package/lib/Mirakurun/Program.js.map +1 -1
- package/lib/Mirakurun/Server.js +14 -12
- package/lib/Mirakurun/Server.js.map +1 -1
- package/lib/Mirakurun/Service.d.ts +0 -8
- package/lib/Mirakurun/Service.js +0 -18
- package/lib/Mirakurun/Service.js.map +1 -1
- package/lib/Mirakurun/ServiceItem.d.ts +2 -1
- package/lib/Mirakurun/ServiceItem.js +2 -2
- package/lib/Mirakurun/ServiceItem.js.map +1 -1
- package/lib/Mirakurun/TSDecoder.d.ts +1 -0
- package/lib/Mirakurun/TSDecoder.js +3 -0
- package/lib/Mirakurun/TSDecoder.js.map +1 -1
- package/lib/Mirakurun/TSFilter.d.ts +10 -6
- package/lib/Mirakurun/TSFilter.js +25 -14
- package/lib/Mirakurun/TSFilter.js.map +1 -1
- package/lib/Mirakurun/Tuner.d.ts +6 -13
- package/lib/Mirakurun/Tuner.js +46 -67
- package/lib/Mirakurun/Tuner.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}/{channel}/services/{id}/stream.js +7 -9
- package/lib/Mirakurun/api/channels/{type}/{channel}/services/{id}/stream.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}/{channel}/services/{id}.js +3 -4
- package/lib/Mirakurun/api/channels/{type}/{channel}/services/{id}.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}/{channel}/services.js +2 -2
- package/lib/Mirakurun/api/channels/{type}/{channel}/services.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}/{channel}/stream.js +6 -7
- package/lib/Mirakurun/api/channels/{type}/{channel}/stream.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}/{channel}.js +2 -2
- package/lib/Mirakurun/api/channels/{type}/{channel}.js.map +1 -1
- package/lib/Mirakurun/api/channels/{type}.js +2 -2
- package/lib/Mirakurun/api/channels/{type}.js.map +1 -1
- package/lib/Mirakurun/api/channels.js +2 -2
- package/lib/Mirakurun/api/channels.js.map +1 -1
- package/lib/Mirakurun/api/config/channels/scan.js +2 -2
- package/lib/Mirakurun/api/config/channels/scan.js.map +1 -1
- package/lib/Mirakurun/api/iptv/discover.json.js +2 -2
- package/lib/Mirakurun/api/iptv/discover.json.js.map +1 -1
- package/lib/Mirakurun/api/iptv/lineup.json.js +2 -2
- package/lib/Mirakurun/api/iptv/lineup.json.js.map +1 -1
- package/lib/Mirakurun/api/iptv/playlist.js +2 -1
- package/lib/Mirakurun/api/iptv/playlist.js.map +1 -1
- package/lib/Mirakurun/api/iptv/xmltv.js +4 -4
- package/lib/Mirakurun/api/iptv/xmltv.js.map +1 -1
- package/lib/Mirakurun/api/programs/{id}/stream.js +7 -9
- package/lib/Mirakurun/api/programs/{id}/stream.js.map +1 -1
- package/lib/Mirakurun/api/programs/{id}.js +2 -2
- package/lib/Mirakurun/api/programs/{id}.js.map +1 -1
- package/lib/Mirakurun/api/programs.js +3 -3
- package/lib/Mirakurun/api/programs.js.map +1 -1
- package/lib/Mirakurun/api/services/{id}/logo.js +2 -1
- package/lib/Mirakurun/api/services/{id}/logo.js.map +1 -1
- package/lib/Mirakurun/api/services/{id}/stream.js +6 -7
- package/lib/Mirakurun/api/services/{id}/stream.js.map +1 -1
- package/lib/Mirakurun/api/services/{id}.js +2 -1
- package/lib/Mirakurun/api/services/{id}.js.map +1 -1
- package/lib/Mirakurun/api/services.js +2 -1
- package/lib/Mirakurun/api/services.js.map +1 -1
- package/lib/Mirakurun/api/status.js +3 -4
- package/lib/Mirakurun/api/status.js.map +1 -1
- package/lib/Mirakurun/api/tuners/{index}/process.js +3 -3
- package/lib/Mirakurun/api/tuners/{index}/process.js.map +1 -1
- package/lib/Mirakurun/api/tuners/{index}.js +2 -2
- package/lib/Mirakurun/api/tuners/{index}.js.map +1 -1
- package/lib/Mirakurun/api/tuners.js +2 -2
- package/lib/Mirakurun/api/tuners.js.map +1 -1
- package/lib/Mirakurun/common.d.ts +0 -1
- package/lib/Mirakurun/config.d.ts +1 -1
- package/lib/Mirakurun/config.js +4 -4
- package/lib/Mirakurun/config.js.map +1 -1
- package/lib/Mirakurun/rpc.js +2 -2
- package/lib/Mirakurun/rpc.js.map +1 -1
- package/lib/epgdump.js +2 -2
- package/lib/epgdump.js.map +1 -1
- package/lib/ui/index.js +79 -57
- package/lib/ui/index.js.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -8,6 +8,7 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
|
|
|
8
8
|
|
|
9
9
|
### Server Changes
|
|
10
10
|
|
|
11
|
+
- **config/server**: Add `disableWebUI` (Env: `DISABLE_WEB_UI` for Docker) to disable Web UI.
|
|
11
12
|
- **config/server**: Change several default values based on typical usage.
|
|
12
13
|
- `programGCInterval`: `900000` (15 mins) → `3600000` (1 hour)
|
|
13
14
|
- `epgGatheringInterval`: `900000` (15 mins) → `1800000` (30 mins)
|
|
@@ -33,12 +34,14 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
|
|
|
33
34
|
- **api/restart**: Improved the restart speed on Docker. (approx. 2 secs)
|
|
34
35
|
- **rpc**: Added a WebSocket RPC interface. (experimental)
|
|
35
36
|
- **ui**: Now using RPC interface.
|
|
36
|
-
- **ui**: Fix "EPG Gathering Network IDs" hex strings to upper case.
|
|
37
|
-
- **ui**:
|
|
37
|
+
- **ui/status**: Fix "EPG Gathering Network IDs" hex strings to upper case.
|
|
38
|
+
- **ui/status**: Fix handle tuner updates to correctly. (bug) [#109](https://github.com/Chinachu/Mirakurun/pull/109)
|
|
39
|
+
- **ui/config**: Add "EPG Gathering Interval" setting in Config/Server.
|
|
40
|
+
- **ui/heart**: Add confirmation before accessing opencollective. [#106](https://github.com/Chinachu/Mirakurun/issues/106)
|
|
38
41
|
|
|
39
42
|
### Docker Changes
|
|
40
43
|
|
|
41
|
-
- Update base image to `node:16.
|
|
44
|
+
- Update base image to `node:16.9.1-buster-slim`.
|
|
42
45
|
- Fixed the exit signal handling properly.
|
|
43
46
|
- When a `SIGHUP` is received in a container, only the node process can be restarted quickly.
|
|
44
47
|
|
package/api.d.ts
CHANGED
|
@@ -229,7 +229,6 @@ export interface ConfigServer {
|
|
|
229
229
|
disableIPv6?: boolean;
|
|
230
230
|
logLevel?: LogLevel;
|
|
231
231
|
maxLogHistory?: number;
|
|
232
|
-
highWaterMark?: number;
|
|
233
232
|
maxBufferBytesBeforeReady?: number;
|
|
234
233
|
eventEndTimeout?: number;
|
|
235
234
|
programGCInterval?: number;
|
|
@@ -237,6 +236,7 @@ export interface ConfigServer {
|
|
|
237
236
|
epgRetrievalTime?: number;
|
|
238
237
|
logoDataInterval?: number;
|
|
239
238
|
disableEITParsing?: boolean;
|
|
239
|
+
disableWebUI?: boolean;
|
|
240
240
|
}
|
|
241
241
|
|
|
242
242
|
export enum LogLevel {
|
package/api.yml
CHANGED
|
@@ -472,8 +472,6 @@ definitions:
|
|
|
472
472
|
maxLogHistory:
|
|
473
473
|
type: integer
|
|
474
474
|
minimum: 0
|
|
475
|
-
highWaterMark:
|
|
476
|
-
type: integer
|
|
477
475
|
maxBufferBytesBeforeReady:
|
|
478
476
|
type: integer
|
|
479
477
|
eventEndTimeout:
|
|
@@ -489,6 +487,8 @@ definitions:
|
|
|
489
487
|
type: integer
|
|
490
488
|
disableEITParsing:
|
|
491
489
|
type: boolean
|
|
490
|
+
disableWebUI:
|
|
491
|
+
type: boolean
|
|
492
492
|
|
|
493
493
|
ConfigTuners:
|
|
494
494
|
type: array
|
package/doc/Configuration.md
CHANGED
|
@@ -19,7 +19,6 @@ path: /var/run/mirakurun.sock # string or ~ (null) *Ignored in Docker
|
|
|
19
19
|
port: 40772 # integer or ~ (null) *Ignored in Docker
|
|
20
20
|
hostname: localhost
|
|
21
21
|
disableIPv6: false # boolean *Ignored in Docker
|
|
22
|
-
highWaterMark: 25165824 # integer (bytes)
|
|
23
22
|
maxBufferBytesBeforeReady: 8388608 # integer (bytes)
|
|
24
23
|
eventEndTimeout: 1000 # integer (ms)
|
|
25
24
|
programGCInterval: 3600000 # integer (ms)
|
|
@@ -27,6 +26,7 @@ epgGatheringInterval: 1800000 # integer (ms)
|
|
|
27
26
|
epgRetrievalTime: 600000 # integer (ms)
|
|
28
27
|
logoDataInterval: 604800000 # integer (ms)
|
|
29
28
|
disableEITParsing: false # boolean
|
|
29
|
+
disableWebUI: false # boolean
|
|
30
30
|
```
|
|
31
31
|
|
|
32
32
|
### Environment Values (Docker)
|
|
@@ -35,7 +35,6 @@ disableEITParsing: false # boolean
|
|
|
35
35
|
HOSTNAME
|
|
36
36
|
LOG_LEVEL
|
|
37
37
|
MAX_LOG_HISTORY
|
|
38
|
-
HIGH_WATER_MARK
|
|
39
38
|
MAX_BUFFER_BYTES_BEFORE_READY
|
|
40
39
|
EVENT_END_TIMEOUT
|
|
41
40
|
PROGRAM_GC_INTERVAL
|
|
@@ -43,6 +42,7 @@ EPG_GATHERING_INTERVAL
|
|
|
43
42
|
EPG_RETRIEVAL_TIME
|
|
44
43
|
LOGO_DATA_INTERVAL
|
|
45
44
|
DISABLE_EIT_PARSING
|
|
45
|
+
DISABLE_WEB_UI
|
|
46
46
|
```
|
|
47
47
|
|
|
48
48
|
## tuners.yml
|
package/doc/Platforms.md
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import * as common from "./common";
|
|
2
2
|
import ChannelItem from "./ChannelItem";
|
|
3
3
|
export default class Channel {
|
|
4
|
-
static get(type: common.ChannelType, channel: string): ChannelItem;
|
|
5
|
-
static findByType(type: common.ChannelType): ChannelItem[];
|
|
6
|
-
static all(): ChannelItem[];
|
|
7
4
|
private _items;
|
|
8
5
|
private _epgGatheringInterval;
|
|
9
6
|
constructor();
|
package/lib/Mirakurun/Channel.js
CHANGED
|
@@ -5,7 +5,6 @@ const _1 = require("./_");
|
|
|
5
5
|
const status_1 = require("./status");
|
|
6
6
|
const queue_1 = require("./queue");
|
|
7
7
|
const ChannelItem_1 = require("./ChannelItem");
|
|
8
|
-
const Tuner_1 = require("./Tuner");
|
|
9
8
|
class Channel {
|
|
10
9
|
constructor() {
|
|
11
10
|
this._items = [];
|
|
@@ -15,15 +14,6 @@ class Channel {
|
|
|
15
14
|
setTimeout(this._epgGatherer.bind(this), 1000 * 60);
|
|
16
15
|
}
|
|
17
16
|
}
|
|
18
|
-
static get(type, channel) {
|
|
19
|
-
return _1.default.channel.get(type, channel);
|
|
20
|
-
}
|
|
21
|
-
static findByType(type) {
|
|
22
|
-
return _1.default.channel.findByType(type);
|
|
23
|
-
}
|
|
24
|
-
static all() {
|
|
25
|
-
return _1.default.channel.items;
|
|
26
|
-
}
|
|
27
17
|
get items() {
|
|
28
18
|
return this._items;
|
|
29
19
|
}
|
|
@@ -98,7 +88,7 @@ class Channel {
|
|
|
98
88
|
if (channel.isDisabled === true) {
|
|
99
89
|
return;
|
|
100
90
|
}
|
|
101
|
-
if (
|
|
91
|
+
if (_1.default.tuner.typeExists(channel.type) === false) {
|
|
102
92
|
return;
|
|
103
93
|
}
|
|
104
94
|
const pre = this.get(channel.type, channel.channel);
|
|
@@ -154,7 +144,7 @@ class Channel {
|
|
|
154
144
|
}
|
|
155
145
|
log.info("Network#%d EPG gathering has started", networkId);
|
|
156
146
|
try {
|
|
157
|
-
await
|
|
147
|
+
await _1.default.tuner.getEPG(service.channel);
|
|
158
148
|
log.info("Network#%d EPG gathering has finished", networkId);
|
|
159
149
|
}
|
|
160
150
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../src/Mirakurun/Channel.ts"],"names":[],"mappings":";;AAgBA,6BAA6B;AAC7B,0BAAoB;AACpB,qCAA8B;AAC9B,mCAA4B;AAC5B,+CAAwC;
|
|
1
|
+
{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../src/Mirakurun/Channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import * as stream from "stream";
|
|
|
3
3
|
import * as common from "./common";
|
|
4
4
|
import * as config from "./config";
|
|
5
5
|
import ServiceItem from "./ServiceItem";
|
|
6
|
+
import TSFilter from "./TSFilter";
|
|
6
7
|
export default class ChannelItem {
|
|
7
8
|
private _name;
|
|
8
9
|
private _type;
|
|
@@ -24,6 +25,6 @@ export default class ChannelItem {
|
|
|
24
25
|
toJSON(): config.Channel;
|
|
25
26
|
addService(serviceId: number): void;
|
|
26
27
|
getServices(): ServiceItem[];
|
|
27
|
-
getStream(user: common.User): Promise<
|
|
28
|
+
getStream(user: common.User, output: stream.Writable): Promise<TSFilter>;
|
|
28
29
|
serviceScan(add: boolean): void;
|
|
29
30
|
}
|
|
@@ -95,8 +95,8 @@ class ChannelItem {
|
|
|
95
95
|
getServices() {
|
|
96
96
|
return _1.default.service.findByChannel(this);
|
|
97
97
|
}
|
|
98
|
-
getStream(user) {
|
|
99
|
-
return _1.default.tuner.
|
|
98
|
+
getStream(user, output) {
|
|
99
|
+
return _1.default.tuner.initChannelStream(this, user, output);
|
|
100
100
|
}
|
|
101
101
|
serviceScan(add) {
|
|
102
102
|
log.debug("ChannelItem#'%s' service scan has queued", this._name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ChannelItem.ts"],"names":[],"mappings":";;AAgBA,0BAAoB;AACpB,mCAA4B;AAE5B,6BAA6B;AAG7B,+CAAwC;
|
|
1
|
+
{"version":3,"file":"ChannelItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ChannelItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import * as db from "./db";
|
|
2
2
|
export declare function getProgramItemId(networkId: number, serviceId: number, eventId: number): number;
|
|
3
3
|
export default class Program {
|
|
4
|
-
static get(id: number): db.Program;
|
|
5
|
-
static exists(id: number): boolean;
|
|
6
|
-
static findByQuery(query: object): db.Program[];
|
|
7
|
-
static all(): db.Program[];
|
|
8
4
|
private _itemMap;
|
|
9
5
|
private _saveTimerId;
|
|
10
6
|
private _emitTimerId;
|
|
@@ -12,7 +8,7 @@ export default class Program {
|
|
|
12
8
|
private _emitPrograms;
|
|
13
9
|
private _programGCInterval;
|
|
14
10
|
constructor();
|
|
15
|
-
get
|
|
11
|
+
get itemMap(): Map<number, db.Program>;
|
|
16
12
|
add(item: db.Program, firstAdd?: boolean): void;
|
|
17
13
|
get(id: number): db.Program | null;
|
|
18
14
|
set(id: number, props: Partial<db.Program>): void;
|
package/lib/Mirakurun/Program.js
CHANGED
|
@@ -21,20 +21,8 @@ class Program {
|
|
|
21
21
|
this._load();
|
|
22
22
|
setTimeout(this._gc.bind(this), this._programGCInterval);
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
return
|
|
26
|
-
}
|
|
27
|
-
static exists(id) {
|
|
28
|
-
return _1.default.program.exists(id);
|
|
29
|
-
}
|
|
30
|
-
static findByQuery(query) {
|
|
31
|
-
return _1.default.program.findByQuery(query);
|
|
32
|
-
}
|
|
33
|
-
static all() {
|
|
34
|
-
return _1.default.program.items;
|
|
35
|
-
}
|
|
36
|
-
get items() {
|
|
37
|
-
return Array.from(this._itemMap.values());
|
|
24
|
+
get itemMap() {
|
|
25
|
+
return this._itemMap;
|
|
38
26
|
}
|
|
39
27
|
add(item, firstAdd = false) {
|
|
40
28
|
if (this.exists(item.id)) {
|
|
@@ -76,7 +64,7 @@ class Program {
|
|
|
76
64
|
return this._itemMap.has(id);
|
|
77
65
|
}
|
|
78
66
|
findByQuery(query) {
|
|
79
|
-
return (0, sift_1.default)(query, this.
|
|
67
|
+
return (0, sift_1.default)(query, Array.from(this._itemMap.values()));
|
|
80
68
|
}
|
|
81
69
|
findByNetworkId(networkId) {
|
|
82
70
|
const items = [];
|
|
@@ -111,7 +99,7 @@ class Program {
|
|
|
111
99
|
}
|
|
112
100
|
findByNetworkIdAndReplace(networkId, programs) {
|
|
113
101
|
let count = 0;
|
|
114
|
-
for (const item of this.
|
|
102
|
+
for (const item of [...this._itemMap.values()].reverse()) {
|
|
115
103
|
if (item.networkId === networkId) {
|
|
116
104
|
this.remove(item.id);
|
|
117
105
|
--count;
|
|
@@ -166,7 +154,7 @@ class Program {
|
|
|
166
154
|
}
|
|
167
155
|
_save() {
|
|
168
156
|
log.debug("saving programs...");
|
|
169
|
-
db.savePrograms(this.
|
|
157
|
+
db.savePrograms(Array.from(this._itemMap.values()), _1.default.configIntegrity.channels);
|
|
170
158
|
}
|
|
171
159
|
_gc() {
|
|
172
160
|
log.debug("Program GC has queued");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Program.js","sourceRoot":"","sources":["../../src/Mirakurun/Program.ts"],"names":[],"mappings":";;;AAeA,+BAAwB;AACxB,mCAAmC;AACnC,6BAA6B;AAC7B,2BAA2B;AAC3B,0BAAoB;AACpB,mCAA2C;AAC3C,mCAA4B;AAE5B,SAAgB,gBAAgB,CAAC,SAAiB,EAAE,SAAiB,EAAE,OAAe;IAClF,OAAO,QAAQ,CAAC,GAAG,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC1H,CAAC;AAFD,4CAEC;AAED,MAAqB,OAAO;
|
|
1
|
+
{"version":3,"file":"Program.js","sourceRoot":"","sources":["../../src/Mirakurun/Program.ts"],"names":[],"mappings":"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"}
|
package/lib/Mirakurun/Server.js
CHANGED
|
@@ -97,20 +97,22 @@ class Server {
|
|
|
97
97
|
res.setHeader("Server", "Mirakurun/" + pkg.version);
|
|
98
98
|
next();
|
|
99
99
|
});
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
100
|
+
if (!serverConfig.disableWebUI) {
|
|
101
|
+
app.use(express.static("lib/ui", {
|
|
102
|
+
setHeaders: (res, path) => {
|
|
103
|
+
if (express.static.mime.lookup(path) === "image/svg+xml") {
|
|
104
|
+
res.setHeader("Cache-Control", "public, max-age=86400");
|
|
105
|
+
}
|
|
104
106
|
}
|
|
107
|
+
}));
|
|
108
|
+
app.use("/eventemitter3", express.static("node_modules/eventemitter3"));
|
|
109
|
+
app.use("/react", express.static("node_modules/react"));
|
|
110
|
+
app.use("/react-dom", express.static("node_modules/react-dom"));
|
|
111
|
+
app.use("/@fluentui/react", express.static("node_modules/@fluentui/react"));
|
|
112
|
+
if (fs.existsSync("node_modules/swagger-ui-dist") === true) {
|
|
113
|
+
app.use("/swagger-ui", express.static("node_modules/swagger-ui-dist"));
|
|
114
|
+
app.get("/api/debug", (req, res) => res.redirect("/swagger-ui/?url=/api/docs"));
|
|
105
115
|
}
|
|
106
|
-
}));
|
|
107
|
-
app.use("/eventemitter3", express.static("node_modules/eventemitter3"));
|
|
108
|
-
app.use("/react", express.static("node_modules/react"));
|
|
109
|
-
app.use("/react-dom", express.static("node_modules/react-dom"));
|
|
110
|
-
app.use("/@fluentui/react", express.static("node_modules/@fluentui/react"));
|
|
111
|
-
if (fs.existsSync("node_modules/swagger-ui-dist") === true) {
|
|
112
|
-
app.use("/swagger-ui", express.static("node_modules/swagger-ui-dist"));
|
|
113
|
-
app.get("/api/debug", (req, res) => res.redirect("/swagger-ui/?url=/api/docs"));
|
|
114
116
|
}
|
|
115
117
|
const api = yaml.load(fs.readFileSync("api.yml", "utf8"));
|
|
116
118
|
api.info.version = pkg.version;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/Mirakurun/Server.ts"],"names":[],"mappings":";;;AAeA,yBAAyB;AACzB,6BAA6B;AAC7B,yBAAyB;AACzB,mCAAmC;AACnC,6BAA6B;AAC7B,2CAA2C;AAC3C,iCAAiC;AACjC,gCAAgC;AAGhC,qCAAiC;AACjC,6BAA6B;AAC7B,mCAAmC;AACnC,qCAA8B;AAC9B,0BAAoB;AACpB,+BAAyD;AAEzD,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE1C,MAAM,MAAM;IAAZ;QAEY,eAAU,GAAG,KAAK,CAAC;QACnB,aAAQ,GAAG,IAAI,GAAG,EAAe,CAAC;QAClC,UAAK,GAAG,IAAI,GAAG,EAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/Mirakurun/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,6 @@
|
|
|
2
2
|
import ChannelItem from "./ChannelItem";
|
|
3
3
|
import ServiceItem from "./ServiceItem";
|
|
4
4
|
export default class Service {
|
|
5
|
-
static get(id: number): ServiceItem;
|
|
6
|
-
static get(networkId: number, serviceId: number): ServiceItem;
|
|
7
|
-
static exists(id: number): boolean;
|
|
8
|
-
static exists(networkId: number, serviceId: number): boolean;
|
|
9
|
-
static findByChannel(channel: ChannelItem): ServiceItem[];
|
|
10
|
-
static findByNetworkId(networkId: number): ServiceItem[];
|
|
11
|
-
static findByNetworkIdWithLogoId(networkId: number, logoId: number): ServiceItem[];
|
|
12
|
-
static all(): ServiceItem[];
|
|
13
5
|
static getLogoDataPath(networkId: number, logoId: number): string;
|
|
14
6
|
static getLogoDataMTime(networkId: number, logoId: number): Promise<number>;
|
|
15
7
|
static isLogoDataExists(networkId: number, logoId: number): Promise<boolean>;
|
package/lib/Mirakurun/Service.js
CHANGED
|
@@ -14,24 +14,6 @@ class Service {
|
|
|
14
14
|
this._items = [];
|
|
15
15
|
this._load();
|
|
16
16
|
}
|
|
17
|
-
static get(id, serviceId) {
|
|
18
|
-
return _1.default.service.get(id, serviceId);
|
|
19
|
-
}
|
|
20
|
-
static exists(id, serviceId) {
|
|
21
|
-
return _1.default.service.exists(id, serviceId);
|
|
22
|
-
}
|
|
23
|
-
static findByChannel(channel) {
|
|
24
|
-
return _1.default.service.findByChannel(channel);
|
|
25
|
-
}
|
|
26
|
-
static findByNetworkId(networkId) {
|
|
27
|
-
return _1.default.service.findByNetworkId(networkId);
|
|
28
|
-
}
|
|
29
|
-
static findByNetworkIdWithLogoId(networkId, logoId) {
|
|
30
|
-
return _1.default.service.findByNetworkIdWithLogoId(networkId, logoId);
|
|
31
|
-
}
|
|
32
|
-
static all() {
|
|
33
|
-
return _1.default.service.items;
|
|
34
|
-
}
|
|
35
17
|
static getLogoDataPath(networkId, logoId) {
|
|
36
18
|
if (typeof logoId !== "number" || logoId < 0) {
|
|
37
19
|
throw new Error("Invalid `logoId`");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Mirakurun/Service.ts"],"names":[],"mappings":";;AAeA,+BAAqC;AACrC,2BAA4C;AAC5C,yBAAyB;AACzB,6BAA6B;AAC7B,2BAA2B;AAC3B,0BAAoB;AACpB,mCAA4B;AAE5B,+CAAwC;AAExC,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE3C,MAAqB,OAAO;
|
|
1
|
+
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Mirakurun/Service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import * as stream from "stream";
|
|
|
3
3
|
import * as common from "./common";
|
|
4
4
|
import * as db from "./db";
|
|
5
5
|
import ChannelItem from "./ChannelItem";
|
|
6
|
+
import TSFilter from "./TSFilter";
|
|
6
7
|
export default class ServiceItem {
|
|
7
8
|
private _channel;
|
|
8
9
|
private _networkId;
|
|
@@ -33,7 +34,7 @@ export default class ServiceItem {
|
|
|
33
34
|
set epgUpdatedAt(time: number);
|
|
34
35
|
get channel(): ChannelItem;
|
|
35
36
|
export(): db.Service;
|
|
36
|
-
getStream(userRequest: common.UserRequest): Promise<
|
|
37
|
+
getStream(userRequest: common.UserRequest, output: stream.Writable): Promise<TSFilter>;
|
|
37
38
|
getOrder(): number;
|
|
38
39
|
private _updated;
|
|
39
40
|
}
|
|
@@ -108,8 +108,8 @@ class ServiceItem {
|
|
|
108
108
|
};
|
|
109
109
|
return ret;
|
|
110
110
|
}
|
|
111
|
-
getStream(userRequest) {
|
|
112
|
-
return _1.default.tuner.
|
|
111
|
+
getStream(userRequest, output) {
|
|
112
|
+
return _1.default.tuner.initServiceStream(this, userRequest, output);
|
|
113
113
|
}
|
|
114
114
|
getOrder() {
|
|
115
115
|
let order;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ServiceItem.ts"],"names":[],"mappings":";;AAiBA,0BAAoB;AAEpB,mCAA4B;
|
|
1
|
+
{"version":3,"file":"ServiceItem.js","sourceRoot":"","sources":["../../src/Mirakurun/ServiceItem.ts"],"names":[],"mappings":";;AAiBA,0BAAoB;AAEpB,mCAA4B;AAI5B,MAAqB,WAAW;IAQ5B,YACY,QAAqB,EACrB,UAAkB,EAClB,UAAkB,EAClB,KAAc,EACd,KAAc,EACd,OAAgB,EAChB,mBAA4B,EAC5B,YAAqB,KAAK,EAC1B,gBAAwB,CAAC;QARzB,aAAQ,GAAR,QAAQ,CAAa;QACrB,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;QAClB,UAAK,GAAL,KAAK,CAAS;QACd,UAAK,GAAL,KAAK,CAAS;QACd,YAAO,GAAP,OAAO,CAAS;QAChB,wBAAmB,GAAnB,mBAAmB,CAAS;QAC5B,cAAS,GAAT,SAAS,CAAiB;QAC1B,kBAAa,GAAb,aAAa,CAAY;QAEjC,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAlBD,MAAM,CAAC,KAAK,CAAC,SAAiB,EAAE,SAAiB;QAC7C,OAAO,QAAQ,CAAC,SAAS,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAkBD,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI,CAAC,IAAY;QAEjB,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAElB,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,IAAI,CAAC,IAAY;QAEjB,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAElB,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM,CAAC,MAAc;QAErB,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE;YACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;YAEtB,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,IAAI,kBAAkB,CAAC,EAAU;QAE7B,IAAI,IAAI,CAAC,mBAAmB,KAAK,EAAE,EAAE;YACjC,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;YAE9B,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ,CAAC,QAAiB;QAE1B,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAE1B,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,YAAY,CAAC,IAAY;QAEzB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAE1B,UAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;SACnB;IACL,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,MAAM;QAEF,MAAM,GAAG,GAAe;YACpB,EAAE,EAAE,IAAI,CAAC,GAAG;YACZ,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,kBAAkB,EAAE,IAAI,CAAC,mBAAmB;YAC5C,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,OAAO,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;gBACxB,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;aACjC;SACJ,CAAC;QAEF,OAAO,GAAG,CAAC;IACf,CAAC;IAED,SAAS,CAAC,WAA+B,EAAE,MAAuB;QAC9D,OAAO,UAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAED,QAAQ;QAEJ,IAAI,KAAa,CAAC;QAElB,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YACxB,KAAK,IAAI;gBACL,KAAK,GAAG,GAAG,CAAC;gBACZ,MAAM;YACV,KAAK,IAAI;gBACL,KAAK,GAAG,GAAG,CAAC;gBACZ,MAAM;YACV,KAAK,IAAI;gBACL,KAAK,GAAG,GAAG,CAAC;gBACZ,MAAM;YACV,KAAK,KAAK;gBACN,KAAK,GAAG,GAAG,CAAC;gBACZ,MAAM;SACb;QAED,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,KAAK,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SAC1D;aAAM;YACH,KAAK,IAAI,KAAK,CAAC;SAClB;QAED,KAAK,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEhD,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC;IAEO,QAAQ;QACZ,eAAK,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;CACJ;AApLD,8BAoLC"}
|
|
@@ -15,6 +15,7 @@ export default class TSDecoder extends stream.Transform {
|
|
|
15
15
|
private _deadCount;
|
|
16
16
|
constructor(opts: StreamOptions);
|
|
17
17
|
_transform(chunk: Buffer, encoding: string, callback: Function): void;
|
|
18
|
+
_flush(): void;
|
|
18
19
|
private _spawn;
|
|
19
20
|
private _dead;
|
|
20
21
|
private _fallback;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TSDecoder.js","sourceRoot":"","sources":["../../src/Mirakurun/TSDecoder.ts"],"names":[],"mappings":";;AAeA,iCAAiC;AACjC,+CAA+C;AAC/C,6BAA6B;AAC7B,qCAA8B;AAM9B,IAAI,SAAS,GAAG,CAAC,CAAC;AAElB,MAAqB,SAAU,SAAQ,MAAM,CAAC,SAAS;IAanD,YAAY,IAAmB;QAC3B,KAAK,CAAC;YACF,GAAG,IAAI;YACP,aAAa,EAAE,KAAK;SACvB,CAAC,CAAC;QATC,WAAM,GAAY,KAAK,CAAC;QAExB,YAAO,GAAY,KAAK,CAAC;QACzB,eAAU,GAAW,CAAC,CAAC;QAQ3B,IAAI,CAAC,GAAG,GAAG,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3C,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE3E,EAAE,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,QAAgB,EAAE,QAAkB;QAE1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,CAAC;YACX,OAAO;SACV;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YACvC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,GAAG,CAAC,IAAI,CAAC,8DAA8D,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnF,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC,EAAE,IAAI,CAAC,CAAC;SACZ;QAED,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,QAAQ,EAAE,CAAC;IACf,CAAC;IAEO,MAAM;QAEV,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YACxC,OAAO;SACV;QACD,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE;YACrB,EAAE,gBAAM,CAAC,UAAU,CAAC,cAAc,CAAC;YACnC,GAAG,CAAC,IAAI,CAAC,iDAAiD,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC1F;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEhE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAChC,GAAG,CAAC,IAAI,CACJ,2EAA2E,EAC3E,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CACnC,CAAC;YACF,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,GAAG,CAAC,IAAI,CAAC,2DAA2D,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7G,CAAC;IAEO,KAAK;QAET,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;YACvB,OAAO;SACV;QAED,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpD,EAAE,IAAI,CAAC,UAAU,CAAC;QAClB,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE;YACrB,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO;SACV;QAED,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAEO,SAAS;QAEb,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QAErE,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QAE7B,GAAG,CAAC,IAAI,CAAC,yDAAyD,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAClF,CAAC;IAEO,KAAK;QAET,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC;SACxB;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC;SACzB;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC;SACzB;IACL,CAAC;IAEO,MAAM;QAEV,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;YACvB,OAAO;SACV;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,EAAE,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC;QAE7B,GAAG,CAAC,IAAI,CAAC,sCAAsC,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAG1E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"TSDecoder.js","sourceRoot":"","sources":["../../src/Mirakurun/TSDecoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import
|
|
2
|
+
import { Writable } from "stream";
|
|
3
|
+
import EventEmitter = require("eventemitter3");
|
|
3
4
|
import { StreamInfo } from "./common";
|
|
4
|
-
interface
|
|
5
|
+
interface TSFilterOptions {
|
|
6
|
+
readonly output?: Writable;
|
|
5
7
|
readonly networkId?: number;
|
|
6
8
|
readonly serviceId?: number;
|
|
7
9
|
readonly eventId?: number;
|
|
8
|
-
readonly noProvide?: boolean;
|
|
9
10
|
readonly parseNIT?: boolean;
|
|
10
11
|
readonly parseSDT?: boolean;
|
|
11
12
|
readonly parseEIT?: boolean;
|
|
12
13
|
readonly tsmfRelTs?: number;
|
|
13
14
|
}
|
|
14
|
-
export default class TSFilter extends
|
|
15
|
+
export default class TSFilter extends EventEmitter {
|
|
15
16
|
streamInfo: StreamInfo;
|
|
17
|
+
private _output;
|
|
16
18
|
private _provideServiceId;
|
|
17
19
|
private _provideEventId;
|
|
18
20
|
private _parseNIT;
|
|
@@ -52,8 +54,10 @@ export default class TSFilter extends stream.Transform {
|
|
|
52
54
|
private _provideEventTimeout;
|
|
53
55
|
private _maxBufferBytesBeforeReady;
|
|
54
56
|
private _eventEndTimeout;
|
|
55
|
-
constructor(options:
|
|
56
|
-
|
|
57
|
+
constructor(options: TSFilterOptions);
|
|
58
|
+
write(chunk: Buffer): void;
|
|
59
|
+
end(): void;
|
|
60
|
+
close(): void;
|
|
57
61
|
private _processPackets;
|
|
58
62
|
private _onPAT;
|
|
59
63
|
private _onPMT;
|