zmp-cli 3.6.0 → 3.7.0

package/dist/index.dev.js

@@ -47,7 +47,9 @@ var buildApp = require('./build/index');
 
 var deployApp = require('./deploy/index');
 
-var migrateApp = require('./migrate/index'); // const generateAssets = require('./assets/index');
+var migrateApp = require('./migrate/index');
+
+var os = require('os'); // const generateAssets = require('./assets/index');
 // const server = require('./ui/server');
 
 
@@ -178,7 +180,7 @@ program.usage('<command> [options]').command('login').description('Login ZMP').a
     }
   });
 });
-program.usage('<command> [options]').command('start').option('-P, --port <n>', 'Specify server port. By default it is 3000', parseInt).option('-U, --show-mobile-ui', 'Show Mobile UI').option('-Z, --zalo-app', 'Preview on zalo').option('-D, --dev', 'Development environment').description('Start a ZMP project').action(function _callee3(options) {
+program.usage('<command> [options]').command('start').option('-iosH, --ios-host-name <n>', 'Specify server hostname. By default it is os.hostname').option('-P, --port <n>', 'Specify server port. By default it is 3000', parseInt).option('-Z, --zalo-app', 'Preview on zalo').option('-ios, --ios', 'Run on ios').option('-D, --dev', 'Development environment').description('Start a ZMP project').action(function _callee3(options) {
   var currentProject;
   return regeneratorRuntime.async(function _callee3$(_context3) {
     while (1) {
@@ -204,8 +206,10 @@ program.usage('<command> [options]').command('start').option('-P, --port <n>', '
           return regeneratorRuntime.awrap(startApp({
             cwd: cwd,
             port: options && options.port || 3000,
+            iosHostName: options && options.iosHostName || os.hostname(),
             showMobileUI: options && options.showMobileUi || false,
-            previewOnZalo: options && options.zaloApp || false
+            previewOnZalo: options && options.zaloApp || false,
+            ios: options && options.ios || false
           }, logger));
 
         case 5:

package/index.js

@@ -20,6 +20,7 @@ const startApp = require('./start/index');
 const buildApp = require('./build/index');
 const deployApp = require('./deploy/index');
 const migrateApp = require('./migrate/index');
+const os = require('os');
 // const generateAssets = require('./assets/index');
 // const server = require('./ui/server');
 const pkg = require('./package.json');
@@ -107,13 +108,17 @@ program
 program
   .usage('<command> [options]')
   .command('start')
+  .option(
+    '-iosH, --ios-host-name <n>',
+    'Specify server hostname. By default it is os.hostname'
+  )
   .option(
     '-P, --port <n>',
     'Specify server port. By default it is 3000',
     parseInt
   )
-  .option('-U, --show-mobile-ui', 'Show Mobile UI')
   .option('-Z, --zalo-app', 'Preview on zalo')
+  .option('-ios, --ios', 'Run on ios')
   .option('-D, --dev', 'Development environment')
   .description('Start a ZMP project')
   .action(async (options) => {
@@ -138,8 +143,10 @@ program
       {
         cwd,
         port: (options && options.port) || 3000,
+        iosHostName: (options && options.iosHostName) || os.hostname(),
         showMobileUI: (options && options.showMobileUi) || false,
         previewOnZalo: (options && options.zaloApp) || false,
+        ios: (options && options.ios) || false,
       },
       logger
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmp-cli",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "ZMP command line utility (CLI)",
   "main": "index.js",
   "bin": {

package/start/dist/index.dev.js

@@ -15,6 +15,8 @@ var ora = require('ora');
 
 var path = require('path');
 
+var os = require('os');
+
 var qrcode = require('qrcode-terminal');
 
 var logSymbols = require('log-symbols');
@@ -41,8 +43,9 @@ module.exports = function _callee() {
       errorExit,
       cwd,
       appId,
-      isShowMobileUI,
       previewOnZalo,
+      isIOS,
+      iosHostName,
       host,
       port,
       hrConfigPath,
@@ -84,11 +87,12 @@ module.exports = function _callee() {
           spinner.start();
           cwd = options.cwd || process.cwd();
           appId = options.appId || envUtils.getEnv(config.env.appId);
-          isShowMobileUI = options.showMobileUI;
           previewOnZalo = options.previewOnZalo;
-          host = 'localhost';
+          isIOS = options.ios;
+          iosHostName = options.iosHostName;
+          host = isIOS ? iosHostName : 'localhost';
           port = options.port;
-          _context.prev = 12;
+          _context.prev = 13;
 
           if (previewOnZalo) {
             hrConfigPath = path.join(cwd, 'hr.config.json');
@@ -108,8 +112,8 @@ module.exports = function _callee() {
 
           localServer = {};
           publicServer = {
-            // host: '0.0.0.0',
-            https: true,
+            host: '0.0.0.0',
+            https: !isIOS,
             hmr: {
               host: host
             }
@@ -121,7 +125,7 @@ module.exports = function _callee() {
             viteConfig = 'vite.config.ts';
           }
 
-          _context.next = 21;
+          _context.next = 22;
           return regeneratorRuntime.awrap(createServer({
             configFile: path.join(cwd, viteConfig),
             root: cwd,
@@ -134,20 +138,20 @@ module.exports = function _callee() {
             }, previewOnZalo ? publicServer : localServer)
           }));
 
-        case 21:
+        case 22:
           server = _context.sent;
-          _context.next = 24;
+          _context.next = 25;
           return regeneratorRuntime.awrap(server.listen());
 
-        case 24:
+        case 25:
           app = _context.sent;
 
           if (previewOnZalo) {
-            _context.next = 35;
+            _context.next = 36;
             break;
           }
 
-          _context.next = 28;
+          _context.next = 29;
           return regeneratorRuntime.awrap(createServer({
             // any valid user config options, plus `mode` and `configFile`
             configFile: false,
@@ -159,73 +163,85 @@ module.exports = function _callee() {
             }
           }));
 
-        case 28:
+        case 29:
           serverFrame = _context.sent;
-          _context.next = 31;
+          _context.next = 32;
           return regeneratorRuntime.awrap(serverFrame.listen());
 
-        case 31:
+        case 32:
           spinner.stop();
           info = serverFrame.config.logger.info;
           info(chalk.green("Zalo Mini App dev server is running at:\n"));
           serverFrame.printUrls();
 
-        case 35:
+        case 36:
           spinner.stop();
-          _context.next = 38;
+          _context.next = 39;
           return regeneratorRuntime.awrap(new Promise(function () {
-            var previewOnZaloURL = "https://zalo.me/app/link/zapps/".concat(appId, "/?env=TESTING_LOCAL&clientIp=https://").concat(host, ":").concat(app.config.server.port);
-
-            if (isShowMobileUI) {
-              var nw = require('nw');
-
-              require('child_process').exec("".concat(nw.findpath(), " ").concat(path.join(__dirname, 'phone-app'), " url=https://").concat(host, ":").concat(port, " appId=").concat(appId, " cwd=").concat(process.cwd(), " previewOnZalo=").concat(previewOnZalo)).unref();
-            } else if (previewOnZalo) {
+            var previewOnZaloURL = "https://zalo.me/app/link/zapps/".concat(appId, "/?env=TESTING_LOCAL&clientIp=").concat(isIOS ? 'http' : 'https', "://").concat(host, ":").concat(app.config.server.port); // if (isShowMobileUI) {
+            //   const nw = require('nw');
+            //   require('child_process')
+            //     .exec(
+            //       `${nw.findpath()} ${path.join(
+            //         __dirname,
+            //         'phone-app'
+            //       )} url=https://${host}:${port} appId=${appId} cwd=${process.cwd()} previewOnZalo=${previewOnZalo}`
+            //     )
+            //     .unref();
+            // } else
+
+            if (previewOnZalo) {
               qrcode.generate(previewOnZaloURL, {
                 small: true
               }, function (qrcode) {
                 logger.text(chalk.green("".concat(logSymbols.info, " ").concat(chalk.bold("Zalo Mini App dev server is running at: ".concat(host, ":").concat(app.config.server.port)))));
                 logger.text(chalk.green("".concat(logSymbols.info, " ").concat(chalk.bold("Trying reverse socket connection"))));
 
-                var processAdbReverse = require('child_process').spawn("adb", ['reverse', "tcp:".concat(app.config.server.port), "tcp:".concat(app.config.server.port)]);
-
-                processAdbReverse.stderr.on('data', function (data) {
-                  logger.error(data.toString());
-                });
-                processAdbReverse.on('exit', function (code) {
-                  if (code !== 0) {
-                    throw new Error("adb reverse error: ".concat(code));
-                  } else {
-                    var qrCode = "".concat(logSymbols.info, " ").concat(chalk.bold("Scan the QR code with Zalo app:\n".concat(qrcode)));
-                    logger.text(qrCode);
-
-                    var processAdbDevices = require('child_process').spawn("adb", ['devices']);
-
-                    processAdbDevices.stdout.on('data', function (data) {
-                      logger.text("".concat(chalk.yellow(data.toString())));
-                    });
-                  }
-                });
+                if (isIOS) {
+                  var qrCode = "".concat(logSymbols.info, " ").concat(chalk.bold("Scan the QR code with Zalo app:\n".concat(qrcode)));
+                  logger.text(qrCode);
+                } else {
+                  var processAdbReverse = require('child_process').spawn("adb", ['reverse', "tcp:".concat(app.config.server.port), "tcp:".concat(app.config.server.port)]);
+
+                  processAdbReverse.stderr.on('data', function (data) {
+                    logger.error(data.toString());
+                  });
+                  processAdbReverse.on('exit', function (code) {
+                    if (code !== 0) {
+                      throw new Error("adb reverse error: ".concat(code));
+                    } else {
+                      var _qrCode = "".concat(logSymbols.info, " ").concat(chalk.bold("Scan the QR code with Zalo app:\n".concat(qrcode)));
+
+                      logger.text(_qrCode);
+
+                      var processAdbDevices = require('child_process').spawn("adb", ['devices']);
+
+                      processAdbDevices.stdout.on('data', function (data) {
+                        logger.text("".concat(chalk.yellow(data.toString())));
+                      });
+                    }
+                  });
+                }
               });
             }
           }));
 
-        case 38:
+        case 39:
           return _context.abrupt("return", _context.sent);
 
-        case 41:
-          _context.prev = 41;
-          _context.t0 = _context["catch"](12);
+        case 42:
+          _context.prev = 42;
+          _context.t0 = _context["catch"](13);
           logger.statusError('Error starting project'); // if (err) logger.error(err.stderr || err);
 
           logger.error(_context.t0);
           errorExit(_context.t0);
           return _context.abrupt("return");
 
-        case 47:
+        case 48:
         case "end":
           return _context.stop();
       }
     }
-  }, null, null, [[12, 41]]);
+  }, null, null, [[13, 42]]);
 };

package/start/index.js

@@ -3,6 +3,7 @@
 const chalk = require('chalk');
 const ora = require('ora');
 const path = require('path');
+const os = require('os');
 const qrcode = require('qrcode-terminal');
 const logSymbols = require('log-symbols');
 const { createServer } = require('vite');
@@ -32,9 +33,10 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
   spinner.start();
   const cwd = options.cwd || process.cwd();
   const appId = options.appId || envUtils.getEnv(config.env.appId);
-  const isShowMobileUI = options.showMobileUI;
   const previewOnZalo = options.previewOnZalo;
-  const host = 'localhost';
+  const isIOS = options.ios;
+  const iosHostName = options.iosHostName;
+  const host = isIOS ? iosHostName : 'localhost';
   const port = options.port;
   try {
     if (previewOnZalo) {
@@ -56,8 +58,8 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
     const localServer = {};
 
     const publicServer = {
-      // host: '0.0.0.0',
-      https: true,
+      host: '0.0.0.0',
+      https: !isIOS,
       hmr: {
         host: host,
       },
@@ -108,18 +110,21 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
 
     spinner.stop();
     return await new Promise(() => {
-      const previewOnZaloURL = `https://zalo.me/app/link/zapps/${appId}/?env=TESTING_LOCAL&clientIp=https://${host}:${app.config.server.port}`;
-      if (isShowMobileUI) {
-        const nw = require('nw');
-        require('child_process')
-          .exec(
-            `${nw.findpath()} ${path.join(
-              __dirname,
-              'phone-app'
-            )} url=https://${host}:${port} appId=${appId} cwd=${process.cwd()} previewOnZalo=${previewOnZalo}`
-          )
-          .unref();
-      } else if (previewOnZalo) {
+      const previewOnZaloURL = `https://zalo.me/app/link/zapps/${appId}/?env=TESTING_LOCAL&clientIp=${
+        isIOS ? 'http' : 'https'
+      }://${host}:${app.config.server.port}`;
+      // if (isShowMobileUI) {
+      //   const nw = require('nw');
+      //   require('child_process')
+      //     .exec(
+      //       `${nw.findpath()} ${path.join(
+      //         __dirname,
+      //         'phone-app'
+      //       )} url=https://${host}:${port} appId=${appId} cwd=${process.cwd()} previewOnZalo=${previewOnZalo}`
+      //     )
+      //     .unref();
+      // } else
+      if (previewOnZalo) {
         qrcode.generate(previewOnZaloURL, { small: true }, function (qrcode) {
           logger.text(
             chalk.green(
@@ -135,33 +140,41 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
               )}`
             )
           );
-          const processAdbReverse = require('child_process').spawn(`adb`, [
-            'reverse',
-            `tcp:${app.config.server.port}`,
-            `tcp:${app.config.server.port}`,
-          ]);
+          if (isIOS) {
+            const qrCode = `${logSymbols.info} ${chalk.bold(
+              `Scan the QR code with Zalo app:\n${qrcode}`
+            )}`;
+            logger.text(qrCode);
+          } else {
+            const processAdbReverse = require('child_process').spawn(`adb`, [
+              'reverse',
+              `tcp:${app.config.server.port}`,
+              `tcp:${app.config.server.port}`,
+            ]);
 
-          processAdbReverse.stderr.on('data', function (data) {
-            logger.error(data.toString());
-          });
+            processAdbReverse.stderr.on('data', function (data) {
+              logger.error(data.toString());
+            });
 
-          processAdbReverse.on('exit', function (code) {
-            if (code !== 0) {
-              throw new Error(`adb reverse error: ${code}`);
-            } else {
-              const qrCode = `${logSymbols.info} ${chalk.bold(
-                `Scan the QR code with Zalo app:\n${qrcode}`
-              )}`;
-              logger.text(qrCode);
-              const processAdbDevices = require('child_process').spawn(`adb`, [
-                'devices',
-              ]);
+            processAdbReverse.on('exit', function (code) {
+              if (code !== 0) {
+                throw new Error(`adb reverse error: ${code}`);
+              } else {
+                const qrCode = `${logSymbols.info} ${chalk.bold(
+                  `Scan the QR code with Zalo app:\n${qrcode}`
+                )}`;
+                logger.text(qrCode);
+                const processAdbDevices = require('child_process').spawn(
+                  `adb`,
+                  ['devices']
+                );
 
-              processAdbDevices.stdout.on('data', function (data) {
-                logger.text(`${chalk.yellow(data.toString())}`);
-              });
-            }
-          });
+                processAdbDevices.stdout.on('data', function (data) {
+                  logger.text(`${chalk.yellow(data.toString())}`);
+                });
+              }
+            });
+          }
         });
       }
     });