@geekity/cms 0.42.2 → 0.44.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/admin/pages/federation/followers.njk +1 -1
- package/admin/pages/users/activity.njk +3 -1
- package/admin/pages/users/apps.njk +55 -19
- package/admin/static/admin.css +9 -1
- package/admin/static/editor.js +22 -21
- package/dist/admin/app-activity.d.ts +8 -3
- package/dist/admin/app-activity.d.ts.map +1 -1
- package/dist/admin/app-activity.js +10 -3
- package/dist/admin/app-activity.js.map +1 -1
- package/dist/admin/connected-apps.d.ts +1 -1
- package/dist/admin/connected-apps.d.ts.map +1 -1
- package/dist/admin/connected-apps.js +99 -28
- package/dist/admin/connected-apps.js.map +1 -1
- package/dist/admin/indieauth-consent.d.ts.map +1 -1
- package/dist/admin/indieauth-consent.js +20 -2
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/list-indent.d.ts +19 -0
- package/dist/admin/list-indent.d.ts.map +1 -0
- package/dist/admin/list-indent.js +73 -0
- package/dist/admin/list-indent.js.map +1 -0
- package/dist/admin/widget-health.d.ts.map +1 -1
- package/dist/admin/widget-health.js +2 -0
- package/dist/admin/widget-health.js.map +1 -1
- package/dist/cms/app.d.ts.map +1 -1
- package/dist/cms/app.js +3 -0
- package/dist/cms/app.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +21 -2
- package/dist/cms/services.js.map +1 -1
- package/dist/{micropub/create.d.ts → content/micropub-create.d.ts} +5 -5
- package/dist/content/micropub-create.d.ts.map +1 -0
- package/dist/{micropub/create.js → content/micropub-create.js} +8 -8
- package/dist/content/micropub-create.js.map +1 -0
- package/dist/{micropub/update.d.ts → content/micropub-update.d.ts} +9 -9
- package/dist/content/micropub-update.d.ts.map +1 -0
- package/dist/{micropub/update.js → content/micropub-update.js} +8 -8
- package/dist/content/micropub-update.js.map +1 -0
- package/dist/federation/delivery.d.ts +20 -2
- package/dist/federation/delivery.d.ts.map +1 -1
- package/dist/federation/delivery.js +37 -23
- package/dist/federation/delivery.js.map +1 -1
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +2 -8
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/inbox.d.ts +5 -2
- package/dist/federation/inbox.d.ts.map +1 -1
- package/dist/federation/inbox.js +3 -3
- package/dist/federation/inbox.js.map +1 -1
- package/dist/federation/keys.d.ts +10 -0
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +13 -8
- package/dist/federation/keys.js.map +1 -1
- package/dist/federation/outbox-observer.d.ts +17 -0
- package/dist/federation/outbox-observer.d.ts.map +1 -0
- package/dist/federation/outbox-observer.js +98 -0
- package/dist/federation/outbox-observer.js.map +1 -0
- package/dist/federation/relays.d.ts.map +1 -1
- package/dist/federation/relays.js +32 -7
- package/dist/federation/relays.js.map +1 -1
- package/dist/federation/resend-job.d.ts +2 -1
- package/dist/federation/resend-job.d.ts.map +1 -1
- package/dist/federation/resend-job.js +11 -10
- package/dist/federation/resend-job.js.map +1 -1
- package/dist/federation/retry-job.d.ts +44 -0
- package/dist/federation/retry-job.d.ts.map +1 -0
- package/dist/federation/retry-job.js +102 -0
- package/dist/federation/retry-job.js.map +1 -0
- package/dist/files/data-files.d.ts +1 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +6 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/indieauth/request.d.ts +4 -3
- package/dist/indieauth/request.d.ts.map +1 -1
- package/dist/indieauth/request.js +21 -3
- package/dist/indieauth/request.js.map +1 -1
- package/dist/mcp/audit.d.ts +3 -0
- package/dist/mcp/audit.d.ts.map +1 -0
- package/dist/mcp/audit.js +35 -0
- package/dist/mcp/audit.js.map +1 -0
- package/dist/mcp/authoring/create.d.ts +2 -0
- package/dist/mcp/authoring/create.d.ts.map +1 -0
- package/dist/mcp/authoring/create.js +79 -0
- package/dist/mcp/authoring/create.js.map +1 -0
- package/dist/mcp/authoring/publish.d.ts +2 -0
- package/dist/mcp/authoring/publish.d.ts.map +1 -0
- package/dist/mcp/authoring/publish.js +75 -0
- package/dist/mcp/authoring/publish.js.map +1 -0
- package/dist/mcp/authoring/shared.d.ts +23 -0
- package/dist/mcp/authoring/shared.d.ts.map +1 -0
- package/dist/mcp/authoring/shared.js +35 -0
- package/dist/mcp/authoring/shared.js.map +1 -0
- package/dist/mcp/authoring/source.d.ts +2 -0
- package/dist/mcp/authoring/source.d.ts.map +1 -0
- package/dist/mcp/authoring/source.js +48 -0
- package/dist/mcp/authoring/source.js.map +1 -0
- package/dist/mcp/authoring/update.d.ts +2 -0
- package/dist/mcp/authoring/update.d.ts.map +1 -0
- package/dist/mcp/authoring/update.js +97 -0
- package/dist/mcp/authoring/update.js.map +1 -0
- package/dist/mcp/authoring/upload.d.ts +3 -0
- package/dist/mcp/authoring/upload.d.ts.map +1 -0
- package/dist/mcp/authoring/upload.js +71 -0
- package/dist/mcp/authoring/upload.js.map +1 -0
- package/dist/mcp/call-limit.d.ts +18 -0
- package/dist/mcp/call-limit.d.ts.map +1 -0
- package/dist/mcp/call-limit.js +24 -0
- package/dist/mcp/call-limit.js.map +1 -0
- package/dist/mcp/endpoint.d.ts +7 -0
- package/dist/mcp/endpoint.d.ts.map +1 -0
- package/dist/mcp/endpoint.js +161 -0
- package/dist/mcp/endpoint.js.map +1 -0
- package/dist/mcp/inspect/inbox.d.ts +2 -0
- package/dist/mcp/inspect/inbox.d.ts.map +1 -0
- package/dist/mcp/inspect/inbox.js +123 -0
- package/dist/mcp/inspect/inbox.js.map +1 -0
- package/dist/mcp/inspect/paging.d.ts +71 -0
- package/dist/mcp/inspect/paging.d.ts.map +1 -0
- package/dist/mcp/inspect/paging.js +59 -0
- package/dist/mcp/inspect/paging.js.map +1 -0
- package/dist/mcp/inspect/post.d.ts +9 -0
- package/dist/mcp/inspect/post.d.ts.map +1 -0
- package/dist/mcp/inspect/post.js +161 -0
- package/dist/mcp/inspect/post.js.map +1 -0
- package/dist/mcp/inspect/records.d.ts +4 -0
- package/dist/mcp/inspect/records.d.ts.map +1 -0
- package/dist/mcp/inspect/records.js +213 -0
- package/dist/mcp/inspect/records.js.map +1 -0
- package/dist/mcp/inspect/remote.d.ts +85 -0
- package/dist/mcp/inspect/remote.d.ts.map +1 -0
- package/dist/mcp/inspect/remote.js +274 -0
- package/dist/mcp/inspect/remote.js.map +1 -0
- package/dist/mcp/inspect/schemas.d.ts +70 -0
- package/dist/mcp/inspect/schemas.d.ts.map +1 -0
- package/dist/mcp/inspect/schemas.js +46 -0
- package/dist/mcp/inspect/schemas.js.map +1 -0
- package/dist/mcp/inspect/status.d.ts +2 -0
- package/dist/mcp/inspect/status.d.ts.map +1 -0
- package/dist/mcp/inspect/status.js +194 -0
- package/dist/mcp/inspect/status.js.map +1 -0
- package/dist/mcp/inspect/webmentions.d.ts +2 -0
- package/dist/mcp/inspect/webmentions.d.ts.map +1 -0
- package/dist/mcp/inspect/webmentions.js +130 -0
- package/dist/mcp/inspect/webmentions.js.map +1 -0
- package/dist/mcp/plugin-tools.d.ts +4 -0
- package/dist/mcp/plugin-tools.d.ts.map +1 -0
- package/dist/mcp/plugin-tools.js +29 -0
- package/dist/mcp/plugin-tools.js.map +1 -0
- package/dist/mcp/protocol.d.ts +67 -0
- package/dist/mcp/protocol.d.ts.map +1 -0
- package/dist/mcp/protocol.js +130 -0
- package/dist/mcp/protocol.js.map +1 -0
- package/dist/mcp/repair/refresh.d.ts +2 -0
- package/dist/mcp/repair/refresh.d.ts.map +1 -0
- package/dist/mcp/repair/refresh.js +111 -0
- package/dist/mcp/repair/refresh.js.map +1 -0
- package/dist/mcp/repair/resend.d.ts +2 -0
- package/dist/mcp/repair/resend.d.ts.map +1 -0
- package/dist/mcp/repair/resend.js +46 -0
- package/dist/mcp/repair/resend.js.map +1 -0
- package/dist/mcp/repair/retry.d.ts +2 -0
- package/dist/mcp/repair/retry.d.ts.map +1 -0
- package/dist/mcp/repair/retry.js +91 -0
- package/dist/mcp/repair/retry.js.map +1 -0
- package/dist/mcp/repair/schemas.d.ts +30 -0
- package/dist/mcp/repair/schemas.d.ts.map +1 -0
- package/dist/mcp/repair/schemas.js +26 -0
- package/dist/mcp/repair/schemas.js.map +1 -0
- package/dist/mcp/tools.d.ts +84 -0
- package/dist/mcp/tools.d.ts.map +1 -0
- package/dist/mcp/tools.js +102 -0
- package/dist/mcp/tools.js.map +1 -0
- package/dist/mcp/whoami.d.ts +2 -0
- package/dist/mcp/whoami.d.ts.map +1 -0
- package/dist/mcp/whoami.js +40 -0
- package/dist/mcp/whoami.js.map +1 -0
- package/dist/micropub/endpoint.d.ts.map +1 -1
- package/dist/micropub/endpoint.js +2 -2
- package/dist/micropub/endpoint.js.map +1 -1
- package/dist/plugin.d.ts +77 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +16 -1
- package/dist/plugin.js.map +1 -1
- package/dist/plugins/registry.d.ts +7 -1
- package/dist/plugins/registry.d.ts.map +1 -1
- package/dist/plugins/registry.js +23 -5
- package/dist/plugins/registry.js.map +1 -1
- package/dist/store/admin-store.d.ts +3 -3
- package/dist/store/admin-store.d.ts.map +1 -1
- package/dist/store/admin-store.js.map +1 -1
- package/dist/store/deliveries.d.ts +35 -4
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +64 -2
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/inbox.d.ts +17 -1
- package/dist/store/inbox.d.ts.map +1 -1
- package/dist/store/inbox.js +35 -0
- package/dist/store/inbox.js.map +1 -1
- package/dist/store/rows.d.ts +5 -0
- package/dist/store/rows.d.ts.map +1 -1
- package/dist/store/rows.js.map +1 -1
- package/dist/util/json-schema.d.ts +68 -0
- package/dist/util/json-schema.d.ts.map +1 -0
- package/dist/util/json-schema.js +60 -0
- package/dist/util/json-schema.js.map +1 -0
- package/dist/util/package-version.d.ts +2 -0
- package/dist/util/package-version.d.ts.map +1 -0
- package/dist/util/package-version.js +3 -0
- package/dist/util/package-version.js.map +1 -0
- package/dist/web/env.d.ts +2 -0
- package/dist/web/env.d.ts.map +1 -1
- package/dist/web/federation-routes.d.ts +1 -0
- package/dist/web/federation-routes.d.ts.map +1 -1
- package/dist/web/federation-routes.js +10 -7
- package/dist/web/federation-routes.js.map +1 -1
- package/dist/web/indieauth-activity-log.d.ts +23 -5
- package/dist/web/indieauth-activity-log.d.ts.map +1 -1
- package/dist/web/indieauth-activity-log.js +62 -23
- package/dist/web/indieauth-activity-log.js.map +1 -1
- package/dist/web/indieauth-bearer.d.ts +8 -1
- package/dist/web/indieauth-bearer.d.ts.map +1 -1
- package/dist/web/indieauth-bearer.js +24 -18
- package/dist/web/indieauth-bearer.js.map +1 -1
- package/dist/web/indieauth-discovery.d.ts +11 -2
- package/dist/web/indieauth-discovery.d.ts.map +1 -1
- package/dist/web/indieauth-discovery.js +22 -4
- package/dist/web/indieauth-discovery.js.map +1 -1
- package/dist/web/llms.d.ts.map +1 -1
- package/dist/web/llms.js +2 -0
- package/dist/web/llms.js.map +1 -1
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +4 -3
- package/dist/web/routes.js.map +1 -1
- package/dist/webmention/fetch-public.d.ts +9 -0
- package/dist/webmention/fetch-public.d.ts.map +1 -1
- package/dist/webmention/fetch-public.js +6 -4
- package/dist/webmention/fetch-public.js.map +1 -1
- package/package.json +3 -1
- package/dist/micropub/create.d.ts.map +0 -1
- package/dist/micropub/create.js.map +0 -1
- package/dist/micropub/update.d.ts.map +0 -1
- package/dist/micropub/update.js.map +0 -1
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Users > App activity: the recent requests apps made to the
|
|
3
|
-
* IndieAuth and Micropub endpoints
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
* IndieAuth and Micropub endpoints and the MCP tools agents called, newest
|
|
4
|
+
* first, failures marked, and one in full. Where a site owner looks when an
|
|
5
|
+
* app will not sign in or post, or to see what an agent did. Any signed-in
|
|
6
|
+
* admin may read it, as with the other admin screens.
|
|
6
7
|
*/
|
|
7
8
|
import type { Hono } from 'hono';
|
|
8
9
|
import type { AdminRender } from './documents.ts';
|
|
9
10
|
import type { GeekityEnv } from '../web/env.ts';
|
|
11
|
+
import type { ActivityEntry } from '../web/indieauth-activity-log.ts';
|
|
12
|
+
export declare function activityEntryUrl(entry: ActivityEntry): string;
|
|
13
|
+
export declare function activityLabel(entry: ActivityEntry): string;
|
|
10
14
|
/** Register the list and the screen for one entry. */
|
|
11
15
|
export declare function mountAppActivity(app: Hono<GeekityEnv>, options: {
|
|
12
16
|
render: AdminRender;
|
|
13
17
|
}): void;
|
|
18
|
+
export declare function freshEntries(dataDir: string, now: Date): Promise<ActivityEntry[]>;
|
|
14
19
|
//# sourceMappingURL=app-activity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-activity.d.ts","sourceRoot":"","sources":["../../src/admin/app-activity.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"app-activity.d.ts","sourceRoot":"","sources":["../../src/admin/app-activity.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,kCAAkC,CAAC;AAW1C,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAE7D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAE1D;AAKD,sDAAsD;AACtD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAwC9F;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAEvF"}
|
|
@@ -8,7 +8,14 @@ const ENDPOINT_LABELS = {
|
|
|
8
8
|
token: 'Token',
|
|
9
9
|
micropub: 'Micropub',
|
|
10
10
|
media: 'Media',
|
|
11
|
+
mcp: 'MCP',
|
|
11
12
|
};
|
|
13
|
+
export function activityEntryUrl(entry) {
|
|
14
|
+
return `${APP_ACTIVITY_PATH}/${entry.id}`;
|
|
15
|
+
}
|
|
16
|
+
export function activityLabel(entry) {
|
|
17
|
+
return `${ENDPOINT_LABELS[entry.endpoint]} ${entry.action}`;
|
|
18
|
+
}
|
|
12
19
|
/** The query that narrows the list to failures. */
|
|
13
20
|
const FAILURES_QUERY = 'show=failures';
|
|
14
21
|
/** Register the list and the screen for one entry. */
|
|
@@ -52,18 +59,18 @@ export function mountAppActivity(app, options) {
|
|
|
52
59
|
});
|
|
53
60
|
});
|
|
54
61
|
}
|
|
55
|
-
async function freshEntries(dataDir, now) {
|
|
62
|
+
export async function freshEntries(dataDir, now) {
|
|
56
63
|
return (await readActivityLog(dataDir)).filter((entry) => isFresh(entry, now));
|
|
57
64
|
}
|
|
58
65
|
/** One entry as the list shows it. */
|
|
59
66
|
function row(entry, timezone) {
|
|
60
67
|
const failed = isFailure(entry);
|
|
61
68
|
return {
|
|
62
|
-
url:
|
|
69
|
+
url: activityEntryUrl(entry),
|
|
63
70
|
when: { iso: entry.at, text: formatInTimezone(entry.at, timezone) },
|
|
64
71
|
endpoint: ENDPOINT_LABELS[entry.endpoint],
|
|
65
72
|
action: entry.action,
|
|
66
|
-
app: entry.clientId,
|
|
73
|
+
app: entry.clientId ?? entry.tokenName,
|
|
67
74
|
user: entry.user,
|
|
68
75
|
status: entry.status,
|
|
69
76
|
failed,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-activity.js","sourceRoot":"","sources":["../../src/admin/app-activity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-activity.js","sourceRoot":"","sources":["../../src/admin/app-activity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Users > Connected apps: the apps that hold a token for whoever is
|
|
3
|
-
* signed in, and the button that cuts one off.
|
|
3
|
+
* signed in, what each did lately, and the button that cuts one off.
|
|
4
4
|
*
|
|
5
5
|
* Only ever your own connections, because a token acts as the person who
|
|
6
6
|
* approved it. Revoking deletes the connection from `data/indieauth-tokens.json`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connected-apps.d.ts","sourceRoot":"","sources":["../../src/admin/connected-apps.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"connected-apps.d.ts","sourceRoot":"","sources":["../../src/admin/connected-apps.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAKlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgBhD,mCAAmC;AACnC,eAAO,MAAM,sBAAsB,6BAAkC,CAAC;AAEtE,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAE7C,eAAO,MAAM,4BAA4B,mCAAwC,CAAC;AAElF,eAAO,MAAM,+BAA+B,0CAA2C,CAAC;AAExF,eAAO,MAAM,YAAY,cAAc,CAAC;AAExC,eAAO,MAAM,iBAAiB,6BAAkC,CAAC;AAuDjE;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAkHhG"}
|
|
@@ -1,23 +1,27 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Users > Connected apps: the apps that hold a token for whoever is
|
|
3
|
-
* signed in, and the button that cuts one off.
|
|
3
|
+
* signed in, what each did lately, and the button that cuts one off.
|
|
4
4
|
*
|
|
5
5
|
* Only ever your own connections, because a token acts as the person who
|
|
6
6
|
* approved it. Revoking deletes the connection from `data/indieauth-tokens.json`,
|
|
7
7
|
* so the access token and the refresh token stop working on the next request.
|
|
8
8
|
*/
|
|
9
|
+
import { activityEntryUrl, activityLabel, freshEntries } from './app-activity.js';
|
|
9
10
|
import { flash } from './flash.js';
|
|
10
11
|
import { formatInTimezone } from './formatting.js';
|
|
11
12
|
import { ADMIN_TEMPLATES } from './templates.js';
|
|
12
13
|
import { CONNECTED_APPS_CHILD, CONNECTED_APPS_PATH } from './users.js';
|
|
14
|
+
import { isFailure } from '../web/indieauth-activity-log.js';
|
|
13
15
|
import { editSiteSetting } from './site-setting-edit.js';
|
|
14
16
|
import { findUserById, listUsers } from '../site/users.js';
|
|
15
17
|
import { stringOrEmpty } from '../util/forms.js';
|
|
16
18
|
import { clientIdentifier, sameClient } from '../util/client-id.js';
|
|
17
19
|
import { SCOPE_LABELS } from './indieauth-consent.js';
|
|
18
|
-
import {
|
|
20
|
+
import { MICROPUB_SCOPES } from '../indieauth/request.js';
|
|
21
|
+
import { MCP_SCOPES } from '../plugin.js';
|
|
19
22
|
import { meForSignIn } from '../indieauth/identity.js';
|
|
20
23
|
import { createToken, lapsesAt, listTokens, revokeConnection } from '../indieauth/tokens.js';
|
|
24
|
+
import { MCP_PATH } from '../web/indieauth-discovery.js';
|
|
21
25
|
/** Where a Revoke button posts. */
|
|
22
26
|
export const REVOKE_CONNECTION_PATH = `${CONNECTED_APPS_PATH}/revoke`;
|
|
23
27
|
/** The field a Revoke button submits: the connection's id. */
|
|
@@ -30,30 +34,51 @@ const TOKEN_LIFETIME_DAYS = [7, 30, 90, 365];
|
|
|
30
34
|
const DEFAULT_TOKEN_LIFETIME_DAYS = 30;
|
|
31
35
|
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
32
36
|
const NAME_LIMIT = 100;
|
|
37
|
+
const RECENT_ACTIVITY_LIMIT = 5;
|
|
38
|
+
const TOKEN_RESOURCES = [
|
|
39
|
+
{
|
|
40
|
+
name: 'micropub',
|
|
41
|
+
label: 'Micropub',
|
|
42
|
+
hint: 'Posting apps and scripts, such as the Manual tab of micropub.rocks.',
|
|
43
|
+
scopes: MICROPUB_SCOPES,
|
|
44
|
+
url: (baseUrl) => baseUrl,
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
name: 'mcp',
|
|
48
|
+
label: 'MCP',
|
|
49
|
+
hint: 'AI assistants and agents, such as Claude Code.',
|
|
50
|
+
scopes: MCP_SCOPES,
|
|
51
|
+
url: (baseUrl) => `${baseUrl}${MCP_PATH}`,
|
|
52
|
+
},
|
|
53
|
+
];
|
|
54
|
+
const DEFAULT_TOKEN_RESOURCE = TOKEN_RESOURCES[0];
|
|
55
|
+
function scopeField(resource) {
|
|
56
|
+
return `${resource.name}_scope`;
|
|
57
|
+
}
|
|
33
58
|
/**
|
|
34
59
|
* Register the screen and its Revoke button. Mounted before the users
|
|
35
60
|
* screens, whose `/admin/users/:id` would otherwise answer `apps` with a 404.
|
|
36
61
|
*/
|
|
37
62
|
export function mountConnectedApps(app, options) {
|
|
38
63
|
const { render } = options;
|
|
39
|
-
app.get(CONNECTED_APPS_PATH, (c) => render(c, ADMIN_TEMPLATES.connectedApps, screen(c)));
|
|
64
|
+
app.get(CONNECTED_APPS_PATH, async (c) => render(c, ADMIN_TEMPLATES.connectedApps, await screen(c)));
|
|
40
65
|
app.post(ADD_CLIENT_WITHOUT_PKCE_PATH, async (c) => {
|
|
41
66
|
const value = stringOrEmpty((await c.req.parseBody())[CLIENT_FIELD]).trim();
|
|
42
|
-
const refuse = (problem) => {
|
|
67
|
+
const refuse = async (problem) => {
|
|
43
68
|
c.status(400);
|
|
44
|
-
return render(c, ADMIN_TEMPLATES.connectedApps, screen(c, { value, problem }));
|
|
69
|
+
return render(c, ADMIN_TEMPLATES.connectedApps, await screen(c, { value, problem }));
|
|
45
70
|
};
|
|
46
71
|
if (clientIdentifier(value) === undefined)
|
|
47
|
-
return refuse(NOT_A_CLIENT_ID);
|
|
72
|
+
return await refuse(NOT_A_CLIENT_ID);
|
|
48
73
|
let listed = false;
|
|
49
74
|
const saved = await editSiteSetting(c.var.settings, 'clients_without_pkce', (current) => {
|
|
50
75
|
listed = current.some((id) => sameClient(id, value));
|
|
51
76
|
return listed ? current : [...current, value];
|
|
52
77
|
});
|
|
53
78
|
if (!saved.ok)
|
|
54
|
-
return refuse(Object.values(saved.problems).join(' '));
|
|
79
|
+
return await refuse(Object.values(saved.problems).join(' '));
|
|
55
80
|
if (listed)
|
|
56
|
-
return refuse(`${value} is already on the list.`);
|
|
81
|
+
return await refuse(`${value} is already on the list.`);
|
|
57
82
|
flash(c, 'notice', `${value} may now sign in without PKCE.`);
|
|
58
83
|
return c.redirect(CONNECTED_APPS_PATH, 303);
|
|
59
84
|
});
|
|
@@ -76,29 +101,37 @@ export function mountConnectedApps(app, options) {
|
|
|
76
101
|
app.post(CREATE_TOKEN_PATH, async (c) => {
|
|
77
102
|
const { config } = c.var;
|
|
78
103
|
const body = await c.req.parseBody({ all: true });
|
|
104
|
+
const resourceName = stringOrEmpty(body['resource']);
|
|
105
|
+
const resource = TOKEN_RESOURCES.find((choice) => choice.name === resourceName);
|
|
79
106
|
const form = {
|
|
80
107
|
name: stringOrEmpty(body['name']).trim(),
|
|
81
|
-
|
|
108
|
+
resource: resourceName,
|
|
109
|
+
scopes: resource === undefined ? [] : [body[scopeField(resource)] ?? []].flat().map(stringOrEmpty),
|
|
82
110
|
expires: stringOrEmpty(body['expires']),
|
|
83
111
|
};
|
|
84
112
|
const user = c.var.session?.userId == null
|
|
85
113
|
? undefined
|
|
86
114
|
: findUserById(config.dataDir, c.var.session.userId);
|
|
87
|
-
const
|
|
115
|
+
const offered = resource?.scopes ?? [];
|
|
116
|
+
const scopes = form.scopes.filter((scope) => offered.includes(scope));
|
|
88
117
|
const days = TOKEN_LIFETIME_DAYS.find((choice) => String(choice) === form.expires);
|
|
89
118
|
const problems = {
|
|
90
119
|
...(form.name === '' ? { name: 'Give the token a name, so you can tell it apart.' } : {}),
|
|
91
120
|
...(form.name.length > NAME_LIMIT
|
|
92
121
|
? { name: `Keep the name to ${NAME_LIMIT} characters.` }
|
|
93
122
|
: {}),
|
|
94
|
-
...(
|
|
123
|
+
...(resource === undefined ? { resource: 'Choose what the token works with.' } : {}),
|
|
124
|
+
...(resource !== undefined && (scopes.length === 0 || scopes.length < form.scopes.length)
|
|
95
125
|
? { scopes: 'Choose at least one thing the token may do.' }
|
|
96
126
|
: {}),
|
|
97
127
|
...(days === undefined ? { expires: 'Choose when the token expires.' } : {}),
|
|
98
128
|
};
|
|
99
|
-
if (user === undefined ||
|
|
129
|
+
if (user === undefined ||
|
|
130
|
+
resource === undefined ||
|
|
131
|
+
days === undefined ||
|
|
132
|
+
Object.keys(problems).length > 0) {
|
|
100
133
|
c.status(400);
|
|
101
|
-
return render(c, ADMIN_TEMPLATES.connectedApps, screen(c, undefined, { refused: form, problems }));
|
|
134
|
+
return render(c, ADMIN_TEMPLATES.connectedApps, await screen(c, undefined, { refused: form, problems }));
|
|
102
135
|
}
|
|
103
136
|
const baseUrl = c.var.config.baseUrl;
|
|
104
137
|
const { accessToken } = await createToken(config.dataDir, {
|
|
@@ -110,10 +143,10 @@ export function mountConnectedApps(app, options) {
|
|
|
110
143
|
}),
|
|
111
144
|
name: form.name,
|
|
112
145
|
scopes,
|
|
113
|
-
resource: baseUrl,
|
|
146
|
+
resource: resource.url(baseUrl),
|
|
114
147
|
lifetimeMs: days * DAY_MS,
|
|
115
148
|
}, config.now());
|
|
116
|
-
return showTokenOnceWithoutStoringIt(c, render, form.name, accessToken);
|
|
149
|
+
return await showTokenOnceWithoutStoringIt(c, render, form.name, accessToken);
|
|
117
150
|
});
|
|
118
151
|
app.post(REVOKE_CONNECTION_PATH, async (c) => {
|
|
119
152
|
const { config, session } = c.var;
|
|
@@ -129,17 +162,26 @@ export function mountConnectedApps(app, options) {
|
|
|
129
162
|
});
|
|
130
163
|
}
|
|
131
164
|
const NOT_A_CLIENT_ID = 'Enter the app’s client_id exactly as it sends it: an http or https URL with a domain name, such as https://ia.net/writer.';
|
|
132
|
-
function screen(c, refused, token) {
|
|
165
|
+
async function screen(c, refused, token) {
|
|
133
166
|
const { config } = c.var;
|
|
134
167
|
const userId = c.var.session?.userId;
|
|
168
|
+
const username = userId == null ? undefined : findUserById(config.dataDir, userId)?.username;
|
|
135
169
|
const settings = c.var.siteAtRequestStart;
|
|
136
|
-
const now = config.now()
|
|
170
|
+
const now = config.now();
|
|
171
|
+
const activity = await freshEntries(config.dataDir, now);
|
|
137
172
|
const connections = listTokens(config.dataDir)
|
|
138
|
-
.filter((stored) => stored.userId === userId && Date.parse(lapsesAt(stored)) > now)
|
|
173
|
+
.filter((stored) => stored.userId === userId && Date.parse(lapsesAt(stored)) > now.getTime())
|
|
139
174
|
.sort((a, b) => b.issuedAt.localeCompare(a.issuedAt))
|
|
140
|
-
.map((stored) =>
|
|
175
|
+
.map((stored) => ({
|
|
176
|
+
...row(stored, settings.timezone, config.baseUrl),
|
|
177
|
+
recent: activity
|
|
178
|
+
.filter((entry) => isActivityOf(stored, username, entry))
|
|
179
|
+
.slice(0, RECENT_ACTIVITY_LIMIT)
|
|
180
|
+
.map((entry) => recentRow(entry, settings.timezone)),
|
|
181
|
+
}));
|
|
141
182
|
const form = token !== undefined && 'refused' in token ? token.refused : undefined;
|
|
142
|
-
const
|
|
183
|
+
const chosenResource = TOKEN_RESOURCES.find((resource) => resource.name === form?.resource) ?? DEFAULT_TOKEN_RESOURCE;
|
|
184
|
+
const ticked = new Set(form?.scopes ?? []);
|
|
143
185
|
return {
|
|
144
186
|
section: 'users',
|
|
145
187
|
child: CONNECTED_APPS_CHILD,
|
|
@@ -157,11 +199,21 @@ function screen(c, refused, token) {
|
|
|
157
199
|
createToken: {
|
|
158
200
|
url: CREATE_TOKEN_PATH,
|
|
159
201
|
name: form?.name ?? '',
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
202
|
+
resources: TOKEN_RESOURCES.map((resource) => {
|
|
203
|
+
const chosen = resource === chosenResource;
|
|
204
|
+
return {
|
|
205
|
+
name: resource.name,
|
|
206
|
+
label: resource.label,
|
|
207
|
+
hint: resource.hint,
|
|
208
|
+
chosen,
|
|
209
|
+
field: scopeField(resource),
|
|
210
|
+
scopes: resource.scopes.map((scope) => ({
|
|
211
|
+
name: scope,
|
|
212
|
+
label: SCOPE_LABELS[scope],
|
|
213
|
+
checked: chosen && ticked.has(scope),
|
|
214
|
+
})),
|
|
215
|
+
};
|
|
216
|
+
}),
|
|
165
217
|
expiries: TOKEN_LIFETIME_DAYS.map((days) => ({
|
|
166
218
|
days,
|
|
167
219
|
selected: String(days) === (form?.expires ?? String(DEFAULT_TOKEN_LIFETIME_DAYS)),
|
|
@@ -172,25 +224,44 @@ function screen(c, refused, token) {
|
|
|
172
224
|
};
|
|
173
225
|
}
|
|
174
226
|
/** One connection as the table shows it. */
|
|
175
|
-
function row(token, timezone) {
|
|
227
|
+
function row(token, timezone, baseUrl) {
|
|
176
228
|
const when = (instant) => ({ iso: instant, text: formatInTimezone(instant, timezone) });
|
|
177
229
|
return {
|
|
178
230
|
id: token.id,
|
|
179
231
|
name: clientLabel(token),
|
|
180
232
|
url: token.kind === 'created' ? undefined : token.clientId,
|
|
233
|
+
resource: token.kind === 'created'
|
|
234
|
+
? TOKEN_RESOURCES.find((resource) => resource.url(baseUrl) === token.resource)?.label
|
|
235
|
+
: undefined,
|
|
181
236
|
scopes: token.scopes.map((scope) => SCOPE_LABELS[scope]),
|
|
182
237
|
issued: when(token.issuedAt),
|
|
183
238
|
lastUsed: token.lastUsedAt === undefined ? undefined : when(token.lastUsedAt),
|
|
184
239
|
expires: when(lapsesAt(token)),
|
|
185
240
|
};
|
|
186
241
|
}
|
|
242
|
+
function isActivityOf(token, username, entry) {
|
|
243
|
+
if (entry.connectionId !== undefined)
|
|
244
|
+
return entry.connectionId === token.id;
|
|
245
|
+
return (token.kind !== 'created' &&
|
|
246
|
+
entry.clientId !== undefined &&
|
|
247
|
+
entry.user === username &&
|
|
248
|
+
sameClient(entry.clientId, token.clientId));
|
|
249
|
+
}
|
|
250
|
+
function recentRow(entry, timezone) {
|
|
251
|
+
return {
|
|
252
|
+
url: activityEntryUrl(entry),
|
|
253
|
+
when: { iso: entry.at, text: formatInTimezone(entry.at, timezone) },
|
|
254
|
+
label: activityLabel(entry),
|
|
255
|
+
failed: isFailure(entry),
|
|
256
|
+
};
|
|
257
|
+
}
|
|
187
258
|
function clientLabel(token) {
|
|
188
259
|
if (token.kind === 'created')
|
|
189
260
|
return token.name;
|
|
190
261
|
return token.clientName ?? token.clientId;
|
|
191
262
|
}
|
|
192
|
-
function showTokenOnceWithoutStoringIt(c, render, name, token) {
|
|
263
|
+
async function showTokenOnceWithoutStoringIt(c, render, name, token) {
|
|
193
264
|
c.header('cache-control', 'no-store');
|
|
194
|
-
return render(c, ADMIN_TEMPLATES.connectedApps, screen(c, undefined, { created: { name, token } }));
|
|
265
|
+
return render(c, ADMIN_TEMPLATES.connectedApps, await screen(c, undefined, { created: { name, token } }));
|
|
195
266
|
}
|
|
196
267
|
//# sourceMappingURL=connected-apps.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connected-apps.js","sourceRoot":"","sources":["../../src/admin/connected-apps.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG7F,mCAAmC;AACnC,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,mBAAmB,SAAS,CAAC;AAEtE,8DAA8D;AAC9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE7C,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,mBAAmB,eAAe,CAAC;AAElF,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,4BAA4B,SAAS,CAAC;AAExF,MAAM,CAAC,MAAM,YAAY,GAAG,WAAW,CAAC;AAExC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,mBAAmB,SAAS,CAAC;AAEjE,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAU,CAAC;AAEtD,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAEvC,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC,MAAM,UAAU,GAAG,GAAG,CAAC;AAmBvB;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAqB,EAAE,OAAgC;IACxF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzF,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,MAAM,GAAG,CAAC,OAAe,EAAY,EAAE;YAC3C,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC,CAAC;QACF,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC,eAAe,CAAC,CAAC;QAC1E,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAC,OAAO,EAAE,EAAE;YACtF,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;YACrD,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,GAAG,KAAK,0BAA0B,CAAC,CAAC;QAC9D,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,gCAAgC,CAAC,CAAC;QAC7D,OAAO,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACpD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QACrE,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAC,OAAO,EAAE,EAAE;YACtF,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;YAClD,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE;YAAE,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACrE,IAAI,OAAO;YAAE,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,uBAAuB,CAAC,CAAC;;YACjE,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,oCAAoC,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QACzB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,IAAI,GAAc;YACtB,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;YACxC,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;YACvD,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACxC,CAAC;QACF,MAAM,IAAI,GACR,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,IAAI,IAAI;YAC3B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAkB,EAAE,CACzD,MAA4B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC9C,CAAC;QACF,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAkB;YAC9B,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,kDAAkD,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU;gBAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAoB,UAAU,cAAc,EAAE;gBACxD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;gBAC3D,CAAC,CAAC,EAAE,MAAM,EAAE,6CAA6C,EAAE;gBAC3D,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7E,CAAC;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjF,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,MAAM,CACX,CAAC,EACD,eAAe,CAAC,aAAa,EAC7B,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAClD,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;QACrC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,WAAW,CACvC,MAAM,CAAC,OAAO,EACd;YACE,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,EAAE,EAAE,WAAW,CAAC,GAAG,OAAO,GAAG,EAAE,IAAI,EAAE;gBACnC,OAAO;gBACP,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;gBAChC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB;aACnC,CAAC;YACF,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM;YACN,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,IAAI,GAAG,MAAM;SAC1B,EACD,MAAM,CAAC,GAAG,EAAE,CACb,CAAC;QACF,OAAO,6BAA6B,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QAClC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,OAAO,GACX,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,MAAM,IAAI,IAAI;YAC/C,CAAC,CAAC,MAAM,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;YAC1E,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,OAAO,KAAK,SAAS;YAAE,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,oCAAoC,CAAC,CAAC;;YAChF,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,OAAO,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,eAAe,GACnB,2HAA2H,CAAC;AAE9H,SAAS,MAAM,CACb,CAAsB,EACtB,OAAuB,EACvB,KAAoB;IAEpB,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;IACzB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC;SAC3C,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC;SAClF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SACpD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,IAAI,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;IAC3C,OAAO;QACL,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,sBAAsB;QACjC,eAAe,EAAE,gBAAgB;QACjC,WAAW;QACX,WAAW,EAAE;YACX,OAAO,EAAE,QAAQ,CAAC,oBAAoB;YACtC,MAAM,EAAE,4BAA4B;YACpC,SAAS,EAAE,+BAA+B;YAC1C,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE;YAC3B,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;SAChC;QACD,WAAW,EAAE;YACX,GAAG,EAAE,iBAAiB;YACtB,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE;YACtB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7B,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;gBAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;aAC3B,CAAC,CAAC;YACH,QAAQ,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;aAClF,CAAC,CAAC;YACH,QAAQ,EAAE,KAAK,KAAK,SAAS,IAAI,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YAC1E,OAAO,EAAE,KAAK,KAAK,SAAS,IAAI,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SAC/E;KACF,CAAC;AACJ,CAAC;AAED,4CAA4C;AAC5C,SAAS,GAAG,CAAC,KAAkB,EAAE,QAAgB;IAC/C,MAAM,IAAI,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAChG,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC;QACxB,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;QAC1D,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC5B,QAAQ,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAC7E,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAkB;IACrC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC,IAAI,CAAC;IAChD,OAAO,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC;AAC5C,CAAC;AAED,SAAS,6BAA6B,CACpC,CAAsB,EACtB,MAAmB,EACnB,IAAY,EACZ,KAAa;IAEb,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACtC,OAAO,MAAM,CACX,CAAC,EACD,eAAe,CAAC,aAAa,EAC7B,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACnD,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"connected-apps.js","sourceRoot":"","sources":["../../src/admin/connected-apps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indieauth-consent.d.ts","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgBhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,YAAY,6BAAsC,CAAC;AAEhE,mGAAmG;AACnG,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"indieauth-consent.d.ts","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgBhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,YAAY,6BAAsC,CAAC;AAEhE,mGAAmG;AACnG,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAUxD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAyBtE;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAqHhG"}
|
|
@@ -22,6 +22,9 @@ export const SCOPE_LABELS = {
|
|
|
22
22
|
update: 'Edit your posts',
|
|
23
23
|
delete: 'Delete your posts',
|
|
24
24
|
media: 'Upload media to your site',
|
|
25
|
+
publish: 'Publish drafts and change published posts',
|
|
26
|
+
inspect: 'Read your site’s federation and delivery records, inbox and followers included',
|
|
27
|
+
repair: 'Resend posts and retry federation deliveries',
|
|
25
28
|
};
|
|
26
29
|
/**
|
|
27
30
|
* The authorization endpoint.
|
|
@@ -164,13 +167,28 @@ async function clientInformation(c, clientId) {
|
|
|
164
167
|
}
|
|
165
168
|
/**
|
|
166
169
|
* Whether a client may be sent back to `redirectUri`: always on its own
|
|
167
|
-
* origin, and elsewhere only when its metadata lists that
|
|
170
|
+
* origin, and elsewhere only when its metadata lists that URL. A native app
|
|
171
|
+
* listening on a loopback address picks its port when it starts, so there the
|
|
172
|
+
* port is not compared (RFC 8252 section 7.3); Claude Code lists
|
|
173
|
+
* `http://localhost/callback` and returns to whatever port it got.
|
|
168
174
|
*/
|
|
169
175
|
function mayRedirect(clientId, redirectUri, client) {
|
|
170
176
|
const target = new URL(redirectUri);
|
|
171
177
|
const sameOrigin = (target.protocol === 'https:' || target.protocol === 'http:') &&
|
|
172
178
|
target.origin === new URL(clientId).origin;
|
|
173
|
-
return sameOrigin ||
|
|
179
|
+
return (sameOrigin ||
|
|
180
|
+
client.redirectUris.some((listed) => listed === redirectUri || sameLoopback(listed, target)));
|
|
181
|
+
}
|
|
182
|
+
const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]']);
|
|
183
|
+
function sameLoopback(listed, target) {
|
|
184
|
+
const url = URL.parse(listed);
|
|
185
|
+
return (url !== null &&
|
|
186
|
+
url.protocol === 'http:' &&
|
|
187
|
+
target.protocol === 'http:' &&
|
|
188
|
+
LOOPBACK_HOSTS.has(url.hostname) &&
|
|
189
|
+
url.hostname === target.hostname &&
|
|
190
|
+
url.pathname === target.pathname &&
|
|
191
|
+
url.search === target.search);
|
|
174
192
|
}
|
|
175
193
|
/** `redirectUri` with the answer and the issuer added to its query. */
|
|
176
194
|
function answer(redirectUri, baseUrl, fields) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indieauth-consent.js","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,YAAY,GACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGpE;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,YAAY,oBAAoB,CAAC;AAEhE,mGAAmG;AACnG,MAAM,CAAC,MAAM,YAAY,GAAoC;IAC3D,OAAO,EAAE,0BAA0B;IACnC,KAAK,EAAE,oBAAoB;IAC3B,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,KAAK,EAAE,2BAA2B;
|
|
1
|
+
{"version":3,"file":"indieauth-consent.js","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A nested item belongs to the item above only when it starts at that item's
|
|
3
|
+
* text column: two spaces under `- `, three under `1. `. A fixed indent unit
|
|
4
|
+
* gets ordered lists wrong, so the indent is read off the neighbouring items.
|
|
5
|
+
*/
|
|
6
|
+
export type Direction = 'in' | 'out';
|
|
7
|
+
/** Spaces to add to (or, when negative, take from) the start of a line. */
|
|
8
|
+
export interface LineShift {
|
|
9
|
+
/** Zero-based line index. */
|
|
10
|
+
line: number;
|
|
11
|
+
shift: number;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* The shifts that nest the selected lines under the item above, or bring them
|
|
15
|
+
* back out to their parent's indent, as one block. `undefined` when the first
|
|
16
|
+
* selected line is not a list item, so the caller can indent it as plain text.
|
|
17
|
+
*/
|
|
18
|
+
export declare function listIndent(lines: readonly string[], first: number, last: number, direction: Direction): LineShift[] | undefined;
|
|
19
|
+
//# sourceMappingURL=list-indent.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list-indent.d.ts","sourceRoot":"","sources":["../../src/admin/list-indent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC;AAErC,2EAA2E;AAC3E,MAAM,WAAW,SAAS;IACxB,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AASD;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,GACnB,SAAS,EAAE,GAAG,SAAS,CAiBzB"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A nested item belongs to the item above only when it starts at that item's
|
|
3
|
+
* text column: two spaces under `- `, three under `1. `. A fixed indent unit
|
|
4
|
+
* gets ordered lists wrong, so the indent is read off the neighbouring items.
|
|
5
|
+
*/
|
|
6
|
+
const ITEM = /^( *)([-*+]|\d{1,9}[.)])( +|$)/;
|
|
7
|
+
/**
|
|
8
|
+
* The shifts that nest the selected lines under the item above, or bring them
|
|
9
|
+
* back out to their parent's indent, as one block. `undefined` when the first
|
|
10
|
+
* selected line is not a list item, so the caller can indent it as plain text.
|
|
11
|
+
*/
|
|
12
|
+
export function listIndent(lines, first, last, direction) {
|
|
13
|
+
const start = lines[first];
|
|
14
|
+
if (start === undefined)
|
|
15
|
+
return undefined;
|
|
16
|
+
const item = itemAt(start);
|
|
17
|
+
if (item === undefined)
|
|
18
|
+
return undefined;
|
|
19
|
+
const target = direction === 'in' ? nestUnder(lines, first, item) : outdentTo(lines, first, item);
|
|
20
|
+
const shift = target - item.indent;
|
|
21
|
+
if (shift === 0)
|
|
22
|
+
return [];
|
|
23
|
+
const shifts = [];
|
|
24
|
+
for (let line = first; line <= last; line += 1) {
|
|
25
|
+
const text = lines[line] ?? '';
|
|
26
|
+
if (text.trim() === '')
|
|
27
|
+
continue;
|
|
28
|
+
shifts.push({ line, shift: Math.max(shift, -leadingSpaces(text)) });
|
|
29
|
+
}
|
|
30
|
+
return shifts;
|
|
31
|
+
}
|
|
32
|
+
function nestUnder(lines, first, item) {
|
|
33
|
+
for (let line = first - 1; line >= 0; line -= 1) {
|
|
34
|
+
const text = lines[line] ?? '';
|
|
35
|
+
if (text.trim() === '')
|
|
36
|
+
continue;
|
|
37
|
+
const indent = leadingSpaces(text);
|
|
38
|
+
if (indent > item.indent)
|
|
39
|
+
continue;
|
|
40
|
+
const above = itemAt(text);
|
|
41
|
+
if (above === undefined || above.indent < item.indent)
|
|
42
|
+
return item.indent;
|
|
43
|
+
return above.textColumn;
|
|
44
|
+
}
|
|
45
|
+
return item.indent;
|
|
46
|
+
}
|
|
47
|
+
function outdentTo(lines, first, item) {
|
|
48
|
+
for (let line = first - 1; line >= 0; line -= 1) {
|
|
49
|
+
const text = lines[line] ?? '';
|
|
50
|
+
if (text.trim() === '')
|
|
51
|
+
continue;
|
|
52
|
+
const indent = leadingSpaces(text);
|
|
53
|
+
if (indent >= item.indent)
|
|
54
|
+
continue;
|
|
55
|
+
const above = itemAt(text);
|
|
56
|
+
if (above === undefined)
|
|
57
|
+
return 0;
|
|
58
|
+
return above.indent;
|
|
59
|
+
}
|
|
60
|
+
return 0;
|
|
61
|
+
}
|
|
62
|
+
function itemAt(text) {
|
|
63
|
+
const match = ITEM.exec(text);
|
|
64
|
+
if (match === null)
|
|
65
|
+
return undefined;
|
|
66
|
+
const [whole, spaces = '', marker = ''] = match;
|
|
67
|
+
const gap = whole.length - spaces.length - marker.length;
|
|
68
|
+
return { indent: spaces.length, textColumn: spaces.length + marker.length + Math.max(gap, 1) };
|
|
69
|
+
}
|
|
70
|
+
function leadingSpaces(text) {
|
|
71
|
+
return text.length - text.trimStart().length;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=list-indent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list-indent.js","sourceRoot":"","sources":["../../src/admin/list-indent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"widget-health.d.ts","sourceRoot":"","sources":["../../src/admin/widget-health.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"widget-health.d.ts","sourceRoot":"","sources":["../../src/admin/widget-health.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AA8D/C,eAAO,MAAM,aAAa,EAAE,UA6C3B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { STRIP_METADATA_JOB } from '../content/metadata/strip-job.js';
|
|
2
2
|
import { SITE_EXPORT_JOB_NAME } from '../export/site-export.js';
|
|
3
3
|
import { RESEND_JOB } from '../federation/resend-job.js';
|
|
4
|
+
import { RETRY_DELIVERIES_JOB } from '../federation/retry-job.js';
|
|
4
5
|
import { countRetryingDeliveries } from '../store/queue-database.js';
|
|
5
6
|
import { EXPORT_PATH } from './export.js';
|
|
6
7
|
import { DELIVERY_PANEL, RESEND_PANEL } from './federation.js';
|
|
@@ -10,6 +11,7 @@ const LONG_RUNNING_MS = 60 * 60 * 1000;
|
|
|
10
11
|
const JOB_PANELS = {
|
|
11
12
|
[STRIP_METADATA_JOB.name]: { label: 'Metadata sweep', href: STRIP_METADATA_PANEL },
|
|
12
13
|
[RESEND_JOB.name]: { label: 'Resend', href: RESEND_PANEL },
|
|
14
|
+
[RETRY_DELIVERIES_JOB.name]: { label: 'Retry deliveries', href: DELIVERY_PANEL },
|
|
13
15
|
[SITE_EXPORT_JOB_NAME]: { label: 'Site export', href: EXPORT_PATH },
|
|
14
16
|
};
|
|
15
17
|
function jobPanel(name) {
|