@giteeteam/apps-cli 0.1.18-alpha.0 → 0.2.1

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
+require('dotenv/config');
 var commander = require('commander');
 var appsBundler = require('@giteeteam/apps-bundler');
 var fse = require('fs-extra');
@@ -30,7 +31,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.1.18-alpha.0";
+var version = "0.2.1";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -379,26 +380,34 @@ var create = async (packageName) => {
     });
 };
 
-const containerName = 'cli-dev-apps-runtime-server';
 class DockerService {
     constructor(imageName) {
         this.imageName = imageName;
     }
     async downloadImage() {
         await this.execPromise(`docker pull ${this.imageName}`);
+        console.log(`Download image(${this.imageName}) success`);
     }
-    async runContainer() {
-        const command = `docker run -d -p 8455:8455 -e PORT=8455 --name ${containerName} ${this.imageName}`;
+    async runContainer({ port, env, name, volume = [] }) {
+        // 先删掉容器
+        await this.removeContainer(name);
+        const envStr = Object.keys(env)
+            .map(k => `-e ${k}=${env[k]}`)
+            .join(' ');
+        const volumeStr = volume === null || volume === void 0 ? void 0 : volume.map(v => `-v ${v}`).join(' ');
+        const command = `docker run -d -p ${port}:${port} ${envStr} ${volumeStr} --name ${name} ${this.imageName}`;
         await this.execPromise(command);
     }
-    async removeContainer() {
+    async removeContainer(containerName) {
         await this.execPromise(`docker rm -f ${containerName}`);
     }
     execPromise(cmd) {
-        return new Promise(resolve => {
+        return new Promise((resolve, reject) => {
             child_process__default["default"].exec(cmd, (err, stdout, stderr) => {
+                if (err) {
+                    return reject(err);
+                }
                 resolve({
-                    err: err,
                     stdout: stdout,
                     stderr: stderr,
                 });
@@ -412,9 +421,17 @@ const watchFiles = async (options) => {
     const manifest = await getManifest();
     const functionFiles = manifest.getFunctionFiles();
     for (const fileName of functionFiles) {
-        const filePath = path__default["default"].join(inputDir, fileName);
+        appsBundler.bundle({
+            inputDir,
+            outputDir,
+            fileName,
+            mode: appsBundler.MODE.DEV,
+        });
+        const filePath = path__default["default"].join(inputDir, `${fileName}.ts`);
+        console.log(`watch file path: ${filePath}`);
         const watcher = chokidar__default["default"].watch(filePath);
         watcher.on('change', () => {
+            console.log(`File ${filePath} has been changed`);
             appsBundler.bundle({
                 inputDir,
                 outputDir,
@@ -425,25 +442,53 @@ const watchFiles = async (options) => {
     }
 };
 
+var _a$1;
+const containerPort = Number((_a$1 = process.env.CONTAINER_PORT) !== null && _a$1 !== void 0 ? _a$1 : 8455);
+const containerName = 'cli-dev-apps-runtime-server';
+const copyManifest = async (pluginDir) => {
+    const manifestFile = path__default["default"].resolve('./manifest.yml');
+    const targetFile = path__default["default"].join(pluginDir, 'manifest.yml');
+    await fse__default["default"].copy(manifestFile, targetFile);
+};
 var run = async (options) => {
     const { imageName, inputDir, outputDir } = options;
     const dockerService = new DockerService(imageName);
+    const pluginDir = path__default["default"].join(outputDir, '_test/production/1.0/server-side');
     await dockerService.downloadImage();
-    await dockerService.runContainer();
-    process.on('SIGINT', () => {
-        console.log('process,SIGINT');
-        dockerService.removeContainer();
+    await dockerService.runContainer({
+        port: containerPort,
+        env: {
+            PORT: containerPort,
+            APPS_DIR: '/usr/src/app/apps',
+            LRU_TTL: 0,
+            DEBUG: 'runtime*',
+            PARSE_PUBLIC_SERVER_URL: process.env.PARSE_PUBLIC_SERVER_URL,
+            PARSE_SERVER_MASTER_KEY: process.env.PARSE_SERVER_MASTER_KEY,
+            PROXIMA_CORE_URL: process.env.PROXIMA_CORE_URL,
+            PGSQL_CLIENT_HOST: process.env.PGSQL_CLIENT_HOST,
+            PGSQL_CLIENT_PORT: process.env.PGSQL_CLIENT_PORT,
+            PGSQL_CLIENT_USER: process.env.PGSQL_CLIENT_USER,
+            PGSQL_CLIENT_PASSWORD: process.env.PGSQL_CLIENT_PASSWORD,
+        },
+        volume: [`${outputDir}:/usr/src/app/apps`],
+        name: containerName,
+    });
+    process.on('SIGINT', async () => {
+        await dockerService.removeContainer(containerName);
+        await fse__default["default"].remove(outputDir);
         process.exit();
     });
-    await watchFiles({ inputDir, outputDir });
+    await copyManifest(pluginDir);
+    await watchFiles({ inputDir, outputDir: pluginDir });
 };
 
+var _a;
 const image = {
     repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
-    tag: '2.5.0-alpha-41',
+    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : '2.5.0-alpha-41',
 };
 var dev = async (options) => {
-    const { input = 'src', output = 'dist' } = options;
+    const { input = 'src', output = 'cache' } = options;
     await run({
         imageName: `${image.repository}:${image.tag}`,
         outputDir: path__default["default"].resolve(output),
@@ -462,5 +507,9 @@ program
     .option('-o --output [dir]', 'output dir')
     .action(build);
 program.command('create [name]').action(create);
-program.command('dev').option('-i --input [dir]', 'input dir').option('-o --output [dir]', 'output dir').action(dev);
+program
+    .command('dev')
+    .option('-i --input [dir]', 'input dir')
+    .option('-o --output [dir]', 'output dir,default cache')
+    .action(dev);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.1.18-alpha.0",
+  "version": "0.2.1",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -44,6 +44,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "commander": "^9.3.0",
+    "dotenv": "^16.0.2",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
     "inquirer": "^8.2.4",
@@ -58,5 +59,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "0b6fe536c2487a1f43e9d373bd2dc2f800c8ae92"
+  "gitHead": "668caac9b1c7f4a82beb57b615ef827a84912823"
 }