mirakurun 3.7.1-beta.3 → 3.8.1

package/CHANGELOG.md

@@ -2,18 +2,59 @@
 
 see [Commit Logs](https://github.com/Chinachu/Mirakurun/commits/master) to check all.
 
-## 3.7.1 (2021-08-xx)
+## 3.8.1 (2022-01-10)
+
+- remove `colors` package for urgent security reasons.
+
+## 3.8.0 (2021-08-10)
+
+Logo support enhanced.
+
+### Server Changes
+
+- **config/server**: Add `logoDataInterval` to suppress parsing logo data frequently.
+- **service**: Save the each logo data to separate file instead of json db.
+- **ts-filter**: Add support for BS/CS logo. [#17](https://github.com/Chinachu/Mirakurun/issues/17)
+- **ui**: Add service list in "Status".
+
+### Client Changes
+
+- Add missing `type` definition in `Service`.
+
+### Docker Changes
+
+- Set env `NODE_ENV=production` by default.
+
+### Other Changes
+
+- **package**: Update dependencies.
+
+## 3.7.1 (2021-08-06)
 
 Bug fixes and improvements to memory usage, etc.
 
 ### Server Changes
 
-- todo
+- **node**: Removed `--max_old_space_size` flag.
+- **db**: Improved performance of the save (write).
+- **epg**: Fixed a bug where the EPG would not update if it was stopped for several days.
+- **epg**: Improved memory usage.
+- **epg**: Improved EPG gathering behavior.
+- **program**: Improved performance and memory usage.
 
 ### Docker Changes
 
-- Update base image to `node:16.6.0-buster-slim`.
+- Update base image to `node:16.6.1-buster-slim`.
 - Set env `MALLOC_ARENA_MAX=2` by default.
+- **docker-compose**: Set container_name to `mirakurun`.
+- **docker-compose**: Set default network name to `mirakurun`.
+
+### Other Changes
+
+- **package**: Add engine support `node@16`.
+- **package**: Drop engine support `node@10`.
+- **package**: Update dependencies.
+- **tsconfig**: Change target `es2017` → `es2019`.
 
 ## 3.7.0 (2021-07-24)
 

package/README.md

@@ -1,4 +1,4 @@
-[![Mirakurun](https://yabumi.cc/159e63f5c692b3b0dae47765.svg)](https://github.com/Chinachu/Mirakurun)
+[![Mirakurun](https://gist.githubusercontent.com/kanreisa/0ab27d7771e97edce5a24cc81b9b8ce6/raw/e50683f1c4e7d1a13e9ef468f8cc945b0dbc853c/logo-mirakurun.svg)](https://github.com/Chinachu/Mirakurun)
 
 # Mirakurun
 
@@ -50,11 +50,11 @@ see: [doc/Platforms.md](doc/Platforms.md)
 
 #### Figure: Variety of the MPEG-2 TS Stream API
 
-![](https://yabumi.cc/1689b554eb4aea9bad992068.svg)
+![](https://gist.githubusercontent.com/kanreisa/0ab27d7771e97edce5a24cc81b9b8ce6/raw/e50683f1c4e7d1a13e9ef468f8cc945b0dbc853c/mirakurun-fig-api-variety.svg)
 
 #### Figure: Stream Flow
 
-![](https://yabumi.cc/1689b5d310c654a770d44e7a.svg)
+![](https://gist.githubusercontent.com/kanreisa/0ab27d7771e97edce5a24cc81b9b8ce6/raw/e50683f1c4e7d1a13e9ef468f8cc945b0dbc853c/mirakurun-fig-flow-stream.svg)
 
 ## Requirements / Supported Platforms
 
@@ -93,7 +93,7 @@ You can use PM2 Plus to realtime monitoring if running by PM2.
 
 ## Contributing
 
-[CONTRIBUTING.md](.github/CONTRIBUTING.md)
+[CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Supporting
 

package/api.d.ts

@@ -58,6 +58,7 @@ export interface Service {
     serviceId: ServiceId;
     networkId: NetworkId;
     name: string;
+    type: number;
     logoId?: number;
     hasLogoData?: boolean;
     remoteControlKeyId?: number;
@@ -205,6 +206,7 @@ export interface ConfigServer {
     programGCInterval?: number;
     epgGatheringInterval?: number;
     epgRetrievalTime?: number;
+    logoDataInterval?: number;
     disableEITParsing?: boolean;
 }
 

package/api.yml

@@ -111,6 +111,7 @@ definitions:
       - serviceId
       - networkId
       - name
+      - type
     properties:
       id:
         $ref: '#/definitions/ServiceItemId'
@@ -120,6 +121,8 @@ definitions:
         $ref: '#/definitions/NetworkId'
       name:
         type: string
+      type:
+        type: integer
       logoId:
         type: integer
       hasLogoData:
@@ -457,6 +460,8 @@ definitions:
         type: integer
       epgRetrievalTime:
         type: integer
+      logoDataInterval:
+        type: integer
       disableEITParsing:
         type: boolean
 

package/bin/init.win32.js

@@ -39,6 +39,7 @@ setEnv("TUNERS_CONFIG_PATH", path.join(configDir, "tuners.yml"));
 setEnv("CHANNELS_CONFIG_PATH", path.join(configDir, "channels.yml"));
 setEnv("SERVICES_DB_PATH", path.join(dataDir, "services.json"));
 setEnv("PROGRAMS_DB_PATH", path.join(dataDir, "programs.json"));
+setEnv("LOGO_DATA_DIR_PATH", path.join(dataDir, "logo-data"));
 
 require("../" + proc.script);
 

package/bin/postinstall.js

@@ -23,14 +23,13 @@ const fs = require("fs");
 const path = require("path");
 const child_process = require("child_process");
 const semver = require("semver");
-const colors = require("colors");
 const pkg = require("../package.json");
 
 // node check
 if (semver.satisfies(process.version, pkg.engines.node) === true) {
-    console.log("Version:", `node@${process.version}`.green, "[OK]".bgGreen);
+    console.log("Version:", `node@${process.version}`, "[OK]");
 } else {
-    console.error("Version:", `node@${process.version}`.red, "[NG]".bgRed, "Expected:", pkg.engines.node);
+    console.error("Version:", `node@${process.version}`, "[NG]", "Expected:", pkg.engines.node);
     process.exit(1);
 }
 
@@ -57,9 +56,9 @@ if (process.platform === "linux" || process.platform === "darwin") {
     const pm2Version = child_process.execSync("pm2 -v", { encoding: "utf8" }).trim();
     const pm2Expected = ">=2.4.0";
     if (semver.satisfies(pm2Version, pm2Expected) === true) {
-        console.log("Version:", `pm2@${pm2Version}`.green, "[OK]".bgGreen);
+        console.log("Version:", `pm2@${pm2Version}`, "[OK]");
     } else {
-        console.error("Version:", `pm2@${pm2Version}`.red, "[NG]".bgRed, "Expected:", pm2Expected);
+        console.error("Version:", `pm2@${pm2Version}`, "[NG]", "Expected:", pm2Expected);
         process.exit(1);
     }
 
@@ -72,7 +71,7 @@ if (process.platform === "linux" || process.platform === "darwin") {
             ]
         });
     } catch (e) {
-        console.log("Caution: `pm2 startup` has failed. you can try fix yourself.".bgYellow);
+        console.log("Caution: `pm2 startup` has failed. you can try fix yourself.");
     }
 
     child_process.execSync("pm2 start processes.json", {
@@ -95,9 +94,9 @@ if (process.platform === "linux" || process.platform === "darwin") {
     const winserVersion = child_process.execSync("winser -v", { encoding: "utf8" }).replace(/^[a-z]+ /, "").trim();
     const winserExpected = ">=1.0.3 <2.0.0";
     if (semver.satisfies(winserVersion, winserExpected) === true) {
-        console.log("Version:", `winser@${winserVersion}`.green, "[OK]".bgGreen);
+        console.log("Version:", `winser@${winserVersion}`, "[OK]");
     } else {
-        console.error("Version:", `winser@${winserVersion}`.red, "[NG]".bgRed, "Expected:", winserExpected);
+        console.error("Version:", `winser@${winserVersion}`, "[NG]", "Expected:", winserExpected);
         process.exit(1);
     }
 

package/doc/Configuration.md

@@ -26,6 +26,7 @@ eventEndTimeout: 1000 # integer (ms)
 programGCInterval: 900000 # integer (ms)
 epgGatheringInterval: 900000 # integer (ms)
 epgRetrievalTime: 600000 # integer (ms)
+logoDataInterval: 86400000 # integer (ms)
 disableEITParsing: false # boolean
 ```
 
@@ -42,6 +43,7 @@ EVENT_END_TIMEOUT
 PROGRAM_GC_INTERVAL
 EPG_GATHERING_INTERVAL
 EPG_RETRIEVAL_TIME
+LOGO_DATA_INTERVAL
 DISABLE_EIT_PARSING
 ```
 

package/docker/container-init.sh

@@ -5,6 +5,7 @@ export TUNERS_CONFIG_PATH=/app-config/tuners.yml
 export CHANNELS_CONFIG_PATH=/app-config/channels.yml
 export SERVICES_DB_PATH=/app-data/services.json
 export PROGRAMS_DB_PATH=/app-data/programs.json
+export LOGO_DATA_DIR_PATH=/app-data/logo-data
 
 export PATH=/opt/bin:$PATH
 export DOCKER=YES
@@ -44,6 +45,7 @@ if [ -e "/etc/init.d/pcscd" ]; then
 fi
 
 if [ "$DEBUG" != "true" ]; then
+  export NODE_ENV=production
   node -r source-map-support/register lib/server.js
 else
   npm run debug

package/lib/Mirakurun/Channel.js

@@ -2,6 +2,7 @@
 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 Tuner_1 = require("./Tuner");
@@ -123,45 +124,44 @@ class Channel {
                     return;
                 }
                 const service = services[0];
-                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 (now - service.epgUpdatedAt > 1000 * 60 * 60 * 6) {
-                        log.info("Network#%d EPG gathering is resuming forcibly because reached maximum pause time", networkId);
-                        service.epgReady = false;
-                    }
-                    else {
-                        const currentPrograms = _1.default.program.findByNetworkIdAndTime(networkId, now)
-                            .filter(program => !!program.name && program.name !== "放送休止");
-                        if (currentPrograms.length === 0) {
-                            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;
-                            }
+                queue_1.default.add(async () => {
+                    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 (now - service.epgUpdatedAt > 1000 * 60 * 60 * 6) {
+                            log.info("Network#%d EPG gathering is resuming forcibly because reached maximum pause time", networkId);
                             service.epgReady = false;
                         }
+                        else {
+                            const currentPrograms = _1.default.program.findByNetworkIdAndTime(networkId, now)
+                                .filter(program => !!program.name && program.name !== "放送休止");
+                            if (currentPrograms.length === 0) {
+                                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;
+                                }
+                                service.epgReady = false;
+                            }
+                        }
+                    }
+                    if (status_1.default.epg[networkId] === true) {
+                        log.info("Network#%d EPG gathering is already in progress on another stream", networkId);
+                        return;
                     }
-                }
-                log.debug("Network#%d EPG gathering has queued", networkId);
-                queue_1.default.add(async () => {
                     log.info("Network#%d EPG gathering has started", networkId);
                     try {
                         await Tuner_1.default.getEPG(service.channel);
-                        const now = Date.now();
-                        for (const service of services) {
-                            service.epgReady = true;
-                            service.epgUpdatedAt = now;
-                        }
                         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);

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.js

@@ -117,11 +117,13 @@ class ChannelItem {
                 if (item !== null) {
                     item.name = service.name;
                     item.type = service.type;
-                    item.logoId = service.logoId;
+                    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, undefined, service.remoteControlKeyId));
+                    _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);

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/Service.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import ChannelItem from "./ChannelItem";
 import ServiceItem from "./ServiceItem";
 export default class Service {
@@ -9,6 +10,11 @@ export default class Service {
     static findByNetworkId(networkId: number): ServiceItem[];
     static findByNetworkIdWithLogoId(networkId: number, logoId: number): ServiceItem[];
     static all(): ServiceItem[];
+    static getLogoDataPath(networkId: number, logoId: number): string;
+    static getLogoDataMTime(networkId: number, logoId: number): Promise<number>;
+    static isLogoDataExists(networkId: number, logoId: number): Promise<boolean>;
+    static loadLogoData(networkId: number, logoId: number): Promise<Buffer>;
+    static saveLogoData(networkId: number, logoId: number, data: Buffer, retrying?: boolean): Promise<void>;
     private _items;
     private _saveTimerId;
     constructor();

package/lib/Mirakurun/Service.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const fs_1 = require("fs");
+const fs = require("fs");
 const log = require("./log");
 const db = require("./db");
 const _1 = require("./_");
 const Event_1 = require("./Event");
 const ServiceItem_1 = require("./ServiceItem");
+const { LOGO_DATA_DIR_PATH } = process.env;
 class Service {
     constructor() {
         this._items = [];
@@ -28,6 +32,70 @@ class Service {
     static all() {
         return _1.default.service.items;
     }
+    static getLogoDataPath(networkId, logoId) {
+        if (typeof logoId !== "number" || logoId < 0) {
+            throw new Error("Invalid `logoId`");
+        }
+        return path_1.join(LOGO_DATA_DIR_PATH, `${networkId}_${logoId}.png`);
+    }
+    static async getLogoDataMTime(networkId, logoId) {
+        if (typeof logoId !== "number" || logoId < 0) {
+            return 0;
+        }
+        try {
+            return (await fs_1.promises.stat(Service.getLogoDataPath(networkId, logoId))).mtimeMs;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
+    static async isLogoDataExists(networkId, logoId) {
+        if (typeof logoId !== "number" || logoId < 0) {
+            return false;
+        }
+        try {
+            return (await fs_1.promises.stat(Service.getLogoDataPath(networkId, logoId))).isFile();
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    static async loadLogoData(networkId, logoId) {
+        if (typeof logoId !== "number" || logoId < 0) {
+            return null;
+        }
+        try {
+            return await fs_1.promises.readFile(Service.getLogoDataPath(networkId, logoId));
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    static async saveLogoData(networkId, logoId, data, retrying = false) {
+        log.info("Service.saveLogoData(): saving... (networkId=%d logoId=%d)", networkId, logoId);
+        const path = Service.getLogoDataPath(networkId, logoId);
+        try {
+            await fs_1.promises.writeFile(path, data, { encoding: "binary" });
+        }
+        catch (e) {
+            if (retrying === false) {
+                const dirPath = path_1.dirname(path);
+                if (fs.existsSync(dirPath) === false) {
+                    log.warn("Service.saveLogoData(): making directory `%s`... (networkId=%d logoId=%d)", dirPath, networkId, logoId);
+                    try {
+                        fs.mkdirSync(dirPath, { recursive: true });
+                    }
+                    catch (e) {
+                        throw e;
+                    }
+                }
+                log.warn("Service.saveLogoData(): retrying... (networkId=%d logoId=%d)", networkId, logoId);
+                return this.saveLogoData(networkId, logoId, data, true);
+            }
+            throw e;
+        }
+        log.info("Service.saveLogoData(): saved. (networkId=%d logoId=%d)", networkId, logoId);
+    }
     get items() {
         return this._items;
     }
@@ -93,30 +161,40 @@ class Service {
     }
     save() {
         clearTimeout(this._saveTimerId);
-        this._saveTimerId = setTimeout(() => this._save(), 500);
+        this._saveTimerId = setTimeout(() => this._save(), 1000 * 3);
     }
     _load() {
         log.debug("loading services...");
-        let dropped = false;
-        db.loadServices(_1.default.configIntegrity.channels).forEach(service => {
+        let updated = false;
+        const services = db.loadServices(_1.default.configIntegrity.channels);
+        for (const service of services) {
             const channelItem = _1.default.channel.get(service.channel.type, service.channel.channel);
             if (channelItem === null) {
-                dropped = true;
+                updated = true;
                 return;
             }
             if (service.networkId === undefined || service.serviceId === undefined) {
-                dropped = true;
+                updated = true;
                 return;
             }
-            this.add(new ServiceItem_1.default(channelItem, service.networkId, service.serviceId, service.name, service.type, service.logoId, service.logoData, service.remoteControlKeyId, service.epgReady, service.epgUpdatedAt));
-        });
-        if (dropped) {
+            if (service.logoData) {
+                const logoDataPath = Service.getLogoDataPath(service.networkId, service.logoId);
+                log.warn("migrating deprecated property `logoData` to file `%s` in service#%d (%s) db", logoDataPath, service.id, service.name);
+                Service.saveLogoData(service.networkId, service.logoId, Buffer.from(service.logoData, "base64"));
+                services.filter(s => s.networkId === service.networkId && s.logoId === service.logoId).forEach(s => {
+                    delete s.logoData;
+                });
+                updated = true;
+            }
+            this.add(new ServiceItem_1.default(channelItem, service.networkId, service.serviceId, service.name, service.type, service.logoId, service.remoteControlKeyId, service.epgReady, service.epgUpdatedAt));
+        }
+        if (updated) {
             this.save();
         }
     }
     _save() {
         log.debug("saving services...");
-        db.saveServices(this._items.map(service => service.export(true)), _1.default.configIntegrity.channels);
+        db.saveServices(this._items.map(service => service.export()), _1.default.configIntegrity.channels);
     }
 }
 exports.default = Service;

package/lib/Mirakurun/Service.js.map

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

package/lib/Mirakurun/ServiceItem.d.ts

@@ -10,13 +10,12 @@ export default class ServiceItem {
     private _name?;
     private _type?;
     private _logoId?;
-    private _logoData?;
     private _remoteControlKeyId?;
     private _epgReady;
     private _epgUpdatedAt;
     static getId(networkId: number, serviceId: number): number;
     private _id;
-    constructor(_channel: ChannelItem, _networkId: number, _serviceId: number, _name?: string, _type?: number, _logoId?: number, _logoData?: string, _remoteControlKeyId?: number, _epgReady?: boolean, _epgUpdatedAt?: number);
+    constructor(_channel: ChannelItem, _networkId: number, _serviceId: number, _name?: string, _type?: number, _logoId?: number, _remoteControlKeyId?: number, _epgReady?: boolean, _epgUpdatedAt?: number);
     get id(): number;
     get networkId(): number;
     get serviceId(): number;
@@ -26,9 +25,6 @@ export default class ServiceItem {
     set type(type: number);
     get logoId(): number;
     set logoId(logoId: number);
-    get logoData(): Buffer;
-    set logoData(logo: Buffer);
-    get hasLogoData(): boolean;
     get remoteControlKeyId(): number;
     set remoteControlKeyId(id: number);
     get epgReady(): boolean;
@@ -36,7 +32,7 @@ export default class ServiceItem {
     get epgUpdatedAt(): number;
     set epgUpdatedAt(time: number);
     get channel(): ChannelItem;
-    export(full?: boolean): db.Service;
+    export(): db.Service;
     getStream(userRequest: common.UserRequest): Promise<stream.Readable>;
     getOrder(): number;
     private _updated;