fluxmail 0.4.0 → 0.5.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 +7 -5
- 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 +10 -7
- package/dist/accounts/googleAuth.d.ts.map +1 -1
- package/dist/accounts/googleAuth.js +48 -17
- package/dist/accounts/googleAuth.js.map +1 -1
- package/dist/accounts/microsoftAuth.js +1 -1
- package/dist/accounts/microsoftAuth.js.map +1 -1
- package/dist/accounts/registry.d.ts +9 -8
- package/dist/accounts/registry.d.ts.map +1 -1
- package/dist/accounts/registry.js +166 -96
- 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 +452 -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 +7 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +734 -358
- package/dist/cli.js.map +1 -1
- package/dist/cliInstances.d.ts +37 -0
- package/dist/cliInstances.d.ts.map +1 -0
- package/dist/cliInstances.js +170 -0
- package/dist/cliInstances.js.map +1 -0
- package/dist/config.d.ts +16 -10
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +125 -35
- package/dist/config.js.map +1 -1
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +8 -4
- package/dist/context.js.map +1 -1
- package/dist/http/admin.d.ts +57 -3
- package/dist/http/admin.d.ts.map +1 -1
- package/dist/http/admin.js +188 -67
- package/dist/http/admin.js.map +1 -1
- package/dist/http/app.d.ts.map +1 -1
- package/dist/http/app.js +78 -54
- 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 +931 -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 +11 -3
- package/dist/http/rest.d.ts.map +1 -1
- package/dist/http/rest.js +138 -66
- package/dist/http/rest.js.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/mcp/buildServer.d.ts +1 -1
- package/dist/mcp/buildServer.d.ts.map +1 -1
- package/dist/mcp/buildServer.js +14 -19
- 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 +7 -1
- package/dist/permissions.js.map +1 -1
- package/dist/scheduler/sendScheduler.d.ts +1 -2
- package/dist/scheduler/sendScheduler.d.ts.map +1 -1
- package/dist/scheduler/sendScheduler.js +1 -2
- package/dist/scheduler/sendScheduler.js.map +1 -1
- package/dist/service/emailService.d.ts +8 -16
- package/dist/service/emailService.d.ts.map +1 -1
- package/dist/service/emailService.js +25 -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 +593 -31
- package/dist/storage/db.d.ts.map +1 -1
- package/dist/storage/db.js +330 -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 +14 -0
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +22 -0
- package/dist/telemetry.js.map +1 -1
- package/package.json +9 -8
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { closeSync, fsyncSync, mkdirSync, openSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { hostname } from 'node:os';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { randomBytes } from 'node:crypto';
|
|
5
|
+
import { Worker } from 'node:worker_threads';
|
|
6
|
+
const WAIT_ARRAY = new Int32Array(new SharedArrayBuffer(4));
|
|
7
|
+
const HEARTBEAT_START_TIMEOUT_MS = 5_000;
|
|
8
|
+
const HEARTBEAT_STOP_TIMEOUT_MS = 5_000;
|
|
9
|
+
const HEARTBEAT_RUNNING = 1;
|
|
10
|
+
const HEARTBEAT_STOP_REQUESTED = 2;
|
|
11
|
+
const HEARTBEAT_STOPPED = 3;
|
|
12
|
+
const HEARTBEAT_WORKER_SOURCE = `
|
|
13
|
+
const { readFileSync, utimesSync } = require('node:fs');
|
|
14
|
+
const { workerData } = require('node:worker_threads');
|
|
15
|
+
const state = new Int32Array(workerData.state);
|
|
16
|
+
Atomics.store(state, 0, ${HEARTBEAT_RUNNING});
|
|
17
|
+
Atomics.notify(state, 0);
|
|
18
|
+
while (Atomics.load(state, 0) === ${HEARTBEAT_RUNNING}) {
|
|
19
|
+
Atomics.wait(state, 0, ${HEARTBEAT_RUNNING}, workerData.intervalMs);
|
|
20
|
+
if (Atomics.load(state, 0) !== ${HEARTBEAT_RUNNING}) break;
|
|
21
|
+
try {
|
|
22
|
+
const owner = JSON.parse(readFileSync(workerData.lockPath, 'utf8'));
|
|
23
|
+
if (owner.token !== workerData.token) break;
|
|
24
|
+
const now = new Date();
|
|
25
|
+
utimesSync(workerData.lockPath, now, now);
|
|
26
|
+
} catch {
|
|
27
|
+
break;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
Atomics.store(state, 0, ${HEARTBEAT_STOPPED});
|
|
31
|
+
Atomics.notify(state, 0);
|
|
32
|
+
`;
|
|
33
|
+
function startLockHeartbeat(lockPath, token, staleMs) {
|
|
34
|
+
const state = new Int32Array(new SharedArrayBuffer(4));
|
|
35
|
+
const worker = new Worker(HEARTBEAT_WORKER_SOURCE, {
|
|
36
|
+
eval: true,
|
|
37
|
+
execArgv: [],
|
|
38
|
+
workerData: {
|
|
39
|
+
lockPath,
|
|
40
|
+
token,
|
|
41
|
+
state: state.buffer,
|
|
42
|
+
intervalMs: Math.max(25, Math.floor(staleMs / 3)),
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
worker.unref();
|
|
46
|
+
const started = Atomics.wait(state, 0, 0, HEARTBEAT_START_TIMEOUT_MS);
|
|
47
|
+
if (started === 'timed-out' || Atomics.load(state, 0) !== HEARTBEAT_RUNNING) {
|
|
48
|
+
void worker.terminate();
|
|
49
|
+
throw new Error(`Could not start the heartbeat for ${lockPath}`);
|
|
50
|
+
}
|
|
51
|
+
return { state, worker };
|
|
52
|
+
}
|
|
53
|
+
function stopLockHeartbeat(heartbeat) {
|
|
54
|
+
if (Atomics.compareExchange(heartbeat.state, 0, HEARTBEAT_RUNNING, HEARTBEAT_STOP_REQUESTED) === HEARTBEAT_RUNNING) {
|
|
55
|
+
Atomics.notify(heartbeat.state, 0);
|
|
56
|
+
Atomics.wait(heartbeat.state, 0, HEARTBEAT_STOP_REQUESTED, HEARTBEAT_STOP_TIMEOUT_MS);
|
|
57
|
+
}
|
|
58
|
+
void heartbeat.worker.terminate();
|
|
59
|
+
}
|
|
60
|
+
function readOwner(lockPath) {
|
|
61
|
+
try {
|
|
62
|
+
const value = JSON.parse(readFileSync(lockPath, 'utf8'));
|
|
63
|
+
if (typeof value.token !== 'string' ||
|
|
64
|
+
typeof value.pid !== 'number' ||
|
|
65
|
+
typeof value.hostname !== 'string' ||
|
|
66
|
+
typeof value.createdAt !== 'number') {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
return value;
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
function processIsRunning(pid) {
|
|
76
|
+
try {
|
|
77
|
+
process.kill(pid, 0);
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
return error.code !== 'ESRCH';
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function canRemoveAbandonedLock(lockPath, staleMs) {
|
|
85
|
+
const owner = readOwner(lockPath);
|
|
86
|
+
if (owner?.hostname === hostname())
|
|
87
|
+
return !processIsRunning(owner.pid);
|
|
88
|
+
try {
|
|
89
|
+
return Date.now() - statSync(lockPath).mtimeMs > staleMs;
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
if (error.code === 'ENOENT')
|
|
93
|
+
return false;
|
|
94
|
+
throw error;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
function releaseOwnedLock(lockPath, token) {
|
|
98
|
+
if (readOwner(lockPath)?.token === token)
|
|
99
|
+
rmSync(lockPath, { force: true });
|
|
100
|
+
}
|
|
101
|
+
function tryRemoveAbandonedLock(lockPath, staleMs) {
|
|
102
|
+
const reclaimPath = `${lockPath}.reclaim`;
|
|
103
|
+
const reclaimToken = randomBytes(16).toString('hex');
|
|
104
|
+
const reclaimOwner = {
|
|
105
|
+
token: reclaimToken,
|
|
106
|
+
pid: process.pid,
|
|
107
|
+
hostname: hostname(),
|
|
108
|
+
createdAt: Date.now(),
|
|
109
|
+
};
|
|
110
|
+
let descriptor;
|
|
111
|
+
try {
|
|
112
|
+
descriptor = openSync(reclaimPath, 'wx', 0o600);
|
|
113
|
+
writeFileSync(descriptor, JSON.stringify(reclaimOwner), 'utf8');
|
|
114
|
+
fsyncSync(descriptor);
|
|
115
|
+
closeSync(descriptor);
|
|
116
|
+
descriptor = undefined;
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
if (descriptor !== undefined) {
|
|
120
|
+
closeSync(descriptor);
|
|
121
|
+
rmSync(reclaimPath, { force: true });
|
|
122
|
+
}
|
|
123
|
+
if (error.code === 'EEXIST')
|
|
124
|
+
return false;
|
|
125
|
+
throw error;
|
|
126
|
+
}
|
|
127
|
+
try {
|
|
128
|
+
if (!canRemoveAbandonedLock(lockPath, staleMs))
|
|
129
|
+
return false;
|
|
130
|
+
rmSync(lockPath, { recursive: true, force: true });
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
finally {
|
|
134
|
+
releaseOwnedLock(reclaimPath, reclaimToken);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
export function withFileLock(lockPath, options, callback) {
|
|
138
|
+
mkdirSync(path.dirname(lockPath), { recursive: true });
|
|
139
|
+
const owner = {
|
|
140
|
+
token: randomBytes(16).toString('hex'),
|
|
141
|
+
pid: process.pid,
|
|
142
|
+
hostname: hostname(),
|
|
143
|
+
createdAt: Date.now(),
|
|
144
|
+
};
|
|
145
|
+
const startedAt = Date.now();
|
|
146
|
+
while (true) {
|
|
147
|
+
let descriptor;
|
|
148
|
+
try {
|
|
149
|
+
descriptor = openSync(lockPath, 'wx', 0o600);
|
|
150
|
+
writeFileSync(descriptor, JSON.stringify(owner), 'utf8');
|
|
151
|
+
fsyncSync(descriptor);
|
|
152
|
+
closeSync(descriptor);
|
|
153
|
+
descriptor = undefined;
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
catch (error) {
|
|
157
|
+
if (descriptor !== undefined) {
|
|
158
|
+
closeSync(descriptor);
|
|
159
|
+
rmSync(lockPath, { force: true });
|
|
160
|
+
}
|
|
161
|
+
if (error.code !== 'EEXIST') {
|
|
162
|
+
throw error;
|
|
163
|
+
}
|
|
164
|
+
if (tryRemoveAbandonedLock(lockPath, options.staleMs))
|
|
165
|
+
continue;
|
|
166
|
+
if (Date.now() - startedAt >= options.timeoutMs) {
|
|
167
|
+
throw new Error(`Timed out waiting for ${options.description}`);
|
|
168
|
+
}
|
|
169
|
+
Atomics.wait(WAIT_ARRAY, 0, 0, 25);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
let heartbeat;
|
|
173
|
+
try {
|
|
174
|
+
heartbeat = startLockHeartbeat(lockPath, owner.token, options.staleMs);
|
|
175
|
+
return callback();
|
|
176
|
+
}
|
|
177
|
+
finally {
|
|
178
|
+
if (heartbeat)
|
|
179
|
+
stopLockHeartbeat(heartbeat);
|
|
180
|
+
releaseOwnedLock(lockPath, owner.token);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=fileLock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fileLock.js","sourceRoot":"","sources":["../../src/storage/fileLock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { type FluxmailDb } from './db.js';
|
|
2
|
-
import type { AccountSharingMode } from '@fluxmail/core';
|
|
3
2
|
export declare const GMAIL_CONNECTION_GRANT_TTL_MS: number;
|
|
4
3
|
export interface GmailConnectionIntent {
|
|
5
|
-
|
|
4
|
+
ownerMemberId?: string;
|
|
6
5
|
reauthorizeAccountId?: string;
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
sharedWithAll?: boolean;
|
|
7
|
+
grantedMemberIds?: string[];
|
|
9
8
|
}
|
|
10
9
|
export interface GmailConnectionGrant extends GmailConnectionIntent {
|
|
11
10
|
expiresAt: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmailConnectionGrants.d.ts","sourceRoot":"","sources":["../../src/storage/gmailConnectionGrants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"gmailConnectionGrants.d.ts","sourceRoot":"","sources":["../../src/storage/gmailConnectionGrants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,6BAA6B,QAAiB,CAAC;AAK5D,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,qBAAqB;IACjE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,oBAAoB,GAC5B;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,GAClD;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvB,MAAM,MAAM,0BAA0B,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAItF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9D;AAoBD,wBAAgB,2BAA2B,CACzC,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,GAAG,SAAa,GACf,0BAA0B,CAE5B;AAED,wBAAgB,6BAA6B,CAC3C,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,GAAG,SAAa,GACf,0BAA0B,CAE5B;AA+BD,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,UAAU,EACd,MAAM,GAAE,qBAA0B,EAClC,GAAG,SAAa,GACf;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAEtC;AAED,wBAAgB,4BAA4B,CAC1C,EAAE,EAAE,UAAU,EACd,MAAM,GAAE,qBAA0B,EAClC,GAAG,SAAa,GACf;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAEtC;AA8CD,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,oBAAoB,CAE/G;AAED,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,oBAAoB,CAEjH"}
|
|
@@ -36,10 +36,10 @@ function createConnectionGrant(db, scope, intent = {}, now = Date.now()) {
|
|
|
36
36
|
.values({
|
|
37
37
|
tokenHash: gmailConnectionTokenHash(token),
|
|
38
38
|
scope,
|
|
39
|
-
|
|
39
|
+
ownerMemberId: intent.ownerMemberId ?? null,
|
|
40
40
|
reauthorizeAccountId: intent.reauthorizeAccountId ?? null,
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
sharedWithAll: intent.sharedWithAll ?? null,
|
|
42
|
+
grantedMemberIds: intent.grantedMemberIds ? JSON.stringify(intent.grantedMemberIds) : null,
|
|
43
43
|
createdAt: now,
|
|
44
44
|
expiresAt,
|
|
45
45
|
consumedAt: null,
|
|
@@ -66,10 +66,10 @@ function claimConnectionGrant(db, token, scope, now = Date.now()) {
|
|
|
66
66
|
status: 'claimed',
|
|
67
67
|
grant: {
|
|
68
68
|
expiresAt: claimed.expiresAt,
|
|
69
|
-
...(claimed.
|
|
69
|
+
...(claimed.ownerMemberId ? { ownerMemberId: claimed.ownerMemberId } : {}),
|
|
70
70
|
...(claimed.reauthorizeAccountId ? { reauthorizeAccountId: claimed.reauthorizeAccountId } : {}),
|
|
71
|
-
...(claimed.
|
|
72
|
-
...(claimed.
|
|
71
|
+
...(claimed.sharedWithAll !== null ? { sharedWithAll: claimed.sharedWithAll } : {}),
|
|
72
|
+
...(claimed.grantedMemberIds ? { grantedMemberIds: JSON.parse(claimed.grantedMemberIds) } : {}),
|
|
73
73
|
},
|
|
74
74
|
};
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmailConnectionGrants.js","sourceRoot":"","sources":["../../src/storage/gmailConnectionGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAmB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"gmailConnectionGrants.js","sourceRoot":"","sources":["../../src/storage/gmailConnectionGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAmB,MAAM,SAAS,CAAC;AAEjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC5D,MAAM,sBAAsB,GAAG,eAAe,CAAC;AAC/C,MAAM,wBAAwB,GAAG,iBAAiB,CAAC;AACnD,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAuBzC,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,sBAAsB,CAC7B,EAAc,EACd,KAAa,EACb,KAAsB,EACtB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,MAAM,QAAQ,GAAG,EAAE;SAChB,MAAM,EAAE;SACR,IAAI,CAAC,qBAAqB,CAAC;SAC3B,KAAK,CACJ,GAAG,CAAC,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAClH;SACA,GAAG,EAAE,CAAC;IACT,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAChD,OAAO,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,EAAc,EACd,KAAa,EACb,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO,sBAAsB,CAAC,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,EAAc,EACd,KAAa,EACb,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO,sBAAsB,CAAC,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,qBAAqB,CAC5B,EAAc,EACd,KAAsB,EACtB,SAAgC,EAAE,EAClC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,GAAG,GAAG,6BAA6B,CAAC;IAEtD,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;SAC7B,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,GAAG,GAAG,YAAY,CAAC,CAAC;SAC9D,GAAG,EAAE,CAAC;IACT,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;SAC7B,MAAM,CAAC;QACN,SAAS,EAAE,wBAAwB,CAAC,KAAK,CAAC;QAC1C,KAAK;QACL,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;QAC3C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,IAAI,IAAI;QACzD,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;QAC3C,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;QAC1F,SAAS,EAAE,GAAG;QACd,SAAS;QACT,UAAU,EAAE,IAAI;KACjB,CAAC;SACD,GAAG,EAAE,CAAC;IAET,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,EAAc,EACd,SAAgC,EAAE,EAClC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO,qBAAqB,CAAC,EAAE,EAAE,sBAAsB,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,EAAc,EACd,SAAgC,EAAE,EAClC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO,qBAAqB,CAAC,EAAE,EAAE,wBAAwB,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,oBAAoB,CAC3B,EAAc,EACd,KAAa,EACb,KAAsB,EACtB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,EAAE;SACf,MAAM,CAAC,qBAAqB,CAAC;SAC7B,GAAG,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;SACxB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,EAC9C,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,EACtC,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,EACxC,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,GAAG,CAAC,CACzC,CACF;SACA,SAAS,EAAE;SACX,GAAG,EAAE,CAAC;IAET,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE;gBACL,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/F,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5G;SACF,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,EAAE;SAChB,MAAM,EAAE;SACR,IAAI,CAAC,qBAAqB,CAAC;SAC3B,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAClG,GAAG,EAAE,CAAC;IACT,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC5C,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EAAc,EAAE,KAAa,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACvF,OAAO,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,EAAc,EAAE,KAAa,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACzF,OAAO,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -4,22 +4,33 @@ export interface MemberInfo {
|
|
|
4
4
|
name: string;
|
|
5
5
|
email: string | null;
|
|
6
6
|
role: MemberRole;
|
|
7
|
+
status: MemberStatus;
|
|
7
8
|
createdAt: number;
|
|
8
9
|
/** Mailboxes owned by this member (shared mailboxes are not counted). */
|
|
9
10
|
accountCount: number;
|
|
10
11
|
apiKeyCount: number;
|
|
11
12
|
}
|
|
12
13
|
export type MemberRole = 'admin' | 'member';
|
|
14
|
+
export type MemberStatus = 'pending' | 'active' | 'suspended';
|
|
13
15
|
export declare function addMember(db: FluxmailDb, input: {
|
|
14
16
|
name: string;
|
|
15
17
|
email?: string;
|
|
16
18
|
role?: MemberRole;
|
|
19
|
+
status?: MemberStatus;
|
|
20
|
+
id?: string;
|
|
21
|
+
completeBootstrap?: boolean;
|
|
17
22
|
}): MemberInfo;
|
|
18
23
|
export declare function getMember(db: FluxmailDb, id: string): MemberInfo;
|
|
19
24
|
/** Resolve a member by id or email, for CLI --member flags. */
|
|
20
25
|
export declare function findMember(db: FluxmailDb, ref: string): MemberInfo;
|
|
21
26
|
export declare function listMembers(db: FluxmailDb): MemberInfo[];
|
|
22
27
|
export declare function setMemberRole(db: FluxmailDb, ref: string, role: MemberRole): MemberInfo;
|
|
28
|
+
export declare function updateMember(db: FluxmailDb, ref: string, update: {
|
|
29
|
+
name?: string;
|
|
30
|
+
email?: string;
|
|
31
|
+
role?: MemberRole;
|
|
32
|
+
status?: MemberStatus;
|
|
33
|
+
}): MemberInfo;
|
|
23
34
|
/**
|
|
24
35
|
* Delete a member after every mailbox they own has been reassigned or removed.
|
|
25
36
|
* Their API keys and selected sharing grants are deleted by the transaction and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"members.d.ts","sourceRoot":"","sources":["../../src/storage/members.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"members.d.ts","sourceRoot":"","sources":["../../src/storage/members.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,UAAU,EAChB,MAAM,SAAS,CAAC;AAGjB,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;AAC5C,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC;AAc9D,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,KAAK,EAAE;IACL,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,GACA,UAAU,CAqCZ;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAIhE;AAED,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,CAWlE;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU,EAAE,CAMxD;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAKvF;AAaD,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,GAClF,UAAU,CA0CZ;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAgBjG"}
|
package/dist/storage/members.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { randomBytes } from 'node:crypto';
|
|
2
2
|
import { eq, sql } from 'drizzle-orm';
|
|
3
3
|
import { EmailError } from '@fluxmail/core';
|
|
4
|
-
import { accounts, apiKeys, members } from './db.js';
|
|
4
|
+
import { accounts, apiKeys, instanceSettings, memberCredentials, memberSessions, members, } from './db.js';
|
|
5
5
|
import { assertMemberLimit, getEntitlements } from '../licensing/entitlements.js';
|
|
6
6
|
function toInfo(db, row) {
|
|
7
7
|
return {
|
|
8
8
|
...row,
|
|
9
9
|
role: row.role,
|
|
10
|
-
|
|
10
|
+
status: row.status,
|
|
11
|
+
accountCount: db.select().from(accounts).where(eq(accounts.ownerMemberId, row.id)).all().length,
|
|
11
12
|
apiKeyCount: db.select().from(apiKeys).where(eq(apiKeys.memberId, row.id)).all().length,
|
|
12
13
|
};
|
|
13
14
|
}
|
|
@@ -16,7 +17,7 @@ export function addMember(db, input) {
|
|
|
16
17
|
if (!name)
|
|
17
18
|
throw new EmailError('invalid_request', 'Member name cannot be empty');
|
|
18
19
|
const email = input.email?.trim().toLowerCase();
|
|
19
|
-
const id = `member_${randomBytes(6).toString('hex')}`;
|
|
20
|
+
const id = input.id ?? `member_${randomBytes(6).toString('hex')}`;
|
|
20
21
|
db.transaction((tx) => {
|
|
21
22
|
if (email &&
|
|
22
23
|
tx
|
|
@@ -29,14 +30,21 @@ export function addMember(db, input) {
|
|
|
29
30
|
const memberCount = tx.select().from(members).all().length;
|
|
30
31
|
assertMemberLimit(memberCount, getEntitlements(tx));
|
|
31
32
|
const role = input.role ?? (memberCount === 0 ? 'admin' : 'member');
|
|
33
|
+
const status = input.status ?? 'active';
|
|
32
34
|
tx.insert(members)
|
|
33
|
-
.values({ id, name, email: email ?? null, role, createdAt: Date.now() })
|
|
35
|
+
.values({ id, name, email: email ?? null, role, status, createdAt: Date.now() })
|
|
34
36
|
.run();
|
|
35
37
|
if (memberCount === 0) {
|
|
36
38
|
tx.update(accounts)
|
|
37
|
-
.set({
|
|
38
|
-
.where(sql `${accounts.
|
|
39
|
+
.set({ ownerMemberId: id })
|
|
40
|
+
.where(sql `${accounts.ownerMemberId} IS NULL`)
|
|
39
41
|
.run();
|
|
42
|
+
if (status === 'active' && input.completeBootstrap !== false) {
|
|
43
|
+
tx.insert(instanceSettings)
|
|
44
|
+
.values({ key: 'bootstrap_complete', value: '1' })
|
|
45
|
+
.onConflictDoUpdate({ target: instanceSettings.key, set: { value: '1' } })
|
|
46
|
+
.run();
|
|
47
|
+
}
|
|
40
48
|
}
|
|
41
49
|
});
|
|
42
50
|
return getMember(db, id);
|
|
@@ -71,9 +79,63 @@ export function listMembers(db) {
|
|
|
71
79
|
}
|
|
72
80
|
export function setMemberRole(db, ref, role) {
|
|
73
81
|
const member = findMember(db, ref);
|
|
82
|
+
if (member.role === 'admin' && role !== 'admin')
|
|
83
|
+
assertNotLastActiveAdmin(db, member.id);
|
|
74
84
|
db.update(members).set({ role }).where(eq(members.id, member.id)).run();
|
|
75
85
|
return getMember(db, member.id);
|
|
76
86
|
}
|
|
87
|
+
function assertNotLastActiveAdmin(db, memberId) {
|
|
88
|
+
const activeAdmins = db
|
|
89
|
+
.select()
|
|
90
|
+
.from(members)
|
|
91
|
+
.where(sql `${members.role} = 'admin' AND ${members.status} = 'active'`)
|
|
92
|
+
.all();
|
|
93
|
+
if (activeAdmins.length === 1 && activeAdmins[0].id === memberId) {
|
|
94
|
+
throw new EmailError('invalid_request', 'The last active administrator cannot be changed or removed.');
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
export function updateMember(db, ref, update) {
|
|
98
|
+
const member = findMember(db, ref);
|
|
99
|
+
const name = update.name?.trim();
|
|
100
|
+
const email = update.email?.trim().toLowerCase();
|
|
101
|
+
if (update.name !== undefined && !name)
|
|
102
|
+
throw new EmailError('invalid_request', 'Member name cannot be empty');
|
|
103
|
+
if (email && listMembers(db).some((candidate) => candidate.id !== member.id && candidate.email === email)) {
|
|
104
|
+
throw new EmailError('invalid_request', `A member with email ${email} already exists`);
|
|
105
|
+
}
|
|
106
|
+
if (update.status === 'active' && member.status !== 'active') {
|
|
107
|
+
const loginEmail = email ?? member.email;
|
|
108
|
+
const credential = db.select().from(memberCredentials).where(eq(memberCredentials.memberId, member.id)).get();
|
|
109
|
+
if (!loginEmail || !credential) {
|
|
110
|
+
throw new EmailError('invalid_request', 'The member must have a login email and password before activation.');
|
|
111
|
+
}
|
|
112
|
+
assertMemberLimit(Math.max(listMembers(db).length - 1, 0), getEntitlements(db));
|
|
113
|
+
}
|
|
114
|
+
if (member.role === 'admin' &&
|
|
115
|
+
member.status === 'active' &&
|
|
116
|
+
(update.role === 'member' || update.status === 'pending' || update.status === 'suspended')) {
|
|
117
|
+
assertNotLastActiveAdmin(db, member.id);
|
|
118
|
+
}
|
|
119
|
+
db.transaction((tx) => {
|
|
120
|
+
tx.update(members)
|
|
121
|
+
.set({
|
|
122
|
+
...(name ? { name } : {}),
|
|
123
|
+
...(email ? { email } : {}),
|
|
124
|
+
...(update.role ? { role: update.role } : {}),
|
|
125
|
+
...(update.status ? { status: update.status } : {}),
|
|
126
|
+
})
|
|
127
|
+
.where(eq(members.id, member.id))
|
|
128
|
+
.run();
|
|
129
|
+
if (update.status === 'suspended') {
|
|
130
|
+
tx.update(memberSessions)
|
|
131
|
+
.set({ revokedAt: Date.now() })
|
|
132
|
+
.where(sql `${memberSessions.memberId} = ${member.id} AND ${memberSessions.revokedAt} IS NULL`)
|
|
133
|
+
.run();
|
|
134
|
+
tx.delete(apiKeys).where(eq(apiKeys.memberId, member.id)).run();
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
return getMember(db, member.id);
|
|
138
|
+
}
|
|
77
139
|
/**
|
|
78
140
|
* Delete a member after every mailbox they own has been reassigned or removed.
|
|
79
141
|
* Their API keys and selected sharing grants are deleted by the transaction and
|
|
@@ -81,6 +143,8 @@ export function setMemberRole(db, ref, role) {
|
|
|
81
143
|
*/
|
|
82
144
|
export function removeMember(db, id) {
|
|
83
145
|
const info = getMember(db, id);
|
|
146
|
+
if (info.role === 'admin' && info.status === 'active')
|
|
147
|
+
assertNotLastActiveAdmin(db, info.id);
|
|
84
148
|
if (info.accountCount > 0) {
|
|
85
149
|
throw new EmailError('invalid_request', `${info.name} still owns ${info.accountCount} mailbox${info.accountCount === 1 ? '' : 'es'}. Reassign or remove ${info.accountCount === 1 ? 'it' : 'them'} first.`);
|
|
86
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"members.js","sourceRoot":"","sources":["../../src/storage/members.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"members.js","sourceRoot":"","sources":["../../src/storage/members.ts"],"names":[],"mappings":"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"}
|
package/dist/telemetry.d.ts
CHANGED
|
@@ -1,10 +1,24 @@
|
|
|
1
1
|
export type TelemetryProperties = Record<string, boolean | number | string | undefined>;
|
|
2
|
+
export declare const OPERATION_TELEMETRY_EVENT = "operation completed";
|
|
3
|
+
export type ProductSurface = 'cli' | 'mcp' | 'rest';
|
|
4
|
+
export type OperationOutcome = 'success' | 'error';
|
|
5
|
+
export interface OperationTelemetry {
|
|
6
|
+
productSurface: ProductSurface;
|
|
7
|
+
operation: string;
|
|
8
|
+
outcome: OperationOutcome;
|
|
9
|
+
durationMs: number;
|
|
10
|
+
errorCode?: string;
|
|
11
|
+
transport?: string;
|
|
12
|
+
properties?: TelemetryProperties;
|
|
13
|
+
}
|
|
2
14
|
export interface Telemetry {
|
|
3
15
|
capture(event: string, properties?: TelemetryProperties): void;
|
|
4
16
|
/** Keep shutdown open until an in-flight operation records its final event. */
|
|
5
17
|
beginActivity?(): () => void;
|
|
6
18
|
shutdown(): Promise<void>;
|
|
7
19
|
}
|
|
20
|
+
/** Capture one user-visible operation without accepting request or response payloads. */
|
|
21
|
+
export declare function captureOperation(telemetry: Telemetry | undefined, operation: OperationTelemetry): void;
|
|
8
22
|
interface PostHogClient {
|
|
9
23
|
capture(options: {
|
|
10
24
|
distinctId: string;
|
package/dist/telemetry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAExF,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC/D,+EAA+E;IAC/E,aAAa,CAAC,IAAI,MAAM,IAAI,CAAC;IAC7B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,UAAU,aAAa;IACrB,OAAO,CAAC,OAAO,EAAE;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;QACtD,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAqHD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAcnG;AAkBD,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAW/E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAI3E;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAInH;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB,GAAG,SAAS,CAgGZ;AAID,UAAU,cAAc;IACtB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACnD;AAED,2EAA2E;AAC3E,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,cAAc,EACtB,QAAQ,GAAE,MAAM,OAAO,CAAC,IAAI,CAAqB,GAChD,IAAI,CAMN;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAGvD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIvD"}
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAExF,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AACpD,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,OAAO,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC/D,+EAA+E;IAC/E,aAAa,CAAC,IAAI,MAAM,IAAI,CAAC;IAC7B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,yFAAyF;AACzF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAkBtG;AAED,UAAU,aAAa;IACrB,OAAO,CAAC,OAAO,EAAE;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;QACtD,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAqHD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAcnG;AAkBD,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAW/E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAI3E;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAInH;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB,GAAG,SAAS,CAgGZ;AAID,UAAU,cAAc;IACtB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACnD;AAED,2EAA2E;AAC3E,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,cAAc,EACtB,QAAQ,GAAE,MAAM,OAAO,CAAC,IAAI,CAAqB,GAChD,IAAI,CAMN;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAGvD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIvD"}
|
package/dist/telemetry.js
CHANGED
|
@@ -12,6 +12,28 @@ const POSTHOG_PROJECT_TOKEN = 'phc_t9WdWpoONslidKRejBKMYG8FLjLo0tR84U8lFKE4MlN';
|
|
|
12
12
|
const POSTHOG_HOST = 'https://t.fluxmail.ai';
|
|
13
13
|
const POSTHOG_REQUEST_TIMEOUT_MS = 500;
|
|
14
14
|
const POSTHOG_SHUTDOWN_TIMEOUT_MS = 1_000;
|
|
15
|
+
export const OPERATION_TELEMETRY_EVENT = 'operation completed';
|
|
16
|
+
/** Capture one user-visible operation without accepting request or response payloads. */
|
|
17
|
+
export function captureOperation(telemetry, operation) {
|
|
18
|
+
const properties = { ...operation.properties };
|
|
19
|
+
for (const key of ['product_surface', 'operation', 'outcome', 'duration_ms', 'error_code', 'transport']) {
|
|
20
|
+
delete properties[key];
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
telemetry?.capture(OPERATION_TELEMETRY_EVENT, {
|
|
24
|
+
...properties,
|
|
25
|
+
product_surface: operation.productSurface,
|
|
26
|
+
operation: operation.operation,
|
|
27
|
+
outcome: operation.outcome,
|
|
28
|
+
duration_ms: Math.max(0, Math.round(operation.durationMs)),
|
|
29
|
+
...(operation.errorCode ? { error_code: operation.errorCode } : {}),
|
|
30
|
+
...(operation.transport ? { transport: operation.transport } : {}),
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
// An injected telemetry client must not affect the operation.
|
|
35
|
+
}
|
|
36
|
+
}
|
|
15
37
|
function acceptedTelemetryResponse(text = '') {
|
|
16
38
|
return {
|
|
17
39
|
status: 200,
|
package/dist/telemetry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACpF,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,4EAA4E;AAC5E,qDAAqD;AACrD,MAAM,qBAAqB,GAAG,iDAAiD,CAAC;AAChF,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAC7C,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAI1C,MAAM,CAAC,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAsB/D,yFAAyF;AACzF,MAAM,UAAU,gBAAgB,CAAC,SAAgC,EAAE,SAA6B;IAC9F,MAAM,UAAU,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QACxG,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,CAAC;QACH,SAAS,EAAE,OAAO,CAAC,yBAAyB,EAAE;YAC5C,GAAG,UAAU;YACb,eAAe,EAAE,SAAS,CAAC,cAAc;YACzC,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1D,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,8DAA8D;IAChE,CAAC;AACH,CAAC;AA+BD,SAAS,yBAAyB,CAAC,IAAI,GAAG,EAAE;IAC1C,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;QACtB,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QACD,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAED,kFAAkF;AAClF,SAAS,sBAAsB;IAC7B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO;YACtB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC5B,MAAM,IAAI,GACR,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtG,IAAI,CAAC,IAAI;oBAAE,OAAO,yBAAyB,EAAE,CAAC;gBAE9C,MAAM,IAAI,GACR,OAAO,CAAC,IAAI,YAAY,IAAI;oBAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC/C,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS;wBAC1B,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAElC,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC3C,MAAM,OAAO,GAAG,IAAI,CAClB,MAAM,EACN;wBACE,MAAM,EAAE,OAAO,CAAC,MAAM;wBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;wBACtB,KAAK,EAAE,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;qBAC7D,EACD,CAAC,QAAQ,EAAE,EAAE;wBACX,MAAM,MAAM,GAAa,EAAE,CAAC;wBAC5B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;4BAC7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;wBACnE,CAAC,CAAC,CAAC;wBACH,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;wBAC/B,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;4BACxB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;4BACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC;4BACxC,IAAI,MAAM,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG;gCAAE,OAAO,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;4BACnF,OAAO,CAAC;gCACN,MAAM;gCACN,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;gCACtB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY;gCAC7C,OAAO,EAAE;oCACP,GAAG,CAAC,IAAI;wCACN,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;wCACnD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;oCACnE,CAAC;iCACF;6BACF,CAAC,CAAC;wBACL,CAAC,CAAC,CAAC;oBACL,CAAC,CACF,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,oEAAoE;gBACpE,kEAAkE;gBAClE,OAAO,yBAAyB,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;QACD,OAAO;YACL,SAAS,CAAC,OAAO,EAAE,CAAC;YACpB,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAyB;IACzC,OAAO,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;AAC/F,CAAC;AAED,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAE9C,SAAS,eAAe,CAAC,IAAY;IACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,OAAO,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,aAAqB,EAAE,WAAmB;IACzF,IAAI,CAAC;QACH,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9B,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAC;QAChE,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;QAElC,2EAA2E;QAC3E,8EAA8E;QAC9E,aAAa,CAAC,IAAI,EAAE,GAAG,WAAW,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACzD,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC;IACzD,aAAa,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACpE,MAAM,OAAO,GAAG,GAAG,CAAC,kBAAkB,EAAE,WAAW,EAAE,CAAC;IACtD,OAAO,CACL,OAAO,KAAK,GAAG;QACf,OAAO,KAAK,OAAO;QACnB,OAAO,KAAK,IAAI;QAChB,OAAO,KAAK,KAAK;QACjB,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;QAC1B,GAAG,CAAC,QAAQ,KAAK,MAAM;QACvB,GAAG,CAAC,MAAM,KAAK,SAAS,CACzB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,GAAuB;IACzE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;AACvH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe,EAAE,OAAgB;IACnE,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,OAAO;QAAE,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;;QACtC,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,OAAe,EAAE,MAAyB,OAAO,CAAC,GAAG;IAC9F,IAAI,GAAG,CAAC,kBAAkB,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IACrD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC;IACnE,OAAO,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAI/B;IACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvE,IAAI,WAAoG,CAAC;IACzG,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,eAA0C,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAc,CAAC;IAC1C,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,SAAS,aAAa;QACpB,IAAI,MAAM,IAAI,eAAe;YAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;QAC/C,gBAAgB,IAAI,CAAC,CAAC;QACtB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,OAAO,GAAG,EAAE;YACV,IAAI,QAAQ;gBAAE,OAAO;YACrB,QAAQ,GAAG,IAAI,CAAC;YAChB,gBAAgB,IAAI,CAAC,CAAC;YACtB,IAAI,gBAAgB,KAAK,CAAC;gBAAE,OAAO;YACnC,KAAK,MAAM,OAAO,IAAI,WAAW;gBAAE,OAAO,EAAE,CAAC;YAC7C,WAAW,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IAED,SAAS,WAAW;QAClB,IAAI,gBAAgB,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,SAAS,UAAU;QACjB,IAAI,MAAM,IAAI,oBAAoB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAClG,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QACpC,IAAI,SAAuC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACpD,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC;YAClE,MAAM,MAAM,GACV,OAAO,CAAC,MAAM;gBACd,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,qBAAqB,EAAE;oBAC7D,IAAI,EAAE,GAAG,CAAC,qBAAqB,IAAI,YAAY;oBAC/C,YAAY,EAAE,IAAI;oBAClB,OAAO,EAAE,EAAE;oBACX,aAAa,EAAE,MAAM;oBACrB,cAAc,EAAE,0BAA0B;oBAC1C,eAAe,EAAE,CAAC;oBAClB,KAAK,EAAE,SAAS,EAAE,KAAK;iBACxB,CAAC,CAAC;YACL,WAAW,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YAChD,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS,EAAE,OAAO,EAAE,CAAC;YACrB,oBAAoB,GAAG,IAAI,CAAC;YAC5B,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,GAAkB,EAAE;QACnC,eAAe,KAAK,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,WAAW,EAAE,CAAC;YACpB,MAAM,GAAG,IAAI,CAAC;YACd,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;YACjE,CAAC;YAAC,MAAM,CAAC;gBACP,4DAA4D;YAC9D,CAAC;oBAAS,CAAC;gBACT,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;YACnC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO;QACL,aAAa;QACb,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,EAAE;YAC5B,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,IAAI,CAAC;gBACH,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;oBACvB,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,KAAK;oBACL,YAAY,EAAE,IAAI;oBAClB,UAAU,EAAE;wBACV,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;wBAC3F,uBAAuB,EAAE,KAAK;wBAC9B,gBAAgB,EAAE,OAAO;wBACzB,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;wBACnC,QAAQ,EAAE,OAAO,CAAC,QAAQ;wBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;qBAC0B;iBAC/C,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,iDAAiD;YACnD,CAAC;QACH,CAAC;QACD,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,IAAI,eAAsC,CAAC;AAM3C,2EAA2E;AAC3E,MAAM,UAAU,gCAAgC,CAC9C,MAAsB,EACtB,WAAgC,iBAAiB;IAEjD,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;QACtB,2EAA2E;QAC3E,6EAA6E;QAC7E,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,eAAe,KAAK,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,SAAS,GAAG,eAAe,CAAC;IAClC,MAAM,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC5B,IAAI,eAAe,KAAK,SAAS;QAAE,eAAe,GAAG,SAAS,CAAC;AACjE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fluxmail",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"mcpName": "io.github.churichard/fluxmail",
|
|
5
5
|
"description": "Self-hosted email API with MCP and REST support for Gmail, Outlook, and IMAP/SMTP",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
7
|
-
"homepage": "https://github.com/churichard/fluxmail
|
|
7
|
+
"homepage": "https://github.com/churichard/fluxmail#readme",
|
|
8
8
|
"repository": {
|
|
9
9
|
"type": "git",
|
|
10
|
-
"url": "git+https://github.com/churichard/fluxmail
|
|
10
|
+
"url": "git+https://github.com/churichard/fluxmail.git",
|
|
11
11
|
"directory": "packages/server"
|
|
12
12
|
},
|
|
13
13
|
"bugs": {
|
|
14
|
-
"url": "https://github.com/churichard/fluxmail
|
|
14
|
+
"url": "https://github.com/churichard/fluxmail/issues"
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"main": "./dist/index.js",
|
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"@hono/node-server": "^1.14.3",
|
|
40
40
|
"@hono/zod-openapi": "0.19.10",
|
|
41
41
|
"@modelcontextprotocol/sdk": "^1.13.0",
|
|
42
|
+
"@node-rs/argon2": "2.0.2",
|
|
42
43
|
"better-sqlite3": "^11.10.0",
|
|
43
44
|
"commander": "^13.1.0",
|
|
44
45
|
"drizzle-orm": "^0.45.2",
|
|
@@ -46,10 +47,10 @@
|
|
|
46
47
|
"hono": "^4.7.11",
|
|
47
48
|
"posthog-node": "^5.41.0",
|
|
48
49
|
"zod": "^3.25.67",
|
|
49
|
-
"@fluxmail/core": "0.
|
|
50
|
-
"@fluxmail/provider-
|
|
51
|
-
"@fluxmail/provider-
|
|
52
|
-
"@fluxmail/provider-outlook": "0.
|
|
50
|
+
"@fluxmail/core": "0.5.0",
|
|
51
|
+
"@fluxmail/provider-gmail": "0.5.0",
|
|
52
|
+
"@fluxmail/provider-imap": "0.5.0",
|
|
53
|
+
"@fluxmail/provider-outlook": "0.5.0"
|
|
53
54
|
},
|
|
54
55
|
"devDependencies": {
|
|
55
56
|
"@types/better-sqlite3": "^7.6.13",
|