Merge branch 'master' into ep/profile-badges

2026-10-06 09:58:26 +00:00 · 2026-10-05 11:08:31 +00:00
parent 079cedac6c 680790695e
commit 1d148109d8
140 changed files with 4408 additions and 611 deletions
@@ -42,5 +42,13 @@ idle_seconds = 60
 index = 1
 private_key = replace-me

-[dev]
-chat_redeem = on
+; Optional. When present, the service creates and manages one group on its first
+; start without --run-cli, and logs its join link once, on the start that creates it.
+; The link is a bearer secret that stays valid, so keep that log private. The first
+; member to join is promoted to owner, so join right away.
+; Moderators can /issue and /bulk codes; admins and owners can also /revoke.
+; display_name must be a name the chat core accepts unchanged: one it would spell
+; differently stops the whole service, payments included, from starting.
+;[group]
+;display_name = SimpleX Badges
+;description = Welcome to the badges group
@@ -0,0 +1,121 @@
+# syntax=docker/dockerfile:1
+
+# The runtime glibc must be the same or newer.
+ARG UBUNTU_LIBS=22.04
+ARG GHC=9.6.3
+ARG CABAL=3.10.2.0
+ARG NODE=24
+
+# --------------------------------------------------------------------------- #
+# libsimplex
+# --------------------------------------------------------------------------- #
+FROM ubuntu:${UBUNTU_LIBS} AS libsimplex
+
+ARG GHC
+ARG CABAL
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential ca-certificates curl git libgmp3-dev libnuma-dev \
+        libsqlite3-dev libssl-dev llvm patchelf pkg-config zlib1g-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
+    BOOTSTRAP_HASKELL_GHC_VERSION=${GHC} \
+    BOOTSTRAP_HASKELL_CABAL_VERSION=${CABAL} \
+    BOOTSTRAP_HASKELL_INSTALL_NO_STACK=true \
+    BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=true
+RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
+ENV PATH="/root/.ghcup/bin:/root/.cabal/bin:$PATH"
+ENV CABAL_DIR=/root/.cabal
+
+WORKDIR /src
+COPY cabal.project simplex-chat.cabal README.md PRIVACY.md ./
+COPY scripts/cabal.project.local.linux ./cabal.project.local
+# The build script checks the export lists in these.
+COPY libsimplex.dll.def flake.nix ./
+COPY scripts/desktop ./scripts/desktop
+COPY src ./src
+
+# VLC is only for the desktop app.
+RUN sed -i '/prepare-vlc-linux.sh/d' scripts/desktop/build-lib-linux.sh
+
+# Other versions' build trees are removed: the script's simplex-chat-* glob
+# fails with "cd: too many arguments" when the cache holds more than one.
+RUN --mount=type=cache,target=/root/.cabal \
+    --mount=type=cache,target=/src/dist-newstyle \
+    set -eu; \
+    ver=$(sed -n 's/^version: *//p' simplex-chat.cabal | tr -d '[:space:]'); \
+    build_dir=dist-newstyle/build/$(uname -m)-linux/ghc-${GHC}/simplex-chat-$ver/build; \
+    find dist-newstyle/build -maxdepth 3 -type d -name 'simplex-chat-*' \
+      ! -path "*/simplex-chat-$ver" -exec rm -rf {} + 2>/dev/null || true; \
+    cabal update; \
+    scripts/desktop/build-lib-linux.sh sqlite; \
+    mkdir -p /libs; \
+    cp "$build_dir"/libsimplex.so "$build_dir"/deps/* /libs/
+
+# --------------------------------------------------------------------------- #
+# build
+# --------------------------------------------------------------------------- #
+FROM node:${NODE}-bookworm-slim AS build
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential python3 && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=libsimplex /libs /opt/simplex/libs
+# Without it, npm re-running the library's preinstall downloads the released libs.
+ENV SIMPLEX_LIBS_DIR=/opt/simplex/libs
+
+WORKDIR /src
+COPY packages/simplex-chat-client/types/typescript packages/simplex-chat-client/types/typescript
+RUN cd packages/simplex-chat-client/types/typescript && \
+    npm install --no-audit --no-fund && \
+    npx tsc
+
+COPY packages/simplex-chat-nodejs packages/simplex-chat-nodejs
+RUN cd packages/simplex-chat-nodejs && \
+    npm install --no-audit --no-fund && \
+    npm install --no-save --no-audit --no-fund ../simplex-chat-client/types/typescript && \
+    npx tsc && \
+    cp src/simplex.* dist/
+
+WORKDIR /src/apps/simplex-calculator-bot
+# No package-lock.json, so no npm ci.
+COPY apps/simplex-calculator-bot/package.json ./
+RUN npm install --no-audit --no-fund
+RUN npm install --no-save --no-audit --no-fund \
+      /src/packages/simplex-chat-nodejs \
+      /src/packages/simplex-chat-client/types/typescript
+
+# calculatorBot.test.ts needs network and tests/fixtures/tls.
+COPY apps/simplex-calculator-bot ./
+RUN npm run build && npx vitest run calculator.test.ts
+
+# --------------------------------------------------------------------------- #
+# runtime
+# --------------------------------------------------------------------------- #
+FROM node:${NODE}-bookworm-slim AS runtime
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        ca-certificates dumb-init libffi8 libgmp10 libssl3 zlib1g && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=build --chown=node:node /src /src
+
+# A named volume takes this ownership; a bind mount must be owned by uid 1000.
+RUN mkdir -p /src/apps/simplex-calculator-bot/data && \
+    chown node:node /src/apps/simplex-calculator-bot/data && \
+    chmod 0700 /src/apps/simplex-calculator-bot/data
+
+USER node
+WORKDIR /src/apps/simplex-calculator-bot
+
+ENV NODE_ENV=production
+
+# node as PID 1 ignores SIGTERM.
+ENTRYPOINT ["dumb-init", "--", "node", "dist/index.js"]
@@ -0,0 +1,22 @@
+*
+
+!cabal.project
+!simplex-chat.cabal
+!README.md
+!PRIVACY.md
+!libsimplex.dll.def
+!flake.nix
+!src
+!scripts/cabal.project.local.linux
+!scripts/desktop
+!packages/simplex-chat-client
+!packages/simplex-chat-nodejs
+!apps/simplex-calculator-bot
+
+**/node_modules
+**/dist
+**/build
+**/libs
+**/data
+**/.env
+**/.npmrc
@@ -0,0 +1,16 @@
+services:
+  calculator-bot:
+    image: simplex-calculator-bot:latest
+    build:
+      context: ../..
+      dockerfile: scripts/calculator-bot/Dockerfile
+    restart: on-failure:5
+    # The name must first be registered with the bot address short link.
+    # command:
+    #   - "--domain"
+    #   - "yourname.simplex"
+    volumes:
+      - calculator-bot-data:/src/apps/simplex-calculator-bot/data
+
+volumes:
+  calculator-bot-data:
@@ -38,6 +38,23 @@
  </description>

  <releases>
+    <release version="7.0.3" date="2026-09-26">
+      <url type="details">https://simplex.chat/blog/20260722-simplex-public-names.html</url>
+      <description>
+        <p>New in v7.0-v7.0.3.</p>
+        <p>SimpleX public names for channels and businesses (BETA).</p>
+        <p>Better channels:</p>
+        <ul>
+          <li>Promote subscribers to contributors.</li>
+          <li>Publish your channel on your website.</li>
+          <li>Verify security code with contributors.</li>
+          <li>Wider messages, easier to read.</li>
+          <li>Host your own chat relays.</li>
+        </ul>
+        <p>Add a longer description to your profile.</p>
+        <p>Simplified app settings.</p>
+      </description>
+    </release>
    <release version="7.0.2" date="2026-09-02">
      <url type="details">https://simplex.chat/blog/20260722-simplex-public-names.html</url>
      <description>
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."55b613a65822672b4bd1349304b30feff9fd3d02" = "0sjj0sq4y4ad122v0dwcrp7sr4lyhp92mf95m0ligwiii8cz1p4c";
+  "https://github.com/simplex-chat/simplexmq.git"."f66d9ec3952f0ff21c3af5827d05c6d596dad110" = "1dfz8f5fcr5dzyc15m523zl932sxdrch8snhl4vj9zgw9bgyrirx";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";