agl 43.6.0 → 43.7.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/changelog.md +10 -0
- package/dist_serve/bundle.js +1801 -1783
- package/dist_serve/bundle.js.map +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.accountsactions.d.ts +3 -1
- package/dist_ts/classes.accountsactions.js +17 -1
- package/dist_ts/classes.controller.d.ts +3 -3
- package/dist_ts/classes.controller.js +5 -4
- package/dist_ts/classes.inferencerouter.d.ts +21 -3
- package/dist_ts/classes.inferencerouter.js +40 -17
- package/dist_ts/classes.inferenceservice.js +2 -2
- package/dist_ts/functions.inferencecli.js +2 -1
- package/dist_ts/interfaces.auth.d.ts +1 -1
- package/dist_ts/interfaces.auth.js +2 -1
- package/dist_ts/plugins.d.ts +2 -1
- package/dist_ts/plugins.js +4 -2
- package/dist_ts_authswitch/authority-contract.d.ts +26 -0
- package/dist_ts_authswitch/authority-contract.js +1 -1
- package/dist_ts_authswitch/authority-overview.d.ts +8 -0
- package/dist_ts_authswitch/authority-overview.js +10 -4
- package/dist_ts_authswitch/authority-placement.d.ts +16 -9
- package/dist_ts_authswitch/authority-placement.js +10 -7
- package/dist_ts_authswitch/authority-priority.d.ts +20 -0
- package/dist_ts_authswitch/authority-priority.js +21 -0
- package/dist_ts_authswitch/classes.authoritybroker.d.ts +7 -0
- package/dist_ts_authswitch/classes.authoritybroker.js +26 -2
- package/dist_ts_authswitch/classes.authoritycli.d.ts +1 -0
- package/dist_ts_authswitch/classes.authoritycli.js +43 -3
- package/dist_ts_authswitch/classes.authorityclient.d.ts +6 -1
- package/dist_ts_authswitch/classes.authorityclient.js +12 -4
- package/dist_ts_authswitch/classes.authoritydaemon.js +7 -1
- package/dist_ts_authswitch/classes.authoritydatabase.d.ts +6 -0
- package/dist_ts_authswitch/classes.authoritydatabase.js +13 -2
- package/dist_ts_authswitch/classes.authoritymodels.d.ts +7 -0
- package/dist_ts_authswitch/classes.authoritymodels.js +17 -8
- package/dist_ts_interfaces/requests.accounts.d.ts +19 -0
- package/dist_ts_interfaces/requests.accounts.js +1 -1
- package/dist_ts_interfaces/requests.d.ts +2 -2
- package/dist_ts_interfaces/requests.js +1 -1
- package/docs/authswitch.md +25 -0
- package/package.json +1 -1
- package/readme.md +29 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.accountsactions.ts +25 -0
- package/ts/classes.controller.ts +4 -3
- package/ts/classes.inferencerouter.ts +61 -16
- package/ts/classes.inferenceservice.ts +1 -1
- package/ts/functions.inferencecli.ts +1 -0
- package/ts/interfaces.auth.ts +1 -0
- package/ts/plugins.ts +3 -0
- package/ts_authswitch/authority-contract.ts +21 -0
- package/ts_authswitch/authority-overview.ts +19 -5
- package/ts_authswitch/authority-placement.ts +18 -10
- package/ts_authswitch/authority-priority.ts +25 -0
- package/ts_authswitch/classes.authoritybroker.ts +26 -1
- package/ts_authswitch/classes.authoritycli.ts +48 -2
- package/ts_authswitch/classes.authorityclient.ts +14 -4
- package/ts_authswitch/classes.authoritydaemon.ts +8 -1
- package/ts_authswitch/classes.authoritydatabase.ts +11 -1
- package/ts_authswitch/classes.authoritymodels.ts +17 -6
- package/ts_authswitch/readme.md +1 -1
- package/ts_interfaces/requests.accounts.ts +17 -0
- package/ts_interfaces/requests.ts +2 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/accounts.plugins.ts +4 -2
- package/ts_web/classes.accountsreadmodel.ts +36 -2
- package/ts_web/elements.accounts.ts +48 -0
|
@@ -8,6 +8,7 @@ import { authSwitchUsageProblemText, authSwitchUsageWindowName, authSwitchUsageW
|
|
|
8
8
|
import { authSwitchUsageLimit, authSwitchUsageLimitText } from './authority-usagelimit.js';
|
|
9
9
|
import { authSwitchPlacement } from './authority-placement.js';
|
|
10
10
|
import { authSwitchRenewal } from './authority-renewal.js';
|
|
11
|
+
import { authSwitchPriorityUntil } from './authority-priority.js';
|
|
11
12
|
import { authSwitchSubscriptionFacts } from './authority-subscription.js';
|
|
12
13
|
import { plainText } from './formatting.js';
|
|
13
14
|
import { authSwitchUsdText } from './authority-spend.js';
|
|
@@ -66,6 +67,7 @@ export const readAuthSwitchAccountOverview = async (snapshotArg, getUsageArg, no
|
|
|
66
67
|
maxUsagePercent: accountArg.maxUsagePercent, lapsesAt: accountArg.lapsesAt,
|
|
67
68
|
lifecycle: authSwitchPlacement(null, accountArg.maxUsagePercent, accountArg.lapsesAt, accountArg.renewsAt, nowArg, accountArg.reserveLiftUntil).lifecycle,
|
|
68
69
|
renewal: authSwitchRenewal(accountArg.renewsAt, nowArg),
|
|
70
|
+
priorityUntil: authSwitchPriorityUntil(accountArg.priorityUntil, nowArg),
|
|
69
71
|
};
|
|
70
72
|
const placement = (readingArg) => authSwitchPlacement(readingArg, accountArg.maxUsagePercent, accountArg.lapsesAt, accountArg.renewsAt, nowArg, accountArg.reserveLiftUntil);
|
|
71
73
|
if (login === null) {
|
|
@@ -115,7 +117,7 @@ export const authSwitchLimitList = (overviewArg) => ({
|
|
|
115
117
|
plan: accountArg.plan, usageState: accountArg.usage?.state ?? null, problem: accountArg.problem,
|
|
116
118
|
maxUsagePercent: accountArg.maxUsagePercent, accountState: accountArg.limit?.state ?? null,
|
|
117
119
|
lapsesAt: accountArg.lapsesAt, lifecycle: accountArg.lifecycle, renewal: accountArg.renewal,
|
|
118
|
-
placementScore: accountArg.placement.score,
|
|
120
|
+
priorityUntil: accountArg.priorityUntil, placementScore: accountArg.placement.score,
|
|
119
121
|
placementEligibility: accountArg.placement.eligibility };
|
|
120
122
|
if (accountArg.windows.length === 0) {
|
|
121
123
|
return [{ ...base, limit: null, windowSeconds: null, usedPercent: null, estimatedUsedPercent: null, resetAt: null,
|
|
@@ -185,12 +187,15 @@ const limitLines = (maxUsagePercentArg, limitArg, nowArg) => [
|
|
|
185
187
|
];
|
|
186
188
|
/**
|
|
187
189
|
* The lifecycle and placement of an account as lines of its cell: nothing for an active account with its score, a
|
|
188
|
-
* canceled one with its lapse, a lapsed one as never placed on; and the renewal its owner set, unless it
|
|
190
|
+
* canceled one with its lapse, a lapsed one as never placed on; and the priority and renewal its owner set, unless it
|
|
191
|
+
* lapsed. The priority's end is in local time: `priority until 14:05 (set by the owner)`, with its date on another day.
|
|
189
192
|
*/
|
|
190
193
|
const placementLines = (accountArg, nowArg) => [
|
|
191
194
|
...accountArg.lifecycle === 'lapsed' ? ['lapsed · never placed on']
|
|
192
195
|
: accountArg.lifecycle === 'canceled' && accountArg.lapsesAt !== null
|
|
193
196
|
? [`canceled · lapses in ${compactUntil(accountArg.lapsesAt, nowArg)}`] : [],
|
|
197
|
+
...accountArg.lifecycle === 'lapsed' || accountArg.priorityUntil === null ? []
|
|
198
|
+
: [`priority until ${asOfTime(accountArg.priorityUntil, nowArg)} (set by the owner)`],
|
|
194
199
|
...accountArg.lifecycle === 'lapsed' || accountArg.renewal === null ? []
|
|
195
200
|
: [renewalLine(accountArg.renewal, accountArg.lifecycle, nowArg)],
|
|
196
201
|
...accountArg.lifecycle === 'lapsed' ? []
|
|
@@ -216,7 +221,8 @@ const accountCell = (accountArg, nowArg) => [
|
|
|
216
221
|
...accountArg.paymentProblem === null ? [] : [`payment problem since ${asOfTime(accountArg.paymentProblem.at, nowArg)}`],
|
|
217
222
|
...limitLines(accountArg.maxUsagePercent, accountArg.limit, nowArg),
|
|
218
223
|
...placementLines({ lifecycle: accountArg.lifecycle, lapsesAt: accountArg.lapsesAt, renewal: accountArg.renewal,
|
|
219
|
-
|
|
224
|
+
priorityUntil: accountArg.priorityUntil, placementScore: accountArg.placement.score,
|
|
225
|
+
placementEligibility: accountArg.placement.eligibility }, nowArg),
|
|
220
226
|
...accountArg.loginHealth === null ? ['no login']
|
|
221
227
|
: accountArg.loginHealth === 'ready' ? []
|
|
222
228
|
: [`login ${accountArg.loginHealth}`,
|
|
@@ -268,4 +274,4 @@ export const renderAuthSwitchLimitList = async (outArg, limitsArg, nowArg) => {
|
|
|
268
274
|
groups: { divider: account, colorLine: (rowArg) => rowArg.providerId },
|
|
269
275
|
});
|
|
270
276
|
};
|
|
271
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authority-overview.js","sourceRoot":"","sources":["../../ts_authswitch/authority-overview.ts"],"names":[],"mappings":"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"}
|
|
277
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authority-overview.js","sourceRoot":"","sources":["../../ts_authswitch/authority-overview.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Where a new session goes: an account's lifecycle against its lapse date, and how much of its usage it can spend per
|
|
3
|
-
* hour before that usage resets, the account lapses or it renews. The inference proxy places
|
|
4
|
-
* authswitch command line and `agl proxy status` show it; an existing session keeps its
|
|
5
|
-
* is never placed again by it.
|
|
3
|
+
* hour before that usage resets, the account lapses or it renews, after its owner's priority. The inference proxy places
|
|
4
|
+
* new sessions by it, and the authswitch command line and `agl proxy status` show it; an existing session keeps its
|
|
5
|
+
* account for the prompt cache and is never placed again by it.
|
|
6
6
|
*
|
|
7
7
|
* Besides types, the module imports only the limit rule of `authority-usagelimit.ts`, the window reader it uses, the
|
|
8
8
|
* spend month of `authority-spend.ts` and the renewal of `authority-renewal.ts`, whose own imports carry nothing to a
|
|
@@ -52,18 +52,25 @@ export declare const authSwitchAccountLifecycle: (lapsesAtArg: string | null, no
|
|
|
52
52
|
* current month (`authSwitchSpendPeriod`) as its reset.
|
|
53
53
|
*/
|
|
54
54
|
export declare const authSwitchPlacement: (readingArg: TAuthSwitchUsageReading | null, maxUsagePercentArg: number | null, lapsesAtArg: string | null, renewalAnchorArg: string | null, nowArg: number, reserveLiftUntilArg?: string | null) => IAuthSwitchPlacement;
|
|
55
|
-
/**
|
|
55
|
+
/**
|
|
56
|
+
* An account as placement ranks it: whether its owner's priority holds now (`authSwitchPriorityActive` of
|
|
57
|
+
* `authority-priority.ts`, judged at the moment of placing), its score, whether it is a last resort, and its headroom
|
|
58
|
+
* below its threshold.
|
|
59
|
+
*/
|
|
56
60
|
export interface IAuthSwitchPlacementRank {
|
|
57
61
|
id: string;
|
|
62
|
+
priority: boolean;
|
|
58
63
|
score: number | null;
|
|
59
64
|
lastResort: boolean;
|
|
60
65
|
headroom: number;
|
|
61
66
|
}
|
|
62
67
|
/**
|
|
63
|
-
* The order a new session is placed in: an account
|
|
64
|
-
* then by the
|
|
65
|
-
*
|
|
66
|
-
*
|
|
67
|
-
*
|
|
68
|
+
* The order a new session is placed in: an account with its owner's priority (AGL-1809) before every account without
|
|
69
|
+
* one, then by the rest of the order among each of the two. An account that lapses within `lapseHorizonMs` only after
|
|
70
|
+
* every other one; then by the account's score shared among the requests it serves now -- `score / (1 + in flight)`, so
|
|
71
|
+
* new sessions spread over the accounts in proportion to what each can spend per hour, and usage that resets, lapses or
|
|
72
|
+
* meets a renewal soon is spent first -- then by headroom and id. An account without a counted window comes after every
|
|
73
|
+
* scored one, the least busy of them first. The order ranks only accounts that take the request: one at its limit or
|
|
74
|
+
* reserve, resting after a 429, lapsed or without the model is never ranked, whatever its priority.
|
|
68
75
|
*/
|
|
69
76
|
export declare const authSwitchPlacementOrder: (inFlightArg: (accountIdArg: string) => number) => (left: IAuthSwitchPlacementRank, right: IAuthSwitchPlacementRank) => number;
|
|
@@ -45,16 +45,19 @@ export const authSwitchPlacement = (readingArg, maxUsagePercentArg, lapsesAtArg,
|
|
|
45
45
|
return { lifecycle, eligibility, score: scores.length ? Math.min(...scores) : null };
|
|
46
46
|
};
|
|
47
47
|
/**
|
|
48
|
-
* The order a new session is placed in: an account
|
|
49
|
-
* then by the
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
48
|
+
* The order a new session is placed in: an account with its owner's priority (AGL-1809) before every account without
|
|
49
|
+
* one, then by the rest of the order among each of the two. An account that lapses within `lapseHorizonMs` only after
|
|
50
|
+
* every other one; then by the account's score shared among the requests it serves now -- `score / (1 + in flight)`, so
|
|
51
|
+
* new sessions spread over the accounts in proportion to what each can spend per hour, and usage that resets, lapses or
|
|
52
|
+
* meets a renewal soon is spent first -- then by headroom and id. An account without a counted window comes after every
|
|
53
|
+
* scored one, the least busy of them first. The order ranks only accounts that take the request: one at its limit or
|
|
54
|
+
* reserve, resting after a 429, lapsed or without the model is never ranked, whatever its priority.
|
|
53
55
|
*/
|
|
54
|
-
export const authSwitchPlacementOrder = (inFlightArg) => (left, right) => Number(
|
|
56
|
+
export const authSwitchPlacementOrder = (inFlightArg) => (left, right) => Number(right.priority) - Number(left.priority)
|
|
57
|
+
|| Number(left.lastResort) - Number(right.lastResort)
|
|
55
58
|
|| Number(left.score === null) - Number(right.score === null)
|
|
56
59
|
|| (left.score !== null && right.score !== null
|
|
57
60
|
? right.score / (1 + inFlightArg(right.id)) - left.score / (1 + inFlightArg(left.id))
|
|
58
61
|
: inFlightArg(left.id) - inFlightArg(right.id))
|
|
59
62
|
|| right.headroom - left.headroom || left.id.localeCompare(right.id);
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXR5LXBsYWNlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX2F1dGhzd2l0Y2gvYXV0aG9yaXR5LXBsYWNlbWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNsRyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN6RyxPQUFPLEVBQUUseUJBQXlCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQWMvRCx5RkFBeUY7QUFDekYsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLFVBQVUsQ0FBQztBQUV6QyxxSEFBcUg7QUFDckgsTUFBTSxpQkFBaUIsR0FBRyxTQUFTLENBQUM7QUFhcEMsaUhBQWlIO0FBQ2pILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQUMsV0FBMEIsRUFBRSxNQUFjLEVBQStCLEVBQUUsQ0FDcEgsV0FBVyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7QUFFOUY7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBaUJHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxVQUEwQyxFQUFFLGtCQUFpQyxFQUMvRyxXQUEwQixFQUFFLGdCQUErQixFQUFFLE1BQWMsRUFDM0UsbUJBQW1CLEdBQWtCLElBQUksRUFBd0IsRUFBRTtJQUNuRSxNQUFNLFNBQVMsR0FBRywwQkFBMEIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDbEUsTUFBTSxRQUFR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
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* An account's priority (AGL-1809), as its owner sets it: for 24 hours from when it was set, or until the owner turns it
|
|
3
|
+
* off, AGL's inference proxy places a new session on a priority account of its pool before any other account, as long as
|
|
4
|
+
* one takes the request (`authSwitchPlacementOrder`). Several accounts can hold it at once; among them the placement
|
|
5
|
+
* order decides as it always does. A session already running stays on its account.
|
|
6
|
+
*
|
|
7
|
+
* The account holds the moment its priority ends (`IAuthSwitchAccount.priorityUntil`), and every reader judges it against
|
|
8
|
+
* its own clock, so it ends by itself with nothing running at its end: one that ended reads as none.
|
|
9
|
+
*
|
|
10
|
+
* The module imports nothing, so it bundles for a browser as it is.
|
|
11
|
+
*/
|
|
12
|
+
/** How long a priority holds once its owner sets it: 24 hours. Setting it again starts the 24 hours again. */
|
|
13
|
+
export declare const authSwitchPriorityMs = 86400000;
|
|
14
|
+
/**
|
|
15
|
+
* Whether an account's priority holds at `nowArg` (epoch milliseconds): strictly before the moment it ends
|
|
16
|
+
* (`priorityUntilArg`, `IAuthSwitchAccount.priorityUntil`). One that ended is none.
|
|
17
|
+
*/
|
|
18
|
+
export declare const authSwitchPriorityActive: (priorityUntilArg: string | null | undefined, nowArg: number) => boolean;
|
|
19
|
+
/** When an account's priority ends while it holds at `nowArg`, ISO 8601 UTC as stored; `null` without one or once it ended. */
|
|
20
|
+
export declare const authSwitchPriorityUntil: (priorityUntilArg: string | null, nowArg: number) => string | null;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* An account's priority (AGL-1809), as its owner sets it: for 24 hours from when it was set, or until the owner turns it
|
|
3
|
+
* off, AGL's inference proxy places a new session on a priority account of its pool before any other account, as long as
|
|
4
|
+
* one takes the request (`authSwitchPlacementOrder`). Several accounts can hold it at once; among them the placement
|
|
5
|
+
* order decides as it always does. A session already running stays on its account.
|
|
6
|
+
*
|
|
7
|
+
* The account holds the moment its priority ends (`IAuthSwitchAccount.priorityUntil`), and every reader judges it against
|
|
8
|
+
* its own clock, so it ends by itself with nothing running at its end: one that ended reads as none.
|
|
9
|
+
*
|
|
10
|
+
* The module imports nothing, so it bundles for a browser as it is.
|
|
11
|
+
*/
|
|
12
|
+
/** How long a priority holds once its owner sets it: 24 hours. Setting it again starts the 24 hours again. */
|
|
13
|
+
export const authSwitchPriorityMs = 86_400_000;
|
|
14
|
+
/**
|
|
15
|
+
* Whether an account's priority holds at `nowArg` (epoch milliseconds): strictly before the moment it ends
|
|
16
|
+
* (`priorityUntilArg`, `IAuthSwitchAccount.priorityUntil`). One that ended is none.
|
|
17
|
+
*/
|
|
18
|
+
export const authSwitchPriorityActive = (priorityUntilArg, nowArg) => typeof priorityUntilArg === 'string' && Date.parse(priorityUntilArg) > nowArg;
|
|
19
|
+
/** When an account's priority ends while it holds at `nowArg`, ISO 8601 UTC as stored; `null` without one or once it ended. */
|
|
20
|
+
export const authSwitchPriorityUntil = (priorityUntilArg, nowArg) => authSwitchPriorityActive(priorityUntilArg, nowArg) ? priorityUntilArg : null;
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXR5LXByaW9yaXR5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfYXV0aHN3aXRjaC9hdXRob3JpdHktcHJpb3JpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7R0FVRztBQUVILDhHQUE4RztBQUM5RyxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxVQUFVLENBQUM7QUFFL0M7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxnQkFBMkMsRUFBRSxNQUFjLEVBQVcsRUFBRSxDQUMvRyxPQUFPLGdCQUFnQixLQUFLLFFBQVEsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsTUFBTSxDQUFDO0FBRWhGLCtIQUErSDtBQUMvSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLGdCQUErQixFQUFFLE1BQWMsRUFBaUIsRUFBRSxDQUN4Ryx3QkFBd0IsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyJ9
|
|
@@ -161,6 +161,13 @@ export declare class AuthSwitchAuthorityBroker {
|
|
|
161
161
|
* had one is the record an earlier accounts service reads.
|
|
162
162
|
*/
|
|
163
163
|
setAccountRenewal(accountId: string, expectedRevision: number, renewsAt: string | null): Promise<IAuthSwitchAccount>;
|
|
164
|
+
/**
|
|
165
|
+
* Gives an account the owner's priority until 24 hours from now on the authority's clock (`authSwitchPriorityMs`), or
|
|
166
|
+
* ends it, as `setAccountRenewal` sets a renewal. Any account can hold one, and giving it to one that holds it starts the
|
|
167
|
+
* 24 hours again. The stored record carries `priorityUntil` only while it is set: ending it removes the member, and the
|
|
168
|
+
* first write of the account after it ended drops it (`AuthSwitchAuthorityDatabase.persistAccount`).
|
|
169
|
+
*/
|
|
170
|
+
setAccountPriority(accountId: string, expectedRevision: number, priority: boolean): Promise<IAuthSwitchAccount>;
|
|
164
171
|
/** Refuses a removal that would not go ahead, changing nothing; `removeAccount` refuses the same. */
|
|
165
172
|
assertAccountRemovable(accountId: string, expectedRevision: number): Promise<void>;
|
|
166
173
|
/**
|