Fix a raw file error caused by facebook CDN violating RFC 2616

This commit is contained in:
Calvin Montgomery 2018-01-21 18:53:16 -08:00
parent e7781b5c09
commit aeab31825e
4 changed files with 26 additions and 4 deletions

View File

@ -2,7 +2,7 @@
"author": "Calvin Montgomery", "author": "Calvin Montgomery",
"name": "CyTube", "name": "CyTube",
"description": "Online media synchronizer and chat", "description": "Online media synchronizer and chat",
"version": "3.53.0", "version": "3.53.1",
"repository": { "repository": {
"url": "http://github.com/calzoneman/sync" "url": "http://github.com/calzoneman/sync"
}, },

View File

@ -46,6 +46,7 @@ class ReferenceCounter {
LOGGER.error("ReferenceCounter::unref() called by caller [" + LOGGER.error("ReferenceCounter::unref() called by caller [" +
caller + "] but this caller had no active references! " + caller + "] but this caller had no active references! " +
`(channel: ${this.channelName})`); `(channel: ${this.channelName})`);
return;
} }
} }

View File

@ -6,6 +6,8 @@ var http = require("http");
var urlparse = require("url"); var urlparse = require("url");
var path = require("path"); var path = require("path");
import { callOnce } from './util/call-once';
const LOGGER = require('@calzoneman/jsli')('ffmpeg'); const LOGGER = require('@calzoneman/jsli')('ffmpeg');
const ECODE_MESSAGES = { const ECODE_MESSAGES = {
ENOTFOUND: e => ( ENOTFOUND: e => (
@ -179,7 +181,19 @@ function testUrl(url, cb, params = { redirCount: 0, cookie: '' }) {
return; return;
} }
LOGGER.error("Error sending preflight request: %s (code=%s) (link: %s)", err.message, err.code, url); // HPE_INVALID_CONSTANT comes from node's HTTP parser because
// facebook's CDN violates RFC 2616 by sending a body even though
// the request uses the HEAD method.
// Avoid logging this because it's a known issue.
if (!(err.code === 'HPE_INVALID_CONSTANT' && /fbcdn/.test(url))) {
LOGGER.error(
"Error sending preflight request: %s (code=%s) (link: %s)",
err.message,
err.code,
url
);
}
cb("An unexpected error occurred while trying to process the link. " + cb("An unexpected error occurred while trying to process the link. " +
"Try again, and contact support for further troubleshooting if the " + "Try again, and contact support for further troubleshooting if the " +
"problem continues." + (!!err.code ? (" Error code: " + err.code) : "")); "problem continues." + (!!err.code ? (" Error code: " + err.code) : ""));
@ -387,7 +401,7 @@ exports.query = function (filename, cb) {
"Ensure that the link begins with 'https://'."); "Ensure that the link begins with 'https://'.");
} }
testUrl(filename, function (err) { testUrl(filename, callOnce(function (err) {
if (err) { if (err) {
return cb(err); return cb(err);
} }
@ -458,5 +472,5 @@ exports.query = function (filename, cb) {
"https://git.io/vrE75 for details."); "https://git.io/vrE75 for details.");
} }
}); });
}); }));
}; };

7
src/util/call-once.js Normal file
View File

@ -0,0 +1,7 @@
export function callOnce(fn) {
let called = false;
return (...args) => {
called || fn(...args), called = true;
}
}