mirakurun 4.0.0-beta.3 → 4.0.0-beta.5

package/api.d.ts

@@ -239,6 +239,9 @@ export interface ConfigServer {
     disableWebUI?: boolean;
     allowIPv4CidrRanges?: string[];
     allowIPv6CidrRanges?: string[];
+    allowOrigins: string[];
+    allowPNA: boolean;
+    tsplayEndpoint: string;
 }
 
 export enum LogLevel {

package/api.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Mirakurun
-  version: ~
+  version: '0.0.0'
   description: DVR Tuner Server for Japanese TV.
   contact:
     name: Chinachu Project
@@ -572,6 +572,55 @@ definitions:
       latest:
         type: string
 
+  ChannelScanStatus:
+    type: object
+    description: "Current status of a channel scan operation"
+    properties:
+      status:
+        type: string
+        description: "Current scan status"
+        enum:
+          - not_started
+          - scanning
+          - completed
+          - cancelled
+          - error
+      isScanning:
+        type: boolean
+        description: "Whether a scan is currently in progress"
+      type:
+        $ref: '#/definitions/ChannelType'
+        description: "Channel type being scanned"
+      dryRun:
+        type: boolean
+        description: "Whether this is a dry run (no changes will be saved)"
+      progress:
+        type: integer
+        description: "Scan progress percentage (0-100)"
+      currentChannel:
+        type: string
+        description: "Channel currently being scanned"
+      scanLog:
+        type: array
+        description: "Log of scan events"
+        items:
+          type: string
+      newCount:
+        type: integer
+        description: "Number of new channels found"
+      takeoverCount:
+        type: integer
+        description: "Number of existing channels merged"
+      result:
+        type: array
+        description: "Complete channel configuration"
+        items:
+          $ref: "#/definitions/ConfigChannelsItem"
+      startTime:
+        $ref: '#/definitions/UnixtimeMS'
+      updateTime:
+        $ref: '#/definitions/UnixtimeMS'
+
   Status:
     type: object
     properties:

package/config/channels.yml

@@ -1,140 +1,197 @@
 - name: ＴＯＫＹＯ　ＭＸ
   type: GR
   channel: '16'
+  isDisabled: true
 
 - name: フジテレビ
   type: GR
   channel: '21'
+  isDisabled: true
 
 - name: ＴＢＳ
   type: GR
   channel: '22'
+  isDisabled: true
 
-- name: テレビ東京
+- name: テレ東
   type: GR
   channel: '23'
+  isDisabled: true
 
 - name: テレビ朝日
   type: GR
   channel: '24'
+  isDisabled: true
 
 - name: 日テレ
   type: GR
   channel: '25'
+  isDisabled: true
 
-- name: ＮＨＫＥテレ・東京
+- name: ＮＨＫＥテレ
   type: GR
   channel: '26'
+  isDisabled: true
 
-- name: ＮＨＫ総合・東京
+- name: ＮＨＫ総合
   type: GR
   channel: '27'
+  isDisabled: true
 
-- name: NHK BS1
+- name: ＢＳ朝日１
   type: BS
-  channel: BS15_0
-  serviceId: 101
+  channel: BS01_0
+  serviceId: 151
+  isDisabled: true
 
-- name: NHK BS1 (Sub)
+- name: ＢＳ朝日２
   type: BS
-  channel: BS15_0
-  serviceId: 102
+  channel: BS01_0
+  serviceId: 152
+  isDisabled: true
+
+- name: ＢＳ朝日３
+  type: BS
+  channel: BS01_0
+  serviceId: 153
+  isDisabled: true
+
+- name: ＢＳ－ＴＢＳ
+  type: BS
+  channel: BS01_1
+  serviceId: 161
+  isDisabled: true
+
+- name: ＢＳ－ＴＢＳ
+  type: BS
+  channel: BS01_1
+  serviceId: 162
+  isDisabled: true
+
+- name: ＢＳ－ＴＢＳ
+  type: BS
+  channel: BS01_1
+  serviceId: 163
+  isDisabled: true
+
+- name: ＢＳテレ東
+  type: BS
+  channel: BS01_2
+  serviceId: 171
+  isDisabled: true
+
+- name: ＢＳテレ東２
+  type: BS
+  channel: BS01_2
+  serviceId: 172
+  isDisabled: true
+
+- name: ＢＳテレ東３
+  type: BS
+  channel: BS01_2
+  serviceId: 173
+  isDisabled: true
 
-- name: ＮＨＫＢＳプレミアム
+- name: ＢＳ１１イレブン
   type: BS
-  channel: BS03_1
-  serviceId: 103
+  channel: BS09_0
+  serviceId: 211
+  isDisabled: true
 
-- name: ＮＨＫＢＳプレミアム
+- name: ＢＳ１２トゥエルビ
   type: BS
-  channel: BS03_1
-  serviceId: 104
+  channel: BS09_2
+  serviceId: 222
+  isDisabled: true
 
 - name: ＢＳ日テレ
   type: BS
   channel: BS13_0
   serviceId: 141
+  isDisabled: true
 
 - name: ＢＳ日テレ
   type: BS
   channel: BS13_0
   serviceId: 142
+  isDisabled: true
 
-- name: ＢＳ朝日１
-  type: BS
-  channel: BS01_0
-  serviceId: 151
-
-- name: ＢＳ朝日２
+- name: ＢＳ日テレ
   type: BS
-  channel: BS01_0
-  serviceId: 152
+  channel: BS13_0
+  serviceId: 143
+  isDisabled: true
 
-- name: ＢＳ－ＴＢＳ
+- name: ＢＳフジ・１８１
   type: BS
-  channel: BS01_1
-  serviceId: 161
+  channel: BS13_1
+  serviceId: 181
+  isDisabled: true
 
-- name: ＢＳテレ東
+- name: ＢＳフジ・１８２
   type: BS
-  channel: BS01_2
-  serviceId: 171
+  channel: BS13_1
+  serviceId: 182
+  isDisabled: true
 
-- name: ＢＳフジ・１８１
+- name: ＢＳフジ・１８３
   type: BS
   channel: BS13_1
-  serviceId: 181
+  serviceId: 183
+  isDisabled: true
 
-- name: ＷＯＷＯＷプライム
+- name: 放送大学テレビ
   type: BS
-  channel: BS03_0
-  serviceId: 191
+  channel: BS13_2
+  serviceId: 231
   isDisabled: true
 
-- name: ＷＯＷＯＷライブ
+- name: 放送大学テレビ
   type: BS
-  channel: BS05_0
-  serviceId: 192
+  channel: BS13_2
+  serviceId: 232
   isDisabled: true
 
-- name: ＷＯＷＯＷシネマ
+- name: ＮＨＫ　ＢＳ
   type: BS
-  channel: BS05_1
-  serviceId: 193
+  channel: BS15_0
+  serviceId: 101
   isDisabled: true
 
-- name: ＢＳ１１イレブン
+- name: ＮＨＫ　ＢＳ
   type: BS
-  channel: BS09_0
-  serviceId: 211
+  channel: BS15_0
+  serviceId: 102
+  isDisabled: true
 
-- name: ＢＳスカパー！
+- name: ＢＳ１０
   type: BS
-  channel: BS11_1
-  serviceId: 241
+  channel: BS15_2
+  serviceId: 200
+  isDisabled: true
 
-- name: テレ朝チャンネル1
-  type: CS
-  channel: CS2
-  serviceId: 298
+- name: ＢＳよしもと
+  type: BS
+  channel: BS23_1
+  serviceId: 265
   isDisabled: true
 
-- name: テレ朝チャンネル2
-  type: CS
-  channel: CS2
-  serviceId: 299
+- name: ＢＳ松竹東急
+  type: BS
+  channel: BS23_3
+  serviceId: 260
   isDisabled: true
 
-- name: 日テレプラス
+- name: ショップチャンネル
   type: CS
-  channel: CS24
-  serviceId: 300
+  channel: CS8
+  serviceId: 55
   isDisabled: true
 
-- name: AT-X
+- name: ＱＶＣ
   type: CS
-  channel: CS16
-  serviceId: 333
+  channel: CS22
+  serviceId: 161
   isDisabled: true
 
 - name: BS SPTV
@@ -143,17 +200,3 @@
   serviceId: 33353
   satellite: JCSAT3A
   isDisabled: true
-
-- name: AT-X HD
-  type: SKY
-  channel: ATXHD
-  serviceId: 33435
-  satellite: JCSAT3A
-  isDisabled: true
-
-- name: AXN HD
-  type: SKY
-  channel: AXNHD
-  serviceId: 33418
-  satellite: JCSAT4A
-  isDisabled: true

package/doc/Configuration.md

@@ -29,6 +29,9 @@ disableEITParsing: false # boolean
 disableWebUI: false # boolean
 allowIPv4CidrRanges: ["10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"] # array of string
 allowIPv6CidrRanges: ["fc00::/7"] # array of string
+allowOrigins: ["https://mirakurun-secure-contexts-api.pages.dev"] # array of string
+allowPNA: true # boolean
+tsplayEndpoint: https://mirakurun-secure-contexts-api.pages.dev/tsplay/ # string
 ```
 
 ### Environment Variables (Docker)
@@ -47,6 +50,9 @@ DISABLE_EIT_PARSING
 DISABLE_WEB_UI
 ALLOW_IPV4_CIDR_RANGES
 ALLOW_IPV6_CIDR_RANGES
+ALLOW_ORIGINS
+ALLOW_PNA
+TSPLAY_ENDPOINT
 ```
 
 ## tuners.yml

package/lib/Mirakurun/Channel.js

@@ -1,14 +1,50 @@
 "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 log = require("./log");
-const _1 = require("./_");
-const status_1 = require("./status");
-const queue_1 = require("./queue");
-const ChannelItem_1 = require("./ChannelItem");
+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;
     constructor() {
-        this._items = [];
-        this._epgGatheringInterval = _1.default.config.server.epgGatheringInterval || 1000 * 60 * 30;
         this._load();
         if (_1.default.config.server.disableEITParsing !== true) {
             setTimeout(this._epgGatherer.bind(this), 1000 * 60);

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

@@ -4,24 +4,15 @@ import * as config from "./config";
 import ServiceItem from "./ServiceItem";
 import TSFilter from "./TSFilter";
 export default class ChannelItem {
-    private _name;
-    private _type;
-    private _channel;
-    private _satellite;
-    private _space;
-    private _freq;
-    private _polarity;
-    private _tsmfRelTs;
+    readonly name: string;
+    readonly type: common.ChannelType;
+    readonly channel: string;
+    readonly satellite: string;
+    readonly space: number;
+    readonly freq: number;
+    readonly polarity: "H" | "V";
+    readonly tsmfRelTs: number;
     constructor(config: config.Channel);
-    get name(): string;
-    get type(): common.ChannelType;
-    get channel(): string;
-    get satellite(): string;
-    get space(): number;
-    get freq(): number;
-    get polarity(): "H" | "V";
-    get tsmfRelTs(): number;
-    toJSON(): config.Channel;
     addService(serviceId: number): void;
     getServices(): ServiceItem[];
     getStream(user: common.User, output: stream.Writable): Promise<TSFilter>;

package/lib/Mirakurun/ChannelItem.js

@@ -1,19 +1,63 @@
 "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 = require("./_");
-const queue_1 = require("./queue");
-const log = require("./log");
-const ServiceItem_1 = require("./ServiceItem");
+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;
+    channel;
+    satellite;
+    space;
+    freq;
+    polarity;
+    tsmfRelTs;
     constructor(config) {
-        this._name = config.name;
-        this._type = config.type;
-        this._channel = config.channel;
-        this._satellite = config.satellite;
-        this._space = config.space;
-        this._freq = config.freq;
-        this._polarity = config.polarity;
-        this._tsmfRelTs = config.tsmfRelTs;
+        this.name = config.name;
+        this.type = config.type;
+        this.channel = config.channel;
+        this.satellite = config.satellite;
+        this.space = config.space;
+        this.freq = config.freq;
+        this.polarity = config.polarity;
+        this.tsmfRelTs = config.tsmfRelTs;
         if (config.serviceId) {
             this.addService(config.serviceId);
         }
@@ -26,42 +70,6 @@ class ChannelItem {
             }
         }, 3000);
     }
-    get name() {
-        return this._name;
-    }
-    get type() {
-        return this._type;
-    }
-    get channel() {
-        return this._channel;
-    }
-    get satellite() {
-        return this._satellite;
-    }
-    get space() {
-        return this._space;
-    }
-    get freq() {
-        return this._freq;
-    }
-    get polarity() {
-        return this._polarity;
-    }
-    get tsmfRelTs() {
-        return this._tsmfRelTs;
-    }
-    toJSON() {
-        return {
-            type: this._type,
-            channel: this._channel,
-            name: this._name,
-            satellite: this._satellite,
-            space: this._space,
-            freq: this._freq,
-            polarity: this._polarity,
-            tsmfRelTs: this._tsmfRelTs
-        };
-    }
     addService(serviceId) {
         if (!_1.default.service) {
             process.nextTick(() => this.addService(serviceId));
@@ -70,25 +78,25 @@ class ChannelItem {
         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);
+        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);
+            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);
+                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);
+                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, "  "));
+            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));
         });
     }
@@ -99,19 +107,19 @@ class ChannelItem {
         return _1.default.tuner.initChannelStream(this, user, output);
     }
     serviceScan(add) {
-        log.debug("ChannelItem#'%s' service scan has queued", this._name);
+        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);
+            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);
+                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, "  "));
+            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) {
@@ -126,7 +134,7 @@ class ChannelItem {
                     _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);
+            log.info("ChannelItem#'%s' service scan has finished", this.name);
         });
     }
 }