milkio 1.0.0-alpha.90 → 1.0.0-alpha.92

package/execute/execute-id-generator.ts

@@ -1,7 +1,7 @@
-import { createId } from '../utils/create-id'
+import { __createId } from '../utils/create-id'
 
 export type ExecuteIdGenerator = (request?: Request) => string | Promise<string>
 
 export function defineDefaultExecuteIdGenerator() {
-  return createId
+  return __createId
 }

package/execute/index.ts

@@ -86,7 +86,7 @@ export function __initExecuter(generated: GeneratedInit, runtime: any) {
       options.createdLogger.request(`headers - ${TSON.stringify(headers.toJSON())}`, `\nparams - ${TSON.stringify(params)}`)
     }
 
-    const module = await routeSchema.module()
+    const module = routeSchema.module
     const meta = (module.default?.meta ? module.default?.meta : {}) as unknown as Readonly<$meta>
 
     if (meta.typeSafety === undefined || meta.typeSafety === true) {

package/flow/index.ts

@@ -14,12 +14,15 @@ export function createFlow<T extends unknown>(): MilkioFlow<T> {
     return {
         emit: (flow: T) => {
             if (flows.at(-1)?.blank === true) {
-                flows.at(-1)!.resolve(flow);
+                const item = flows.at(-1)!;
+                item.blank = false;
+                item.resolve(flow);
                 return;
+            } else {
+                const resolvers = Promise.withResolvers<T>();
+                resolvers.resolve(flow);
+                flows.push({ ...resolvers, blank: false });
             }
-            const resolvers = Promise.withResolvers<T>();
-            resolvers.resolve(flow);
-            flows.push({ ...resolvers, blank: false });
         },
         next: async () => {
             if (flows.length === 0) {

package/listener/index.ts

@@ -2,7 +2,8 @@ import { TSON } from '@southern-aurora/tson'
 import { createLogger, exceptionHandler, reject } from '..'
 import type { Mixin, GeneratedInit, $types, ContextHttp, MilkioResponseReject, Results, MilkioResponseSuccess } from '..'
 import type { __initExecuter } from '../execute'
-import { createId } from '../utils/create-id'
+import { __createId } from '../utils/create-id'
+import { Trie } from '../utils/trie'
 
 export type MilkioHttpRequest = Request
 
@@ -16,7 +17,8 @@ export type MilkioHttpResponse = Mixin<
 >
 
 export function __initListener(generated: GeneratedInit, runtime: any, executer: ReturnType<typeof __initExecuter>) {
-  const port = runtime.port
+  const port = runtime.port;
+  const trie = new Trie<any>();
   const fetch = async (options: {
     request: MilkioHttpRequest
     envMode?: string
@@ -50,8 +52,8 @@ export function __initListener(generated: GeneratedInit, runtime: any, executer:
     if (runtime.ignorePathLevel !== undefined && runtime.ignorePathLevel !== 0) pathArray = pathArray.slice(runtime.ignorePathLevel)
     const pathString = `/${pathArray.join('/')}`
 
-    const executeId = runtime?.executeId ? await runtime.executeId(options.request) : createId()
-    console.log('executeId', await runtime.executeId(options.request), createId())
+    const executeId = runtime?.executeId ? await runtime.executeId(options.request) : __createId()
+    console.log('executeId', await runtime.executeId(options.request), __createId())
 
     const logger = createLogger(runtime, pathString, executeId)
     runtime.runtime.request.set(executeId, { logger })
@@ -66,7 +68,7 @@ export function __initListener(generated: GeneratedInit, runtime: any, executer:
         'Content-Type': 'application/json',
       },
     }
-    
+
     let finales: Array<() => void | Promise<void>> = []
 
     try {
@@ -96,11 +98,18 @@ export function __initListener(generated: GeneratedInit, runtime: any, executer:
 
       if (!options.request.headers.get('Accept')?.startsWith('text/event-stream')) {
         // action
-        const routeSchema = generated.routeSchema[http.path.string]
-        if (routeSchema === undefined) {
-          await runtime.emit('milkio:httpNotFound', { executeId, logger, path: http.path.string as string, http })
-          throw reject('NOT_FOUND', { path: http.path.string as string })
+        let routeSchema: any
+        routeSchema = trie.get(http.path.string as string)
+        if (routeSchema === null) {
+          routeSchema = generated.routeSchema?.[http.path.string]
+          if (routeSchema === undefined) {
+            await runtime.emit('milkio:httpNotFound', { executeId, logger, path: http.path.string as string, http })
+            throw reject('NOT_FOUND', { path: http.path.string as string })
+          }
+          routeSchema.module = await routeSchema.module()
+          trie.add(http.path.string as string, routeSchema)
         }
+
         if (routeSchema.type !== 'action') throw reject('UNACCEPTABLE', { expected: 'stream', message: `Not acceptable, the Accept in the request header should be "text/event-stream". If you are using the "@milkio/stargate" package, please add \`type: "stream"\` to the execute options.` })
 
         const executed = await executer.__execute(routeSchema, {
@@ -127,7 +136,7 @@ export function __initListener(generated: GeneratedInit, runtime: any, executer:
         }
 
         await runtime.emit('milkio:httpResponse', { executeId, logger, path: http.path.string as string, http, context: executed.context })
-        
+
         for (const handler of finales) {
           try {
             await handler()
@@ -141,8 +150,17 @@ export function __initListener(generated: GeneratedInit, runtime: any, executer:
       }
       else {
         // stream
-        const routeSchema = generated.routeSchema[http.path.string]
-        if (routeSchema === undefined) throw reject('NOT_FOUND', { path: http.path.string as string })
+        let routeSchema: any
+        routeSchema = trie.get(http.path.string as string)
+        if (routeSchema === null) {
+          routeSchema = generated.routeSchema?.[http.path.string]
+          if (routeSchema === undefined) {
+            await runtime.emit('milkio:httpNotFound', { executeId, logger, path: http.path.string as string, http })
+            throw reject('NOT_FOUND', { path: http.path.string as string })
+          }
+          routeSchema.module = await routeSchema.module()
+          trie.add(http.path.string as string, routeSchema)
+        }
         if (routeSchema.type !== 'stream') throw reject('UNACCEPTABLE', { expected: 'stream', message: `Not acceptable, the Accept in the request header should be "application/json". If you are using the "@milkio/stargate" package, please remove \`type: "stream"\` to the execute options.` })
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "milkio",
   "type": "module",
-  "version": "1.0.0-alpha.90",
+  "version": "1.0.0-alpha.92",
   "module": "index.ts",
   "scripts": {},
   "peerDependencies": {

package/utils/create-id.ts

@@ -8,4 +8,4 @@ const idGenerator = defineIdGenerator({
   sequential: false,
 })
 
-export const createId = idGenerator.createId
+export const __createId = idGenerator.createId

package/utils/trie.ts

@@ -0,0 +1,54 @@
+export class Trie<T> {
+    private root: TrieNode<T>;
+
+    constructor() {
+        this.root = new TrieNode();
+    }
+
+    add(path: string, value: T): void {
+        const parts = path.replace(/^\/+|\/+$/g, '').split('/').filter(p => p !== '');
+        let currentNode = this.root;
+        if (parts.length === 0) {
+            currentNode.value = value;
+            return;
+        }
+        for (const part of parts) {
+            if (!currentNode.children.has(part)) {
+                currentNode.children.set(part, new TrieNode());
+            }
+            currentNode = currentNode.children.get(part)!;
+        }
+        currentNode.value = value;
+    }
+
+    get(path: string): T | null {
+        const parts = path.replace(/^\/+|\/+$/g, '').split('/').filter(p => p !== '');
+        let currentNode = this.root;
+        for (const part of parts) {
+            if (!currentNode.children.has(part)) return null;
+            currentNode = currentNode.children.get(part)!;
+        }
+        return currentNode.value;
+    }
+
+    has(path: string): boolean {
+        const parts = path.replace(/^\/+|\/+$/g, '').split('/').filter(p => p !== '');
+        let currentNode = this.root;
+        if (parts.length === 0) return currentNode.value !== null;
+        for (const part of parts) {
+            if (!currentNode.children.has(part)) return false;
+            else currentNode = currentNode.children.get(part)!;
+        }
+        return currentNode.value !== null;
+    }
+}
+
+class TrieNode<T> {
+    children: Map<string, TrieNode<T>>;
+    value: T | null;
+
+    constructor() {
+        this.children = new Map();
+        this.value = null;
+    }
+}