milkio 0.0.30 → 0.0.32

package/c.ts

@@ -3,7 +3,6 @@
 /* eslint-disable no-constant-condition, @typescript-eslint/no-misused-promises, no-console, @typescript-eslint/no-explicit-any */
 
 import { argv, exit } from "node:process"
-import process from "process"
 import { $ } from "bun"
 
 const method = argv[2] as keyof typeof commands

package/defines/define-command-handler.ts

@@ -0,0 +1,46 @@
+/* eslint-disable no-console, @typescript-eslint/no-explicit-any */
+import type { MilkioApp } from ".."
+
+export type CommandOptions = {
+  notFoundHandler?: (event: { name: string, path: string, commands: Array<string>, options: Record<string, string | true> }) => void | Promise<void>;
+}
+
+export function defineCommandHandler(app: MilkioApp, options: CommandOptions = {}) {
+  const call = async (argv: Array<string>) => {
+    const params = {
+      path: 'default',
+      commands: [] as Array<string>,
+      options: {} as Record<string, string | true>
+    }
+    for (const v of argv.slice(3)) {
+      if (v.startsWith("--") && v.includes('=')) {
+        const vSplited = v.split("=")
+        params.options[vSplited[0].slice(2)] = vSplited.slice(1, vSplited.length).join("=")
+      } else if (v.startsWith("--")) {
+        params.options[v.slice(2)] = true
+      } else if (v.startsWith("-") && v.includes('=')) {
+        const vSplited = v.split("=")
+        params.options[vSplited[0].slice(1)] = vSplited.slice(1, vSplited.length).join("=")
+      } else if (v.startsWith("-")) {
+        params.options[v.slice(1)] = true
+      } else {
+        params.commands.push(v)
+      }
+    }
+    if (argv.length === 2) params.path = `$/default`
+    else params.path = `$/${argv[2]}`
+
+    // @ts-ignore
+    const result = await app.execute(params.path as any, params)
+    if (!result.success) {
+      if (result.fail.code === 'NOT_FOUND') {
+        if (options.notFoundHandler) await options.notFoundHandler({ ...params, name: argv.length === 2 ? 'default' : argv[2] })
+        return
+      }
+      console.log(result.fail.message)
+    }
+    else if (result.data) console.log(result.data)
+  }
+
+  return call
+}

package/defines/define-http-handler.ts

@@ -8,6 +8,7 @@ import { failCode } from "../../../src/fail-code"
 import { TSON } from "@southern-aurora/tson"
 import { createUlid } from "../utils/create-ulid"
 import { configMilkio } from "../../../src/config/milkio"
+import { headerToPlainObject } from "../utils/header-to-plain-object"
 
 export type ExecuteHttpServerOptions = {
   /**
@@ -35,7 +36,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
       ip,
       method: request.request.method,
       // @ts-ignore
-      requestHeaders: request.request.headers.toJSON(),
+      requestHeaders: headerToPlainObject(request.request.headers),
       timein: new Date().getTime()
     })
 
@@ -74,7 +75,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
       let pathstr = path.join("/") as keyof (typeof schema)["apiMethodsSchema"]
 
       // Special processing: do not run middleware when encountering 404 and return quickly
-      if (!(pathstr in schema.apiMethodsSchema)) {
+      if (!(pathstr in schema.apiMethodsSchema) || pathstr.startsWith('$/')) {
         // @ts-ignore
         const redirectPath = await routerHandler(pathstr, fullurl)
         if (!redirectPath) {
@@ -172,7 +173,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 
     await loggerSubmit(executeId)
     runtime.execute.executeIds.delete(executeId)
-    
+
     return new Response(response.body, response)
   }
 

package/index.ts

@@ -8,6 +8,7 @@ export * from "./utils/env-to-string"
 export * from "./utils/env-to-number"
 export * from "./utils/env-to-boolean"
 export * from "./utils/create-template"
+export * from "./utils/header-to-plain-object"
 
 // defines
 export * from "./defines/define-use"
@@ -26,6 +27,7 @@ export * from "./kernel/middleware"
 
 // handler
 export * from "./defines/define-http-handler"
+export * from "./defines/define-command-handler"
 
 // api test
 export * from "./api-test/index"

package/kernel/milkio.ts

@@ -4,6 +4,7 @@ import schema from "../../../generated/api-schema"
 import type { Context } from "../../../src/context"
 import { failCode } from "../../../src/fail-code"
 import type { MilkioContext } from "./context"
+import { headerToPlainObject } from "../utils/header-to-plain-object"
 import { type Mixin, type ExecuteId, type Fail, type FailEnumerates, loggerPushTags, loggerSubmit, runtime, TSON, type Logger, useLogger } from ".."
 import { hanldeCatchError } from "../utils/handle-catch-error"
 import { createUlid } from "../utils/create-ulid"
@@ -98,7 +99,7 @@ async function _execute<Path extends keyof (typeof schema)["apiMethodsTypeSchema
     logger,
     onAfterHeaders: (headers) => {
       loggerPushTags(executeId, {
-        headers: headers.toJSON()
+        headers: headerToPlainObject(headers)
       })
     }
   })

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },

package/scripts/gen-significant.ts

@@ -60,12 +60,12 @@ export default async () => {
     if (module?.api?.isApi === true) {
       // Exclude disallowed characters
       if (path.includes("_")) {
-        console.error(`\n\nPath: ` + `"${path}"`)
+        console.error(`\n\nPath: ` + `"${path.slice(0, -3)}"`)
         console.error(`Do not use "_" in the path. If you want to add a separator between words, please use "-".\n`)
         exit(1)
       }
-      if (!/^[a-z0-9/-]+$/.test(path.slice(0, -3))) {
-        console.error(`\n\nPath: ` + `"${path}"`)
+      if (!/^[a-z0-9/$/-]+$/.test(path.slice(0, -3))) {
+        console.error(`\n\nPath: ` + `"${path.slice(0, -3)}"`)
         console.error(`The path can only contain lowercase letters, numbers, and "-".\n`)
         exit(1)
       }

package/utils/header-to-plain-object.ts

@@ -0,0 +1,8 @@
+export const headerToPlainObject = (headers: Headers) => {
+  if (headers.toJSON) return headers.toJSON()
+  const plainHeaders: Record<string, string> = {}
+  headers.forEach((value, key) => {
+    plainHeaders[key] = value
+  })
+  return headers
+}