go-duck-cli 1.4.8 → 1.4.12

package/generators/postman.js

@@ -178,7 +178,8 @@ export const generatePostmanCollection = async (config, entities, outputDir, ope
             if (f.type === 'Integer' || f.type === 'Long') return `${f.name}: 100`;
             if (f.type === 'Float' || f.type === 'BigDecimal') return `${f.name}: 99.99`;
             if (f.type === 'Boolean') return `${f.name}: true`;
-            if (f.type === 'LocalDate') return `${f.name}: "2024-01-01"`;
+            if (f.type === 'Time') return `${f.name}: "0000-01-01T12:00:00Z"`;
+            if (f.type === 'LocalDate') return `${f.name}: "2024-01-01T00:00:00Z"`;
             if (f.type === 'Instant') return `${f.name}: "2024-01-01T12:00:00Z"`;
             if (f.type === 'JSON' || f.type === 'JSONB') return `${f.name}: "{\\"attribute\\": \\"example_value\\"}"`;
             return `${f.name}: "test"`;
@@ -361,9 +362,10 @@ export const generatePostmanCollection = async (config, entities, outputDir, ope
         for (const f of fields) {
             if (f.type === 'String' || f.type === 'Text') obj[f.name] = "Sample " + f.name;
             else if (f.type === 'Integer' || f.type === 'Long') obj[f.name] = 100;
-            else if (f.type === 'Float' || f.type === 'BigDecimal') obj[f.name] = 99.99;
+            else if (f.type === 'Float' || f.type === 'Double' || f.type === 'BigDecimal') obj[f.name] = 99.99;
             else if (f.type === 'Boolean') obj[f.name] = true;
-            else if (f.type === 'LocalDate') obj[f.name] = "2024-01-01";
+            else if (f.type === 'Time') obj[f.name] = "0000-01-01T12:00:00Z";
+            else if (f.type === 'LocalDate') obj[f.name] = "2024-01-01T00:00:00Z";
             else if (f.type === 'Instant' || f.type === 'DateTime' || f.type === 'Datetime') obj[f.name] = "2024-01-01T12:00:00Z";
             else if (f.type === 'JSON' || f.type === 'JSONB') obj[f.name] = {"attribute": "example_value"};
             else if (f.isEnum) obj[f.name] = "ACTIVE"; // Safe fallback for enums

package/generators/swagger.js

@@ -322,11 +322,13 @@ const getSwaggerFieldSchema = (type) => {
     const schemas = {
         'String': { type: 'string' },
         'Integer': { type: 'integer', format: 'int32' },
-        'Float': { type: 'number', format: 'double' },
+        'Float': { type: 'number', format: 'float' },
+        'Double': { type: 'number', format: 'double' },
         'Boolean': { type: 'boolean' },
+        'Time': { type: 'string', format: 'date-time' },
         'Long': { type: 'integer', format: 'int64' },
         'BigDecimal': { type: 'number', format: 'double' },
-        'LocalDate': { type: 'string', format: 'date' },
+        'LocalDate': { type: 'string', format: 'date-time' },
         'Instant': { type: 'string', format: 'date-time' },
         'JSON': { type: 'object' },
         'JSONB': { type: 'object' },

package/generators/telemetry.js

@@ -203,8 +203,18 @@ import (
 	"time"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v3/mem"
 	"os"
 	"fmt"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+var (
+	cgroupCPULock     sync.Mutex
+	lastCgroupTime    time.Time
+	lastCgroupUsageNs uint64
 )
 
 type SystemMetrics struct {
@@ -212,9 +222,13 @@ type SystemMetrics struct {
 	StartTime        string  \`json:"start_time"\`
 	ProcessCPUUsage  float64 \`json:"process_cpu_usage"\`
 	SystemCPUUsage   float64 \`json:"system_cpu_usage"\`
+	PodCPULimitPct   float64 \`json:"pod_cpu_limit_pct"\`
+	IsPodCPULimited  bool    \`json:"is_pod_cpu_limited"\`
+	CPUThreadsUsage  []float64 \`json:"cpu_threads_usage"\`
 	SystemCPUCount   int     \`json:"system_cpu_count"\`
 	ProcessFilesOpen int32   \`json:"process_files_open"\`
 	
+	TotalMemMB       uint64  \`json:"total_mem_mb"\`
 	HeapAllocMB      uint64  \`json:"heap_alloc_mb"\`
 	HeapSysMB        uint64  \`json:"heap_sys_mb"\`
 	NumGC            uint32  \`json:"num_gc"\`
@@ -222,11 +236,88 @@ type SystemMetrics struct {
 	Goroutines       int     \`json:"goroutines"\`
 }
 
+func getContainerMemoryLimit() uint64 {
+	// Check cgroup v2
+	if data, err := os.ReadFile("/sys/fs/cgroup/memory.max"); err == nil {
+		val := strings.TrimSpace(string(data))
+		if val != "max" && val != "" {
+			if limit, err := strconv.ParseUint(val, 10, 64); err == nil {
+				return limit
+			}
+		}
+	}
+	// Check cgroup v1
+	if data, err := os.ReadFile("/sys/fs/cgroup/memory/memory.limit_in_bytes"); err == nil {
+		val := strings.TrimSpace(string(data))
+		if limit, err := strconv.ParseUint(val, 10, 64); err == nil {
+			// Some systems report an absurdly high number (e.g. 9223372036854771712) for "no limit"
+			if limit < 9000000000000000000 {
+				return limit
+			}
+		}
+	}
+	return 0
+}
+
+func getCgroupCPUUsageNs() (uint64, error) {
+	// try v2
+	if data, err := os.ReadFile("/sys/fs/cgroup/cpu.stat"); err == nil {
+		lines := strings.Split(string(data), "\n")
+		for _, line := range lines {
+			if strings.HasPrefix(line, "usage_usec") {
+				parts := strings.Fields(line)
+				if len(parts) == 2 {
+					if usec, err := strconv.ParseUint(parts[1], 10, 64); err == nil {
+						return usec * 1000, nil // to nanoseconds
+					}
+				}
+			}
+		}
+	}
+	// try v1
+	if data, err := os.ReadFile("/sys/fs/cgroup/cpuacct/cpuacct.usage"); err == nil {
+		val := strings.TrimSpace(string(data))
+		if ns, err := strconv.ParseUint(val, 10, 64); err == nil {
+			return ns, nil
+		}
+	}
+	return 0, fmt.Errorf("not found")
+}
+
+func getCgroupCPULimitCores() float64 {
+	// check v2
+	if data, err := os.ReadFile("/sys/fs/cgroup/cpu.max"); err == nil {
+		parts := strings.Fields(strings.TrimSpace(string(data)))
+		if len(parts) == 2 && parts[0] != "max" {
+			max, err1 := strconv.ParseFloat(parts[0], 64)
+			period, err2 := strconv.ParseFloat(parts[1], 64)
+			if err1 == nil && err2 == nil && period > 0 {
+				return max / period
+			}
+		}
+	}
+	// check v1
+	if quotaData, err := os.ReadFile("/sys/fs/cgroup/cpu/cpu.cfs_quota_us"); err == nil {
+		quotaStr := strings.TrimSpace(string(quotaData))
+		if quotaStr != "-1" {
+			if quota, err := strconv.ParseFloat(quotaStr, 64); err == nil {
+				if periodData, err := os.ReadFile("/sys/fs/cgroup/cpu/cpu.cfs_period_us"); err == nil {
+					if period, err := strconv.ParseFloat(strings.TrimSpace(string(periodData)), 64); err == nil && period > 0 {
+						return quota / period
+					}
+				}
+			}
+		}
+	}
+	return 0
+}
+
 func CollectSystemMetrics() SystemMetrics {
 	var m runtime.MemStats
 	runtime.ReadMemStats(&m)
 
 	cpuPercent, _ := cpu.Percent(0, false)
+	threadsPercent, _ := cpu.Percent(0, true)
 	sysCPU := 0.0
 	if len(cpuPercent) > 0 {
 		sysCPU = cpuPercent[0]
@@ -241,23 +332,59 @@ func CollectSystemMetrics() SystemMetrics {
 		openFiles = int32(len(files))
 	}
 
+	vMem, _ := mem.VirtualMemory()
+	totalMemMB := uint64(0)
+	
+	// 1. Try Kubernetes / Docker Cgroup Limits first
+	cgroupLimitBytes := getContainerMemoryLimit()
+	if cgroupLimitBytes > 0 {
+		totalMemMB = cgroupLimitBytes / 1024 / 1024
+	} else if vMem != nil {
+		// 2. Fallback to underlying physical host memory
+		totalMemMB = vMem.Total / 1024 / 1024
+	}
+
 	appMetrics := GetGlobalMetrics()
 	uptime := time.Since(appMetrics.StartTime)
 	
-	// Convert uptime duration to readable string like "10 days 4 hours..."
-	days := int(uptime.Hours()) / 24
-	hours := int(uptime.Hours()) % 24
-	mins := int(uptime.Minutes()) % 60
-	secs := int(uptime.Seconds()) % 60
-	uptimeStr := fmt.Sprintf("%d days %d hours %d minutes %d seconds", days, hours, mins, secs)
+	uptimeStr := fmt.Sprintf("%d days, %d hours, %d minutes", 
+		int(uptime.Hours())/24, int(uptime.Hours())%24, int(uptime.Minutes())%60)
+
+	podCPULimitPct := 0.0
+	isPodCPULimited := false
+	
+	limitCores := getCgroupCPULimitCores()
+	if limitCores > 0 {
+		isPodCPULimited = true
+		cgroupCPULock.Lock()
+		usageNs, err := getCgroupCPUUsageNs()
+		now := time.Now()
+		if err == nil {
+			if !lastCgroupTime.IsZero() && usageNs > lastCgroupUsageNs {
+				timeDelta := float64(now.Sub(lastCgroupTime).Nanoseconds())
+				usageDelta := float64(usageNs - lastCgroupUsageNs)
+				if timeDelta > 0 {
+					coresUsed := usageDelta / timeDelta
+					podCPULimitPct = (coresUsed / limitCores) * 100.0
+				}
+			}
+			lastCgroupUsageNs = usageNs
+			lastCgroupTime = now
+		}
+		cgroupCPULock.Unlock()
+	}
 
 	return SystemMetrics{
 		Uptime:           uptimeStr,
 		StartTime:        appMetrics.StartTime.Format(time.RFC1123),
 		ProcessCPUUsage:  procCPU,
 		SystemCPUUsage:   sysCPU,
+		PodCPULimitPct:   podCPULimitPct,
+		IsPodCPULimited:  isPodCPULimited,
+		CPUThreadsUsage:  threadsPercent,
 		SystemCPUCount:   runtime.NumCPU(),
 		ProcessFilesOpen: openFiles,
+		TotalMemMB:       totalMemMB,
 		HeapAllocMB:      m.HeapAlloc / 1024 / 1024,
 		HeapSysMB:        m.HeapSys / 1024 / 1024,
 		NumGC:            m.NumGC,

package/go.mod

@@ -0,0 +1,15 @@
+module testmod
+
+go 1.26.1
+
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	gorm.io/datatypes v1.2.7 // indirect
+	gorm.io/driver/mysql v1.5.6 // indirect
+	gorm.io/gorm v1.30.0 // indirect
+)

package/go.sum

@@ -0,0 +1,20 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+gorm.io/datatypes v1.2.7 h1:ww9GAhF1aGXZY3EB3cJPJ7//JiuQo7DlQA7NNlVaTdk=
+gorm.io/datatypes v1.2.7/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY=
+gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
+gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs=
+gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=

package/index.js

@@ -216,6 +216,11 @@ Handlebars.registerHelper('isJson', (type) => {
     return t === 'json' || t === 'jsonb';
 });
 
+Handlebars.registerHelper('hasDecimal', (fields) => {
+    if (!fields || !Array.isArray(fields)) return false;
+    return fields.some(f => f.type === 'BigDecimal');
+});
+
 Handlebars.registerHelper('toLowerCase', (str) => {
     if (typeof str !== 'string') return '';
     return str.toLowerCase();
@@ -235,11 +240,13 @@ Handlebars.registerHelper('toGoType', (type, options) => {
         'text': 'string',
         'integer': 'int',
         'int': 'int',
-        'float': 'float64',
+        'float': 'float32',
+        'double': 'float64',
         'boolean': 'bool',
         'bool': 'bool',
+        'time': 'time.Time',
         'long': 'int64',
-        'bigdecimal': 'float64',
+        'bigdecimal': 'decimal.Decimal',
         'localdate': 'time.Time',
         'instant': 'time.Time',
         'datetime': 'time.Time',
@@ -662,7 +669,8 @@ program
         // 8. Generate Swagger Docs
         await generateSwaggerDocs(config, entities, absoluteOutputDir, openEntities);
         await generatePostmanCollection(config, entities, absoluteOutputDir, openEntities);
-        console.log(chalk.green('✅ Swagger API and Postman Collection generated!'));
+        await generateMQTTTopicsJSON(config, entities, absoluteOutputDir);
+        console.log(chalk.green('✅ Swagger API, Postman Collection, and MQTT Dictionary generated!'));
 
         // 8.5 Generate Web Docs App
         await generateDocumentation(config, entities, absoluteOutputDir, enums, openEntities);
@@ -835,9 +843,10 @@ require (
         // Sync WebSocket
         await generateWebSocketCode(config, entities, absoluteOutputDir);
 
-        // Sync Swagger Docs
+        // Sync Swagger Docs & MQTT Dictionary
         await generateSwaggerDocs(config, entities, absoluteOutputDir, openEntities);
         await generatePostmanCollection(config, entities, absoluteOutputDir, openEntities);
+        await generateMQTTTopicsJSON(config, entities, absoluteOutputDir);
 
         // Sync Web Docs App
         await generateDocumentation(config, entities, absoluteOutputDir, enums, openEntities);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.4.8",
+  "version": "1.4.12",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",

package/parser/gdl.js

@@ -8,7 +8,7 @@ import path from 'path';
  *   fieldName  Type  [required]  [unique]  [text]
  *
  * Supported types:
- *   String, Text, Integer, Long, Float, BigDecimal, Boolean, LocalDate, Instant, JSON, JSONB
+ *   String, Text, Integer, Long, Float, Double, BigDecimal, Boolean, Time, LocalDate, Instant, JSON, JSONB
  *
  * Type overrides in GDL:
  *   - `Text` maps to TEXT in DB and string in Go
@@ -266,9 +266,11 @@ export const toGoType = (type, enums = []) => {
         Text: 'string',
         Integer: 'int',
         Long: 'int64',
-        Float: 'float64',
-        BigDecimal: 'float64',
+        Float: 'float32',
+        Double: 'float64',
+        BigDecimal: 'decimal.Decimal',
         Boolean: 'bool',
+        Time: 'time.Time',
         LocalDate: 'time.Time',
         Instant: 'time.Time',
         JSON: 'datatypes.JSON',
@@ -291,9 +293,11 @@ export const toLiquibaseType = (field, enums = []) => {
         String: 'VARCHAR(255)',
         Integer: 'INT',
         Long: 'BIGINT',
-        Float: 'DECIMAL',
-        BigDecimal: 'DECIMAL',
+        Float: 'REAL',
+        Double: 'DOUBLE PRECISION',
+        BigDecimal: 'NUMERIC(19, 4)',
         Boolean: 'BOOLEAN',
+        Time: 'TIME',
         LocalDate: 'DATE',
         Instant: 'TIMESTAMP',
         JSON: 'JSON',

package/templates/docs/pages/gdl-entities.hbs

@@ -41,6 +41,39 @@ metadata JSONB
         </div>
     </div>
 
+    <!-- Comprehensive Example -->
+    <div class="bg-slate-900 p-10 rounded-[3rem] border border-slate-800 mb-20 shadow-xl shadow-slate-900/50">
+        <h2 class="text-2xl font-black text-white mb-6 m-0 flex items-center">
+            <svg class="w-6 h-6 mr-3 text-emerald-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4" /></svg>
+            Comprehensive Financial Entity Example
+        </h2>
+        <p class="text-slate-400 mb-6">This real-world example demonstrates the use of high-precision numeric types like <code class="text-emerald-400">Double</code> and <code class="text-emerald-400">BigDecimal</code> alongside standard types, modifiers, and entity annotations.</p>
+        
+        <div class="bg-slate-950 p-6 rounded-2xl border border-slate-800 shadow-inner overflow-x-auto">
+            <pre class="bg-transparent p-0 text-emerald-400 font-mono text-sm leading-relaxed whitespace-pre font-bold m-0">
+@Audited
+@Searchable
+entity Transaction {
+    uuid id required unique             // Maps to UUID
+    string(50) transactionId required unique // Maps to VARCHAR(50)
+    string currency required            // Maps to VARCHAR(255)
+    text notes                          // Maps to TEXT
+    int attemptCount                    // Maps to INTEGER
+    long userId required                // Maps to BIGINT
+    float fee                           // Maps to REAL and float32
+    double exchangeRate                 // Maps to DOUBLE PRECISION and float64
+    bigdecimal amount required          // Maps to NUMERIC(19,4) and decimal.Decimal
+    bool isInternational                // Maps to BOOLEAN
+    time cutoffTime                     // Maps to TIME and time.Time
+    datetime processedAt                // Maps to TIMESTAMP and time.Time
+    instant createdAt                   // Maps to TIMESTAMP and time.Time
+    jsonb metadata                      // Maps to JSONB
+    json rawPayload                     // Maps to JSON
+}
+            </pre>
+        </div>
+    </div>
+
     <!-- ELITE TYPE REFERENCE -->
     <section class="mb-20">
         <h2 class="text-3xl font-black text-slate-900 mb-8 tracking-tight underline decoration-emerald-500 underline-offset-8">Global Type System Reference</h2>
@@ -74,6 +107,21 @@ metadata JSONB
                         <td class="px-6 py-4 font-mono text-slate-400">int64</td>
                         <td class="px-6 py-4 font-mono text-slate-400">BIGINT</td>
                     </tr>
+                    <tr class="hover:bg-emerald-50/30 transition-colors">
+                        <td class="px-6 py-4 font-mono font-bold text-emerald-700">float</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">float32</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">REAL</td>
+                    </tr>
+                    <tr class="hover:bg-emerald-50/30 transition-colors">
+                        <td class="px-6 py-4 font-mono font-bold text-emerald-700">double</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">float64</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">DOUBLE PRECISION</td>
+                    </tr>
+                    <tr class="hover:bg-emerald-50/30 transition-colors">
+                        <td class="px-6 py-4 font-mono font-bold text-emerald-700">bigdecimal</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">decimal.Decimal</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">NUMERIC(19, 4)</td>
+                    </tr>
                     <tr class="hover:bg-emerald-50/30 transition-colors">
                         <td class="px-6 py-4 font-mono font-bold text-emerald-700">bool / boolean</td>
                         <td class="px-6 py-4 font-mono text-slate-400">bool</td>
@@ -89,6 +137,11 @@ metadata JSONB
                         <td class="px-6 py-4 font-mono text-slate-400">time.Time</td>
                         <td class="px-6 py-4 font-mono text-slate-400">TIMESTAMP</td>
                     </tr>
+                    <tr class="hover:bg-emerald-50/30 transition-colors">
+                        <td class="px-6 py-4 font-mono font-bold text-emerald-700">time</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">time.Time</td>
+                        <td class="px-6 py-4 font-mono text-slate-400">TIME</td>
+                    </tr>
                     <tr class="hover:bg-emerald-50/30 transition-colors">
                         <td class="px-6 py-4 font-mono font-bold text-emerald-700">uuid</td>
                         <td class="px-6 py-4 font-mono text-slate-400">uuid.UUID</td>

package/templates/go/entity.go.hbs

@@ -5,6 +5,9 @@ import (
 {{#if (hasJson fields)}}
 "gorm.io/datatypes"
 {{/if}}
+{{#if (hasDecimal fields)}}
+"github.com/shopspring/decimal"
+{{/if}}
 )
 
 type {{name}} struct {