tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-02 02:58:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring Log Logic

Browse Source
This commit is contained in:
suziwen 2024-06-29 10:46:25 +08:00
parent 962bc129cd
commit 3994518c00
13 changed files with 18670 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
omega-target-chromium-extension/overlay/background.html
View File

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>SwitchyOmega Background</title>
</head>
<body>
<canvas id="canvas-icon"></canvas>
<script src="js/log_error.js"></script>
<script src="lib/FileSaver/FileSaver.min.js"></script>
<script src="js/omega_debug.js"></script>
<script src="js/background_preload.js"></script>
<script src="js/omega_pac.min.js"></script>
<script src="js/omega_target.min.js"></script>
<script src="js/omega_target_chromium_extension.min.js"></script>
<script src="img/icons/draw_omega.js"></script>
<script src="js/background.js"></script>
</body>
</html>

108
omega-target-chromium-extension/overlay/log.js Normal file
View File

@ -0,0 +1,108 @@
const logStore = idbKeyval.createStore('log-store', 'log-store');
const dayOfWeek = moment().format('E') // Day of Week (ISO), keep logs max 7 day
const logKey = 'zerolog-' + dayOfWeek
const logSequence = []
let isRunning = false
let splitStr = '\n------------------\n'
const originConsoleLog = console.log
const originConsoleError = console.error
const _logFn = async function(){
if (isRunning) return
isRunning = true
while (logSequence.length > 0) {
const str = logSequence.join('\n');
logSequence.length = 0;
let logInfo = await idbKeyval.get(logKey, logStore)
if (!logInfo || !logInfo.date) {
logInfo = { date: moment().format('YYYY-MM-DD'), val: ''}
}
let { date, val } = logInfo
if ( !date.endsWith(dayOfWeek)) {
val = ''
}
val += splitStr
splitStr = `\n`
val += str
await idbKeyval.set(logKey, { date, val }, logStore)
}
isRunning = false
}
const logFn = (str)=>{
logSequence.push(moment().format('YYYY-MM-DD HH:mm:ss ') + ` ` + str)
_logFn()
}
const replacerFn = (key, value)=>{
switch (key) {
case 'username':
case 'password':
case 'host':
case 'port':
return '<secret>'
default:
return value
}
}
const getStr = function (){
const strArgs = [...arguments].map((obj)=>{
let str = '';
try {
if (typeof obj == 'string') {
str = obj
} else {
str = JSON.stringify(obj, replacerFn, 4)
}
} catch(e){
try {
str = obj.toString()
} catch(e){
}
}
return str
})
return strArgs.join(' ')
}
const ZeroLog = function(){
logFn(getStr.apply(null, arguments))
}
const _lastErrorLogFn = async ()=>{
if (_lastErrorLogFn.isRunning) return
_lastErrorLogFn.isRunning = true
while (_lastErrorLogFn.val) {
const val = _lastErrorLogFn.val
_lastErrorLogFn.val = ''
await idbKeyval.set('lastError', val, logStore)
}
_lastErrorLogFn.isRunning = false
}
const lastErrorLogFn = async ()=>{
const val = getStr.apply(null, arguments)
_lastErrorLogFn.val = val
_lastErrorLogFn()
}
globalThis.ZeroLogInfo = function() {
originConsoleLog.apply(null, arguments)
ZeroLog.apply(null, ['[INFO]', ...arguments])
}
globalThis.ZeroLogError = function(){
originConsoleError.apply(null, arguments)
ZeroLog.apply(null, ['[ERROR]', ...arguments])
lastErrorLogFn.apply(null, arguments)
}
globalThis.ZeroLogClear = async function(){
await idbKeyval.clear(logStore)
}
console.log = ZeroLogInfo
console.error = ZeroLogError

8
omega-target-chromium-extension/overlay/x-background.js
View File

@ -1,10 +1,12 @@
import "./js/background_preload.js" import "./js/background_preload.js"
import "./idb-keyval.js" import "./lib/idb-keyval.js"
import "./lib/moment-with-locales.js"
import "./localstorage-polyfill.js" import "./localstorage-polyfill.js"
import "./csso.js" import "./lib/csso.js"
import "./js/log_error.js" import "./js/log_error.js"
import "./log.js"
//import "./lib/FileSaver/FileSaver.min.js" //import "./lib/FileSaver/FileSaver.min.js"
import "./js/omega_debug.js" //import "./js/omega_debug.js"
import "./js/omega_pac.min.js" import "./js/omega_pac.min.js"
import "./js/omega_target.min.js" import "./js/omega_target.min.js"
import "./js/omega_target_chromium_extension.min.js" import "./js/omega_target_chromium_extension.min.js"

17
omega-target-chromium-extension/src/coffee/background.coffee
View File

@ -5,23 +5,6 @@ Promise.longStackTraces()
OmegaTargetCurrent.Log = Object.create(OmegaTargetCurrent.Log) OmegaTargetCurrent.Log = Object.create(OmegaTargetCurrent.Log)
Log = OmegaTargetCurrent.Log Log = OmegaTargetCurrent.Log
_writeLogToLocalStorage = (content) ->
try
localStorage['log'] += content
catch _
# Maybe we have reached our limit here. See #1288. Try trimming it.
localStorage['log'] = content
Log.log = (args...) ->
console.log(args...)
content = args.map(Log.str.bind(Log)).join(' ') + '\n'
_writeLogToLocalStorage(content)
Log.error = (args...) ->
console.error(args...)
content = args.map(Log.str.bind(Log)).join(' ')
localStorage['logLastError'] = content
_writeLogToLocalStorage('ERROR: ' + content + '\n')
unhandledPromises = [] unhandledPromises = []
unhandledPromisesId = [] unhandledPromisesId = []
unhandledPromisesNextId = 1 unhandledPromisesNextId = 1

45
omega-target-chromium-extension/src/coffee/omega_debug.coffee
View File

@ -1,20 +1,54 @@
logStore = idbKeyval.createStore('log-store', 'log-store')
isProcessing = false
window.OmegaDebug = window.OmegaDebug =
getProjectVersion: -> getProjectVersion: ->
chrome.runtime.getManifest().version chrome.runtime.getManifest().version
getExtensionVersion: -> getExtensionVersion: ->
chrome.runtime.getManifest().version chrome.runtime.getManifest().version
downloadLog: -> downloadLog: ->
blob = new Blob [localStorage['log']], {type: "text/plain;charset=utf-8"} return if isProcessing
filename = "OmegaLog_#{Date.now()}.txt" isProcessing = true
idbKeyval.entries(logStore).then((entries) ->
zip = new JSZip()
zipFolder = zip.folder('ZeroOmega')
entries.forEach((entry) ->
if entry[0] != 'lastError'
zipFolder.file(entry[1].date + '.log', entry[1].val)
)
return zip.generateAsync({
compression: "DEFLATE",
compressionOptions: {
level: 9
},
type: 'blob'
})
).then((blob) ->
filename = "ZeroOmegaLog_#{Date.now()}.zip"
saveAs(blob, filename) saveAs(blob, filename)
isProcessing = false
)
resetOptions: -> resetOptions: ->
return if isProcessing
isProcessing = true
Promise.all([
idbKeyval.clear(logStore),
chrome.storage.local.clear()
]).then( ->
localStorage.clear() localStorage.clear()
# Prevent options loading from sync storage after reload. # Prevent options loading from sync storage after reload.
localStorage['omega.local.syncOptions'] = '"conflict"' localStorage['omega.local.syncOptions'] = '"conflict"'
chrome.storage.local.clear() isProcessing = false
chrome.runtime.reload() chrome.runtime.reload()
)
reportIssue: -> reportIssue: ->
url = 'https://github.com/FelisCatus/SwitchyOmega/issues/new?title=&body=' return if isProcessing
isProcessing = true
idbKeyval.get('lastError', logStore).then((lastError) ->
isProcessing = false
url = 'https://github.com/suziwen/ZeroOmega/issues/new?title=&body='
finalUrl = url finalUrl = url
try try
projectVersion = OmegaDebug.getProjectVersion() projectVersion = OmegaDebug.getProjectVersion()
@ -33,9 +67,10 @@ window.OmegaDebug =
#{env.userAgent} #{env.userAgent}
""" """
finalUrl = url + encodeURIComponent(body) finalUrl = url + encodeURIComponent(body)
err = localStorage['logLastError'] err = lastError or ''
if err if err
body += "\n```\n#{err}\n```" body += "\n```\n#{err}\n```"
finalUrl = (url + encodeURIComponent(body)).substr(0, 2000) finalUrl = (url + encodeURIComponent(body)).substr(0, 2000)
chrome.tabs.create(url: finalUrl) chrome.tabs.create(url: finalUrl)
)

2
omega-target/src/options.coffee
View File

@ -653,7 +653,7 @@ class Options
# updated profile. # updated profile.
### ###
updateProfile: (name, opt_bypass_cache) -> updateProfile: (name, opt_bypass_cache) ->
@log.method('Options#updateProfile', this, arguments) # @log.method('Options#updateProfile', this, arguments)
results = {} results = {}
OmegaPac.Profiles.each @_options, (key, profile) => OmegaPac.Profiles.each @_options, (key, profile) =>
if name? if name?

0
omega-target-chromium-extension/overlay/csso.js → omega-web/lib/csso.js vendored
View File

0
omega-target-chromium-extension/overlay/idb-keyval.js → omega-web/lib/idb-keyval.js vendored
View File

13
omega-web/lib/jszip.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18472
omega-web/lib/moment-with-locales.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1
omega-web/src/coffee/log_error.coffee
View File

@ -1,4 +1,5 @@
window.onerror = (message, url, line, col, err) -> window.onerror = (message, url, line, col, err) ->
console.log('globalThis onerror', arguments)
log = localStorage['log'] || '' log = localStorage['log'] || ''
if err?.stack if err?.stack
log += err.stack + '\n\n' log += err.stack + '\n\n'

1
omega-web/src/coffee/options.coffee
View File

@ -62,7 +62,6 @@ $script.ready ['angular'], ->
$script.ready ['angular', 'omega', 'omega-deps', 'angular-ui-router', $script.ready ['angular', 'omega', 'omega-deps', 'angular-ui-router',
'jquery-ui', 'spectrum', 'filesaver', 'blob', 'angular-ladda', 'jquery-ui', 'spectrum', 'filesaver', 'blob', 'angular-ladda',
'angular-sanitize', 'angular-i18n'], -> 'angular-sanitize', 'angular-i18n'], ->
$script 'js/style.js', 'om-style'
initInjector = angular.injector(['ng']) initInjector = angular.injector(['ng'])
$http = initInjector.get('$http') $http = initInjector.get('$http')
$http.get('./lib/themes/themes.json').then((response) -> $http.get('./lib/themes/themes.json').then((response) ->

3
omega-web/src/options.jade
View File

@ -72,6 +72,9 @@ html(lang='en' ng-controller='MasterCtrl' ng-csp)
span.glyphicon(class="{{alertIcons[alert.type]}}") span.glyphicon(class="{{alertIcons[alert.type]}}")
= ' ' = ' '
| {{alert.i18n ? (alert.i18n | tr) : alert.message}} | {{alert.i18n ? (alert.i18n | tr) : alert.message}}
script(src='lib/moment-with-locales.js')
script(src='lib/idb-keyval.js')
script(src='lib/jszip.min.js')
script(src='js/omega_debug.js') script(src='js/omega_debug.js')
script(src='js/log_error.js') script(src='js/log_error.js')
script(src='lib/script.js/script.min.js') script(src='lib/script.js/script.min.js')