use splitted lodash modules for better efficiency

scripts/core/dataLoader.ts

@@ -1,103 +1,103 @@
-import type { DataLoaderProps, DataLoaderData } from '../types/dataLoader'
-import cliProgress, { MultiBar } from 'cli-progress'
-import { Storage } from '@freearhey/core'
-import { ApiClient } from './apiClient'
-import numeral from 'numeral'
-
-export class DataLoader {
-  client: ApiClient
-  storage: Storage
-  progressBar: MultiBar
-
-  constructor(props: DataLoaderProps) {
-    this.client = new ApiClient()
-    this.storage = props.storage
-    this.progressBar = new cliProgress.MultiBar({
-      stopOnComplete: true,
-      hideCursor: true,
-      forceRedraw: true,
-      barsize: 36,
-      format(options, params, payload) {
-        const filename = payload.filename.padEnd(18, ' ')
-        const barsize = options.barsize || 40
-        const percent = (params.progress * 100).toFixed(2)
-        const speed = payload.speed ? numeral(payload.speed).format('0.0 b') + '/s' : 'N/A'
-        const total = numeral(params.total).format('0.0 b')
-        const completeSize = Math.round(params.progress * barsize)
-        const incompleteSize = barsize - completeSize
-        const bar =
-          options.barCompleteString && options.barIncompleteString
-            ? options.barCompleteString.substr(0, completeSize) +
-              options.barGlue +
-              options.barIncompleteString.substr(0, incompleteSize)
-            : '-'.repeat(barsize)
-
-        return `${filename} [${bar}] ${percent}% | ETA: ${params.eta}s | ${total} | ${speed}`
-      }
-    })
-  }
-
-  async load(): Promise<DataLoaderData> {
-    const [
-      countries,
-      regions,
-      subdivisions,
-      languages,
-      categories,
-      blocklist,
-      channels,
-      feeds,
-      timezones,
-      guides,
-      streams,
-      logos
-    ] = await Promise.all([
-      this.storage.json('countries.json'),
-      this.storage.json('regions.json'),
-      this.storage.json('subdivisions.json'),
-      this.storage.json('languages.json'),
-      this.storage.json('categories.json'),
-      this.storage.json('blocklist.json'),
-      this.storage.json('channels.json'),
-      this.storage.json('feeds.json'),
-      this.storage.json('timezones.json'),
-      this.storage.json('guides.json'),
-      this.storage.json('streams.json'),
-      this.storage.json('logos.json')
-    ])
-
-    return {
-      countries,
-      regions,
-      subdivisions,
-      languages,
-      categories,
-      blocklist,
-      channels,
-      feeds,
-      timezones,
-      guides,
-      streams,
-      logos
-    }
-  }
-
-  async download(filename: string) {
-    if (!this.storage || !this.progressBar) return
-
-    const stream = await this.storage.createStream(filename)
-    const progressBar = this.progressBar.create(0, 0, { filename })
-
-    this.client
-      .get(filename, {
-        responseType: 'stream',
-        onDownloadProgress({ total, loaded, rate }) {
-          if (total) progressBar.setTotal(total)
-          progressBar.update(loaded, { speed: rate })
-        }
-      })
-      .then(response => {
-        response.data.pipe(stream)
-      })
-  }
-}
+import type { DataLoaderProps, DataLoaderData } from '../types/dataLoader'
+import cliProgress, { MultiBar } from 'cli-progress'
+import { Storage } from '@freearhey/core'
+import { ApiClient } from './apiClient'
+import numeral from 'numeral'
+
+export class DataLoader {
+  client: ApiClient
+  storage: Storage
+  progressBar: MultiBar
+
+  constructor(props: DataLoaderProps) {
+    this.client = new ApiClient()
+    this.storage = props.storage
+    this.progressBar = new cliProgress.MultiBar({
+      stopOnComplete: true,
+      hideCursor: true,
+      forceRedraw: true,
+      barsize: 36,
+      format(options, params, payload) {
+        const filename = payload.filename.padEnd(18, ' ')
+        const barsize = options.barsize || 40
+        const percent = (params.progress * 100).toFixed(2)
+        const speed = payload.speed ? numeral(payload.speed).format('0.0 b') + '/s' : 'N/A'
+        const total = numeral(params.total).format('0.0 b')
+        const completeSize = Math.round(params.progress * barsize)
+        const incompleteSize = barsize - completeSize
+        const bar =
+          options.barCompleteString && options.barIncompleteString
+            ? options.barCompleteString.substr(0, completeSize) +
+              options.barGlue +
+              options.barIncompleteString.substr(0, incompleteSize)
+            : '-'.repeat(barsize)
+
+        return `${filename} [${bar}] ${percent}% | ETA: ${params.eta}s | ${total} | ${speed}`
+      }
+    })
+  }
+
+  async load(): Promise<DataLoaderData> {
+    const [
+      countries,
+      regions,
+      subdivisions,
+      languages,
+      categories,
+      blocklist,
+      channels,
+      feeds,
+      timezones,
+      guides,
+      streams,
+      logos
+    ] = await Promise.all([
+      this.storage.json('countries.json'),
+      this.storage.json('regions.json'),
+      this.storage.json('subdivisions.json'),
+      this.storage.json('languages.json'),
+      this.storage.json('categories.json'),
+      this.storage.json('blocklist.json'),
+      this.storage.json('channels.json'),
+      this.storage.json('feeds.json'),
+      this.storage.json('timezones.json'),
+      this.storage.json('guides.json'),
+      this.storage.json('streams.json'),
+      this.storage.json('logos.json')
+    ])
+
+    return {
+      countries,
+      regions,
+      subdivisions,
+      languages,
+      categories,
+      blocklist,
+      channels,
+      feeds,
+      timezones,
+      guides,
+      streams,
+      logos
+    }
+  }
+
+  async download(filename: string) {
+    if (!this.storage || !this.progressBar) return
+
+    const stream = await this.storage.createStream(filename)
+    const progressBar = this.progressBar.create(0, 0, { filename })
+
+    this.client
+      .get(filename, {
+        responseType: 'stream',
+        onDownloadProgress({ total, loaded, rate }) {
+          if (total) progressBar.setTotal(total)
+          progressBar.update(loaded, { speed: rate })
+        }
+      })
+      .then(response => {
+        response.data.pipe(stream)
+      })
+  }
+}

scripts/core/index.ts

@@ -1,14 +1,14 @@
-export * from './apiClient'
-export * from './channelsParser'
-export * from './configLoader'
-export * from './dataLoader'
-export * from './dataProcessor'
-export * from './grabber'
-export * from './guideManager'
-export * from './htmlTable'
-export * from './issueLoader'
-export * from './issueParser'
-export * from './job'
-export * from './proxyParser'
-export * from './queue'
-export * from './queueCreator'
+export * from './apiClient'
+export * from './channelsParser'
+export * from './configLoader'
+export * from './dataLoader'
+export * from './dataProcessor'
+export * from './grabber'
+export * from './guideManager'
+export * from './htmlTable'
+export * from './issueLoader'
+export * from './issueParser'
+export * from './job'
+export * from './proxyParser'
+export * from './queue'
+export * from './queueCreator'

scripts/core/issueLoader.ts

@@ -1,37 +1,37 @@
-import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods'
-import { paginateRest } from '@octokit/plugin-paginate-rest'
-import { TESTING, OWNER, REPO } from '../constants'
-import { Collection } from '@freearhey/core'
-import { Octokit } from '@octokit/core'
-import { IssueParser } from './'
-
-const CustomOctokit = Octokit.plugin(paginateRest, restEndpointMethods)
-const octokit = new CustomOctokit()
-
-export class IssueLoader {
-  async load(props?: { labels: string[] | string }) {
-    let labels = ''
-    if (props && props.labels) {
-      labels = Array.isArray(props.labels) ? props.labels.join(',') : props.labels
-    }
-    let issues: object[] = []
-    if (TESTING) {
-      issues = (await import('../../tests/__data__/input/sites_update/issues.mjs')).default
-    } else {
-      issues = await octokit.paginate(octokit.rest.issues.listForRepo, {
-        owner: OWNER,
-        repo: REPO,
-        per_page: 100,
-        labels,
-        state: 'open',
-        headers: {
-          'X-GitHub-Api-Version': '2022-11-28'
-        }
-      })
-    }
-
-    const parser = new IssueParser()
-
-    return new Collection(issues).map(parser.parse)
-  }
-}
+import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods'
+import { paginateRest } from '@octokit/plugin-paginate-rest'
+import { TESTING, OWNER, REPO } from '../constants'
+import { Collection } from '@freearhey/core'
+import { Octokit } from '@octokit/core'
+import { IssueParser } from './'
+
+const CustomOctokit = Octokit.plugin(paginateRest, restEndpointMethods)
+const octokit = new CustomOctokit()
+
+export class IssueLoader {
+  async load(props?: { labels: string[] | string }) {
+    let labels = ''
+    if (props && props.labels) {
+      labels = Array.isArray(props.labels) ? props.labels.join(',') : props.labels
+    }
+    let issues: object[] = []
+    if (TESTING) {
+      issues = (await import('../../tests/__data__/input/sites_update/issues.mjs')).default
+    } else {
+      issues = await octokit.paginate(octokit.rest.issues.listForRepo, {
+        owner: OWNER,
+        repo: REPO,
+        per_page: 100,
+        labels,
+        state: 'open',
+        headers: {
+          'X-GitHub-Api-Version': '2022-11-28'
+        }
+      })
+    }
+
+    const parser = new IssueParser()
+
+    return new Collection(issues).map(parser.parse)
+  }
+}