@dainprotocol/cli 1.0.10 → 1.0.12

package/dist/commands/build.js

@@ -70,57 +70,92 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
 var path_1 = __importDefault(require("path"));
 function build(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var spinner, config, outDir, staticDir, error_1;
+        var spinner, config, runtime, outDir, dainDir, buildOptions, context, staticDir, staticOutDir, 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)(options.config);
+                    runtime = options.runtime || config.runtime || 'node';
                     outDir = config['out-dir'] || 'build';
+                    dainDir = path_1.default.join(process.cwd(), '.dain');
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 7, , 8]);
+                    _a.trys.push([1, 12, , 13]);
                     // Ensure build directory exists
                     return [4 /*yield*/, fs_extra_1.default.ensureDir(outDir)];
                 case 2:
                     // Ensure build directory exists
                     _a.sent();
-                    // Build the main application
-                    return [4 /*yield*/, esbuild.build({
-                            entryPoints: [config['main-file']],
-                            bundle: true,
+                    buildOptions = {
+                        entryPoints: [config['main-file']],
+                        bundle: true,
+                        sourcemap: true,
+                        outdir: options.watch ? dainDir : outDir,
+                    };
+                    if (runtime === 'node') {
+                        // Node.js build process
+                        Object.assign(buildOptions, {
                             platform: 'node',
                             target: 'node14',
-                            outfile: path_1.default.join(outDir, 'index.js'),
-                            minify: true,
-                            sourcemap: true,
-                        })];
+                            minify: !options.watch,
+                        });
+                    }
+                    else if (runtime === 'workers') {
+                        // Cloudflare Workers build process
+                        Object.assign(buildOptions, {
+                            format: 'esm',
+                            target: 'esnext',
+                            conditions: ['worker', 'workerd', 'browser'],
+                            outExtension: { '.js': '.mjs' },
+                        });
+                    }
+                    else {
+                        throw new Error("Unsupported runtime: ".concat(runtime));
+                    }
+                    if (!options.watch) return [3 /*break*/, 6];
+                    // Ensure .dain directory exists for watch mode
+                    return [4 /*yield*/, fs_extra_1.default.ensureDir(dainDir)];
                 case 3:
-                    // Build the main application
+                    // Ensure .dain directory exists for watch mode
                     _a.sent();
+                    return [4 /*yield*/, esbuild.context(buildOptions)];
+                case 4:
+                    context = _a.sent();
+                    return [4 /*yield*/, context.watch()];
+                case 5:
+                    _a.sent();
+                    (0, utils_1.logInfo)('Watching for file changes...');
+                    return [3 /*break*/, 8];
+                case 6: return [4 /*yield*/, esbuild.build(buildOptions)];
+                case 7:
+                    _a.sent();
+                    _a.label = 8;
+                case 8:
                     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, path_1.default.join(outDir, 'static'))];
-                case 4:
+                    if (!fs_extra_1.default.existsSync(staticDir)) return [3 /*break*/, 10];
+                    staticOutDir = path_1.default.join(options.watch ? dainDir : outDir, 'static');
+                    return [4 /*yield*/, fs_extra_1.default.copy(staticDir, staticOutDir)];
+                case 9:
                     _a.sent();
-                    (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)("Static files copied to ".concat(staticOutDir));
+                    return [3 /*break*/, 11];
+                case 10:
                     (0, utils_1.logInfo)('No static directory found. Skipping static file copy.');
-                    _a.label = 6;
-                case 6:
+                    _a.label = 11;
+                case 11:
                     spinner.succeed('Build completed successfully.');
-                    (0, utils_1.logSuccess)("Project built and ready for deployment in ".concat(outDir, "."));
-                    return [3 /*break*/, 8];
-                case 7:
+                    (0, utils_1.logSuccess)("Project built and ready for ".concat(runtime, " runtime in ").concat(options.watch ? dainDir : outDir, "."));
+                    return [3 /*break*/, 13];
+                case 12:
                     error_1 = _a.sent();
                     spinner.fail('Build failed.');
                     (0, utils_1.logError)('Build process encountered an error', error_1);
                     process.exit(1);
-                    return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+                    return [3 /*break*/, 13];
+                case 13: return [2 /*return*/];
             }
         });
     });

package/dist/commands/config.js

@@ -66,6 +66,10 @@ function config(action, key, value) {
                     return [3 /*break*/, 6];
                 case 3:
                     if (!(action === 'edit' && key && value)) return [3 /*break*/, 5];
+                    if (key === 'runtime' && !['node', 'workers'].includes(value)) {
+                        (0, utils_1.logError)('Invalid runtime. Use "node" or "workers"');
+                        return [2 /*return*/];
+                    }
                     config_1[key] = value;
                     return [4 /*yield*/, fs_extra_1.default.writeJSON(configPath, config_1, { spaces: 2 })];
                 case 4:

package/dist/commands/dev.js

@@ -56,8 +56,12 @@ var utils_1 = require("../utils");
 var ora_1 = __importDefault(require("ora"));
 var chokidar_1 = __importDefault(require("chokidar"));
 var path_1 = __importDefault(require("path"));
+var miniflare_1 = require("miniflare");
+var build_1 = __importDefault(require("./build"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
 var childProcess = null;
 var watcher = null;
+var mf = null;
 function startProcess(command, env) {
     var _a, _b;
     if (childProcess) {
@@ -88,16 +92,23 @@ function cleanup() {
         watcher.close();
         watcher = null;
     }
+    if (mf) {
+        mf.dispose();
+        mf = null;
+    }
     (0, utils_1.logInfo)('Development server and file watcher stopped.');
     process.exit(0);
 }
 function dev(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, command, envVars, proxyServer, watchPaths, error_1;
+        var config, runtime, command, envVars, proxyServer, watchPaths, dainDir, outFile, MFconfig_1, debounceTimer_1, watchDirs, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     config = (0, utils_1.getDainConfig)(options.config);
+                    console.log("Config: " + JSON.stringify(config));
+                    runtime = options.runtime || config.runtime || 'node';
+                    console.log("Runtime: " + runtime);
                     command = "ts-node ".concat(config['main-file']);
                     envVars = {
                         PORT: options.port,
@@ -109,7 +120,9 @@ function dev(options) {
                     proxyServer = null;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
+                    _a.trys.push([1, 8, , 9]);
+                    if (!(runtime === 'node')) return [3 /*break*/, 4];
+                    // Existing Node.js development process
                     startProcess(command, envVars);
                     if (!!options.noproxy) return [3 /*break*/, 3];
                     if (!config['api-key']) {
@@ -185,18 +198,53 @@ function dev(options) {
                             process.exit(1);
                         }, 500);
                     });
-                    return [3 /*break*/, 5];
+                    return [3 /*break*/, 7];
                 case 4:
+                    if (!(runtime === 'workers')) return [3 /*break*/, 6];
+                    dainDir = path_1.default.join(process.cwd(), '.dain');
+                    outFile = path_1.default.join(dainDir, path_1.default.basename(config['main-file'], '.ts') + '.mjs');
+                    // Start the build process in watch mode
+                    return [4 /*yield*/, (0, build_1.default)({ config: options.config, runtime: 'workers', watch: true, })];
+                case 5:
+                    // Start the build process in watch mode
+                    _a.sent();
+                    MFconfig_1 = {
+                        scriptPath: outFile,
+                        modules: true,
+                        port: parseInt(options.port),
+                        log: new miniflare_1.Log(miniflare_1.LogLevel.DEBUG),
+                        liveReload: true,
+                    };
+                    mf = new miniflare_1.Miniflare(MFconfig_1);
+                    (0, utils_1.logSuccess)("Miniflare server started on port ".concat(options.port));
+                    watchDirs = [dainDir];
+                    watchDirs.forEach(function (dir) {
+                        fs_extra_1.default.watch(dir, { recursive: true }, function (eventType, filename) {
+                            clearTimeout(debounceTimer_1);
+                            debounceTimer_1 = setTimeout(function () {
+                                if (mf) {
+                                    //  mf.setOptions({ scriptPath: outFile });
+                                    mf.setOptions(MFconfig_1);
+                                    (0, utils_1.logInfo)("Build updated (".concat(filename, ")"));
+                                }
+                            }, 300); // 300ms debounce time
+                        });
+                    });
+                    (0, utils_1.logInfo)('Watching for file changes in source and build directories...');
+                    return [3 /*break*/, 7];
+                case 6: throw new Error("Unsupported runtime: ".concat(runtime));
+                case 7: return [3 /*break*/, 9];
+                case 8:
                     error_1 = _a.sent();
-                    (0, utils_1.logError)('Error in dev process:', error_1);
+                    (0, utils_1.logError)("Error in dev process for ".concat(runtime, " runtime:"), error_1);
                     cleanup();
                     if (proxyServer)
                         proxyServer.close();
                     setTimeout(function () {
                         process.exit(1);
                     }, 500);
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     });

package/dist/index.js

@@ -31,6 +31,7 @@ program
     .option('--port <port>', 'Set the port number', '2022')
     .option('--noproxy', 'Disable localtunnel proxy')
     .option('-c, --config <path>', 'Path to custom configuration file')
+    .option('--runtime <runtime>', 'Specify the runtime (node or workers)')
     .action(function (options) {
     (0, dev_1.default)(options);
 });
@@ -45,6 +46,7 @@ program
     .command('build')
     .description('Build the project')
     .option('-c, --config <path>', 'Path to custom configuration file')
+    .option('--runtime <runtime>', 'Specify the runtime (node or workers)', 'node')
     .action(function (options) {
     (0, build_1.default)(options);
 });

package/dist/templates/default/dain.json

@@ -6,5 +6,6 @@
   "out-dir": "dist",
   "environment": "development",
   "version": "1.0.0",
-  "tunnel-base-url": "wss:///devtunnel.dain-local.com"
+  "tunnel-base-url": "wss:///devtunnel.dain-local.com",
+  "runtime": "workers"
 }

package/dist/templates/default/src/index.ts

@@ -1,8 +1,10 @@
+//File: example/example-node.ts
+
 import { z } from "zod";
 
-import { DAINService } from "@dainprotocol/service-sdk";
+import { defineDAINService , ToolConfig, ServiceConfig, ToolboxConfig} from "@dainprotocol/service-sdk";
 
-const getWeatherConfig: DAINService.ToolConfig = {
+const getWeatherConfig: ToolConfig = {
   id: "get-weather",
   name: "Get Weather",
   description: "Fetches current weather for a city",
@@ -23,8 +25,8 @@ const getWeatherConfig: DAINService.ToolConfig = {
   handler: async ({ city }, agentInfo) => {
     console.log(`Agent ${agentInfo.agentId} requested weather for ${city}`);
     return {
-      text: `The current weather in ${city} is 22°C and Sunny`,
-      data: { temperature: 22, condition: "Sunny" },
+      text: `The current weather in ${city} is 125c and Sunny`,
+      data: { temperature: 99, condition: "Sunny" },
       ui: {
         type: "h2",
         children: "Weather test",
@@ -33,7 +35,7 @@ const getWeatherConfig: DAINService.ToolConfig = {
   },
 };
 
-const getWeatherForecastConfig: DAINService.ToolConfig = {
+const getWeatherForecastConfig: ToolConfig = {
   id: "get-weather-forecast",
   name: "Get Weather Forecast",
   description: "Fetches a 5-day weather forecast for a city",
@@ -70,7 +72,7 @@ const getWeatherForecastConfig: DAINService.ToolConfig = {
   },
 };
 
-const getAirQualityConfig: DAINService.ToolConfig = {
+  const getAirQualityConfig: ToolConfig = {
   id: "get-air-quality",
   name: "Get Air Quality",
   description: "Fetches air quality information for a city",
@@ -99,7 +101,7 @@ const getAirQualityConfig: DAINService.ToolConfig = {
   },
 };
 
-const getHistoricalWeatherConfig: DAINService.ToolConfig = {
+const getHistoricalWeatherConfig: ToolConfig = {
   id: "get-historical-weather",
   name: "Get Historical Weather",
   description: "Retrieves historical weather data for a specific date and city",
@@ -129,7 +131,7 @@ const getHistoricalWeatherConfig: DAINService.ToolConfig = {
   },
 };
 
-const weatherServiceConfig: DAINService.ServiceConfig = {
+const weatherServiceConfig: ServiceConfig = {
   id: "weather-service",
   name: "Weather Service",
   description: "Provides comprehensive weather information",
@@ -152,7 +154,7 @@ const weatherServiceConfig: DAINService.ServiceConfig = {
   ],
 };
 
-const weatherToolboxConfig: DAINService.ToolboxConfig = {
+const weatherToolboxConfig: ToolboxConfig = {
   id: "weather-toolbox",
   name: "Weather Toolbox",
   description: "Collection of weather-related tools",
@@ -170,7 +172,7 @@ const weatherToolboxConfig: DAINService.ToolboxConfig = {
     "Use these tools for various weather-related tasks and analyses",
 };
 
-const dainService = DAINService.defineDAINService({
+const dainService = defineDAINService({
   metadata: {
     title: "Comprehensive Weather DAIN Service",
     description:
@@ -181,7 +183,7 @@ const dainService = DAINService.defineDAINService({
   },
   identity: {
     apiKey:
-      "sk_agent_3_0_49bhyNKMYYH3TtjqycgKQCBhUuTu4bnYvKzStv3bBmKaY55LMBmLVQR1wAtkizdGPM3wBAA2X6rfYpfpEuisx5Cc",
+      process.env.DAIN_API_KEY,
   },
   services: [weatherServiceConfig],
   tools: [
@@ -193,6 +195,6 @@ const dainService = DAINService.defineDAINService({
   toolboxes: [weatherToolboxConfig],
 });
 
-dainService.startNode({ port: 2022 }).then(() => {
-  console.log("Comprehensive Weather DAIN Service is running on port 2022");
-});
+export default {
+  fetch: dainService.startWorkers(),
+};

package/dist/utils.js

@@ -88,6 +88,7 @@ function getDainConfig(configFile) {
         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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dainprotocol/cli",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "CLI for Dain Protocol",
   "main": "dist/index.js",
   "bin": {
@@ -25,6 +25,7 @@
     "esbuild": "^0.23.1",
     "fs-extra": "^11.2.0",
     "localtunnel": "^2.0.2",
+    "miniflare": "^3.20240909.1",
     "ora": "^3.4.0"
   },
   "devDependencies": {

package/templates/default/dain.json

@@ -6,5 +6,6 @@
   "out-dir": "dist",
   "environment": "development",
   "version": "1.0.0",
-  "tunnel-base-url": "wss:///devtunnel.dain-local.com"
+  "tunnel-base-url": "wss:///devtunnel.dain-local.com",
+  "runtime": "workers"
 }

package/templates/default/src/index.ts

@@ -1,8 +1,10 @@
+//File: example/example-node.ts
+
 import { z } from "zod";
 
-import { DAINService } from "@dainprotocol/service-sdk";
+import { defineDAINService , ToolConfig, ServiceConfig, ToolboxConfig} from "@dainprotocol/service-sdk";
 
-const getWeatherConfig: DAINService.ToolConfig = {
+const getWeatherConfig: ToolConfig = {
   id: "get-weather",
   name: "Get Weather",
   description: "Fetches current weather for a city",
@@ -23,8 +25,8 @@ const getWeatherConfig: DAINService.ToolConfig = {
   handler: async ({ city }, agentInfo) => {
     console.log(`Agent ${agentInfo.agentId} requested weather for ${city}`);
     return {
-      text: `The current weather in ${city} is 22°C and Sunny`,
-      data: { temperature: 22, condition: "Sunny" },
+      text: `The current weather in ${city} is 125c and Sunny`,
+      data: { temperature: 99, condition: "Sunny" },
       ui: {
         type: "h2",
         children: "Weather test",
@@ -33,7 +35,7 @@ const getWeatherConfig: DAINService.ToolConfig = {
   },
 };
 
-const getWeatherForecastConfig: DAINService.ToolConfig = {
+const getWeatherForecastConfig: ToolConfig = {
   id: "get-weather-forecast",
   name: "Get Weather Forecast",
   description: "Fetches a 5-day weather forecast for a city",
@@ -70,7 +72,7 @@ const getWeatherForecastConfig: DAINService.ToolConfig = {
   },
 };
 
-const getAirQualityConfig: DAINService.ToolConfig = {
+  const getAirQualityConfig: ToolConfig = {
   id: "get-air-quality",
   name: "Get Air Quality",
   description: "Fetches air quality information for a city",
@@ -99,7 +101,7 @@ const getAirQualityConfig: DAINService.ToolConfig = {
   },
 };
 
-const getHistoricalWeatherConfig: DAINService.ToolConfig = {
+const getHistoricalWeatherConfig: ToolConfig = {
   id: "get-historical-weather",
   name: "Get Historical Weather",
   description: "Retrieves historical weather data for a specific date and city",
@@ -129,7 +131,7 @@ const getHistoricalWeatherConfig: DAINService.ToolConfig = {
   },
 };
 
-const weatherServiceConfig: DAINService.ServiceConfig = {
+const weatherServiceConfig: ServiceConfig = {
   id: "weather-service",
   name: "Weather Service",
   description: "Provides comprehensive weather information",
@@ -152,7 +154,7 @@ const weatherServiceConfig: DAINService.ServiceConfig = {
   ],
 };
 
-const weatherToolboxConfig: DAINService.ToolboxConfig = {
+const weatherToolboxConfig: ToolboxConfig = {
   id: "weather-toolbox",
   name: "Weather Toolbox",
   description: "Collection of weather-related tools",
@@ -170,7 +172,7 @@ const weatherToolboxConfig: DAINService.ToolboxConfig = {
     "Use these tools for various weather-related tasks and analyses",
 };
 
-const dainService = DAINService.defineDAINService({
+const dainService = defineDAINService({
   metadata: {
     title: "Comprehensive Weather DAIN Service",
     description:
@@ -181,7 +183,7 @@ const dainService = DAINService.defineDAINService({
   },
   identity: {
     apiKey:
-      "sk_agent_3_0_49bhyNKMYYH3TtjqycgKQCBhUuTu4bnYvKzStv3bBmKaY55LMBmLVQR1wAtkizdGPM3wBAA2X6rfYpfpEuisx5Cc",
+      process.env.DAIN_API_KEY,
   },
   services: [weatherServiceConfig],
   tools: [
@@ -193,6 +195,6 @@ const dainService = DAINService.defineDAINService({
   toolboxes: [weatherToolboxConfig],
 });
 
-dainService.startNode({ port: 2022 }).then(() => {
-  console.log("Comprehensive Weather DAIN Service is running on port 2022");
-});
+export default {
+  fetch: dainService.startWorkers(),
+};