@iobroker/js-controller-common-db 7.2.3 → 8.0.0-alpha.1-20260921-e5941ca8a
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/build/cjs/index.js +3 -3
- package/build/cjs/lib/common/aliasProcessing.js +6 -0
- package/build/cjs/lib/common/aliasProcessing.js.map +2 -2
- package/build/cjs/lib/common/interview.js +2 -0
- package/build/cjs/lib/common/interview.js.map +1 -1
- package/build/cjs/lib/common/logger.d.ts +34 -1
- package/build/cjs/lib/common/logger.js +37 -37
- package/build/cjs/lib/common/logger.js.map +2 -2
- package/build/cjs/lib/common/maybeCallback.js +4 -0
- package/build/cjs/lib/common/maybeCallback.js.map +1 -1
- package/build/cjs/lib/common/password.d.ts +9 -0
- package/build/cjs/lib/common/password.js +8 -6
- package/build/cjs/lib/common/password.js.map +2 -2
- package/build/cjs/lib/common/session.js +10 -5
- package/build/cjs/lib/common/session.js.map +2 -2
- package/build/cjs/lib/common/tools.d.ts +164 -59
- package/build/cjs/lib/common/tools.js +497 -476
- package/build/cjs/lib/common/tools.js.map +3 -3
- package/build/esm/lib/common/aliasProcessing.d.ts.map +1 -1
- package/build/esm/lib/common/aliasProcessing.js +5 -0
- package/build/esm/lib/common/aliasProcessing.js.map +1 -1
- package/build/esm/lib/common/logger.d.ts +34 -1
- package/build/esm/lib/common/logger.d.ts.map +1 -1
- package/build/esm/lib/common/logger.js +45 -49
- package/build/esm/lib/common/logger.js.map +1 -1
- package/build/esm/lib/common/password.d.ts +9 -0
- package/build/esm/lib/common/password.d.ts.map +1 -1
- package/build/esm/lib/common/password.js +5 -0
- package/build/esm/lib/common/password.js.map +1 -1
- package/build/esm/lib/common/session.d.ts.map +1 -1
- package/build/esm/lib/common/session.js +6 -6
- package/build/esm/lib/common/session.js.map +1 -1
- package/build/esm/lib/common/tools.d.ts +164 -59
- package/build/esm/lib/common/tools.d.ts.map +1 -1
- package/build/esm/lib/common/tools.js +535 -586
- package/build/esm/lib/common/tools.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +18 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliasProcessing.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/aliasProcessing.ts"],"names":[],"mappings":"AAAA,UAAU,4BAA4B;IAClC,kCAAkC;IAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;IACtB,yFAAyF;IACzF,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC3C,0FAA0F;IAC1F,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC5C,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,gFAAgF;IAChF,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,sCAAsC;IAC5C,kCAAkC;IAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;IACtB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;CAChD;AAED,UAAU,4BAA6B,SAAQ,sCAAsC;IACjF,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;CAChD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,QAAQ,CAAC,UAAU,CAyBhG;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,sCAAsC,GAAG,QAAQ,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"aliasProcessing.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/aliasProcessing.ts"],"names":[],"mappings":"AAAA,UAAU,4BAA4B;IAClC,kCAAkC;IAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;IACtB,yFAAyF;IACzF,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC3C,0FAA0F;IAC1F,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC5C,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,gFAAgF;IAChF,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,sCAAsC;IAC5C,kCAAkC;IAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;IACtB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;CAChD;AAED,UAAU,4BAA6B,SAAQ,sCAAsC;IACjF,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;CAChD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,QAAQ,CAAC,UAAU,CAyBhG;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,sCAAsC,GAAG,QAAQ,CAAC,UAAU,CAuBpH;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,QAAQ,CAAC,UAAU,CAoChG"}
|
|
@@ -29,6 +29,11 @@ export function applyAliasConvenienceConversion(options) {
|
|
|
29
29
|
else if (targetCommon.type === 'number' && typeof state.val === 'string') {
|
|
30
30
|
return parseFloat(state.val);
|
|
31
31
|
}
|
|
32
|
+
else if (targetCommon.type === 'number' && typeof state.val === 'boolean') {
|
|
33
|
+
// a read/write function may return a comparison result (e.g. "val < 20") for a
|
|
34
|
+
// numeric alias — store it as 1/0 instead of leaving a boolean in a number state
|
|
35
|
+
return state.val ? 1 : 0;
|
|
36
|
+
}
|
|
32
37
|
else if (targetCommon.type === 'string') {
|
|
33
38
|
return state.val.toString();
|
|
34
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliasProcessing.js","sourceRoot":"","sources":["../../../../src/lib/common/aliasProcessing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"aliasProcessing.js","sourceRoot":"","sources":["../../../../src/lib/common/aliasProcessing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,47 @@
|
|
|
1
1
|
import winston from 'winston';
|
|
2
|
-
|
|
2
|
+
import type { TransformableInfo } from 'logform';
|
|
3
|
+
/** Log entry enriched with ioBroker specific properties */
|
|
4
|
+
export interface LogInfo extends TransformableInfo {
|
|
5
|
+
/** The log message text */
|
|
6
|
+
message: string;
|
|
7
|
+
/** Additional properties attached to the log entry */
|
|
8
|
+
props?: {
|
|
9
|
+
/** The host the log entry originates from */
|
|
10
|
+
Hostname?: string;
|
|
11
|
+
/** The source (adapter/instance) of the log entry */
|
|
12
|
+
Source?: string;
|
|
13
|
+
/** The process id that produced the log entry */
|
|
14
|
+
Pid?: string;
|
|
15
|
+
};
|
|
16
|
+
/** ISO timestamp of the log entry */
|
|
17
|
+
timestamp: string;
|
|
18
|
+
}
|
|
19
|
+
/** Logger configuration options provided by the user */
|
|
3
20
|
export interface UserOptions {
|
|
21
|
+
/** Minimum log level to output (e.g. silly, debug, info, warn, error) */
|
|
4
22
|
level: string;
|
|
23
|
+
/** Maximum number of days rotated log files are kept before deletion */
|
|
5
24
|
maxDays: number;
|
|
25
|
+
/** If true, do not output log messages to stdout */
|
|
6
26
|
noStdout: boolean;
|
|
27
|
+
/** Use local time instead of UTC for the log timestamps */
|
|
7
28
|
localTime?: string;
|
|
29
|
+
/** Colorize the console output */
|
|
8
30
|
colorize?: boolean;
|
|
31
|
+
/** Output log entries in JSON format */
|
|
9
32
|
json?: boolean;
|
|
33
|
+
/** Label prepended to every log message */
|
|
10
34
|
prefix?: string;
|
|
35
|
+
/** Winston transport configurations keyed by transport name */
|
|
11
36
|
transport: Record<string, any>;
|
|
12
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Create and configure a winston logger instance for the controller and adapters
|
|
40
|
+
*
|
|
41
|
+
* @param level Log level as a string, or a full UserOptions object with the detailed configuration
|
|
42
|
+
* @param files One or more log file paths the logger should write to
|
|
43
|
+
* @param noStdout If true, do not output log messages to stdout
|
|
44
|
+
* @param prefix Label prepended to every log message
|
|
45
|
+
*/
|
|
13
46
|
export declare function logger(level: string | UserOptions, files?: string[] | string, noStdout?: boolean, prefix?: string): winston.Logger;
|
|
14
47
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/logger.ts"],"names":[],"mappings":"AAMA,OAAO,OAAO,MAAM,SAAS,CAAC;AAS9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAwBjD,2DAA2D;AAC3D,MAAM,WAAW,OAAQ,SAAQ,iBAAiB;IAC9C,2BAA2B;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,KAAK,CAAC,EAAE;QACJ,6CAA6C;QAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,qDAAqD;QACrD,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,iDAAiD;QACjD,GAAG,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAC;CACrB;AA6FD,wDAAwD;AACxD,MAAM,WAAW,WAAW;IACxB,yEAAyE;IACzE,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,QAAQ,EAAE,OAAO,CAAC;IAClB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,wCAAwC;IACxC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+DAA+D;IAC/D,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAOD;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAClB,KAAK,EAAE,MAAM,GAAG,WAAW,EAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EACzB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAkWhB"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import winston from 'winston';
|
|
2
|
-
import DailyRotateFile from 'winston-daily-rotate-file';
|
|
3
1
|
import fs from 'node:fs';
|
|
4
2
|
import path from 'node:path';
|
|
5
3
|
import os from 'node:os';
|
|
6
|
-
import * as
|
|
4
|
+
import * as url from 'node:url';
|
|
5
|
+
import { createRequire } from 'node:module';
|
|
6
|
+
import winston from 'winston';
|
|
7
|
+
import DailyRotateFile from 'winston-daily-rotate-file';
|
|
7
8
|
import Transport from 'winston-transport';
|
|
8
9
|
import { LEVEL } from 'triple-beam';
|
|
9
10
|
import deepClone from 'deep-clone';
|
|
10
|
-
import * as
|
|
11
|
-
import { createRequire } from 'node:module';
|
|
11
|
+
import * as tools from '../../lib/common/tools.js';
|
|
12
12
|
// eslint-disable-next-line unicorn/prefer-module
|
|
13
13
|
const thisDir = url.fileURLToPath(new URL('.', import.meta.url || `file://${__filename}`));
|
|
14
14
|
// eslint-disable-next-line unicorn/prefer-module
|
|
@@ -58,7 +58,7 @@ const IoSeq = Seq &&
|
|
|
58
58
|
class extends Seq {
|
|
59
59
|
log(info, callback) {
|
|
60
60
|
const ioInfo = deepClone(info);
|
|
61
|
-
ioInfo.props
|
|
61
|
+
ioInfo.props ||= {};
|
|
62
62
|
// map our log levels to Seq levels
|
|
63
63
|
const level = (ioInfo.level || '').toLowerCase();
|
|
64
64
|
if (level.includes('error')) {
|
|
@@ -81,7 +81,7 @@ const IoSeq = Seq &&
|
|
|
81
81
|
}
|
|
82
82
|
// we add own properties
|
|
83
83
|
ioInfo.props.Hostname = tools.getHostName();
|
|
84
|
-
if (ioInfo.message) {
|
|
84
|
+
if (typeof ioInfo.message === 'string') {
|
|
85
85
|
// handle as single line with s flag, to if message ends with CR, etc
|
|
86
86
|
const msgParts = ioInfo.message.match(/^([^.]+\.[0-9]+) \(([^)]+)\) (.*)$/s);
|
|
87
87
|
if (msgParts) {
|
|
@@ -97,10 +97,13 @@ const IoSeq = Seq &&
|
|
|
97
97
|
};
|
|
98
98
|
// Class used to inform adapter about new log entry
|
|
99
99
|
class NotifierTransport extends Transport {
|
|
100
|
-
|
|
100
|
+
/**
|
|
101
|
+
* Name used by controller and adapters to locate this transport via
|
|
102
|
+
* `logger.transports.find(t => t.name === 'NT')`. Must stay 'NT'.
|
|
103
|
+
*/
|
|
104
|
+
name = 'NT';
|
|
101
105
|
constructor(opts) {
|
|
102
106
|
super(opts);
|
|
103
|
-
this.name = 'NT'; // NotifierTransport
|
|
104
107
|
}
|
|
105
108
|
log(info, callback) {
|
|
106
109
|
const msg = {
|
|
@@ -112,6 +115,14 @@ class NotifierTransport extends Transport {
|
|
|
112
115
|
callback();
|
|
113
116
|
}
|
|
114
117
|
}
|
|
118
|
+
/**
|
|
119
|
+
* Create and configure a winston logger instance for the controller and adapters
|
|
120
|
+
*
|
|
121
|
+
* @param level Log level as a string, or a full UserOptions object with the detailed configuration
|
|
122
|
+
* @param files One or more log file paths the logger should write to
|
|
123
|
+
* @param noStdout If true, do not output log messages to stdout
|
|
124
|
+
* @param prefix Label prepended to every log message
|
|
125
|
+
*/
|
|
115
126
|
export function logger(level, files, noStdout, prefix) {
|
|
116
127
|
const options = {
|
|
117
128
|
transports: [],
|
|
@@ -121,8 +132,8 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
121
132
|
files = [files];
|
|
122
133
|
}
|
|
123
134
|
const formatter = (info) => `${timestamp(info.timestamp)} - ${info.level}: ${info.message}`;
|
|
124
|
-
files
|
|
125
|
-
// indicator
|
|
135
|
+
files ||= [];
|
|
136
|
+
// indicator that is used to determine the log dir for developing, where it should be inside the repository
|
|
126
137
|
const isNpm = !thisDir
|
|
127
138
|
.replace(/\\/g, '/')
|
|
128
139
|
.toLowerCase()
|
|
@@ -153,10 +164,10 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
153
164
|
const isWindows = os.platform().startsWith('win');
|
|
154
165
|
for (const transport of Object.values(userOptions.transport)) {
|
|
155
166
|
transport._defaultConfigLoglevel = transport.level; // remember Loglevel if set
|
|
156
|
-
transport.level
|
|
167
|
+
transport.level ||= level;
|
|
157
168
|
if (transport.type === 'file' && transport.enabled !== false) {
|
|
158
|
-
transport.filename
|
|
159
|
-
if (!transport.fileext && transport.filename.
|
|
169
|
+
transport.filename ||= `log/${tools.appName}`;
|
|
170
|
+
if (!transport.fileext && !transport.filename.endsWith('.log')) {
|
|
160
171
|
transport.fileext = '.log';
|
|
161
172
|
}
|
|
162
173
|
if (!fName) {
|
|
@@ -173,24 +184,16 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
173
184
|
transport.filename = path.normalize(`${tools.getControllerDir()}${isNpm ? '/../../' : '/'}${transport.filename}`);
|
|
174
185
|
}
|
|
175
186
|
transport.auditFile = `${transport.filename}-audit.json`;
|
|
176
|
-
transport.createSymlink
|
|
177
|
-
|
|
178
|
-
transport.symlinkName =
|
|
179
|
-
transport.symlinkName !== undefined
|
|
180
|
-
? transport.symlinkName
|
|
181
|
-
: path.basename(`${transport.filename}.current.log`);
|
|
187
|
+
transport.createSymlink ??= !isWindows;
|
|
188
|
+
transport.symlinkName ??= path.basename(`${transport.filename}.current.log`);
|
|
182
189
|
transport.filename += `.%DATE%${transport.fileext || ''}`;
|
|
183
190
|
//transport.label = prefix || ''; //TODO format.label()
|
|
184
191
|
// transport.json = (transport.json !== undefined) ? transport.json : false; // TODO format.json(), new Default!!
|
|
185
192
|
transport.silent = transport.silent !== undefined ? transport.silent : false;
|
|
186
193
|
// transport.colorize = (transport.colorize !== undefined) ? transport.colorize : ((userOptions.colorize === undefined) ? true : userOptions.colorize); //TODO format.colorize()
|
|
187
|
-
transport.localTime
|
|
188
|
-
transport.localTime !== undefined
|
|
189
|
-
? transport.localTime
|
|
190
|
-
: userOptions.localTime === undefined
|
|
191
|
-
? true
|
|
192
|
-
: userOptions.localTime;
|
|
194
|
+
transport.localTime ??= userOptions.localTime ?? true;
|
|
193
195
|
transport.datePattern = 'YYYY-MM-DD';
|
|
196
|
+
// @ts-expect-error fix later
|
|
194
197
|
transport.format = winston.format.combine(winston.format.printf(formatter));
|
|
195
198
|
/*transport.logException = function (message, info, next, err) {
|
|
196
199
|
console.error(message);
|
|
@@ -205,9 +208,7 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
205
208
|
}
|
|
206
209
|
try {
|
|
207
210
|
const _log = new DailyRotateFile(transport);
|
|
208
|
-
_log.on('error', err => {
|
|
209
|
-
console.error(`Error on log file rotation: ${err.message}`);
|
|
210
|
-
});
|
|
211
|
+
_log.on('error', err => console.error(`Error on log file rotation: ${err.message}`));
|
|
211
212
|
options.transports.push(_log);
|
|
212
213
|
}
|
|
213
214
|
catch (e) {
|
|
@@ -235,7 +236,8 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
235
236
|
// eol: The end of line character to be added to the end of the message (Default: Message without modifications).
|
|
236
237
|
// replace the used by syslog attribute "type" with own "sysLogType"
|
|
237
238
|
// If no name defined, use hostname as name
|
|
238
|
-
transport.localhost
|
|
239
|
+
transport.localhost ||= hostname;
|
|
240
|
+
// @ts-expect-error fix later
|
|
239
241
|
transport.format = winston.format.combine(winston.format.printf(formatter));
|
|
240
242
|
if (transport.sysLogType) {
|
|
241
243
|
transport.type = transport.sysLogType;
|
|
@@ -258,7 +260,7 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
258
260
|
// auth: (Default: None) An object representing the username and password for HTTP Basic Auth
|
|
259
261
|
// ssl: (Default: false) Value indicating if we should use HTTPS
|
|
260
262
|
// If no name defined, use hostname as name
|
|
261
|
-
transport.host
|
|
263
|
+
transport.host ||= 'localhost';
|
|
262
264
|
try {
|
|
263
265
|
options.transports.push(new winston.transports.Http(transport));
|
|
264
266
|
}
|
|
@@ -267,12 +269,12 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
267
269
|
}
|
|
268
270
|
}
|
|
269
271
|
else if (transport.type === 'stream' && transport.enabled !== false) {
|
|
270
|
-
// stream: any Node.js stream. If an objectMode stream is provided then the entire info object will be written. Otherwise info[MESSAGE] will be written.
|
|
272
|
+
// stream: any Node.js stream. If an objectMode stream is provided then the entire info object will be written. Otherwise, info[MESSAGE] will be written.
|
|
271
273
|
// level: Level of messages that this transport should log (default: level set on parent logger).
|
|
272
274
|
// silent: Boolean flag indicating whether to suppress output (default false).
|
|
273
275
|
// eol: Line-ending character to use. (default: os.EOL).
|
|
274
276
|
// If no name defined, use hostname as name
|
|
275
|
-
transport.host
|
|
277
|
+
transport.host ||= 'localhost';
|
|
276
278
|
try {
|
|
277
279
|
if (typeof transport.stream === 'string') {
|
|
278
280
|
transport.stream = fs.createWriteStream(transport.stream);
|
|
@@ -299,9 +301,7 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
299
301
|
// Add only if serverUrl is configured at least
|
|
300
302
|
if (transport.serverUrl) {
|
|
301
303
|
try {
|
|
302
|
-
transport.onError = (e) => {
|
|
303
|
-
console.log(`SEQ error: ${e.message}`);
|
|
304
|
-
};
|
|
304
|
+
transport.onError = (e) => console.log(`SEQ error: ${e.message}`);
|
|
305
305
|
const seqLogger = new IoSeq(transport);
|
|
306
306
|
options.transports.push(seqLogger);
|
|
307
307
|
}
|
|
@@ -340,10 +340,8 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
340
340
|
options.transports.push(new winston.transports.Console({
|
|
341
341
|
level,
|
|
342
342
|
silent: false,
|
|
343
|
+
// @ts-expect-error fix later
|
|
343
344
|
format: winston.format.combine(winston.format.printf(formatter)),
|
|
344
|
-
//colorize: (userOptions.colorize === undefined) ? true : userOptions.colorize, // TODO format.colorize()
|
|
345
|
-
//timestamp: timestamp, // TODO: format.timestamp()
|
|
346
|
-
//label: prefix || '' // TODO format.label()
|
|
347
345
|
}));
|
|
348
346
|
}
|
|
349
347
|
// Must be registered, for adapter.js notification about new logs
|
|
@@ -355,23 +353,23 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
355
353
|
// @ts-expect-error why do we override/add method to foreign instance? TODO
|
|
356
354
|
log.getFileName = function () {
|
|
357
355
|
// @ts-expect-error we use undocumented stuff here TODO
|
|
358
|
-
let transport = this.transports.find(t =>
|
|
356
|
+
let transport = this.transports.find(t => t.transport?.dirname || t.dirname);
|
|
359
357
|
if (transport) {
|
|
360
358
|
// @ts-expect-error we use undocumented stuff here TODO
|
|
361
|
-
transport = transport.transport
|
|
359
|
+
transport = transport.transport || transport;
|
|
362
360
|
// @ts-expect-error we use undocumented stuff here TODO
|
|
363
361
|
return `${transport.dirname}/${transport.filename.replace('%DATE%', getDate())}`;
|
|
364
362
|
}
|
|
365
363
|
return '';
|
|
366
364
|
};
|
|
367
|
-
log.on('error', error => {
|
|
368
|
-
console.log(`Logger error: ${error.message}`);
|
|
369
|
-
});
|
|
365
|
+
log.on('error', error => console.log(`Logger error: ${error.message}`));
|
|
370
366
|
// This cannot be deleted, because file rotate works with the size of files and not with the time
|
|
371
367
|
// TODO research and open new issue in winston-daily-rotate-file repo
|
|
372
368
|
/**
|
|
373
|
-
*
|
|
374
|
-
*
|
|
369
|
+
* Enable or disable the periodic checker that deletes outdated log files
|
|
370
|
+
*
|
|
371
|
+
* @param isEnabled Whether the periodic file checker should run
|
|
372
|
+
* @param daysCount Number of days after which old log files are deleted (defaults to 3)
|
|
375
373
|
*/
|
|
376
374
|
// @ts-expect-error why do we override/add method to foreign instance? TODO
|
|
377
375
|
log.activateDateChecker = function (isEnabled, daysCount) {
|
|
@@ -382,9 +380,7 @@ export function logger(level, files, noStdout, prefix) {
|
|
|
382
380
|
// @ts-expect-error we use undocumented stuff here TODO
|
|
383
381
|
}
|
|
384
382
|
else if (isEnabled && !this._fileChecker) {
|
|
385
|
-
|
|
386
|
-
daysCount = 3;
|
|
387
|
-
}
|
|
383
|
+
daysCount ||= 3;
|
|
388
384
|
// Check every hour
|
|
389
385
|
// @ts-expect-error we use undocumented stuff here TODO
|
|
390
386
|
this._fileChecker = setInterval(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/lib/common/logger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/lib/common/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,10 +28,19 @@
|
|
|
28
28
|
|
|
29
29
|
*
|
|
30
30
|
*/
|
|
31
|
+
/** Set of password helper functions bound to a specific password */
|
|
31
32
|
export interface PasswordReturnValue {
|
|
33
|
+
/** Check whether the password fulfills the complexity requirements */
|
|
32
34
|
complexity: (password: string, callback: (isComplex: boolean) => void) => boolean;
|
|
35
|
+
/** Verify the password against the given stored hash */
|
|
33
36
|
check: (hashedPassword: string, callback: (err?: Error | null, isOk?: boolean) => void) => void;
|
|
37
|
+
/** Create a salted PBKDF2 hash of the password */
|
|
34
38
|
hash: (salt: string | null, iterations: number | null, callback: (err?: Error | null, hash?: string) => void) => void;
|
|
35
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Create a set of helper functions (hash, check, complexity) bound to the given password
|
|
42
|
+
*
|
|
43
|
+
* @param pw The plain text password to operate on
|
|
44
|
+
*/
|
|
36
45
|
export declare function password(pw: string): PasswordReturnValue;
|
|
37
46
|
//# sourceMappingURL=password.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/password.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAIH,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,KAAK,OAAO,CAAC;IAClF,KAAK,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,CAAC;IAChG,IAAI,EAAE,CACF,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,KACpD,IAAI,CAAC;CACb;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,CA+CxD"}
|
|
1
|
+
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/password.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAIH,oEAAoE;AACpE,MAAM,WAAW,mBAAmB;IAChC,sEAAsE;IACtE,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,KAAK,OAAO,CAAC;IAClF,wDAAwD;IACxD,KAAK,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,CAAC;IAChG,kDAAkD;IAClD,IAAI,EAAE,CACF,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,KACpD,IAAI,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,CA+CxD"}
|
|
@@ -29,6 +29,11 @@
|
|
|
29
29
|
*
|
|
30
30
|
*/
|
|
31
31
|
import crypto from 'node:crypto';
|
|
32
|
+
/**
|
|
33
|
+
* Create a set of helper functions (hash, check, complexity) bound to the given password
|
|
34
|
+
*
|
|
35
|
+
* @param pw The plain text password to operate on
|
|
36
|
+
*/
|
|
32
37
|
export function password(pw) {
|
|
33
38
|
return {
|
|
34
39
|
hash: (salt, iterations, callback) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/lib/common/password.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/lib/common/password.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AAgBjC;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,EAAU;IAC/B,OAAO;QACH,IAAI,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YACjC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtD,UAAU,GAAG,UAAU,IAAI,MAAM,CAAC;YAElC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC5D,IAAI,GAAG,EAAE,CAAC;oBACN,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;gBAED,QAAQ,CAAC,IAAI,EAAE,UAAU,UAAU,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAC1E,CAAC,CAAC,CAAC;QACP,CAAC;QACD,KAAK,EAAE,UAAU,cAAc,EAAE,QAAQ;YACrC,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,OAAO,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,MAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtB,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvD,IAAI,KAAK,EAAE,CAAC;oBACR,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACJ,QAAQ,CAAC,IAAI,EAAE,OAAO,KAAK,cAAc,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC/B,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM;oBACF,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,sBAAsB;wBAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,8BAA8B;wBACrD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,0CAA0C;wBACpE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,0CAA0C;YAC1E,CAAC;YACD,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC,CAAC,4BAA4B;QAC/C,CAAC;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/lib/common/session.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;CACd,CAAC;AAiBF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,SAAO,GAAG,GAAG,CAwG3E"}
|
|
@@ -9,13 +9,13 @@ export function createAdapterStore(session, defaultTtl = 3600) {
|
|
|
9
9
|
const Store = session.Store;
|
|
10
10
|
class AdapterStore extends Store {
|
|
11
11
|
adapter;
|
|
12
|
+
/**
|
|
13
|
+
* @param options Store options including the adapter instance used to read and write sessions
|
|
14
|
+
*/
|
|
12
15
|
constructor(options) {
|
|
13
16
|
super(options);
|
|
14
17
|
this.adapter = options.adapter;
|
|
15
|
-
options
|
|
16
|
-
if (!options.cookie) {
|
|
17
|
-
options.cookie = { maxAge: defaultTtl };
|
|
18
|
-
}
|
|
18
|
+
options.cookie ||= { maxAge: defaultTtl };
|
|
19
19
|
Store.call(this, options);
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
@@ -53,9 +53,9 @@ export function createAdapterStore(session, defaultTtl = 3600) {
|
|
|
53
53
|
? Math.round(sess.cookie.originalMaxAge / 1000)
|
|
54
54
|
: defaultTtl;
|
|
55
55
|
}
|
|
56
|
-
ttl
|
|
56
|
+
ttl ||= defaultTtl;
|
|
57
57
|
this.adapter.setSession(sid, ttl, sess, function (err) {
|
|
58
|
-
// @ts-expect-error
|
|
58
|
+
// @ts-expect-error "this" is OK
|
|
59
59
|
fn?.call(this, err);
|
|
60
60
|
}); // do not use here => !!!
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/lib/common/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/lib/common/session.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAU,GAAG,IAAI;IAClE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,MAAM,YAAa,SAAQ,KAAK;QACX,OAAO,CAStB;QAEF;;WAEG;QACH,YAAY,OAA4B;YACpC,KAAK,CAAC,OAAO,CAAC,CAAC;YAEf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAE/B,OAAO,CAAC,MAAM,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,CAAC;QAED;;;;;WAKG;QACH,GAAG,CAAC,GAAW,EAAE,EAAiE;YAC9E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAqB,EAAQ,EAAE;gBACzD,IAAI,GAAG,EAAE,CAAC;oBACN,IAAI,EAAE,EAAE,CAAC;wBACL,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACzB,CAAC;gBACL,CAAC;qBAAM,IAAI,EAAE,EAAE,CAAC;oBACZ,OAAO,EAAE,EAAE,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAoBD;;;;;;;WAOG;QACH,GAAG,CAAC,GAAY,EAAE,GAAY,EAAE,IAAa,EAAE,EAAY;YACvD,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,EAAE,GAAG,IAAI,CAAC;gBACV,IAAI,GAAG,GAAG,CAAC;gBACX,iEAAiE;gBACjE,GAAG,GAAI,IAAyB,EAAE,MAAM,EAAE,cAAc;oBACpD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAE,IAAyB,CAAC,MAAO,CAAC,cAAe,GAAG,IAAI,CAAC;oBACvE,CAAC,CAAC,UAAU,CAAC;YACrB,CAAC;YACD,GAAG,KAAK,UAAU,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,UAAU,CACnB,GAAa,EACb,GAAa,EACb,IAAwB,EACxB,UAAU,GAAkB;gBACxB,gCAAgC;gBAC/B,EAAmC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC,CACJ,CAAC,CAAC,yBAAyB;QAChC,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,GAAW,EAAE,EAAc;YAC/B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;KACJ;IAED,OAAO,YAAY,CAAC;AACxB,CAAC"}
|