@geekity/cms 0.52.0 → 0.52.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.
- package/admin/components/badge.njk +1 -0
- package/admin/pages/federation/followers.njk +8 -4
- package/admin/pages/federation/resend.njk +2 -2
- package/admin/static/admin.css +27 -37
- package/dist/admin/federation.d.ts +4 -4
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +31 -16
- package/dist/admin/federation.js.map +1 -1
- package/dist/admin/indieauth-consent.js +1 -1
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/taxonomy.d.ts.map +1 -1
- package/dist/admin/taxonomy.js +28 -19
- package/dist/admin/taxonomy.js.map +1 -1
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +11 -1
- package/dist/admin/users.js.map +1 -1
- package/dist/cli/commands.js +1 -1
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/resend.d.ts.map +1 -1
- package/dist/cli/resend.js +26 -5
- package/dist/cli/resend.js.map +1 -1
- package/dist/cli/run-job.d.ts +1 -1
- package/dist/cli/run-job.d.ts.map +1 -1
- package/dist/cli/run-job.js +2 -2
- package/dist/cli/run-job.js.map +1 -1
- package/dist/cli/user.js +5 -1
- package/dist/cli/user.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +36 -14
- package/dist/cms/services.js.map +1 -1
- package/dist/config.d.ts +8 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +2 -0
- package/dist/config.js.map +1 -1
- package/dist/content/authors.d.ts +6 -0
- package/dist/content/authors.d.ts.map +1 -1
- package/dist/content/authors.js +9 -0
- package/dist/content/authors.js.map +1 -1
- package/dist/content/reconcile.d.ts.map +1 -1
- package/dist/content/reconcile.js +20 -14
- package/dist/content/reconcile.js.map +1 -1
- package/dist/content/save.d.ts +33 -0
- package/dist/content/save.d.ts.map +1 -1
- package/dist/content/save.js +84 -5
- package/dist/content/save.js.map +1 -1
- package/dist/content/schedule.d.ts.map +1 -1
- package/dist/content/schedule.js +30 -6
- package/dist/content/schedule.js.map +1 -1
- package/dist/content/sync.d.ts +7 -0
- package/dist/content/sync.d.ts.map +1 -1
- package/dist/content/sync.js +41 -9
- package/dist/content/sync.js.map +1 -1
- package/dist/content/trash.d.ts.map +1 -1
- package/dist/content/trash.js +24 -17
- package/dist/content/trash.js.map +1 -1
- package/dist/content/write.d.ts.map +1 -1
- package/dist/content/write.js +64 -41
- package/dist/content/write.js.map +1 -1
- package/dist/federation/article.d.ts +27 -13
- package/dist/federation/article.d.ts.map +1 -1
- package/dist/federation/article.js +44 -33
- package/dist/federation/article.js.map +1 -1
- package/dist/federation/backfill.d.ts.map +1 -1
- package/dist/federation/backfill.js +3 -3
- package/dist/federation/backfill.js.map +1 -1
- package/dist/federation/citations.d.ts +1 -1
- package/dist/federation/citations.d.ts.map +1 -1
- package/dist/federation/citations.js +74 -19
- package/dist/federation/citations.js.map +1 -1
- package/dist/federation/delivery-plan.d.ts +17 -2
- package/dist/federation/delivery-plan.d.ts.map +1 -1
- package/dist/federation/delivery-plan.js +66 -6
- package/dist/federation/delivery-plan.js.map +1 -1
- package/dist/federation/delivery.d.ts +22 -19
- package/dist/federation/delivery.d.ts.map +1 -1
- package/dist/federation/delivery.js +186 -120
- package/dist/federation/delivery.js.map +1 -1
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +1 -3
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/handles.d.ts.map +1 -1
- package/dist/federation/handles.js +22 -1
- package/dist/federation/handles.js.map +1 -1
- package/dist/federation/keys.d.ts +5 -0
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +26 -1
- package/dist/federation/keys.js.map +1 -1
- package/dist/federation/object-ids.d.ts.map +1 -1
- package/dist/federation/object-ids.js +32 -13
- package/dist/federation/object-ids.js.map +1 -1
- package/dist/federation/ordered-queue.d.ts +16 -0
- package/dist/federation/ordered-queue.d.ts.map +1 -0
- package/dist/federation/ordered-queue.js +77 -0
- package/dist/federation/ordered-queue.js.map +1 -0
- package/dist/federation/outbox-observer.d.ts +3 -1
- package/dist/federation/outbox-observer.d.ts.map +1 -1
- package/dist/federation/outbox-observer.js +18 -6
- package/dist/federation/outbox-observer.js.map +1 -1
- package/dist/federation/paths.d.ts +3 -4
- package/dist/federation/paths.d.ts.map +1 -1
- package/dist/federation/paths.js +3 -4
- package/dist/federation/paths.js.map +1 -1
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +5 -4
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/queue.d.ts +9 -4
- package/dist/federation/queue.d.ts.map +1 -1
- package/dist/federation/queue.js +12 -6
- package/dist/federation/queue.js.map +1 -1
- package/dist/federation/records.d.ts.map +1 -1
- package/dist/federation/records.js +17 -1
- package/dist/federation/records.js.map +1 -1
- package/dist/federation/relays.d.ts +20 -11
- package/dist/federation/relays.d.ts.map +1 -1
- package/dist/federation/relays.js +108 -83
- package/dist/federation/relays.js.map +1 -1
- package/dist/federation/reply-targets.d.ts +5 -2
- package/dist/federation/reply-targets.d.ts.map +1 -1
- package/dist/federation/reply-targets.js +24 -14
- package/dist/federation/reply-targets.js.map +1 -1
- package/dist/federation/resend-job.d.ts +10 -4
- package/dist/federation/resend-job.d.ts.map +1 -1
- package/dist/federation/resend-job.js +27 -19
- package/dist/federation/resend-job.js.map +1 -1
- package/dist/federation/retry-job.d.ts +26 -8
- package/dist/federation/retry-job.d.ts.map +1 -1
- package/dist/federation/retry-job.js +114 -45
- package/dist/federation/retry-job.js.map +1 -1
- package/dist/federation/send-deadline.d.ts +13 -0
- package/dist/federation/send-deadline.d.ts.map +1 -0
- package/dist/federation/send-deadline.js +30 -0
- package/dist/federation/send-deadline.js.map +1 -0
- package/dist/jobs/queue.d.ts.map +1 -1
- package/dist/jobs/queue.js +5 -4
- package/dist/jobs/queue.js.map +1 -1
- package/dist/jobs/types.d.ts +8 -2
- package/dist/jobs/types.d.ts.map +1 -1
- package/dist/jobs/types.js.map +1 -1
- package/dist/mcp/authoring/shared.d.ts.map +1 -1
- package/dist/mcp/authoring/shared.js +2 -3
- package/dist/mcp/authoring/shared.js.map +1 -1
- package/dist/mcp/repair/resend.js +1 -1
- package/dist/mcp/repair/resend.js.map +1 -1
- package/dist/mcp/repair/retry.d.ts.map +1 -1
- package/dist/mcp/repair/retry.js +20 -8
- package/dist/mcp/repair/retry.js.map +1 -1
- package/dist/micropub/endpoint.d.ts.map +1 -1
- package/dist/micropub/endpoint.js +3 -6
- package/dist/micropub/endpoint.js.map +1 -1
- package/dist/privacy/retention.d.ts.map +1 -1
- package/dist/privacy/retention.js +9 -0
- package/dist/privacy/retention.js.map +1 -1
- package/dist/site/setting-values.d.ts +3 -2
- package/dist/site/setting-values.d.ts.map +1 -1
- package/dist/site/setting-values.js +7 -4
- package/dist/site/setting-values.js.map +1 -1
- package/dist/site/users.d.ts +19 -1
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +31 -3
- package/dist/site/users.js.map +1 -1
- package/dist/store/deliveries.d.ts +24 -5
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +86 -31
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/queue-database.d.ts +19 -2
- package/dist/store/queue-database.d.ts.map +1 -1
- package/dist/store/queue-database.js +69 -4
- package/dist/store/queue-database.js.map +1 -1
- package/dist/store/queue-order.d.ts +17 -0
- package/dist/store/queue-order.d.ts.map +1 -0
- package/dist/store/queue-order.js +33 -0
- package/dist/store/queue-order.js.map +1 -0
- package/dist/store/relays.d.ts +5 -3
- package/dist/store/relays.d.ts.map +1 -1
- package/dist/store/relays.js +1 -1
- package/dist/store/relays.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +12 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/util/errors.d.ts +6 -0
- package/dist/util/errors.d.ts.map +1 -1
- package/dist/util/errors.js +11 -0
- package/dist/util/errors.js.map +1 -1
- package/dist/webmention/service.d.ts +2 -2
- package/dist/webmention/service.d.ts.map +1 -1
- package/dist/webmention/service.js +3 -16
- package/dist/webmention/service.js.map +1 -1
- package/package.json +10 -10
- package/themes/default/static/style.css +8 -8
|
@@ -1,29 +1,41 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Document } from '../content/document.ts';
|
|
2
|
+
import type { CatalogReader, DocumentLookup, IndexClock } from '../content/store.ts';
|
|
2
3
|
import type { ResolvedConfig } from '../config.ts';
|
|
3
4
|
import type { JobDefinition } from '../jobs/types.ts';
|
|
4
5
|
import type { AdminStore } from '../store/admin-store.ts';
|
|
5
6
|
import type { DeliveryService } from './delivery.ts';
|
|
6
7
|
import type { ResendActivity } from './resend-job.ts';
|
|
8
|
+
/** A post is named by its content path, because a slug can name several. */
|
|
7
9
|
export type RetryFilter = {
|
|
8
|
-
readonly
|
|
10
|
+
readonly path: string;
|
|
9
11
|
readonly inbox: string | null;
|
|
10
12
|
} | {
|
|
11
|
-
readonly
|
|
13
|
+
readonly path: null;
|
|
12
14
|
readonly inbox: string;
|
|
13
15
|
};
|
|
16
|
+
/**
|
|
17
|
+
* What a recipient is owed. `post` is `announcement` when its newest `Create`
|
|
18
|
+
* failed, so it may never have stored the post, and `revision` when only a
|
|
19
|
+
* later activity about the post failed. `pin` is whether its newest `Add` or
|
|
20
|
+
* `Remove` failed.
|
|
21
|
+
*/
|
|
22
|
+
export type Missed = {
|
|
23
|
+
readonly post: 'announcement' | 'revision' | null;
|
|
24
|
+
readonly pin: boolean;
|
|
25
|
+
};
|
|
14
26
|
export type RetryRecipient = {
|
|
15
27
|
readonly actorId: string;
|
|
16
28
|
readonly inboxId: string;
|
|
17
29
|
readonly error: string | null;
|
|
18
|
-
readonly
|
|
30
|
+
readonly missed: Missed;
|
|
19
31
|
};
|
|
20
32
|
export type Retry = {
|
|
21
|
-
readonly
|
|
33
|
+
readonly path: string;
|
|
22
34
|
readonly recipients: RetryRecipient[];
|
|
23
35
|
};
|
|
24
36
|
export type RetryReport = {
|
|
25
37
|
readonly posts: readonly {
|
|
26
|
-
readonly
|
|
38
|
+
readonly path: string;
|
|
27
39
|
readonly recipients: number;
|
|
28
40
|
readonly activity: ResendActivity | null;
|
|
29
41
|
}[];
|
|
@@ -32,13 +44,19 @@ export declare const RETRY_DELIVERIES_JOB: import("../jobs/types.ts").JobName<Re
|
|
|
32
44
|
/** A burst of deliveries to one server can trip its bot protection. */
|
|
33
45
|
export declare const RETRY_PACE_MS = 2000;
|
|
34
46
|
export interface RetryPlanServices {
|
|
35
|
-
readonly store: DocumentLookup & CatalogReader;
|
|
47
|
+
readonly store: DocumentLookup & CatalogReader & IndexClock;
|
|
36
48
|
readonly admin: Pick<AdminStore, 'searchDeliveries'>;
|
|
37
49
|
readonly config: Pick<ResolvedConfig, 'contentDir' | 'baseUrl'>;
|
|
38
50
|
}
|
|
39
51
|
export interface RetryJobServices extends RetryPlanServices {
|
|
40
|
-
readonly delivery: Pick<DeliveryService, 'resend'>;
|
|
52
|
+
readonly delivery: Pick<DeliveryService, 'resend' | 'resendPin'>;
|
|
41
53
|
}
|
|
42
54
|
export declare function failedRetries(services: RetryPlanServices, filter: RetryFilter): Retry[];
|
|
55
|
+
/**
|
|
56
|
+
* The announced post a delivery row's object id belongs to, under any id it
|
|
57
|
+
* has been federated as. Built on first use, so a caller that never asks pays
|
|
58
|
+
* nothing for the walk of every announced post.
|
|
59
|
+
*/
|
|
60
|
+
export declare function federatedPostOf(services: RetryPlanServices): (objectId: string) => Document | undefined;
|
|
43
61
|
export declare function retryDeliveriesJob(services: RetryJobServices, pace?: (signal: AbortSignal) => Promise<void>): JobDefinition<RetryFilter, RetryReport>;
|
|
44
62
|
//# sourceMappingURL=retry-job.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,yBAAyB,CAAC;AAGpF,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,4EAA4E;AAC5E,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;KAC1C,EAAE,CAAC;CACL,CAAC;AAQF,eAAO,MAAM,oBAAoB,8DAAwD,CAAC;AAE1F,uEAAuE;AACvE,eAAO,MAAM,aAAa,OAAO,CAAC;AAElC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC;IAC5D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;CAClE;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,CAkDvF;AAqCD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,iBAAiB,GAC1B,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,GAAG,SAAS,CAM5C;AAuBD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CACE,GAC5C,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CAiCzC"}
|
|
@@ -1,61 +1,113 @@
|
|
|
1
1
|
import { setTimeout as sleep } from 'node:timers/promises';
|
|
2
|
-
import { postObjectId } from '../content/guids.js';
|
|
3
2
|
import { jobName } from '../jobs/types.js';
|
|
4
3
|
import { NO_LIMIT } from '../store/rows.js';
|
|
5
4
|
import { isRecord } from '../util/guards.js';
|
|
6
|
-
import {
|
|
7
|
-
import { objectIdsOf, readObjectIds } from './object-ids.js';
|
|
5
|
+
import { ownObjectIds } from './article.js';
|
|
8
6
|
import { resendActivity } from './resend-job.js';
|
|
9
7
|
const RETRIED = new Set(['failed', 'unknown']);
|
|
8
|
+
const PIN_ACTIVITIES = new Set(['Add', 'Remove']);
|
|
9
|
+
const POST_ORDER = ['announcement', 'revision', null];
|
|
10
10
|
export const RETRY_DELIVERIES_JOB = jobName('retry-deliveries');
|
|
11
11
|
/** A burst of deliveries to one server can trip its bot protection. */
|
|
12
12
|
export const RETRY_PACE_MS = 2000;
|
|
13
13
|
export function failedRetries(services, filter) {
|
|
14
14
|
const { admin, config } = services;
|
|
15
15
|
let objectIds;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
let postOf = federatedPostOf(services);
|
|
17
|
+
if (filter.path !== null) {
|
|
18
|
+
const document = services.store.getByPath(filter.path);
|
|
19
|
+
if (document?.type !== 'post')
|
|
19
20
|
return [];
|
|
20
|
-
objectIds = [
|
|
21
|
-
|
|
22
|
-
];
|
|
21
|
+
objectIds = [...ownObjectIds(services.store, document, config)];
|
|
22
|
+
postOf = () => document;
|
|
23
23
|
}
|
|
24
24
|
const all = { limit: NO_LIMIT };
|
|
25
25
|
const candidates = admin.searchDeliveries({ objectIds, inboxId: filter.inbox ?? undefined }, all).items;
|
|
26
26
|
const history = filter.inbox === null ? candidates : deliveriesToSameActors(admin, objectIds, candidates);
|
|
27
|
-
const
|
|
28
|
-
const newestCreate = new Map();
|
|
27
|
+
const histories = new Map();
|
|
29
28
|
for (const row of history) {
|
|
30
|
-
const
|
|
31
|
-
if (
|
|
29
|
+
const path = postOf(row.objectId)?.path;
|
|
30
|
+
if (path === undefined)
|
|
32
31
|
continue;
|
|
33
|
-
const key = JSON.stringify([
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
const key = JSON.stringify([path, row.actorId]);
|
|
33
|
+
let held = histories.get(key);
|
|
34
|
+
if (held === undefined) {
|
|
35
|
+
held = { path };
|
|
36
|
+
histories.set(key, held);
|
|
37
|
+
}
|
|
38
|
+
if (row.activityType === 'Create')
|
|
39
|
+
held.create ??= row;
|
|
40
|
+
if (PIN_ACTIVITIES.has(row.activityType))
|
|
41
|
+
held.pin ??= row;
|
|
42
|
+
else
|
|
43
|
+
held.post ??= row;
|
|
38
44
|
}
|
|
39
45
|
const retries = new Map();
|
|
40
|
-
for (const
|
|
41
|
-
|
|
46
|
+
for (const { path, ...rows } of histories.values()) {
|
|
47
|
+
const missed = missedFrom(rows);
|
|
48
|
+
const failure = newestFailure(rows, missed);
|
|
49
|
+
if (failure === undefined)
|
|
42
50
|
continue;
|
|
43
|
-
|
|
44
|
-
if (filter.inbox !== null && row.inboxId !== filter.inbox)
|
|
51
|
+
if (filter.inbox !== null && failure.inboxId !== filter.inbox)
|
|
45
52
|
continue;
|
|
46
53
|
const recipient = {
|
|
47
|
-
actorId:
|
|
48
|
-
inboxId:
|
|
49
|
-
error:
|
|
50
|
-
|
|
54
|
+
actorId: failure.actorId,
|
|
55
|
+
inboxId: failure.inboxId,
|
|
56
|
+
error: failure.error,
|
|
57
|
+
missed,
|
|
51
58
|
};
|
|
52
|
-
const held = retries.get(
|
|
59
|
+
const held = retries.get(path);
|
|
53
60
|
if (held === undefined)
|
|
54
|
-
retries.set(
|
|
61
|
+
retries.set(path, [recipient]);
|
|
55
62
|
else
|
|
56
63
|
held.push(recipient);
|
|
57
64
|
}
|
|
58
|
-
return [...retries].map(([
|
|
65
|
+
return [...retries].map(([path, recipients]) => ({ path, recipients }));
|
|
66
|
+
}
|
|
67
|
+
function failed(row) {
|
|
68
|
+
return row !== undefined && RETRIED.has(row.status);
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* A failed `Create` is owed even after a later `Update` went through, because
|
|
72
|
+
* a peer drops an `Update` of a status it never stored; only a later `Delete`
|
|
73
|
+
* settles it.
|
|
74
|
+
*/
|
|
75
|
+
function missedFrom({ create, post, pin }) {
|
|
76
|
+
const withdrawn = post?.activityType === 'Delete' && !failed(post);
|
|
77
|
+
return {
|
|
78
|
+
post: failed(create) && !withdrawn ? 'announcement' : failed(post) ? 'revision' : null,
|
|
79
|
+
pin: failed(pin),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
function newestFailure({ create, post, pin }, missed) {
|
|
83
|
+
const owed = [
|
|
84
|
+
missed.post === 'announcement' ? create : undefined,
|
|
85
|
+
missed.post === null ? undefined : post,
|
|
86
|
+
missed.pin ? pin : undefined,
|
|
87
|
+
].filter(failed);
|
|
88
|
+
return owed.toSorted((a, b) => b.attemptedAt.localeCompare(a.attemptedAt))[0];
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* The announced post a delivery row's object id belongs to, under any id it
|
|
92
|
+
* has been federated as. Built on first use, so a caller that never asks pays
|
|
93
|
+
* nothing for the walk of every announced post.
|
|
94
|
+
*/
|
|
95
|
+
export function federatedPostOf(services) {
|
|
96
|
+
let posts;
|
|
97
|
+
return (objectId) => {
|
|
98
|
+
posts ??= postsByObjectId(services);
|
|
99
|
+
return posts.get(objectId);
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
function postsByObjectId({ store, config }) {
|
|
103
|
+
const posts = new Map();
|
|
104
|
+
for (const document of store.listFederated()) {
|
|
105
|
+
for (const id of ownObjectIds(store, document, config)) {
|
|
106
|
+
if (!posts.has(id))
|
|
107
|
+
posts.set(id, document);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return posts;
|
|
59
111
|
}
|
|
60
112
|
function deliveriesToSameActors(admin, objectIds, rows) {
|
|
61
113
|
const actorIds = new Set(rows.map((row) => row.actorId));
|
|
@@ -72,17 +124,22 @@ export function retryDeliveriesJob(services, pace = (signal) => sleep(RETRY_PACE
|
|
|
72
124
|
context.signal.throwIfAborted();
|
|
73
125
|
if (done > 0)
|
|
74
126
|
await pace(context.signal);
|
|
75
|
-
for (const
|
|
76
|
-
const group = retry.recipients.filter((recipient) => recipient.missedAnnouncement === missedAnnouncement);
|
|
77
|
-
if (group.length === 0)
|
|
78
|
-
continue;
|
|
127
|
+
for (const { missed, group } of byWhatTheyMissed(retry.recipients)) {
|
|
79
128
|
const actors = new Set(group.map((recipient) => recipient.actorId));
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
129
|
+
const reports = [];
|
|
130
|
+
if (missed.post !== null) {
|
|
131
|
+
const missedAnnouncement = missed.post === 'announcement';
|
|
132
|
+
reports.push(await services.delivery.resend(retry.path, { actors, missedAnnouncement }));
|
|
133
|
+
}
|
|
134
|
+
if (missed.pin)
|
|
135
|
+
reports.push(await services.delivery.resendPin(retry.path, actors));
|
|
136
|
+
for (const report of reports) {
|
|
137
|
+
posts.push({
|
|
138
|
+
path: retry.path,
|
|
139
|
+
recipients: group.length,
|
|
140
|
+
activity: report === undefined ? null : resendActivity(report),
|
|
141
|
+
});
|
|
142
|
+
}
|
|
86
143
|
}
|
|
87
144
|
await context.progress({ done: done + 1, total: retries.length });
|
|
88
145
|
}
|
|
@@ -90,15 +147,27 @@ export function retryDeliveriesJob(services, pace = (signal) => sleep(RETRY_PACE
|
|
|
90
147
|
},
|
|
91
148
|
};
|
|
92
149
|
}
|
|
150
|
+
function byWhatTheyMissed(recipients) {
|
|
151
|
+
const groups = new Map();
|
|
152
|
+
for (const recipient of recipients) {
|
|
153
|
+
const key = JSON.stringify(recipient.missed);
|
|
154
|
+
const held = groups.get(key);
|
|
155
|
+
if (held === undefined)
|
|
156
|
+
groups.set(key, { missed: recipient.missed, group: [recipient] });
|
|
157
|
+
else
|
|
158
|
+
held.group.push(recipient);
|
|
159
|
+
}
|
|
160
|
+
return [...groups.values()].toSorted((a, b) => POST_ORDER.indexOf(a.missed.post) - POST_ORDER.indexOf(b.missed.post));
|
|
161
|
+
}
|
|
93
162
|
function parseRetryFilter(payload) {
|
|
94
163
|
if (isRecord(payload)) {
|
|
95
|
-
const {
|
|
96
|
-
if (typeof
|
|
97
|
-
return {
|
|
164
|
+
const { path, inbox } = payload;
|
|
165
|
+
if (typeof path === 'string' && (inbox === null || typeof inbox === 'string')) {
|
|
166
|
+
return { path, inbox };
|
|
98
167
|
}
|
|
99
|
-
if (
|
|
100
|
-
return {
|
|
168
|
+
if (path === null && typeof inbox === 'string')
|
|
169
|
+
return { path, inbox };
|
|
101
170
|
}
|
|
102
|
-
throw new Error('A retry names a post’s
|
|
171
|
+
throw new Error('A retry names a post’s path, an inbox, or both.');
|
|
103
172
|
}
|
|
104
173
|
//# sourceMappingURL=retry-job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { ResolvedConfig } from '../config.ts';
|
|
2
|
+
/**
|
|
3
|
+
* Wait for one delivery POST for as long as the config allows, and reject when
|
|
4
|
+
* the inbox has not answered by then.
|
|
5
|
+
*
|
|
6
|
+
* Fedify 2.4.5 takes no signal or deadline for a delivery, and its HTTP client
|
|
7
|
+
* waits five minutes for headers, so an inbox that accepts the connection and
|
|
8
|
+
* never answers would hold a resend and a shutdown that long per post. The
|
|
9
|
+
* request is left to finish or fail on its own, and what it ends in after the
|
|
10
|
+
* deadline is dropped.
|
|
11
|
+
*/
|
|
12
|
+
export declare function sendWithinDeadline(config: Pick<ResolvedConfig, 'federation'>, inbox: string, sending: Promise<void>): Promise<void>;
|
|
13
|
+
//# sourceMappingURL=send-deadline.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"send-deadline.d.ts","sourceRoot":"","sources":["../../src/federation/send-deadline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC1C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GACrB,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { DEFAULT_DELIVERY_TIMEOUT_MS } from '../config.js';
|
|
2
|
+
/**
|
|
3
|
+
* Wait for one delivery POST for as long as the config allows, and reject when
|
|
4
|
+
* the inbox has not answered by then.
|
|
5
|
+
*
|
|
6
|
+
* Fedify 2.4.5 takes no signal or deadline for a delivery, and its HTTP client
|
|
7
|
+
* waits five minutes for headers, so an inbox that accepts the connection and
|
|
8
|
+
* never answers would hold a resend and a shutdown that long per post. The
|
|
9
|
+
* request is left to finish or fail on its own, and what it ends in after the
|
|
10
|
+
* deadline is dropped.
|
|
11
|
+
*/
|
|
12
|
+
export async function sendWithinDeadline(config, inbox, sending) {
|
|
13
|
+
const ms = config.federation.deliveryTimeoutMs ?? DEFAULT_DELIVERY_TIMEOUT_MS;
|
|
14
|
+
sending.catch(() => undefined);
|
|
15
|
+
let timer;
|
|
16
|
+
try {
|
|
17
|
+
await Promise.race([
|
|
18
|
+
sending,
|
|
19
|
+
new Promise((_resolve, reject) => {
|
|
20
|
+
timer = setTimeout(() => {
|
|
21
|
+
reject(new Error(`No answer from ${inbox} within ${String(ms / 1000)} s.`));
|
|
22
|
+
}, ms);
|
|
23
|
+
}),
|
|
24
|
+
]);
|
|
25
|
+
}
|
|
26
|
+
finally {
|
|
27
|
+
clearTimeout(timer);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=send-deadline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"send-deadline.js","sourceRoot":"","sources":["../../src/federation/send-deadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAG3D;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAA0C,EAC1C,KAAa,EACb,OAAsB;IAEtB,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,IAAI,2BAA2B,CAAC;IAC9E,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,KAAiC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,OAAO;YACP,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;gBACtC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBACtB,MAAM,CAAC,IAAI,KAAK,CAAC,kBAAkB,KAAK,WAAW,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC9E,CAAC,EAAE,EAAE,CAAC,CAAC;YACT,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC"}
|
package/dist/jobs/queue.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/jobs/queue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C,OAAO,KAAK,EACV,aAAa,EAEb,QAAQ,EACR,UAAU,EAGV,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAIpB,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAI3C,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/jobs/queue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C,OAAO,KAAK,EACV,aAAa,EAEb,QAAQ,EACR,UAAU,EAGV,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAIpB,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAI3C,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,QAAQ,CA0MjE"}
|
package/dist/jobs/queue.js
CHANGED
|
@@ -35,7 +35,7 @@ export function createJobQueue(options) {
|
|
|
35
35
|
if (record.state !== 'running' || record.owner === owner || !isCutOff(record))
|
|
36
36
|
continue;
|
|
37
37
|
const expected = { state: 'running', attempt: record.attempt };
|
|
38
|
-
await records.transition(record.id, expected, record.attempt >= maxAttempts
|
|
38
|
+
await records.transition(record.id, expected, record.attempt >= maxAttempts || record.resumable === false
|
|
39
39
|
? { state: 'interrupted', attempt: record.attempt, interruptedAt: now() }
|
|
40
40
|
: { state: 'queued', attempt: record.attempt + 1, interruptedAt: now() });
|
|
41
41
|
}
|
|
@@ -44,7 +44,7 @@ export function createJobQueue(options) {
|
|
|
44
44
|
for (const record of await records.list(['queued']))
|
|
45
45
|
await transport.enqueue({ id: record.id });
|
|
46
46
|
}
|
|
47
|
-
async function claimAndRun(id, signal) {
|
|
47
|
+
async function claimAndRun(id, signal, resumable = true) {
|
|
48
48
|
if (signal.aborted)
|
|
49
49
|
return false;
|
|
50
50
|
const record = await records.get(id);
|
|
@@ -67,6 +67,7 @@ export function createJobQueue(options) {
|
|
|
67
67
|
owner,
|
|
68
68
|
claimer: thisProcess(),
|
|
69
69
|
startedAt: now(),
|
|
70
|
+
...(resumable ? {} : { resumable: false }),
|
|
70
71
|
};
|
|
71
72
|
if (!(await records.transition(id, queued, claim)))
|
|
72
73
|
return false;
|
|
@@ -175,8 +176,8 @@ export function createJobQueue(options) {
|
|
|
175
176
|
await reconcile();
|
|
176
177
|
return records.list(states);
|
|
177
178
|
},
|
|
178
|
-
async run(id) {
|
|
179
|
-
await claimAndRun(id, stopping.signal);
|
|
179
|
+
async run(id, options = {}) {
|
|
180
|
+
await claimAndRun(id, stopping.signal, options.resumable ?? true);
|
|
180
181
|
for (;;) {
|
|
181
182
|
const status = await records.get(id);
|
|
182
183
|
if (status === undefined)
|
package/dist/jobs/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/jobs/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAW1C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AAE3C,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAUhC;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,OAAwB;IACrD,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAChE,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAwB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAE/F,IAAI,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,IAAI,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IACjD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,IAAI,GAAmB,EAAE,CAAC;IAE9B;;;;;;;OAOG;IACH,KAAK,UAAU,SAAS;QACtB,KAAK,MAAM,MAAM,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACrD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAAE,SAAS;YACxF,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,SAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;YACxE,MAAM,OAAO,CAAC,UAAU,CACtB,MAAM,CAAC,EAAE,EACT,QAAQ,EACR,MAAM,CAAC,OAAO,IAAI,WAAW;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/jobs/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/jobs/types.d.ts
CHANGED
|
@@ -27,6 +27,8 @@ export type JobState = {
|
|
|
27
27
|
readonly claimer?: Claimer;
|
|
28
28
|
readonly startedAt: string;
|
|
29
29
|
readonly progress?: Progress;
|
|
30
|
+
/** Set when the job ends with its claimer: another queue does not take it back. */
|
|
31
|
+
readonly resumable?: false;
|
|
30
32
|
} | {
|
|
31
33
|
readonly state: 'finished';
|
|
32
34
|
readonly attempt: number;
|
|
@@ -119,9 +121,13 @@ export interface JobQueue {
|
|
|
119
121
|
* Run one queued job in this process and resolve with its final status,
|
|
120
122
|
* with no transport and no start-up recovery: what a CLI command does
|
|
121
123
|
* beside a server that may be running. A job another process claimed first
|
|
122
|
-
* is waited for instead.
|
|
124
|
+
* is waited for instead. With `resumable: false`, a queue that finds this
|
|
125
|
+
* process gone marks the job interrupted rather than running it again: a
|
|
126
|
+
* person who stopped a command meant it to stop.
|
|
123
127
|
*/
|
|
124
|
-
run(id: string
|
|
128
|
+
run(id: string, options?: {
|
|
129
|
+
readonly resumable?: boolean;
|
|
130
|
+
}): Promise<JobStatus>;
|
|
125
131
|
/** Recover the jobs no worker owns and start taking messages. */
|
|
126
132
|
start(): Promise<void>;
|
|
127
133
|
/** Stop taking messages and abort the running job's signal. */
|
package/dist/jobs/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/jobs/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GACd,IAAI,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,IAAI,EAAE,GAAG;IAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAExF,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,QAAQ,GAChB;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GACvF;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/jobs/types.ts"],"names":[],"mappings":"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"}
|
package/dist/jobs/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/jobs/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/jobs/types.ts"],"names":[],"mappings":"AA8CA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAU,CAAC;AA2B9F,MAAM,UAAU,OAAO,CAAiC,IAAY;IAClE,OAAO,EAAE,IAAI,EAAE,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAqB,EACrB,MAA6B;IAE7B,OAAO,MAAM,EAAE,KAAK,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI;QAC7D,CAAC,CAAE,MAAM,CAAC,MAAY;QACtB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAoGD,uDAAuD;AACvD,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YAAY,EAAU;QACpB,KAAK,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/mcp/authoring/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErD,wBAAgB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/mcp/authoring/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErD,wBAAgB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAOzF;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAOrD;AAED,wBAAgB,OAAO,CACrB,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,EACpD,IAAI,EAAE,MAAM,EACZ,MAAM,SAAoB,GACzB,OAAO,CAMT;AAED,eAAO,MAAM,YAAY;aACvB,GAAG;iBAAI,IAAI,EAAE,QAAQ;iBAAE,WAAW,EAAE,qBAAqB;;aACzD,IAAI;iBAAI,IAAI,EAAE,QAAQ;;aACtB,KAAK;iBAAI,IAAI,EAAE,SAAS;;CAChB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { postOwner } from '../../content/authors.js';
|
|
2
2
|
import { keptProperties } from '../../content/kept-properties.js';
|
|
3
3
|
import { postLocations } from '../../content/locations.js';
|
|
4
4
|
import { listUsers } from '../../site/users.js';
|
|
@@ -8,8 +8,7 @@ export function ownPost(site, user, reference) {
|
|
|
8
8
|
const document = findPost(site, reference);
|
|
9
9
|
if (isRefused(document))
|
|
10
10
|
return document;
|
|
11
|
-
|
|
12
|
-
if (author !== undefined && author.id !== user.id) {
|
|
11
|
+
if (postOwner(listUsers(site.config.dataDir), document.author)?.id !== user.id) {
|
|
13
12
|
return refused(`${reference} is not your post.`);
|
|
14
13
|
}
|
|
15
14
|
return document;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/mcp/authoring/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/mcp/authoring/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,UAAU,OAAO,CAAC,IAAc,EAAE,IAAU,EAAE,SAAiB;IACnE,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACzC,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;QAC/E,OAAO,OAAO,CAAC,GAAG,SAAS,oBAAoB,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAc;IACvC,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;QAC5B,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE;QAC9C,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7C,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,OAAoD,EACpD,IAAY,EACZ,MAAM,GAAG,iBAAiB;IAE1B,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS;QAClC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1B,CAAC,CAAC,OAAO,CACL,GAAG,IAAI,kDAAkD,MAAM,qCAAqC,CACrG,CAAC;AACR,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qBAAqB,EAAE;IAC3D,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACxB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;CAClB,CAAC"}
|
|
@@ -31,7 +31,7 @@ export const resendPost = defineTool({
|
|
|
31
31
|
return document;
|
|
32
32
|
const { slug } = document;
|
|
33
33
|
const outcome = queuedJob(await site.jobs.enqueueUnlessActive(RESEND_JOB, {
|
|
34
|
-
|
|
34
|
+
paths: [document.path],
|
|
35
35
|
webmentions: args.webmentions ?? true,
|
|
36
36
|
}));
|
|
37
37
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend.js","sourceRoot":"","sources":["../../../src/mcp/repair/resend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;IACnC,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,eAAe;IACtB,WAAW,EACT,mXAAmX;IACrX,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,MAAM;IACnB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE;gBACX,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,sEAAsE;aACpF;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,CAAC;QAClB,oBAAoB,EAAE,KAAK;KAC5B;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE;QAClE,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC;KACpC;IACD,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;QACzC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QAC1B,MAAM,OAAO,GAAG,SAAS,CACvB,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE;YAC9C,KAAK,EAAE,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"resend.js","sourceRoot":"","sources":["../../../src/mcp/repair/resend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;IACnC,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,eAAe;IACtB,WAAW,EACT,mXAAmX;IACrX,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,MAAM;IACnB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE;gBACX,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,sEAAsE;aACpF;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,CAAC;QAClB,oBAAoB,EAAE,KAAK;KAC5B;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE;QAClE,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC;KACpC;IACD,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;QACzC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QAC1B,MAAM,OAAO,GAAG,SAAS,CACvB,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE;YAC9C,KAAK,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;SACtC,CAAC,CACH,CAAC;QACF,OAAO;YACL,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,OAAO,CAAC,MAAM;gBACrB,CAAC,CAAC,sBAAsB,IAAI,WAAW,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG;gBACxD,CAAC,CAAC,uBAAuB,OAAO,CAAC,GAAG,CAAC,KAAK,WAAW,OAAO,CAAC,GAAG,CAAC,EAAE,2BAA2B;YAChG,UAAU,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE;SACjC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../src/mcp/repair/retry.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,eAAe,+
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../src/mcp/repair/retry.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,eAAe,+BAiG1B,CAAC"}
|