@geekity/cms 0.51.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/account/forgot.njk +13 -7
- package/admin/pages/account/reset.njk +1 -1
- package/admin/pages/federation/followers.njk +8 -4
- package/admin/pages/federation/resend.njk +2 -2
- package/admin/pages/users/edit.njk +36 -4
- package/admin/pages/users/new.njk +19 -1
- package/admin/static/admin.css +27 -37
- package/dist/admin/admin-bar.d.ts.map +1 -1
- package/dist/admin/admin-bar.js +11 -10
- package/dist/admin/admin-bar.js.map +1 -1
- package/dist/admin/autosave.d.ts.map +1 -1
- package/dist/admin/autosave.js +1 -2
- package/dist/admin/autosave.js.map +1 -1
- package/dist/admin/confirm-password.d.ts +19 -1
- package/dist/admin/confirm-password.d.ts.map +1 -1
- package/dist/admin/confirm-password.js +40 -8
- package/dist/admin/confirm-password.js.map +1 -1
- package/dist/admin/connected-apps.d.ts.map +1 -1
- package/dist/admin/connected-apps.js +1 -0
- package/dist/admin/connected-apps.js.map +1 -1
- package/dist/admin/credentials.d.ts +0 -1
- package/dist/admin/credentials.d.ts.map +1 -1
- package/dist/admin/credentials.js +1 -2
- package/dist/admin/credentials.js.map +1 -1
- package/dist/admin/documents.d.ts +0 -7
- package/dist/admin/documents.d.ts.map +1 -1
- package/dist/admin/documents.js +1 -15
- package/dist/admin/documents.js.map +1 -1
- package/dist/admin/export.d.ts +2 -0
- package/dist/admin/export.d.ts.map +1 -1
- package/dist/admin/export.js +5 -4
- package/dist/admin/export.js.map +1 -1
- 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/headers.d.ts.map +1 -1
- package/dist/admin/headers.js +4 -0
- package/dist/admin/headers.js.map +1 -1
- package/dist/admin/index.d.ts +7 -7
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +5 -5
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/indieauth-consent.d.ts.map +1 -1
- package/dist/admin/indieauth-consent.js +4 -3
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/legacy-migrations.d.ts.map +1 -1
- package/dist/admin/legacy-migrations.js +6 -2
- package/dist/admin/legacy-migrations.js.map +1 -1
- package/dist/admin/plugins.d.ts +2 -0
- package/dist/admin/plugins.d.ts.map +1 -1
- package/dist/admin/plugins.js +15 -11
- package/dist/admin/plugins.js.map +1 -1
- package/dist/admin/recovery.d.ts +7 -4
- package/dist/admin/recovery.d.ts.map +1 -1
- package/dist/admin/recovery.js +68 -43
- package/dist/admin/recovery.js.map +1 -1
- package/dist/admin/routes.d.ts.map +1 -1
- package/dist/admin/routes.js +99 -76
- package/dist/admin/routes.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/uploads.d.ts +4 -13
- package/dist/admin/uploads.d.ts.map +1 -1
- package/dist/admin/uploads.js +9 -28
- package/dist/admin/uploads.js.map +1 -1
- package/dist/admin/users.d.ts +7 -0
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +166 -43
- package/dist/admin/users.js.map +1 -1
- package/dist/cli/commands.d.ts.map +1 -1
- package/dist/cli/commands.js +13 -2
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +5 -4
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/password.js +3 -3
- package/dist/cli/password.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/serve.d.ts.map +1 -1
- package/dist/cli/serve.js +17 -0
- package/dist/cli/serve.js.map +1 -1
- package/dist/cli/user.d.ts +1 -1
- package/dist/cli/user.d.ts.map +1 -1
- package/dist/cli/user.js +79 -12
- 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 +16 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -1
- 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/actor.d.ts.map +1 -1
- package/dist/federation/actor.js +9 -5
- package/dist/federation/actor.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 +32 -16
- 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/files/atomic.d.ts +7 -1
- package/dist/files/atomic.d.ts.map +1 -1
- package/dist/files/atomic.js +75 -14
- package/dist/files/atomic.js.map +1 -1
- package/dist/files/data-files.d.ts +12 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +24 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/files/lock-file.d.ts.map +1 -0
- package/dist/{jobs → files}/lock-file.js +1 -1
- package/dist/files/lock-file.js.map +1 -0
- package/dist/gemini/certificate.d.ts.map +1 -1
- package/dist/gemini/certificate.js +15 -12
- package/dist/gemini/certificate.js.map +1 -1
- package/dist/indieauth/grants.d.ts +1 -0
- package/dist/indieauth/grants.d.ts.map +1 -1
- package/dist/indieauth/grants.js.map +1 -1
- package/dist/indieauth/tokens.d.ts +4 -1
- package/dist/indieauth/tokens.d.ts.map +1 -1
- package/dist/indieauth/tokens.js +7 -3
- package/dist/indieauth/tokens.js.map +1 -1
- package/dist/jobs/file-records.js +1 -1
- package/dist/jobs/file-records.js.map +1 -1
- package/dist/jobs/processes.d.ts +0 -1
- package/dist/jobs/processes.d.ts.map +1 -1
- package/dist/jobs/processes.js +1 -9
- package/dist/jobs/processes.js.map +1 -1
- 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/notifications/mail-service.d.ts.map +1 -1
- package/dist/notifications/mail-service.js +16 -1
- package/dist/notifications/mail-service.js.map +1 -1
- package/dist/plugin.d.ts +3 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js.map +1 -1
- package/dist/plugins/site.d.ts.map +1 -1
- package/dist/plugins/site.js +1 -1
- package/dist/plugins/site.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/admin-paths.d.ts +7 -0
- package/dist/site/admin-paths.d.ts.map +1 -1
- package/dist/site/admin-paths.js +18 -0
- package/dist/site/admin-paths.js.map +1 -1
- package/dist/site/passwords.d.ts +9 -2
- package/dist/site/passwords.d.ts.map +1 -1
- package/dist/site/passwords.js +45 -14
- package/dist/site/passwords.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 +85 -11
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +237 -37
- 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 +23 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sessions.d.ts +3 -0
- package/dist/store/sessions.d.ts.map +1 -1
- package/dist/store/sessions.js +27 -18
- package/dist/store/sessions.js.map +1 -1
- package/dist/store/tokens.d.ts +4 -2
- package/dist/store/tokens.d.ts.map +1 -1
- package/dist/store/tokens.js +16 -10
- package/dist/store/tokens.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/util/html-tree.d.ts +4 -0
- package/dist/util/html-tree.d.ts.map +1 -1
- package/dist/util/html-tree.js +34 -0
- package/dist/util/html-tree.js.map +1 -1
- package/dist/util/process-alive.d.ts +3 -0
- package/dist/util/process-alive.d.ts.map +1 -0
- package/dist/util/process-alive.js +11 -0
- package/dist/util/process-alive.js.map +1 -0
- package/dist/web/compression.js +2 -3
- package/dist/web/compression.js.map +1 -1
- package/dist/web/indieauth-bearer.js +2 -2
- package/dist/web/indieauth-bearer.js.map +1 -1
- package/dist/web/indieauth-token.js +3 -3
- package/dist/web/indieauth-token.js.map +1 -1
- package/dist/web/session.d.ts +6 -1
- package/dist/web/session.d.ts.map +1 -1
- package/dist/web/session.js +21 -3
- package/dist/web/session.js.map +1 -1
- package/dist/web/signed-in.d.ts.map +1 -1
- package/dist/web/signed-in.js +6 -2
- package/dist/web/signed-in.js.map +1 -1
- package/dist/web/throttle.d.ts +26 -18
- package/dist/web/throttle.d.ts.map +1 -1
- package/dist/web/throttle.js +130 -24
- package/dist/web/throttle.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 +11 -11
- package/templates/site/gitignore +4 -0
- package/themes/default/mail/email-changed.html.njk +17 -0
- package/themes/default/mail/email-changed.subject.njk +1 -0
- package/themes/default/mail/email-changed.txt.njk +14 -0
- package/themes/default/mail/password-changed.html.njk +1 -1
- package/themes/default/mail/password-changed.txt.njk +2 -1
- package/themes/default/partials/jsonld.njk +1 -1
- package/themes/default/static/style.css +8 -8
- package/dist/jobs/lock-file.d.ts.map +0 -1
- package/dist/jobs/lock-file.js.map +0 -1
- /package/dist/{jobs → files}/lock-file.d.ts +0 -0
|
@@ -3,9 +3,12 @@ import { Accept, Follow, PUBLIC_COLLECTION, Reject, Undo } from '@fedify/vocab';
|
|
|
3
3
|
import { holdOutbound } from '../dev-mode.js';
|
|
4
4
|
import { SITE } from '../site/namespace.js';
|
|
5
5
|
import { primaryUser } from '../site/users.js';
|
|
6
|
-
import { messageOf } from '../util/errors.js';
|
|
6
|
+
import { messageOf, oneLineMessageOf } from '../util/errors.js';
|
|
7
7
|
import { createSerialQueue } from '../util/queue.js';
|
|
8
8
|
import { actorId, senderKeyPairs } from './actor.js';
|
|
9
|
+
import { isDuplicateDelivery } from './outbox-observer.js';
|
|
10
|
+
import { sendWithinDeadline } from './send-deadline.js';
|
|
11
|
+
const RELAY_FOLLOW_FRAGMENT = '#relay-follow/';
|
|
9
12
|
/**
|
|
10
13
|
* One relay as the {@link Recipient} Fedify delivers to.
|
|
11
14
|
*
|
|
@@ -46,10 +49,10 @@ export function createRelayService(options) {
|
|
|
46
49
|
const { federation, admin, store, config, settings } = options;
|
|
47
50
|
const logger = options.logger ?? console;
|
|
48
51
|
const synchronous = config.federation.queue === null;
|
|
49
|
-
//
|
|
50
|
-
// the
|
|
52
|
+
// Each change is decided here as well as made here: a decision read from
|
|
53
|
+
// records an earlier change has not written yet follows a relay the list
|
|
54
|
+
// has since dropped, or brings back one whose Undo just went out.
|
|
51
55
|
const subscriptions = createSerialQueue();
|
|
52
|
-
const listReadsApartFromRelays = createSerialQueue();
|
|
53
56
|
/** A context outside any request, which is where a follow is sent from. */
|
|
54
57
|
async function relayContext() {
|
|
55
58
|
const site = await settings.values(SITE);
|
|
@@ -108,16 +111,18 @@ export function createRelayService(options) {
|
|
|
108
111
|
if (!synchronous)
|
|
109
112
|
record('queued', null);
|
|
110
113
|
try {
|
|
111
|
-
await context.sendActivity(await senderKeyPairs(context, user), relayRecipient(relay), activity, {
|
|
114
|
+
await sendWithinDeadline(config, relay.inboxId, context.sendActivity(await senderKeyPairs(context, user), relayRecipient(relay), activity, {
|
|
112
115
|
// A relay has one inbox and no shared one, and its activities are about
|
|
113
116
|
// the subscription rather than about any post, so they are ordered
|
|
114
117
|
// against each other rather than against a post's Create.
|
|
115
118
|
orderingKey: relay.inboxId,
|
|
116
|
-
});
|
|
119
|
+
}));
|
|
117
120
|
}
|
|
118
121
|
catch (thrown) {
|
|
119
|
-
|
|
120
|
-
|
|
122
|
+
if (!isDuplicateDelivery(thrown)) {
|
|
123
|
+
record('failed', messageOf(thrown));
|
|
124
|
+
throw thrown;
|
|
125
|
+
}
|
|
121
126
|
}
|
|
122
127
|
if (synchronous)
|
|
123
128
|
record('sent', null);
|
|
@@ -139,7 +144,7 @@ export function createRelayService(options) {
|
|
|
139
144
|
return admin.putRelay({ ...relay, reason: 'The site has no account to subscribe with.' });
|
|
140
145
|
}
|
|
141
146
|
const id = actorId(context, user);
|
|
142
|
-
const followId = new URL(
|
|
147
|
+
const followId = new URL(`${RELAY_FOLLOW_FRAGMENT}${randomUUID()}`, id);
|
|
143
148
|
const stored = admin.putRelay({
|
|
144
149
|
inboxId: relay.inboxId,
|
|
145
150
|
actorId: relay.actorId,
|
|
@@ -158,102 +163,118 @@ export function createRelayService(options) {
|
|
|
158
163
|
object: PUBLIC_COLLECTION,
|
|
159
164
|
}));
|
|
160
165
|
if (outcome === 'held') {
|
|
161
|
-
return
|
|
162
|
-
...stored,
|
|
163
|
-
reason: 'Not sent: the site is in dev mode. Retry once it is live.',
|
|
164
|
-
});
|
|
166
|
+
return noteWhilePending(stored, 'Not sent: the site is in dev mode. Retry once it is live.');
|
|
165
167
|
}
|
|
166
168
|
}
|
|
167
169
|
catch (thrown) {
|
|
168
170
|
// The record stays pending with the reason on it: the relay may simply
|
|
169
171
|
// have been down, and Retry is what the screen offers for that.
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
return admin.putRelay({ ...stored, reason: message });
|
|
172
|
+
logger.warn(`Could not follow the relay at ${stored.inboxId}: ${oneLineMessageOf(thrown)}`);
|
|
173
|
+
return noteWhilePending(stored, messageOf(thrown));
|
|
173
174
|
}
|
|
174
175
|
return stored;
|
|
175
176
|
}
|
|
176
|
-
/**
|
|
177
|
+
/**
|
|
178
|
+
* Say why a follow went nowhere, unless the relay answered it meanwhile: its
|
|
179
|
+
* `Accept` can arrive before the POST that carried the `Follow` has failed.
|
|
180
|
+
*/
|
|
181
|
+
function noteWhilePending(stored, reason) {
|
|
182
|
+
const current = admin.getRelay(stored.inboxId);
|
|
183
|
+
if (current?.state !== 'pending' || current.followId !== stored.followId) {
|
|
184
|
+
return current ?? stored;
|
|
185
|
+
}
|
|
186
|
+
return admin.putRelay({ ...current, reason });
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* Undo one relay's follow and forget it, unless dev mode holds the `Undo`:
|
|
190
|
+
* then the record is kept as leaving, and the first sync once the site is
|
|
191
|
+
* live sends it.
|
|
192
|
+
*/
|
|
177
193
|
async function unfollow(relay) {
|
|
178
194
|
const user = subscriber();
|
|
179
195
|
if (relay.followId !== null && user !== undefined) {
|
|
180
196
|
try {
|
|
181
197
|
const context = await relayContext();
|
|
182
198
|
const id = actorId(context, user);
|
|
183
|
-
await send(context, user, relay, new Undo({
|
|
199
|
+
const outcome = await send(context, user, relay, new Undo({
|
|
184
200
|
id: new URL(`#undo/${randomUUID()}`, id),
|
|
185
201
|
actor: id,
|
|
186
202
|
// The follow by id rather than embedded, which FEP-ae0c allows and
|
|
187
203
|
// which is what the relay matched its own record on.
|
|
188
204
|
object: new URL(relay.followId),
|
|
189
205
|
}));
|
|
206
|
+
if (outcome === 'held') {
|
|
207
|
+
admin.putRelay({
|
|
208
|
+
...relay,
|
|
209
|
+
state: 'leaving',
|
|
210
|
+
reason: 'Undo not sent: the site is in dev mode. It goes out once the site is live.',
|
|
211
|
+
});
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
190
214
|
}
|
|
191
215
|
catch (thrown) {
|
|
192
216
|
// The subscription is gone from this side whatever the relay heard: a
|
|
193
217
|
// relay that keeps sending is one whose activities land in the inbox
|
|
194
218
|
// log, which is a nuisance rather than a leak, and re-adding it would
|
|
195
219
|
// strand the record against a list that no longer names it.
|
|
196
|
-
logger.warn(`Could not tell the relay at ${relay.inboxId} to stop: ${
|
|
220
|
+
logger.warn(`Could not tell the relay at ${relay.inboxId} to stop: ${oneLineMessageOf(thrown)}`);
|
|
197
221
|
}
|
|
198
222
|
}
|
|
199
223
|
admin.deleteRelay(relay.inboxId);
|
|
200
224
|
}
|
|
225
|
+
async function attempt(change) {
|
|
226
|
+
try {
|
|
227
|
+
await change();
|
|
228
|
+
}
|
|
229
|
+
catch (thrown) {
|
|
230
|
+
logger.warn(`A relay subscription failed: ${oneLineMessageOf(thrown)}`);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
201
233
|
return {
|
|
202
234
|
sync() {
|
|
203
|
-
return
|
|
235
|
+
return subscriptions.run(async () => {
|
|
204
236
|
const listed = await settings.get(SITE.relays);
|
|
205
237
|
const known = admin.listRelays();
|
|
206
|
-
const
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
for (const relay of known) {
|
|
226
|
-
if (listed.includes(relay.inboxId))
|
|
227
|
-
continue;
|
|
228
|
-
unfollowed.push(relay.inboxId);
|
|
229
|
-
queue(() => unfollow(relay));
|
|
238
|
+
const recordOf = (inboxId) => known.find((relay) => relay.inboxId === inboxId);
|
|
239
|
+
// A leaving relay listed again is followed again: its record no
|
|
240
|
+
// longer says how the relay last answered, so the site asks again.
|
|
241
|
+
const followed = listed.filter((inboxId) => {
|
|
242
|
+
const record = recordOf(inboxId);
|
|
243
|
+
return record === undefined || record.state === 'leaving';
|
|
244
|
+
});
|
|
245
|
+
const leaving = known.filter((relay) => !listed.includes(relay.inboxId));
|
|
246
|
+
for (const inboxId of followed) {
|
|
247
|
+
const at = config.now().toISOString();
|
|
248
|
+
await attempt(() => follow(recordOf(inboxId) ?? {
|
|
249
|
+
inboxId,
|
|
250
|
+
actorId: null,
|
|
251
|
+
state: 'pending',
|
|
252
|
+
reason: null,
|
|
253
|
+
followId: null,
|
|
254
|
+
createdAt: at,
|
|
255
|
+
updatedAt: at,
|
|
256
|
+
}));
|
|
230
257
|
}
|
|
231
|
-
|
|
258
|
+
for (const relay of leaving)
|
|
259
|
+
await attempt(() => unfollow(relay));
|
|
260
|
+
return { followed, unfollowed: leaving.map((relay) => relay.inboxId) };
|
|
232
261
|
});
|
|
233
262
|
},
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
263
|
+
retry(inboxId) {
|
|
264
|
+
return subscriptions.run(async () => {
|
|
265
|
+
const relay = admin.getRelay(inboxId);
|
|
266
|
+
const listed = await settings.get(SITE.relays);
|
|
267
|
+
if (relay === undefined || !listed.includes(inboxId))
|
|
268
|
+
return undefined;
|
|
269
|
+
if (relay.state !== 'pending')
|
|
270
|
+
return relay;
|
|
271
|
+
return await follow(relay);
|
|
272
|
+
});
|
|
239
273
|
},
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
await subscriptions.settled();
|
|
274
|
+
settled() {
|
|
275
|
+
return subscriptions.settled();
|
|
243
276
|
},
|
|
244
277
|
};
|
|
245
|
-
/**
|
|
246
|
-
* Put one subscription change on the queue and stop caring about its result.
|
|
247
|
-
*
|
|
248
|
-
* Nothing is waiting for the follow a settings save set off, so a rejection
|
|
249
|
-
* here has nowhere to go but the log; a failed follow has already been
|
|
250
|
-
* written to its record by then.
|
|
251
|
-
*/
|
|
252
|
-
function queue(task) {
|
|
253
|
-
subscriptions.run(task).catch((thrown) => {
|
|
254
|
-
logger.warn(`A relay subscription failed: ${messageOf(thrown)}`);
|
|
255
|
-
});
|
|
256
|
-
}
|
|
257
278
|
}
|
|
258
279
|
/**
|
|
259
280
|
* Mark the subscription an `Accept` answers as accepted, and record who the
|
|
@@ -290,32 +311,36 @@ export function rejectRelay(admin, activity) {
|
|
|
290
311
|
/**
|
|
291
312
|
* Match an `Accept` or a `Reject` to the subscription it answers.
|
|
292
313
|
*
|
|
293
|
-
* The
|
|
294
|
-
*
|
|
295
|
-
*
|
|
296
|
-
*
|
|
297
|
-
*
|
|
298
|
-
*
|
|
299
|
-
*
|
|
314
|
+
* The answer has to come from the relay: the actor it recorded once it had
|
|
315
|
+
* answered before, and until then an actor on the relay inbox's host. The
|
|
316
|
+
* follow id is what FEP-ae0c says the answer names, so it is tried first.
|
|
317
|
+
* After that the answer has to name some relay follow of this site, and a
|
|
318
|
+
* relay that has answered before is recognised by its actor id, which covers
|
|
319
|
+
* a re-follow whose answer echoes a stale id. Last, a single pending
|
|
320
|
+
* subscription on the answering relay's own origin is taken as the one meant.
|
|
321
|
+
* Two pending subscriptions on one host are left alone rather than guessed
|
|
322
|
+
* between.
|
|
300
323
|
*/
|
|
301
324
|
export function relayAnswering(admin, activity) {
|
|
302
|
-
const followId = activity.objectId?.href;
|
|
303
|
-
if (followId !== undefined) {
|
|
304
|
-
const byFollow = admin.getRelayByFollow(followId);
|
|
305
|
-
if (byFollow !== undefined)
|
|
306
|
-
return byFollow;
|
|
307
|
-
}
|
|
308
325
|
const actorId = activity.actorId?.href;
|
|
309
326
|
if (actorId === undefined)
|
|
310
327
|
return undefined;
|
|
311
|
-
const
|
|
328
|
+
const answeredBy = (relay) => relay.actorId === null
|
|
329
|
+
? originOf(relay.inboxId) === originOf(actorId)
|
|
330
|
+
: relay.actorId === actorId;
|
|
331
|
+
const followId = activity.objectId?.href;
|
|
332
|
+
if (followId === undefined)
|
|
333
|
+
return undefined;
|
|
334
|
+
const byFollow = admin.getRelayByFollow(followId);
|
|
335
|
+
if (byFollow !== undefined)
|
|
336
|
+
return answeredBy(byFollow) ? byFollow : undefined;
|
|
337
|
+
if (!new URL(followId).hash.startsWith(RELAY_FOLLOW_FRAGMENT))
|
|
338
|
+
return undefined;
|
|
339
|
+
const relays = admin.listRelays().filter(answeredBy);
|
|
312
340
|
const byActor = relays.find((relay) => relay.actorId === actorId);
|
|
313
341
|
if (byActor !== undefined)
|
|
314
342
|
return byActor;
|
|
315
|
-
const
|
|
316
|
-
if (origin === undefined)
|
|
317
|
-
return undefined;
|
|
318
|
-
const pending = relays.filter((relay) => relay.state === 'pending' && originOf(relay.inboxId) === origin);
|
|
343
|
+
const pending = relays.filter((relay) => relay.state === 'pending');
|
|
319
344
|
return pending.length === 1 ? pending[0] : undefined;
|
|
320
345
|
}
|
|
321
346
|
/** Why a `Reject` was a rejection, in the relay's own words, or `null`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../src/federation/relays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../src/federation/relays.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
+
* The object id each URL a post replies to, likes or reposts was last found
|
|
3
|
+
* to name, or `null` for a URL found to name none.
|
|
4
|
+
*
|
|
2
5
|
* Mastodon keeps a status whose `inReplyTo` it cannot fetch as a reply to
|
|
3
6
|
* nothing, and leaves it out of every home feed and the profile's posts. So a
|
|
4
7
|
* reply to a page with no fediverse object behind it is sent with no
|
|
5
8
|
* `inReplyTo` at all.
|
|
6
9
|
*/
|
|
7
10
|
export type ReplyTargets = Readonly<Record<string, string | null>>;
|
|
8
|
-
export declare function
|
|
9
|
-
export declare function
|
|
11
|
+
export declare function resolvedTarget(contentDir: string, url: string): string | null | undefined;
|
|
12
|
+
export declare function recordResolvedTarget(contentDir: string, url: string, objectId: string | null): Promise<void>;
|
|
10
13
|
//# sourceMappingURL=reply-targets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-targets.d.ts","sourceRoot":"","sources":["../../src/federation/reply-targets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reply-targets.d.ts","sourceRoot":"","sources":["../../src/federation/reply-targets.ts"],"names":[],"mappings":"AASA;;;;;;;;GAQG;AACH,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;AAenE,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAEzF;AAED,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { statSync } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { readFileIfPresentSync, withFileLock, writeFileAtomicallySync } from '../files/atomic.js';
|
|
4
|
+
import { lockFileFor, withLockFile } from '../files/lock-file.js';
|
|
4
5
|
import { messageOf } from '../util/errors.js';
|
|
5
6
|
import { isRecord } from '../util/guards.js';
|
|
6
7
|
import { FEDERATION_DATA_DIRECTORY } from './records.js';
|
|
@@ -9,26 +10,35 @@ const cache = new Map();
|
|
|
9
10
|
function replyTargetsFile(contentDir) {
|
|
10
11
|
return path.join(contentDir, ...REPLY_TARGETS_FILE.split('/'));
|
|
11
12
|
}
|
|
12
|
-
export function
|
|
13
|
+
export function resolvedTarget(contentDir, url) {
|
|
13
14
|
return readCached(replyTargetsFile(contentDir))[url];
|
|
14
15
|
}
|
|
15
|
-
export async function
|
|
16
|
+
export async function recordResolvedTarget(contentDir, url, objectId) {
|
|
16
17
|
const file = replyTargetsFile(contentDir);
|
|
17
|
-
await withFileLock(file, () => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
targets = parseReplyTargets(file);
|
|
21
|
-
}
|
|
22
|
-
catch (error) {
|
|
23
|
-
console.warn(`${messageOf(error)} Writing nothing to it until it is fixed.`);
|
|
18
|
+
await withFileLock(file, async () => {
|
|
19
|
+
const before = readTargets(file);
|
|
20
|
+
if (before === undefined || before[url] === objectId)
|
|
24
21
|
return;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
22
|
+
// Decided again under the lock file a CLI process beside the server takes too.
|
|
23
|
+
await withLockFile(lockFileFor(file), () => {
|
|
24
|
+
const targets = readTargets(file);
|
|
25
|
+
if (targets === undefined || targets[url] === objectId)
|
|
26
|
+
return Promise.resolve();
|
|
27
|
+
writeFileAtomicallySync(file, `${JSON.stringify({ ...targets, [url]: objectId }, null, 2)}\n`);
|
|
28
|
+
cache.delete(file);
|
|
29
|
+
return Promise.resolve();
|
|
30
|
+
});
|
|
30
31
|
});
|
|
31
32
|
}
|
|
33
|
+
function readTargets(file) {
|
|
34
|
+
try {
|
|
35
|
+
return parseReplyTargets(file);
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
console.warn(`${messageOf(error)} Writing nothing to it until it is fixed.`);
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
32
42
|
function readCached(file) {
|
|
33
43
|
const version = versionOf(file);
|
|
34
44
|
const cached = cache.get(file);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-targets.js","sourceRoot":"","sources":["../../src/federation/reply-targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"reply-targets.js","sourceRoot":"","sources":["../../src/federation/reply-targets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { CatalogReader } from '../content/store.ts';
|
|
2
|
+
import type { ContentSync } from '../content/sync.ts';
|
|
2
3
|
import type { JobDefinition } from '../jobs/types.ts';
|
|
3
4
|
import type { WebmentionService } from '../webmention/service.ts';
|
|
4
5
|
import type { DeliveryReport, DeliveryService } from './delivery.ts';
|
|
5
6
|
export type ResendPayload = {
|
|
6
|
-
|
|
7
|
+
/** Content paths, which name one post where a slug can name several. */
|
|
8
|
+
readonly paths: readonly string[] | 'all';
|
|
7
9
|
readonly webmentions: boolean;
|
|
8
10
|
};
|
|
9
11
|
export type ResendActivity = {
|
|
@@ -20,12 +22,11 @@ export type ResendWebmentions = {
|
|
|
20
22
|
readonly none: number;
|
|
21
23
|
readonly failed: number;
|
|
22
24
|
};
|
|
23
|
-
/** One slug in a resend: either nothing went out for it, or what did. */
|
|
24
25
|
export type ResendPost = {
|
|
25
|
-
readonly
|
|
26
|
+
readonly path: string;
|
|
26
27
|
readonly resent: false;
|
|
27
28
|
} | {
|
|
28
|
-
readonly
|
|
29
|
+
readonly path: string;
|
|
29
30
|
readonly resent: true;
|
|
30
31
|
readonly activity: ResendActivity | null;
|
|
31
32
|
readonly webmentions: ResendWebmentions | null;
|
|
@@ -36,10 +37,15 @@ export type ResendReport = {
|
|
|
36
37
|
export declare const RESEND_JOB: import("../jobs/types.ts").JobName<ResendPayload, ResendReport>;
|
|
37
38
|
export interface ResendJobServices {
|
|
38
39
|
readonly store: Pick<CatalogReader, 'listFederated'>;
|
|
40
|
+
readonly content: Pick<ContentSync, 'reread'>;
|
|
39
41
|
readonly delivery: Pick<DeliveryService, 'resend'>;
|
|
40
42
|
readonly webmentions: Pick<WebmentionService, 'send'>;
|
|
41
43
|
}
|
|
42
44
|
/** Running it again sends another `Update`, which receivers treat as the same post. */
|
|
43
45
|
export declare function resendJob(services: ResendJobServices): JobDefinition<ResendPayload, ResendReport>;
|
|
46
|
+
/**
|
|
47
|
+
* Counted per inbox, because followers behind one shared inbox get one POST
|
|
48
|
+
* and the queue settles that POST's outcome for all of them.
|
|
49
|
+
*/
|
|
44
50
|
export declare function resendActivity(report: DeliveryReport): ResendActivity;
|
|
45
51
|
//# sourceMappingURL=resend-job.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend-job.d.ts","sourceRoot":"","sources":["../../src/federation/resend-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"resend-job.d.ts","sourceRoot":"","sources":["../../src/federation/resend-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,KAAK,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAA;CAAE,GACjD;IACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAChD,CAAC;AAEN,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAA;CAAE,CAAC;AAErE,eAAO,MAAM,UAAU,iEAAiD,CAAC;AAEzE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACrD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9C,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACnD,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;CACvD;AAED,uFAAuF;AACvF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,iBAAiB,GAAG,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,CAmCjG;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAYrE"}
|
|
@@ -7,14 +7,15 @@ export function resendJob(services) {
|
|
|
7
7
|
name: RESEND_JOB.name,
|
|
8
8
|
parse: parseResendPayload,
|
|
9
9
|
async run(payload, context) {
|
|
10
|
-
const
|
|
11
|
-
? services.store.listFederated().map((document) => document.
|
|
12
|
-
: payload.
|
|
10
|
+
const paths = payload.paths === 'all'
|
|
11
|
+
? services.store.listFederated().map((document) => document.path)
|
|
12
|
+
: payload.paths;
|
|
13
13
|
const posts = [];
|
|
14
|
-
for (const
|
|
14
|
+
for (const path of paths) {
|
|
15
15
|
context.signal.throwIfAborted();
|
|
16
|
-
|
|
17
|
-
const
|
|
16
|
+
await services.content.reread(path);
|
|
17
|
+
const report = await services.delivery.resend(path);
|
|
18
|
+
const links = payload.webmentions ? await services.webmentions.send(path) : undefined;
|
|
18
19
|
const activity = report === undefined ? null : resendActivity(report);
|
|
19
20
|
const webmentions = links === undefined || links.sent.length === 0
|
|
20
21
|
? null
|
|
@@ -25,22 +26,29 @@ export function resendJob(services) {
|
|
|
25
26
|
failed: countOf(links.sent, 'failed'),
|
|
26
27
|
};
|
|
27
28
|
posts.push(activity === null && webmentions === null
|
|
28
|
-
? {
|
|
29
|
-
: {
|
|
30
|
-
await context.progress({ done: posts.length, total:
|
|
29
|
+
? { path, resent: false }
|
|
30
|
+
: { path, resent: true, activity, webmentions });
|
|
31
|
+
await context.progress({ done: posts.length, total: paths.length });
|
|
31
32
|
}
|
|
32
33
|
return { posts };
|
|
33
34
|
},
|
|
34
35
|
};
|
|
35
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Counted per inbox, because followers behind one shared inbox get one POST
|
|
39
|
+
* and the queue settles that POST's outcome for all of them.
|
|
40
|
+
*/
|
|
36
41
|
export function resendActivity(report) {
|
|
42
|
+
const inboxes = [
|
|
43
|
+
...new Map(report.deliveries.map((row) => [row.inboxId, row])).values(),
|
|
44
|
+
];
|
|
37
45
|
return {
|
|
38
46
|
activityType: report.activityType,
|
|
39
47
|
heldByDevMode: report.held,
|
|
40
|
-
inboxes:
|
|
41
|
-
reached: countOf(
|
|
42
|
-
queued: countOf(
|
|
43
|
-
failed: countOf(
|
|
48
|
+
inboxes: inboxes.length,
|
|
49
|
+
reached: countOf(inboxes, 'sent'),
|
|
50
|
+
queued: countOf(inboxes, 'queued'),
|
|
51
|
+
failed: countOf(inboxes, 'failed'),
|
|
44
52
|
};
|
|
45
53
|
}
|
|
46
54
|
function countOf(rows, status) {
|
|
@@ -48,13 +56,13 @@ function countOf(rows, status) {
|
|
|
48
56
|
}
|
|
49
57
|
function parseResendPayload(payload) {
|
|
50
58
|
if (isRecord(payload) && typeof payload['webmentions'] === 'boolean') {
|
|
51
|
-
const {
|
|
52
|
-
if (
|
|
53
|
-
return {
|
|
54
|
-
if (Array.isArray(
|
|
55
|
-
return {
|
|
59
|
+
const { paths, webmentions } = payload;
|
|
60
|
+
if (paths === 'all')
|
|
61
|
+
return { paths, webmentions };
|
|
62
|
+
if (Array.isArray(paths) && paths.every((path) => typeof path === 'string')) {
|
|
63
|
+
return { paths: paths, webmentions };
|
|
56
64
|
}
|
|
57
65
|
}
|
|
58
|
-
throw new Error('A resend job names its
|
|
66
|
+
throw new Error('A resend job names its posts’ paths, or "all", and whether to send webmentions.');
|
|
59
67
|
}
|
|
60
68
|
//# sourceMappingURL=resend-job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend-job.js","sourceRoot":"","sources":["../../src/federation/resend-job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resend-job.js","sourceRoot":"","sources":["../../src/federation/resend-job.ts"],"names":[],"mappings":"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"}
|