agora-foundation 3.9.0 → 3.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/logger/index.d.ts +2 -0
- package/lib/logger/index.js +3 -1
- package/lib/logger/logger-impl.d.ts +1 -0
- package/lib/logger/logger-impl.js +3 -2
- package/lib/logger/type.d.ts +1 -1
- package/lib/utilities/env.d.ts +3 -1
- package/lib/utilities/env.js +8 -1
- package/lib/utilities/logger.d.ts +5 -2
- package/lib/utilities/logger.js +16 -5
- package/lib/utilities/zip.d.ts +16 -1
- package/lib/utilities/zip.js +518 -99
- package/lib/worker/handler/log-rotate-new.js +8 -5
- package/lib/worker/handler/log.d.ts +1 -1
- package/lib/worker/handler/log.js +6 -3
- package/lib/worker/interactor.d.ts +1 -1
- package/lib/worker/interactor.js +4 -4
- package/lib/worker/worker-installer.js +3 -2
- package/lib-es/logger/index.js +3 -1
- package/lib-es/logger/logger-impl.js +3 -2
- package/lib-es/utilities/env.js +7 -0
- package/lib-es/utilities/logger.js +16 -5
- package/lib-es/utilities/zip.js +517 -98
- package/lib-es/worker/handler/log-rotate-new.js +8 -5
- package/lib-es/worker/handler/log.js +6 -3
- package/lib-es/worker/interactor.js +4 -4
- package/lib-es/worker/worker-installer.js +3 -2
- package/package.json +2 -2
package/lib/logger/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { LogLevel, Logger, LogManager } from './type';
|
|
2
2
|
export declare const getLogger: (opts?: {
|
|
3
3
|
label?: string;
|
|
4
|
+
maxSize?: number;
|
|
4
5
|
}) => Logger;
|
|
5
6
|
export declare const createLogger: (opts?: {
|
|
6
7
|
label?: string;
|
|
@@ -8,6 +9,7 @@ export declare const createLogger: (opts?: {
|
|
|
8
9
|
database?: boolean;
|
|
9
10
|
console?: boolean;
|
|
10
11
|
maxFiles?: number;
|
|
12
|
+
maxSize?: number;
|
|
11
13
|
}) => Logger;
|
|
12
14
|
export declare const getLogManager: () => LogManager;
|
|
13
15
|
export declare const setLogLevel: (_logLevel: LogLevel) => void;
|
package/lib/logger/index.js
CHANGED
|
@@ -50,7 +50,9 @@ var getLogger = exports.getLogger = function getLogger() {
|
|
|
50
50
|
var label = opts.label || 'agora-default';
|
|
51
51
|
if (!_common.loggerRegistrar.has(label)) {
|
|
52
52
|
_common.loggerLabels.add(label);
|
|
53
|
-
_common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {
|
|
53
|
+
_common.loggerRegistrar.set(label, new _loggerImpl.LoggerImpl(label, {
|
|
54
|
+
maxSize: opts.maxSize
|
|
55
|
+
}, {
|
|
54
56
|
console: true,
|
|
55
57
|
database: true
|
|
56
58
|
}, logLevel, (0, _worker.getWorkerSingleton)()));
|
|
@@ -32,9 +32,10 @@ var LoggerImpl = exports.LoggerImpl = /*#__PURE__*/function () {
|
|
|
32
32
|
var path = window.require('path');
|
|
33
33
|
var _window$require = window.require('@electron/remote'),
|
|
34
34
|
app = _window$require.app;
|
|
35
|
-
var logFolderPath = path.resolve(app.getPath('logs'), 'logs');
|
|
35
|
+
var logFolderPath = path.resolve(app.getPath('logs'), 'logs', this._label);
|
|
36
36
|
var maxFiles = _opts.maxFiles || 5;
|
|
37
|
-
|
|
37
|
+
var maxSize = _opts.maxSize || 512;
|
|
38
|
+
_logWorkerInteractor.addFsLogger(_label, logFolderPath, maxFiles, maxSize);
|
|
38
39
|
} else {
|
|
39
40
|
this.warn('window.require is not present, logWorkerInteractor.addFsLogger cannot proceed');
|
|
40
41
|
}
|
package/lib/logger/type.d.ts
CHANGED
|
@@ -22,5 +22,5 @@ export interface LogWorkerInteractor {
|
|
|
22
22
|
lastId: number;
|
|
23
23
|
}>;
|
|
24
24
|
deleteLogs(labels: string[], lastId: number): Promise<void>;
|
|
25
|
-
addFsLogger(label: string, logFolderPath: string, maxFiles: number): void;
|
|
25
|
+
addFsLogger(label: string, logFolderPath: string, maxFiles: number, maxSize: number): void;
|
|
26
26
|
}
|
package/lib/utilities/env.d.ts
CHANGED
|
@@ -4,9 +4,11 @@ export declare enum FcrApplicationPlatform {
|
|
|
4
4
|
MACOS = 2,
|
|
5
5
|
WINDOWS = 3,
|
|
6
6
|
WEB_MOBILE = 6,
|
|
7
|
-
HARMONY = 7
|
|
7
|
+
HARMONY = 7,
|
|
8
|
+
LINUX = 8
|
|
8
9
|
}
|
|
9
10
|
export declare const getPlatform: () => FcrApplicationPlatform;
|
|
10
11
|
export declare const isWindows: () => boolean;
|
|
11
12
|
export declare const windowsVersion: () => string | null;
|
|
12
13
|
export declare const isMac: () => boolean;
|
|
14
|
+
export declare const isLinux: () => boolean;
|
package/lib/utilities/env.js
CHANGED
|
@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.windowsVersion = exports.isWindows = exports.isMac = exports.isElectron = exports.getPlatform = exports.FcrApplicationPlatform = void 0;
|
|
7
|
+
exports.windowsVersion = exports.isWindows = exports.isMac = exports.isLinux = exports.isElectron = exports.getPlatform = exports.FcrApplicationPlatform = void 0;
|
|
8
8
|
require("core-js/modules/es.array.find.js");
|
|
9
9
|
require("core-js/modules/es.array.includes.js");
|
|
10
10
|
require("core-js/modules/es.array.index-of.js");
|
|
@@ -26,6 +26,7 @@ var FcrApplicationPlatform = exports.FcrApplicationPlatform = /*#__PURE__*/funct
|
|
|
26
26
|
FcrApplicationPlatform[FcrApplicationPlatform["WINDOWS"] = 3] = "WINDOWS";
|
|
27
27
|
FcrApplicationPlatform[FcrApplicationPlatform["WEB_MOBILE"] = 6] = "WEB_MOBILE";
|
|
28
28
|
FcrApplicationPlatform[FcrApplicationPlatform["HARMONY"] = 7] = "HARMONY";
|
|
29
|
+
FcrApplicationPlatform[FcrApplicationPlatform["LINUX"] = 8] = "LINUX";
|
|
29
30
|
return FcrApplicationPlatform;
|
|
30
31
|
}({});
|
|
31
32
|
var getPlatform = exports.getPlatform = function getPlatform() {
|
|
@@ -37,6 +38,9 @@ var getPlatform = exports.getPlatform = function getPlatform() {
|
|
|
37
38
|
}, {
|
|
38
39
|
key: 'mac',
|
|
39
40
|
value: FcrApplicationPlatform.MACOS
|
|
41
|
+
}, {
|
|
42
|
+
key: 'linux',
|
|
43
|
+
value: FcrApplicationPlatform.LINUX
|
|
40
44
|
}];
|
|
41
45
|
var platform = platforms.find(function (p) {
|
|
42
46
|
return userAgent.includes(p.key);
|
|
@@ -59,4 +63,7 @@ var windowsVersion = exports.windowsVersion = function windowsVersion() {
|
|
|
59
63
|
};
|
|
60
64
|
var isMac = exports.isMac = function isMac() {
|
|
61
65
|
return getPlatform() === FcrApplicationPlatform.MACOS;
|
|
66
|
+
};
|
|
67
|
+
var isLinux = exports.isLinux = function isLinux() {
|
|
68
|
+
return getPlatform() === FcrApplicationPlatform.LINUX;
|
|
62
69
|
};
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Logger } from '../logger';
|
|
2
2
|
export declare class LoggerManager {
|
|
3
3
|
private _logger;
|
|
4
|
-
private
|
|
5
|
-
|
|
4
|
+
private _label;
|
|
5
|
+
private _maxSize?;
|
|
6
|
+
constructor({ label, maxSize }: {
|
|
6
7
|
label: string;
|
|
8
|
+
maxSize?: number;
|
|
7
9
|
});
|
|
8
10
|
getLogger(): Logger;
|
|
9
11
|
createLogger(opts: {
|
|
@@ -11,4 +13,5 @@ export declare class LoggerManager {
|
|
|
11
13
|
database?: boolean;
|
|
12
14
|
}): Logger;
|
|
13
15
|
generateLogObserver<T>(logger: Logger, callbackMethods: (keyof T | [keyof T, string[]])[]): T;
|
|
16
|
+
release(): void;
|
|
14
17
|
}
|
package/lib/utilities/logger.js
CHANGED
|
@@ -53,6 +53,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
53
53
|
var _bound = require("../decorator/bound");
|
|
54
54
|
var _logSerializer = require("../decorator/log/log-serializer");
|
|
55
55
|
var _logger = require("../logger");
|
|
56
|
+
var _common = require("../logger/common");
|
|
56
57
|
var _misc = require("./misc");
|
|
57
58
|
var _LoggerManager;
|
|
58
59
|
var _initProto;
|
|
@@ -63,12 +64,15 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
|
|
|
63
64
|
function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
|
|
64
65
|
var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
|
|
65
66
|
function LoggerManager(_ref) {
|
|
66
|
-
var label = _ref.label
|
|
67
|
+
var label = _ref.label,
|
|
68
|
+
maxSize = _ref.maxSize;
|
|
67
69
|
(0, _classCallCheck2["default"])(this, LoggerManager);
|
|
68
70
|
(0, _defineProperty2["default"])(this, "_logger", void _initProto(this));
|
|
69
|
-
this.
|
|
71
|
+
this._label = label;
|
|
72
|
+
this._maxSize = maxSize;
|
|
70
73
|
this._logger = (0, _logger.getLogger)({
|
|
71
|
-
label: this.
|
|
74
|
+
label: this._label,
|
|
75
|
+
maxSize: this._maxSize
|
|
72
76
|
});
|
|
73
77
|
}
|
|
74
78
|
return (0, _createClass2["default"])(LoggerManager, [{
|
|
@@ -80,9 +84,10 @@ var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
|
|
|
80
84
|
key: "createLogger",
|
|
81
85
|
value: function createLogger(opts) {
|
|
82
86
|
return (0, _logger.createLogger)({
|
|
83
|
-
label: this.
|
|
87
|
+
label: this._label,
|
|
84
88
|
prefix: "".concat(opts.prefix, "@").concat((0, _misc.randomString)(5)),
|
|
85
|
-
database: opts.database
|
|
89
|
+
database: opts.database,
|
|
90
|
+
maxSize: this._maxSize
|
|
86
91
|
});
|
|
87
92
|
}
|
|
88
93
|
}, {
|
|
@@ -107,6 +112,12 @@ var LoggerManager = exports.LoggerManager = /*#__PURE__*/function () {
|
|
|
107
112
|
});
|
|
108
113
|
return observer;
|
|
109
114
|
}
|
|
115
|
+
}, {
|
|
116
|
+
key: "release",
|
|
117
|
+
value: function release() {
|
|
118
|
+
_common.loggerLabels["delete"](this._label);
|
|
119
|
+
_common.loggerRegistrar["delete"](this._label);
|
|
120
|
+
}
|
|
110
121
|
}]);
|
|
111
122
|
}();
|
|
112
123
|
_LoggerManager = LoggerManager;
|
package/lib/utilities/zip.d.ts
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
|
-
export declare const zipDir: (dirPath: string,
|
|
1
|
+
export declare const zipDir: (dirPath: string, options?: {
|
|
2
|
+
recursive?: boolean;
|
|
3
|
+
filePattern?: RegExp;
|
|
4
|
+
dirPattern?: RegExp;
|
|
5
|
+
clean?: boolean;
|
|
6
|
+
}) => Promise<File | null>;
|
|
7
|
+
/**
|
|
8
|
+
* 删除目录中不符合规则的旧文件和目录
|
|
9
|
+
* @param dirPath 目录路径
|
|
10
|
+
* @param options.filePattern 文件名匹配规则(不符合的删除)
|
|
11
|
+
* @param options.dirPattern 目录名匹配规则(不符合的删除)
|
|
12
|
+
*/
|
|
13
|
+
export declare const cleanDir: (dirPath: string, options?: {
|
|
14
|
+
filePattern?: RegExp;
|
|
15
|
+
dirPattern?: RegExp;
|
|
16
|
+
}) => Promise<void>;
|
|
2
17
|
export declare const createMultiEntryZip: () => {
|
|
3
18
|
addFile: (fileName: string, content: string) => void;
|
|
4
19
|
finish: () => Promise<ArrayBuffer>;
|