Merge pull request #38 from Samsung/wits-vscode

resource zip에 canon 파일 다운로드 추가

command/init.js

@@ -36,7 +36,7 @@ module.exports = {
         makeWitsignoreFile();
         makeWitsconfigFile();
 
-        console.log(``);
+        console.log(`\nStart downloading files for configuration...`);
 
         await Promise.all([
             prepareTool(CONTAINER_NAME, CONTAINER_ZIP_URL),
@@ -77,7 +77,7 @@ function makeWitsconfigFile() {
             console.log('.witsconfig.json is already exist.');
             return;
         }
-        util.createEmptyFile(WITSCONFIG_PATH);
+        util.createEmptyFile(WITSCONFIG_PATH, '{}');
         console.log('.witsconfig.json is prepared.');
     } catch (error) {
         console.error(`Failed to makeWitsconfigFile ${error}`);
@@ -125,15 +125,14 @@ async function download(name, downloadUrl) {
 
     if (getFileSize(ZIP_FILE_PATH) === 0) {
         util.removeFile(ZIP_FILE_PATH);
-        console.log(`Invalid zip file was successfully removed.\n`);
     }
 
     const optionalInfo = await userInfoHelper.getOptionalInfo();
     const zip = fs.createWriteStream(ZIP_FILE_PATH);
 
     await new Promise((resolve, reject) => {
         let requestOptions = { uri: downloadUrl };
-        if (util.isPropertyExist(optionalInfo, 'proxyServer')) {
+        if (optionalInfo && util.isPropertyExist(optionalInfo, 'proxyServer')) {
             requestOptions = {
                 uri: downloadUrl,
                 strictSSL: false,

command/start.js

@@ -7,11 +7,17 @@ const appLaunchHelper = require('../lib/appLaunchHelper.js');
 const watchHelper = require('../lib/watchHelper.js');
 
 const CONTAINER_DIRECTORY_NAME = 'container';
+const RESOURCE_DIRECTORY_NAME = 'resource';
 const CONTAINER_DIRECTORY_PATH = path.join(
     util.WITS_BASE_PATH,
     '../',
     CONTAINER_DIRECTORY_NAME
 );
+const RESOURCE_DIRECTORY_PATH = path.join(
+    util.WITS_BASE_PATH,
+    '../',
+    RESOURCE_DIRECTORY_NAME
+);
 
 module.exports = {
     run: async () => {
@@ -69,6 +75,7 @@ module.exports = {
 function checkConfiguration() {
     if (
         !util.isFileExist(CONTAINER_DIRECTORY_PATH) ||
+        !util.isFileExist(RESOURCE_DIRECTORY_PATH) ||
         !util.isFileExist(util.TOOLS_CRYPT_PATH) ||
         !util.isFileExist(util.TOOLS_SDB_PATH)
     ) {

index.js

@@ -1,34 +1,36 @@
-const initCommand = require('./command/init.js');
-const watchCommand = require('./command/watch.js');
-const startCommand = require('./command/start.js');
 const userInfoHelper = require('./lib/userInfoHelper');
 
-const setWitsconfigInfo = data => {
+const setWitsconfigInfo = async data => {
+    const initCommand = require('./command/init.js');
     console.log('WITs::setWitsconfigInfo');
-    initCommand.prepareRun();
-    userInfoHelper.updateLatestUserAnswer(data);
-
+    await initCommand.prepareRun();
+    await userInfoHelper.updateLatestUserAnswer(data);
+    return;
     /**
-        {
-            width: '1920',
-            deviceIp: '192.168.250.250',
-            socketPort: 8498, (optional)
-            hostIp: '192.168.250.250', 
-            baseAppPath: 'E:/dev/workspace/test', 
-            isDebugMode: false,
-            profilePath: 'C:/tizen-studio-data/profile/profiles.xml',
+     {
+         width: '1920',
+         deviceIp: '192.168.250.250',
+         socketPort: 8498, (optional)
+         hostIp: '192.168.250.250', 
+         baseAppPath: 'E:/dev/workspace/test', 
+         isDebugMode: false,
+         profilePath: 'C:/tizen-studio-data/profile/profiles.xml',
         }
-     */
+        */
 };
 
-const start = () => {
+const start = async () => {
+    const startCommand = require('./command/start.js');
     console.log('WITs::start');
-    startCommand.run();
+    await startCommand.run();
+    return;
 };
 
-const watch = () => {
+const watch = async () => {
+    const watchCommand = require('./command/watch.js');
     console.log('WITs::watch');
-    watchCommand.run();
+    await watchCommand.run();
+    return;
 };
 
 module.exports = {

lib/build/signPackage.js

@@ -11,8 +11,18 @@ const util = require('../util.js');
 
 // 3rd packager tool, enter into  'xml-crypto' to support xml signature
 const Dom = require('xmldom').DOMParser;
-const ExclusiveCanonicalization = require('./exclusive-canonicalization')
-    .ExclusiveCanonicalization;
+const CANON_PATH = path.join(
+    util.WITS_BASE_PATH,
+    '../',
+    'resource',
+    'exclusive-canonicalization.js'
+);
+
+let ExclusiveCanonicalization = null;
+if (util.isFileExist(CANON_PATH)) {
+    ExclusiveCanonicalization = require('../../resource/exclusive-canonicalization')
+        .ExclusiveCanonicalization;
+}
 
 // Generated personal/public signature file
 const AUTOR_SIGNATURE = path.join(

lib/cli.js

@@ -3,14 +3,11 @@
 const commander = require('commander');
 const program = new commander.Command();
 
-const initCommand = require('../command/init.js');
-const startCommand = require('../command/start.js');
-const watchCommand = require('../command/watch.js');
-const watchHelper = require('./watchHelper.js');
 const util = require('./util.js');
 
 process.on('SIGINT', () => {
     // ctrl + C
+    const watchHelper = require('./watchHelper.js');
     watchHelper.closeSocketServer();
     util.close();
 });
@@ -22,10 +19,13 @@ program.option('-w, --watch', 'Watch project for live reloading');
 program.parse(process.argv);
 
 if (program.init) {
+    const initCommand = require('../command/init.js');
     initCommand.run();
 } else if (program.start) {
+    const startCommand = require('../command/start.js');
     startCommand.run();
 } else if (program.watch) {
+    const watchCommand = require('../command/watch.js');
     watchCommand.run();
 } else {
     program.help();