Comparing version 1.0.10 to 1.0.11
14
index.js
@@ -149,4 +149,7 @@ function escape(s) { | ||
if (process.cwd().like('*portal')) { | ||
browser.data_dir = browser.path.join(process.cwd(), '/social-data'); | ||
browser.data_dir = browser.path.join(process.cwd(), 'social-data'); | ||
} | ||
browser.Partitions_data_dir = browser.path.join(browser.data_dir, 'default' , 'Partitions'); | ||
browser.electron.app.setPath('userData', browser.path.join(browser.data_dir, 'default')); | ||
@@ -614,6 +617,6 @@ browser.electron.app.setPath('crashDumps', browser.path.join(browser.data_dir, 'crashes')); | ||
let content = browser.readFileSync(default_path); | ||
browser.var[name] = content ? browser.parseJson(content) : {}; | ||
browser.var[name] = content ? browser.parseJson(content) : name.like('*list*') ? [] : {}; | ||
} else { | ||
let content = browser.readFileSync(path); | ||
browser.var[name] = content ? browser.parseJson(content) || {} : {}; | ||
browser.var[name] = content ? browser.parseJson(content) : name.like('*list*') ? [] : {}; | ||
} | ||
@@ -676,2 +679,3 @@ | ||
}); | ||
if (name == 'proxy' || name == 'session_list') { | ||
@@ -777,3 +781,3 @@ if (browser.handleSessions) { | ||
browser.request = require('request'); | ||
browser.request = require('node-fetch'); | ||
@@ -792,2 +796,3 @@ require(__dirname + '/lib/cookie.js')(browser); | ||
browser.get_var('proxy_list'); | ||
browser.get_var('preload_list'); | ||
@@ -808,2 +813,3 @@ browser.get_var('white_list'); | ||
browser.get_var('bookmarks'); | ||
browser.get_var('video_quality_list'); | ||
@@ -810,0 +816,0 @@ browser.get_var('vip'); |
module.exports = function (browser) { | ||
browser.var.download_list = browser.var.download_list || []; | ||
browser.var.download_list = browser.var.download_list || [] | ||
browser.downloadFile_mt = function (file_url, targetPath, onProgress, done) { | ||
const mt = require('mt-downloader'); | ||
let mt_list = [] | ||
console.log('mt-downloader downloadFile ::' + file_url) | ||
onProgress = onProgress || function () {} | ||
done = done || function () {} | ||
onProgress(-1, -1, file_url) | ||
let id = browser.guid() | ||
let mt_list = []; | ||
console.log('mt-downloader downloadFile ::' + file_url); | ||
onProgress = onProgress || function () {}; | ||
done = done || function () {}; | ||
onProgress(-1, -1, file_url); | ||
let id = browser.guid(); | ||
let mt_object = { | ||
@@ -20,39 +17,37 @@ id: id, | ||
info: { | ||
done: false | ||
} | ||
} | ||
mt_list.push(mt_object) | ||
done: false, | ||
}, | ||
}; | ||
mt_list.push(mt_object); | ||
mt.CreateMTDFile({ | ||
url: file_url, | ||
path: targetPath | ||
}).subscribe(result => { | ||
path: targetPath, | ||
}).subscribe((result) => { | ||
if (result[0] == 'written$') { | ||
mt_object.mtd.written = result[1] | ||
mt_object.mtd.written = result[1]; | ||
} else if (result[0] == 'remoteFileSize$') { | ||
mt_object.mtd.remoteFileSize = result[1] | ||
mt_object.mtd.remoteFileSize = result[1]; | ||
} else if (result[0] == 'fdW$') { | ||
mt_object.mtd.fdW = result[1] | ||
mt_object.mtd.fd$ = result | ||
mt_object.mtd.fdW = result[1]; | ||
mt_object.mtd.fd$ = result; | ||
} else if (result[0] == 'meta$') { | ||
mt_object.mtd.meta = result[1] | ||
mt.DownloadFromMTDFile(mt_object.mtd.meta.mtdPath).subscribe(info => { | ||
mt_object.mtd.meta = result[1]; | ||
mt.DownloadFromMTDFile(mt_object.mtd.meta.mtdPath).subscribe((info) => { | ||
if (info[0] == 'metaWritten$') { | ||
mt_object.info.metaWritten = info[1] | ||
mt_object.info.metaWritten = info[1]; | ||
} else if (info[0] == 'response$') { | ||
mt_object.info.response = info[1] | ||
mt_object.info.response = info[1]; | ||
} else if (info[0] == 'responses$') { | ||
mt_object.info.responses = info[1] | ||
mt_object.info.responses = info[1]; | ||
} else if (info[0] == 'localFileSize$') { | ||
mt_object.info.localFileSize = info[1] | ||
mt_object.info.localFileSize = info[1]; | ||
} else if (info[0] == 'fdR$') { | ||
mt_object.info.fdR = info[1] | ||
mt_object.info.fdR = info[1]; | ||
} else if (info[0] == 'metaPosition$') { | ||
mt_object.info.metaPosition = info[1] | ||
mt_object.info.metaPosition = info[1]; | ||
} else if (info[0] == 'meta$') { | ||
mt_object.info.meta = info[1] | ||
mt_object.info.meta$ = info | ||
let done = true | ||
mt_object.info.meta = info[1]; | ||
mt_object.info.meta$ = info; | ||
let done = true; | ||
@@ -62,19 +57,17 @@ mt_object.info.meta.threads.forEach((thread, i) => { | ||
if (thread[1] != mt_object.info.meta.offsets[i]) { | ||
done = false | ||
done = false; | ||
} | ||
} else { | ||
if (thread[1] + 1 != mt_object.info.meta.offsets[i]) { | ||
done = false | ||
done = false; | ||
} | ||
} | ||
}); | ||
}) | ||
if (done) { | ||
console.log('completing ...................') | ||
console.log('completing ...................'); | ||
mt.FinalizeDownload({ | ||
fd$: mt_object.mtd.fd$, | ||
meta$: Observable.of(mt_object.mtd.meta) | ||
}) | ||
meta$: Observable.of(mt_object.mtd.meta), | ||
}); | ||
} | ||
@@ -84,11 +77,8 @@ | ||
} | ||
}) | ||
}); | ||
} | ||
}); | ||
}) | ||
return; | ||
return | ||
let dl = { | ||
@@ -102,84 +92,79 @@ id: id, | ||
path: targetPath, | ||
status: 'connecting...' | ||
} | ||
status: 'connecting...', | ||
}; | ||
browser.var.download_list.push(dl) | ||
browser.set_var('download_list', browser.var.download_list) | ||
browser.var.download_list.push(dl); | ||
browser.set_var('download_list', browser.var.download_list); | ||
}; | ||
} | ||
browser.tryDownload = function (url) { | ||
// browser.tryDownloadURL(url) | ||
console.log('tryDownload ::' + url) | ||
browser.mainWindow.webContents.downloadURL(url.replace('#___new_tab___' , '').replace('#___new_window__' , '').replace('#___trusted_window___', '')) // download from session will-download | ||
} | ||
console.log('tryDownload ::' + url); | ||
browser.mainWindow.webContents.downloadURL(url.replace('#___new_tab___', '').replace('#___new_window__', '').replace('#___trusted_window___', '')); // download from session will-download | ||
}; | ||
browser.tryDownloadURL0 = function (item) { | ||
if (typeof item === 'string') { | ||
item = { | ||
url: item.replace('#___new_tab___' , '').replace('#___new_window__' , '').replace('#___trusted_window___', ''), | ||
name: browser.path.basename(item).replace('#___new_tab___' , '').replace('#___new_window__' , '').replace('#___trusted_window___', '') | ||
} | ||
}else{ | ||
item.url = item.url.replace('#___new_tab___' , '').replace('#___new_window__' , '').replace('#___trusted_window___', '') | ||
item.name = item.name.replace('#___new_tab___' , '').replace('#___new_window__' , '').replace('#___trusted_window___', '') | ||
url: item.replace('#___new_tab___', '').replace('#___new_window__', '').replace('#___trusted_window___', ''), | ||
name: browser.path.basename(item).replace('#___new_tab___', '').replace('#___new_window__', '').replace('#___trusted_window___', ''), | ||
}; | ||
} else { | ||
item.url = item.url.replace('#___new_tab___', '').replace('#___new_window__', '').replace('#___trusted_window___', ''); | ||
item.name = item.name.replace('#___new_tab___', '').replace('#___new_window__', '').replace('#___trusted_window___', ''); | ||
} | ||
browser.backAllViews() | ||
browser.dialog.showSaveDialog({ | ||
defaultPath: item.name, | ||
title: "Save Downloading URL As", | ||
properties: ["openFile", "createDirectory"] | ||
}).then(( | ||
result) => { | ||
if (result.canceled) { | ||
return | ||
} | ||
browser.downloadFile0( | ||
item.url, | ||
result.filePath, | ||
(recived, total, url) => {}, | ||
info => { | ||
browser.dialog.showMessageBox({ | ||
title: "Download Complete", | ||
type: "info", | ||
buttons: ["Open File", "Open Folder", "Close"], | ||
message: `Downloaded URL \n ${info.url} \n To \n ${info.path} ` | ||
}, | ||
result => { | ||
browser.shell.beep() | ||
if (result.response == 1) { | ||
browser.shell.showItemInFolder(info.path) | ||
} | ||
if (result.response == 0) { | ||
browser.shell.openItem(info.path) | ||
} | ||
} | ||
) | ||
browser.backAllViews(); | ||
browser.dialog | ||
.showSaveDialog({ | ||
defaultPath: item.name, | ||
title: 'Save Downloading URL As', | ||
properties: ['openFile', 'createDirectory'], | ||
}) | ||
.then((result) => { | ||
if (result.canceled) { | ||
return; | ||
} | ||
) | ||
}) | ||
} | ||
browser.downloadFile0( | ||
item.url, | ||
result.filePath, | ||
(recived, total, url) => {}, | ||
(info) => { | ||
browser.dialog.showMessageBox( | ||
{ | ||
title: 'Download Complete', | ||
type: 'info', | ||
buttons: ['Open File', 'Open Folder', 'Close'], | ||
message: `Downloaded URL \n ${info.url} \n To \n ${info.path} `, | ||
}, | ||
(result) => { | ||
browser.shell.beep(); | ||
if (result.response == 1) { | ||
browser.shell.showItemInFolder(info.path); | ||
} | ||
if (result.response == 0) { | ||
browser.shell.openItem(info.path); | ||
} | ||
}, | ||
); | ||
}, | ||
); | ||
}); | ||
}; | ||
browser.downloadFile0 = function (file_url, targetPath, onProgress, done , is_hidden) { | ||
browser.downloadFile0 = function (file_url, targetPath, onProgress, done, is_hidden) { | ||
onProgress = onProgress || function () {}; | ||
done = done || function () {}; | ||
onProgress = onProgress || function () {} | ||
done = done || function () {} | ||
onProgress(-1, -1, file_url); | ||
onProgress(-1, -1, file_url) | ||
var request = browser.request; | ||
var fs = browser.fs; | ||
var request = browser.request | ||
var fs = browser.fs | ||
var received_bytes = 0; | ||
var total_bytes = 0; | ||
let id = browser.guid(); | ||
var received_bytes = 0 | ||
var total_bytes = 0 | ||
let id = browser.guid() | ||
let dl = { | ||
@@ -193,70 +178,79 @@ date: new Date(), | ||
id: id, | ||
status: 'connecting...' | ||
} | ||
status: 'connecting...', | ||
}; | ||
if(!is_hidden){ | ||
browser.var.download_list.push(dl) | ||
browser.set_var('download_list', browser.var.download_list) | ||
if (!is_hidden) { | ||
browser.var.download_list.push(dl); | ||
browser.set_var('download_list', browser.var.download_list); | ||
} | ||
var req = request({ | ||
method: "GET", | ||
url: file_url, | ||
request(file_url, { | ||
headers: { | ||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36' | ||
} | ||
}) | ||
var out = fs.createWriteStream(targetPath) | ||
req.pipe(out) | ||
req.on("response", function (data) { | ||
total_bytes = parseInt(data.headers["content-length"]) | ||
if(!is_hidden){ | ||
browser.var.download_list.forEach(dd => { | ||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36', | ||
}, | ||
}).then((res) => { | ||
var out = fs.createWriteStream(targetPath); | ||
res.body.pipe(out); | ||
if (!is_hidden) { | ||
browser.var.download_list.forEach((dd) => { | ||
if (dd.id === id) { | ||
dd.total = total_bytes | ||
dd.status = 'starting...' | ||
dd.status = 'completed'; | ||
} | ||
}) | ||
}); | ||
browser.set_var('download_list', browser.var.download_list); | ||
} | ||
}) | ||
req.on("data", function (chunk) { | ||
received_bytes += chunk.length | ||
if(!is_hidden){ | ||
browser.var.download_list.forEach(dd => { | ||
if (dd.id === id) { | ||
dd.received = received_bytes | ||
dd.status = 'downloading...' | ||
} | ||
}) | ||
} | ||
onProgress(received_bytes, total_bytes, file_url) | ||
}) | ||
req.on("end", function () { | ||
if(!is_hidden){ | ||
browser.var.download_list.forEach(dd => { | ||
if (dd.id === id) { | ||
dd.status = 'completed' | ||
} | ||
}) | ||
browser.set_var('download_list', browser.var.download_list) | ||
} | ||
setTimeout(() => { | ||
done({ | ||
url: file_url, | ||
path: targetPath | ||
}) | ||
path: targetPath, | ||
}); | ||
}, 300); | ||
return; | ||
req.on('response', function (data) { | ||
total_bytes = parseInt(data.headers['content-length']); | ||
if (!is_hidden) { | ||
browser.var.download_list.forEach((dd) => { | ||
if (dd.id === id) { | ||
dd.total = total_bytes; | ||
dd.status = 'starting...'; | ||
} | ||
}); | ||
} | ||
}); | ||
}) | ||
} | ||
req.on('data', function (chunk) { | ||
received_bytes += chunk.length; | ||
if (!is_hidden) { | ||
browser.var.download_list.forEach((dd) => { | ||
if (dd.id === id) { | ||
dd.received = received_bytes; | ||
dd.status = 'downloading...'; | ||
} | ||
}); | ||
} | ||
onProgress(received_bytes, total_bytes, file_url); | ||
}); | ||
} | ||
req.on('end', function () { | ||
if (!is_hidden) { | ||
browser.var.download_list.forEach((dd) => { | ||
if (dd.id === id) { | ||
dd.status = 'completed'; | ||
} | ||
}); | ||
browser.set_var('download_list', browser.var.download_list); | ||
} | ||
setTimeout(() => { | ||
done({ | ||
url: file_url, | ||
path: targetPath, | ||
}); | ||
}, 300); | ||
}); | ||
}); | ||
}; | ||
}; |
@@ -48,4 +48,2 @@ module.exports = function (browser) { | ||
ipcMain.handle('get_var', async (event, info) => { | ||
if (info.name == '*') { | ||
@@ -75,2 +73,6 @@ return browser.var; | ||
ipcMain.on('show_message', (e, info) => { | ||
browser.call('show_message', info); | ||
}); | ||
ipcMain.on('online-status', (event, info) => { | ||
@@ -152,4 +154,3 @@ browser.online = info.status; | ||
if (info.name == 'open new tab') { | ||
console.log('event new tab fire'); | ||
console.log(info); | ||
console.log('open new tab', info); | ||
info.win_id = info.win_id || browser.current_view.id; | ||
@@ -458,2 +459,5 @@ if (info.source == 'session') { | ||
view.zoom = factor - 0.2; | ||
if (view.zoom < 0) { | ||
view.zoom = 0; | ||
} | ||
win.webContents.zoomFactor = view.zoom; | ||
@@ -638,2 +642,7 @@ } | ||
ipcMain.on('new-view', (e, info) => { | ||
info.url = info.url || browser.var.core.default_page; | ||
if (info.url.endsWith('.sb')) { | ||
info.url = 'https://www.google.com/search?q=' + info.url.replace('.sb', ''); | ||
} | ||
if (browser.addressbarWindow) { | ||
@@ -658,6 +667,7 @@ browser.addressbarWindow.hide(); | ||
user_name: info.user_name, | ||
user_agent: info.user_agent, | ||
zoom: 1, | ||
}; | ||
browser.views.push(new_view); | ||
if (browser.views.length == 0) { | ||
if (true || browser.views.length == 0) { | ||
browser.current_view = new_view; | ||
@@ -668,4 +678,10 @@ browser.mainWindow.webContents.send('render_message', { | ||
url: decodeURI(info.url), | ||
title: decodeURI(info.url), | ||
}); | ||
browser.mainWindow.webContents.send('render_message', { | ||
name: 'update-title', | ||
title: decodeURI(info.url), | ||
tab_id: browser.current_view._id, | ||
}); | ||
browser.mainWindow.webContents.send('render_message', { | ||
name: 'update-audio', | ||
@@ -681,3 +697,2 @@ tab_id: browser.current_view._id, | ||
}); | ||
browser.hideOthersViews(); | ||
} | ||
@@ -729,2 +744,19 @@ | ||
ipcMain.on('update-view', (e, info) => { | ||
if(!info){ | ||
console.log('Error update-view No Info Exists') | ||
return | ||
} | ||
info.url = info.url || browser.var.core.default_page; | ||
info.url = info.url.replace('#___new_tab___', '').replace('#___new_window___', ''); | ||
let info2 = browser.get_overwrite_info(info.url) | ||
if(info2.overwrite){ | ||
info.url = info2.new_url | ||
} | ||
if (info.url.endsWith('.sb')) { | ||
info.url = 'https://www.google.com/search?q=' + info.url.replace('.sb', ''); | ||
} | ||
if (browser.addressbarWindow) { | ||
@@ -734,5 +766,3 @@ browser.addressbarWindow.hide(); | ||
if (info.url) { | ||
info.url = info.url.replace('#___new_tab___', '').replace('#___new_window___', ''); | ||
} | ||
browser.mainWindow.webContents.send('render_message', { | ||
@@ -753,15 +783,4 @@ name: 'update-url', | ||
browser.var.overwrite.urls.forEach((data) => { | ||
if (info.url.like(data.from)) { | ||
console.log(`\nAuto overwrite redirect \n ${data.to} \n `); | ||
let q = info.url.split('?')[1]; | ||
if (q) { | ||
q = '?' + q; | ||
} else { | ||
q = ''; | ||
} | ||
info.url = data.to + q; | ||
} | ||
}); | ||
console.log(info.url); | ||
console.log('Will Load URL : ' , info.url) | ||
win.loadURL(info.url); | ||
@@ -856,3 +875,23 @@ e.returnValue = win; | ||
}); | ||
ipcMain.on('check_sessions', (e, info) => { | ||
console.log('check_sessions', browser.Partitions_data_dir); | ||
browser.fs.readdirSync(browser.Partitions_data_dir).forEach((file) => { | ||
let s = { name: 'persist:' + file, display: file }; | ||
let exists = false; | ||
browser.var.session_list.forEach((s2) => { | ||
if (s2.name == s.name) { | ||
exists = true; | ||
} | ||
}); | ||
if (!exists) { | ||
browser.var.session_list.push(s) | ||
console.log(s); | ||
} | ||
}); | ||
browser.call('setting.session_list' , {data : browser.var.session_list}) | ||
e.returnValue = { done: true }; | ||
return { done: true }; | ||
}); | ||
} | ||
}; |
@@ -22,2 +22,9 @@ module.exports = function init(browser) { | ||
} | ||
if(browser.addressbarWindow){ | ||
browser.addressbarWindow.send(channel, value) | ||
} | ||
if(browser.userProfileWindow){ | ||
browser.userProfileWindow.send(channel, value) | ||
} | ||
if(browser.window_list){ | ||
@@ -24,0 +31,0 @@ browser.window_list.forEach(view => { |
@@ -21,2 +21,40 @@ module.exports = function (browser) { | ||
browser.get_overwrite_info = function (url) { | ||
let info = { | ||
url: url, | ||
overwrite: false, | ||
new_url: url, | ||
}; | ||
browser.var.overwrite.urls.forEach((data) => { | ||
if (info.overwrite) { | ||
return; | ||
} | ||
if (info.url.like(data.from)) { | ||
if (data.time && new Date().getTime() - data.time < 3000) { | ||
return; | ||
} | ||
if (data.ignore && info.url.like(data.ignore)) { | ||
return; | ||
} | ||
info.new_url = data.to; | ||
console.log(`\n Auto overwrite redirect from \n ${info.url} \n to \n ${info.new_url} \n`); | ||
data.time = new Date().getTime(); | ||
if (data.query !== false) { | ||
let q = url.split('?')[1]; | ||
if (q) { | ||
q = '?' + q; | ||
} else { | ||
q = ''; | ||
} | ||
info.new_url = data.to + q; | ||
} | ||
info.overwrite = true; | ||
return; | ||
} | ||
}); | ||
return info; | ||
}; | ||
let old_sessions = []; | ||
@@ -122,9 +160,9 @@ | ||
ss.webRequest.onBeforeRequest(filter, function (details, callback) { | ||
if(details.url.like('*google.com*')){ | ||
callback({ | ||
cancel: false, | ||
requestHeaders: details.requestHeaders, | ||
}); | ||
return | ||
} | ||
// if(details.url.like('*google.com*')){ | ||
// callback({ | ||
// cancel: false, | ||
// requestHeaders: details.requestHeaders, | ||
// }); | ||
// return | ||
// } | ||
let url = details.url.toLowerCase(); | ||
@@ -134,2 +172,4 @@ let source_url = details['referrer'] || details['host'] || url; | ||
// console.log('source url ' , source_url) | ||
if (url.like('localhost*')) { | ||
@@ -151,27 +191,21 @@ callback({ | ||
let end = false; | ||
browser.var.overwrite.urls.forEach((data) => { | ||
if (end) { | ||
return; | ||
} | ||
if (url.like(data.from)) { | ||
// console.log(`\nAuto overwrite redirect \n ${data.to} \n `) | ||
let q = url.split('?')[1]; | ||
if (q) { | ||
q = '?' + q; | ||
} else { | ||
q = ''; | ||
if (url.like('*linkatcom.com*') && details.method == 'POST') { | ||
console.log(details); | ||
details.uploadData.forEach((d) => { | ||
if (d.bytes) { | ||
console.log(Buffer.from(d.bytes).toString()); | ||
} | ||
callback({ | ||
cancel: false, | ||
redirectURL: data.to + q, | ||
}); | ||
end = true; | ||
return; | ||
} | ||
}); | ||
if (end) { | ||
}); | ||
} | ||
let info = browser.get_overwrite_info(url); | ||
if (info.overwrite) { | ||
callback({ | ||
cancel: false, | ||
redirectURL: info.new_url, | ||
}); | ||
return; | ||
} | ||
let end = false; | ||
browser.var.white_list.forEach((s) => { | ||
@@ -181,3 +215,3 @@ if (end) { | ||
} | ||
if (s.url.length > 2 && source_url.like(s.url)) { | ||
if (s.url.length > 2 && (source_url.like(s.url) || url.like(s.url))) { | ||
callback({ | ||
@@ -221,3 +255,3 @@ cancel: false, | ||
end = true; | ||
console.log(`\n Block un_safe_list : ${s.url} \n`); | ||
console.log(`\n Block un_safe_list : ${s.url} \n ${url} \n`); | ||
} | ||
@@ -269,9 +303,10 @@ }); | ||
ss.webRequest.onBeforeSendHeaders(filter, function (details, callback) { | ||
if(details.url.like('*google.com*')){ | ||
callback({ | ||
cancel: false, | ||
requestHeaders: details.requestHeaders, | ||
}); | ||
return | ||
} | ||
// if(details.url.like('*google.com*')){ | ||
// callback({ | ||
// cancel: false, | ||
// requestHeaders: details.requestHeaders, | ||
// }); | ||
// return | ||
// } | ||
let exit = false; | ||
@@ -289,4 +324,4 @@ | ||
// details.requestHeaders['x-browser'] = `social-browser-${browser.var.core.id}-${d}`; | ||
details.requestHeaders['User-Agent'] = browser.var.core.user_agent; | ||
// console.log(details) | ||
details.requestHeaders['User-Agent'] = details.requestHeaders['User-Agent'] || browser.var.core.user_agent; | ||
browser.var.sites.forEach((site) => { | ||
@@ -309,2 +344,7 @@ if (url.like(site.url)) { | ||
if (browser.var.blocking.social.allow_alexa) { | ||
// Alexa Header | ||
details.requestHeaders['AlexaToolbar-ALX_NS_PH'] = 'AlexaToolbar/alx-4.0.5'; | ||
} | ||
//details.requestHeaders['Referrer-Policy'] = 'no-referrer'; | ||
@@ -391,12 +431,12 @@ | ||
ss.webRequest.onHeadersReceived(filter, function (details, callback) { | ||
if(details.url.like('*google.com*')){ | ||
callback({ | ||
cancel: false, | ||
responseHeaders: { | ||
...details.responseHeaders, | ||
}, | ||
statusLine: details.statusLine, | ||
}); | ||
return | ||
} | ||
// if(details.url.like('*google.com*')){ | ||
// callback({ | ||
// cancel: false, | ||
// responseHeaders: { | ||
// ...details.responseHeaders, | ||
// }, | ||
// statusLine: details.statusLine, | ||
// }); | ||
// return | ||
// } | ||
// delete details.responseHeaders['x-frame-options'] // sameorigin | deny | ||
@@ -412,3 +452,19 @@ // delete details.responseHeaders['Content-Security-Policy'] | ||
let a_Methods = details.responseHeaders['Access-Control-Allow-Methods'] || details.responseHeaders['Access-Control-Allow-Methods'.toLowerCase()]; | ||
['Cross-Origin-Embedder-Policy','Cross-Origin-Opener-Policy','Strict-Transport-Security','Cross-Origin-Resource-Policy','X-XSS-Protection','X-Content-Type-Options','Content-Security-Policy-Report-Only','Content-Security-Policy','Access-Control-Allow-Credentials', 'Access-Control-Allow-Methods', 'Access-Control-Allow-Headers', 'Access-Control-Allow-Origin', 'X-Frame-Options'].forEach((p) => { | ||
// Must Delete Before set new values [duplicate headers] | ||
[ | ||
'Cross-Origin-Embedder-Policy', | ||
'Cross-Origin-Opener-Policy', | ||
'Strict-Transport-Security', | ||
'Cross-Origin-Resource-Policy', | ||
'X-XSS-Protection', | ||
'X-Content-Type-Options', | ||
'Content-Security-Policy-Report-Only', | ||
'Content-Security-Policy', | ||
'Access-Control-Allow-Credentials', | ||
'Access-Control-Allow-Methods', | ||
'Access-Control-Allow-Headers', | ||
'Access-Control-Allow-Origin', | ||
'X-Frame-Options', | ||
].forEach((p) => { | ||
delete details.responseHeaders[p]; | ||
@@ -422,3 +478,4 @@ delete details.responseHeaders[p.toLowerCase()]; | ||
a_Headers || 'Authorization ,Access-Control-Allow-Headers, Access-Control-Request-Method, Access-Control-Request-Headers,Origin, X-Requested-With, Content-Type, Accept'; | ||
details.responseHeaders['Access-Control-Allow-Origin'.toLowerCase()] = a_orgin || '*'; | ||
details.responseHeaders['Access-Control-Allow-Origin'.toLowerCase()] = a_orgin ? [a_orgin[0]] : '*'; | ||
details.responseHeaders['X-Browser'.toLowerCase()] = 'social browser'; | ||
@@ -435,3 +492,2 @@ details.responseHeaders['X-XSS-Protection'.toLowerCase()] = '0'; | ||
}); | ||
}); | ||
@@ -673,3 +729,3 @@ ss.webRequest.onResponseStarted(filter, function (details) {}); | ||
.then((result) => { | ||
// console.log(result); | ||
// console.log(result); | ||
browser.shell.beep(); | ||
@@ -676,0 +732,0 @@ if (result.response == 1) { |
@@ -15,5 +15,6 @@ module.exports = function init(browser) { | ||
console.log('newWindowEvent'); | ||
console.log(this.id); | ||
let view = browser.getView(this.id); | ||
console.log(view); | ||
let view = browser.getView(this.id) || browser.current_view; | ||
let y_url = url || event.url || ''; | ||
@@ -44,3 +45,2 @@ | ||
console.log('call new url from new window ', event.options.url); | ||
console.log(view); | ||
@@ -170,2 +170,3 @@ if (event.options.url.like('*#___new_tab___*')) { | ||
sandbox: false, | ||
webaudio: typeof options.webaudio == 'undefined' ? true : options.webaudio, | ||
enableRemoteModule: true, | ||
@@ -187,2 +188,6 @@ contextIsolation: false, // false -> can access preload window functions | ||
if (options.webaudio === false) { | ||
win.webContents.audioMuted = true; | ||
} | ||
browser.handleViewPosition(win); | ||
@@ -194,2 +199,27 @@ | ||
if (!options.user_agent || options.user_agent == 'undefined') { | ||
options.user_agent = browser.var.core.user_agent; | ||
} | ||
win.setMenuBarVisibility(false); | ||
// console.log('View options' , options) | ||
if (options.proxy) { | ||
// console.log('.........................Proxy Setting ..........................') | ||
win.webContents.session.setProxy({ | ||
proxyRules: options.proxy, | ||
proxyBypassRules: '127.0.0.1' | ||
}); | ||
} | ||
if (options.url) { | ||
win.loadURL(options.url, { | ||
referrer: options.referrer, | ||
userAgent: options.user_agent, | ||
}); | ||
} else { | ||
win.loadURL(browser.var.core.default_page || 'http://127.0.0.1:60080/newTab', { | ||
userAgent: options.user_agent, | ||
}); | ||
} | ||
options.win_id = win.id; | ||
@@ -227,12 +257,2 @@ | ||
win.setMenuBarVisibility(false); | ||
if (options.url) { | ||
win.loadURL(options.url, { | ||
referrer: options.referrer, | ||
}); | ||
} else { | ||
win.loadURL(browser.var.core.default_page || 'http://127.0.0.1:60080/newTab'); | ||
} | ||
win.on('enter-full-screen', (e) => { | ||
@@ -530,3 +550,3 @@ console.log('enter-full-screen'); | ||
contents.on('will-redirect', (e) => { | ||
// console.log('will-redirect') | ||
console.log('will-redirect') | ||
}); | ||
@@ -660,2 +680,6 @@ | ||
browser.newUserProfileWindow = function () { | ||
console.log('browser.newUserProfileWindow'); | ||
if (browser.userProfileWindow) { | ||
return browser.userProfileWindow; | ||
} | ||
let win = new BrowserWindow({ | ||
@@ -705,2 +729,3 @@ parent: browser.mainWindow, | ||
// win.openDevTools() | ||
browser.userProfileWindow = win; | ||
return win; | ||
@@ -739,6 +764,7 @@ }; | ||
options.width = options.width || 1280; | ||
options.height = options.height || 720; | ||
options.x = options.x || 200; | ||
// options.x = options.x > 1200 ? 200 : options.x | ||
options.y = options.y || 200; | ||
// options.y = options.y > 600 ? 200 : options.y | ||
@@ -750,7 +776,7 @@ if (!options.partition && !options.webPreferences.partition) { | ||
let win = new BrowserWindow({ | ||
show: false, | ||
show: typeof options.show !== 'undefined' ? options.show : true, | ||
title: options.title || 'New Window', | ||
alwaysOnTop: options.alwaysOnTop, | ||
width: options.width || 1280, | ||
height: options.height || 720, | ||
width: options.width, | ||
height: options.height, | ||
x: options.x, | ||
@@ -765,4 +791,5 @@ y: options.y, | ||
enableRemoteModule: true, | ||
webaudio: typeof options.webaudio == 'undefined' ? true : options.webaudio, | ||
partition: options.webPreferences.partition || options.partition, | ||
sandbox: typeof options.webPreferences.sandbox !== 'undefined' ? options.webPreferences.sandbox : null, | ||
sandbox: typeof options.webPreferences.sandbox !== 'undefined' ? options.webPreferences.sandbox : false, | ||
preload: typeof options.webPreferences.preload !== 'undefined' ? options.webPreferences.preload : browser.files_dir + '/js/context-menu.js', | ||
@@ -780,3 +807,9 @@ nativeWindowOpen: typeof options.webPreferences.nativeWindowOpen !== 'undefined' ? options.webPreferences.nativeWindowOpen : false, | ||
if (options.webaudio === false) { | ||
win.webContents.audioMuted = true; | ||
} | ||
win.setMenuBarVisibility(false); | ||
if (options.title !== 'Youtube') { | ||
win.center(); | ||
} | ||
@@ -791,2 +824,9 @@ options.win_id = win.id; | ||
win.once('ready-to-show', function () { | ||
if (typeof options.show === 'undefined' || options.show) { | ||
win.hide(); | ||
win.show(); | ||
} | ||
}); | ||
win.on('closed', (e) => { | ||
@@ -804,7 +844,7 @@ browser.window_list.forEach((v, i) => { | ||
win.setMenuBarVisibility(false); | ||
if (options.proxy) { | ||
console.log('Proxy Setting') | ||
win.webContents.session.setProxy({ | ||
proxyRules: options.proxy, | ||
proxyBypassRules: '127.0.0.1' | ||
}); | ||
@@ -819,8 +859,2 @@ } | ||
} | ||
win.once('ready-to-show', function () { | ||
if (typeof options.show === "undefined" || options.show) { | ||
win.show(); | ||
} | ||
}); | ||
@@ -830,2 +864,4 @@ win.webContents.on('dom-ready', (e) => { | ||
// win.webContents.insertCSS(css) | ||
win.setBounds({ width: win.getBounds().width + 1 }); | ||
win.setBounds({ width: win.getBounds().width - 1 }); | ||
}); | ||
@@ -1026,6 +1062,6 @@ | ||
win.show(); | ||
console.log('view show'); | ||
// console.log('view show'); | ||
} else { | ||
win.hide(); | ||
console.log('view hide'); | ||
// console.log('view hide'); | ||
} | ||
@@ -1032,0 +1068,0 @@ } |
{ | ||
"name": "ibrowser", | ||
"version": "1.0.10", | ||
"version": "1.0.11", | ||
"description": "Integration For Social-browser.com", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
148801
3924
1