fluxmail 0.4.1 → 0.6.0
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/README.md +6 -4
- package/dist/accounts/defaultGoogleOAuth.d.ts +4 -0
- package/dist/accounts/defaultGoogleOAuth.d.ts.map +1 -0
- package/dist/accounts/defaultGoogleOAuth.js +7 -0
- package/dist/accounts/defaultGoogleOAuth.js.map +1 -0
- package/dist/accounts/gmailConnection.js +2 -2
- package/dist/accounts/gmailConnection.js.map +1 -1
- package/dist/accounts/googleAuth.d.ts +16 -9
- package/dist/accounts/googleAuth.d.ts.map +1 -1
- package/dist/accounts/googleAuth.js +52 -20
- package/dist/accounts/googleAuth.js.map +1 -1
- package/dist/accounts/microsoftAuth.d.ts +5 -2
- package/dist/accounts/microsoftAuth.d.ts.map +1 -1
- package/dist/accounts/microsoftAuth.js +25 -22
- package/dist/accounts/microsoftAuth.js.map +1 -1
- package/dist/accounts/registry.d.ts +11 -9
- package/dist/accounts/registry.d.ts.map +1 -1
- package/dist/accounts/registry.js +169 -98
- package/dist/accounts/registry.js.map +1 -1
- package/dist/auth.d.ts +106 -0
- package/dist/auth.d.ts.map +1 -0
- package/dist/auth.js +455 -0
- package/dist/auth.js.map +1 -0
- package/dist/authorization.d.ts +9 -0
- package/dist/authorization.d.ts.map +1 -0
- package/dist/authorization.js +23 -0
- package/dist/authorization.js.map +1 -0
- package/dist/cli.d.ts +15 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1096 -403
- package/dist/cli.js.map +1 -1
- package/dist/cliInstances.d.ts +51 -0
- package/dist/cliInstances.d.ts.map +1 -0
- package/dist/cliInstances.js +237 -0
- package/dist/cliInstances.js.map +1 -0
- package/dist/cliMail.d.ts +9 -0
- package/dist/cliMail.d.ts.map +1 -0
- package/dist/cliMail.js +450 -0
- package/dist/cliMail.js.map +1 -0
- package/dist/config.d.ts +95 -118
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +351 -286
- package/dist/config.js.map +1 -1
- package/dist/configMigration.d.ts +8 -0
- package/dist/configMigration.d.ts.map +1 -0
- package/dist/configMigration.js +234 -0
- package/dist/configMigration.js.map +1 -0
- package/dist/context.d.ts +8 -2
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +29 -8
- package/dist/context.js.map +1 -1
- package/dist/deploymentConfig.d.ts +190 -0
- package/dist/deploymentConfig.d.ts.map +1 -0
- package/dist/deploymentConfig.js +539 -0
- package/dist/deploymentConfig.js.map +1 -0
- package/dist/http/admin.d.ts +75 -3
- package/dist/http/admin.d.ts.map +1 -1
- package/dist/http/admin.js +347 -79
- package/dist/http/admin.js.map +1 -1
- package/dist/http/app.d.ts +4 -1
- package/dist/http/app.d.ts.map +1 -1
- package/dist/http/app.js +119 -63
- package/dist/http/app.js.map +1 -1
- package/dist/http/identity.d.ts +114 -0
- package/dist/http/identity.d.ts.map +1 -0
- package/dist/http/identity.js +936 -0
- package/dist/http/identity.js.map +1 -0
- package/dist/http/operationRoutes.d.ts +8 -0
- package/dist/http/operationRoutes.d.ts.map +1 -0
- package/dist/http/operationRoutes.js +13 -0
- package/dist/http/operationRoutes.js.map +1 -0
- package/dist/http/rest.d.ts +16 -4
- package/dist/http/rest.d.ts.map +1 -1
- package/dist/http/rest.js +213 -71
- package/dist/http/rest.js.map +1 -1
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/instanceConfig.d.ts +36 -0
- package/dist/instanceConfig.d.ts.map +1 -0
- package/dist/instanceConfig.js +157 -0
- package/dist/instanceConfig.js.map +1 -0
- package/dist/licensing/activation.d.ts +2 -1
- package/dist/licensing/activation.d.ts.map +1 -1
- package/dist/licensing/activation.js +2 -3
- package/dist/licensing/activation.js.map +1 -1
- package/dist/licensing/entitlements.d.ts.map +1 -1
- package/dist/licensing/entitlements.js +2 -2
- package/dist/licensing/entitlements.js.map +1 -1
- package/dist/licensing/refresher.d.ts +6 -1
- package/dist/licensing/refresher.d.ts.map +1 -1
- package/dist/licensing/refresher.js +18 -7
- package/dist/licensing/refresher.js.map +1 -1
- package/dist/logging.d.ts +87 -0
- package/dist/logging.d.ts.map +1 -0
- package/dist/logging.js +612 -0
- package/dist/logging.js.map +1 -0
- package/dist/mcp/buildServer.d.ts +3 -1
- package/dist/mcp/buildServer.d.ts.map +1 -1
- package/dist/mcp/buildServer.js +27 -24
- package/dist/mcp/buildServer.js.map +1 -1
- package/dist/permissions.d.ts +1 -1
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +10 -4
- package/dist/permissions.js.map +1 -1
- package/dist/scheduler/sendScheduler.d.ts +4 -3
- package/dist/scheduler/sendScheduler.d.ts.map +1 -1
- package/dist/scheduler/sendScheduler.js +15 -3
- package/dist/scheduler/sendScheduler.js.map +1 -1
- package/dist/service/emailService.d.ts +10 -17
- package/dist/service/emailService.d.ts.map +1 -1
- package/dist/service/emailService.js +28 -38
- package/dist/service/emailService.js.map +1 -1
- package/dist/storage/adminAudit.d.ts +15 -2
- package/dist/storage/adminAudit.d.ts.map +1 -1
- package/dist/storage/adminAudit.js +22 -27
- package/dist/storage/adminAudit.js.map +1 -1
- package/dist/storage/apiKeys.d.ts +8 -8
- package/dist/storage/apiKeys.d.ts.map +1 -1
- package/dist/storage/apiKeys.js +16 -11
- package/dist/storage/apiKeys.js.map +1 -1
- package/dist/storage/db.d.ts +596 -31
- package/dist/storage/db.d.ts.map +1 -1
- package/dist/storage/db.js +383 -45
- package/dist/storage/db.js.map +1 -1
- package/dist/storage/fileLock.d.ts +7 -0
- package/dist/storage/fileLock.d.ts.map +1 -0
- package/dist/storage/fileLock.js +183 -0
- package/dist/storage/fileLock.js.map +1 -0
- package/dist/storage/gmailConnectionGrants.d.ts +3 -4
- package/dist/storage/gmailConnectionGrants.d.ts.map +1 -1
- package/dist/storage/gmailConnectionGrants.js +6 -6
- package/dist/storage/gmailConnectionGrants.js.map +1 -1
- package/dist/storage/members.d.ts +11 -0
- package/dist/storage/members.d.ts.map +1 -1
- package/dist/storage/members.js +70 -6
- package/dist/storage/members.js.map +1 -1
- package/dist/telemetry.d.ts +17 -2
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +34 -19
- package/dist/telemetry.js.map +1 -1
- package/dist/updateNotifier.d.ts +18 -0
- package/dist/updateNotifier.d.ts.map +1 -0
- package/dist/updateNotifier.js +128 -0
- package/dist/updateNotifier.js.map +1 -0
- package/package.json +38 -5
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import type { FluxmailConfig } from '../config.js';
|
|
1
|
+
import type { ConfigurationService, FluxmailConfig } from '../config.js';
|
|
2
2
|
import type { FluxmailDb } from '../storage/db.js';
|
|
3
|
+
import { type Logger } from '../logging.js';
|
|
3
4
|
import { type LeasePayload } from './lease.js';
|
|
4
5
|
/** Instances revalidate roughly daily; the lease itself is valid for ~7 days. */
|
|
5
6
|
export declare const VALIDATE_INTERVAL_MS: number;
|
|
7
|
+
/** Notice a license added through another local process while the server is running. */
|
|
8
|
+
export declare const LICENSE_CONFIG_RECHECK_MS = 5000;
|
|
6
9
|
export type RefreshResult = {
|
|
7
10
|
outcome: 'refreshed';
|
|
8
11
|
lease: LeasePayload;
|
|
@@ -26,7 +29,9 @@ export interface RefreshOptions {
|
|
|
26
29
|
export interface LicenseControllerOptions {
|
|
27
30
|
db: FluxmailDb;
|
|
28
31
|
config: FluxmailConfig;
|
|
32
|
+
configuration?: ConfigurationService;
|
|
29
33
|
log?: (line: string) => void;
|
|
34
|
+
logger?: Logger;
|
|
30
35
|
onRefreshed?: () => void;
|
|
31
36
|
fetchImpl?: typeof fetch;
|
|
32
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresher.d.ts","sourceRoot":"","sources":["../../src/licensing/refresher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"refresher.d.ts","sourceRoot":"","sources":["../../src/licensing/refresher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/E,iFAAiF;AACjF,eAAO,MAAM,oBAAoB,QAAsB,CAAC;AAGxD,wFAAwF;AACxF,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,MAAM,MAAM,aAAa,GACrB;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,GAC7C;IACE,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtF,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEN;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAStD;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA4DjG;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IAMhB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALjC,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAC,CAAqC;IACrD,OAAO,CAAC,cAAc,CAAS;gBAEF,IAAI,EAAE,wBAAwB;IAE3D,aAAa,IAAI,MAAM,GAAG,SAAS;IAInC,OAAO,CAAC,QAAQ;IAOV,UAAU,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;YAoBxC,GAAG;IAqCjB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAazC,IAAI,IAAI,IAAI;IAWZ,IAAI,IAAI,IAAI;CAMb;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,IAAI,CAIhF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomBytes } from 'node:crypto';
|
|
2
2
|
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
-
import {
|
|
4
|
+
import { logFailure } from '../logging.js';
|
|
5
5
|
import { validateLicense } from './client.js';
|
|
6
6
|
import { licensePublicKeys, verifyLease } from './lease.js';
|
|
7
7
|
import { getEntitlements, readLeaseRow, saveLeaseToken } from './entitlements.js';
|
|
@@ -9,6 +9,8 @@ import { getEntitlements, readLeaseRow, saveLeaseToken } from './entitlements.js
|
|
|
9
9
|
export const VALIDATE_INTERVAL_MS = 24 * 60 * 60 * 1000;
|
|
10
10
|
/** After an outage, retry sooner than the daily cadence. */
|
|
11
11
|
const OUTAGE_RETRY_MS = 60 * 60 * 1000;
|
|
12
|
+
/** Notice a license added through another local process while the server is running. */
|
|
13
|
+
export const LICENSE_CONFIG_RECHECK_MS = 5_000;
|
|
12
14
|
/**
|
|
13
15
|
* Stable random id per install, persisted next to the database. Not a secret;
|
|
14
16
|
* it lets the license server spot one key shared across many instances.
|
|
@@ -105,12 +107,10 @@ export class LicenseController {
|
|
|
105
107
|
this.deps = deps;
|
|
106
108
|
}
|
|
107
109
|
configuredKey() {
|
|
108
|
-
|
|
109
|
-
return this.deps.config.licenseKey;
|
|
110
|
-
return readStoredConfig(this.deps.config.dataDir).FLUXMAIL_LICENSE_KEY?.trim() || this.deps.config.licenseKey;
|
|
110
|
+
return this.deps.configuration?.config.licenseKey ?? this.deps.config.licenseKey;
|
|
111
111
|
}
|
|
112
112
|
schedule(delayMs) {
|
|
113
|
-
if (this.stopped
|
|
113
|
+
if (this.stopped)
|
|
114
114
|
return;
|
|
115
115
|
if (this.timer)
|
|
116
116
|
clearTimeout(this.timer);
|
|
@@ -121,8 +121,10 @@ export class LicenseController {
|
|
|
121
121
|
if (this.running)
|
|
122
122
|
return this.running;
|
|
123
123
|
const licenseKey = this.configuredKey();
|
|
124
|
-
if (!licenseKey)
|
|
124
|
+
if (!licenseKey) {
|
|
125
|
+
this.schedule(LICENSE_CONFIG_RECHECK_MS);
|
|
125
126
|
return undefined;
|
|
127
|
+
}
|
|
126
128
|
this.running = this.run(licenseKey).finally(() => {
|
|
127
129
|
const refreshPending = this.refreshPending && !this.stopped;
|
|
128
130
|
this.refreshPending = false;
|
|
@@ -147,16 +149,23 @@ export class LicenseController {
|
|
|
147
149
|
});
|
|
148
150
|
}
|
|
149
151
|
catch (err) {
|
|
152
|
+
logFailure(this.deps.logger, 'license.refresh_failed', err);
|
|
150
153
|
this.deps.log?.(`License refresh failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
151
154
|
this.schedule(OUTAGE_RETRY_MS);
|
|
152
155
|
return undefined;
|
|
153
156
|
}
|
|
154
157
|
if (result.outcome === 'refreshed') {
|
|
158
|
+
this.deps.logger?.info('license.refreshed', 'License lease renewed', {
|
|
159
|
+
details: { expires_at: result.lease.expiresAt },
|
|
160
|
+
});
|
|
155
161
|
this.deps.log?.(`License validated; lease renewed until ${result.lease.expiresAt}`);
|
|
156
162
|
this.deps.onRefreshed?.();
|
|
157
163
|
this.schedule(VALIDATE_INTERVAL_MS);
|
|
158
164
|
}
|
|
159
165
|
else {
|
|
166
|
+
this.deps.logger?.warn('license.refresh_failed', result.message, undefined, {
|
|
167
|
+
details: { outcome: result.outcome, cached_lease_active: result.cachedLeaseActive },
|
|
168
|
+
});
|
|
160
169
|
this.deps.log?.(`License validation: ${result.message}` +
|
|
161
170
|
(result.cachedLeaseActive
|
|
162
171
|
? ' The cached lease keeps paid limits for now.'
|
|
@@ -169,8 +178,10 @@ export class LicenseController {
|
|
|
169
178
|
if (log)
|
|
170
179
|
this.deps.log = log;
|
|
171
180
|
this.stopped = false;
|
|
172
|
-
if (!this.configuredKey())
|
|
181
|
+
if (!this.configuredKey()) {
|
|
182
|
+
this.schedule(LICENSE_CONFIG_RECHECK_MS);
|
|
173
183
|
return;
|
|
184
|
+
}
|
|
174
185
|
const row = readLeaseRow(this.deps.db);
|
|
175
186
|
const sinceLastValidation = row ? Date.now() - row.updatedAt : Number.POSITIVE_INFINITY;
|
|
176
187
|
if (sinceLastValidation >= VALIDATE_INTERVAL_MS)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresher.js","sourceRoot":"","sources":["../../src/licensing/refresher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"refresher.js","sourceRoot":"","sources":["../../src/licensing/refresher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
export type LogLevel = 'info' | 'warn' | 'error' | 'off';
|
|
2
|
+
export type LogDestination = 'both' | 'file' | 'console';
|
|
3
|
+
export type ProcessMode = 'cli' | 'serve' | 'stdio' | 'library';
|
|
4
|
+
export type LogValue = boolean | number | string;
|
|
5
|
+
export interface LogContext {
|
|
6
|
+
productSurface?: 'cli' | 'mcp' | 'rest';
|
|
7
|
+
operation?: string;
|
|
8
|
+
durationMs?: number;
|
|
9
|
+
details?: Record<string, LogValue | undefined>;
|
|
10
|
+
/** CLI errors are already printed in their user-facing form. */
|
|
11
|
+
skipConsole?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export interface Logger {
|
|
14
|
+
info(event: string, message: string, context?: LogContext): void;
|
|
15
|
+
warn(event: string, message: string, error?: unknown, context?: LogContext): void;
|
|
16
|
+
error(event: string, message: string, error?: unknown, context?: LogContext): void;
|
|
17
|
+
flush(): Promise<void>;
|
|
18
|
+
close(): Promise<void>;
|
|
19
|
+
}
|
|
20
|
+
export interface LogError {
|
|
21
|
+
name: string;
|
|
22
|
+
code?: string;
|
|
23
|
+
message: string;
|
|
24
|
+
stack?: string;
|
|
25
|
+
cause?: LogError;
|
|
26
|
+
}
|
|
27
|
+
export interface LogRecord {
|
|
28
|
+
timestamp: string;
|
|
29
|
+
level: Exclude<LogLevel, 'off'>;
|
|
30
|
+
event: string;
|
|
31
|
+
message: string;
|
|
32
|
+
version: string;
|
|
33
|
+
pid: number;
|
|
34
|
+
run_id: string;
|
|
35
|
+
process_mode: ProcessMode;
|
|
36
|
+
product_surface?: 'cli' | 'mcp' | 'rest';
|
|
37
|
+
operation?: string;
|
|
38
|
+
duration_ms?: number;
|
|
39
|
+
details?: Record<string, LogValue>;
|
|
40
|
+
error?: LogError;
|
|
41
|
+
}
|
|
42
|
+
interface LoggerLimits {
|
|
43
|
+
segmentBytes: number;
|
|
44
|
+
segmentCount: number;
|
|
45
|
+
maxRecordBytes: number;
|
|
46
|
+
maxQueueBytes: number;
|
|
47
|
+
maxBatchBytes: number;
|
|
48
|
+
flushIntervalMs: number;
|
|
49
|
+
rateBurstBytes: number;
|
|
50
|
+
rateBytesPerHour: number;
|
|
51
|
+
duplicateWindowMs: number;
|
|
52
|
+
duplicateLimit: number;
|
|
53
|
+
}
|
|
54
|
+
export interface CreateLoggerOptions {
|
|
55
|
+
dataDir: string;
|
|
56
|
+
mode: ProcessMode;
|
|
57
|
+
level?: LogLevel;
|
|
58
|
+
destination?: LogDestination;
|
|
59
|
+
now?: () => number;
|
|
60
|
+
consoleWrite?: (value: string) => void;
|
|
61
|
+
limits?: Partial<LoggerLimits>;
|
|
62
|
+
}
|
|
63
|
+
export declare function escapeLogTextForConsole(value: string): string;
|
|
64
|
+
export declare function createLogger(options: CreateLoggerOptions): Logger;
|
|
65
|
+
export declare function logFailure(logger: Logger | undefined, event: string, error: unknown, context?: LogContext): void;
|
|
66
|
+
export declare function logCodedFailure(logger: Logger | undefined, event: string, code: string, message: string, context?: LogContext): void;
|
|
67
|
+
export declare function getLogger(dataDir: string, mode: ProcessMode, settings: {
|
|
68
|
+
level: LogLevel;
|
|
69
|
+
destination: LogDestination;
|
|
70
|
+
}): Logger;
|
|
71
|
+
export declare function flushLogging(): Promise<void>;
|
|
72
|
+
export declare function shutdownLogging(): Promise<void>;
|
|
73
|
+
export interface ReadLogsOptions {
|
|
74
|
+
tail: number;
|
|
75
|
+
minimumLevel?: Exclude<LogLevel, 'off'>;
|
|
76
|
+
}
|
|
77
|
+
export interface ReadLogEntry {
|
|
78
|
+
record: LogRecord;
|
|
79
|
+
raw: string;
|
|
80
|
+
}
|
|
81
|
+
export interface ReadLogsResult {
|
|
82
|
+
entries: ReadLogEntry[];
|
|
83
|
+
malformedLines: number;
|
|
84
|
+
}
|
|
85
|
+
export declare function readLocalLogs(dataDir: string, options: ReadLogsOptions): ReadLogsResult;
|
|
86
|
+
export {};
|
|
87
|
+
//# sourceMappingURL=logging.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"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"}
|