create-aomex 0.0.67 → 0.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aomex",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",

package/templates/.env

@@ -1 +1 @@
-DATABASE_URL=mysql://my_user:my_pwd@localhost:3306/{{projectName}}
+DATABASE_URL=mysql://root:abcde@localhost:3306/{{projectName}}

package/templates/Dockerfile.integration

@@ -7,9 +7,8 @@ RUN mv .env.integration .env
 ENV TZ=Asia/Shanghai
 ENV PORT=3000
 ENV NODE_ENV=integration
-ENV NODE_OPTIONS='--enable-source-maps --stack-trace-limit=50'
 ENV PATH="$PATH:/codes/node_modules/.bin"
 
 RUN sh scripts/build-in-docker.sh
 
-CMD ["node", "src/web.js"]
+CMD ["node", "--enable-source-maps", "--stack-trace-limit=50", "src/web.js"]

package/templates/Dockerfile.production

@@ -7,9 +7,8 @@ RUN mv .env.production .env
 ENV TZ=Asia/Shanghai
 ENV PORT=3000
 ENV NODE_ENV=production
-ENV NODE_OPTIONS='--enable-source-maps --stack-trace-limit=50'
 ENV PATH="$PATH:/codes/node_modules/.bin"
 
 RUN sh scripts/build-in-docker.sh
 
-CMD ["node", "src/web.js"]
+CMD ["node", "--enable-source-maps", "--stack-trace-limit=50", "src/web.js"]

package/templates/docker-compose.yml

@@ -5,8 +5,6 @@ services:
       MYSQL_ROOT_PASSWORD: 'abcde'
       # 修改后需要同步修改.env里的参数
       MYSQL_DATABASE: '{{projectName}}'
-      MYSQL_USER: 'my_user'
-      MYSQL_PASSWORD: 'my_pwd'
     volumes:
       - ./volumes/mysql:/var/lib/mysql
     ports:
@@ -19,7 +17,7 @@ services:
       timeout: 3s
       retries: 10
   redis:
-    image: redis:8.0-M04
+    image: redis:8.0
     volumes:
       - ./volumes/redis:/data
     ports:

package/templates/src/cli.ts

@@ -19,6 +19,10 @@ const app = new ConsoleApp({
   ],
 });
 
+process.on('uncaughtException', (err) => {
+  logger.error(err.stack!);
+});
+
 app.on('error', (err) => {
   logger.error(err.stack!);
 });

package/templates/src/routers/{hello.router.ts → index.router.ts}

@@ -1,20 +1,17 @@
 import { rule } from '@aomex/common';
-import { query, response, Router } from '@aomex/web';
+import { response, Router } from '@aomex/web';
 
 export const router = new Router();
 
 router.get('/', {
+  docs: { showInOpenapi: false },
   mount: [
-    query({
-      user: rule.string().optional(),
-    }),
     response({
       statusCode: 200,
       content: rule.string(),
     }),
   ],
   action: (ctx) => {
-    const { user = 'World' } = ctx.query;
-    ctx.send(`Hello ${user}`);
+    ctx.send('Hello World');
   },
 });

package/templates/src/web.ts

@@ -8,6 +8,8 @@ import { swagger } from '@middleware/swagger.md';
 import { slowTrace } from '@middleware/slow-trace.md';
 import { httpLogger } from '@middleware/http-logger.md';
 import { logger } from '@services/logger';
+import cluster from 'node:cluster';
+import { cpus } from 'node:os';
 
 export const app = new WebApp({
   language: 'zh_CN',
@@ -24,18 +26,37 @@ export const app = new WebApp({
   ],
 });
 
-app.on('error', (err, ctx) => {
+process.on('uncaughtException', (err) => {
   logger.error(err.stack!);
-  ctx.response.body = {
-    status: ctx.response.statusCode,
-    message: ctx.response.body,
-  };
 });
 
-const port = process.env['PORT'] || 3000;
-app.listen(port, () => {
-  console.log(`服务已启动，点击 http://localhost:${port} 访问`);
-});
+if (cluster.isWorker) {
+  app.on('error', (err, ctx) => {
+    logger.error(err.stack!);
+    ctx.response.body = {
+      status: ctx.response.statusCode,
+      message: ctx.response.body,
+    };
+  });
+  app.listen(process.env['PORT'] || 3000);
+}
+
+if (cluster.isPrimary) {
+  for (let i = cpus().length; i-- > 0; ) {
+    cluster.fork();
+  }
+
+  cluster
+    .on('listening', (worker, address) => {
+      const href = `http://${address.address || 'localhost'}:${address.port}`;
+      logger.info(`Worker ${worker.id} is listening ${href}`);
+    })
+    .on('exit', (worker, code, signal) => {
+      const msg = `Worker ${worker.id} exit with code '${code}' and signal '${signal}'`;
+      logger.error(msg);
+      cluster.fork();
+    });
+}
 
 declare module '@aomex/web' {
   namespace WebApp {

package/templates/tsconfig.json

@@ -1,8 +1,7 @@
 {
   "compilerOptions": {
-    "target": "es2022",
-    "module": "es2022",
-    "lib": ["ESNext"],
+    "target": "esnext",
+    "module": "esnext",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,