fluxmail 0.5.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (109) hide show
  1. package/dist/accounts/googleAuth.d.ts +7 -3
  2. package/dist/accounts/googleAuth.d.ts.map +1 -1
  3. package/dist/accounts/googleAuth.js +8 -7
  4. package/dist/accounts/googleAuth.js.map +1 -1
  5. package/dist/accounts/microsoftAuth.d.ts +5 -2
  6. package/dist/accounts/microsoftAuth.d.ts.map +1 -1
  7. package/dist/accounts/microsoftAuth.js +24 -21
  8. package/dist/accounts/microsoftAuth.js.map +1 -1
  9. package/dist/accounts/registry.d.ts +3 -1
  10. package/dist/accounts/registry.d.ts.map +1 -1
  11. package/dist/accounts/registry.js +12 -6
  12. package/dist/accounts/registry.js.map +1 -1
  13. package/dist/auth.d.ts.map +1 -1
  14. package/dist/auth.js +5 -2
  15. package/dist/auth.js.map +1 -1
  16. package/dist/cli.d.ts +8 -0
  17. package/dist/cli.d.ts.map +1 -1
  18. package/dist/cli.js +382 -65
  19. package/dist/cli.js.map +1 -1
  20. package/dist/cliInstances.d.ts +14 -0
  21. package/dist/cliInstances.d.ts.map +1 -1
  22. package/dist/cliInstances.js +88 -5
  23. package/dist/cliInstances.js.map +1 -1
  24. package/dist/cliMail.d.ts +9 -0
  25. package/dist/cliMail.d.ts.map +1 -0
  26. package/dist/cliMail.js +450 -0
  27. package/dist/cliMail.js.map +1 -0
  28. package/dist/config.d.ts +89 -118
  29. package/dist/config.d.ts.map +1 -1
  30. package/dist/config.js +344 -369
  31. package/dist/config.js.map +1 -1
  32. package/dist/configMigration.d.ts +8 -0
  33. package/dist/configMigration.d.ts.map +1 -0
  34. package/dist/configMigration.js +234 -0
  35. package/dist/configMigration.js.map +1 -0
  36. package/dist/context.d.ts +8 -2
  37. package/dist/context.d.ts.map +1 -1
  38. package/dist/context.js +24 -7
  39. package/dist/context.js.map +1 -1
  40. package/dist/deploymentConfig.d.ts +190 -0
  41. package/dist/deploymentConfig.d.ts.map +1 -0
  42. package/dist/deploymentConfig.js +539 -0
  43. package/dist/deploymentConfig.js.map +1 -0
  44. package/dist/http/admin.d.ts +19 -1
  45. package/dist/http/admin.d.ts.map +1 -1
  46. package/dist/http/admin.js +162 -15
  47. package/dist/http/admin.js.map +1 -1
  48. package/dist/http/app.d.ts +4 -1
  49. package/dist/http/app.d.ts.map +1 -1
  50. package/dist/http/app.js +44 -12
  51. package/dist/http/app.js.map +1 -1
  52. package/dist/http/identity.d.ts.map +1 -1
  53. package/dist/http/identity.js +5 -0
  54. package/dist/http/identity.js.map +1 -1
  55. package/dist/http/rest.d.ts +5 -1
  56. package/dist/http/rest.d.ts.map +1 -1
  57. package/dist/http/rest.js +76 -6
  58. package/dist/http/rest.js.map +1 -1
  59. package/dist/index.d.ts +2 -1
  60. package/dist/index.d.ts.map +1 -1
  61. package/dist/index.js +2 -1
  62. package/dist/index.js.map +1 -1
  63. package/dist/instanceConfig.d.ts +36 -0
  64. package/dist/instanceConfig.d.ts.map +1 -0
  65. package/dist/instanceConfig.js +157 -0
  66. package/dist/instanceConfig.js.map +1 -0
  67. package/dist/licensing/activation.d.ts +2 -1
  68. package/dist/licensing/activation.d.ts.map +1 -1
  69. package/dist/licensing/activation.js +2 -3
  70. package/dist/licensing/activation.js.map +1 -1
  71. package/dist/licensing/entitlements.d.ts.map +1 -1
  72. package/dist/licensing/entitlements.js +2 -2
  73. package/dist/licensing/entitlements.js.map +1 -1
  74. package/dist/licensing/refresher.d.ts +6 -1
  75. package/dist/licensing/refresher.d.ts.map +1 -1
  76. package/dist/licensing/refresher.js +18 -7
  77. package/dist/licensing/refresher.js.map +1 -1
  78. package/dist/logging.d.ts +87 -0
  79. package/dist/logging.d.ts.map +1 -0
  80. package/dist/logging.js +612 -0
  81. package/dist/logging.js.map +1 -0
  82. package/dist/mcp/buildServer.d.ts +2 -0
  83. package/dist/mcp/buildServer.d.ts.map +1 -1
  84. package/dist/mcp/buildServer.js +13 -5
  85. package/dist/mcp/buildServer.js.map +1 -1
  86. package/dist/permissions.d.ts.map +1 -1
  87. package/dist/permissions.js +3 -3
  88. package/dist/permissions.js.map +1 -1
  89. package/dist/scheduler/sendScheduler.d.ts +3 -1
  90. package/dist/scheduler/sendScheduler.d.ts.map +1 -1
  91. package/dist/scheduler/sendScheduler.js +14 -1
  92. package/dist/scheduler/sendScheduler.js.map +1 -1
  93. package/dist/service/emailService.d.ts +2 -1
  94. package/dist/service/emailService.d.ts.map +1 -1
  95. package/dist/service/emailService.js +3 -0
  96. package/dist/service/emailService.js.map +1 -1
  97. package/dist/storage/db.d.ts +5 -2
  98. package/dist/storage/db.d.ts.map +1 -1
  99. package/dist/storage/db.js +55 -2
  100. package/dist/storage/db.js.map +1 -1
  101. package/dist/telemetry.d.ts +3 -2
  102. package/dist/telemetry.d.ts.map +1 -1
  103. package/dist/telemetry.js +12 -19
  104. package/dist/telemetry.js.map +1 -1
  105. package/dist/updateNotifier.d.ts +18 -0
  106. package/dist/updateNotifier.d.ts.map +1 -0
  107. package/dist/updateNotifier.js +128 -0
  108. package/dist/updateNotifier.js.map +1 -0
  109. package/package.json +37 -5
@@ -0,0 +1,157 @@
1
+ import { eq, sql } from 'drizzle-orm';
2
+ import { decryptString, encryptString } from './storage/crypto.js';
3
+ import { accountCredentials, accounts, instanceSettings, oauthTokens } from './storage/db.js';
4
+ const ENVELOPE_PREFIX = 'v1:';
5
+ export const INSTANCE_CONFIG_KEYS = {
6
+ google: 'config.oauth.google',
7
+ microsoft: 'config.oauth.microsoft',
8
+ license: 'config.license.key',
9
+ };
10
+ function requiredString(value, field) {
11
+ if (typeof value !== 'string' || !value.trim())
12
+ throw new Error(`${field} is missing from encrypted instance settings`);
13
+ return value.trim();
14
+ }
15
+ function parseGoogle(value) {
16
+ if (!value || typeof value !== 'object' || Array.isArray(value)) {
17
+ throw new Error('The encrypted Google OAuth application is invalid');
18
+ }
19
+ const record = value;
20
+ return {
21
+ clientId: requiredString(record.clientId, 'Google client ID'),
22
+ clientSecret: requiredString(record.clientSecret, 'Google client secret'),
23
+ };
24
+ }
25
+ function parseMicrosoft(value) {
26
+ if (!value || typeof value !== 'object' || Array.isArray(value)) {
27
+ throw new Error('The encrypted Microsoft OAuth application is invalid');
28
+ }
29
+ const record = value;
30
+ const clientSecret = typeof record.clientSecret === 'string' ? record.clientSecret.trim() : undefined;
31
+ return {
32
+ clientId: requiredString(record.clientId, 'Microsoft client ID'),
33
+ tenantId: requiredString(record.tenantId ?? 'common', 'Microsoft tenant ID'),
34
+ ...(clientSecret ? { clientSecret } : {}),
35
+ };
36
+ }
37
+ export class InstanceConfigStore {
38
+ db;
39
+ encryptionKey;
40
+ constructor(db, encryptionKey) {
41
+ this.db = db;
42
+ this.encryptionKey = encryptionKey;
43
+ }
44
+ raw(key) {
45
+ return this.db.select().from(instanceSettings).where(eq(instanceSettings.key, key)).get()?.value;
46
+ }
47
+ dataVersion() {
48
+ const sqlite = this.db;
49
+ return sqlite.$client.pragma('data_version', { simple: true });
50
+ }
51
+ readEncrypted(key) {
52
+ const value = this.raw(key);
53
+ if (value === undefined)
54
+ return undefined;
55
+ if (!value.startsWith(ENVELOPE_PREFIX)) {
56
+ throw new Error(`Instance setting ${key} is not stored in a supported encrypted envelope`);
57
+ }
58
+ try {
59
+ return JSON.parse(decryptString(this.encryptionKey, value.slice(ENVELOPE_PREFIX.length)));
60
+ }
61
+ catch {
62
+ throw new Error(`Could not decrypt instance setting ${key}; check the Fluxmail encryption key`);
63
+ }
64
+ }
65
+ writeEncrypted(key, value) {
66
+ const encrypted = `${ENVELOPE_PREFIX}${encryptString(this.encryptionKey, JSON.stringify(value))}`;
67
+ this.db
68
+ .insert(instanceSettings)
69
+ .values({ key, value: encrypted })
70
+ .onConflictDoUpdate({ target: instanceSettings.key, set: { value: encrypted } })
71
+ .run();
72
+ }
73
+ remove(key) {
74
+ return this.db.delete(instanceSettings).where(eq(instanceSettings.key, key)).run().changes > 0;
75
+ }
76
+ google() {
77
+ const value = this.readEncrypted(INSTANCE_CONFIG_KEYS.google);
78
+ return value === undefined ? undefined : parseGoogle(value);
79
+ }
80
+ setGoogle(value) {
81
+ this.writeEncrypted(INSTANCE_CONFIG_KEYS.google, parseGoogle(value));
82
+ }
83
+ removeGoogle() {
84
+ return this.remove(INSTANCE_CONFIG_KEYS.google);
85
+ }
86
+ microsoft() {
87
+ const value = this.readEncrypted(INSTANCE_CONFIG_KEYS.microsoft);
88
+ return value === undefined ? undefined : parseMicrosoft(value);
89
+ }
90
+ setMicrosoft(value) {
91
+ this.writeEncrypted(INSTANCE_CONFIG_KEYS.microsoft, parseMicrosoft(value));
92
+ }
93
+ pinMicrosoftOAuthAppForAccounts(value) {
94
+ const application = parseMicrosoft(value);
95
+ const sqlite = this.db;
96
+ return sqlite.$client
97
+ .transaction(() => {
98
+ const rows = this.db
99
+ .select({
100
+ accountId: accountCredentials.accountId,
101
+ encryptedCredentials: accountCredentials.encryptedCredentials,
102
+ })
103
+ .from(accountCredentials)
104
+ .innerJoin(accounts, eq(accounts.id, accountCredentials.accountId))
105
+ .where(eq(accounts.provider, 'outlook'))
106
+ .all();
107
+ let pinned = 0;
108
+ for (const row of rows) {
109
+ const decoded = JSON.parse(decryptString(this.encryptionKey, row.encryptedCredentials));
110
+ if (!decoded || typeof decoded !== 'object' || Array.isArray(decoded)) {
111
+ throw new Error('The encrypted Outlook credentials are invalid');
112
+ }
113
+ const credentials = decoded;
114
+ if (credentials.fluxmailOAuthClient !== undefined)
115
+ continue;
116
+ const encryptedCredentials = encryptString(this.encryptionKey, JSON.stringify({ ...credentials, fluxmailOAuthClient: application }));
117
+ const updatedAt = Date.now();
118
+ this.db
119
+ .update(accountCredentials)
120
+ .set({
121
+ encryptedCredentials,
122
+ updatedAt,
123
+ revision: sql `${accountCredentials.revision} + 1`,
124
+ })
125
+ .where(eq(accountCredentials.accountId, row.accountId))
126
+ .run();
127
+ this.db
128
+ .insert(oauthTokens)
129
+ .values({ accountId: row.accountId, encryptedTokens: encryptedCredentials, updatedAt })
130
+ .onConflictDoUpdate({
131
+ target: oauthTokens.accountId,
132
+ set: { encryptedTokens: encryptedCredentials, updatedAt },
133
+ })
134
+ .run();
135
+ pinned += 1;
136
+ }
137
+ return pinned;
138
+ })
139
+ .immediate();
140
+ }
141
+ removeMicrosoft() {
142
+ return this.remove(INSTANCE_CONFIG_KEYS.microsoft);
143
+ }
144
+ licenseKey() {
145
+ const value = this.readEncrypted(INSTANCE_CONFIG_KEYS.license);
146
+ if (value === undefined)
147
+ return undefined;
148
+ return requiredString(value, 'License key');
149
+ }
150
+ setLicenseKey(value) {
151
+ this.writeEncrypted(INSTANCE_CONFIG_KEYS.license, requiredString(value, 'License key'));
152
+ }
153
+ removeLicenseKey() {
154
+ return this.remove(INSTANCE_CONFIG_KEYS.license);
155
+ }
156
+ }
157
+ //# sourceMappingURL=instanceConfig.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../src/instanceConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAE/G,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,wBAAwB;IACnC,OAAO,EAAE,oBAAoB;CACrB,CAAC;AAaX,SAAS,cAAc,CAAC,KAAc,EAAE,KAAa;IACnD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,8CAA8C,CAAC,CAAC;IAC1E,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,OAAO;QACL,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC;QAC7D,YAAY,EAAE,cAAc,CAAC,MAAM,CAAC,YAAY,EAAE,sBAAsB,CAAC;KAC1E,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACtG,OAAO;QACL,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC;QAChE,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,QAAQ,EAAE,qBAAqB,CAAC;QAC5E,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,mBAAmB;IAEX;IACA;IAFnB,YACmB,EAAc,EACd,aAAqB;QADrB,OAAE,GAAF,EAAE,CAAY;QACd,kBAAa,GAAb,aAAa,CAAQ;IACrC,CAAC;IAEI,GAAG,CAAC,GAAW;QACrB,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC;IACnG,CAAC;IAED,WAAW;QACT,MAAM,MAAM,GAAG,IAAI,CAAC,EAEnB,CAAC;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAW,CAAC;IAC3E,CAAC;IAEO,aAAa,CAAC,GAAW;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,kDAAkD,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QACvG,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,qCAAqC,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,KAAc;QAChD,MAAM,SAAS,GAAG,GAAG,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAClG,IAAI,CAAC,EAAE;aACJ,MAAM,CAAC,gBAAgB,CAAC;aACxB,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;aACjC,kBAAkB,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;aAC/E,GAAG,EAAE,CAAC;IACX,CAAC;IAEO,MAAM,CAAC,GAAW;QACxB,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC;IACjG,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC9D,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,KAA2B;QACnC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,SAAS;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACjE,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAED,YAAY,CAAC,KAA8B;QACzC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,+BAA+B,CAAC,KAA8B;QAC5D,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,EAEnB,CAAC;QACF,OAAO,MAAM,CAAC,OAAO;aAClB,WAAW,CAAC,GAAG,EAAE;YAChB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;iBACjB,MAAM,CAAC;gBACN,SAAS,EAAE,kBAAkB,CAAC,SAAS;gBACvC,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;aAC9D,CAAC;iBACD,IAAI,CAAC,kBAAkB,CAAC;iBACxB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;iBAClE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;iBACvC,GAAG,EAAE,CAAC;YACT,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAY,CAAC;gBACnG,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;oBACtE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBACnE,CAAC;gBACD,MAAM,WAAW,GAAG,OAAkC,CAAC;gBACvD,IAAI,WAAW,CAAC,mBAAmB,KAAK,SAAS;oBAAE,SAAS;gBAE5D,MAAM,oBAAoB,GAAG,aAAa,CACxC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,CAAC,CACrE,CAAC;gBACF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC7B,IAAI,CAAC,EAAE;qBACJ,MAAM,CAAC,kBAAkB,CAAC;qBAC1B,GAAG,CAAC;oBACH,oBAAoB;oBACpB,SAAS;oBACT,QAAQ,EAAE,GAAG,CAAA,GAAG,kBAAkB,CAAC,QAAQ,MAAM;iBAClD,CAAC;qBACD,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;qBACtD,GAAG,EAAE,CAAC;gBACT,IAAI,CAAC,EAAE;qBACJ,MAAM,CAAC,WAAW,CAAC;qBACnB,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;qBACtF,kBAAkB,CAAC;oBAClB,MAAM,EAAE,WAAW,CAAC,SAAS;oBAC7B,GAAG,EAAE,EAAE,eAAe,EAAE,oBAAoB,EAAE,SAAS,EAAE;iBAC1D,CAAC;qBACD,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,CAAC,CAAC;YACd,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;aACD,SAAS,EAAE,CAAC;IACjB,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,UAAU;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC1C,OAAO,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,KAAa;QACzB,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,OAAO,EAAE,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;CACF"}
@@ -1,5 +1,6 @@
1
+ import type { ConfigurationService } from '../config.js';
1
2
  import type { FluxmailDb } from '../storage/db.js';
2
3
  import { type RefreshOptions, type RefreshResult } from './refresher.js';
3
4
  /** Validate a replacement key before allowing it to overwrite stored config. */
4
- export declare function activateLicense(db: FluxmailDb, opts: RefreshOptions): Promise<RefreshResult>;
5
+ export declare function activateLicense(db: FluxmailDb, configuration: ConfigurationService, opts: RefreshOptions): Promise<RefreshResult>;
5
6
  //# sourceMappingURL=activation.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"activation.d.ts","sourceRoot":"","sources":["../../src/licensing/activation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEzF,gFAAgF;AAChF,wBAAsB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAMlG"}
1
+ {"version":3,"file":"activation.d.ts","sourceRoot":"","sources":["../../src/licensing/activation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEzF,gFAAgF;AAChF,wBAAsB,eAAe,CACnC,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,oBAAoB,EACnC,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,aAAa,CAAC,CAMxB"}
@@ -1,10 +1,9 @@
1
- import { setStoredConfig } from '../config.js';
2
1
  import { refreshLicense } from './refresher.js';
3
2
  /** Validate a replacement key before allowing it to overwrite stored config. */
4
- export async function activateLicense(db, opts) {
3
+ export async function activateLicense(db, configuration, opts) {
5
4
  const result = await refreshLicense(db, opts);
6
5
  if (result.outcome === 'refreshed' || result.outcome === 'outage') {
7
- setStoredConfig(opts.dataDir, 'FLUXMAIL_LICENSE_KEY', opts.licenseKey);
6
+ configuration.setLicenseKey(opts.licenseKey);
8
7
  }
9
8
  return result;
10
9
  }
@@ -1 +1 @@
1
- {"version":3,"file":"activation.js","sourceRoot":"","sources":["../../src/licensing/activation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,cAAc,EAA2C,MAAM,gBAAgB,CAAC;AAEzF,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAc,EAAE,IAAoB;IACxE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC9C,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAClE,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"activation.js","sourceRoot":"","sources":["../../src/licensing/activation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2C,MAAM,gBAAgB,CAAC;AAEzF,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,aAAmC,EACnC,IAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC9C,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAClE,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"entitlements.d.ts","sourceRoot":"","sources":["../../src/licensing/entitlements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmC,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGpF,8FAA8F;AAC9F,eAAO,MAAM,eAAe,QAA2B,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,sFAAsF;IACtF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,EAAE,YAM3B,CAAC;AAIF,oFAAoF;AACpF,KAAK,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAE3C,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAG3F;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAMlF;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,IAAI,CAE/D;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAsB5E;AAcD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAEpF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAEnF;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kFAAkF;IAClF,SAAS,EAAE,OAAO,CAAC;IACnB,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAqB9E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAa9E"}
1
+ {"version":3,"file":"entitlements.d.ts","sourceRoot":"","sources":["../../src/licensing/entitlements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmC,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGpF,8FAA8F;AAC9F,eAAO,MAAM,eAAe,QAA0B,CAAC;AAEvD,MAAM,WAAW,YAAY;IAC3B,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,sFAAsF;IACtF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,EAAE,YAM3B,CAAC;AAIF,oFAAoF;AACpF,KAAK,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAE3C,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAG3F;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAMlF;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,IAAI,CAE/D;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAsB5E;AAcD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAEpF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAEnF;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kFAAkF;IAClF,SAAS,EAAE,OAAO,CAAC;IACnB,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAqB9E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,YAAY,CAa9E"}
@@ -3,7 +3,7 @@ import { eq } from 'drizzle-orm';
3
3
  import { accounts, licenseLease, members } from '../storage/db.js';
4
4
  import { licensePublicKeys, verifyLease } from './lease.js';
5
5
  /** After a lease expires, paid limits are honored this much longer before the plan lapses. */
6
- export const GRACE_PERIOD_MS = 21 * 24 * 60 * 60 * 1000;
6
+ export const GRACE_PERIOD_MS = 7 * 24 * 60 * 60 * 1000;
7
7
  export const PERSONAL_TIER = {
8
8
  plan: 'personal',
9
9
  licensed: false,
@@ -108,7 +108,7 @@ export function assertWithinQuota(db, now = new Date()) {
108
108
  const { entitlements: ent } = state;
109
109
  throw new EmailError('entitlement_exceeded', `This instance has ${state.accountCount} connected mailboxes and ${state.memberCount} members, but the ` +
110
110
  `${ent.plan} plan allows ${ent.maxAccounts} and ${ent.maxMembers}. Renew the license ` +
111
- '("fluxmail license activate <key>") or remove mailboxes/members ' +
111
+ '("fluxmail license activate") or remove mailboxes/members ' +
112
112
  '("fluxmail accounts remove", "fluxmail members remove") to fit the plan.');
113
113
  }
114
114
  return state;
@@ -1 +1 @@
1
- {"version":3,"file":"entitlements.js","sourceRoot":"","sources":["../../src/licensing/entitlements.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entitlements.js","sourceRoot":"","sources":["../../src/licensing/entitlements.ts"],"names":[],"mappings":"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"}
@@ -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;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/E,iFAAiF;AACjF,eAAO,MAAM,oBAAoB,QAAsB,CAAC;AAIxD,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,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,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;IAKnC,OAAO,CAAC,QAAQ;IAOV,UAAU,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;YAiBxC,GAAG;IA8BjB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAUzC,IAAI,IAAI,IAAI;IAWZ,IAAI,IAAI,IAAI;CAMb;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,IAAI,CAIhF"}
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 { readStoredConfig } from '../config.js';
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
- if (this.deps.config.licenseKeyFromEnvironment)
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 || !this.configuredKey())
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":"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"}
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;AAG7B,OAAO,EAAE,UAAU,EAAe,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAqB,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElF,iFAAiF;AACjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACxD,4DAA4D;AAC5D,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACvC,wFAAwF;AACxF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAW/C;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/C,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3C,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAC/B,OAAO,EAAE,CAAC;AACZ,CAAC;AAmBD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAc,EAAE,IAAoB;IACvE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,UAAU,EAAE,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IAE7D,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,KAAmB,CAAC;YACxB,IAAI,CAAC;gBACH,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO;oBACL,OAAO,EAAE,WAAW;oBACpB,OAAO,EACL,+DAA+D;wBAC/D,IAAI,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK;wBACzD,0DAA0D;oBAC5D,iBAAiB,EAAE,iBAAiB,EAAE;iBACvC,CAAC;YACJ,CAAC;YACD,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACzC,CAAC;QACD,KAAK,iBAAiB;YACpB,OAAO;gBACL,OAAO,EAAE,aAAa;gBACtB,OAAO,EAAE,+EAA+E;gBACxF,iBAAiB,EAAE,iBAAiB,EAAE;aACvC,CAAC;QACJ,KAAK,mBAAmB;YACtB,OAAO;gBACL,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,iDAAiD;gBAC1D,iBAAiB,EAAE,iBAAiB,EAAE;aACvC,CAAC;QACJ,KAAK,kBAAkB;YACrB,OAAO;gBACL,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,oCAAoC,MAAM,CAAC,MAAM,IAAI;gBAC9D,iBAAiB,EAAE,iBAAiB,EAAE;aACvC,CAAC;QACJ,KAAK,gBAAgB;YACnB,OAAO;gBACL,OAAO,EAAE,QAAQ;gBACjB,OAAO,EACL,+DAA+D;oBAC/D,gGAAgG;gBAClG,iBAAiB,EAAE,iBAAiB,EAAE;aACvC,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,uCAAuC,MAAM,CAAC,MAAM,gBAAgB;gBAC7E,iBAAiB,EAAE,iBAAiB,EAAE;aACvC,CAAC;IACN,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,iBAAiB;IAMC;IALrB,KAAK,CAAkB;IACvB,OAAO,GAAG,IAAI,CAAC;IACf,OAAO,CAAsC;IAC7C,cAAc,GAAG,KAAK,CAAC;IAE/B,YAA6B,IAA8B;QAA9B,SAAI,GAAJ,IAAI,CAA0B;IAAG,CAAC;IAE/D,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IACnF,CAAC;IAEO,QAAQ,CAAC,OAAe;QAC9B,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,IAAI,CAAC,KAAK;YAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;YACzC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAC5D,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,IAAI,CAAC,KAAK;oBAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;gBACvB,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,GAAG,CAAC,UAAkB;QAClC,IAAI,MAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC1C,UAAU;gBACV,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB;gBAC5C,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;gBACjC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnE,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,2BAA2B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC/F,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,EAAE,uBAAuB,EAAE;gBACnE,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;aAChD,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,0CAA0C,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;YACpF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE;gBAC1E,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,iBAAiB,EAAE;aACpF,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CACb,uBAAuB,MAAM,CAAC,OAAO,EAAE;gBACrC,CAAC,MAAM,CAAC,iBAAiB;oBACvB,CAAC,CAAC,8CAA8C;oBAChD,CAAC,CAAC,qCAAqC,CAAC,CAC7C,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,GAA4B;QAChC,IAAI,GAAG;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,mBAAmB,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;QACxF,IAAI,mBAAmB,IAAI,oBAAoB;YAAE,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;;YACnE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,CAAC;IACjE,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK;YAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;IACzB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,IAAI,CAAC,KAAK;YAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACzB,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB,CAAC,IAA8B;IAClE,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/C,UAAU,CAAC,KAAK,EAAE,CAAC;IACnB,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC"}
@@ -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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"}