Merge branch 'main' of https://github.com/cameri/nostream into fix/opennode-webhook-validation

# Conflicts:
#	src/controllers/callbacks/opennode-callback-controller.ts

Author: Anshumancanrock

CONFIGURATION.md

@@ -109,6 +109,9 @@ Running `nostream` for the first time creates the settings file in `<project_roo
 | limits.event.rateLimits[].rate              | Maximum number of events during period. |
 | limits.event.whitelists.pubkeys             | List of public keys to ignore rate limits. |
 | limits.event.whitelists.ipAddresses         | List of IPs (IPv4 or IPv6) to ignore rate limits. |
+| limits.event.retention.maxDays              | Maximum number of days to retain events. Purge deletes events that are expired (`expires_at`), soft-deleted (`deleted_at`), or older than this window (`created_at`). Any non-positive value disables retention purge. |
+| limits.event.retention.kind.whitelist       | Event kinds excluded from retention purge. NIP-62 `REQUEST_TO_VANISH` is always excluded from retention purge, even if not listed here. |
+| limits.event.retention.pubkey.whitelist     | Public keys excluded from retention purge. |
 | limits.client.subscription.maxSubscriptions | Maximum number of subscriptions per connected client. Defaults to 10. Disabled when set to zero. |
 | limits.client.subscription.maxFilters       | Maximum number of filters per subscription. Defaults to 10. Disabled when set to zero. |
 | limits.message.rateLimits[].period          | Rate limit period in milliseconds. |

Dockerfile.railwayapp

@@ -23,14 +23,15 @@ ADD migrations /build/migrations
 
 RUN npm install -g knex@2.4.0 && npm install --quiet
 
-RUN npm run db:migrate
-
 COPY . .
 
 RUN npm run build
 
 FROM node:24-alpine
 
+# Install dumb-init for proper signal handling
+RUN apk add --no-cache dumb-init
+
 ARG PORT
 ARG PGHOST
 ARG PGPORT
@@ -71,12 +72,19 @@ LABEL org.opencontainers.image.licenses=MIT
 
 WORKDIR /app
 
+# Copy runtime artifacts and configuration
 COPY --from=build /build/dist .
+COPY --from=build /build/package.json /build/package-lock.json ./
+COPY --from=build /build/knexfile.js ./
+COPY --from=build /build/migrations ./migrations
+COPY --from=build /build/seeds ./seeds
 
-RUN npm install --omit=dev --quiet
+RUN npm install --omit=dev --quiet && npm install -g knex@2.4.0
 
 USER 1000:1000
 
 RUN mkdir -p $NOSTR_CONFIG_DIR
 
-CMD ["node", "src/index.js"]
+ENTRYPOINT ["dumb-init", "--"]
+
+CMD ["sh", "-c", "npm run db:migrate && node src/index.js"]

README.md

@@ -570,6 +570,44 @@ To see the integration test coverage report open `.coverage/integration/lcov-rep
   open .coverage/integration/lcov-report/index.html
   ```
 
+## Relay Maintenance
+
+Use `clean-db` to wipe or prune `events` table data. This also removes
+corresponding data from the derived `event_tags` table when present.
+
+Dry run (no deletion):
+
+  ```
+  npm run clean-db -- --all --dry-run
+  ```
+
+Full wipe:
+
+  ```
+  npm run clean-db -- --all --force
+  ```
+
+Delete events older than N days:
+
+  ```
+  npm run clean-db -- --older-than=30 --force
+  ```
+
+Delete only selected kinds:
+
+  ```
+  npm run clean-db -- --kinds=1,7,4 --force
+  ```
+
+Delete only selected kinds older than N days:
+
+  ```
+  npm run clean-db -- --older-than=30 --kinds=1,7,4 --force
+  ```
+
+By default, the script asks for explicit confirmation (`Type 'DELETE' to confirm`).
+Use `--force` to skip the prompt.
+
 ## Configuration
 
 You can change the default folder by setting the `NOSTR_CONFIG_DIR` environment variable to a different path.

commitlint.config.js

@@ -2,7 +2,8 @@ module.exports = {
   extends: ['@commitlint/config-conventional'],
 	parserPreset: 'conventional-changelog-conventionalcommits',
 	rules: {
-		'body-max-line-length': [2, 'always', 250],
+		'body-max-line-length': [0, 'always'],
+		'header-max-length': [0, 'always'],
 		'subject-case': [0, 'always'],
 		'header-case': [0, 'always'],
 		'body-case': [0, 'always'],

cucumber.js

@@ -11,7 +11,6 @@ const config = [
   '--format @cucumber/pretty-formatter',
   '--format html:.test-reports/integration/report.html',
   '--format json:.test-reports/integration/report.json',
-  '--publish',
 ].join(' ')
 
 module.exports = {

migrations/20260409201624_admit_user_func.js

@@ -0,0 +1,27 @@
+exports.up = async function (knex) {
+  return knex.schema
+    .raw(
+      `CREATE OR REPLACE FUNCTION admit_user(user_pubkey BYTEA, tos_accepted TIMESTAMP WITHOUT TIME ZONE)
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    PERFORM ASSERT_SERIALIZED();
+
+    INSERT INTO "users" ("pubkey", "is_admitted", "tos_accepted_at", "created_at", "updated_at")
+    VALUES (user_pubkey, true, tos_accepted, now_utc(), now_utc())
+    ON CONFLICT ("pubkey")
+    DO UPDATE SET
+      "is_admitted" = true,
+      "tos_accepted_at" = tos_accepted,
+      "updated_at" = now_utc();
+
+    RETURN 0;
+END;
+$$;`)
+}
+
+exports.down = function (knex) {
+  return knex.schema
+    .raw('DROP FUNCTION IF EXISTS admit_user(BYTEA, TIMESTAMP WITHOUT TIME ZONE);')
+}