chore: P1 - stage.dzcode.io to new more powerful VPS

.github/workflows/cd.deploy.stg.yml

@@ -13,15 +13,13 @@ jobs:
       node-version: "20"
       os: "ubuntu-latest"
 
-  bundle-deploy:
+  deploy-api:
     needs: build
     runs-on: ubuntu-latest
     env:
       CI: true
       STAGE: staging
       SSH_ADDRESS_STG: ${{ secrets.SSH_ADDRESS_STG }}
-      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
       DEPLOY_VERSION: ${{ github.ref_type == 'tag' && github.ref_name || format('stg-0.0.0-{0}-{1}-{2}', github.ref_name, github.run_number, github.run_attempt) }}
 
     steps:
@@ -42,24 +40,73 @@ jobs:
         with:
           key: ${{ secrets.SSH_KEY }}
           known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-      - name: "Bundle info"
+      - name: "Generate Bundle info"
         run: npm run generate:bundle-info $DEPLOY_VERSION stage
-      - name: "Bundle ./web"
-        run: npx lerna run bundle:alone --scope @dzcode.io/web
       - name: "Sentry Release"
-        run: npm run generate:sentry-release $DEPLOY_VERSION stage ${{ secrets.SENTRY_AUTH_TOKEN }}
-      - name: "Pre-deploy"
-        run: npm run pre-deploy
+        # todo-zm: remove sentry entirely
+        run: cd ./api && npm run generate:sentry-release $DEPLOY_VERSION stage ${{ secrets.SENTRY_AUTH_TOKEN }}
       - name: "Deploy"
-        run: npm run deploy:stg
+        run: cd ./api && npm run deploy:stg
 
-  lighthouse:
-    needs: bundle-deploy
-    uses: ./.github/workflows/ci.reusable.lighthouse.yml
-    with:
-      serverBaseUrl: "https://lh-stage.dzcode.io"
-      testBaseUrl: "https://stage.dzcode.io"
-      stage: "staging"
-    secrets:
-      LH_SERVER_TOKEN_STG: ${{ secrets.LH_SERVER_TOKEN_STG }}
-      LH_SERVER_TOKEN_PRD: ${{ secrets.LH_SERVER_TOKEN_PRD }}
+  deploy-web-server:
+    needs: build
+    runs-on: ubuntu-latest
+    env:
+      CI: true
+      STAGE: staging
+      DEPLOY_VERSION: ${{ github.ref_type == 'tag' && github.ref_name || format('stg-0.0.0-{0}-{1}-{2}', github.ref_name, github.run_number, github.run_attempt) }}
+
+    steps:
+      - name: "Git"
+        uses: actions/checkout@v4
+      - name: "Nodejs"
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+      - run: npm ci
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: build output (ubuntu-latest, 20)
+
+      - name: "Generate Bundle info"
+        run: npm run generate:bundle-info $DEPLOY_VERSION stage
+
+      - name: "Sentry Release"
+        # todo-zm: remove sentry entirely
+        run: cd ./web && npm run generate:sentry-release $DEPLOY_VERSION stage ${{ secrets.SENTRY_AUTH_TOKEN }}
+
+      - name: "Bundle ./web for deployment"
+        run: |
+          cd ./web
+          npm run bundle
+          npm run pre-deploy
+
+      - name: "Write ./web-server deps into Dockerfile..."
+        run: |
+          cd ./web-server
+          npm run prepare-dockerfile
+
+      - name: Build docker image
+        run: |
+          docker buildx build -f web-server.Dockerfile . -t ghcr.io/dzcode-io/stage-dot-dzcode-dot-io-server:latest
+        env:
+          DOCKER_BUILDKIT: 1
+
+      - name: Push docker image
+        run: |
+          echo $CR_PAT | docker login ghcr.io -u dzcode-io --password-stdin
+          docker push ghcr.io/dzcode-io/stage-dot-dzcode-dot-io-server:latest
+        env:
+          CR_PAT: ${{ secrets.CR_PAT }}
+
+      - name: install zcluster
+        run: |
+          curl -fsSL https://infra.zak-man.com/install.sh | sh
+          echo "/home/runner/.zcluster/bin" >> $GITHUB_PATH
+
+      - name: Deploy to zcluster
+        run: zcluster deploy -p stage-dzcode ./docker-compose.stage.yml
+        env:
+          ADMIN_AUTH_TOKEN: ${{ secrets.ADMIN_AUTH_TOKEN }}

.github/workflows/cd.deploy.yml

@@ -19,8 +19,6 @@ jobs:
       CI: true
       STAGE: production
       SSH_ADDRESS_PRD: ${{ secrets.SSH_ADDRESS_PRD }}
-      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
       DEPLOY_VERSION: ${{ github.ref_type == 'tag' && github.ref_name || format('0.0.0-{0}-{1}-{2}', github.ref_name, github.run_number, github.run_attempt) }}
 
     steps:

.github/workflows/ci.reusable.misc.yml

@@ -27,4 +27,3 @@ jobs:
       - run: npx lerna run bundle:alone --scope "@dzcode.io/web"
       - run: npx lerna run generate:sitemap --scope "@dzcode.io/web"
       - run: npx lerna run generate:htmls --scope "@dzcode.io/web"
-      - run: npm run --prefix web/cloudflare ts:check

.gitignore

@@ -28,11 +28,10 @@ build
 src/_e2e-test/downloads
 src/_e2e-test/videos
 src/_e2e-test/screenshots
-cloudflare/public/*
-**/cloudflare/public/*
 **.lighthouseci
-.wrangler
-**/cloudflare/wrangler.toml
+
+# web server
+web-server/nodemon.json
 
 # data
 data/nodemon.json

api/src/digest/cron.ts

@@ -19,6 +19,7 @@ import { AIResponseTranslateNameDto, AIResponseTranslateTitleDto } from "./dto";
 import { DataProjectEntity } from "src/data/types";
 import { RepositoryEntity } from "@dzcode.io/models/dist/repository";
 import { BitbucketService } from "src/bitbucket/service";
+import { ConfigService } from "src/config/service";
 
 type RepoInfo = Pick<RepositoryEntity, "id" | "name" | "owner" | "provider" | "stars">;
 interface RepoContributor {
@@ -56,6 +57,7 @@ export class DigestCron {
     private readonly tagRepository: TagRepository,
     private readonly aiService: AIService,
     private readonly bitbucketService: BitbucketService,
+    private readonly configService: ConfigService,
   ) {
     const SentryCronJob = cron.instrumentCron(CronJob, "DigestCron");
     new SentryCronJob(
@@ -98,14 +100,14 @@ export class DigestCron {
     const runId = Math.random().toString(36).slice(2);
     this.logger.info({ message: `Digest cron started, runId: ${runId}` });
 
-    const projectsFromDataFolder = await this.dataService.listProjects();
-    // todo-ZM: make this configurable
-    // uncomment during development
-    // const projectsFromDataFolder = (await this.dataService.listProjects()).filter((p) =>
-    //   ["Open-listings", "dzcode.io website", "Mishkal", "System Monitor"].includes(p.name),
-    // );
-    // or uncomment to skip the cron
-    // if (Math.random()) return;
+    let projectsFromDataFolder = await this.dataService.listProjects();
+
+    if (this.configService.env().NODE_ENV === "development") {
+      this.logger.info({ message: `Running in development mode, filtering projects` });
+      projectsFromDataFolder = projectsFromDataFolder.filter((p) =>
+        ["Open-listings", "dzcode.io website", "Mishkal", "System Monitor"].includes(p.name),
+      );
+    }
 
     const projectTitleSystemPrompt = `user will give you an open-source project name, and you will translate it to Arabic.
 it may contain non-translatable parts like acronyms, keep them as is.`;

data/package.json

@@ -3,9 +3,9 @@
   "description": "data.dzcode.io code",
   "version": "6.1.0",
   "author": {
-    "email": "contact@zakiii.com",
+    "email": "zakman.dev@gmail.com",
     "name": "Zakaria Mansouri",
-    "url": "https://www.zakiii.com"
+    "url": "https://zak-man.com"
   },
   "dependencies": {
     "fs-extra": "^11.2.0",

docker-compose.stage.yml

@@ -0,0 +1,15 @@
+services:
+  web:
+    image: ghcr.io/dzcode-io/stage-dot-dzcode-dot-io-server:latest
+    pull_policy: always
+    restart: unless-stopped
+    environment:
+      - VIRTUAL_HOST=stage.dzcode.io
+      - LETSENCRYPT_HOST=stage.dzcode.io
+      - STAGE=staging
+    networks:
+      - main-infra-network
+
+networks:
+  main-infra-network:
+    external: true