feat!: New Prose Pod architecture

.dockerignore

@@ -0,0 +1,63 @@
+# Bloat
+.task
+**/.git*
+**/.hg*
+api/target
+
+# Prosody Community modules conflicting with internal plugins or merged
+plugins/community/mod_cloud_notify
+plugins/community/mod_graceful_shutdown
+plugins/community/mod_pep_vcard_avatar
+plugins/community/mod_server_contact_info
+plugins/community/mod_server_info
+# See `for f in $(rg -l Stage-Merged --no-ignore-vcs); do print -- "$(dirname "$f")"; done | sort`
+plugins/community/mod_auth_any
+plugins/community/mod_auth_ldap
+plugins/community/mod_bookmarks2
+plugins/community/mod_invites
+plugins/community/mod_invites_adhoc
+plugins/community/mod_invites_register
+plugins/community/mod_stanzadebug
+plugins/community/mod_storage_memory
+plugins/community/mod_turn_external
+
+# Broken Prosody Community modules
+plugins/community/mod_vcard_command
+
+# Other plugins we probably don’t want
+# See `for f in $(rg -li 'Stage-(Broken|Obsolete)' --no-ignore-vcs); do print -- "$(dirname "$f")"; done | sort`
+# TIP: See all statuses uing `rg -Ioi 'Stage-[a-z]+' | sort -u`
+plugins/community/mod_bidi
+plugins/community/mod_bookmarks
+plugins/community/mod_carbons
+plugins/community/mod_checkcerts
+plugins/community/mod_csi
+plugins/community/mod_http_upload
+plugins/community/mod_limits
+plugins/community/mod_limits_exception
+plugins/community/mod_listusers
+plugins/community/mod_mam
+plugins/community/mod_mam_muc
+plugins/community/mod_muc_log
+plugins/community/mod_muc_log_http
+plugins/community/mod_muc_occupant_id
+plugins/community/mod_muc_ping
+plugins/community/mod_muc_restrict_pm
+plugins/community/mod_profile
+plugins/community/mod_prometheus
+plugins/community/mod_s2s_auth_dane
+plugins/community/mod_s2s_smacks_timeout
+plugins/community/mod_smacks
+plugins/community/mod_smacks_offline
+plugins/community/mod_sslv3_warn
+plugins/community/mod_statistics
+plugins/community/mod_telnet_tlsinfo
+plugins/community/mod_turncredentials
+plugins/community/mod_twitter
+
+# Editor
+.nova
+.zed
+
+# macOS
+**/.DS_Store

.gitignore

@@ -1,9 +1,64 @@
 # Bloat
-plugins/community/.hg
+.task
+**/.hg/cache/
+**/.hg/store/undo*
+**/.hg/wcache/
+**/.hg/hgrc.d/
+
+# Prosody Community modules conflicting with internal plugins or merged
+plugins/community/mod_cloud_notify
+plugins/community/mod_graceful_shutdown
+plugins/community/mod_pep_vcard_avatar
+plugins/community/mod_server_contact_info
+plugins/community/mod_server_info
+# See `for f in $(rg -l Stage-Merged --no-ignore-vcs); do print -- "$(dirname "$f")"; done | sort`
+plugins/community/mod_auth_any
+plugins/community/mod_auth_ldap
+plugins/community/mod_bookmarks2
+plugins/community/mod_invites
+plugins/community/mod_invites_adhoc
+plugins/community/mod_invites_register
+plugins/community/mod_stanzadebug
+plugins/community/mod_storage_memory
+plugins/community/mod_turn_external
+
+# Broken Prosody Community modules
+plugins/community/mod_vcard_command
+
+# Other plugins we probably don’t want
+# See `for f in $(rg -li 'Stage-(Broken|Obsolete)' --no-ignore-vcs); do print -- "$(dirname "$f")"; done | sort`
+# TIP: See all statuses uing `rg -Ioi 'Stage-[a-z]+' | sort -u`
+plugins/community/mod_bidi
+plugins/community/mod_bookmarks
+plugins/community/mod_carbons
+plugins/community/mod_checkcerts
+plugins/community/mod_csi
+plugins/community/mod_http_upload
+plugins/community/mod_limits
+plugins/community/mod_limits_exception
+plugins/community/mod_listusers
+plugins/community/mod_mam
+plugins/community/mod_mam_muc
+plugins/community/mod_muc_log
+plugins/community/mod_muc_log_http
+plugins/community/mod_muc_occupant_id
+plugins/community/mod_muc_ping
+plugins/community/mod_muc_restrict_pm
+plugins/community/mod_profile
+plugins/community/mod_prometheus
+plugins/community/mod_s2s_auth_dane
+plugins/community/mod_s2s_smacks_timeout
+plugins/community/mod_smacks
+plugins/community/mod_smacks_offline
+plugins/community/mod_sslv3_warn
+plugins/community/mod_statistics
+plugins/community/mod_telnet_tlsinfo
+plugins/community/mod_turncredentials
+plugins/community/mod_twitter
 
 # Editor
 .nova
 .zed
 
 # macOS
-**.DS_Store
+**/.DS_Store

Dockerfile

@@ -1,20 +1,46 @@
-ARG BASE_IMAGE=alpine:3.19
+ARG BASE_IMAGE=alpine:3.22.1
+ARG CARGO_CHEF_IMAGE=lukemathwalker/cargo-chef:0.1.72-rust-1.89.0-alpine
 
-# -- STAGE 1 [build] --
 
-FROM ${BASE_IMAGE} AS build
+
+
+FROM ${CARGO_CHEF_IMAGE} AS chef
+WORKDIR /usr/src/prose-pod-server
+
+
+FROM chef AS api-plan
+COPY api .
+RUN cargo chef prepare --recipe-path recipe.json
+
+
+FROM chef AS api-build
+COPY --from=api-plan /usr/src/prose-pod-server/recipe.json recipe.json
+
+ARG CARGO_PROFILE='release'
+
+# Build dependencies.
+RUN cargo chef cook --recipe-path recipe.json --profile "${CARGO_PROFILE}"
+
+# Build the application.
+COPY api .
+RUN cargo install --path . --bin prose-pod-server --profile "${CARGO_PROFILE}"
+
+
+
+
+FROM ${BASE_IMAGE} AS prosody-build
 
 WORKDIR /build
 
 RUN apk add --no-cache \
-  build-base \
-  linux-headers \
-  lua5.4-dev \
-  libidn-dev \
-  openssl-dev \
-  libidn-dev \
-  luarocks5.4 \
-  sqlite-dev
+	build-base \
+	linux-headers \
+	lua5.4-dev \
+	libidn-dev \
+	openssl-dev \
+	libidn-dev \
+	luarocks5.4 \
+	sqlite-dev
 
 # BUG: Broken. See [Builds broken by issue in LuaSQLite3 · Issue #8 · prose-im/prose-pod-server](https://github.com/prose-im/prose-pod-server/issues/8).
 #RUN luarocks-5.4 install lsqlite3
@@ -24,41 +50,40 @@ RUN apk add --no-cache \
 COPY ./build /build
 RUN apk add --no-cache unzip
 RUN unzip /build/lsqlite3_v096.zip; \
-  cd /build/lsqlite3_v096; \
-  luarocks-5.4 make lsqlite3-0.9.6-1.rockspec
+	cd /build/lsqlite3_v096; \
+	luarocks-5.4 make lsqlite3-0.9.6-1.rockspec
 
 COPY ./prosody /build
 
 RUN ./configure \
-  --prefix=/ \
-  --sysconfdir=/etc/prosody \
-  --libdir=/lib \
-  --datadir=/var/lib/prosody \
-  --lua-version=5.4 \
-  --lua-suffix=5.4 \
-  --idn-library=idn
+	--prefix=/ \
+	--sysconfdir=/etc/prosody \
+	--libdir=/lib \
+	--datadir=/var/lib/prosody \
+	--lua-version=5.4 \
+	--lua-suffix=5.4 \
+	--idn-library=idn
 
 RUN make
 RUN make install
 
-# -- STAGE 2 [run] --
 
-FROM ${BASE_IMAGE} AS run
+FROM ${BASE_IMAGE} AS prosody-run
 
 RUN apk add --no-cache \
-  libidn \
-  lua5.4 \
-  lua5.4-expat \
-  lua5.4-socket \
-  lua5.4-filesystem \
-  lua5.4-sec \
-  lua5.4-unbound \
-  sqlite-libs
-
-COPY --from=build /bin/prosody bin/
-COPY --from=build /bin/prosodyctl bin/
-COPY --from=build /lib/prosody/ /lib/prosody/
-COPY --from=build /usr/local/lib/lua/5.4/lsqlite3.so /usr/lib/lua/5.4/
+	libidn \
+	lua5.4 \
+	lua5.4-expat \
+	lua5.4-socket \
+	lua5.4-filesystem \
+	lua5.4-sec \
+	lua5.4-unbound \
+	sqlite-libs
+
+COPY --from=prosody-build /bin/prosody bin/
+COPY --from=prosody-build /bin/prosodyctl bin/
+COPY --from=prosody-build /lib/prosody/ /lib/prosody/
+COPY --from=prosody-build /usr/local/lib/lua/5.4/lsqlite3.so /usr/lib/lua/5.4/
 
 COPY ./plugins/*/ /usr/local/lib/prosody/modules/
 COPY ./pod-bootstrap.cfg.lua /usr/share/prose/prosody.bootstrap.cfg.lua
@@ -67,22 +92,22 @@ RUN addgroup -S --gid 1001 prosody
 RUN adduser -S --uid 1001 -G prosody --no-create-home prosody
 
 RUN mkdir \
-  /var/lib/prosody/ \
-  /var/run/prosody/
+	/var/lib/prosody/ \
+	/var/run/prosody/
 
 RUN chown prosody:prosody \
-  /var/lib/prosody/ \
-  /var/run/prosody/
+	/var/lib/prosody/ \
+	/var/run/prosody/
 
 ARG VERSION=''
 ARG COMMIT=''
 ARG BUILD_TIMESTAMP=''
 RUN SERVER_VERSION_DIR=/lib/prosody/prose.version.d && \
-  mkdir -p "${SERVER_VERSION_DIR:?}" && \
-  echo "${VERSION:-}" > "${SERVER_VERSION_DIR:?}"/VERSION && \
-  echo "${COMMIT:-}" > "${SERVER_VERSION_DIR:?}"/COMMIT && \
-  if [ -z "${BUILD_TIMESTAMP:-}" ]; then BUILD_TIMESTAMP="$(date -u -Iseconds)" && BUILD_TIMESTAMP="${BUILD_TIMESTAMP//+00:00/Z}"; fi && \
-  echo "${BUILD_TIMESTAMP:?}" > "${SERVER_VERSION_DIR:?}"/BUILD_TIMESTAMP
+	mkdir -p "${SERVER_VERSION_DIR:?}" && \
+	echo "${VERSION:-}" > "${SERVER_VERSION_DIR:?}"/VERSION && \
+	echo "${COMMIT:-}" > "${SERVER_VERSION_DIR:?}"/COMMIT && \
+	if [ -z "${BUILD_TIMESTAMP:-}" ]; then BUILD_TIMESTAMP="$(date -u -Iseconds)" && BUILD_TIMESTAMP="${BUILD_TIMESTAMP//+00:00/Z}"; fi && \
+	echo "${BUILD_TIMESTAMP:?}" > "${SERVER_VERSION_DIR:?}"/BUILD_TIMESTAMP
 
 VOLUME /etc/prosody/
 VOLUME /var/lib/prosody/
@@ -99,4 +124,17 @@ EXPOSE 5280/tcp
 
 USER prosody:prosody
 
-ENTRYPOINT ["prosody"]
+
+
+
+FROM prosody-run AS run
+
+WORKDIR /usr/share/prose-pod-server
+
+COPY --from=api-build /usr/local/cargo/bin/prose-pod-server /usr/local/bin/prose-pod-server
+
+VOLUME /etc/prose/
+
+ENTRYPOINT ["prose-pod-server"]
+
+EXPOSE 8080/tcp

Taskfile.dist.yaml

@@ -13,4 +13,43 @@ tasks:
 
   update:plugins:
     desc: Update Prosody community modules
-    cmd: hg -R plugins/community pull --update
+    cmds:
+      - hg -R plugins/community pull --update
+      - git add plugins/community
+      - "git commit -m 'feat(prosody): Update Prosody Community modules'"
+    preconditions:
+      - git diff --cached --quiet
+
+  dev:build:
+    desc: Build `proseim/prose-pod-server:local`
+    cmds:
+      - |-
+        docker build -t proseim/prose-pod-server:local \
+          --build-arg VERSION="$(cat VERSION)" \
+          --build-arg COMMIT="$(git rev-parse HEAD)" \
+          --build-arg CARGO_PROFILE='{{ .CARGO_PROFILE }}' \
+          {{ .CLI_ARGS }} \
+          '{{ .ROOT_DIR }}'
+      - echo '{{ .CARGO_PROFILE }}-{{ .CHECKSUM }}' > .task/checksum/dev-build-profile
+    vars:
+      CARGO_PROFILE: '{{ .CARGO_PROFILE | default "dev" }}'
+    sources:
+      - plugins/**
+      - prosody/**
+      - api/src/**
+      - api/crates/**/src/**
+      - api/Cargo.toml
+      - pod-bootstrap.cfg.lua
+      - VERSION
+      - Dockerfile
+      - .dockerignore
+    status:
+      - >-
+        [[ "$(cat .task/checksum/dev-build-profile)" == '{{ .CARGO_PROFILE }}-{{ .CHECKSUM }}' ]]
+
+  internal:
+    cmds:
+      - pushd plugins/community
+      - hg init
+      - hg pull https://hg.prosody.im/prosody-modules/
+      - popd

api/.gitignore

@@ -0,0 +1 @@
+target/

api/ARCHITECTURE.md

@@ -0,0 +1 @@
+docs/ARCHITECTURE.md