alice.mosphere.at / indigo
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

rename yet again (rerelay to relay)

bryan newbold 4757a4c4 eeb3abbb

+64 -64
+6 -6
cmd/rerelay/Dockerfile cmd/relay/Dockerfile
··· 1 1 # Run this dockerfile from the top level of the indigo git repository like: 2 2 # 3 - # podman build -f ./cmd/rerelay/Dockerfile -t rerelay . 3 + # podman build -f ./cmd/relay/Dockerfile -t relay . 4 4 5 5 ### Compile stage 6 6 FROM golang:1.23-alpine3.20 AS build-env ··· 12 12 # timezone data for alpine builds 13 13 ENV GOEXPERIMENT=loopvar 14 14 RUN GIT_VERSION=$(git describe --tags --long --always) && \ 15 - go build -tags timetzdata -o /rerelay ./cmd/rerelay 15 + go build -tags timetzdata -o /relay ./cmd/relay 16 16 17 17 ### Build Frontend stage 18 18 FROM node:18-alpine as web-builder 19 19 20 20 WORKDIR /app 21 21 22 - COPY cmd/rerelay/relay-admin-ui /app/ 22 + COPY cmd/relay/relay-admin-ui /app/ 23 23 24 24 RUN yarn install --frozen-lockfile 25 25 ··· 32 32 ENTRYPOINT ["dumb-init", "--"] 33 33 34 34 WORKDIR / 35 - RUN mkdir -p data/rerelay 36 - COPY --from=build-env /rerelay / 35 + RUN mkdir -p data/relay 36 + COPY --from=build-env /relay / 37 37 COPY --from=web-builder /app/dist/ public/ 38 38 39 39 # small things to make golang binaries work well under alpine ··· 42 42 43 43 EXPOSE 2470 44 44 45 - CMD ["/rerelay", "serve"] 45 + CMD ["/relay", "serve"] 46 46 47 47 LABEL org.opencontainers.image.source=https://github.com/bluesky-social/indigo 48 48 LABEL org.opencontainers.image.description="atproto Relay"
+11 -11
cmd/rerelay/README.md cmd/relay/README.md
··· 1 1 2 - rerelay: an atproto relay 3 - =========================== 2 + `relay`: atproto relay reference implementation 3 + =============================================== 4 4 5 5 *NOTE: "relays" used to be called "Big Graph Servers", or "BGS", or "bigsky". Many variables and packages still reference "bgs"* 6 6 ··· 35 35 36 36 You can re-build and run the command directly to get a list of configuration flags and env vars; env vars will be loaded from `.env` if that file exists: 37 37 38 - RELAY_ADMIN_KEY=localdev go run ./cmd/rerelay/ --help 38 + RELAY_ADMIN_KEY=localdev go run ./cmd/relay/ --help 39 39 40 - By default, the daemon will use sqlite for databases (in the directory `./data/rerelay/`) and the HTTP API will be bound to localhost port 2470. 40 + By default, the daemon will use sqlite for databases (in the directory `./data/relay/`) and the HTTP API will be bound to localhost port 2470. 41 41 42 42 When the daemon isn't running, sqlite database files can be inspected with: 43 43 44 - sqlite3 data/rerelay/rerelay.sqlite 44 + sqlite3 data/relay/relay.sqlite 45 45 [...] 46 46 sqlite> .schema 47 47 48 48 Wipe all local data: 49 49 50 50 # careful! double-check this destructive command 51 - rm -rf ./data/rerelay/* 51 + rm -rf ./data/relay/* 52 52 53 53 There is a basic web dashboard, though it will not be included unless built and copied to a local directory `./public/`. Run `make build-relay-ui`, and then when running the daemon the dashboard will be available at: <http://localhost:2470/dash/>. Paste in the admin key, eg `localdev`. 54 54 ··· 65 65 66 66 One way to deploy is running a docker image. You can pull and/or run a specific version of relay, referenced by git commit, from the Bluesky Github container registry. For example: 67 67 68 - docker pull ghcr.io/bluesky-social/indigo:rerelay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 69 - docker run ghcr.io/bluesky-social/indigo:rerelay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 68 + docker pull ghcr.io/bluesky-social/indigo:relay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 69 + docker run ghcr.io/bluesky-social/indigo:relay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 70 70 71 71 There is a Dockerfile in this directory, which can be used to build customized/patched versions of the relay as a container, republish them, run locally, deploy to servers, deploy to an orchestrated cluster, etc. See docs and guides for docker and cluster management systems for details. 72 72 ··· 77 77 78 78 For PostgreSQL, the user and database must already be configured. Some example SQL commands are: 79 79 80 - CREATE DATABASE rerelay; 80 + CREATE DATABASE relay; 81 81 82 82 CREATE USER ${username} WITH PASSWORD '${password}'; 83 - GRANT ALL PRIVILEGES ON DATABASE rerelay TO ${username}; 83 + GRANT ALL PRIVILEGES ON DATABASE relay TO ${username}; 84 84 85 85 This service currently uses `gorm` to automatically run database migrations as the regular user. There is no concept of running a separate set of migrations under more privileged database user. 86 86 ··· 131 131 132 132 ``` 133 133 RELAY_ADMIN_PASSWORD=$(openssl rand --hex 16) 134 - rerelay --api-listen :2470 --admin-key ${RELAY_ADMIN_PASSWORD} ... 134 + relay --api-listen :2470 --admin-key ${RELAY_ADMIN_PASSWORD} ... 135 135 ``` 136 136 137 137 One can, for example, begin compaction of all repos
+3 -3
cmd/rerelay/handlers.go cmd/relay/handlers.go
··· 8 8 9 9 comatproto "github.com/bluesky-social/indigo/api/atproto" 10 10 "github.com/bluesky-social/indigo/atproto/syntax" 11 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 12 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 11 + "github.com/bluesky-social/indigo/cmd/relay/relay" 12 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 13 13 "github.com/bluesky-social/indigo/xrpc" 14 14 15 15 "github.com/labstack/echo/v4" ··· 279 279 .##....##..##.......##.......##.....##....##... 280 280 .##.....##.########.########.##.....##....##... 281 281 282 - This is an atproto [https://atproto.com] relay instance, running the 'rerelay' codebase [https://github.com/bluesky-social/indigo] 282 + This is an atproto [https://atproto.com] relay instance, running the 'relay' codebase [https://github.com/bluesky-social/indigo] 283 283 284 284 The firehose WebSocket path is at: /xrpc/com.atproto.sync.subscribeRepos 285 285 `
+2 -2
cmd/rerelay/handlers_admin.go cmd/relay/handlers_admin.go
··· 10 10 11 11 comatproto "github.com/bluesky-social/indigo/api/atproto" 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 14 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 13 + "github.com/bluesky-social/indigo/cmd/relay/relay" 14 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 15 15 16 16 "github.com/labstack/echo/v4" 17 17 dto "github.com/prometheus/client_model/go"
+4 -4
cmd/rerelay/main.go cmd/relay/main.go
··· 17 17 _ "net/http/pprof" 18 18 19 19 "github.com/bluesky-social/indigo/atproto/identity" 20 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 21 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" 22 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist/diskpersist" 20 + "github.com/bluesky-social/indigo/cmd/relay/relay" 21 + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" 22 + "github.com/bluesky-social/indigo/cmd/relay/stream/persist/diskpersist" 23 23 "github.com/bluesky-social/indigo/util/cliutil" 24 24 25 25 "github.com/carlmjohnson/versioninfo" ··· 37 37 func run(args []string) error { 38 38 39 39 app := cli.App{ 40 - Name: "rerelay", 40 + Name: "relay", 41 41 Usage: "atproto relay daemon", 42 42 Version: versioninfo.Short(), 43 43 }
+2 -2
cmd/rerelay/otel.go cmd/relay/otel.go
··· 35 35 // Record information about this application in a Resource. 36 36 tracesdk.WithResource(resource.NewWithAttributes( 37 37 semconv.SchemaURL, 38 - semconv.ServiceNameKey.String("rerelay"), 38 + semconv.ServiceNameKey.String("relay"), 39 39 attribute.String("env", env), // DataDog 40 40 attribute.String("environment", env), // Others 41 41 attribute.Int64("ID", 1), ··· 73 73 tracesdk.WithBatcher(exp), 74 74 tracesdk.WithResource(resource.NewWithAttributes( 75 75 semconv.SchemaURL, 76 - semconv.ServiceNameKey.String("rerelay"), 76 + semconv.ServiceNameKey.String("relay"), 77 77 attribute.String("env", env), // DataDog 78 78 attribute.String("environment", env), // Others 79 79 attribute.Int64("ID", 1),
cmd/rerelay/relay-admin-ui/.gitignore cmd/relay/relay-admin-ui/.gitignore
cmd/rerelay/relay-admin-ui/index.html cmd/relay/relay-admin-ui/index.html
cmd/rerelay/relay-admin-ui/package.json cmd/relay/relay-admin-ui/package.json
cmd/rerelay/relay-admin-ui/postcss.config.js cmd/relay/relay-admin-ui/postcss.config.js
cmd/rerelay/relay-admin-ui/public/vite.svg cmd/relay/relay-admin-ui/public/vite.svg
cmd/rerelay/relay-admin-ui/src/App.css cmd/relay/relay-admin-ui/src/App.css
cmd/rerelay/relay-admin-ui/src/App.tsx cmd/relay/relay-admin-ui/src/App.tsx
cmd/rerelay/relay-admin-ui/src/assets/react.svg cmd/relay/relay-admin-ui/src/assets/react.svg
cmd/rerelay/relay-admin-ui/src/components/Consumers/Consumers.tsx cmd/relay/relay-admin-ui/src/components/Consumers/Consumers.tsx
cmd/rerelay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx cmd/relay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx
cmd/rerelay/relay-admin-ui/src/components/Dash/Dash.tsx cmd/relay/relay-admin-ui/src/components/Dash/Dash.tsx
cmd/rerelay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx cmd/relay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx
cmd/rerelay/relay-admin-ui/src/components/Domains/Domains.tsx cmd/relay/relay-admin-ui/src/components/Domains/Domains.tsx
cmd/rerelay/relay-admin-ui/src/components/Login/Login.tsx cmd/relay/relay-admin-ui/src/components/Login/Login.tsx
cmd/rerelay/relay-admin-ui/src/components/Logout/Logout.tsx cmd/relay/relay-admin-ui/src/components/Logout/Logout.tsx
cmd/rerelay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx cmd/relay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx
cmd/rerelay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx cmd/relay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx
cmd/rerelay/relay-admin-ui/src/components/Notification/Notification.tsx cmd/relay/relay-admin-ui/src/components/Notification/Notification.tsx
cmd/rerelay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx cmd/relay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx
cmd/rerelay/relay-admin-ui/src/components/Repos/Repos.tsx cmd/relay/relay-admin-ui/src/components/Repos/Repos.tsx
cmd/rerelay/relay-admin-ui/src/constants.ts cmd/relay/relay-admin-ui/src/constants.ts
cmd/rerelay/relay-admin-ui/src/index.css cmd/relay/relay-admin-ui/src/index.css
cmd/rerelay/relay-admin-ui/src/main.tsx cmd/relay/relay-admin-ui/src/main.tsx
cmd/rerelay/relay-admin-ui/src/models/consumer.ts cmd/relay/relay-admin-ui/src/models/consumer.ts
cmd/rerelay/relay-admin-ui/src/models/pds.ts cmd/relay/relay-admin-ui/src/models/pds.ts
cmd/rerelay/relay-admin-ui/src/vite-env.d.ts cmd/relay/relay-admin-ui/src/vite-env.d.ts
cmd/rerelay/relay-admin-ui/tailwind.config.js cmd/relay/relay-admin-ui/tailwind.config.js
cmd/rerelay/relay-admin-ui/tsconfig.json cmd/relay/relay-admin-ui/tsconfig.json
cmd/rerelay/relay-admin-ui/tsconfig.node.json cmd/relay/relay-admin-ui/tsconfig.node.json
cmd/rerelay/relay-admin-ui/vite.config.ts cmd/relay/relay-admin-ui/vite.config.ts
cmd/rerelay/relay-admin-ui/yarn.lock cmd/relay/relay-admin-ui/yarn.lock
+1 -1
cmd/rerelay/relay/account.go cmd/relay/relay/account.go
··· 6 6 "fmt" 7 7 8 8 "github.com/bluesky-social/indigo/atproto/syntax" 9 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 9 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 10 10 11 11 "gorm.io/gorm" 12 12 )
+1 -1
cmd/rerelay/relay/broadcast.go cmd/relay/relay/broadcast.go
··· 8 8 "sync" 9 9 "time" 10 10 11 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 11 + "github.com/bluesky-social/indigo/cmd/relay/stream" 12 12 13 13 "github.com/gorilla/websocket" 14 14 promclient "github.com/prometheus/client_golang/prometheus"
+1 -1
cmd/rerelay/relay/crawl.go cmd/relay/relay/crawl.go
··· 4 4 "fmt" 5 5 "strings" 6 6 7 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 7 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 8 8 ) 9 9 10 10 // Checks whether a host is allowed to be subscribed to
+1 -1
cmd/rerelay/relay/domain_ban.go cmd/relay/relay/domain_ban.go
··· 6 6 "fmt" 7 7 "strings" 8 8 9 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 9 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 10 10 11 11 "gorm.io/gorm" 12 12 )
cmd/rerelay/relay/errors.go cmd/relay/relay/errors.go
+1 -1
cmd/rerelay/relay/host.go cmd/relay/relay/host.go
··· 8 8 "strings" 9 9 10 10 "github.com/bluesky-social/indigo/atproto/syntax" 11 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 11 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 12 12 13 13 "gorm.io/gorm" 14 14 )
cmd/rerelay/relay/host_checker.go cmd/relay/relay/host_checker.go
cmd/rerelay/relay/host_checker_test.go cmd/relay/relay/host_checker_test.go
cmd/rerelay/relay/host_test.go cmd/relay/relay/host_test.go
+2 -2
cmd/rerelay/relay/ingest.go cmd/relay/relay/ingest.go
··· 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 11 "github.com/bluesky-social/indigo/atproto/identity" 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 14 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 13 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 14 + "github.com/bluesky-social/indigo/cmd/relay/stream" 15 15 16 16 "go.opentelemetry.io/otel/attribute" 17 17 )
cmd/rerelay/relay/metrics.go cmd/relay/relay/metrics.go
cmd/rerelay/relay/metrics_slurper.go cmd/relay/relay/metrics_slurper.go
cmd/rerelay/relay/metrics_validator.go cmd/relay/relay/metrics_validator.go
cmd/rerelay/relay/models/methods.go cmd/relay/relay/models/methods.go
cmd/rerelay/relay/models/methods_test.go cmd/relay/relay/models/methods_test.go
cmd/rerelay/relay/models/models.go cmd/relay/relay/models/models.go
cmd/rerelay/relay/rate_limits.go cmd/relay/relay/rate_limits.go
+3 -3
cmd/rerelay/relay/relay.go cmd/relay/relay/relay.go
··· 5 5 "sync" 6 6 7 7 "github.com/bluesky-social/indigo/atproto/identity" 8 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 9 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" 8 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 9 + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" 10 10 11 11 "github.com/hashicorp/golang-lru/v2" 12 12 "go.opentelemetry.io/otel" ··· 69 69 70 70 uc, _ := lru.New[string, *models.Account](2_000_000) 71 71 72 - hc := NewHostClient("rerelay") // TODO: pass-through a user-agent from config? 72 + hc := NewHostClient("relay") // TODO: pass-through a user-agent from config? 73 73 74 74 r := &Relay{ 75 75 db: db,
+3 -3
cmd/rerelay/relay/slurper.go cmd/relay/relay/slurper.go
··· 11 11 "time" 12 12 13 13 comatproto "github.com/bluesky-social/indigo/api/atproto" 14 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 15 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 16 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers/parallel" 14 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 15 + "github.com/bluesky-social/indigo/cmd/relay/stream" 16 + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers/parallel" 17 17 18 18 "github.com/RussellLuo/slidingwindow" 19 19 "github.com/gorilla/websocket"
+1 -1
cmd/rerelay/relay/verify.go cmd/relay/relay/verify.go
··· 11 11 "github.com/bluesky-social/indigo/atproto/identity" 12 12 "github.com/bluesky-social/indigo/atproto/repo" 13 13 "github.com/bluesky-social/indigo/atproto/syntax" 14 - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" 14 + "github.com/bluesky-social/indigo/cmd/relay/relay/models" 15 15 ) 16 16 17 17 var (
+1 -1
cmd/rerelay/service.go cmd/relay/service.go
··· 9 9 "strings" 10 10 "time" 11 11 12 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 12 + "github.com/bluesky-social/indigo/cmd/relay/relay" 13 13 "github.com/bluesky-social/indigo/util/svcutil" 14 14 15 15 "github.com/labstack/echo/v4"
cmd/rerelay/stream/cbor_gen.go cmd/relay/stream/cbor_gen.go
cmd/rerelay/stream/consumer.go cmd/relay/stream/consumer.go
cmd/rerelay/stream/eventmgr/errors.go cmd/relay/stream/eventmgr/errors.go
+2 -2
cmd/rerelay/stream/eventmgr/event_manager.go cmd/relay/stream/eventmgr/event_manager.go
··· 7 7 "sync" 8 8 "time" 9 9 10 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 11 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist" 10 + "github.com/bluesky-social/indigo/cmd/relay/stream" 11 + "github.com/bluesky-social/indigo/cmd/relay/stream/persist" 12 12 13 13 "go.opentelemetry.io/otel" 14 14 )
cmd/rerelay/stream/eventmgr/metrics.go cmd/relay/stream/eventmgr/metrics.go
+1 -1
cmd/rerelay/stream/eventmgr/subscriber.go cmd/relay/stream/eventmgr/subscriber.go
··· 3 3 import ( 4 4 "sync" 5 5 6 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 6 + "github.com/bluesky-social/indigo/cmd/relay/stream" 7 7 8 8 "github.com/prometheus/client_golang/prometheus" 9 9 )
cmd/rerelay/stream/events.go cmd/relay/stream/events.go
cmd/rerelay/stream/metrics.go cmd/relay/stream/metrics.go
+2 -2
cmd/rerelay/stream/persist/diskpersist/diskpersist.go cmd/relay/stream/persist/diskpersist/diskpersist.go
··· 15 15 "time" 16 16 17 17 "github.com/bluesky-social/indigo/api/atproto" 18 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 19 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist" 18 + "github.com/bluesky-social/indigo/cmd/relay/stream" 19 + "github.com/bluesky-social/indigo/cmd/relay/stream/persist" 20 20 arc "github.com/hashicorp/golang-lru/arc/v2" 21 21 "github.com/prometheus/client_golang/prometheus" 22 22 "github.com/prometheus/client_golang/prometheus/promauto"
+1 -1
cmd/rerelay/stream/persist/persist.go cmd/relay/stream/persist/persist.go
··· 3 3 import ( 4 4 "context" 5 5 6 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 6 + "github.com/bluesky-social/indigo/cmd/relay/stream" 7 7 ) 8 8 9 9 // Note that this interface looks generic, but some persisters might only work with RepoAppend or LabelLabels
cmd/rerelay/stream/scheduler.go cmd/relay/stream/scheduler.go
cmd/rerelay/stream/schedulers/metrics.go cmd/relay/stream/schedulers/metrics.go
+2 -2
cmd/rerelay/stream/schedulers/parallel/parallel.go cmd/relay/stream/schedulers/parallel/parallel.go
··· 5 5 "log/slog" 6 6 "sync" 7 7 8 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 9 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers" 8 + "github.com/bluesky-social/indigo/cmd/relay/stream" 9 + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers" 10 10 11 11 "github.com/prometheus/client_golang/prometheus" 12 12 )
cmd/rerelay/stream/schedulers/scheduler.go cmd/relay/stream/schedulers/scheduler.go
+2 -2
cmd/rerelay/stream/schedulers/sequential/sequential.go cmd/relay/stream/schedulers/sequential/sequential.go
··· 3 3 import ( 4 4 "context" 5 5 6 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 7 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers" 6 + "github.com/bluesky-social/indigo/cmd/relay/stream" 7 + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers" 8 8 9 9 "github.com/prometheus/client_golang/prometheus" 10 10 )
+1 -1
cmd/rerelay/stubs.go cmd/relay/stubs.go
··· 7 7 8 8 comatproto "github.com/bluesky-social/indigo/api/atproto" 9 9 "github.com/bluesky-social/indigo/atproto/syntax" 10 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 10 + "github.com/bluesky-social/indigo/cmd/relay/relay" 11 11 "github.com/bluesky-social/indigo/xrpc" 12 12 13 13 "github.com/labstack/echo/v4"
+2 -2
cmd/rerelay/testing/consumer.go cmd/relay/testing/consumer.go
··· 8 8 "time" 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 12 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers/sequential" 11 + "github.com/bluesky-social/indigo/cmd/relay/stream" 12 + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers/sequential" 13 13 14 14 "github.com/gorilla/websocket" 15 15 )
+1 -1
cmd/rerelay/testing/framework_test.go cmd/relay/testing/framework_test.go
··· 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 11 "github.com/bluesky-social/indigo/atproto/syntax" 12 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 12 + "github.com/bluesky-social/indigo/cmd/elay/stream" 13 13 14 14 "github.com/stretchr/testify/assert" 15 15 )
+1 -1
cmd/rerelay/testing/producer.go cmd/relay/testing/producer.go
··· 8 8 "net/http" 9 9 "sync" 10 10 11 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 11 + "github.com/bluesky-social/indigo/cmd/relay/stream" 12 12 13 13 "github.com/gorilla/websocket" 14 14 )
+5 -5
cmd/rerelay/testing/runner.go cmd/relay/testing/runner.go
··· 11 11 "reflect" 12 12 13 13 "github.com/bluesky-social/indigo/atproto/identity" 14 - "github.com/bluesky-social/indigo/cmd/rerelay/relay" 15 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 16 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" 17 - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist/diskpersist" 14 + "github.com/bluesky-social/indigo/cmd/relay/relay" 15 + "github.com/bluesky-social/indigo/cmd/relay/stream" 16 + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" 17 + "github.com/bluesky-social/indigo/cmd/relay/stream/persist/diskpersist" 18 18 "github.com/bluesky-social/indigo/util/cliutil" 19 19 ) 20 20 ··· 117 117 dir.Insert(acc.Identity) 118 118 } 119 119 120 - tmpd, err := os.MkdirTemp("", "rerelay-test-") 120 + tmpd, err := os.MkdirTemp("", "relay-test-") 121 121 if err != nil { 122 122 return err 123 123 }
+1 -1
cmd/rerelay/testing/scenario.go cmd/relay/testing/scenario.go
··· 6 6 7 7 comatproto "github.com/bluesky-social/indigo/api/atproto" 8 8 "github.com/bluesky-social/indigo/atproto/identity" 9 - "github.com/bluesky-social/indigo/cmd/rerelay/stream" 9 + "github.com/bluesky-social/indigo/cmd/relay/stream" 10 10 ) 11 11 12 12 // represents an entire test case
cmd/rerelay/testing/sync_test.go cmd/relay/testing/sync_test.go
cmd/rerelay/testing/testdata/basic.json cmd/relay/testing/testdata/basic.json
cmd/rerelay/testing/testdata/deactivation.json cmd/relay/testing/testdata/deactivation.json
cmd/rerelay/testing/testdata/post_lifecycle.json cmd/relay/testing/testdata/post_lifecycle.json