Skip to content

feat: add raw list of segment lines to manifest #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeff-transmit wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add raw list of segment lines to manifest #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee6dd4e
feat: add raw list of segment lines to manifest
jeff-transmit Jul 13, 2021
411792a
added feature flag
jeff-transmit Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ const options = {
});

defaults.dataFiles = dataFiles({
expecteds: {include: 'test/fixtures/integration/*.js', transform: 'js', extensions: false},
manifests: {include: 'test/fixtures/integration/*.m3u8', transform: 'string', extensions: false}
expecteds: {include: 'test/fixtures/integration/without-raw/*.js', transform: 'js', extensions: false},
manifests: {include: 'test/fixtures/integration/without-raw/*.m3u8', transform: 'string', extensions: false},
expectedsWithRaw: {include: 'test/fixtures/integration/with-raw/*.js', transform: 'js', extensions: false},
manifestsWithRaw: {include: 'test/fixtures/integration/with-raw/*.m3u8', transform: 'string', extensions: false}
});

return defaults;
Expand Down
90 changes: 60 additions & 30 deletions src/parse-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ const parseAttributes = function(attributes) {
* @extends Stream
*/
export default class ParseStream extends Stream {
constructor() {
constructor(returnRaw = false) {
super();
this.customParsers = [];
this.tagMappers = [];
this.returnRaw = returnRaw;
}

/**
Expand All @@ -118,7 +119,8 @@ export default class ParseStream extends Stream {
if (line[0] !== '#') {
this.trigger('data', {
type: 'uri',
uri: line
uri: line,
raw: this.returnRaw ? line : undefined
});
return;
}
Expand Down Expand Up @@ -146,7 +148,8 @@ export default class ParseStream extends Stream {
if (newLine.indexOf('#EXT') !== 0) {
this.trigger('data', {
type: 'comment',
text: newLine.slice(1)
text: newLine.slice(1),
raw: this.returnRaw ? newLine : undefined
});
return;
}
Expand All @@ -160,15 +163,17 @@ export default class ParseStream extends Stream {
if (match) {
this.trigger('data', {
type: 'tag',
tagType: 'm3u'
tagType: 'm3u',
raw: this.returnRaw ? newLine : undefined
});
return;
}
match = (/^#EXTINF:?([0-9\.]*)?,?(.*)?$/).exec(newLine);
if (match) {
event = {
type: 'tag',
tagType: 'inf'
tagType: 'inf',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.duration = parseFloat(match[1]);
Expand All @@ -183,7 +188,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'targetduration'
tagType: 'targetduration',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.duration = parseInt(match[1], 10);
Expand All @@ -195,7 +201,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'version'
tagType: 'version',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.version = parseInt(match[1], 10);
Expand All @@ -207,7 +214,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'media-sequence'
tagType: 'media-sequence',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.number = parseInt(match[1], 10);
Expand All @@ -219,7 +227,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'discontinuity-sequence'
tagType: 'discontinuity-sequence',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.number = parseInt(match[1], 10);
Expand All @@ -231,7 +240,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'playlist-type'
tagType: 'playlist-type',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.playlistType = match[1];
Expand All @@ -243,7 +253,8 @@ export default class ParseStream extends Stream {
if (match) {
event = Object.assign(parseByterange(match[1]), {
type: 'tag',
tagType: 'byterange'
tagType: 'byterange',
raw: this.returnRaw ? newLine : undefined
});
this.trigger('data', event);
return;
Expand All @@ -252,7 +263,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'allow-cache'
tagType: 'allow-cache',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.allowed = !(/NO/).test(match[1]);
Expand All @@ -264,7 +276,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'map'
tagType: 'map',
raw: this.returnRaw ? newLine : undefined
};

if (match[1]) {
Expand All @@ -285,7 +298,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'stream-inf'
tagType: 'stream-inf',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.attributes = parseAttributes(match[1]);
Expand Down Expand Up @@ -316,7 +330,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'media'
tagType: 'media',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.attributes = parseAttributes(match[1]);
Expand All @@ -328,23 +343,26 @@ export default class ParseStream extends Stream {
if (match) {
this.trigger('data', {
type: 'tag',
tagType: 'endlist'
tagType: 'endlist',
raw: this.returnRaw ? newLine : undefined
});
return;
}
match = (/^#EXT-X-DISCONTINUITY/).exec(newLine);
if (match) {
this.trigger('data', {
type: 'tag',
tagType: 'discontinuity'
tagType: 'discontinuity',
raw: this.returnRaw ? newLine : undefined
});
return;
}
match = (/^#EXT-X-PROGRAM-DATE-TIME:?(.*)$/).exec(newLine);
if (match) {
event = {
type: 'tag',
tagType: 'program-date-time'
tagType: 'program-date-time',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.dateTimeString = match[1];
Expand All @@ -357,7 +375,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'key'
tagType: 'key',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.attributes = parseAttributes(match[1]);
Expand All @@ -382,7 +401,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'start'
tagType: 'start',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.attributes = parseAttributes(match[1]);
Expand All @@ -397,7 +417,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'cue-out-cont'
tagType: 'cue-out-cont',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.data = match[1];
Expand All @@ -411,7 +432,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'cue-out'
tagType: 'cue-out',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.data = match[1];
Expand All @@ -425,7 +447,8 @@ export default class ParseStream extends Stream {
if (match) {
event = {
type: 'tag',
tagType: 'cue-in'
tagType: 'cue-in',
raw: this.returnRaw ? newLine : undefined
};
if (match[1]) {
event.data = match[1];
Expand All @@ -439,7 +462,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'skip'
tagType: 'skip',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);

Expand All @@ -459,7 +483,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'part'
tagType: 'part',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);
['DURATION'].forEach(function(key) {
Expand All @@ -485,7 +510,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'server-control'
tagType: 'server-control',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);
['CAN-SKIP-UNTIL', 'PART-HOLD-BACK', 'HOLD-BACK'].forEach(function(key) {
Expand All @@ -507,7 +533,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'part-inf'
tagType: 'part-inf',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);
['PART-TARGET'].forEach(function(key) {
Expand All @@ -524,7 +551,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'preload-hint'
tagType: 'preload-hint',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);
['BYTERANGE-START', 'BYTERANGE-LENGTH'].forEach(function(key) {
Expand All @@ -547,7 +575,8 @@ export default class ParseStream extends Stream {
if (match && match[1]) {
event = {
type: 'tag',
tagType: 'rendition-report'
tagType: 'rendition-report',
raw: this.returnRaw ? newLine : undefined
};
event.attributes = parseAttributes(match[1]);
['LAST-MSN', 'LAST-PART'].forEach(function(key) {
Expand All @@ -563,7 +592,8 @@ export default class ParseStream extends Stream {
// unknown tag type
this.trigger('data', {
type: 'tag',
data: newLine.slice(4)
data: newLine.slice(4),
raw: this.returnRaw ? newLine : undefined
});
});
}
Expand Down
Loading