@dainprotocol/cli 1.0.43 → 1.0.45

package/dist/utils.js

@@ -45,6 +45,7 @@ exports.logError = logError;
 exports.logSuccess = logSuccess;
 exports.logInfo = logInfo;
 exports.getStaticFilesPath = getStaticFilesPath;
+exports.extractOrgId = extractOrgId;
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var client_1 = require("@dainprotocol/tunnel/client");
@@ -52,12 +53,7 @@ var ora_1 = __importDefault(require("ora"));
 var chalk_1 = __importDefault(require("chalk"));
 var dotenv_1 = __importDefault(require("dotenv"));
 function loadEnvFiles() {
-    var envFiles = [
-        ".env.local",
-        ".env",
-        ".env.development",
-        ".env.production",
-    ];
+    var envFiles = ['.env.local', '.env', '.env.development', '.env.production'];
     envFiles.forEach(function (file) {
         var envPath = path_1.default.join(process.cwd(), file);
         if (fs_1.default.existsSync(envPath)) {
@@ -67,34 +63,37 @@ function loadEnvFiles() {
 }
 function getDainConfig(configFile) {
     loadEnvFiles(); // Load environment variables from files
-    var defaultConfigPath = path_1.default.join(process.cwd(), "dain.json");
+    var defaultConfigPath = path_1.default.join(process.cwd(), 'dain.json');
     var configPath = configFile
         ? path_1.default.join(process.cwd(), configFile)
         : defaultConfigPath;
-    console.log("Config path: ", configPath);
+    console.log('Config path: ', configPath);
     if (!fs_1.default.existsSync(configPath)) {
-        throw new Error("Configuration file not found: ".concat(configPath));
+        logError("Configuration file not found: ".concat(configPath));
+        process.exit(1);
     }
     try {
-        var configData = fs_1.default.readFileSync(configPath, "utf8");
+        var configData = fs_1.default.readFileSync(configPath, 'utf8');
         var config = JSON.parse(configData);
         // Validate required fields
-        if (!config["main-file"]) {
+        if (!config['main-file']) {
             throw new Error("Configuration must include 'main-file'");
         }
         // Set default values for optional fields
-        config["environment"] = config["environment"] || "development";
-        config["version"] = config["version"] || "1.0.0";
-        config["out-dir"] = config["out-dir"] || "dist"; // Default to 'dist' if not specified
-        config["tunnel-base-url"] =
-            config["tunnel-base-url"] || "wss:///tunnel.dain-local.com"; // Default value if not specified
-        config["runtime"] = config["runtime"] || "node"; // Add this line
+        config['environment'] = config['environment'] || 'development';
+        config['version'] = config['version'] || '1.0.0';
+        config['out-dir'] = config['out-dir'] || 'dist'; // Default to 'dist' if not specified
+        config['tunnel-base-url'] =
+            config['tunnel-base-url'] || 'wss:///tunnel.dain-local.com'; // Default value if not specified
+        config['runtime'] = config['runtime'] || 'node'; // Add this line
         // Handle API key
-        if (!config["api-key"] || config["api-key"] === "env" || config["api-key"] === "MUST PUT IN .env.development as DAIN_API_KEY=YOUR_API_KEY") {
-            config["api-key"] = process.env.DAIN_API_KEY;
+        if (!config['api-key'] ||
+            config['api-key'] === 'env' ||
+            config['api-key'] === 'MUST PUT IN .env.development as DAIN_API_KEY=YOUR_API_KEY') {
+            config['api-key'] = process.env.DAIN_API_KEY;
         }
-        if (!config["api-key"]) {
-            throw new Error("API key is not set in config or DAIN_API_KEY environment variable");
+        if (!config['api-key']) {
+            throw new Error('API key is not set in config or DAIN_API_KEY environment variable');
         }
         return config;
     }
@@ -108,19 +107,21 @@ function setupProxy(port, apiKey, config) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    spinner = (0, ora_1.default)("Setting up proxy...").start();
+                    spinner = (0, ora_1.default)('Setting up proxy...').start();
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    client = new client_1.DainTunnel(config["tunnel-base-url"] || "wss:///tunnel.dain-local.com", apiKey);
+                    client = new client_1.DainTunnel(config['tunnel-base-url'] || 'wss:///tunnel.dain-local.com', apiKey);
                     return [4 /*yield*/, client.start(parseInt(port))];
                 case 2:
                     tunnelUrl = _a.sent();
-                    spinner.succeed(chalk_1.default.green("\n------------------------------------------------------------\nYour service is available publicly at: ") + chalk_1.default.cyan.underline("".concat(tunnelUrl)) + chalk_1.default.green("\n------------------------------------------------------------\n"));
+                    spinner.succeed(chalk_1.default.green("\n------------------------------------------------------------\nYour service is available publicly at: ") +
+                        chalk_1.default.cyan.underline("".concat(tunnelUrl)) +
+                        chalk_1.default.green("\n------------------------------------------------------------\n"));
                     return [2 /*return*/, client];
                 case 3:
                     error_1 = _a.sent();
-                    spinner.fail(chalk_1.default.red("Error setting up proxy"));
+                    spinner.fail(chalk_1.default.red('\nError setting up proxy'));
                     console.error(chalk_1.default.red(error_1));
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
@@ -129,17 +130,21 @@ function setupProxy(port, apiKey, config) {
     });
 }
 function logError(message, error) {
-    console.error(chalk_1.default.red("Error: ".concat(message)));
+    console.error(chalk_1.default.red("\nError: ".concat(message)));
     if (error) {
         console.error(chalk_1.default.red(error));
     }
 }
 function logSuccess(message) {
-    console.log(chalk_1.default.green("Success: ".concat(message)));
+    console.log(chalk_1.default.green("\nSuccess: ".concat(message)));
 }
 function logInfo(message) {
-    console.log(chalk_1.default.blue("Info: ".concat(message)));
+    console.log(chalk_1.default.blue("\nInfo: ".concat(message)));
 }
 function getStaticFilesPath() {
-    return path_1.default.join(process.cwd(), "static");
+    return path_1.default.join(process.cwd(), 'static');
+}
+function extractOrgId(apiKey) {
+    var apiKeySplit = apiKey === null || apiKey === void 0 ? void 0 : apiKey.split('_');
+    return apiKeySplit ? apiKeySplit[2] : '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -11,7 +11,7 @@
     "dain": "./dist/index.js"
   },
   "scripts": {
-    "build": "tsc && cp -r templates dist/",
+    "build": "tsc",
     "prepublishOnly": "pnpm run build"
   },
   "files": [
@@ -26,6 +26,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/localtunnel": "^2.0.4",
     "ai": "^3.3.41",
+    "archiver": "^7.0.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "commander": "^11.1.0",
@@ -37,8 +38,9 @@
     "ora": "^3.4.0"
   },
   "devDependencies": {
+    "@types/archiver": "^6.0.3",
     "@types/node": "^22.5.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   }
-}
+}

package/templates/default/.env.development

@@ -1 +1 @@
-DAIN_API_KEY=
+DAIN_API_KEY=NEED_TO_BE_SET

package/templates/default/dain.json

@@ -7,6 +7,5 @@
   "environment": "development",
   "version": "1.0.0",
   "tunnel-base-url": "wss:///tunnel.dain-local.com",
-  "platform-base-url": "https://platform.dain.org",
-  "runtime": "node"
-}
+  "deployment-id": ""
+}