epg-grabber 0.46.2 → 0.48.0

package/README.md

@@ -368,7 +368,6 @@ And when the download is complete, a ready-to-use guide will appear in the locat
   <tv>
     <channel id="CNN.us">
       <display-name>CNN</display-name>
-      <url>https://example.com</url>
     </channel>
     <programme start="20211116040000 +0000" stop="20211116050000 +0000" channel="CNN.us">
       <title lang="en">News at 10PM</title>

package/dist/cli.js

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
-import { n as name, v as version, d as description, p as parseNumber, l as loadJs, a as parseProxy, E as EPGGrabberMock, b as EPGGrabber, c as defaultConfig, i as isObject, g as getAbsPath, e as getUTCDate } from './index-Bnw63KMN.js';
+#! /usr/bin/env node
+import { n as name, v as version, d as description, p as parseNumber, l as loadJs, a as parseProxy, E as EPGGrabberMock, b as EPGGrabber, c as defaultConfig, i as isObject, g as getAbsPath, e as getUTCDate } from './index-B6SCP9dP.js';
 import { Collection, Template } from '@freearhey/core';
 import { Command, Option } from 'commander';
 import { SocksProxyAgent } from 'socks-proxy-agent';
@@ -220,7 +220,8 @@ async function main() {
       })
     );
     await Promise$1.all(requests.all());
-    const xml = EPGGrabber.generateXMLTV(groupChannels.all(), programs.all(), utcDate);
+    const headers = { date: utcDate.format("YYYYMMDD") };
+    const xml = EPGGrabber.generateXMLTV(groupChannels.all(), programs.all(), headers);
     const channelSample = groupChannels.sample();
     let outputPath = template.format(channelSample.toObject());
     const outputDir = path$1.dirname(outputPath);

package/dist/{index-Bnw63KMN.js → index-B6SCP9dP.js}

@@ -35,9 +35,6 @@ function parseNumber(value) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function isDate(date) {
-  return dayjs(date).isValid();
-}
 function isObject(value) {
   return !!value && value.constructor === Object;
 }
@@ -65,9 +62,6 @@ function escapeString(value, defaultValue = "") {
 function formatDate(date, format) {
   return date ? dayjs.utc(date).format(format) : "";
 }
-function toURL(domain) {
-  return domain ? `https://${domain}` : "";
-}
 function createXMLElement(name, attrs, children) {
   return convertXMLElementToString({ name, attrs, children });
 }
@@ -102,7 +96,7 @@ function toArray(value) {
 }
 
 var name = "epg-grabber";
-var version = "0.46.1";
+var version = "0.48.0";
 var description = "Node.js CLI tool for grabbing EPG from different sites";
 var homepage = "https://github.com/freearhey/epg-grabber";
 
@@ -145,7 +139,7 @@ class Channel {
     this.site_id = data.site_id;
     this.lang = data.lang;
     this.logo = data.logo;
-    this.url = data.url || toURL(data.site);
+    this.url = data.url;
     this.lcn = data.lcn;
     this.index = data.index !== void 0 ? data.index : -1;
   }
@@ -528,10 +522,13 @@ class Program {
       ...this.length.map(
         (length) => el("length", { units: length.units }, [escapeString(length.value)])
       ),
+      ...this.icons.map(
+        (icon) => el("icon", { src: icon.src, width: icon.width, height: icon.height })
+      ),
+      ...this.urls.map(createURLElement),
       ...this.countries.map(
         (country) => el("country", { lang: country.lang }, [escapeString(country.value)])
       ),
-      ...this.urls.map(createURLElement),
       ...this.episodeNumbers.map(
         (episode) => el("episode-num", { system: episode.system }, [escapeString(episode.value)])
       ),
@@ -599,10 +596,7 @@ class Program {
           [escapeString(review.value || "")]
         )
       ),
-      ...this.images.map(createImageElement),
-      ...this.icons.map(
-        (icon) => el("icon", { src: icon.src, width: icon.width, height: icon.height })
-      )
+      ...this.images.map(createImageElement)
     ];
     return el(
       "programme",
@@ -799,18 +793,15 @@ class EPGGrabber {
     ).filter(Boolean);
     return channels;
   }
-  static generateXMLTV(channels, programs, date = getUTCDate()) {
+  static generateXMLTV(channels, programs, headers) {
     if (!channels.every((channel) => channel instanceof Channel)) {
       throw new Error('"channels" must be an array of Channels');
     }
     if (!programs.every((program) => program instanceof Program)) {
       throw new Error('"programs" must be an array of Programs');
     }
-    if (!isDate(date)) {
-      throw new Error('"date" must be a valid date');
-    }
     let output = `<?xml version="1.0" encoding="UTF-8" ?>`;
-    output += createXMLElement("tv", { date: formatDate(date, "YYYYMMDD") }, [
+    output += createXMLElement("tv", headers, [
       ...channels.map((channel) => "\r\n" + channel.toXML()),
       ...programs.map((program) => "\r\n" + program.toXML()),
       "\r\n"

package/dist/index.d.ts

@@ -710,7 +710,7 @@ declare class EPGGrabber {
     loadLogo(channel: Channel, date: string | number | Date | Dayjs | null, config?: SiteConfig): Promise<string | null>;
     grab(channel: Channel, date: string | number | Date | Dayjs | null, config?: SiteConfig | GrabCallback, callback?: GrabCallback): Promise<Program[]>;
     static parseChannelsXML(xml: string): Channel[];
-    static generateXMLTV(channels: Channel[], programs: Program[], date?: Dayjs): string;
+    static generateXMLTV(channels: Channel[], programs: Program[], headers?: Record<string, string>): string;
 }
 declare class EPGGrabberMock extends EPGGrabber {
     grab(channel: Channel, date: string | number | Date | Dayjs | null, config?: SiteConfig | GrabCallback, callback?: GrabCallback): Promise<Program[]>;

package/dist/index.js

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
-export { C as Channel, b as EPGGrabber, E as EPGGrabberMock, P as Program } from './index-Bnw63KMN.js';
+#! /usr/bin/env node
+export { C as Channel, b as EPGGrabber, E as EPGGrabberMock, P as Program } from './index-B6SCP9dP.js';
 import 'axios-mock-adapter';
 import 'lodash.merge';
 import 'xml-js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.46.2",
+  "version": "0.48.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "homepage": "https://github.com/freearhey/epg-grabber",
   "preferGlobal": true,
@@ -18,7 +18,8 @@
     "build": "pkgroll --clean-dist",
     "dev": "pkgroll --watch",
     "lint": "npx eslint ./src/**/*.ts ./tests/**/*.ts",
-    "test": "npx vitest run"
+    "test": "npx vitest run",
+    "prepublishOnly": "npm run build"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/cli.ts

@@ -12,7 +12,6 @@ import defaultConfig from './default.config'
 import { Program, Channel } from './models'
 import { Logger } from './core/logger'
 import { SiteConfig } from './types'
-import { AxiosHeaders } from 'axios'
 import { TaskQueue } from 'cwait'
 import merge from 'lodash.merge'
 import Promise from 'bluebird'
@@ -265,7 +264,8 @@ async function main() {
 
     await Promise.all(requests.all())
 
-    const xml = EPGGrabber.generateXMLTV(groupChannels.all(), programs.all(), utcDate)
+    const headers = { date: utcDate.format('YYYYMMDD') }
+    const xml = EPGGrabber.generateXMLTV(groupChannels.all(), programs.all(), headers)
     const channelSample = groupChannels.sample()
     let outputPath = template.format(channelSample.toObject() as { [key: string]: any })
     const outputDir = path.dirname(outputPath)

package/src/index.ts

@@ -1,4 +1,4 @@
-import { sleep, getUTCDate, isPromise, isDate, createXMLElement, formatDate } from './core/utils'
+import { sleep, getUTCDate, isPromise, createXMLElement } from './core/utils'
 import { ProgramParserResult } from './types/program'
 import AxiosMockAdapter from 'axios-mock-adapter'
 import { SiteConfig } from './types/siteConfig'
@@ -136,7 +136,7 @@ export class EPGGrabber {
   static generateXMLTV(
     channels: Channel[],
     programs: Program[],
-    date: Dayjs = getUTCDate()
+    headers?: Record<string, string>
   ): string {
     if (!channels.every((channel: Channel) => channel instanceof Channel)) {
       throw new Error('"channels" must be an array of Channels')
@@ -146,12 +146,8 @@ export class EPGGrabber {
       throw new Error('"programs" must be an array of Programs')
     }
 
-    if (!isDate(date)) {
-      throw new Error('"date" must be a valid date')
-    }
-
     let output = `<?xml version="1.0" encoding="UTF-8" ?>`
-    output += createXMLElement('tv', { date: formatDate(date, 'YYYYMMDD') }, [
+    output += createXMLElement('tv', headers, [
       ...channels.map((channel: Channel) => '\r\n' + channel.toXML()),
       ...programs.map((program: Program) => '\r\n' + program.toXML()),
       '\r\n'

package/src/models/channel.ts

@@ -1,4 +1,4 @@
-import { toURL, escapeString, createXMLElement } from '../core/utils'
+import { escapeString, createXMLElement } from '../core/utils'
 import { ChannelData } from '../types/channel'
 import xmlJs from 'xml-js'
 
@@ -20,7 +20,7 @@ export class Channel {
     this.site_id = data.site_id
     this.lang = data.lang
     this.logo = data.logo
-    this.url = data.url || toURL(data.site)
+    this.url = data.url
     this.lcn = data.lcn
     this.index = data.index !== undefined ? data.index : -1
   }

package/src/models/program.ts

@@ -438,10 +438,13 @@ export class Program {
       ...this.length.map(length =>
         el('length', { units: length.units }, [escapeString(length.value)])
       ),
+      ...this.icons.map(icon =>
+        el('icon', { src: icon.src, width: icon.width, height: icon.height })
+      ),
+      ...this.urls.map(createURLElement),
       ...this.countries.map(country =>
         el('country', { lang: country.lang }, [escapeString(country.value)])
       ),
-      ...this.urls.map(createURLElement),
       ...this.episodeNumbers.map(episode =>
         el('episode-num', { system: episode.system }, [escapeString(episode.value)])
       ),
@@ -513,10 +516,7 @@ export class Program {
           [escapeString(review.value || '')]
         )
       ),
-      ...this.images.map(createImageElement),
-      ...this.icons.map(icon =>
-        el('icon', { src: icon.src, width: icon.width, height: icon.height })
-      )
+      ...this.images.map(createImageElement)
     ]
 
     return el(

package/tests/__data__/expected/channels_array.guide.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="3TV.com"><display-name>3 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
-<channel id="4TV.com"><display-name>4 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
-<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>
-<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example.com</url></channel>
+<channel id="3TV.com"><display-name>3 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
+<channel id="4TV.com"><display-name>4 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="3TV.com"><title>Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="3TV.com"><title>Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="2TV.com"><title>Program1</title></programme>

package/tests/__data__/expected/example.guide.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url><lcn>36</lcn></channel>
-<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example.com</url></channel>
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><lcn>36</lcn></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="1TV.com"><title lang="fr">Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="1TV.com"><title lang="fr">Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="2TV.com"><title>Program1</title></programme>

package/tests/__data__/expected/fr/1TV.com.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url><lcn>36</lcn></channel>
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><lcn>36</lcn></channel>
 </tv>

package/tests/__data__/expected/index.guide.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?><tv date="20220505">
+<channel id="1TV.co"><display-name>1 TV</display-name><icon src="https://example.com/channel_one_icon.jpg"/><url>https://example.com/channel_one?foo=foo&amp;bar=bar</url><lcn>36</lcn></channel>
+<channel id="2TV.co"><display-name>2 TV</display-name><icon src="https://example.com/logos/2TV.png"/></channel>
+<channel id="3TV.co"><display-name>3 TV</display-name></channel>
+<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.co"><title>Program 1</title><sub-title>Sub-title &amp; 1</sub-title><desc>Description for Program 1</desc><credits><director>Director 1<url system="TestSystem">http://example.com/director1.html</url><image>https://example.com/image1.jpg</image><image type="person" size="2" orient="P" system="TestSystem">https://example.com/image2.jpg</image></director><director>Director 2</director><actor>Actor 1</actor><actor>Actor 2</actor><writer>Writer 1</writer></credits><date>20220506</date><category>Test</category><keyword lang="en">physical-comedy</keyword><keyword lang="en">romantic</keyword><language>English</language><orig-language lang="en">French</orig-language><length units="minutes">60</length><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/><url>http://example.com/title.html</url><country>US</country><episode-num system="xmltv_ns">8.238.0/1</episode-num><episode-num system="onscreen">S09E239</episode-num><video><present>yes</present><colour>no</colour><aspect>16:9</aspect><quality>HDTV</quality></video><audio><present>yes</present><stereo>Dolby Digital</stereo></audio><previously-shown/><premiere>First time on British TV</premiere><last-chance lang="en">Last time on this channel</last-chance><new/><subtitles type="teletext"><language>English</language></subtitles><subtitles type="onscreen"><language lang="en">Spanish</language></subtitles><rating system="MPAA"><value>P&amp;G</value><icon src="http://example.com/pg_symbol.png"/></rating><star-rating system="TV Guide"><value>4/5</value><icon src="stars.png"/></star-rating><star-rating system="IMDB"><value>8/10</value></star-rating><review type="text" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">This is a fantastic show!</review><review type="text" source="IDMB" reviewer="Jane Doe" lang="en">I love this show!</review><review type="url" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">https://example.com/programme_one_review</review><image type="poster" size="1" orient="P" system="tvdb">https://tvdb.com/programme_one_poster_1.jpg?foo=foo&amp;bar=bar</image><image type="poster" size="2" orient="P" system="tmdb">https://tmdb.com/programme_one_poster_2.jpg</image><image type="backdrop" size="3" orient="L" system="tvdb">https://tvdb.com/programme_one_backdrop_3.jpg</image><image type="backdrop" size="3" orient="L" system="tmdb">https://tmdb.com/programme_one_backdrop_3.jpg</image></programme>
+<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="2TV.co"><title lang="es">Program 2</title></programme>
+</tv>

package/tests/__data__/expected/mini.guide.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url><lcn>36</lcn></channel>
-<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><lcn>36</lcn></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name></channel>
 </tv>

package/tests/__data__/expected/undefined/2TV.com.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="2TV.com"><display-name>2 TV</display-name><url>https://example.com</url></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name></channel>
 </tv>

package/tests/__data__/expected/wildcard.guide.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?><tv date="20251028">
-<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/><url>https://example.com</url></channel>
-<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example.com</url></channel>
-<channel id="3TV.com"><display-name>3 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
-<channel id="4TV.com"><display-name>4 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/><url>https://example2.com</url></channel>
+<channel id="1TV.com"><display-name>1 TV</display-name><icon src="https://example.com/logos/1TV.png"/></channel>
+<channel id="2TV.com"><display-name>2 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
+<channel id="3TV.com"><display-name>3 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
+<channel id="4TV.com"><display-name>4 TV</display-name><icon src="http://example.com/logos/1TV.png?x=шеллы&amp;sid=777"/></channel>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="1TV.com"><title lang="fr">Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="4TV.com"><title>Program1</title></programme>
 <programme start="20220101000000 +0000" stop="20220101010000 +0000" channel="3TV.com"><title>Program1</title></programme>

package/tests/index.test.ts

@@ -7,8 +7,10 @@ import { EPGGrabber, EPGGrabberMock } from '../src/index'
 import { SiteConfig } from '../src/types/siteConfig'
 import * as epgGrabber from '../src/index'
 import { http, HttpResponse } from 'msw'
+import { pathToFileURL } from 'node:url'
 import { setupServer } from 'msw/node'
 import path from 'node:path'
+import dayjs from 'dayjs'
 import fs from 'fs-extra'
 
 describe('EPGGrabber', () => {
@@ -444,11 +446,11 @@ describe('EPGGrabber', () => {
         })
       ]
 
-      const output = EPGGrabber.generateXMLTV(channels, programs)
+      const output = EPGGrabber.generateXMLTV(channels, programs, { date: dayjs.utc().format('YYYYMMDD') })
 
-      expect(output).toBe(
-        '<?xml version="1.0" encoding="UTF-8" ?><tv date="20220505">\r\n<channel id="1TV.co"><display-name>1 TV</display-name><icon src="https://example.com/channel_one_icon.jpg"/><url>https://example.com/channel_one?foo=foo&amp;bar=bar</url><lcn>36</lcn></channel>\r\n<channel id="2TV.co"><display-name>2 TV</display-name><icon src="https://example.com/logos/2TV.png"/><url>https://example.com</url></channel>\r\n<channel id="3TV.co"><display-name>3 TV</display-name><url>https://example.com</url></channel>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="1TV.co"><title>Program 1</title><sub-title>Sub-title &amp; 1</sub-title><desc>Description for Program 1</desc><credits><director>Director 1<url system="TestSystem">http://example.com/director1.html</url><image>https://example.com/image1.jpg</image><image type="person" size="2" orient="P" system="TestSystem">https://example.com/image2.jpg</image></director><director>Director 2</director><actor>Actor 1</actor><actor>Actor 2</actor><writer>Writer 1</writer></credits><date>20220506</date><category>Test</category><keyword lang="en">physical-comedy</keyword><keyword lang="en">romantic</keyword><language>English</language><orig-language lang="en">French</orig-language><length units="minutes">60</length><country>US</country><url>http://example.com/title.html</url><episode-num system="xmltv_ns">8.238.0/1</episode-num><episode-num system="onscreen">S09E239</episode-num><video><present>yes</present><colour>no</colour><aspect>16:9</aspect><quality>HDTV</quality></video><audio><present>yes</present><stereo>Dolby Digital</stereo></audio><previously-shown/><premiere>First time on British TV</premiere><last-chance lang="en">Last time on this channel</last-chance><new/><subtitles type="teletext"><language>English</language></subtitles><subtitles type="onscreen"><language lang="en">Spanish</language></subtitles><rating system="MPAA"><value>P&amp;G</value><icon src="http://example.com/pg_symbol.png"/></rating><star-rating system="TV Guide"><value>4/5</value><icon src="stars.png"/></star-rating><star-rating system="IMDB"><value>8/10</value></star-rating><review type="text" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">This is a fantastic show!</review><review type="text" source="IDMB" reviewer="Jane Doe" lang="en">I love this show!</review><review type="url" source="Rotten Tomatoes" reviewer="Joe Bloggs" lang="en">https://example.com/programme_one_review</review><image type="poster" size="1" orient="P" system="tvdb">https://tvdb.com/programme_one_poster_1.jpg?foo=foo&amp;bar=bar</image><image type="poster" size="2" orient="P" system="tmdb">https://tmdb.com/programme_one_poster_2.jpg</image><image type="backdrop" size="3" orient="L" system="tvdb">https://tvdb.com/programme_one_backdrop_3.jpg</image><image type="backdrop" size="3" orient="L" system="tmdb">https://tmdb.com/programme_one_backdrop_3.jpg</image><icon src="https://example.com/images/Program1.png?x=шеллы&amp;sid=777"/></programme>\r\n<programme start="20210319060000 +0000" stop="20210319063000 +0000" channel="2TV.co"><title lang="es">Program 2</title></programme>\r\n</tv>'
-      )
+      expect(output).toEqual(
+    fs.readFileSync(pathToFileURL('tests/__data__/expected/index.guide.xml'), 'utf8')
+  )
     })
   })
 })