@lakutata/cli 1.0.13 → 1.0.17

package/build/Deploy.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/build/Deploy.js

@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+"use strict";
+(async () => {
+    const path = require('path');
+    const inquirer = require('inquirer');
+    const shelljs = require('shelljs');
+    const moment = require('moment-timezone');
+    const packageJson = require(path.resolve(process.cwd(), './package.json'));
+    const argvLen = process.argv.length;
+    const REGISTRY_ADDR = process.argv[argvLen - 1];
+    const DOCKERFILE_PATH = process.argv[argvLen - 2];
+    const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname;
+    if (!REGISTRY_ADDR)
+        throw new Error('未配置仓库地址');
+    const TIMESTAMP = Date.now();
+    const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`;
+    const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`;
+    const execPromise = (command, options) => {
+        return new Promise((resolve, reject) => {
+            shelljs.exec(command, options, (code, stdout, stderr) => {
+                code && stderr ? reject(stderr) : resolve(stdout);
+            });
+        });
+    };
+    const account = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'username',
+            message: 'Docker仓库账号'
+        },
+        {
+            type: 'password',
+            name: 'password',
+            message: 'Docker仓库密码',
+            mask: '*'
+        }
+    ]);
+    const settings = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'platform',
+            message: '目标构建平台架构',
+            choices: [
+                'linux/amd64',
+                'linux/arm64',
+                'linux/riscv64',
+                'linux/ppc64le',
+                'linux/s390x',
+                'linux/386',
+                'linux/arm/v7',
+                'linux/arm/v6'
+            ]
+        },
+        {
+            type: 'confirm',
+            name: 'tagLatest',
+            message: '是否为镜像打上latest标签',
+            default: false
+        }
+    ]);
+    const tagLatest = settings.tagLatest;
+    try {
+        await execPromise(`docker login --username=${account.username} ${REPOSITORY_ADDR} -p${account.password}`);
+        shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${settings.platform} .`);
+        shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`);
+        if (tagLatest) {
+            shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`);
+        }
+        shelljs.exec(`docker push ${REGISTRY_ADDR}:${IMAGE_VERSION}`);
+        if (tagLatest) {
+            shelljs.exec(`docker push ${REGISTRY_ADDR}:latest`);
+        }
+        shelljs.exec(`docker rmi -f ${REGISTRY_ADDR}:${IMAGE_VERSION}`);
+        if (tagLatest) {
+            shelljs.exec(`docker rmi -f ${REGISTRY_ADDR}:latest`);
+        }
+        shelljs.exec(`docker rmi -f ${IMAGE_BASE_NAME}:${IMAGE_VERSION}`);
+    }
+    catch (e) {
+        console.error(e.message);
+    }
+})();
+//# sourceMappingURL=Deploy.js.map

package/build/Deploy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":"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"}

package/build/lib/manipulators/CreateDockerFileManipulator.js

@@ -7,9 +7,10 @@ exports.CreateDockerFileManipulator = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-function generateDockerfileContent(timezone, envName, outDir, entryPoint) {
+const inquirer_1 = __importDefault(require("inquirer"));
+function generateDockerfileContent(timezone, envName, outDir, runtime, entryPoint) {
     const dockerFileContents = [
-        'FROM node:14-buster-slim',
+        'FROM node:lts-buster-slim',
         '#Set docker timezone',
         `ENV TZ=${timezone}`,
         `ENV NODE_ENV=${envName}`,
@@ -27,42 +28,82 @@ function generateDockerfileContent(timezone, envName, outDir, entryPoint) {
         'RUN npm install --build-from-source',
         'RUN tsc',
         '#Expose ports',
-        '#Todo export ports or remove this line',
-        `ENTRYPOINT node ${path_1.default.resolve('/app/', entryPoint)}`
+        '#TODO export ports or remove this line',
+        `ENTRYPOINT ${runtime} ${path_1.default.resolve('/app/', entryPoint)}`
     ];
     let content = '';
     dockerFileContents.forEach(line => {
-        content = `${line}\n`;
+        if (!content) {
+            content = line;
+        }
+        else {
+            content = `${content}\n${line}`;
+        }
     });
     return content;
 }
 async function CreateDockerFileManipulator(projectPath, tsConfigFilePath, directories) {
     var _a, _b;
     try {
+        const repositories = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'production',
+                message: '请输入正式环境仓库地址'
+            },
+            {
+                type: 'input',
+                name: 'development',
+                message: '请输入测试环境仓库地址'
+            }
+        ]);
+        const productionRepository = repositories.production ? repositories.production : '';
+        const developmentRepository = repositories.development ? repositories.development : '';
         const timezone = moment_timezone_1.default.tz.guess();
         const tsConfigJson = JSON.parse(fs_1.default.readFileSync(tsConfigFilePath).toString());
         const outDir = (_a = tsConfigJson === null || tsConfigJson === void 0 ? void 0 : tsConfigJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.outDir;
         if (!outDir)
             return console.error('项目输出目录设置有误');
-        const packageJson = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(projectPath, './package.json')).toString());
+        const packageJsonFilePath = path_1.default.resolve(projectPath, './package.json');
+        const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFilePath).toString());
         const mainEntry = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.main) ? packageJson.main : '';
         if (!mainEntry)
             return console.error('应用程序主入口设置有误');
         const dockerfiles = {};
-        dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, mainEntry);
-        if ((_b = packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) === null || _b === void 0 ? void 0 : _b.test) {
+        if (productionRepository) {
+            dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, 'node', mainEntry);
+            packageJson.scripts.deploy = `lakutata-deploy ./Dockerfile ${productionRepository}`;
+        }
+        if (((_b = packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) === null || _b === void 0 ? void 0 : _b.test) && developmentRepository) {
             const testScriptString = packageJson.scripts.test;
             const testScriptParams = testScriptString.split(' ').reverse();
             let testEntryPoint = '';
+            let runtime = '';
             for (const testScriptParam of testScriptParams) {
                 const regExp = /src\//;
                 if (['.ts', '.js'].includes(path_1.default.extname(testScriptParam)) && regExp.test(testScriptParam)) {
-                    testEntryPoint = testScriptParam.replace('src/', `${outDir}/`);
+                    switch (path_1.default.extname(testScriptParam)) {
+                        case '.ts':
+                            {
+                                runtime = 'ts-node';
+                            }
+                            break;
+                        case '.js':
+                            {
+                                runtime = 'node';
+                            }
+                            break;
+                        default: {
+                            console.error('不正确的测试主入口扩展名');
+                        }
+                    }
+                    testEntryPoint = testScriptParam;
                     break;
                 }
             }
-            if (testEntryPoint) {
-                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, testEntryPoint);
+            if (testEntryPoint && runtime) {
+                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, runtime, testEntryPoint);
+                packageJson.scripts['deploy:dev'] = `lakutata-deploy ./DockerfileDev ${developmentRepository}`;
             }
         }
         for (const dockerfileName of Object.keys(dockerfiles)) {
@@ -72,6 +113,7 @@ async function CreateDockerFileManipulator(projectPath, tsConfigFilePath, direct
             });
             console.info(dockerfileName, '写入成功');
         }
+        fs_1.default.writeFileSync(packageJsonFilePath, JSON.stringify(packageJson, null, ' '), { encoding: 'utf-8', flag: 'w' });
         console.info('Dockerfile已创建成功');
     }
     catch (e) {

package/build/lib/manipulators/CreateDockerFileManipulator.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateDockerFileManipulator.js","sourceRoot":"","sources":["../../../src/lib/manipulators/CreateDockerFileManipulator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CreateDockerFileManipulator.js","sourceRoot":"","sources":["../../../src/lib/manipulators/CreateDockerFileManipulator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@lakutata/cli",
-  "version": "1.0.13",
+  "version": "1.0.17",
   "description": "Lakutata CLI Tool",
   "main": "./build/CLI.js",
   "types": "./build/CLI.d.ts",
   "bin": {
-    "lakutata": "./build/CLI.js"
+    "lakutata": "./build/CLI.js",
+    "lakutata-deploy": "./build/Deploy.js"
   },
   "scripts": {
     "clean": "shx rm -rf ./build",

package/src/Deploy.ts

@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+(async () => {
+    const path = require('path')
+    const inquirer = require('inquirer')
+    const shelljs = require('shelljs')
+    const moment = require('moment-timezone')
+    const packageJson = require(path.resolve(process.cwd(), './package.json'))
+    const argvLen = process.argv.length
+    const REGISTRY_ADDR = process.argv[argvLen - 1]
+    const DOCKERFILE_PATH = process.argv[argvLen - 2]
+    const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname
+    if (!REGISTRY_ADDR) throw new Error('未配置仓库地址')
+    const TIMESTAMP = Date.now()
+    const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`
+    const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`
+    const execPromise = (command, options?) => {
+        return new Promise((resolve, reject) => {
+            shelljs.exec(command, options, (code, stdout, stderr) => {
+                code && stderr ? reject(stderr) : resolve(stdout)
+            })
+        })
+    }
+    const account = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'username',
+            message: 'Docker仓库账号'
+        },
+        {
+            type: 'password',
+            name: 'password',
+            message: 'Docker仓库密码',
+            mask: '*'
+        }
+    ])
+    const settings = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'platform',
+            message: '目标构建平台架构',
+            choices: [
+                'linux/amd64',
+                'linux/arm64',
+                'linux/riscv64',
+                'linux/ppc64le',
+                'linux/s390x',
+                'linux/386',
+                'linux/arm/v7',
+                'linux/arm/v6'
+            ]
+        },
+        {
+            type: 'confirm',
+            name: 'tagLatest',
+            message: '是否为镜像打上latest标签',
+            default: false
+        }
+    ])
+    const tagLatest: boolean = settings.tagLatest
+    try {
+        await execPromise(`docker login --username=${account.username} ${REPOSITORY_ADDR} -p${account.password}`)
+        shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${settings.platform} .`)
+        shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
+        if (tagLatest) {
+            shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`)
+        }
+        shelljs.exec(`docker push ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
+        if (tagLatest) {
+            shelljs.exec(`docker push ${REGISTRY_ADDR}:latest`)
+        }
+        shelljs.exec(`docker rmi -f ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
+        if (tagLatest) {
+            shelljs.exec(`docker rmi -f ${REGISTRY_ADDR}:latest`)
+        }
+        shelljs.exec(`docker rmi -f ${IMAGE_BASE_NAME}:${IMAGE_VERSION}`)
+    } catch (e) {
+        console.error((e as Error).message)
+    }
+})()

package/src/lib/manipulators/CreateDockerFileManipulator.ts

@@ -1,17 +1,19 @@
 import fs from 'fs'
 import path from 'path'
 import moment from 'moment-timezone'
+import inquirer from 'inquirer'
 
 /**
  * 生成Dockerfile文件内容
  * @param timezone
  * @param envName
  * @param outDir
+ * @param runtime
  * @param entryPoint
  */
-function generateDockerfileContent(timezone: string, envName: string, outDir: string, entryPoint: string): string {
+function generateDockerfileContent(timezone: string, envName: string, outDir: string, runtime: string, entryPoint: string): string {
     const dockerFileContents: string[] = [
-        'FROM node:14-buster-slim',
+        'FROM node:lts-buster-slim',
         '#Set docker timezone',
         `ENV TZ=${timezone}`,
         `ENV NODE_ENV=${envName}`,
@@ -29,41 +31,78 @@ function generateDockerfileContent(timezone: string, envName: string, outDir: st
         'RUN npm install --build-from-source',
         'RUN tsc',
         '#Expose ports',
-        '#Todo export ports or remove this line',
-        `ENTRYPOINT node ${path.resolve('/app/', entryPoint)}`
+        '#TODO export ports or remove this line',
+        `ENTRYPOINT ${runtime} ${path.resolve('/app/', entryPoint)}`
     ]
     let content: string = ''
     dockerFileContents.forEach(line => {
-        content = `${line}\n`
+        if (!content) {
+            content = line
+        } else {
+            content = `${content}\n${line}`
+        }
     })
     return content
 }
 
 export async function CreateDockerFileManipulator(projectPath: string, tsConfigFilePath: string, directories: { [name: string]: string }) {
     try {
+        const repositories = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'production',
+                message: '请输入正式环境仓库地址'
+            },
+            {
+                type: 'input',
+                name: 'development',
+                message: '请输入测试环境仓库地址'
+            }
+        ])
+        const productionRepository: string = repositories.production ? repositories.production : ''
+        const developmentRepository: string = repositories.development ? repositories.development : ''
         const timezone = moment.tz.guess()
         const tsConfigJson = JSON.parse(fs.readFileSync(tsConfigFilePath).toString())
         const outDir: string = tsConfigJson?.compilerOptions?.outDir
         if (!outDir) return console.error('项目输出目录设置有误')
-        const packageJson = JSON.parse(fs.readFileSync(path.resolve(projectPath, './package.json')).toString())
+        const packageJsonFilePath: string = path.resolve(projectPath, './package.json')
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath).toString())
         const mainEntry: string = packageJson?.main ? packageJson.main : ''
         if (!mainEntry) return console.error('应用程序主入口设置有误')
         const dockerfiles: { [key: string]: string } = {}
-        dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, mainEntry)
-        if (packageJson?.scripts?.test) {
-            //有测试主入口
+        if (productionRepository) {
+            dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, 'node', mainEntry)
+            packageJson.scripts.deploy = `lakutata-deploy ./Dockerfile ${productionRepository}`
+        }
+        if (packageJson?.scripts?.test && developmentRepository) {
+            //有测试主入口并且仓库地址被正确配置
             const testScriptString: string = packageJson.scripts.test
             const testScriptParams: string[] = testScriptString.split(' ').reverse()
             let testEntryPoint: string = ''
+            let runtime: string = ''
             for (const testScriptParam of testScriptParams) {
                 const regExp = /src\//
                 if (['.ts', '.js'].includes(path.extname(testScriptParam)) && regExp.test(testScriptParam)) {
-                    testEntryPoint = testScriptParam.replace('src/', `${outDir}/`)
+                    switch (path.extname(testScriptParam)) {
+                        case '.ts': {
+                            runtime = 'ts-node'
+                        }
+                            break
+                        case '.js': {
+                            runtime = 'node'
+                        }
+                            break
+                        default: {
+                            console.error('不正确的测试主入口扩展名')
+                        }
+                    }
+                    testEntryPoint = testScriptParam
                     break
                 }
             }
-            if (testEntryPoint) {
-                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, testEntryPoint)
+            if (testEntryPoint && runtime) {
+                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, runtime, testEntryPoint)
+                packageJson.scripts['deploy:dev'] = `lakutata-deploy ./DockerfileDev ${developmentRepository}`
             }
         }
         for (const dockerfileName of Object.keys(dockerfiles)) {
@@ -74,6 +113,7 @@ export async function CreateDockerFileManipulator(projectPath: string, tsConfigF
             })
             console.info(dockerfileName, '写入成功')
         }
+        fs.writeFileSync(packageJsonFilePath, JSON.stringify(packageJson, null, ' '), {encoding: 'utf-8', flag: 'w'})
         console.info('Dockerfile已创建成功')
     } catch (e) {
         console.error(`Dockerfile创建错误: ${(e as Error).message}`)