Update scripts

scripts/core/grabber.ts

@@ -70,6 +70,10 @@ export class Grabber {
               }
             }
 
+            if (this.options.curl === true) {
+              config.curl = true
+            }
+
             const _programs = await this.grabber.grab(
               channel,
               date,

scripts/core/guideManager.ts

@@ -29,7 +29,7 @@ export class GuideManager {
     const pathTemplate = new StringTemplate(this.options.output)
 
     const groupedChannels = this.channels
-      .orderBy([(channel: Channel) => channel.xmltv_id])
+      .orderBy([(channel: Channel) => channel.index, (channel: Channel) => channel.xmltv_id])
       .uniqBy((channel: Channel) => `${channel.xmltv_id}:${channel.site}:${channel.lang}`)
       .groupBy((channel: Channel) => {
         return pathTemplate.format({ lang: channel.lang || 'en', site: channel.site || '' })

scripts/core/proxyParser.ts

@@ -2,9 +2,9 @@ import { URL } from 'node:url'
 
 type ProxyParserResult = {
   protocol: string | null
-  auth: {
-    username: string | null
-    password: string | null
+  auth?: {
+    username?: string
+    password?: string
   }
   host: string
   port: number | null
@@ -14,14 +14,18 @@ export class ProxyParser {
   parse(_url: string): ProxyParserResult {
     const parsed = new URL(_url)
 
-    return {
+    const result: ProxyParserResult = {
       protocol: parsed.protocol.replace(':', '') || null,
-      auth: {
-        username: parsed.username || null,
-        password: parsed.password || 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
   }
 }

scripts/core/queueCreator.ts

@@ -35,8 +35,10 @@ export class QueueCreator {
     const channelsContent = await this.dataStorage.json('channels.json')
     const channels = new Collection(channelsContent).map(data => new Channel(data))
 
+    let index = 0
     const queue = new Queue()
     for (const channel of this.parsedChannels.all()) {
+      channel.index = index++
       if (!channel.site || !channel.site_id || !channel.name) continue
 
       const configPath = path.resolve(SITES_DIR, `${channel.site}/${channel.site}.config.js`)