update project files

Author: icebob

.github/workflows/docker.yml

@@ -1,22 +1,27 @@
 name: Test with Docker
 
-on: [push, pull_request]
+on: 
+  push:
+  pull_request:
+  schedule:
+    - cron: '5 10 * * 3'
+
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
-        # transporter: [NATS, Redis, MQTT, AMQP, AMQP10, STAN, Kafka, TCP]
-        transporter: [NATS, Redis, MQTT, AMQP, STAN, Kafka, TCP]
+        node-version: [20.x, 22.x, 24.x]
+        # transporter: [NATS, Redis, MQTT, AMQP, AMQP10, Kafka, TCP]
+        transporter: [None, NATS, Redis, MQTT, AMQP, Kafka, TCP]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Use Node.js ${{ matrix.node-version }} with ${{ matrix.transporter }} transporter
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -47,14 +52,23 @@ jobs:
       run: sleep 30
 
     - name: Check containers
-      run: docker-compose ps
+      run: docker compose ps
       working-directory: ./ci-test
 
-    - run: curl --silent --show-error --fail http://localhost:3000/api/greeter/hello
-    - run: curl --silent --show-error --fail http://localhost:3000/api/products
+    - name: Check greeter.hello via API
+      run: curl --silent --show-error --fail http://localhost:3000/api/greeter/hello
+
+    - name: Check products.list via API
+      run: curl --silent --show-error --fail http://localhost:3000/api/products
+      if: ${{ matrix.transporter != 'None' }}
+
+    - name: Check greeter.hello via GraphQL
+      run: |
+        curl --silent --show-error --fail -H "Content-Type: application/json" --data '{"query": "query { hello } "}' http://localhost:3000/graphql
+      if: ${{ matrix.transporter != 'None' }}
 
     - name: Check logs
-      run: docker-compose logs
+      run: docker compose logs
       working-directory: ./ci-test
       if: failure()
 

.github/workflows/generate.yml

@@ -1,33 +1,38 @@
 name: Generate a demo project
 
-on:
+on: 
   push:
     branches:
       - master
+      - next
+  schedule:
+    - cron: '0 10 * * 3'
 
 jobs:
   generate:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js 18.x
-      uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+
+    - name: Use Node.js 22.x
+      uses: actions/setup-node@v4
       with:
-        node-version: 18.x
-    
+        node-version: 22.x
+
     - name: Install dependencies
       run: npm i
+
     - name: Generate project
-      run: node_modules/.bin/moleculer init --answers test/demo/answers.json --no-install . project-demo
+      run: node_modules/.bin/moleculer init --answers test/ci/answers.full.json --no-install . project-demo
 
     - name: Initialize Git repo
       run: git init
       working-directory: ./project-demo
 
     - name: Set remote
-      run: git remote add origin https://${{ secrets.GH_TOKEN }}@github.com/moleculerjs/project-typescript-demo.git
+      run: git remote add origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/moleculerjs/project-typescript-demo.git
       working-directory: ./project-demo
 
     - name: Add files
@@ -39,7 +44,7 @@ jobs:
       working-directory: ./project-demo
 
     - name: Commit
-      run: git commit -m "Generated files"
+      run: git commit -m "Generated files (${{ github.sha }})"
       working-directory: ./project-demo
 
     - name: Git push

.github/workflows/kubernetes.yml

@@ -1,23 +1,28 @@
 name: Test with Kubernetes
 
-on: [push, pull_request]
+on: 
+  push:
+  pull_request:
+  schedule:
+    - cron: '10 10 * * 3'
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        transporter: [NATS, Redis, MQTT, AMQP, AMQP10, STAN, Kafka]
+        # transporter: [NATS, Redis, MQTT, AMQP, AMQP10, Kafka]
+        transporter: [None, NATS, Redis, MQTT, AMQP, Kafka]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Use Node.js with ${{ matrix.transporter }} transporter
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 22.x
 
     - name: Install dependencies
       run: npm i
@@ -31,47 +36,62 @@ jobs:
     - name: Generate project with '${{ matrix.transporter }}' transporter
       run: npm test
 
-    - name: Run tests in the generated project
-      run: npm test
-      working-directory: ./ci-test
-
-    - name: Start a local Docker Registry
-      run: docker run -d --restart=always -p 5000:5000 --name registry registry:2
-
     - name: Build Docker image
-      run: docker build -t ci-test:demo .
+      run: docker build -t ci-test .
       working-directory: ./ci-test
 
     - uses: engineerd/[email protected]
       with:
-        version: "v0.17.0"
+        version: "v0.29.0"
         config: ./test/ci/kind-config.yaml
 
     - run: kubectl cluster-info
     - run: kubectl get nodes
-    - run: kubectl get pods -n kube-system
+    - run: kubectl get pods --all-namespaces
 
-    - name: Load Docker image
-      run: kind load docker-image ci-test:demo ci-test:demo
+    - name: Load built image
+      run: kind load docker-image ci-test
 
     - name: Install NGINX Ingress
-      run: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+      run: |
+        kubectl apply -f https://kind.sigs.k8s.io/examples/ingress/deploy-ingress-nginx.yaml
+        kubectl wait --namespace ingress-nginx \
+          --for=condition=ready pod \
+          --selector=app.kubernetes.io/component=controller \
+          --timeout=90s
+
+    - run: cat ./ci-test/k8s.yaml
 
     - name: Kubectl apply
       working-directory: ./ci-test
-      run: |
-        # Fix nginx ingress issue: https://github.com/kubernetes/ingress-nginx/issues/5401#issuecomment-662424306
-        kubectl delete -A ValidatingWebhookConfiguration ingress-nginx-admission
-        sed 's/image: ci-test/image: ci-test:demo/g' k8s.yaml | kubectl apply -f -
+      run: kubectl apply -f k8s.yaml
 
-    - name: Sleeping 120 secs
-      run: sleep 120
+    - name: Wait for deployment
+      run: "kubectl rollout status deployment ${{ matrix.transporter != 'None' && 'greeter' || 'services' }} --timeout=180s"
+
+    - name: Sleeping 90 secs (for Redis, Mongo...etc)
+      run: sleep 90
 
     - name: Check pods
-      run: kubectl get all
+      run: |
+        kubectl get all
+
+    - name: Check greeter.hello via API
+      run: curl --silent --show-error --fail http://ci-test.127.0.0.1.nip.io/api/greeter/hello
+
+    - name: Check products.list via API
+      run: curl --silent --show-error --fail http://ci-test.127.0.0.1.nip.io/api/products
+      if: ${{ matrix.transporter != 'None' }}
+
+    - name: Check greeter.hello via GraphQL
+      run: |
+        curl --silent --show-error --fail -H "Content-Type: application/json" --data '{"query": "query { hello } "}' http://ci-test.127.0.0.1.nip.io/graphql
+      if: ${{ matrix.transporter != 'None' }}
 
-    - run: curl --silent --show-error --fail http://ci-test.127.0.0.1.nip.io/api/greeter/hello
-    - run: curl --silent --show-error --fail http://ci-test.127.0.0.1.nip.io/api/products
+    - name: Check Pod
+      run: kubectl describe pod ${{ matrix.transporter != 'None' && 'greeter' || 'services' }}
+      if: failure()
 
     - name: Check logs
-      run: kubectl logs deployment/products
+      run: kubectl logs deployment/${{ matrix.transporter != 'None' && 'greeter' || 'services' }}
+      if: failure()

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 MoleculerJS
+Copyright (c) 2025 MoleculerJS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,9 +2,11 @@
 :mortar_board: Moleculer-based microservices project template for Typescript project.
 
 ## Features
-- Moleculer v0.14 with full-detailed `moleculer.config.ts` file.
-- Common mono-repo project with a demo `greeter` service.
+- Moleculer v0.15 with full-detailed `moleculer.config.js` file.
+- Common mono-repo project with a `greeter` demo service.
 - Sample database `products` service (with file-based NeDB in development & MongoDB in production).
+- Sample service with Moleculer Channels middleware.
+- Sample service with Moleculer Workflows middleware.
 - Optional API Gateway service with detailed service settings.
 - Beautiful static welcome page to test generated services & watch nodes and services.
 - Optional Transporter & Cacher.
@@ -27,15 +29,17 @@ $ moleculer init project-typescript my-project
 $ moleculer init project-typescript moleculer-demo
 
 Template repo: moleculerjs/moleculer-template-project-typescript
-? Add API Gateway (moleculer-web) service? Yes
+? Add HTTP API Gateway (moleculer-web) service? Yes
+? Add GraphQL Gateway? Yes
+? Add Socket.Io Gateway? Yes
 ? Would you like to communicate with other nodes? Yes
 ? Select a transporter NATS (recommended)
-? Would you like to use cache? Yes
-? Select a cacher solution Memory
+? Would you like to use cache? No
+? Add DB sample service? Yes
+? Add Moleculer-Channels middleware? Yes
+? Select a Channels Redis
 ? Would you like to enable metrics? Yes
-? Select a reporter solution Prometheus
 ? Would you like to enable tracing? Yes
-? Select a exporter solution Console
 ? Add Docker & Kubernetes sample files? Yes
 ? Use ESLint to lint your code? Yes
 Create 'moleculer-demo' folder...
@@ -57,6 +61,6 @@ Create 'moleculer-demo' folder...
 moleculer-template-project-typescript is available under the [MIT license](https://tldrlegal.com/license/mit-license).
 
 ## Contact
-Copyright (c) 2023 MoleculerJS
+Copyright (c) 2025 MoleculerJS
 
 [![@moleculerjs](https://img.shields.io/badge/github-moleculerjs-green.svg)](https://github.com/moleculerjs) [![@MoleculerJS](https://img.shields.io/badge/twitter-MoleculerJS-blue.svg)](https://twitter.com/MoleculerJS)