@squidcloud/cli 1.0.395 → 1.0.397

package/dist/index.js

@@ -3314,6 +3314,62 @@ module.exports = isFullwidthCodePoint;
 module.exports["default"] = isFullwidthCodePoint;
 
 
+/***/ }),
+
+/***/ 1665:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.parseSquidRegion = parseSquidRegion;
+function parseSquidRegion(input) {
+    if (input === 'local') {
+        return {
+            cloudId: 'local',
+            region: 'local',
+            shard: undefined,
+            stage: 'prod',
+        };
+    }
+    const parts = input.split('.');
+    // possible forms:
+    // [region, cloudId]                 (prod, no shard)
+    // [region, cloudId, stage]          (non-prod, no shard)
+    // [shard, region, cloudId]          (prod, with shard)
+    // [shard, region, cloudId, stage]   (non-prod, with shard)
+    if (parts.length < 2) {
+        throw new Error(`Invalid SquidRegion format: ${input}`);
+    }
+    let shard;
+    let region;
+    let cloudId;
+    let stage = 'prod';
+    if (parts.length === 2) {
+        // region.cloudId
+        [region, cloudId] = parts;
+    }
+    else if (parts.length === 3) {
+        if (parts[2] === 'prod') {
+            // region.cloudId.prod (explicit prod stage, rare case)
+            [region, cloudId, stage] = parts;
+        }
+        else {
+            // shard.region.cloudId (prod with shard)
+            [shard, region, cloudId] = parts;
+        }
+    }
+    else if (parts.length === 4) {
+        // shard.region.cloudId.stage
+        [shard, region, cloudId, stage] = parts;
+    }
+    else {
+        throw new Error(`Invalid SquidRegion format: ${input}`);
+    }
+    return { cloudId: cloudId, region, shard, stage: stage };
+}
+
+
 /***/ }),
 
 /***/ 1674:
@@ -4359,13 +4415,16 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
 const fs = __importStar(__webpack_require__(1943));
 const path_1 = __importDefault(__webpack_require__(6928));
-async function default_1(pathStr = './', appId, apiKey, environmentId, squidDeveloperId, region) {
-    const fileContent = `SQUID_APP_ID=${appId}
+async function default_1(consoleRegion, pathStr = './', appId, apiKey, environmentId, squidDeveloperId, region) {
+    let fileContent = `SQUID_APP_ID=${appId}
 SQUID_REGION=${region}
 SQUID_API_KEY=${apiKey}
 SQUID_ENVIRONMENT_ID=${environmentId}
 SQUID_DEVELOPER_ID=${squidDeveloperId}
-`;
+`.trim();
+    if (consoleRegion) {
+        fileContent += `\nSQUID_CONSOLE_REGION=${consoleRegion}`;
+    }
     await fs.writeFile(path_1.default.resolve(pathStr, '.env'), fileContent);
     console.log('Created .env file');
 }
@@ -8180,15 +8239,12 @@ module.exports = function bitIterator(nextBuffer) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.reportLocalBackendInitialized = reportLocalBackendInitialized;
 const assertic_1 = __webpack_require__(3205);
-const console_app_utils_1 = __webpack_require__(7580);
 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);
+async function reportLocalBackendInitialized(consoleRegion, appId, apiKey, verbose) {
     const url = `${(0, http_1.getApplicationUrl)(consoleRegion, environment_1.environment.consoleAppId, 'webhooks/reportLocalBackendInitialized')}`;
     if (verbose) {
-        console.log('Reporting backend initialization to Squid Console...', url, appRegion, stage);
+        console.log('Reporting backend initialization to Squid Console...', url);
     }
     try {
         const headers = new Headers();
@@ -11615,7 +11671,8 @@ const dotenv = __importStar(__webpack_require__(9650));
 const fsSync = __importStar(__webpack_require__(9896));
 const path_1 = __importDefault(__webpack_require__(6928));
 const yargs_1 = __importDefault(__webpack_require__(1771));
-const stage_1 = __webpack_require__(8058);
+const console_app_utils_1 = __webpack_require__(7580);
+const region_utils_1 = __webpack_require__(1665);
 const packageJson = __importStar(__webpack_require__(8330));
 const build_1 = __importDefault(__webpack_require__(8584));
 const deploy_1 = __importDefault(__webpack_require__(8705));
@@ -11659,10 +11716,11 @@ function setupDeployCommand(yargs) {
     yargs.command(['deploy [path]', 'upload [path]'], 'Builds and deploys your backend code to the Squid server', yargs => {
         yargs.positional('path', { type: 'string', description: 'The path to the bundle file (e.g. dist/bundle.zip)' });
         yargs.count('direct').alias('d', 'direct');
-        attachStageOption(yargs);
+        attachConsoleRegionOption(yargs);
         attachAppIdOption(yargs, false);
         attachApiKeyOption(yargs, false);
         attachEnvironmentIdOption(yargs, false);
+        attachRegionOption(yargs, false);
         attachInternalApiKeyOption(yargs);
         yargs.option('skipBuild', {
             type: 'boolean',
@@ -11681,27 +11739,30 @@ function setupDeployCommand(yargs) {
         const internalApiKey = argv.direct ? getInternalApiKeyFromCommandOrEnv(argv.internalApiKey) : undefined;
         if (!argv.direct && !apiKey)
             (0, process_utils_1.exitWithError)('Must provide an API key');
-        const stage = argv.stage;
-        (0, deploy_1.default)(stage, appId, bundlePath, apiKey, !!argv.verbose, argv.direct, isUserSpecifiedPath, !!argv.skipBuild, internalApiKey, environmentId).then();
+        const appRegion = geAppRegionFromCommandOrEnv(argv.region);
+        const consoleRegion = geConsoleRegionFromCommandOrEnv(argv.consoleRegion) || getConsoleRegionFromAppRegion(appRegion);
+        (0, deploy_1.default)(consoleRegion, appId, bundlePath, apiKey, !!argv.verbose, argv.direct, isUserSpecifiedPath, !!argv.skipBuild, internalApiKey, environmentId).then();
     });
 }
 function setupUndeployCommand(yargs) {
     yargs.command(['undeploy'], 'Undeploys your backend code from Squid Cloud', yargs => {
-        attachStageOption(yargs);
         attachAppIdOption(yargs, false);
         attachApiKeyOption(yargs, false);
         attachEnvironmentIdOption(yargs, false);
+        attachConsoleRegionOption(yargs);
+        attachRegionOption(yargs, false);
     }, async (argv) => {
         await (0, validate_1.validateSquidProject)();
         const baseDir = getEnvFolderPath();
         setupDotEnv(baseDir);
         const appId = getAppIdFromCommandOrEnv(argv.appId);
         const apiKey = getApiKeyFromCommandOrEnv(argv.apiKey);
-        const environmentId = getEnvironmentIdFromCommandOrEnv(argv.environmentId);
         if (!apiKey)
             (0, process_utils_1.exitWithError)('Must provide an API key');
-        const stage = argv.stage;
-        (0, undeploy_1.default)(stage, appId, apiKey, environmentId).then();
+        const environmentId = getEnvironmentIdFromCommandOrEnv(argv.environmentId);
+        const region = geAppRegionFromCommandOrEnv(undefined);
+        const consoleRegion = geConsoleRegionFromCommandOrEnv(argv.consoleRegion) || getConsoleRegionFromAppRegion(region);
+        (0, undeploy_1.default)(consoleRegion, appId, apiKey, environmentId).then();
     });
 }
 function setupInitEnvCommand(yargs) {
@@ -11712,9 +11773,10 @@ function setupInitEnvCommand(yargs) {
         attachEnvironmentIdOption(yargs, true);
         attachSquidDeveloperIdOption(yargs, true);
         attachRegionOption(yargs, true);
+        attachConsoleRegionOption(yargs);
     }, async (argv) => {
         await (0, validate_1.validateSquidProject)();
-        await (0, init_env_1.default)(argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region);
+        await (0, init_env_1.default)(argv.consoleRegion, argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region);
     });
 }
 function setupInitWebpackCommand(yargs) {
@@ -11731,8 +11793,12 @@ function setupInitCommand(yargs) {
         attachEnvironmentIdOption(yargs, false);
         attachSquidDeveloperIdOption(yargs, false);
         attachRegionOption(yargs, false);
+        attachConsoleRegionOption(yargs);
     }, async (argv) => {
-        await (0, sample_1.default)(argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region, 'backend', !!argv.verbose);
+        const appRegion = geAppRegionFromCommandOrEnv(argv.region);
+        const consoleRegion = geConsoleRegionFromCommandOrEnv(argv.consoleRegion) || getConsoleRegionFromAppRegion(appRegion);
+        await (0, sample_1.default)(consoleRegion, !!argv.consoleRegion, // If the console region is specified, we assume it's an on-prem console
+        argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region, 'backend', !!argv.verbose);
     });
 }
 function setupInitSampleCommand(yargs) {
@@ -11744,8 +11810,12 @@ function setupInitSampleCommand(yargs) {
         attachSquidDeveloperIdOption(yargs, false);
         attachRegionOption(yargs, false);
         attachTemplateOption(yargs, true);
+        attachConsoleRegionOption(yargs);
     }, async (argv) => {
-        await (0, sample_1.default)(argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region, argv.template, !!argv.verbose);
+        const appRegion = geAppRegionFromCommandOrEnv(argv.region);
+        const consoleRegion = geConsoleRegionFromCommandOrEnv(argv.consoleRegion) || getConsoleRegionFromAppRegion(appRegion);
+        await (0, sample_1.default)(consoleRegion, !!argv.consoleRegion, // If the console region is specified, we assume it's an on-prem console
+        argv.path, argv.appId, argv.apiKey, argv.environmentId, argv.squidDeveloperId, argv.region, argv.template, !!argv.verbose);
     });
 }
 function setupBuildCommand(yargs) {
@@ -11837,6 +11907,16 @@ function getEnvironmentIdFromCommandOrEnv(environmentId) {
         return environmentId;
     return getEnvVarOrFail('SQUID_ENVIRONMENT_ID', '--environmentId');
 }
+function geAppRegionFromCommandOrEnv(appRegion) {
+    if (appRegion)
+        return appRegion;
+    return getEnvVarOrFail('SQUID_REGION', '--region');
+}
+function geConsoleRegionFromCommandOrEnv(consoleRegion) {
+    if (consoleRegion)
+        return consoleRegion;
+    return process.env['SQUID_CONSOLE_REGION'];
+}
 function getInternalApiKeyFromCommandOrEnv(internalApiKey) {
     if (internalApiKey)
         return internalApiKey;
@@ -11845,12 +11925,12 @@ function getInternalApiKeyFromCommandOrEnv(internalApiKey) {
         return envInternalApiKey;
     (0, process_utils_1.exitWithError)('Squid internal API key was not provided when using -d');
 }
-function attachStageOption(yargs) {
-    yargs.option('stage', {
+function attachConsoleRegionOption(yargs) {
+    yargs.option('consoleRegion', {
         type: 'string',
         hidden: true,
-        default: 'prod',
-        choices: stage_1.STAGES,
+        default: '',
+        demandOption: false,
     });
 }
 function getEnvFolderPath(bundlePath) {
@@ -11866,6 +11946,10 @@ function getEnvFolderPath(bundlePath) {
     // 3. Return current path
     return process.cwd();
 }
+function getConsoleRegionFromAppRegion(appRegion) {
+    const regionParts = (0, region_utils_1.parseSquidRegion)(appRegion);
+    return (0, console_app_utils_1.getConsoleAppRegionByStage)(regionParts.stage);
+}
 
 
 /***/ }),
@@ -11962,13 +12046,14 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = initSample;
 const promises_1 = __importDefault(__webpack_require__(1943));
 const path_1 = __importDefault(__webpack_require__(6928));
+const communication_types_1 = __webpack_require__(3443);
 const shell_runner_1 = __webpack_require__(3089);
 const git_utils_1 = __webpack_require__(954);
 const logging_1 = __webpack_require__(443);
 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) {
+async function initSample(consoleRegion, isOnPremConsole, dirPath, appId, apiKey, environmentId, squidDeveloperId, region, templateName, verbose = false) {
     try {
         await promises_1.default.stat(path_1.default.resolve(dirPath));
         (0, process_utils_1.exitWithError)(`Project already exists: ${dirPath}`);
@@ -11983,7 +12068,6 @@ async function initSample(dirPath, appId, apiKey, environmentId, squidDeveloperI
     console.log(`Downloading ${templateRepoPath}...`);
     try {
         await (0, git_utils_1.downloadRepo)(ORG, templateName, dirPath);
-        // Delete the `.github` directory if it exists.
         await promises_1.default.rm(`${dirPath}/.github`, { recursive: true, force: true });
     }
     catch {
@@ -12008,12 +12092,15 @@ async function initSample(dirPath, appId, apiKey, environmentId, squidDeveloperI
     }
     catch { }
     const hasEnvars = appId && region && apiKey && environmentId && squidDeveloperId;
-    const backendEnvFileContent = `SQUID_APP_ID=${appId || ''}
+    let backendEnvFileContent = `SQUID_APP_ID=${appId || ''}
 SQUID_REGION=${region || ''}
 SQUID_API_KEY=${apiKey || ''}
 SQUID_ENVIRONMENT_ID=${environmentId || ''}
 SQUID_DEVELOPER_ID=${squidDeveloperId || ''}
-`;
+`.trim();
+    if (isOnPremConsole) {
+        backendEnvFileContent += `\nSQUID_CONSOLE_REGION=${consoleRegion}`;
+    }
     await promises_1.default.writeFile(path_1.default.resolve(dirPath, monorepo ? 'backend' : '', '.env'), backendEnvFileContent);
     if (hasEnvars)
         console.log(`${monorepo ? 'Backend ' : ''}.env file created successfully`);
@@ -12032,7 +12119,7 @@ ${(0, logging_1.primary)('Done. Now run:')}
   cd ${dirPath}
   npm run start
 `);
-        await (0, report_utils_1.reportLocalBackendInitialized)(`${appId}-${environmentId}-${squidDeveloperId}`, apiKey, region, verbose);
+        await (0, report_utils_1.reportLocalBackendInitialized)(consoleRegion, (0, communication_types_1.appIdWithEnvironmentIdAndDevId)(appId, environmentId, squidDeveloperId), apiKey, verbose);
     }
     else {
         console.log((0, logging_1.link)('https://console.getsquid.ai'));
@@ -22288,25 +22375,6 @@ module.exports = function forEachBail(array, iterator, callback) {
 };
 
 
-/***/ }),
-
-/***/ 8058:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.STAGES = void 0;
-/**
- * Stage of the Squid deployment:
- * - 'local' - Squid is run locally.
- * - 'prod' - Production environment (https://console.getsquid.ai).
- * - 'sandbox' - One of the sandbox environments  (https://console.sandbox.squid.cloud).
- * - 'staging' - One of the staging environments  (https://console.staging.squid.cloud).
- */
-exports.STAGES = ['local', 'prod', 'sandbox', 'staging'];
-
-
 /***/ }),
 
 /***/ 8165:
@@ -22550,7 +22618,7 @@ function exitWithError(...messages) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.395","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.395","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.101.3","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/decompress":"^4.2.7","@types/node":"^20.19.9","terminal-link":"^3.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@squidcloud/cli","version":"1.0.397","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.397","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.101.3","zip-webpack-plugin":"^4.0.1"},"devDependencies":{"@types/decompress":"^4.2.7","@types/node":"^20.19.9","terminal-link":"^3.0.0"}}');
 
 /***/ }),
 
@@ -23281,12 +23349,11 @@ exports["default"] = default_1;
 const assertic_1 = __webpack_require__(3205);
 const fs = __importStar(__webpack_require__(1943));
 const communication_types_1 = __webpack_require__(3443);
-const console_app_utils_1 = __webpack_require__(7580);
 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) {
+async function default_1(consoleRegion, appId, bundlePath, apiKey, verbose, direct, isUserSpecifiedPath, skipBuild, internalApiKey, environmentId) {
     if (!direct && !isUserSpecifiedPath && !skipBuild) {
         console.log('Building code bundle...');
         await (0, shell_runner_1.runInShell)('npm run build');
@@ -23297,10 +23364,9 @@ async function default_1(stage, appId, bundlePath, apiKey, verbose, direct, isUs
     const fileData = await fs.readFile(bundlePath);
     const bundleDataAsBlob = new Blob([new Uint8Array(fileData)], { type: 'application/octet-stream' });
     form.append('file', bundleDataAsBlob);
-    const regionPrefix = (0, console_app_utils_1.getConsoleAppRegionByStage)(stage);
     const updateCodeUrl = direct
-        ? (0, http_1.getApplicationUrl)(regionPrefix, appIdWithEnvId, 'application/updateApplicationCode')
-        : (0, http_1.getApplicationUrl)(regionPrefix, environment_1.environment.consoleAppId, 'webhooks/updateApplicationCode');
+        ? (0, http_1.getApplicationUrl)(consoleRegion, appIdWithEnvId, 'application/updateApplicationCode')
+        : (0, http_1.getApplicationUrl)(consoleRegion, environment_1.environment.consoleAppId, 'webhooks/updateApplicationCode');
     console.log(`Deploying code bundle for appId '${appId}' to the '${environmentId}' environment...`);
     if (verbose) {
         console.log('Deploying bundle to:', updateCodeUrl);
@@ -24808,14 +24874,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = default_1;
 const assertic_1 = __webpack_require__(3205);
 const communication_types_1 = __webpack_require__(3443);
-const console_app_utils_1 = __webpack_require__(7580);
 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) {
+async function default_1(consoleRegion, appId, apiKey, environmentId) {
     const appIdWithEnvId = (0, communication_types_1.appIdWithEnvironmentId)(appId, environmentId);
-    const regionPrefix = (0, console_app_utils_1.getConsoleAppRegionByStage)(stage);
-    const deleteApplicationCodeUrl = (0, http_1.getApplicationUrl)(regionPrefix, environment_1.environment.consoleAppId, 'webhooks/deleteApplicationCode');
+    const deleteApplicationCodeUrl = (0, http_1.getApplicationUrl)(consoleRegion, environment_1.environment.consoleAppId, 'webhooks/deleteApplicationCode');
     console.log(`Undeploying code bundle for appId '${appId}' from the '${environmentId}' environment...`);
     try {
         const headers = new Headers();

package/package.json

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