@underpostnet/cyberia 3.3.76 → 3.4.0

package/deploy/cyberia-client/deploy.sh

@@ -8,6 +8,8 @@ source "$SCRIPT_DIR/../lib/host.sh"
 DEPLOY_ID=dd-cyberia
 INSTANCE_ID=mmo-client
 TARGET_NODE="${TARGET_NODE:-$WORKER_NODE}"
+ENGINE_SRC_REPO="${ENGINE_SRC_REPO:-underpostnet/engine-test-cyberia}"
+ENGINE_SRC_PRIVATE_REPO="${ENGINE_SRC_PRIVATE_REPO:-underpostnet/engine-private}"
 
 main() {
     deploy_start "Starting remote deploy"
@@ -15,24 +17,24 @@ main() {
     prepare_host "$ENGINE_ROOT"
 
     deploy_step "Build $DEPLOY_ID configuration" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
 
     deploy_step "Wait for target node readiness" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl wait --for=condition=Ready node/${TARGET_NODE} --timeout=2m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl wait --for=condition=Ready node/${TARGET_NODE} --timeout=2m"
 
     deploy_step "Wait for ingress rollout" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-ingress -n default --timeout=5m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-ingress -n default --timeout=5m"
 
     deploy_step "Wait for gateway rollout" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
 
     deploy_step "Deploy $DEPLOY_ID $INSTANCE_ID instance" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin run instance \
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && node bin run instance \
           --kubeadm \
           ${TARGET_NODE:+--node-name ${TARGET_NODE}} \
           --gateway-api \
@@ -40,7 +42,7 @@ main() {
           --ingress-node ${INGRESS_NODE} \
           --ssh-key-path ${DEPLOY_SSH_KEY_PATH} \
           --deploy-id $DEPLOY_ID \
-          --instance-id $INSTANCE_ID"
+    --instance-id $INSTANCE_ID"
 }
 
 main "$@"

package/deploy/cyberia-server/deploy.sh

@@ -8,6 +8,8 @@ source "$SCRIPT_DIR/../lib/host.sh"
 DEPLOY_ID=dd-cyberia
 INSTANCE_ID=mmo-server
 TARGET_NODE="${TARGET_NODE:-$WORKER_NODE}"
+ENGINE_SRC_REPO="${ENGINE_SRC_REPO:-underpostnet/engine-test-cyberia}"
+ENGINE_SRC_PRIVATE_REPO="${ENGINE_SRC_PRIVATE_REPO:-underpostnet/engine-private}"
 
 main() {
     deploy_start "Starting remote deploy"
@@ -15,24 +17,24 @@ main() {
     prepare_host "$ENGINE_ROOT"
 
     deploy_step "Build $DEPLOY_ID configuration" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
 
     deploy_step "Wait for target node readiness" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl wait --for=condition=Ready node/${TARGET_NODE} --timeout=2m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl wait --for=condition=Ready node/${TARGET_NODE} --timeout=2m"
 
     deploy_step "Wait for ingress rollout" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-ingress -n default --timeout=5m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-ingress -n default --timeout=5m"
 
     deploy_step "Wait for gateway rollout" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
 
     deploy_step "Deploy $DEPLOY_ID $INSTANCE_ID instance" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin run instance \
+    sudo -n -- /bin/bash -lc \
+    "cd $ENGINE_ROOT && node bin run instance \
           --kubeadm \
           ${TARGET_NODE:+--node-name ${TARGET_NODE}} \
           --gateway-api \
@@ -40,7 +42,7 @@ main() {
           --ingress-node ${INGRESS_NODE} \
           --ssh-key-path ${DEPLOY_SSH_KEY_PATH} \
           --deploy-id $DEPLOY_ID \
-          --instance-id $INSTANCE_ID"
+    --instance-id $INSTANCE_ID"
 }
 
 main "$@"

package/deploy/dd-cyberia/sync-deploy.sh

@@ -23,13 +23,9 @@ UNDERPOST_ASSETS=src/client/public/underpost
 # from source, which is the behaviour this script had before bundle mode existed.
 BUNDLE_MODE="${BUNDLE_MODE:-1}"
 BUNDLE_SPLIT="${BUNDLE_SPLIT:-8}"
-# Where push-bundle records the uploaded keys, relative to a conf checkout root.
-BUNDLE_MANIFEST_PATH="conf/$DEPLOY_ID/storage.bundle.json"
 # `mv` into a directory that already exists nests the checkout inside it rather than replacing
 # it, and the pod would then load whatever conf the image carried.
 POD_SRC_PRIVATE_DIR="${POD_SRC_PRIVATE_REPO##*/}"
-# Sibling of the engine checkout, so the publish work tree is never part of it.
-POD_PRIVATE_CHECKOUT="../$POD_SRC_PRIVATE_DIR"
 
 main() {
     deploy_start "Starting remote sync and deploy"
@@ -102,38 +98,21 @@ main() {
 
     # Follows the manifest step: the client renders from the conf.ssr.json that build-manifest
     # writes, so a bundle pushed before it would ship the previous SSR views. The uploaded keys
-    # are recorded in engine-private/conf/$DEPLOY_ID/storage.bundle.json, which the pod reads
-    # back through its own conf repository.
+    # are recorded in engine-private/conf/$DEPLOY_ID/storage.bundle.json.
     if [ "$BUNDLE_MODE" = "1" ]; then
         deploy_step "Push $DEPLOY_ID client bundle" \
             sudo -n -- /bin/bash -lc \
             "cd $ENGINE_ROOT && node bin run push-bundle \
               --deploy-id $DEPLOY_ID \
               --split $BUNDLE_SPLIT"
-
-        # push-bundle records the keys in the host's own conf checkout, but the pod replaces
-        # ./engine-private with a clone of its conf repository — so the manifest is published
-        # there too, or the pod reads an empty one and restores nothing. Cloning from the engine
-        # root keeps `underpost clone` reading this checkout's credentials, and the work tree is
-        # then moved out so it is never part of the engine checkout.
-        deploy_step "Stage $DEPLOY_ID bundle manifest" \
-            sudo -n -- /bin/bash -lc \
-            "cd $ENGINE_ROOT && rm -rf $POD_PRIVATE_CHECKOUT \
-              && node bin clone $POD_SRC_PRIVATE_REPO \
-              && mv ./$POD_SRC_PRIVATE_DIR $POD_PRIVATE_CHECKOUT \
-              && mkdir -p $POD_PRIVATE_CHECKOUT/conf/$DEPLOY_ID \
-              && cp ./engine-private/$BUNDLE_MANIFEST_PATH $POD_PRIVATE_CHECKOUT/$BUNDLE_MANIFEST_PATH"
-
-        # A rerun that uploads the same keys leaves the manifest byte-identical, and committing
-        # nothing fails the step.
-        if [ "$(has_changes $POD_PRIVATE_CHECKOUT "$ENGINE_ROOT")" = "1" ]; then
-            deploy_step "Publish $DEPLOY_ID bundle manifest" \
-                sudo -n -- /bin/bash -lc \
-                "cd $ENGINE_ROOT && node bin cmt $POD_PRIVATE_CHECKOUT feat 'Update $DEPLOY_ID bundle manifest' \
-                  && node bin push $POD_PRIVATE_CHECKOUT $POD_SRC_PRIVATE_REPO"
-        fi
     fi
 
+    # The pod replaces ./engine-private with a clone of its conf repository, so this publishes
+    # the deploy's conf there — the bundle manifest included — before the pod starts.
+    deploy_step "Build $DEPLOY_ID configuration" \
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
+
     # Two commands, one bootstrap: `pod_bootstrap_cmd` replaces the image's engine with this
     # deploy's source and repoints the global bin at it — without that, the first step needing
     # the current CLI answered `unknown command 'app'`. `start --build` then owns the rest

package/deploy/lib/config.sh

@@ -26,4 +26,4 @@ DEPLOY_SSH_KEY_PATH="${DEPLOY_SSH_KEY_PATH:-/home/dd/tmp/897as9dxhaskd9}"
 
 # The published image the WordPress deploys run. Pinned rather than derived from the checkout's
 # version: a tag is only deployable once the release workflow has published it.
-DEPLOY_WP_IMAGE="${DEPLOY_WP_IMAGE:-underpost/wp:v3.3.76}"
+DEPLOY_WP_IMAGE="${DEPLOY_WP_IMAGE:-underpost/wp:v3.4.0}"

package/deploy/lib/github-actions-logging.sh

@@ -537,8 +537,9 @@ run_quiet() {
 
     # stderr is duplicated: on its own for the native error and stack trace, and
     # into the merged stream so both the debug log and the filter see it in
-    # chronological order with stdout.
-    tee -a "$error_log" <"$fifo_dir/stderr" >"$fifo_dir/merged" &
+    # chronological order with stdout. tee opens the merged writer first: if a short command
+    # closes the stream before it, awk reads EOF and tee blocks until the drain kills it.
+    tee -a "$error_log" >"$fifo_dir/merged" <"$fifo_dir/stderr" &
     stderr_pid=$!
 
     "$@" >"$fifo_dir/merged" 2>"$fifo_dir/stderr" || status=$?

package/deploy/lib/host.sh

@@ -176,7 +176,7 @@ has_changes() {
 pod_bootstrap_cmd() {
     local deploy_id="$1"
     local env="${2:-production}"
-    local repo="${3:-underpostnet/engine-test-${deploy_id#dd-}}"
+    local repo="${3:-underpostnet/engine-${deploy_id#dd-}}"
     local name="${repo##*/}"
 
     printf '%s' "cd /home/dd, \

package/deploy/pwa-microservices-template/deploy.sh

@@ -11,6 +11,12 @@ REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
 DEPLOY_ID=dd-github-pages
 
+# `bin new --default-conf --conf-workflow-id $DEPLOY_ID` (src/cli/repository.js) keys the
+# generated conf off this same variable, defaulting to underpostnet when unset — kept in step so
+# a checkout under any GitHub owner (underpost, underpostnet, ...) builds and uploads its own
+# `<owner>.github.io` pages instead of always the default owner's.
+GITHUB_PAGES_HOST="${GITHUB_USERNAME:-underpostnet}.github.io"
+
 main() {
     deploy_start "Starting github pages deploy"
 
@@ -41,7 +47,7 @@ main() {
         node bin app load --env production --args deploy-id=$DEPLOY_ID
 
     deploy_step "Build $DEPLOY_ID client" \
-        env NODE_ENV=production node bin client $DEPLOY_ID '' underpostnet.github.io /pwa-microservices-template-ghpkg
+        env NODE_ENV=production node bin client $DEPLOY_ID '' $GITHUB_PAGES_HOST /pwa-microservices-template-ghpkg
 }
 
 main "$@"

package/deployment.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: dd-cyberia-development-blue
-          image: underpost/underpost-engine:v3.3.76
+          image: underpost/underpost-engine:v3.4.0
           imagePullPolicy: IfNotPresent
           envFrom:
             - secretRef:

package/docker-compose.yml

@@ -135,7 +135,7 @@ services:
   # server starts but rejects connections until seeded). Serves REST/WS on 4005
   # and the engine gRPC data service on 50051.
   engine-cyberia-runtime:
-    image: ${ENGINE_CYBERIA_IMAGE:-underpost/engine-cyberia-dev}:${ENGINE_CYBERIA_TAG:-v3.3.76}
+    image: ${ENGINE_CYBERIA_IMAGE:-underpost/engine-cyberia-dev}:${ENGINE_CYBERIA_TAG:-v3.4.0}
     container_name: dd-cyberia-engine
     command:
       - /bin/sh
@@ -190,7 +190,7 @@ services:
   # gateway on host port 8081, so one port can route every instance path.
 
   cyberia-server-runtime:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.76}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.4.0}
     container_name: dd-cyberia-server
     environment:
       INSTANCE_CODE: amethyst-strata-expansion
@@ -228,7 +228,7 @@ services:
     restart: unless-stopped
 
   cyberia-server-forest:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.76}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.4.0}
     container_name: dd-cyberia-server-forest
     environment:
       INSTANCE_CODE: FOREST
@@ -266,7 +266,7 @@ services:
     restart: unless-stopped
 
   cyberia-server-test:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.76}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.4.0}
     container_name: dd-cyberia-server-test
     environment:
       INSTANCE_CODE: TEST
@@ -315,7 +315,7 @@ services:
   #   cyberia-server-test   -> cyberia-client-test
 
   cyberia-client-runtime:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.76}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.4.0}
     container_name: dd-cyberia-client
     environment:
       CYBERIA_PORT: '8081'
@@ -340,7 +340,7 @@ services:
     restart: unless-stopped
 
   cyberia-client-forest:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.76}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.4.0}
     container_name: dd-cyberia-client-forest
     environment:
       CYBERIA_PORT: '8081'
@@ -365,7 +365,7 @@ services:
     restart: unless-stopped
 
   cyberia-client-test:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.76}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.4.0}
     container_name: dd-cyberia-client-test
     environment:
       CYBERIA_PORT: '8081'