alicezetion 1.8.4 → 1.8.6

package/utils.js

@@ -1,23 +1,39 @@
 "use strict";
 
-let request = require("request").defaults({ jar: true });
+const bluebird = require("bluebird");
+let request = bluebird.promisify(require("request").defaults({ jar: true, proxy: process.env.FB_PROXY }));
 const stream = require("stream");
 const log = require("npmlog");
 const querystring = require("querystring");
 const url = require("url");
 
-function setProxy(proxy) {
-  if (typeof proxy == 'string')
-    request = require("request").defaults({ jar: true, proxy });
-  else request = request;
-  return;
+class CustomError extends Error {
+	constructor(obj) {
+		if (typeof obj === 'string')
+			obj = { message: obj };
+		if (typeof obj !== 'object' || obj === null)
+			throw new TypeError('Object required');
+		obj.message ? super(obj.message) : super();
+		Object.assign(this, obj);
+	}
+}
+
+function setProxy(url) {
+	if (typeof url == "undefined")
+		return request = bluebird.promisify(require("request").defaults({
+			jar: true
+		}));
+	return request = bluebird.promisify(require("request").defaults({
+		jar: true,
+		proxy: url
+	}));
 }
 
 function getHeaders(url, options, ctx, customHeader) {
-	var headers = {
+	const headers = {
 		"Content-Type": "application/x-www-form-urlencoded",
 		Referer: "https://www.facebook.com/",
-		Host: new URL(url).hostname,
+		Host: url.replace("https://", "").split("/")[0],
 		Origin: "https://www.facebook.com",
 		"User-Agent": options.userAgent,
 		Connection: "keep-alive",
@@ -26,10 +42,9 @@ function getHeaders(url, options, ctx, customHeader) {
 	if (customHeader) {
 		Object.assign(headers, customHeader);
 	}
-  if (customHeader && customHeader.noRef) 
-    delete headers.Referer;
-	if (ctx && ctx.region) 
-    headers["X-MSGR-Region"] = ctx.region;
+	if (ctx && ctx.region) {
+		headers["X-MSGR-Region"] = ctx.region;
+	}
 
 	return headers;
 }
@@ -43,7 +58,7 @@ function isReadableStream(obj) {
 	);
 }
 
-function get(url, jar, qs, options, ctx, customHeader) {
+function get(url, jar, qs, options, ctx) {
 	// I'm still confused about this
 	if (getType(qs) === "Object") {
 		for (const prop in qs) {
@@ -53,7 +68,7 @@ function get(url, jar, qs, options, ctx, customHeader) {
 		}
 	}
 	const op = {
-		headers: getHeaders(url, options, ctx, customHeader),
+		headers: getHeaders(url, options, ctx),
 		timeout: 60000,
 		qs: qs,
 		url: url,
@@ -62,39 +77,31 @@ function get(url, jar, qs, options, ctx, customHeader) {
 		gzip: true
 	};
 
-  var callback;
-  var returnPromise = new Promise(function (resolve, reject) {
-    callback = (error, data) => error != null ? reject(error) : resolve(data);
-  });
-  request(op, callback);
-
-	return returnPromise;
+	return request(op).then(function (res) {
+		return Array.isArray(res) ? res[0] : res;
+	});
 }
 
 function post(url, jar, form, options, ctx, customHeader) {
-	var op = {
-    headers: getHeaders(url, options, ctx, customHeader),
-    timeout: 60000,
+	const op = {
+		headers: getHeaders(url, options, ctx, customHeader),
+		timeout: 60000,
 		url: url,
 		method: "POST",
 		form: form,
 		jar: jar,
 		gzip: true
-	}
-
-	var callback;
-  var returnPromise = new Promise(function (resolve, reject) {
-    callback = (error, data) => error != null ? reject(error) : resolve(data);
-  });
-  request(op, callback);
+	};
 
-	return returnPromise;
+	return request(op).then(function (res) {
+		return Array.isArray(res) ? res[0] : res;
+	});
 }
 
 function postFormData(url, jar, form, qs, options, ctx) {
-	var headers = getHeaders(url, options, ctx);
+	const headers = getHeaders(url, options, ctx);
 	headers["Content-Type"] = "multipart/form-data";
-	var op = {
+	const op = {
 		headers: headers,
 		timeout: 60000,
 		url: url,
@@ -105,13 +112,9 @@ function postFormData(url, jar, form, qs, options, ctx) {
 		gzip: true
 	};
 
-	var callback;
-  var returnPromise = new Promise(function (resolve, reject) {
-    callback = (error, data) => error != null ? reject(error) : resolve(data);
-  });
-  request(op, callback);
-
-	return returnPromise;
+	return request(op).then(function (res) {
+		return Array.isArray(res) ? res[0] : res;
+	});
 }
 
 function padZeros(val, len) {
@@ -748,7 +751,6 @@ function formatDeltaMessage(m) {
 			m_offset[i] + m_length[i]
 		);
 	}
-
 	return {
 		type: "message",
 		senderID: formatID(md.actorFbId.toString()),
@@ -761,7 +763,7 @@ function formatDeltaMessage(m) {
 		mentions: mentions,
 		timestamp: md.timestamp,
 		isGroup: !!md.threadKey.threadFbId,
-    participantIDs: m.delta.participants
+		participantIDs: m.delta.participants || (md.cid ? md.cid.canonicalParticipantFbids : []) || []
 	};
 }
 
@@ -857,10 +859,6 @@ function formatHistoryMessage(m) {
 // Get a more readable message type for AdminTextMessages
 function getAdminTextMessageType(type) {
 	switch (type) {
-    case 'unpin_messages_v2':
-      return 'log:unpin-message';
-    case 'pin_messages_v2':
-      return 'log:pin-message';
 		case "change_thread_theme":
 			return "log:thread-color";
 		case "change_thread_icon":
@@ -935,7 +933,7 @@ function formatDeltaEvent(m) {
 		logMessageBody: m.messageMetadata.adminText,
 		timestamp: m.messageMetadata.timestamp,
 		author: m.messageMetadata.actorFbId,
-    participantIDs: m.participants
+		participantIDs: (m.participants || []).map(p => p.toString())
 	};
 }
 
@@ -996,7 +994,7 @@ function getFrom(str, startToken, endToken) {
 	const lastHalf = str.substring(start);
 	const end = lastHalf.indexOf(endToken);
 	if (end === -1) {
-		throw Error(
+		throw new Error(
 			"Could not find endTime `" + endToken + "` in the given string."
 		);
 	}
@@ -1086,17 +1084,16 @@ function makeDefaults(html, userID, ctx) {
 		//
 		//              Ben - July 15th 2017
 		const newObj = {
-      av: userID,
 			__user: userID,
 			__req: (reqCounter++).toString(36),
 			__rev: revision,
 			__a: 1,
-			//__af: siteData.features,
+			// __af: siteData.features,
 			fb_dtsg: ctx.fb_dtsg ? ctx.fb_dtsg : fb_dtsg,
 			jazoest: ctx.ttstamp ? ctx.ttstamp : ttstamp
-			//__spin_r: siteData.__spin_r,
-			//__spin_b: siteData.__spin_b,
-			//__spin_t: siteData.__spin_t,
+			// __spin_r: siteData.__spin_r,
+			// __spin_b: siteData.__spin_b,
+			// __spin_t: siteData.__spin_t,
 		};
 
 		// @TODO this is probably not needed.
@@ -1147,78 +1144,118 @@ function makeDefaults(html, userID, ctx) {
 	};
 }
 
-function parseAndCheckLogin(ctx, http, retryCount) {
-  var delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-  var _try = (tryData) => new Promise(function (resolve, reject) {
-    try {
-      resolve(tryData());
-    } catch (error) {
-      reject(error);
-    }
-  });
-  if (retryCount == undefined) retryCount = 0;
-  
+function parseAndCheckLogin(ctx, defaultFuncs, retryCount, sourceCall) {
+	if (retryCount == undefined) {
+		retryCount = 0;
+	}
+	if (sourceCall == undefined) {
+		try {
+			throw new Error();
+		}
+		catch (e) {
+			sourceCall = e;
+		}
+	}
 	return function (data) {
-    function any() {
-      log.verbose("parseAndCheckLogin", data.body);
-      if (data.statusCode >= 500 && data.statusCode < 600) {
-        if (retryCount >= 5) {
-          const err = new Error("Request retry failed. Check the `res` and `statusCode` property on this error.");
-					err.statusCode = data.statusCode;
-					err.res = data.body;
-					err.error = "Request retry failed. Check the `res` and `statusCode` property on this error.";
-					throw err;
-        }
-        retryCount++;
-        const retryTime = Math.floor(Math.random() * 5000);
-        log.warn("parseAndCheckLogin", "Got status code " + data.statusCode + " - " + retryCount + ". attempt to retry in " + retryTime + " milliseconds...");
-				const url = data.request.uri.protocol + "//" + data.request.uri.hostname + data.request.uri.pathname;
-        if (data.request.headers["Content-Type"].split(";")[0] === "multipart/form-data") {
-					return delay(retryTime)
-            .then(function () {
-              return http
-                .postFormData(url, ctx.jar, data.request.formData);
-            })
-            .then(parseAndCheckLogin(ctx, http, retryCount));
-        }
-        else {
-          return delay(retryTime)
-            .then(function () {
-              return http
-                .post(url, ctx.jar, data.request.formData);
-            })
-            .then(parseAndCheckLogin(ctx, http, retryCount));
-        }
-      }
-      if (data.statusCode !== 200)
-				throw new Error("parseAndCheckLogin got status code: " + data.statusCode + ". Bailing out of trying to parse response.");
-      
-      let res = null;
+		return bluebird.try(function () {
+			log.verbose("parseAndCheckLogin", data.body);
+			if (data.statusCode >= 500 && data.statusCode < 600) {
+				if (retryCount >= 5) {
+					throw new CustomError({
+						message: "Request retry failed. Check the `res` and `statusCode` property on this error.",
+						statusCode: data.statusCode,
+						res: data.body,
+						error: "Request retry failed. Check the `res` and `statusCode` property on this error.",
+						sourceCall: sourceCall
+					});
+				}
+				retryCount++;
+				const retryTime = Math.floor(Math.random() * 5000);
+				log.warn(
+					"parseAndCheckLogin",
+					"Got status code " +
+					data.statusCode +
+					" - " +
+					retryCount +
+					". attempt to retry in " +
+					retryTime +
+					" milliseconds..."
+				);
+				const url =
+					data.request.uri.protocol +
+					"//" +
+					data.request.uri.hostname +
+					data.request.uri.pathname;
+				if (
+					data.request.headers["Content-Type"].split(";")[0] ===
+					"multipart/form-data"
+				) {
+					return bluebird
+						.delay(retryTime)
+						.then(function () {
+							return defaultFuncs.postFormData(
+								url,
+								ctx.jar,
+								data.request.formData,
+								{}
+							);
+						})
+						.then(parseAndCheckLogin(ctx, defaultFuncs, retryCount, sourceCall));
+				}
+				else {
+					return bluebird
+						.delay(retryTime)
+						.then(function () {
+							return defaultFuncs.post(url, ctx.jar, data.request.formData);
+						})
+						.then(parseAndCheckLogin(ctx, defaultFuncs, retryCount, sourceCall));
+				}
+			}
+			if (data.statusCode !== 200)
+				throw new CustomError({
+					message: "parseAndCheckLogin got status code: " + data.statusCode + ". Bailing out of trying to parse response.",
+					statusCode: data.statusCode,
+					res: data.body,
+					error: "parseAndCheckLogin got status code: " + data.statusCode + ". Bailing out of trying to parse response.",
+					sourceCall: sourceCall
+				});
+
+			let res = null;
 			try {
 				res = JSON.parse(makeParsable(data.body));
-      } catch (e) {
-				const err = new Error("JSON.parse error. Check the `detail` property on this error.");
-				err.error = "JSON.parse error. Check the `detail` property on this error.";
-				err.detail = e;
-				err.res = data.body;
-				throw err;
+			} catch (e) {
+				throw new CustomError({
+					message: "JSON.parse error. Check the `detail` property on this error.",
+					detail: e,
+					res: data.body,
+					error: "JSON.parse error. Check the `detail` property on this error.",
+					sourceCall: sourceCall
+				});
 			}
 
 			// In some cases the response contains only a redirect URL which should be followed
 			if (res.redirect && data.request.method === "GET") {
-				return http
+				return defaultFuncs
 					.get(res.redirect, ctx.jar)
-					.then(parseAndCheckLogin(ctx, http));
-      }
+					.then(parseAndCheckLogin(ctx, defaultFuncs, undefined, sourceCall));
+			}
 
 			// TODO: handle multiple cookies?
-			if (res.jsmods && res.jsmods.require && Array.isArray(res.jsmods.require[0]) && res.jsmods.require[0][0] === "Cookie") {
-        res.jsmods.require[0][3][0] = res.jsmods.require[0][3][0].replace("_js_", "");
-        const cookie = formatCookie(res.jsmods.require[0][3], "facebook");
+			if (
+				res.jsmods &&
+				res.jsmods.require &&
+				Array.isArray(res.jsmods.require[0]) &&
+				res.jsmods.require[0][0] === "Cookie"
+			) {
+				res.jsmods.require[0][3][0] = res.jsmods.require[0][3][0].replace(
+					"_js_",
+					""
+				);
+				const cookie = formatCookie(res.jsmods.require[0][3], "facebook");
 				const cookie2 = formatCookie(res.jsmods.require[0][3], "messenger");
 				ctx.jar.setCookie(cookie, "https://www.facebook.com");
 				ctx.jar.setCookie(cookie2, "https://www.messenger.com");
-      }
+			}
 
 			// On every request we check if we got a DTSG and we mutate the context so that we use the latest
 			// one for the next requests.
@@ -1238,16 +1275,33 @@ function parseAndCheckLogin(ctx, http, retryCount) {
 			}
 
 			if (res.error === 1357001) {
-				const err = new Error('Facebook blocked login. Please visit https://facebook.com and check your account.');
-				err.error = "Not logged in.";
-				throw err;
+				throw new CustomError({
+					message: "Facebook blocked login. Please visit https://facebook.com and check your account.",
+					error: "Not logged in.",
+					res: res,
+					statusCode: data.statusCode,
+					sourceCall: sourceCall
+				});
 			}
 			return res;
-		}
-		return _try(any);
+		});
 	};
 }
 
+function checkLiveCookie(ctx, defaultFuncs) {
+	return defaultFuncs
+		.get("https://m.facebook.com/me", ctx.jar)
+		.then(function (res) {
+			if (res.body.indexOf(ctx.i_userID || ctx.userID) === -1) {
+				throw new CustomError({
+					message: "Not logged in.",
+					error: "Not logged in."
+				});
+			}
+			return true;
+		});
+}
+
 function saveCookies(jar) {
 	return function (res) {
 		const cookies = res.headers["set-cookie"] || [];
@@ -1379,6 +1433,7 @@ function decodeClientPayload(payload) {
 function getAppState(jar) {
 	return jar
 		.getCookies("https://www.facebook.com")
+		.concat(jar.getCookies("https://facebook.com"))
 		.concat(jar.getCookies("https://www.messenger.com"));
 }
 
@@ -1396,8 +1451,9 @@ function createAccess_token(jar, globalOptions) {
       })
   }
 }
-
+  
 module.exports = {
+	CustomError,
 	isReadableStream,
 	get,
 	post,
@@ -1436,5 +1492,6 @@ module.exports = {
 	getAppState,
 	getAdminTextMessageType,
 	setProxy,
+	checkLiveCookie,
   createAccess_token
 }

package/src/addExternalModule.js

@@ -1,17 +0,0 @@
-'use strict';
-
-var utils = require('../utils');
-
-module.exports = function (http, api, ctx) {
-  return function addExternalModule(moduleObj) {
-    if (utils.getType(moduleObj) == 'Object') {
-      for (let name in moduleObj) {
-        if (utils.getType(moduleObj[name]) == 'Function') 
-          api[name] = moduleObj[name](http, api, ctx);
-        else 
-          throw new Error(`Item "${name}" in moduleObj must be a function, not ${utils.getType(moduleObj[name])}!`);
-      }
-    } else
-      throw new Error(`moduleObj must be an object, not ` + utils.getType(moduleObj) + `!`);
-  }
-}

package/src/addUserToGroup.js

@@ -1,113 +0,0 @@
-"use strict";
-
-const utils = require("../utils");
-const log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-	return function addUserToGroup(userID, threadID, callback) {
-		let resolveFunc = function () { };
-		let rejectFunc = function () { };
-		const returnPromise = new Promise(function (resolve, reject) {
-			resolveFunc = resolve;
-			rejectFunc = reject;
-		});
-
-		if (
-			!callback &&
-			(utils.getType(threadID) === "Function" ||
-				utils.getType(threadID) === "AsyncFunction")
-		) {
-			throw new utils.CustomError({ error: "please pass a threadID as a second argument." });
-		}
-
-		if (!callback) {
-			callback = function (err) {
-				if (err) {
-					return rejectFunc(err);
-				}
-				resolveFunc();
-			};
-		}
-
-		if (
-			utils.getType(threadID) !== "Number" &&
-			utils.getType(threadID) !== "String"
-		) {
-			throw new utils.CustomError({
-				error:
-					"ThreadID should be of type Number or String and not " +
-					utils.getType(threadID) +
-					"."
-			});
-		}
-
-		if (utils.getType(userID) !== "Array") {
-			userID = [userID];
-		}
-
-		const messageAndOTID = utils.generateOfflineThreadingID();
-		const form = {
-			client: "mercury",
-			action_type: "ma-type:log-message",
-			author: "fbid:" + (ctx.i_userID || ctx.userID),
-			thread_id: "",
-			timestamp: Date.now(),
-			timestamp_absolute: "Today",
-			timestamp_relative: utils.generateTimestampRelative(),
-			timestamp_time_passed: "0",
-			is_unread: false,
-			is_cleared: false,
-			is_forward: false,
-			is_filtered_content: false,
-			is_filtered_content_bh: false,
-			is_filtered_content_account: false,
-			is_spoof_warning: false,
-			source: "source:chat:web",
-			"source_tags[0]": "source:chat",
-			log_message_type: "log:subscribe",
-			status: "0",
-			offline_threading_id: messageAndOTID,
-			message_id: messageAndOTID,
-			threading_id: utils.generateThreadingID(ctx.clientID),
-			manual_retry_cnt: "0",
-			thread_fbid: threadID
-		};
-
-		for (let i = 0; i < userID.length; i++) {
-			if (
-				utils.getType(userID[i]) !== "Number" &&
-				utils.getType(userID[i]) !== "String"
-			) {
-				throw new utils.CustomError({
-					error:
-						"Elements of userID should be of type Number or String and not " +
-						utils.getType(userID[i]) +
-						"."
-				});
-			}
-
-			form["log_message_data[added_participants][" + i + "]"] =
-				"fbid:" + userID[i];
-		}
-
-		defaultFuncs
-			.post("https://www.facebook.com/messaging/send/", ctx.jar, form)
-			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-			.then(function (resData) {
-				if (!resData) {
-					throw new utils.CustomError({ error: "Add to group failed." });
-				}
-				if (resData.error) {
-					throw new utils.CustomError(resData);
-				}
-
-				return callback();
-			})
-			.catch(function (err) {
-				log.error("addUserToGroup", err);
-				return callback(err);
-			});
-
-		return returnPromise;
-	};
-};

package/src/changeAdminStatus.js

@@ -1,79 +0,0 @@
-"use strict";
-
-const utils = require("../utils");
-const log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-	return function changeAdminStatus(threadID, adminIDs, adminStatus, callback) {
-		if (utils.getType(threadID) !== "String") {
-			throw new utils.CustomError({ error: "changeAdminStatus: threadID must be a string" });
-		}
-
-		if (utils.getType(adminIDs) === "String") {
-			adminIDs = [adminIDs];
-		}
-
-		if (utils.getType(adminIDs) !== "Array") {
-			throw new utils.CustomError({ error: "changeAdminStatus: adminIDs must be an array or string" });
-		}
-
-		if (utils.getType(adminStatus) !== "Boolean") {
-			throw new utils.CustomError({ error: "changeAdminStatus: adminStatus must be a string" });
-		}
-
-		let resolveFunc = function () { };
-		let rejectFunc = function () { };
-		const returnPromise = new Promise(function (resolve, reject) {
-			resolveFunc = resolve;
-			rejectFunc = reject;
-		});
-
-		if (!callback) {
-			callback = function (err) {
-				if (err) {
-					return rejectFunc(err);
-				}
-				resolveFunc();
-			};
-		}
-
-		if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
-			throw new utils.CustomError({ error: "changeAdminStatus: callback is not a function" });
-		}
-
-		const form = {
-			"thread_fbid": threadID
-		};
-
-		let i = 0;
-		for (const u of adminIDs) {
-			form[`admin_ids[${i++}]`] = u;
-		}
-		form["add"] = adminStatus;
-
-		defaultFuncs
-			.post("https://www.facebook.com/messaging/save_admins/?dpr=1", ctx.jar, form)
-			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-			.then(function (resData) {
-				if (resData.error) {
-					switch (resData.error) {
-						case 1976004:
-							throw new utils.CustomError({ error: "Cannot alter admin status: you are not an admin.", rawResponse: resData });
-						case 1357031:
-							throw new utils.CustomError({ error: "Cannot alter admin status: this thread is not a group chat.", rawResponse: resData });
-						default:
-							throw new utils.CustomError({ error: "Cannot alter admin status: unknown error.", rawResponse: resData });
-					}
-				}
-
-				callback();
-			})
-			.catch(function (err) {
-				log.error("changeAdminStatus", err);
-				return callback(err);
-			});
-
-		return returnPromise;
-	};
-};
-