zcatalyst-cli 1.15.0-beta.4 → 1.15.0-beta.6

package/lib/archiver.js

@@ -179,9 +179,12 @@ class Archiver {
     getUnixPath(pth) {
         return pth.split(path_1.sep).join('/');
     }
-    add(pth, content, { createFolders = true } = {}) {
+    add(pth, content, { createFolders = true, mode } = {}) {
         this.promiseArr.push(this.jszip.then((zip) => {
-            return zip.file(this.getUnixPath(pth), content, { createFolders });
+            return zip.file(this.getUnixPath(pth), content, {
+                createFolders,
+                unixPermissions: mode
+            });
         }));
         return this;
     }
@@ -223,18 +226,20 @@ class Archiver {
                 const zip = yield this.jszip;
                 const content = yield zip.generateAsync({
                     type: 'nodebuffer',
+                    platform: 'UNIX',
                     compression: 'DEFLATE',
                     compressionOptions: {
                         level: 9
                     }
                 });
                 yield fs_1.ASYNC.writeFile(tempFilePath, content);
-                return fs_1.SYNC.getReadStream(tempFilePath);
+                return { stream: fs_1.SYNC.getReadStream(tempFilePath), length: content.length };
             }),
             writeZip: (pth) => __awaiter(this, void 0, void 0, function* () {
                 const zip = yield this.jszip;
                 const content = yield zip.generateAsync({
                     type: 'nodebuffer',
+                    platform: 'UNIX',
                     compression: 'DEFLATE',
                     compressionOptions: {
                         level: 9

package/lib/client-utils.js

@@ -171,7 +171,11 @@ exports.clientUtils = {
         const files = yield fs_1.ASYNC.walk(source, { filter: { exclude, excludeDir: true } });
         const zip = new archiver_1.default();
         files.forEach((file) => {
-            zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
+            zip.add(file.path.replace(source + path_1.sep, ''), file.stats.isSymbolicLink()
+                ? fs_1.SYNC.readSymLink(file.path)
+                : fs_1.SYNC.getReadStream(file.path), {
+                mode: file.stats.mode
+            });
         });
         const zipFinalizer = yield zip.finalize();
         return zipFinalizer.fsStream();

package/lib/commands/iac/pack.js

@@ -55,14 +55,14 @@ exports.default = new command_1.default('iac:pack [zip_name]')
     .needs('auth')
     .needs('config')
     .action((userZipName) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     const config = runtime_store_1.default.get('config');
     const rootDir = (0, path_1.dirname)(config.configPath);
     const filesAtRoot = yield fs_1.ASYNC.walk(rootDir, {
         filter: { excludeDir: true, exclude: [] },
         depth: 1
     });
-    const templateFilePth = filesAtRoot.find((fileName) => fileName.match(constants_1.REGEX.project.template));
+    const templateFilePth = (_a = filesAtRoot.find((file) => file.path.match(constants_1.REGEX.project.template))) === null || _a === void 0 ? void 0 : _a.path;
     if (templateFilePth === undefined) {
         throw new error_1.default('No template file found', { exit: 1 });
     }
@@ -71,8 +71,8 @@ exports.default = new command_1.default('iac:pack [zip_name]')
         throw new error_1.default('Unable to read template file', { exit: 1 });
     }
     const templateJson = js_1.JS.parseJSON(templateFile) || (0, yaml_1.parse)(templateFile);
-    const templateFns = ((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || [];
-    const templateClient = ((_b = templateJson.components) === null || _b === void 0 ? void 0 : _b.WebClient) || [];
+    const templateFns = ((_b = templateJson.components) === null || _b === void 0 ? void 0 : _b.Functions) || [];
+    const templateClient = ((_c = templateJson.components) === null || _c === void 0 ? void 0 : _c.WebClient) || [];
     const hrTime = process.hrtime();
     const archiveName = (userZipName === null || userZipName === void 0 ? void 0 : userZipName.replace('.zip', '')) || `iac_${hrTime[0] * 1000000000 + hrTime[1]}`;
     const finalZip = new archiver_1.default(archiveName);
@@ -114,21 +114,22 @@ exports.default = new command_1.default('iac:pack [zip_name]')
                     ...(packedPythonFns || [])
                 ];
                 packedFns.forEach((fn) => {
+                    var _a;
                     if (!fn.valid) {
                         throw new error_1.default(`Unable to pack since "${fn.name}" is not valid. Reason: ${fn.failure_reason}`);
                     }
-                    finalZip.add(fnNameByCodePath[fn.name], fn.zip_stream);
+                    finalZip.add(fnNameByCodePath[fn.name], (_a = fn.zip_stream) === null || _a === void 0 ? void 0 : _a.stream);
                 });
                 break;
             case 'client':
                 yield client_utils_1.clientUtils.validate();
                 const clientName = runtime_store_1.default.get('context.client.name');
-                const clientTeamplateConfig = templateClient.find((tClient) => clientName === tClient.properties.app_name);
-                if (!clientTeamplateConfig) {
+                const clientTemplateConfig = templateClient.find((tClient) => clientName === tClient.properties.app_name);
+                if (!clientTemplateConfig) {
                     throw new error_1.default(`No property found for client ${clientName} in project template`, { exit: 1 });
                 }
                 const clientZipStream = yield client_utils_1.clientUtils.pack();
-                finalZip.add(clientTeamplateConfig.properties.code.path, clientZipStream);
+                finalZip.add(clientTemplateConfig.properties.code.path, clientZipStream.stream);
                 break;
             default:
                 (0, logger_1.debug)(`skipping ${component} since there is no processing needed`);

package/lib/deploy/features/appsail/index.js

@@ -30,6 +30,7 @@ const logger_1 = require("../../../util_modules/logger");
 const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 const utils_1 = require("./utils");
+const throbber_1 = __importDefault(require("../../../throbber"));
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -175,6 +176,7 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
         });
     }
     const sailAPI = yield (0, endpoints_1.appSailAPI)();
+    const throbber = throbber_1.default.getInstance();
     const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         const targ = _targ.appSail;
@@ -183,6 +185,10 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
             if ((_a = targ.scripts) === null || _a === void 0 ? void 0 : _a.predeploy) {
                 executeHook(targ.scripts.predeploy, 'predeploy', targ.source);
             }
+            const throbberName = `prepare_appsail_${targ.name}`;
+            throbber.add(throbberName, {
+                text: `Preparing AppSail[${targ.name}]`
+            });
             const zip = new archiver_1.default();
             const folderPath = (0, project_1.resolveProjectPath)(targ.buildPath);
             const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(folderPath, constants_1.FILENAME.catalyst_ignore));
@@ -199,20 +205,24 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
                 }
             });
             folderContents.forEach((content) => {
-                zip.add(content === folderPath
-                    ? (0, path_1.basename)(content)
-                    : content.replace(folderPath + path_1.sep, ''), fs_1.SYNC.getReadStream(content));
+                zip.add(content.path === folderPath
+                    ? (0, path_1.basename)(content.path)
+                    : content.path.replace(folderPath + path_1.sep, ''), content.stats.isSymbolicLink()
+                    ? fs_1.SYNC.readSymLink(content.path)
+                    : fs_1.SYNC.getReadStream(content.path), { mode: content.stats.mode });
             });
             const finalized = yield zip.finalize();
             const zipStream = yield finalized.fsStream();
+            throbber.remove(throbberName);
             const { stack, name, command, memory, platform, env_variables } = targ;
-            const apiRes = yield sailAPI.deploy(zipStream, {
+            const apiRes = yield sailAPI.deploy(zipStream.stream, {
                 stack,
                 name,
                 memory,
                 platform,
                 command,
-                envVariables: env_variables
+                envVariables: env_variables,
+                contentLength: zipStream.length
             });
             _targ.url = apiRes.url;
             if ((_b = targ.scripts) === null || _b === void 0 ? void 0 : _b.postdeploy) {

package/lib/deploy/features/client.js

@@ -20,7 +20,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     client_utils_1.clientUtils.executeHook({ prefix: 'pre', command: 'deploy' });
     yield client_utils_1.clientUtils.validate();
     const readStream = yield client_utils_1.clientUtils.pack();
-    const resp = (yield (yield (0, endpoints_1.clientAPI)()).deploy(readStream));
+    const resp = (yield (yield (0, endpoints_1.clientAPI)()).deploy(readStream.stream, readStream.length));
     const homepage = runtime_store_1.default.get('context.client.homepage', '');
     runtime_store_1.default.set('payload.client.url', 'https://' +
         resp.url_prefix +

package/lib/deploy/features/functions/index.js

@@ -56,17 +56,19 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         const limit = combinedTarget.length > batchSize ? batchSize : combinedTarget.length;
         const targetBatch = combinedTarget.splice(0, limit);
         yield Promise.all(targetBatch.map((target) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
             if (!target) {
                 return;
             }
             try {
                 let resp;
                 if (target.type !== undefined && target.type === constants_1.FN_TYPE.advanced) {
-                    resp = (yield appAPI.deploy(target.zip_stream, {
+                    resp = (yield appAPI.deploy((_a = target.zip_stream) === null || _a === void 0 ? void 0 : _a.stream, {
                         stack: target.stack,
                         name: target.name,
                         memory: target.memory,
-                        envVariables: target.env_var
+                        envVariables: target.env_var,
+                        contentLength: (_b = target.zip_stream) === null || _b === void 0 ? void 0 : _b.length
                     }));
                 }
                 else {
@@ -74,7 +76,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                         stack: target.stack,
                         name: target.name,
                         type: constants_1.REMOTE_REF.functions.type[target.type],
-                        envVariables: target.env_var
+                        envVariables: target.env_var,
+                        contentLength: (_c = target.zip_stream) === null || _c === void 0 ? void 0 : _c.length
                     };
                     if (target.type === constants_1.FN_TYPE.browserLogic && !target.memory && !target.id) {
                         deployOptions.memory = 512;
@@ -82,7 +85,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     else {
                         deployOptions.memory = target.memory;
                     }
-                    resp = (yield fnAPI.deploy(target.zip_stream, deployOptions));
+                    resp = (yield fnAPI.deploy((_d = target.zip_stream) === null || _d === void 0 ? void 0 : _d.stream, deployOptions));
                 }
                 target.id = resp.id + '';
                 fn_utils_1.fnUtils.common.generateUrlForTarget(target);

package/lib/endpoints/lib/applogic.js

@@ -20,7 +20,7 @@ class Applogic {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceFsStream, { stack, name, memory, envVariables }) {
+    deploy(sourceFsStream, { stack, name, memory, envVariables, contentLength }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -41,12 +41,24 @@ class Applogic {
             if (Object.keys(configuration).length > 0) {
                 formData.configuration = JSON.stringify(configuration);
             }
+            const log = contentLength
+                ? {
+                    uploadProgress: {
+                        title: `[${name}]`,
+                        total: contentLength,
+                        progressType: 'upload'
+                    },
+                    stream: sourceFsStream,
+                    awaitingSpinner: `deploying function [${name}]`
+                }
+                : undefined;
             const res = yield new api_1.default(this.opts).put(`/baas/v1/project/${this.projectId}/server/upsert`, {
                 formData,
                 headers: {
                     'Content-Type': 'application/zip'
                 },
-                json: false
+                json: false,
+                log
             });
             if (res.body && res.body.data) {
                 return res.body.data;

package/lib/endpoints/lib/appsail.js

@@ -21,7 +21,7 @@ class AppSail {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceFsStream, { stack, name, command, memory, platform, envVariables = {} }) {
+    deploy(sourceFsStream, { stack, name, contentLength, command, memory, platform, envVariables = {} }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -48,7 +48,16 @@ class AppSail {
             }
             const res = yield new api_1.default(this.opts).put(`/baas/v1/project/${this.projectId}/appsail/upsert`, {
                 formData,
-                json: false
+                json: false,
+                log: {
+                    uploadProgress: {
+                        title: `AppSail[${name}]`,
+                        total: contentLength,
+                        progressType: 'upload'
+                    },
+                    stream: sourceFsStream,
+                    awaitingSpinner: `deploying Appsail[${name}]`
+                }
             });
             if (res.body && res.body.data) {
                 return res.body.data;

package/lib/endpoints/lib/client.js

@@ -20,13 +20,22 @@ class Client {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceStream) {
+    deploy(sourceStream, contentLength) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield new api_1.default(this.opts).post(`/baas/v1/project/${this.projectId}/webapp`, {
                 formData: {
                     app_zip: sourceStream
                 },
-                json: false
+                json: false,
+                log: {
+                    uploadProgress: {
+                        title: 'Web_Client',
+                        total: contentLength,
+                        progressType: 'upload'
+                    },
+                    stream: sourceStream,
+                    awaitingSpinner: 'deploying Web Client'
+                }
             });
             if (res.body && res.body.data) {
                 return res.body.data;

package/lib/endpoints/lib/functions.js

@@ -73,7 +73,7 @@ class Functions {
             });
         });
     }
-    deploy(sourceFsStream, { stack, name, type, memory, envVariables }) {
+    deploy(sourceFsStream, { stack, name, type, memory, envVariables, contentLength }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -95,9 +95,21 @@ class Functions {
             if (Object.keys(configuration).length > 0) {
                 formData.configuration = JSON.stringify(configuration);
             }
+            const log = contentLength
+                ? {
+                    uploadProgress: {
+                        title: `[${name}]`,
+                        total: contentLength,
+                        progressType: 'upload'
+                    },
+                    stream: sourceFsStream,
+                    awaitingSpinner: `deploying function [${name}]`
+                }
+                : undefined;
             const res = yield new api_1.default(this.opts).put(`/baas/v1/project/${this.projectId}/function/upsert`, {
                 formData,
-                json: false
+                json: false,
+                log
             });
             if (res.body && res.body.data) {
                 return res.body.data;

package/lib/endpoints/lib/sdk.js

@@ -22,17 +22,20 @@ class SDK {
     }
     getSdkUrl(fnType, service) {
         switch (fnType) {
+            case constants_1.FN_TYPE.browserLogic: {
+                return `/downloads/sdk/java/catalyst_java_sdk_beta.zip`;
+            }
             case constants_1.FN_TYPE.integration: {
                 if (!service) {
                     throw new error_1.default('Invalid integration service');
                 }
-                return `/downloads/sdk/java/${constants_1.INTEG.service_map[service]}/${constants_1.INTEG.java_dependencies[service]}_latest.zip`;
-            }
-            case constants_1.FN_TYPE.browserLogic: {
-                return `/downloads/sdk/java/catalyst_java_sdk_beta.zip`;
+                if (service === constants_1.INTEG.services.cliq) {
+                    return `/downloads/sdk/java/${constants_1.INTEG.service_map[service]}/${constants_1.INTEG.java_dependencies[service]}_latest.zip`;
+                }
+                return '/downloads/sdk/java/catalyst_java_sdk_beta.zip';
             }
             default: {
-                return `/downloads/sdk/java/catalyst_java_sdk_latest.zip`;
+                return '/downloads/sdk/java/catalyst_java_sdk_latest.zip';
             }
         }
     }

package/lib/express_middlewares/logger.js

@@ -1,10 +1,14 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-exports.default = (req, _RES, next) => {
+exports.default = (appSailDetails) => (req, _RES, next) => {
+    var _a, _b;
     console.log('[' +
         new Date().getTime() +
-        ']' +
+        '] ' +
+        (appSailDetails
+            ? (0, ansi_colors_1.cyan)(` Appsail[${(_b = (_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.appSail) === null || _b === void 0 ? void 0 : _b.name}] `)
+            : '') +
         ' "' +
         (0, ansi_colors_1.cyan)(req.method) +
         '" ' +

package/lib/fn-utils/lib/common.js

@@ -300,14 +300,22 @@ function pack(target) {
                 const outputFolder = (0, path_1.join)(source, constants_1.FOLDERNAME.output);
                 const outputFiles = yield fs_1.ASYNC.walk(outputFolder);
                 outputFiles.forEach((file) => {
-                    zip.add(file.replace(outputFolder + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
+                    zip.add(file.path.replace(outputFolder + path_1.sep, ''), file.stats.isSymbolicLink()
+                        ? fs_1.SYNC.readSymLink(file.path)
+                        : fs_1.SYNC.getReadStream(file.path), {
+                        mode: file.stats.mode
+                    });
                 });
             }
             else {
                 const exclude = config_1.functionsConfig.ignore(source);
                 const files = yield fs_1.ASYNC.walk(source, { filter: { exclude, excludeDir: true } });
                 files.forEach((file) => {
-                    zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
+                    zip.add(file.path.replace(source + path_1.sep, ''), file.stats.isSymbolicLink()
+                        ? fs_1.SYNC.readSymLink(file.path)
+                        : fs_1.SYNC.getReadStream(file.path), {
+                        mode: file.stats.mode
+                    });
                 });
             }
             if ((_b = target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.python.value)) {
@@ -320,7 +328,11 @@ function pack(target) {
                     yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), true);
                     const files = yield fs_1.ASYNC.walk(tmpDir);
                     files.forEach((file) => {
-                        zip.add(file.replace(tmpDir + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
+                        zip.add(file.path.replace(tmpDir + path_1.sep, ''), file.stats.isSymbolicLink()
+                            ? fs_1.SYNC.readSymLink(file.path)
+                            : fs_1.SYNC.getReadStream(file.path), {
+                            mode: file.stats.mode
+                        });
                     });
                 }
             }
@@ -365,53 +377,71 @@ function findAndReplaceConfigProps(dir, { stack, type, integ_config }) {
     });
 }
 exports.findAndReplaceConfigProps = findAndReplaceConfigProps;
-function resolveAllFnPorts(targets, idx = 0) {
-    var _a;
+function resolveAllFnServePort(targets) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (targets.length < idx + 1) {
-            return;
-        }
-        const currentTarget = targets[idx];
-        const currentTargetType = currentTarget.type;
-        if (!currentTarget.valid) {
-            return resolveAllFnPorts(targets, idx + 1);
+        let isBioHttp = false;
+        const debugOpts = runtime_store_1.default.get('context.port.debug', false);
+        yield Promise.all(targets.map((target) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (!target.valid) {
+                return;
+            }
+            let curTargetType = target.type;
+            if (curTargetType === constants_1.FN_TYPE.basic &&
+                ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value))) {
+                curTargetType = constants_1.FN_TYPE.advanced;
+            }
+            if (debugOpts && target.name in (debugOpts[curTargetType] || {})) {
+                const debugPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[curTargetType], 'debug', {
+                    name: target.name,
+                    duplicateCheck: false,
+                    searchSpan: 0
+                });
+                runtime_store_1.default.set('context.port.debug.functions.' + target.name, debugPort);
+            }
+            if (curTargetType === constants_1.FN_TYPE.basic && isBioHttp) {
+                return;
+            }
+            const httpPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[curTargetType], 'http', {
+                name: target.name,
+                duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced || curTargetType === constants_1.FN_TYPE.browserLogic
+            });
+            if (curTargetType === constants_1.FN_TYPE.basic) {
+                runtime_store_1.default.set('context.port.http.' + constants_1.REMOTE_REF.functions.type.bio, httpPort);
+                isBioHttp = true;
+            }
+            else {
+                runtime_store_1.default.set('context.port.http.functions.' + target.name, httpPort);
+            }
+        })));
+        if (debugOpts && 'basicio' in debugOpts) {
+            const bioDebugPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type.bio, 'debug', { duplicateCheck: false, searchSpan: 0 });
+            runtime_store_1.default.set('context.port.debug.basicio', bioDebugPort);
         }
-        let httpPort = -1;
-        let debugPort = -1;
+    });
+}
+function resolveAllFnPorts(targets) {
+    return __awaiter(this, void 0, void 0, function* () {
         switch ((0, option_1.getCurrentCommand)()) {
-            case 'serve':
-                const isPyBio = currentTargetType === constants_1.FN_TYPE.basic &&
-                    ((_a = currentTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value));
-                httpPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[currentTargetType], 'http', currentTarget.name, currentTargetType === constants_1.FN_TYPE.advanced ||
-                    currentTargetType === constants_1.FN_TYPE.browserLogic, isPyBio);
-                runtime_store_1.default.set('context.port.http.functions.' + currentTarget.name, httpPort);
-                const debugOptValue = (0, option_1.getOptionValue)('debug', false);
-                if (debugOptValue &&
-                    (debugOptValue + '').includes(constants_1.REMOTE_REF.functions.type[currentTargetType]) &&
-                    ((debugOptValue + '').includes(currentTarget.name) ||
-                        currentTargetType === constants_1.FN_TYPE.basic)) {
-                    debugPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[currentTargetType], 'debug', currentTarget.name, currentTargetType === constants_1.FN_TYPE.advanced);
-                    runtime_store_1.default.set('context.port.debug.functions.' + currentTarget.name, debugPort);
-                }
-                if (currentTargetType === constants_1.FN_TYPE.basic && !isPyBio) {
-                    runtime_store_1.default.set('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], httpPort);
-                    runtime_store_1.default.set('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], debugPort);
+            case 'serve': {
+                if (!targets) {
+                    throw new error_1.default('Invalid targets', { exit: 2 });
                 }
-                break;
-            case 'functions:shell':
-                if (currentTargetType === constants_1.FN_TYPE.basic && (0, option_1.getOptionValue)('http', false)) {
-                    httpPort = yield port_resolver_1.default.getPort('basicio', 'http', currentTarget.name, false);
-                    runtime_store_1.default.set('context.port.http.' + constants_1.REMOTE_REF.functions.type[currentTargetType], httpPort);
-                }
-                if ((0, option_1.getOptionValue)('debug', false)) {
-                    debugPort = yield port_resolver_1.default.getPort('basicio', 'debug', '', false);
-                    runtime_store_1.default.set('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], debugPort);
+                return resolveAllFnServePort(targets);
+            }
+            case 'functions:shell': {
+                if (runtime_store_1.default.get('context.port.http.basicio', false)) {
+                    const bioHttpPort = yield port_resolver_1.default.getPort('basicio', 'http', {
+                        duplicateCheck: false
+                    });
+                    runtime_store_1.default.set('context.port.http.' + constants_1.REMOTE_REF.functions.type.bio, bioHttpPort);
                 }
                 break;
-            default:
-                throw new error_1.default('Unknown command', { exit: 2 });
+            }
+            default: {
+                throw new error_1.default('Invalid catalyst command', { exit: 2 });
+            }
         }
-        return resolveAllFnPorts(targets, idx + 1);
     });
 }
 exports.resolveAllFnPorts = resolveAllFnPorts;
@@ -531,15 +561,15 @@ function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
         yield Promise.all(srcContents.map((content) => {
             return new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const isDir = yield fs_1.ASYNC.dirExists(content);
+                    const isDir = content.stats.isDirectory();
                     if (isDir) {
-                        const destFolder = (0, path_1.join)(dest, (0, path_1.basename)(content));
+                        const destFolder = (0, path_1.join)(dest, (0, path_1.basename)(content.path));
                         yield fs_1.ASYNC.ensureDir(destFolder);
-                        yield copyModDirPerm(content, destFolder, perm);
+                        yield copyModDirPerm(content.path, destFolder, perm);
                         return res();
                     }
-                    const destFile = (0, path_1.join)(dest, (0, path_1.basename)(content));
-                    yield fs_1.ASYNC.copyFile(content, destFile, replace ? fs_2.constants.COPYFILE_FICLONE : fs_2.constants.COPYFILE_EXCL).catch((err) => {
+                    const destFile = (0, path_1.join)(dest, (0, path_1.basename)(content.path));
+                    yield fs_1.ASYNC.copyFile(content.path, destFile, replace ? fs_2.constants.COPYFILE_FICLONE : fs_2.constants.COPYFILE_EXCL).catch((err) => {
                         if (!replace && err.code === 'EEXIST') {
                             return;
                         }

package/lib/fn-utils/lib/integ.js

@@ -22,16 +22,27 @@ const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
-function integHelper() {
+const serviceChoiceMap = {
+    [constants_1.INTEG.services.cliq]: prompt_1.default.choice('Cliq', {
+        value: constants_1.INTEG.services.cliq,
+        short: 'Cliq'
+    }),
+    [constants_1.INTEG.services.convokraft]: prompt_1.default.choice(constants_1.INTEG.services.convokraft, {
+        value: constants_1.INTEG.services.convokraft,
+        short: constants_1.INTEG.services.convokraft
+    })
+};
+function integHelper(services) {
     return __awaiter(this, void 0, void 0, function* () {
+        const serviceChoices = services.map((service) => serviceChoiceMap[service]);
+        if (serviceChoices.length === 0) {
+            throw new error_1.default(`Invalid integration services: [${services.join(',')}]`, {
+                exit: 2
+            });
+        }
         const serviceAns = yield prompt_1.default.ask(prompt_1.default.question('service', 'Select one of the services to continue:', {
             type: 'list',
-            choices: [
-                prompt_1.default.choice('Cliq', {
-                    value: constants_1.INTEG.services.cliq,
-                    short: 'Cliq'
-                })
-            ]
+            choices: serviceChoices
         }));
         runtime_store_1.default.set('context.functions.integration.service', serviceAns.service);
         switch (serviceAns.service) {
@@ -105,15 +116,14 @@ function copyIntegHandlers(templatePath, targetPath, lang) {
                 else if (lang === runtime_1.default.language.python.value) {
                     const filePaths = constants_1.CLIQ.python_template_contents_initial_copy.map((path) => (0, path_1.join)(templatePath, path));
                     yield fs_1.ASYNC.copyFiles(filePaths, targetPath);
-                    const integHandlerConfig = {};
-                    const handlerPaths = handlers.map((handler) => {
-                        integHandlerConfig[handler] = (0, path_1.join)(constants_1.CLIQ.python_handlers_path, constants_1.CLIQ.python_handler_file_mapping[handler]);
-                        return (0, path_1.join)(templatePath, constants_1.CLIQ.python_handlers_template_dir, constants_1.CLIQ.python_handler_file_mapping[handler]);
-                    });
+                    const handlerPaths = handlers.map((handler) => (0, path_1.join)(templatePath, constants_1.CLIQ.python_handlers_template_dir, constants_1.CLIQ.python_handler_file_mapping[handler]));
                     yield fs_1.ASYNC.copyFiles(handlerPaths, (0, path_1.join)(targetPath, constants_1.CLIQ.python_handlers_template_dir));
-                    integ_config.handlers = integHandlerConfig;
                 }
                 break;
+            case constants_1.INTEG.services.convokraft: {
+                yield fs_1.ASYNC.copyDir(templatePath, targetPath);
+                break;
+            }
             default:
                 break;
         }