@simplelayer/graniteer-core 0.3.30 → 0.3.31
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.
|
@@ -10,6 +10,24 @@ export interface MembershipDoorSyncConfig {
|
|
|
10
10
|
membershipBusEnforce: (members: MembershipSnapshotMember[], supabase: SupabaseLike) => Promise<Record<string, unknown> | null>;
|
|
11
11
|
membershipBusRevoke: (members: MembershipSnapshotMember[], generatedAt: string, supabase: SupabaseLike) => Promise<Record<string, unknown> | null>;
|
|
12
12
|
}
|
|
13
|
+
type MembershipRow = {
|
|
14
|
+
id: string;
|
|
15
|
+
email: string | null;
|
|
16
|
+
status: string;
|
|
17
|
+
pricing_grace_ends_at: string | null;
|
|
18
|
+
door_managed: boolean;
|
|
19
|
+
access_state: {
|
|
20
|
+
entitled: boolean;
|
|
21
|
+
group_ids: string[];
|
|
22
|
+
wifi_enabled: boolean;
|
|
23
|
+
} | null;
|
|
24
|
+
plan_id: string | null;
|
|
25
|
+
membership_plans: {
|
|
26
|
+
unifi_group_ids: string[] | null;
|
|
27
|
+
wifi_enabled: boolean | null;
|
|
28
|
+
} | null;
|
|
29
|
+
door_access_not_before: string | null;
|
|
30
|
+
};
|
|
13
31
|
/**
|
|
14
32
|
* Loads membership_id -> add-on UniFi group ids for LIVE subscriptions to
|
|
15
33
|
* grants_access add-ons. Throws on any read error so the tick aborts before
|
|
@@ -28,5 +46,18 @@ export declare function computeDesiredGroupIds(entitledRows: Array<{
|
|
|
28
46
|
unifi_group_ids: string[] | null;
|
|
29
47
|
} | null;
|
|
30
48
|
}>, addonGroupsByMembership: Map<string, string[]>): string[];
|
|
49
|
+
/**
|
|
50
|
+
* True if CommonSignal has ever (as far as the DB can tell) granted this email door access.
|
|
51
|
+
* Emails that are not ever-entitled are left OUT of the Phase 2 snapshot so the middleware
|
|
52
|
+
* never treats them as revoke candidates: their access (if any) predates CommonSignal
|
|
53
|
+
* (legacy Proximity / UniFi Fabric Roles) or the row is still mid-checkout.
|
|
54
|
+
* Any managed row qualifies if it is (1) currently entitled, (2) has a stored
|
|
55
|
+
* access_state.entitled === true, or (3) has a status that is NOT a known pre-checkout status
|
|
56
|
+
* (deny-list: incomplete, incomplete_expired, pending) and its door gate has already opened.
|
|
57
|
+
* Deny-list rather than allow-list because Phase 1 overwrites access_state with entitled:false
|
|
58
|
+
* on the same tick, so (2) only protects once; unknown/future statuses (e.g. 'paused') must
|
|
59
|
+
* stay revoke candidates instead of silently dropping out of the snapshot.
|
|
60
|
+
*/
|
|
61
|
+
export declare function everEntitledInCommonSignal(managed: MembershipRow[], currentlyEntitled: boolean, now: number): boolean;
|
|
31
62
|
export declare function createMembershipDoorSyncHandler(config: MembershipDoorSyncConfig): (req: Request) => Promise<Response>;
|
|
32
63
|
export {};
|
|
@@ -174,6 +174,27 @@ function doorGateOk(row, now) {
|
|
|
174
174
|
return false;
|
|
175
175
|
return t <= now;
|
|
176
176
|
}
|
|
177
|
+
// Deny-list, not allow-list: any status NOT known to be pre-checkout (including
|
|
178
|
+
// 'paused' and any future Stripe status) stays a revoke candidate. Unknown => revoke-eligible.
|
|
179
|
+
const PRE_CHECKOUT_STATUSES = ['incomplete', 'incomplete_expired', 'pending'];
|
|
180
|
+
/**
|
|
181
|
+
* True if CommonSignal has ever (as far as the DB can tell) granted this email door access.
|
|
182
|
+
* Emails that are not ever-entitled are left OUT of the Phase 2 snapshot so the middleware
|
|
183
|
+
* never treats them as revoke candidates: their access (if any) predates CommonSignal
|
|
184
|
+
* (legacy Proximity / UniFi Fabric Roles) or the row is still mid-checkout.
|
|
185
|
+
* Any managed row qualifies if it is (1) currently entitled, (2) has a stored
|
|
186
|
+
* access_state.entitled === true, or (3) has a status that is NOT a known pre-checkout status
|
|
187
|
+
* (deny-list: incomplete, incomplete_expired, pending) and its door gate has already opened.
|
|
188
|
+
* Deny-list rather than allow-list because Phase 1 overwrites access_state with entitled:false
|
|
189
|
+
* on the same tick, so (2) only protects once; unknown/future statuses (e.g. 'paused') must
|
|
190
|
+
* stay revoke candidates instead of silently dropping out of the snapshot.
|
|
191
|
+
*/
|
|
192
|
+
export function everEntitledInCommonSignal(managed, currentlyEntitled, now) {
|
|
193
|
+
if (currentlyEntitled)
|
|
194
|
+
return true;
|
|
195
|
+
return managed.some((r) => r.access_state?.entitled === true ||
|
|
196
|
+
(!PRE_CHECKOUT_STATUSES.includes(r.status) && doorGateOk(r, now)));
|
|
197
|
+
}
|
|
177
198
|
export function createMembershipDoorSyncHandler(config) {
|
|
178
199
|
const PROTECTED_ALLOWLIST = new Set(config.protectedAllowlist.map((e) => e.trim().toLowerCase()));
|
|
179
200
|
const { membershipBusSync, membershipBusEnforce, membershipBusRevoke } = config;
|
|
@@ -227,6 +248,7 @@ export function createMembershipDoorSyncHandler(config) {
|
|
|
227
248
|
const wouldRevoke = [];
|
|
228
249
|
let skippedAllowlist = 0;
|
|
229
250
|
let skippedNotManaged = 0;
|
|
251
|
+
let skippedNeverEntitled = 0;
|
|
230
252
|
let unchanged = 0;
|
|
231
253
|
let bootstrapped = 0;
|
|
232
254
|
const totalEvaluated = byEmail.size;
|
|
@@ -266,17 +288,23 @@ export function createMembershipDoorSyncHandler(config) {
|
|
|
266
288
|
groupIds = computeDesiredGroupIds(entitledRows, addonGroupsByMembership);
|
|
267
289
|
}
|
|
268
290
|
const desired = { entitled, group_ids: groupIds, wifi_enabled: wifiEnabled };
|
|
269
|
-
// Every managed, non-protected email
|
|
270
|
-
// The NOT-entitled ones are exactly the revoke candidates,
|
|
271
|
-
// make Stage 2 blind to the whole reason Stage 2 exists.
|
|
272
|
-
//
|
|
273
|
-
//
|
|
274
|
-
//
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
291
|
+
// Every managed, non-protected email that CommonSignal has ever entitled goes into the
|
|
292
|
+
// snapshot -- entitled or not. The NOT-entitled ones are exactly the revoke candidates,
|
|
293
|
+
// so omitting them would make Stage 2 blind to the whole reason Stage 2 exists. Emails
|
|
294
|
+
// CommonSignal never entitled (mid-checkout rows, future-dated gates with no history)
|
|
295
|
+
// are omitted: the middleware leaves absent emails untouched, so their legacy access
|
|
296
|
+
// is not revoked. Placed before the unchanged/continue branch so unchanged rows are
|
|
297
|
+
// included too: Stage 1's "unchanged" says nothing about whether UniFi matches intent.
|
|
298
|
+
if (everEntitledInCommonSignal(managed, entitled, now)) {
|
|
299
|
+
snapshot.push({
|
|
300
|
+
email,
|
|
301
|
+
desired_group_ids: desired.group_ids,
|
|
302
|
+
desired_wifi: desired.wifi_enabled,
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
else {
|
|
306
|
+
skippedNeverEntitled++;
|
|
307
|
+
}
|
|
280
308
|
// Per-email change detection uses the FIRST managed row's stored
|
|
281
309
|
// access_state as the reference; write-on-change updates every managed
|
|
282
310
|
// row for this email so they stay mutually consistent.
|
|
@@ -328,6 +356,7 @@ export function createMembershipDoorSyncHandler(config) {
|
|
|
328
356
|
await logOps(supabase, 'door_sync_write_failed', { email, error: upErr.message }, { severity: 'warning' });
|
|
329
357
|
}
|
|
330
358
|
}
|
|
359
|
+
console.log(`[door-sync] skipped_never_entitled=${skippedNeverEntitled}`);
|
|
331
360
|
const wouldChangeTotal = wouldGrant.length + wouldRevoke.length;
|
|
332
361
|
const severity = wouldChangeTotal > WOULD_CHANGE_WARN_THRESHOLD ? 'warning' : 'info';
|
|
333
362
|
await logOps(supabase, 'door_sync_shadow', {
|
|
@@ -335,6 +364,7 @@ export function createMembershipDoorSyncHandler(config) {
|
|
|
335
364
|
total_evaluated: totalEvaluated,
|
|
336
365
|
skipped_allowlist: skippedAllowlist,
|
|
337
366
|
skipped_not_managed: skippedNotManaged,
|
|
367
|
+
skipped_never_entitled: skippedNeverEntitled,
|
|
338
368
|
would_grant: wouldGrant.length,
|
|
339
369
|
would_revoke: wouldRevoke.length,
|
|
340
370
|
bootstrapped,
|
|
@@ -911,6 +941,7 @@ export function createMembershipDoorSyncHandler(config) {
|
|
|
911
941
|
total_evaluated: totalEvaluated,
|
|
912
942
|
skipped_allowlist: skippedAllowlist,
|
|
913
943
|
skipped_not_managed: skippedNotManaged,
|
|
944
|
+
skipped_never_entitled: skippedNeverEntitled,
|
|
914
945
|
would_grant: wouldGrant.length,
|
|
915
946
|
would_revoke: wouldRevoke.length,
|
|
916
947
|
bootstrapped,
|