@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
package/dist/store/deliveries.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { decodeEntities } from '../util/html.js';
|
|
2
|
-
import { allRows, countByStatus, getRow, NO_LIMIT, nullableText, oneOf } from './rows.js';
|
|
2
|
+
import { allRows, countByStatus, getRow, inTransaction, NO_LIMIT, nullableText, oneOf, } from './rows.js';
|
|
3
3
|
/** How one delivery of one activity to one follower ended. */
|
|
4
4
|
export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed', 'unknown'];
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
// Only the given filters go into the statement: SQLite cannot use an index
|
|
6
|
+
// for a column test written as `:param IS NULL OR column = :param`.
|
|
7
|
+
const DELIVERY_SEARCH_FILTERS = {
|
|
8
|
+
objectIds: 'object_id IN (SELECT value FROM json_each(:objectIds))',
|
|
9
|
+
activityId: 'activity_id = :activityId',
|
|
10
|
+
statuses: 'status IN (SELECT value FROM json_each(:statuses))',
|
|
11
|
+
inboxId: 'inbox_id = :inboxId',
|
|
12
|
+
actorId: 'actor_id = :actorId',
|
|
13
|
+
};
|
|
11
14
|
export function openDeliveryStore(db, clock) {
|
|
12
15
|
const statements = {
|
|
13
16
|
recordDelivery: db.prepare(`
|
|
@@ -25,19 +28,37 @@ export function openDeliveryStore(db, clock) {
|
|
|
25
28
|
error = excluded.error,
|
|
26
29
|
attempted_at = excluded.attempted_at
|
|
27
30
|
RETURNING *
|
|
31
|
+
`),
|
|
32
|
+
pruneSupersededDeliveries: db.prepare(`
|
|
33
|
+
DELETE FROM ap_deliveries
|
|
34
|
+
WHERE attempted_at < :before
|
|
35
|
+
AND EXISTS (
|
|
36
|
+
SELECT 1 FROM ap_deliveries AS later
|
|
37
|
+
WHERE later.actor_id = ap_deliveries.actor_id
|
|
38
|
+
AND later.object_id = ap_deliveries.object_id
|
|
39
|
+
AND later.activity_type = ap_deliveries.activity_type
|
|
40
|
+
AND (later.attempted_at, later.rowid) > (ap_deliveries.attempted_at, ap_deliveries.rowid)
|
|
41
|
+
)
|
|
28
42
|
`),
|
|
29
43
|
settleDeliveries: db.prepare(`
|
|
30
44
|
UPDATE ap_deliveries SET status = ?, error = ?, attempted_at = ?
|
|
31
45
|
WHERE activity_id = ? AND inbox_id = ?
|
|
46
|
+
`),
|
|
47
|
+
forgetHeldDeliveries: db.prepare(`
|
|
48
|
+
DELETE FROM ap_deliveries
|
|
49
|
+
WHERE activity_id = :activityId
|
|
50
|
+
AND inbox_id IN (SELECT value FROM json_each(:inboxes))
|
|
51
|
+
AND status IN ('queued', 'retrying')
|
|
32
52
|
`),
|
|
33
53
|
markUnsettledDeliveriesUnknown: db.prepare(`
|
|
34
54
|
UPDATE ap_deliveries SET status = 'unknown'
|
|
35
55
|
WHERE status IN ('queued', 'retrying')
|
|
36
56
|
AND attempted_at < :before
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
57
|
+
-- Uncorrelated, so SQLite reads the waiting list into a lookup once
|
|
58
|
+
-- instead of scanning it again for every row.
|
|
59
|
+
AND (activity_id, inbox_id) NOT IN (
|
|
60
|
+
SELECT json_extract(value, '$.activityId'), json_extract(value, '$.inbox')
|
|
61
|
+
FROM json_each(:waiting)
|
|
41
62
|
)
|
|
42
63
|
`),
|
|
43
64
|
listDeliveries: db.prepare(`
|
|
@@ -65,8 +86,10 @@ export function openDeliveryStore(db, clock) {
|
|
|
65
86
|
AND NOT EXISTS (
|
|
66
87
|
SELECT 1 FROM ap_deliveries AS later
|
|
67
88
|
WHERE later.actor_id = failure.actor_id
|
|
68
|
-
AND
|
|
89
|
+
AND later.object_id = failure.object_id
|
|
69
90
|
AND (later.attempted_at, later.rowid) > (failure.attempted_at, failure.rowid)
|
|
91
|
+
-- A peer drops an Update of a status it never stored.
|
|
92
|
+
AND (failure.activity_type <> 'Create' OR later.activity_type IN ('Create', 'Delete'))
|
|
70
93
|
)
|
|
71
94
|
ORDER BY attempted_at DESC, rowid DESC
|
|
72
95
|
`),
|
|
@@ -84,24 +107,53 @@ export function openDeliveryStore(db, clock) {
|
|
|
84
107
|
GROUP BY activity_id
|
|
85
108
|
ORDER BY last_attempted_at DESC, activity_id
|
|
86
109
|
`),
|
|
87
|
-
searchDeliveries: db.prepare(`
|
|
88
|
-
SELECT * FROM ap_deliveries ${DELIVERY_SEARCH}
|
|
89
|
-
ORDER BY attempted_at DESC, rowid DESC
|
|
90
|
-
LIMIT :limit OFFSET :offset
|
|
91
|
-
`),
|
|
92
|
-
countDeliverySearch: db.prepare(`SELECT COUNT(*) AS count FROM ap_deliveries ${DELIVERY_SEARCH}`),
|
|
93
110
|
};
|
|
111
|
+
const searchStatements = new Map();
|
|
112
|
+
function searchStatementsFor(filters) {
|
|
113
|
+
const key = filters.join(',');
|
|
114
|
+
let prepared = searchStatements.get(key);
|
|
115
|
+
if (prepared === undefined) {
|
|
116
|
+
const where = filters.length === 0
|
|
117
|
+
? ''
|
|
118
|
+
: `WHERE ${filters.map((filter) => DELIVERY_SEARCH_FILTERS[filter]).join(' AND ')}`;
|
|
119
|
+
prepared = {
|
|
120
|
+
items: db.prepare(`
|
|
121
|
+
SELECT * FROM ap_deliveries ${where}
|
|
122
|
+
ORDER BY attempted_at DESC, rowid DESC
|
|
123
|
+
LIMIT :limit OFFSET :offset
|
|
124
|
+
`),
|
|
125
|
+
count: db.prepare(`SELECT COUNT(*) AS count FROM ap_deliveries ${where}`),
|
|
126
|
+
};
|
|
127
|
+
searchStatements.set(key, prepared);
|
|
128
|
+
}
|
|
129
|
+
return prepared;
|
|
130
|
+
}
|
|
131
|
+
function recordDelivery(delivery) {
|
|
132
|
+
const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, withHtmlPageAsTitle(delivery.error), delivery.attemptedAt ?? clock().toISOString());
|
|
133
|
+
if (recorded === undefined) {
|
|
134
|
+
throw new Error(`The delivery of "${delivery.activityId}" to "${delivery.actorId}" was not recorded.`);
|
|
135
|
+
}
|
|
136
|
+
return recorded;
|
|
137
|
+
}
|
|
94
138
|
return {
|
|
95
|
-
recordDelivery
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
139
|
+
recordDelivery,
|
|
140
|
+
recordDeliveries(deliveries) {
|
|
141
|
+
const recorded = [];
|
|
142
|
+
inTransaction(db, () => {
|
|
143
|
+
for (const delivery of deliveries)
|
|
144
|
+
recorded.push(recordDelivery(delivery));
|
|
145
|
+
});
|
|
100
146
|
return recorded;
|
|
101
147
|
},
|
|
148
|
+
pruneSupersededDeliveries(before) {
|
|
149
|
+
return Number(statements.pruneSupersededDeliveries.run({ before }).changes);
|
|
150
|
+
},
|
|
102
151
|
settleDeliveries(outcome) {
|
|
103
152
|
statements.settleDeliveries.run(outcome.status, withHtmlPageAsTitle(outcome.error), clock().toISOString(), outcome.activityId, outcome.inbox);
|
|
104
153
|
},
|
|
154
|
+
forgetHeldDeliveries({ activityId, inboxes }) {
|
|
155
|
+
statements.forgetHeldDeliveries.run({ activityId, inboxes: JSON.stringify(inboxes) });
|
|
156
|
+
},
|
|
105
157
|
markUnsettledDeliveriesUnknown({ before, waiting }) {
|
|
106
158
|
statements.markUnsettledDeliveriesUnknown.run({ before, waiting: JSON.stringify(waiting) });
|
|
107
159
|
},
|
|
@@ -128,16 +180,19 @@ export function openDeliveryStore(db, clock) {
|
|
|
128
180
|
},
|
|
129
181
|
searchDeliveries(search, page = {}) {
|
|
130
182
|
const filter = {
|
|
131
|
-
objectIds: search.objectIds === undefined ?
|
|
132
|
-
activityId: search.activityId
|
|
133
|
-
statuses: search.statuses === undefined ?
|
|
134
|
-
inboxId: search.inboxId
|
|
135
|
-
actorId: search.actorId
|
|
183
|
+
objectIds: search.objectIds === undefined ? undefined : JSON.stringify(search.objectIds),
|
|
184
|
+
activityId: search.activityId,
|
|
185
|
+
statuses: search.statuses === undefined ? undefined : JSON.stringify(search.statuses),
|
|
186
|
+
inboxId: search.inboxId,
|
|
187
|
+
actorId: search.actorId,
|
|
136
188
|
};
|
|
189
|
+
const given = Object.entries(filter).filter((entry) => entry[1] !== undefined);
|
|
190
|
+
const prepared = searchStatementsFor(given.map(([name]) => name));
|
|
191
|
+
const params = Object.fromEntries(given);
|
|
137
192
|
return {
|
|
138
|
-
total: Number(
|
|
139
|
-
items:
|
|
140
|
-
.all({ ...
|
|
193
|
+
total: Number(prepared.count.get(params)?.['count'] ?? 0),
|
|
194
|
+
items: prepared.items
|
|
195
|
+
.all({ ...params, limit: page.limit ?? NO_LIMIT, offset: page.offset ?? 0 })
|
|
141
196
|
.map(toDelivery),
|
|
142
197
|
};
|
|
143
198
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,
|
|
1
|
+
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,27 @@ export declare const FEDERATION_QUEUE_TABLE = "federation_messages";
|
|
|
4
4
|
export declare function queueFile(dataDir: string): string;
|
|
5
5
|
/**
|
|
6
6
|
* Open the queue file, creating it mode `0600`: a waiting delivery carries the
|
|
7
|
-
* private key it is signed with. SQLite
|
|
8
|
-
* mode
|
|
7
|
+
* private key it is signed with. SQLite creates the `-wal` and `-shm` files
|
|
8
|
+
* with the database's mode but leaves the mode of ones that already exist, so
|
|
9
|
+
* those are narrowed too. `secure_delete` zeroes a taken message's bytes
|
|
10
|
+
* rather than leaving them in a free page.
|
|
9
11
|
*/
|
|
10
12
|
export declare function openQueueDatabase(dataDir: string): DatabaseSync;
|
|
13
|
+
/**
|
|
14
|
+
* Remove each waiting message signed with a private key that is not in
|
|
15
|
+
* `held`, the `d` of every key file the site has now. A key file replaced or
|
|
16
|
+
* removed by hand is a key the site has stopped trusting, and Fedify would go
|
|
17
|
+
* on signing with the copy in the message through days of retries.
|
|
18
|
+
*/
|
|
19
|
+
export declare function dropMessagesSignedByRetiredKeys(dataDir: string, held: ReadonlySet<string>): void;
|
|
20
|
+
/**
|
|
21
|
+
* Drop the ordering locks a worker left behind. `SqliteMessageQueue` holds a
|
|
22
|
+
* lock row while a handler runs and deletes it when the handler ends, so a
|
|
23
|
+
* worker killed mid-send leaves its key locked and every message on that key
|
|
24
|
+
* is skipped for good. Only safe before this process's queue listens and once
|
|
25
|
+
* the previous worker has stopped taking messages.
|
|
26
|
+
*/
|
|
27
|
+
export declare function releaseOrderingLocks(dataDir: string): void;
|
|
11
28
|
export declare function countWaitingMessages(dataDir: string): number;
|
|
12
29
|
/**
|
|
13
30
|
* How many deliveries first tried at or after `since` wait in the queue for a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED
|
|
1
|
+
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAU/D;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CA0BhG;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAY1D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ9E;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CAuBxE"}
|
|
@@ -8,15 +8,80 @@ export function queueFile(dataDir) {
|
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
10
10
|
* Open the queue file, creating it mode `0600`: a waiting delivery carries the
|
|
11
|
-
* private key it is signed with. SQLite
|
|
12
|
-
* mode
|
|
11
|
+
* private key it is signed with. SQLite creates the `-wal` and `-shm` files
|
|
12
|
+
* with the database's mode but leaves the mode of ones that already exist, so
|
|
13
|
+
* those are narrowed too. `secure_delete` zeroes a taken message's bytes
|
|
14
|
+
* rather than leaving them in a free page.
|
|
13
15
|
*/
|
|
14
16
|
export function openQueueDatabase(dataDir) {
|
|
15
17
|
mkdirSync(dataDir, { recursive: true });
|
|
16
18
|
const file = queueFile(dataDir);
|
|
17
19
|
closeSync(openSync(file, 'a', 0o600));
|
|
18
|
-
|
|
19
|
-
|
|
20
|
+
for (const owned of [file, `${file}-wal`, `${file}-shm`]) {
|
|
21
|
+
if (existsSync(owned))
|
|
22
|
+
chmodSync(owned, 0o600);
|
|
23
|
+
}
|
|
24
|
+
const db = new DatabaseSync(file, { timeout: BUSY_TIMEOUT_MS });
|
|
25
|
+
db.exec('PRAGMA secure_delete=ON');
|
|
26
|
+
return db;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Remove each waiting message signed with a private key that is not in
|
|
30
|
+
* `held`, the `d` of every key file the site has now. A key file replaced or
|
|
31
|
+
* removed by hand is a key the site has stopped trusting, and Fedify would go
|
|
32
|
+
* on signing with the copy in the message through days of retries.
|
|
33
|
+
*/
|
|
34
|
+
export function dropMessagesSignedByRetiredKeys(dataDir, held) {
|
|
35
|
+
if (!existsSync(queueFile(dataDir)))
|
|
36
|
+
return;
|
|
37
|
+
const db = openQueueDatabase(dataDir);
|
|
38
|
+
try {
|
|
39
|
+
const table = db
|
|
40
|
+
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?")
|
|
41
|
+
.get(FEDERATION_QUEUE_TABLE);
|
|
42
|
+
if (table === undefined)
|
|
43
|
+
return;
|
|
44
|
+
const rows = db
|
|
45
|
+
.prepare(`SELECT id, json_extract(message, '$.keys') AS keys FROM ${FEDERATION_QUEUE_TABLE}
|
|
46
|
+
WHERE json_extract(message, '$.keys') IS NOT NULL`)
|
|
47
|
+
.all();
|
|
48
|
+
const remove = db.prepare(`DELETE FROM ${FEDERATION_QUEUE_TABLE} WHERE id = ?`);
|
|
49
|
+
for (const row of rows) {
|
|
50
|
+
const keys = JSON.parse(String(row['keys']));
|
|
51
|
+
const retired = keys.some((key) => {
|
|
52
|
+
const d = key.privateKey?.d;
|
|
53
|
+
return typeof d !== 'string' || !held.has(d);
|
|
54
|
+
});
|
|
55
|
+
if (retired)
|
|
56
|
+
remove.run(row['id']);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
db.close();
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Drop the ordering locks a worker left behind. `SqliteMessageQueue` holds a
|
|
65
|
+
* lock row while a handler runs and deletes it when the handler ends, so a
|
|
66
|
+
* worker killed mid-send leaves its key locked and every message on that key
|
|
67
|
+
* is skipped for good. Only safe before this process's queue listens and once
|
|
68
|
+
* the previous worker has stopped taking messages.
|
|
69
|
+
*/
|
|
70
|
+
export function releaseOrderingLocks(dataDir) {
|
|
71
|
+
if (!existsSync(queueFile(dataDir)))
|
|
72
|
+
return;
|
|
73
|
+
const db = openQueueDatabase(dataDir);
|
|
74
|
+
try {
|
|
75
|
+
const locks = `${FEDERATION_QUEUE_TABLE}_locks`;
|
|
76
|
+
const table = db
|
|
77
|
+
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?")
|
|
78
|
+
.get(locks);
|
|
79
|
+
if (table !== undefined)
|
|
80
|
+
db.exec(`DELETE FROM "${locks}"`);
|
|
81
|
+
}
|
|
82
|
+
finally {
|
|
83
|
+
db.close();
|
|
84
|
+
}
|
|
20
85
|
}
|
|
21
86
|
export function countWaitingMessages(dataDir) {
|
|
22
87
|
return countMessages(dataDir, '', []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { DatabaseSync } from 'node:sqlite';
|
|
2
|
+
/** Where the waiting messages of one ordering key stand in the queue table. */
|
|
3
|
+
export interface QueueOrder {
|
|
4
|
+
/** When the key's last waiting message is due, in epoch milliseconds. */
|
|
5
|
+
lastDue(key: string): number | undefined;
|
|
6
|
+
/**
|
|
7
|
+
* Put the key's newest row ahead of its older ones, which keep their order
|
|
8
|
+
* and their gaps behind it.
|
|
9
|
+
*/
|
|
10
|
+
moveNewestAhead(key: string): void;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Over the tables of `SqliteMessageQueue`, which takes the row with the lowest
|
|
14
|
+
* `scheduled` first. A row added later has the higher `rowid`.
|
|
15
|
+
*/
|
|
16
|
+
export declare function queueOrder(db: DatabaseSync, tableName: string): QueueOrder;
|
|
17
|
+
//# sourceMappingURL=queue-order.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue-order.d.ts","sourceRoot":"","sources":["../../src/store/queue-order.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,+EAA+E;AAC/E,MAAM,WAAW,UAAU;IACzB,yEAAyE;IACzE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;;OAGG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAgC1E"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Over the tables of `SqliteMessageQueue`, which takes the row with the lowest
|
|
3
|
+
* `scheduled` first. A row added later has the higher `rowid`.
|
|
4
|
+
*/
|
|
5
|
+
export function queueOrder(db, tableName) {
|
|
6
|
+
return {
|
|
7
|
+
lastDue(key) {
|
|
8
|
+
const last = db
|
|
9
|
+
.prepare(`SELECT MAX(scheduled) AS due FROM "${tableName}" WHERE ordering_key = ?`)
|
|
10
|
+
.get(key)?.['due'];
|
|
11
|
+
return typeof last === 'number' ? last : undefined;
|
|
12
|
+
},
|
|
13
|
+
moveNewestAhead(key) {
|
|
14
|
+
const newest = db
|
|
15
|
+
.prepare(`SELECT rowid AS position, scheduled AS due FROM "${tableName}"
|
|
16
|
+
WHERE ordering_key = ? ORDER BY rowid DESC LIMIT 1`)
|
|
17
|
+
.get(key);
|
|
18
|
+
if (newest === undefined)
|
|
19
|
+
return;
|
|
20
|
+
const position = Number(newest['position']);
|
|
21
|
+
const due = Number(newest['due']);
|
|
22
|
+
const first = db
|
|
23
|
+
.prepare(`SELECT MIN(scheduled) AS due FROM "${tableName}"
|
|
24
|
+
WHERE ordering_key = ? AND rowid < ?`)
|
|
25
|
+
.get(key, position)?.['due'];
|
|
26
|
+
if (typeof first !== 'number' || first > due)
|
|
27
|
+
return;
|
|
28
|
+
db.prepare(`UPDATE "${tableName}" SET scheduled = scheduled + ?
|
|
29
|
+
WHERE ordering_key = ? AND rowid < ?`).run(due + 1 - first, key, position);
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=queue-order.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue-order.js","sourceRoot":"","sources":["../../src/store/queue-order.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,EAAgB,EAAE,SAAiB;IAC5D,OAAO;QACL,OAAO,CAAC,GAAG;YACT,MAAM,IAAI,GAAG,EAAE;iBACZ,OAAO,CAAC,sCAAsC,SAAS,0BAA0B,CAAC;iBAClF,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACrD,CAAC;QAED,eAAe,CAAC,GAAG;YACjB,MAAM,MAAM,GAAG,EAAE;iBACd,OAAO,CACN,oDAAoD,SAAS;+DACR,CACtD;iBACA,GAAG,CAAC,GAAG,CAAC,CAAC;YACZ,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO;YACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,EAAE;iBACb,OAAO,CACN,sCAAsC,SAAS;iDACR,CACxC;iBACA,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,GAAG,GAAG;gBAAE,OAAO;YACrD,EAAE,CAAC,OAAO,CACR,WAAW,SAAS;+CACmB,CACxC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/store/relays.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { DatabaseSync } from 'node:sqlite';
|
|
2
2
|
import type { Clock } from '../util/clock.ts';
|
|
3
3
|
/** Where a relay subscription stands (FEP-ae0c). */
|
|
4
|
-
export declare const RELAY_STATES: readonly ['pending', 'accepted', 'rejected'];
|
|
4
|
+
export declare const RELAY_STATES: readonly ['pending', 'accepted', 'rejected', 'leaving'];
|
|
5
5
|
/**
|
|
6
6
|
* One of {@link RELAY_STATES}.
|
|
7
7
|
*
|
|
@@ -9,7 +9,9 @@ export declare const RELAY_STATES: readonly ['pending', 'accepted', 'rejected'];
|
|
|
9
9
|
* take days, because a relay is allowed to hold one for a human to approve.
|
|
10
10
|
* `accepted` is one the relay answered `Accept` to, and the only state the
|
|
11
11
|
* site delivers to. `rejected` is one it answered `Reject` to, with whatever
|
|
12
|
-
* it said in {@link Relay.reason}.
|
|
12
|
+
* it said in {@link Relay.reason}. `leaving` is one the list no longer names
|
|
13
|
+
* whose `Undo` dev mode held: the relay still holds the subscription, so the
|
|
14
|
+
* record stays until the `Undo` can go out.
|
|
13
15
|
*/
|
|
14
16
|
export type RelayState = (typeof RELAY_STATES)[number];
|
|
15
17
|
/**
|
|
@@ -27,7 +29,7 @@ export interface Relay {
|
|
|
27
29
|
readonly actorId: string | null;
|
|
28
30
|
/** Where the subscription stands. */
|
|
29
31
|
readonly state: RelayState;
|
|
30
|
-
/** Why a `Reject` was a reject,
|
|
32
|
+
/** Why a `Reject` was a reject, or why a `Follow` or `Undo` was not sent, or `null`. */
|
|
31
33
|
readonly reason: string | null;
|
|
32
34
|
/** The id of the `Follow` that was sent, which an `Accept` names. */
|
|
33
35
|
readonly followId: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../src/store/relays.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,oDAAoD;AACpD,eAAO,MAAM,YAAY,YAAI,SAAS,EAAE,UAAU,EAAE,UAAU,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../src/store/relays.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,oDAAoD;AACpD,eAAO,MAAM,YAAY,YAAI,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAU,CAAC;AAEpF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,KAAK;IACpB,mFAAmF;IACnF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,yEAAyE;IACzE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,qCAAqC;IACrC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,wFAAwF;IACxF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,qEAAqE;IACrE,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,8DAA8D;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAAC,GAAG;IAC9D,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,iEAAiE;IACjE,UAAU,IAAI,KAAK,EAAE,CAAC;IACtB,0EAA0E;IAC1E,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;IAC7C;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;IACtD;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,CAAC;IACjC,qFAAqF;IACrF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,UAAU,CAuDzE"}
|
package/dist/store/relays.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { allRows, getRow, nullableText, oneOf } from './rows.js';
|
|
2
2
|
/** Where a relay subscription stands (FEP-ae0c). */
|
|
3
|
-
export const RELAY_STATES = ['pending', 'accepted', 'rejected'];
|
|
3
|
+
export const RELAY_STATES = ['pending', 'accepted', 'rejected', 'leaving'];
|
|
4
4
|
export function openRelayStore(db, clock) {
|
|
5
5
|
const statements = {
|
|
6
6
|
listRelays: db.prepare('SELECT * FROM ap_relays ORDER BY created_at, inbox_id'),
|
package/dist/store/relays.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../src/store/relays.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGjE,oDAAoD;AACpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../src/store/relays.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGjE,oDAAoD;AACpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAU,CAAC;AAoEpF,MAAM,UAAU,cAAc,CAAC,EAAgB,EAAE,KAAY;IAC3D,MAAM,UAAU,GAAG;QACjB,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC,uDAAuD,CAAC;QAC/E,YAAY,EAAE,EAAE,CAAC,OAAO,CAAC,4CAA4C,CAAC;QACtE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC;QACxE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;KAWpB,CAAC;QACF,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,0CAA0C,CAAC;KACpE,CAAC;IACF,OAAO;QACL,UAAU;YACR,OAAO,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,QAAQ,CAAC,OAAO;YACd,OAAO,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;QAED,gBAAgB,CAAC,QAAQ;YACvB,OAAO,MAAM,CAAC,UAAU,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAED,QAAQ,CAAC,KAAK;YACZ,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,CACnB,UAAU,CAAC,QAAQ,EACnB,OAAO,EACP,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,SAAS,IAAI,GAAG,EACtB,GAAG,CACJ,CAAC;YACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;YACnF,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,WAAW,CAAC,OAAO;YACjB,OAAO,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;QACzD,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,GAAQ;IACvB,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KACrC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/store/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,+DAA+D;AAC/D,eAAO,MAAM,MAAM,qBAAqB,CAAC;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,SAAS,SAAS,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/store/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,+DAA+D;AAC/D,eAAO,MAAM,MAAM,qBAAqB,CAAC;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,SAAS,SAAS,EAslB1C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,YAAY,CAE3E"}
|
package/dist/store/schema.js
CHANGED
|
@@ -585,6 +585,29 @@ export const MIGRATIONS = [
|
|
|
585
585
|
version: 27,
|
|
586
586
|
sql: `ALTER TABLE sessions ADD COLUMN cleared_autosaves TEXT;`,
|
|
587
587
|
},
|
|
588
|
+
{
|
|
589
|
+
version: 28,
|
|
590
|
+
sql: `
|
|
591
|
+
ALTER TABLE sessions ADD COLUMN user_uid TEXT;
|
|
592
|
+
ALTER TABLE password_resets ADD COLUMN user_uid TEXT;
|
|
593
|
+
`,
|
|
594
|
+
},
|
|
595
|
+
{
|
|
596
|
+
version: 29,
|
|
597
|
+
sql: `DELETE FROM sessions;`,
|
|
598
|
+
},
|
|
599
|
+
{
|
|
600
|
+
// Rows grow as followers times posts, and how many followers sit behind
|
|
601
|
+
// one inbox is up to the remote server. The standing-failure check and
|
|
602
|
+
// the retry job ask per actor and post, which without this is a scan.
|
|
603
|
+
version: 30,
|
|
604
|
+
sql: `CREATE INDEX ap_deliveries_actor_id ON ap_deliveries (actor_id, object_id, attempted_at);`,
|
|
605
|
+
},
|
|
606
|
+
{
|
|
607
|
+
// The retry tools and the delivery search ask for every row at one inbox.
|
|
608
|
+
version: 31,
|
|
609
|
+
sql: `CREATE INDEX ap_deliveries_inbox_id ON ap_deliveries (inbox_id, attempted_at);`,
|
|
610
|
+
},
|
|
588
611
|
];
|
|
589
612
|
export function openAdminDatabase(dataDir, now) {
|
|
590
613
|
return openDatabase({ dataDir, ledger: LEDGER, migrations: MIGRATIONS, now });
|
package/dist/store/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/store/schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/store/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/store/sessions.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export interface Session {
|
|
|
9
9
|
readonly id: string;
|
|
10
10
|
/** The user, or `null` while the session is anonymous. */
|
|
11
11
|
readonly userId: number | null;
|
|
12
|
+
/** The uid that user had at login, when they had one. */
|
|
13
|
+
readonly userUid?: string | undefined;
|
|
12
14
|
/**
|
|
13
15
|
* The token every mutating form on this session has to send back. It is a
|
|
14
16
|
* second secret rather than the session id, so a token that leaks through a
|
|
@@ -38,6 +40,7 @@ export interface FlashMessage {
|
|
|
38
40
|
export interface CreateSessionInput {
|
|
39
41
|
/** The user logging in, or `null` for the pre-login CSRF session. */
|
|
40
42
|
userId: number | null;
|
|
43
|
+
userUid?: string | undefined;
|
|
41
44
|
/** How long the session lasts, in seconds. */
|
|
42
45
|
lifetimeSeconds: number;
|
|
43
46
|
/** The clock, injectable so expiry is testable. Defaults to now. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/store/sessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,yDAAyD;IACzD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAIvD;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8CAA8C;IAC9C,eAAe,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/store/sessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,yDAAyD;IACzD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,yDAAyD;IACzD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAIvD;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,8CAA8C;IAC9C,eAAe,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACxB;AAID,gEAAgE;AAChE,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,MAAM,WAAW,YAAY;IAC3B,2DAA2D;IAC3D,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC;IAClD;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACxD,0EAA0E;IAC1E,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC;;;;;;OAMG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAE7E,2DAA2D;IAC3D,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAClC;;;OAGG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACxD;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IAC7C,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1D,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnD;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,YAAY,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,KAAK,EAAE,KAAK,GACX,YAAY,CA2Gd;AAuCD;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAEpC"}
|