@giteeteam/apps-cli 0.2.0 → 0.2.2

package/dist/index.js

@@ -31,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.2.0";
+var version = "0.2.2";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -169,7 +169,7 @@ class Manifest {
 }
 
 const getManifest = async () => {
-    const manifestFile = path__default["default"].resolve('./manifest.yml');
+    const manifestFile = path__default["default"].resolve('manifest.yml');
     const strBuffer = await fse__default["default"].readFile(manifestFile);
     return new Manifest(strBuffer.toString());
 };
@@ -389,6 +389,8 @@ class DockerService {
         console.log(`Download image(${this.imageName}) success`);
     }
     async runContainer({ port, env, name, volume = [] }) {
+        // 先删掉容器
+        await this.removeContainer(name);
         const envStr = Object.keys(env)
             .map(k => `-e ${k}=${env[k]}`)
             .join(' ');
@@ -400,10 +402,12 @@ class DockerService {
         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,
                 });
@@ -438,55 +442,57 @@ const watchFiles = async (options) => {
     }
 };
 
-var _a$1;
-const containerPort = Number((_a$1 = process.env.CONTAINER_PORT) !== null && _a$1 !== void 0 ? _a$1 : 8455);
+var _a, _b;
+const image = {
+    repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
+    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : '2.5.0-alpha-41',
+};
+const containerPort = Number((_b = process.env.CONTAINER_PORT) !== null && _b !== void 0 ? _b : 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');
+const tempAppDir = 'app/production/1.0/server-side';
+const containerEnv = {
+    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,
+};
+const copyManifest = async (appDir) => {
+    const manifestFile = path__default["default"].resolve('manifest.yml');
+    const targetFile = path__default["default"].join(appDir, 'manifest.yml');
     await fse__default["default"].copy(manifestFile, targetFile);
 };
 var run = async (options) => {
-    const { imageName, inputDir, outputDir } = options;
+    const { inputDir, outputDir } = options;
+    await fse__default["default"].emptyDir(outputDir);
+    const imageName = `${image.repository}:${image.tag}`;
+    const appDir = path__default["default"].join(outputDir, tempAppDir);
     const dockerService = new DockerService(imageName);
-    const pluginDir = path__default["default"].join(outputDir, '_test/production/1.0/server-side');
     await dockerService.downloadImage();
     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,
-        },
+        env: containerEnv,
         volume: [`${outputDir}:/usr/src/app/apps`],
         name: containerName,
     });
-    process.on('SIGINT', () => {
-        console.log('process,SIGINT');
-        dockerService.removeContainer(containerName);
+    process.on('SIGINT', async () => {
+        await dockerService.removeContainer(containerName);
+        await fse__default["default"].remove(outputDir);
         process.exit();
     });
-    await copyManifest(pluginDir);
-    await watchFiles({ inputDir, outputDir: pluginDir });
+    await copyManifest(appDir);
+    await watchFiles({ inputDir, outputDir: appDir });
 };
 
-var _a;
-const image = {
-    repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
-    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : '2.5.0-alpha-41',
-};
 var dev = async (options) => {
     const { input = 'src', output = 'cache' } = options;
     await run({
-        imageName: `${image.repository}:${image.tag}`,
         outputDir: path__default["default"].resolve(output),
         inputDir: path__default["default"].resolve(input),
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -59,5 +59,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "11be8747537fcd607f97a80f5f3e07a592e85b14"
+  "gitHead": "21e371df9bb6e4b94ccd508f17db93f5055a0b3d"
 }