feat: support effect labels

Author: shigma

package.json

@@ -9,23 +9,20 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "tsc -b",
-    "bump": "yarn yakumo version",
-    "dep": "yarn yakumo upgrade",
-    "pub": "yarn yakumo publish",
-    "test": "yarn yakumo mocha -r esbuild-register -t 10000",
+    "build": "yarn yakumo build",
+    "test": "yarn yakumo mocha --import tsx -t 10000",
     "test:text": "shx rm -rf coverage && c8 -r text yarn test",
     "test:json": "shx rm -rf coverage && c8 -r json yarn test",
     "test:html": "shx rm -rf coverage && c8 -r html yarn test"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^22.7.5",
     "c8": "^7.14.0",
     "esbuild": "^0.25.0",
-    "esbuild-register": "^3.5.0",
     "mocha": "^11.1.0",
     "shx": "^0.3.4",
+    "tsx": "npm:@cordiverse/[email protected]",
     "typescript": "^5.8.2",
     "yakumo": "^2.0.0-alpha.2",
     "yakumo-esbuild": "^2.0.0-alpha.2",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cordisjs/plugin-server",
   "description": "Server plugin for cordis",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,11 +30,11 @@
     "plugin"
   ],
   "peerDependencies": {
-    "cordis": "^4.0.0-alpha.5"
+    "cordis": "^4.0.0-alpha.6"
   },
   "devDependencies": {
     "@types/accepts": "^1.3.7",
-    "cordis": "^4.0.0-alpha.5"
+    "cordis": "^4.0.0-alpha.6"
   },
   "dependencies": {
     "@types/ws": "^8.5.10",

packages/core/src/index.ts

@@ -1,5 +1,5 @@
 import { Context, DisposableList, Service, z } from 'cordis'
-import { defineProperty, Dict, isNullable, trimSlash } from 'cosmokit'
+import { defineProperty, isNullable, trimSlash } from 'cosmokit'
 import * as http from 'node:http'
 import { Keys, pathToRegexp } from 'path-to-regexp'
 import { WebSocket, WebSocketServer } from 'ws'
@@ -116,7 +116,7 @@ export class WsRoute extends Route {
           socket.close()
         }
       }
-    })
+    }, `ctx.server.ws(${typeof path === 'string' ? JSON.stringify(path) : path})`)
   }
 }
 
@@ -125,18 +125,18 @@ export type Middleware<P = any> = (req: Request & { params: P }, res: Response,
 class HttpRoute extends Route {
   dispose: () => Promise<void>
 
-  constructor(server: Server, public method: Server.Method | undefined, path: string | RegExp, public callback: Middleware) {
-    super(server, method ?? 'ALL', path)
+  constructor(server: Server, public method: string, path: string | RegExp, public callback: Middleware) {
+    super(server, method, path)
     const self = this
     this.dispose = server.ctx.effect(function* () {
       yield server.httpRoutes.push(self)
       yield server.ctx.on('server/__route', async (req, res, next) => {
-        if (method && req.method !== method) return next()
+        if (method !== 'all' && req.method.toLowerCase() !== method) return next()
         const params = self.check(req)
         if (!params) return next()
         return callback(Object.assign(Object.create(req), { params }), res, next)
       })
-    })
+    }, `ctx.server.${method}(${typeof path === 'string' ? JSON.stringify(path) : path})`)
   }
 }
 
@@ -158,7 +158,7 @@ class Server extends Service {
   static {
     for (const method of Server.methods) {
       defineProperty(Server.prototype, method, function (this: Server, path: string | RegExp, middleware: Middleware) {
-        return new HttpRoute(this, method === 'all' ? undefined : method.toUpperCase() as Server.Method, path, middleware)
+        return new HttpRoute(this, method, path, middleware)
       })
     }
   }
@@ -198,7 +198,7 @@ class Server extends Service {
       }
 
       if (!isNullable(res.body)) return
-      const methods = new Set<Server.Method>()
+      const methods = new Set<string>()
       let asterisk = false
       for (const route of this.httpRoutes) {
         if (!route.check(req)) continue
@@ -305,8 +305,6 @@ class Server extends Service {
 }
 
 namespace Server {
-  export type Method = 'GET' | 'DELETE' | 'HEAD' | 'POST' | 'PUT' | 'PATCH'
-
   export interface Config extends ListenOptions {
     host: string
     port: number

packages/temp/package.json

@@ -29,12 +29,12 @@
   ],
   "devDependencies": {
     "@cordisjs/plugin-http": "^1.0.0",
-    "@cordisjs/plugin-server": "^1.0.1",
-    "cordis": "^4.0.0-alpha.5"
+    "@cordisjs/plugin-server": "^1.0.2",
+    "cordis": "^4.0.0-alpha.6"
   },
   "peerDependencies": {
-    "@cordisjs/plugin-server": "^1.0.1",
-    "cordis": "^4.0.0-alpha.5"
+    "@cordisjs/plugin-server": "^1.0.2",
+    "cordis": "^4.0.0-alpha.6"
   },
   "dependencies": {
     "cosmokit": "^1.7.3"

yakumo.yml

@@ -0,0 +1,11 @@
+- id: k9knuj
+  name: yakumo
+  config:
+    pipeline:
+      build:
+        - tsc
+        - esbuild
+- id: itydft
+  name: yakumo-esbuild
+- id: ep025k
+  name: yakumo-tsc