@dainprotocol/cli 1.0.4 → 1.0.6

package/dist/commands/build.js

@@ -68,19 +68,20 @@ var utils_1 = require("../utils");
 var ora_1 = __importDefault(require("ora"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var path_1 = __importDefault(require("path"));
-function build() {
+function build(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var spinner, config, staticDir, error_1;
+        var spinner, config, outDir, staticDir, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     spinner = (0, ora_1.default)('Building project...').start();
-                    config = (0, utils_1.getDainConfig)();
+                    config = (0, utils_1.getDainConfig)(options.config);
+                    outDir = config['out-dir'] || 'build';
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 7, , 8]);
                     // Ensure build directory exists
-                    return [4 /*yield*/, fs_extra_1.default.ensureDir('build')];
+                    return [4 /*yield*/, fs_extra_1.default.ensureDir(outDir)];
                 case 2:
                     // Ensure build directory exists
                     _a.sent();
@@ -90,26 +91,28 @@ function build() {
                             bundle: true,
                             platform: 'node',
                             target: 'node14',
-                            outfile: 'build/index.js',
+                            outfile: path_1.default.join(outDir, 'index.js'),
                             minify: true,
                             sourcemap: true,
                         })];
                 case 3:
                     // Build the main application
                     _a.sent();
-                    staticDir = path_1.default.join(process.cwd(), 'static');
+                    staticDir = config['static-dir']
+                        ? path_1.default.join(process.cwd(), config['static-dir'])
+                        : path_1.default.join(process.cwd(), 'static');
                     if (!fs_extra_1.default.existsSync(staticDir)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, fs_extra_1.default.copy(staticDir, 'build/static')];
+                    return [4 /*yield*/, fs_extra_1.default.copy(staticDir, path_1.default.join(outDir, 'static'))];
                 case 4:
                     _a.sent();
-                    (0, utils_1.logInfo)('Static files copied to build/static');
+                    (0, utils_1.logInfo)("Static files copied to ".concat(path_1.default.join(outDir, 'static')));
                     return [3 /*break*/, 6];
                 case 5:
                     (0, utils_1.logInfo)('No static directory found. Skipping static file copy.');
                     _a.label = 6;
                 case 6:
                     spinner.succeed('Build completed successfully.');
-                    (0, utils_1.logSuccess)('Project built and ready for deployment.');
+                    (0, utils_1.logSuccess)("Project built and ready for deployment in ".concat(outDir, "."));
                     return [3 /*break*/, 8];
                 case 7:
                     error_1 = _a.sent();

package/dist/commands/deploy.js

@@ -44,25 +44,28 @@ var build_1 = __importDefault(require("./build"));
 var utils_1 = require("../utils");
 var ora_1 = __importDefault(require("ora"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
-function deploy() {
+var path_1 = __importDefault(require("path"));
+function deploy(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var spinner, staticFilesPath, error_1;
+        var config, spinner, outDir, staticFilesPath, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    config = (0, utils_1.getDainConfig)(options.config);
                     spinner = (0, ora_1.default)("Deploying project...").start();
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
                     // First, build the project
-                    return [4 /*yield*/, (0, build_1.default)()];
+                    return [4 /*yield*/, (0, build_1.default)({ config: options.config })];
                 case 2:
                     // First, build the project
                     _a.sent();
+                    outDir = config['out-dir'] || 'build';
                     // Here you would add your deployment logic
-                    // For example, uploading the build/index.js file and static files to your server
+                    // For example, uploading the outDir/index.js file and static files to your server
                     (0, utils_1.logInfo)("Deployment logic to be implemented");
-                    staticFilesPath = (0, utils_1.getStaticFilesPath)();
+                    staticFilesPath = path_1.default.join(outDir, 'static');
                     if (fs_extra_1.default.existsSync(staticFilesPath)) {
                         (0, utils_1.logInfo)("Static files are available at: ".concat(staticFilesPath));
                         // Here you would implement the logic to deploy these static files
@@ -78,6 +81,7 @@ function deploy() {
                     error_1 = _a.sent();
                     spinner.fail("Deployment failed.");
                     (0, utils_1.logError)("Error during deployment", error_1);
+                    process.exit(1);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
             }

package/dist/commands/dev.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -47,13 +58,13 @@ var chokidar_1 = __importDefault(require("chokidar"));
 var path_1 = __importDefault(require("path"));
 var childProcess = null;
 var watcher = null;
-function startProcess(command) {
+function startProcess(command, env) {
     var _a, _b;
     if (childProcess) {
         childProcess.kill();
     }
     var spinner = (0, ora_1.default)('Starting development server...').start();
-    childProcess = (0, child_process_1.exec)(command);
+    childProcess = (0, child_process_1.exec)(command, { env: __assign(__assign({}, process.env), env) });
     (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', function (data) {
         spinner.succeed('Development server started.');
         console.log(data);
@@ -82,27 +93,36 @@ function cleanup() {
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, command, proxyServer, watchPaths, error_1;
+        var config, command, envVars, proxyServer, watchPaths, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    process.env.PORT = options.port;
-                    config = (0, utils_1.getDainConfig)();
+                    config = (0, utils_1.getDainConfig)(options.config);
                     command = "ts-node ".concat(config['main-file']);
+                    envVars = {
+                        PORT: options.port,
+                        DAIN_API_KEY: config['api-key'],
+                        DAIN_PROJECT_ID: config['project-id'],
+                        DAIN_ENVIRONMENT: config['environment'],
+                        DAIN_OUT_DIR: config['out-dir']
+                    };
                     proxyServer = null;
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 4, , 5]);
-                    startProcess(command);
+                    startProcess(command, envVars);
                     if (!!options.noproxy) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_1.setupProxy)(options.port)];
+                    if (!config['api-key']) {
+                        throw new Error("'api-key' is required when using development proxy");
+                    }
+                    return [4 /*yield*/, (0, utils_1.setupProxy)(options.port, config['api-key'])];
                 case 2:
                     proxyServer = _a.sent();
                     _a.label = 3;
                 case 3:
                     watchPaths = [
                         path_1.default.dirname(config['main-file']),
-                        (0, utils_1.getStaticFilesPath)()
+                        config['static-dir'] ? path_1.default.join(process.cwd(), config['static-dir']) : (0, utils_1.getStaticFilesPath)()
                     ];
                     watcher = chokidar_1.default.watch(watchPaths, {
                         ignored: /(^|[\/\\])\../, // ignore dotfiles
@@ -110,7 +130,7 @@ function dev(options) {
                     });
                     watcher.on('change', function (path) {
                         (0, utils_1.logInfo)("File ".concat(path, " has been changed. Restarting..."));
-                        startProcess(command);
+                        startProcess(command, envVars);
                     });
                     (0, utils_1.logInfo)('Watching for file changes...');
                     // Add signal handlers for graceful shutdown

package/dist/index.js

@@ -30,20 +30,23 @@ program
     .description('Run the project in development mode')
     .option('--port <port>', 'Set the port number', '2022')
     .option('--noproxy', 'Disable localtunnel proxy')
+    .option('-c, --config <path>', 'Path to custom configuration file')
     .action(function (options) {
     (0, dev_1.default)(options);
 });
 program
     .command('deploy')
     .description('Deploy the project')
-    .action(function () {
-    (0, deploy_1.default)();
+    .option('-c, --config <path>', 'Path to custom configuration file')
+    .action(function (options) {
+    (0, deploy_1.default)(options);
 });
 program
     .command('build')
     .description('Build the project')
-    .action(function () {
-    (0, build_1.default)();
+    .option('-c, --config <path>', 'Path to custom configuration file')
+    .action(function (options) {
+    (0, build_1.default)(options);
 });
 program
     .command('start')

package/dist/templates/default/dain.json

@@ -1,5 +1,10 @@
 {
   "project-id": "",
-  "project-api-key": "",
-  "main-file": "src/index.ts"
+  "api-key": "",
+  "main-file": "src/index.ts",
+  "static-dir": "static",
+  "out-dir": "dist",
+  "environment": "development",
+  "version": "1.0.0",
+  "tunnel-base-url": "wss:///devtunnel.dain-local.com"
 }

package/dist/templates/default/package.json

@@ -16,6 +16,7 @@
   "devDependencies": {
     "@types/express": "^4.17.13",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.4",
+    "@types/node": "^22.5.4"
   }
 }

package/dist/utils.js

@@ -50,13 +50,54 @@ var path_1 = __importDefault(require("path"));
 var client_1 = require("@dainprotocol/tunnel/client");
 var ora_1 = __importDefault(require("ora"));
 var chalk_1 = __importDefault(require("chalk"));
-function getDainConfig() {
-    var configPath = path_1.default.join(process.cwd(), 'dain.json');
-    return JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+var dotenv_1 = __importDefault(require("dotenv"));
+function loadEnvFiles() {
+    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)) {
+            dotenv_1.default.config({ path: envPath });
+        }
+    });
+}
+function getDainConfig(configFile) {
+    loadEnvFiles(); // Load environment variables from files
+    var defaultConfigPath = path_1.default.join(process.cwd(), 'dain.json');
+    var configPath = configFile ? path_1.default.join(process.cwd(), configFile) : defaultConfigPath;
+    if (!fs_1.default.existsSync(configPath)) {
+        throw new Error("Configuration file not found: ".concat(configPath));
+    }
+    try {
+        var configData = fs_1.default.readFileSync(configPath, 'utf8');
+        var config = JSON.parse(configData);
+        // Validate required fields
+        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:///devtunnel.dain-local.com'; // Default value if not specified
+        // Handle API key
+        if (config['api-key'] === 'env') {
+            config['api-key'] = process.env.DAIN_API_KEY;
+            if (!config['api-key']) {
+                throw new Error("DAIN_API_KEY environment variable is not set");
+            }
+        }
+        else if (config['api-key'] && typeof config['api-key'] !== 'string') {
+            throw new Error("'api-key' must be a string or 'env'");
+        }
+        return config;
+    }
+    catch (error) {
+        throw new Error("Error reading or parsing configuration file: ".concat(error));
+    }
 }
-function setupProxy(port) {
+function setupProxy(port, apiKey) {
     return __awaiter(this, void 0, void 0, function () {
-        var spinner, client, tunnelUrl, error_1;
+        var spinner, config, client, tunnelUrl, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -64,7 +105,8 @@ function setupProxy(port) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    client = new client_1.DainTunnel('wss:///devtunnel.dain-local.com');
+                    config = getDainConfig();
+                    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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "CLI for Dain Protocol",
   "main": "dist/index.js",
   "bin": {
@@ -15,12 +15,13 @@
     "templates"
   ],
   "dependencies": {
-    "@dainprotocol/tunnel": "^1.0.1",
+    "@dainprotocol/tunnel": "^1.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/localtunnel": "^2.0.4",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "commander": "^11.1.0",
+    "dotenv": "^16.4.5",
     "esbuild": "^0.23.1",
     "fs-extra": "^11.2.0",
     "localtunnel": "^2.0.2",

package/templates/default/dain.json

@@ -1,5 +1,10 @@
 {
   "project-id": "",
-  "project-api-key": "",
-  "main-file": "src/index.ts"
+  "api-key": "",
+  "main-file": "src/index.ts",
+  "static-dir": "static",
+  "out-dir": "dist",
+  "environment": "development",
+  "version": "1.0.0",
+  "tunnel-base-url": "wss:///devtunnel.dain-local.com"
 }

package/templates/default/package.json

@@ -16,6 +16,7 @@
   "devDependencies": {
     "@types/express": "^4.17.13",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.4",
+    "@types/node": "^22.5.4"
   }
 }