epg-grabber 0.42.0 → 0.43.0

package/dist/cli.js

@@ -1,48 +1,24 @@
 #!/usr/bin/env node
-import { n as name, v as version, d as description, p as parseNumber, L as Logger, E as EPGGrabber, g as getUTCDate, a as generateXMLTV } from './index-Bcnk0U8G.js';
+import { n as name, v as version, d as description, p as parseNumber, L as Logger, l as loadJs, a as parseProxy, E as EPGGrabber, g as getUTCDate } from './index-_okTrZbD.js';
 import { Template, Collection } from '@freearhey/core';
 import { Command, Option } from 'commander';
 import { SocksProxyAgent } from 'socks-proxy-agent';
-import { URL } from 'node:url';
-import path from 'node:path';
 import { TaskQueue } from 'cwait';
 import Promise$1 from 'bluebird';
+import path from 'node:path';
 import fs from 'fs-extra';
 import pako from 'pako';
 import _ from 'lodash';
 import 'dayjs';
 import 'dayjs/plugin/utc.js';
-import 'xml-js';
+import 'node:url';
 import 'glob';
 import 'axios';
 import 'curl-generator';
-import 'axios-cache-interceptor';
 import 'winston';
 import 'path';
-
-class ProxyParser {
-  static parse(proxy) {
-    const parsed = new URL(proxy);
-    const result = {
-      protocol: parsed.protocol.replace(":", "") || null,
-      host: parsed.hostname,
-      port: parsed.port ? parseInt(parsed.port) : null
-    };
-    if (parsed.username || parsed.password) {
-      result.auth = {};
-      if (parsed.username) result.auth.username = parsed.username;
-      if (parsed.password) result.auth.password = parsed.password;
-    }
-    return result;
-  }
-}
-
-class Storage {
-  static async loadJs(filepath) {
-    const absPath = path.resolve(filepath);
-    return (await import(absPath)).default;
-  }
-}
+import 'axios-cache-interceptor';
+import 'xml-js';
 
 const program = new Command();
 program.name(name).version(version, "-v, --version").description(description).addOption(
@@ -73,7 +49,7 @@ async function main() {
   logger.info("Starting...");
   logger.debug(`Options: ${JSON.stringify(options, null, 2)}`);
   logger.info(`Loading '${options.config}'...`);
-  let configObject = await Storage.loadJs(options.config);
+  let configObject = await loadJs(options.config);
   configObject = _.merge(configObject, {
     filepath: path.resolve(options.config),
     channels: typeof options.channels === "string" ? path.resolve(options.channels) : void 0,
@@ -90,7 +66,7 @@ async function main() {
   if (configObject.request.timeout === void 0) configObject.request.timeout = options.timeout;
   if (options.cacheTtl !== void 0) configObject.request.cache = { ttl: options.cacheTtl };
   if (options.proxy !== void 0) {
-    const proxy = ProxyParser.parse(options.proxy);
+    const proxy = parseProxy(options.proxy);
     if (proxy.protocol && ["socks", "socks5", "socks5h", "socks4", "socks4a"].includes(String(proxy.protocol))) {
       const socksProxyAgent = new SocksProxyAgent(options.proxy);
       configObject.request = {
@@ -102,28 +78,38 @@ async function main() {
     }
   }
   const grabber = new EPGGrabber(configObject, { logger });
-  logger.info("Loading channel list...");
-  const channelList = await grabber.loadChannels();
+  logger.info("Loading channels...");
+  const channels = await grabber.loadChannels();
   const template = new Template(configObject.output);
-  const groups = channelList.getGroups({ template });
-  if (channelList.getChannels().isEmpty()) {
+  const variables = template.variables();
+  if (!channels.length) {
     logger.info("No channels found");
     logger.info("Exit");
     return;
   }
+  const groups = new Collection(channels).groupBy((channel) => {
+    let groupId = "";
+    for (const key in channel) {
+      if (variables.includes(key)) {
+        const obj = channel.toObject();
+        groupId += obj[key];
+      }
+    }
+    return groupId;
+  });
   logger.info("Processing...");
   for (let groupId of groups.keys()) {
     const group = groups.get(groupId);
-    const channels = new Collection(group);
+    const groupChannels = new Collection(group);
     let programs = new Collection();
     let index = 1;
     let days = configObject.days;
     const maxConnections = configObject.maxConnections;
-    const total = channels.count() * days;
+    const total = groupChannels.count() * days;
     const utcDate = getUTCDate(process.env.CURR_DATE);
     const dates = Array.from({ length: days }, (_2, i) => utcDate.add(i, "d"));
     let queue = new Collection();
-    channels.forEach((channel) => {
+    groupChannels.forEach((channel) => {
       for (let date of dates) {
         queue.add({ channel, date });
       }
@@ -133,7 +119,7 @@ async function main() {
       taskQueue.wrap(async (queueItem) => {
         const { channel, date } = queueItem;
         if (!channel.logo && configObject.logo) {
-          channel.logo = await grabber.loadLogo({ channel, date });
+          channel.logo = await grabber.loadLogo(channel, date);
         }
         const _programs = await grabber.grab(channel, date, (context, error) => {
           const { channel: channel2, date: date2, programs: programs2 } = context;
@@ -148,8 +134,8 @@ async function main() {
     );
     await Promise$1.all(requests.all());
     programs = programs.uniqBy((program2) => program2.start + program2.channel);
-    const xml = generateXMLTV(channels.all(), programs.all(), utcDate);
-    const channelSample = channels.sample();
+    const xml = EPGGrabber.generateXMLTV(groupChannels.all(), programs.all(), utcDate);
+    const channelSample = groupChannels.sample();
     let outputPath = template.format(channelSample.toObject());
     const outputDir = path.dirname(outputPath);
     fs.mkdirSync(outputDir, { recursive: true });