@squidcloud/cli 1.0.367 → 1.0.369

package/dist/index.js

@@ -447,8 +447,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.requirePath = void 0;
 exports.findModulePath = findModulePath;
-const path_1 = __importDefault(__webpack_require__(6928));
 const enhanced_resolve_1 = __importDefault(__webpack_require__(4506));
+const path_1 = __importDefault(__webpack_require__(6928));
 async function findModulePath(moduleName, startDir = process.cwd()) {
     const directoriesToSearch = new Set([startDir, process.cwd(), __dirname]);
     // Try each directory in order
@@ -982,12 +982,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
 const fs = __importStar(__webpack_require__(1943));
-const process_utils_1 = __webpack_require__(8251);
-const resolve_1 = __webpack_require__(412);
 const path_1 = __importDefault(__webpack_require__(6928));
-const validate_1 = __webpack_require__(2246);
-const logging_1 = __webpack_require__(443);
+const resolve_1 = __webpack_require__(412);
 const shell_runner_1 = __webpack_require__(3089);
+const logging_1 = __webpack_require__(443);
+const process_utils_1 = __webpack_require__(8251);
+const validate_1 = __webpack_require__(2246);
 async function default_1() {
     const packageJson = await (0, validate_1.validateSquidProject)();
     console.log((0, logging_1.primary)('Please note:'), 'to debug your application, you need to run the "start" npm script in your IDE in debug mode');
@@ -1704,6 +1704,7 @@ module.exports = require("os");
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.KOTLIN_CONTROLLERS = void 0;
+exports.getEnvironmentPrefix = getEnvironmentPrefix;
 exports.getApplicationUrl = getApplicationUrl;
 exports.KOTLIN_CONTROLLERS = [
     'aiData',
@@ -1732,25 +1733,40 @@ exports.KOTLIN_CONTROLLERS = [
     'personalStorage',
     'internal-extraction',
 ];
-function getApplicationUrl(regionPrefix, appId, path) {
-    const baseUrl = 'https://squid.cloud';
-    const parsedBaseUrl = new URL(baseUrl);
-    parsedBaseUrl.host = `${appId}.${regionPrefix}.${parsedBaseUrl.host}`;
-    const controller = path.replace(/^\//g, '').split('/')[0] || '';
-    if (isLocal(regionPrefix)) {
-        parsedBaseUrl.protocol = 'http';
-        parsedBaseUrl.port = exports.KOTLIN_CONTROLLERS.includes(controller) ? '8001' : '8000';
-        if (isAndroid(regionPrefix)) {
-            parsedBaseUrl.host = '10.0.2.2';
+function getEnvironmentPrefix(shard, region, cloudId, stage) {
+    if (region === 'local') {
+        return 'local';
+    }
+    const components = [];
+    if (shard && shard !== 'default') {
+        components.push(shard);
+    }
+    components.push(region);
+    components.push(cloudId);
+    if (stage !== 'prod') {
+        components.push(stage);
+    }
+    return components.join('.');
+}
+function getApplicationUrl(environmentPrefix, appId, path, appIdPlaceholder, environmentPrefixPlaceholder) {
+    const baseDomain = new URL('https://squid.cloud').host;
+    const customHost = `${appIdPlaceholder || appId}.${environmentPrefixPlaceholder || environmentPrefix}.${baseDomain}`;
+    let protocol = 'https';
+    let host = customHost;
+    let port = '';
+    if (isLocal(environmentPrefix)) {
+        protocol = 'http';
+        port = exports.KOTLIN_CONTROLLERS.includes(path.replace(/^\//, '').split('/')[0] || '') ? '8001' : '8000';
+        if (isAndroid(environmentPrefix)) {
+            host = '10.0.2.2';
         }
-        else if (isIOS(regionPrefix)) {
-            parsedBaseUrl.host = 'localhost';
+        else if (isIOS(environmentPrefix)) {
+            host = 'localhost';
         }
     }
-    const url = parsedBaseUrl.toString();
-    path = path.startsWith('/') ? path.slice(1) : path;
-    const urlWithoutTrailingSlash = url.replace(/\/$/g, '');
-    return path.length ? `${urlWithoutTrailingSlash}/${path}` : urlWithoutTrailingSlash;
+    const origin = protocol + '://' + host + (port ? `:${port}` : '');
+    const cleanPath = path.replace(/^\/+/, '');
+    return cleanPath ? `${origin}/${cleanPath}` : origin;
 }
 function isLocal(regionPrefix) {
     return /^local/.test(regionPrefix);
@@ -1812,8 +1828,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.downloadRepo = downloadRepo;
-const fs_1 = __importDefault(__webpack_require__(9896));
 const decompress_1 = __importDefault(__webpack_require__(482));
+const fs_1 = __importDefault(__webpack_require__(9896));
 async function downloadRepo(username, repo, dest) {
     let tempDir;
     try {
@@ -8107,11 +8123,11 @@ module.exports = function bitIterator(nextBuffer) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.reportLocalBackendInitialized = reportLocalBackendInitialized;
-const environment_1 = __webpack_require__(722);
-const http_1 = __webpack_require__(866);
-const global_utils_1 = __webpack_require__(6334);
-const console_app_utils_1 = __webpack_require__(7580);
 const assertic_1 = __webpack_require__(3205);
+const console_app_utils_1 = __webpack_require__(7580);
+const global_utils_1 = __webpack_require__(6334);
+const http_1 = __webpack_require__(866);
+const environment_1 = __webpack_require__(722);
 async function reportLocalBackendInitialized(appId, apiKey, appRegion, verbose) {
     const stage = appRegion === 'local' ? 'local' : appRegion.endsWith('.sandbox') ? 'sandbox' : 'prod';
     const consoleRegion = (0, console_app_utils_1.getConsoleAppRegionByStage)(stage);
@@ -10302,8 +10318,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.BUILT_IN_WEBPACK_CONFIG_PATH = exports.USER_WEBPACK_CONFIG_PATH = exports.requirePath = void 0;
 exports.findModulePath = findModulePath;
-const path_1 = __importDefault(__webpack_require__(6928));
 const enhanced_resolve_1 = __importDefault(__webpack_require__(4506));
+const path_1 = __importDefault(__webpack_require__(6928));
 async function findModulePath(moduleName, startDir = __dirname) {
     let currentDir = startDir;
     const result = await new Promise((r, rej) => {
@@ -11480,21 +11496,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-const yargs_1 = __importDefault(__webpack_require__(1771));
-const deploy_1 = __importDefault(__webpack_require__(8705));
+const dotenv = __importStar(__webpack_require__(9650));
+const fsSync = __importStar(__webpack_require__(9896));
 const path_1 = __importDefault(__webpack_require__(6928));
-const process_utils_1 = __webpack_require__(8251);
+const yargs_1 = __importDefault(__webpack_require__(1771));
+const stage_1 = __webpack_require__(8058);
 const packageJson = __importStar(__webpack_require__(8330));
-const start_1 = __importDefault(__webpack_require__(496));
-const dotenv = __importStar(__webpack_require__(9650));
+const build_1 = __importDefault(__webpack_require__(8584));
+const deploy_1 = __importDefault(__webpack_require__(8705));
 const init_env_1 = __importDefault(__webpack_require__(1838));
-const fsSync = __importStar(__webpack_require__(9896));
+const init_webpack_1 = __importDefault(__webpack_require__(1134));
 const sample_1 = __importDefault(__webpack_require__(4328));
-const build_1 = __importDefault(__webpack_require__(8584));
-const stage_1 = __webpack_require__(8058);
-const validate_1 = __webpack_require__(2246);
+const start_1 = __importDefault(__webpack_require__(496));
 const undeploy_1 = __importDefault(__webpack_require__(9478));
-const init_webpack_1 = __importDefault(__webpack_require__(1134));
+const process_utils_1 = __webpack_require__(8251);
+const validate_1 = __webpack_require__(2246);
 function setupDotEnv(baseDir) {
     dotenv.config({ path: path_1.default.resolve(baseDir || './', '.env') });
 }
@@ -11825,11 +11841,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = initSample;
 const promises_1 = __importDefault(__webpack_require__(1943));
 const path_1 = __importDefault(__webpack_require__(6928));
-const report_utils_1 = __webpack_require__(3066);
-const process_utils_1 = __webpack_require__(8251);
+const shell_runner_1 = __webpack_require__(3089);
 const git_utils_1 = __webpack_require__(954);
 const logging_1 = __webpack_require__(443);
-const shell_runner_1 = __webpack_require__(3089);
+const process_utils_1 = __webpack_require__(8251);
+const report_utils_1 = __webpack_require__(3066);
 const ORG = 'squid-cloud-samples';
 async function initSample(dirPath, appId, apiKey, environmentId, squidDeveloperId, region, templateName, verbose = false) {
     try {
@@ -22360,7 +22376,7 @@ function exitWithError(...messages) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.367","description":"The Squid CLI","main":"dist/index.js","scripts":{"start":"node dist/index.js","start-ts":"ts-node -r tsconfig-paths/register src/index.ts","prebuild":"rimraf dist","build":"webpack --mode=production","build:dev":"webpack --mode=development","build:prod":"webpack --mode=production","lint":"eslint","link":"npm run build && chmod 755 dist/index.js && npm link","watch":"webpack --watch","deploy":"npm run build && npm pack --silent | xargs -I {} mv {} package.tgz && npm install -g package.tgz && rm -rf package.tgz","publish:public":"npm run build && npm publish --access public"},"files":["dist/**/*"],"bin":{"squid":"dist/index.js"},"keywords":[],"author":"","license":"ISC","engines":{"node":">=18.0.0"},"dependencies":{"@squidcloud/local-backend":"^1.0.367","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.3","terser-webpack-plugin":"^5.3.10","ts-loader":"^9.5.1","ts-node":"^10.9.2","tsconfig-paths":"^4.2.0","tsconfig-paths-webpack-plugin":"^4.1.0","webpack":"^5.96.0","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/decompress":"^4.2.7","@types/node":"^20.16.10","terminal-link":"^3.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.369","description":"The Squid CLI","main":"dist/index.js","scripts":{"start":"node dist/index.js","start-ts":"ts-node -r tsconfig-paths/register src/index.ts","prebuild":"rimraf dist","build":"webpack --mode=production","build:dev":"webpack --mode=development","build:prod":"webpack --mode=production","lint":"eslint","link":"npm run build && chmod 755 dist/index.js && npm link","watch":"webpack --watch","deploy":"npm run build && npm pack --silent | xargs -I {} mv {} package.tgz && npm install -g package.tgz && rm -rf package.tgz","publish:public":"npm run build && npm publish --access public"},"files":["dist/**/*"],"bin":{"squid":"dist/index.js"},"keywords":[],"author":"","license":"ISC","engines":{"node":">=18.0.0"},"dependencies":{"@squidcloud/local-backend":"^1.0.369","copy-webpack-plugin":"^12.0.2","decompress":"^4.2.1","nodemon":"^3.1.3","terser-webpack-plugin":"^5.3.10","ts-loader":"^9.5.1","ts-node":"^10.9.2","tsconfig-paths":"^4.2.0","tsconfig-paths-webpack-plugin":"^4.1.0","webpack":"^5.96.0","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/decompress":"^4.2.7","@types/node":"^20.16.10","terminal-link":"^3.0.0"}}');
 
 /***/ }),
 
@@ -22481,18 +22497,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
-const webpack_1 = __importDefault(__webpack_require__(6807));
-const process_utils_1 = __webpack_require__(8251);
-const validate_1 = __webpack_require__(2246);
-const logging_1 = __webpack_require__(443);
-const path_1 = __importDefault(__webpack_require__(6928));
+const assertic_1 = __webpack_require__(3205);
 const fsSync = __importStar(__webpack_require__(9896));
 const fs_1 = __webpack_require__(9896);
+const path_1 = __importDefault(__webpack_require__(6928));
+const webpack_1 = __importDefault(__webpack_require__(6807));
 const resolve_1 = __webpack_require__(412);
-const resolve_2 = __webpack_require__(3878);
 const tsoa_utils_1 = __webpack_require__(1431);
 const packageJson = __importStar(__webpack_require__(8330));
-const assertic_1 = __webpack_require__(3205);
+const logging_1 = __webpack_require__(443);
+const process_utils_1 = __webpack_require__(8251);
+const resolve_2 = __webpack_require__(3878);
+const validate_1 = __webpack_require__(2246);
 function isEnvVarFalsy(variableName) {
     const value = process.env[variableName];
     return !value || value.toLowerCase() === 'false' || value === '0';
@@ -23087,14 +23103,14 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
-const environment_1 = __webpack_require__(722);
-const process_utils_1 = __webpack_require__(8251);
+const assertic_1 = __webpack_require__(3205);
 const fs = __importStar(__webpack_require__(1943));
-const http_1 = __webpack_require__(866);
 const communication_types_1 = __webpack_require__(3443);
 const console_app_utils_1 = __webpack_require__(7580);
-const assertic_1 = __webpack_require__(3205);
+const http_1 = __webpack_require__(866);
 const shell_runner_1 = __webpack_require__(3089);
+const environment_1 = __webpack_require__(722);
+const process_utils_1 = __webpack_require__(8251);
 async function default_1(stage, appId, bundlePath, apiKey, verbose, direct, isUserSpecifiedPath, skipBuild, internalApiKey, environmentId) {
     if (!direct && !isUserSpecifiedPath && !skipBuild) {
         console.log('Building code bundle...');
@@ -24614,12 +24630,12 @@ module.exports = (__webpack_require__(9896).constants) || __webpack_require__(91
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
-const environment_1 = __webpack_require__(722);
-const process_utils_1 = __webpack_require__(8251);
-const http_1 = __webpack_require__(866);
+const assertic_1 = __webpack_require__(3205);
 const communication_types_1 = __webpack_require__(3443);
 const console_app_utils_1 = __webpack_require__(7580);
-const assertic_1 = __webpack_require__(3205);
+const http_1 = __webpack_require__(866);
+const environment_1 = __webpack_require__(722);
+const process_utils_1 = __webpack_require__(8251);
 async function default_1(stage, appId, apiKey, environmentId) {
     const appIdWithEnvId = (0, communication_types_1.appIdWithEnvironmentId)(appId, environmentId);
     const regionPrefix = (0, console_app_utils_1.getConsoleAppRegionByStage)(stage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squidcloud/cli",
-  "version": "1.0.367",
+  "version": "1.0.369",
   "description": "The Squid CLI",
   "main": "dist/index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@squidcloud/local-backend": "^1.0.367",
+    "@squidcloud/local-backend": "^1.0.369",
     "copy-webpack-plugin": "^12.0.2",
     "decompress": "^4.2.1",
     "nodemon": "^3.1.3",