typespeed 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -4,6 +4,7 @@ typespeed 版本演进记录。本文件 2026-09-06 从 git 历史反推建立
 
 ## 2.5.x
 
+- **2.5.1**：补全 `default/` 族装饰器双签名（`rabbitListener` / `redisSubscriber` / `SocketIo.onEvent`/`onError`/`onDisconnect`/`onConnected`）；打包瘦身（`files` 白名单 108→31 文件）；`npm pkg fix` 修正 bin 字段；修正 `redisSubscriber` 的 d.ts 签名（2026-09-07）
 - **2.5.0**：装饰器双轨——支持 TC39 标准装饰器（Stage 2.7），legacy 装饰器零破坏。单份源码运行时双签名感知（`isStd` 判据），覆盖 core/route/database 三族 + 入口 `app`/`value`；新增方法级 `@bind` 装饰器（route 参数名→来源、database 占位符→索引，替代标准模式删除的参数装饰器）；`@autoware`/`@resource`/`@bean` 支持显式 token（标准模式无 `design:type`）；类型声明宽松化；新增标准模式示例 `introduction/decorator-next/` + `isStd` 单测（2026-09-07）
 
 ## 2.4.x

package/dist/default/rabbitmq.class.js

@@ -13,6 +13,7 @@ exports.rabbitListener = exports.RabbitMQ = void 0;
 const core_decorator_1 = require("../core.decorator");
 const typespeed_1 = require("../typespeed");
 const amqplib_1 = require("amqplib");
+const decorator_utils_1 = require("../decorator-utils");
 let rabbitConnection = null;
 class RabbitMQ {
     getRabbitMQ() {
@@ -58,7 +59,23 @@ async function getChannel() {
     return channel;
 }
 function rabbitListener(queue) {
-    return (target, propertyKey) => {
+    return (...args) => {
+        if ((0, decorator_utils_1.isStd)(args)) {
+            const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+            ctx.addInitializer(function () {
+                const targetConstructor = this.constructor;
+                const methodName = String(ctx.name);
+                (async function () {
+                    const channel = await getChannel();
+                    await channel.assertQueue(queue);
+                    const targetBean = (0, core_decorator_1.getComponent)(targetConstructor);
+                    await channel.consume(queue, targetBean[methodName], { noAck: true });
+                }());
+            });
+            return;
+        }
+        const target = args[0];
+        const propertyKey = args[1];
         (async function () {
             const channel = await getChannel();
             await channel.assertQueue(queue);

package/dist/default/redis.class.js

@@ -13,6 +13,7 @@ exports.redisSubscriber = exports.Redis = void 0;
 const core_decorator_1 = require("../core.decorator");
 const ioredis_1 = require("ioredis");
 const typespeed_1 = require("../typespeed");
+const decorator_utils_1 = require("../decorator-utils");
 const redisSubscribers = {};
 class Redis extends ioredis_1.default {
     getRedis() {
@@ -75,7 +76,19 @@ function redisSubscriber(channel) {
             console.error(err);
         }
     });
-    return function (target, propertyKey) {
+    return function (...args) {
+        if ((0, decorator_utils_1.isStd)(args)) {
+            const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+            ctx.addInitializer(function () {
+                redisSubscribers[channel] = {
+                    target: this,
+                    propertyKey: String(ctx.name)
+                };
+            });
+            return;
+        }
+        const target = args[0];
+        const propertyKey = args[1];
         redisSubscribers[channel] = {
             target: target,
             propertyKey: propertyKey

package/dist/default/socket-io.class.js

@@ -4,6 +4,7 @@ exports.io = exports.SocketIo = void 0;
 const socket_io_1 = require("socket.io");
 const http_1 = require("http");
 const core_decorator_1 = require("../core.decorator");
+const decorator_utils_1 = require("../decorator-utils");
 let io = null;
 exports.io = io;
 const listeners = { "event": [], "disconnect": null, "error": null, "connected": null };
@@ -48,26 +49,74 @@ class SocketIo {
         return httpServer;
     }
     static onEvent(event) {
-        return (target, propertyKey) => {
+        return (...args) => {
+            if ((0, decorator_utils_1.isStd)(args)) {
+                const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+                ctx.addInitializer(function () {
+                    listeners["event"].push([{
+                            target: this,
+                            propertyKey: String(ctx.name)
+                        }, event]);
+                });
+                return;
+            }
+            const target = args[0];
+            const propertyKey = args[1];
             listeners["event"].push([{
                     target: target,
                     propertyKey: propertyKey
                 }, event]);
         };
     }
-    static onError(target, propertyKey) {
+    static onError(...args) {
+        if ((0, decorator_utils_1.isStd)(args)) {
+            const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+            ctx.addInitializer(function () {
+                listeners["error"] = {
+                    target: this,
+                    propertyKey: String(ctx.name)
+                };
+            });
+            return;
+        }
+        const target = args[0];
+        const propertyKey = args[1];
         listeners["error"] = {
             target: target,
             propertyKey: propertyKey
         };
     }
-    static onDisconnect(target, propertyKey) {
+    static onDisconnect(...args) {
+        if ((0, decorator_utils_1.isStd)(args)) {
+            const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+            ctx.addInitializer(function () {
+                listeners["disconnect"] = {
+                    target: this,
+                    propertyKey: String(ctx.name)
+                };
+            });
+            return;
+        }
+        const target = args[0];
+        const propertyKey = args[1];
         listeners["disconnect"] = {
             target: target,
             propertyKey: propertyKey
         };
     }
-    static onConnected(target, propertyKey) {
+    static onConnected(...args) {
+        if ((0, decorator_utils_1.isStd)(args)) {
+            const [, ctx] = (0, decorator_utils_1.getStdArgs)(args);
+            ctx.addInitializer(function () {
+                listeners["connected"] = {
+                    target: this,
+                    propertyKey: String(ctx.name)
+                };
+            });
+            return;
+        }
+        const target = args[0];
+        const propertyKey = args[1];
         listeners["connected"] = {
             target: target,
             propertyKey: propertyKey

package/dist/typespeed.d.ts

@@ -175,9 +175,9 @@ declare function after(constructorFunction: any, methodName: string): (...args:
 /**定时程序装饰器，参数支持 crontab 格式字符串，可根据参数定时执行被装饰的方法 */
 declare function schedule(cronTime: string | Date): (...args: any[]) => any;
 /**RabbitMQ 监听装饰器，参数是监听的队列名称，当接受到消息时将执行被装饰方法 */
-declare function rabbitListener(queue: string): (target: any, propertyKey: string) => void;
-/**Redis 监听装饰器，参数是监听的队列名称，当接受到消息时将执行被装饰方法 */
-declare function redisSubscriber(target: any, propertyKey: string): void;
+declare function rabbitListener(queue: string): (...args: any[]) => any;
+/**Redis 监听装饰器，参数是监听的频道名称，当接受到消息时将执行被装饰方法 */
+declare function redisSubscriber(channel: string): (...args: any[]) => any;
 /** request 对象装饰器，作为路由页面方法参数，获取 request 对象 */
 declare function req(target: any, propertyKey: string, parameterIndex: number): void;
 /** response 对象装饰器，作为路由页面方法参数，获取 response 对象 */
@@ -389,13 +389,13 @@ declare class SocketIo {
      * Socket IO 事件装饰器
      * @param event 事件名称
      */
-    public static onEvent(event: string): (target: any, propertyKey: string) => void;
+    public static onEvent(event: string): (...args: any[]) => any;
     /**Socket IO 错误捕获装饰器 */
-    public static onError(target: any, propertyKey: string): void;
+    public static onError(...args: any[]): any;
     /**Socket IO 客户端断开连接事件装饰器 */
-    public static onDisconnect(target: any, propertyKey: string): void;
+    public static onDisconnect(...args: any[]): any;
     /**Socket IO 客户端连接成功事件装饰器 */
-    public static onConnected(target: any, propertyKey: string): void;
+    public static onConnected(...args: any[]): any;
 }
 /**Socket IO 服务实现类 */
 declare const io: IoServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
@@ -13,8 +13,12 @@
     "prebuild": "rm -rf dist"
   },
   "main": "dist/typespeed.js",
+  "files": [
+    "dist",
+    "CHANGELOG.md"
+  ],
   "bin": {
-    "typespeed": "./dist/scaffold/command.js"
+    "typespeed": "dist/scaffold/command.js"
   },
   "homepage": "https://github.com/speedphp/typespeed#readme",
   "repository": {

package/.github/workflows/test.yml

@@ -1,50 +0,0 @@
-name: Tests
-'on': 
-  push:
-    branches:
-      - main
-
-jobs:
-  test:
-    name: 'Test TypeSpeed'
-    runs-on: ubuntu-latest
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-      rabbitmq:
-        image: rabbitmq:3.8
-        env:
-          RABBITMQ_DEFAULT_USER: guest
-          RABBITMQ_DEFAULT_PASS: guest
-        ports:
-          - 5672
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - name: Setup MySQL
-        run: |
-          sudo /etc/init.d/mysql start
-          mysql -e 'CREATE DATABASE test;USE test; \
-          CREATE TABLE `user` (`id` int(11) NOT NULL AUTO_INCREMENT,`name` varchar(100) DEFAULT NULL,PRIMARY KEY (`id`)) \
-          ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;SHOW TABLES;' -uroot -proot
-      - name: 'Cache node_modules'
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-v22-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-v22-
-      - name: Install Dependencies
-        run: npm install
-      - name: Run Tests with Coverage
-        run: npm run test-with-coverage
-        env:
-          LOCAL_HOST: localhost
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

package/app/nodemon.json

@@ -1,5 +0,0 @@
-{
-    "watch": ["src", "../dist", "../src", "../test"],
-    "ext": "ts,json",
-    "exec": "npm test" 
-}

package/app/package.json

@@ -1,17 +0,0 @@
-{
-    "name": "test-typespeed",
-    "version": "1.0.0",
-    "description": "",
-    "scripts": {
-      "watch": "nodemon",
-      "test": "ts-node src/main.ts",
-      "build": "tsc -p ."
-    },
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-      "@types/node": "^18.0.6",
-      "tracer": "^1.1.6"
-    }
-  }
-  

package/app/src/aop-test.class.ts

@@ -1,29 +0,0 @@
-import { before, log, component, after } from "../../src/typespeed";
-import FirstPage from "./first-page.class";
-
-@component
-export default class AopTest {
-
-    @before(FirstPage, "index")
-    public FirstIndex() {
-        log("Before FirstPage index run, at AopTest FirstIndex.");
-        log("AopTest FirstIndex run over." + this.getWordsFromAopTest());
-        return "FirstIndex";
-    }
-
-    public getWordsFromAopTest() {
-        return "getWordsFromAopTest";
-    }
-
-    @before(FirstPage, "getTestFromFirstPage")
-    public testGetTestFromFirstPage() {
-        log("AopTest testGetTestFromFirstPage run over.");
-    }
-
-    @after(FirstPage, "index")
-    public testFirstIndexAfter(result) {
-        log("AopTest testFirstIndexAfter run over, result: " + result);
-        log(result);
-    }
-
-}

package/app/src/config-development.json

@@ -1,26 +0,0 @@
-{
-    "view": {
-        "engine": "mustache",
-        "path": "/views/",
-        "suffix": "html"
-    },
-    "mysql": {
-        "host": "127.0.0.1",
-        "user": "root",
-        "password": "root",
-        "database": "test"
-    },
-    "redis": {
-        "host": "127.0.0.1",
-        "port": "6379",
-        "db": 0
-    },
-    "rabbitmq": {
-        "protocol": "amqp",
-        "hostname": "127.0.0.1",
-        "port": 5672,
-        "username": "guest",
-        "password": "guest"
-    },
-    "socket":{}
-}

package/app/src/config-production.json

@@ -1,15 +0,0 @@
-{
-    "server": {
-        "port": "8081"
-    },
-    "database": {
-        "host": "localhost",
-        "port": "27017",
-        "name": "test"
-    },
-    "view": {
-        "engine": "mustache",
-        "path": "./views",
-        "suffix": "html"
-    }
-}

package/app/src/config.json

@@ -1,50 +0,0 @@
-{
-    "view": {
-        "engine": "mustache",
-        "path": "./src/views",
-        "suffix": "html"
-    },
-
-    "compression": {
-        "level": 9
-    },
-    "cookie": {
-        "secret": "catme",
-        "options": {}
-    },
-    "session": {
-        "trust proxy": false,
-        "secret": "keyboard cat",
-        "resave": false,
-        "saveUninitialized": true,
-        "cookie": {
-            "secure": false
-        }
-    },
-    "mysql": {
-        "master": {
-            "host": "localhost",
-            "user": "root",
-            "password": "123456",
-            "database": "test"
-        },
-        "slave": [
-            {
-                "host": "localhost",
-                "user": "root",
-                "password": "123456",
-                "database": "test"
-            }
-        ]
-    },
-    "redis": {
-        "host": "localhost",
-        "port": "6379",
-        "db": 0
-    },
-    "jwt" : {
-        "secret": "shhhhhhared-secret", 
-        "algorithms": ["HS256"],
-        "ignore": ["/first", "/second/testSession"]
-    }
-}

package/app/src/custom-log.class.ts

@@ -1,33 +0,0 @@
-import * as tracer from "tracer";
-import { bean, LogFactory } from "../../src/typespeed";
-
-export default class CustomLog extends LogFactory {
-    private logger = tracer.console({
-        format: "[{{title}}] {{timestamp}} {{file}}:{{line}} ({{method}}) {{message}}",
-        dateformat: "yyyy-mm-dd HH:MM:ss",
-        stackIndex: 2,
-        preprocess: function (data) {
-            data.title = data.title.toUpperCase();
-        }
-    });
-
-    @bean
-    public createLog(): LogFactory {
-        return new CustomLog();
-    }
-
-    public log(message?: any, ...optionalParams: any[]) : void{
-        if(process.env.LOG === "CLOSE") return;
-        this.logger.log(message, ...optionalParams);
-    }
-
-    public error(message?: any, ...optionalParams: any[]) : void {
-        this.logger.error(message, ...optionalParams);
-    }
-
-    public debug(message?: any, ...optionalParams: any[]) : void {
-        if(process.env.NODE_ENV === "development"){
-            this.logger.debug(message, ...optionalParams);
-        }
-    }
-}

package/app/src/entities/mutil-users.class.ts

@@ -1,5 +0,0 @@
-import UserDto from "./user-dto.class";
-
-export default class MutilUsers {
-    constructor(public group: string, public users: UserDto[]){}
-}

package/app/src/entities/user-dto.class.ts

@@ -1,3 +0,0 @@
-export default class UserDto {
-    constructor(public id: number, public name: string){}
-}

package/app/src/first-page.class.ts

@@ -1,46 +0,0 @@
-//import * as jwttoken from "jsonwebtoken";
-import { log, component, getMapping } from "../../src/typespeed";
-
-@component
-export default class FirstPage {
-
-    @getMapping("/first")
-    public index(req: any, res: any) {
-        log("FirstPage index running" + this.getTestFromFirstPage());
-        res.send("FirstPage index running");
-    }
-
-    @getMapping("/first/sendJson")
-    public sendJson() {
-        log("FirstPage sendJson running");
-        return {
-            "from": "sendJson",
-            "to": "Browser"
-        }
-    }
-
-    @getMapping("/first/sendResult")
-    public sendResult() {
-        log("FirstPage sendResult running");
-        return "sendResult";
-    }
-
-    @getMapping("/first/renderTest")
-    public renderTest(req: any, res: any) {
-        res.render("index", { name: "zzz" });
-    }
-
-    // @getMapping("/login")
-    // login() {
-    //     const token = jwttoken.sign({ foo: 'bar' }, 'shhhhhhared-secret');
-    //     /**
-    //      * 将这里获得的token，放到header的Authorization中。
-    //      * 值是：Bearer + token
-    //      */
-    //     return token;
-    // }
-
-    public getTestFromFirstPage() {
-        return "getTestFromFirstPage";
-    }
-}

package/app/src/jwt-authentication.class.ts

@@ -1,30 +0,0 @@
-import { AuthenticationFactory, bean, config } from "../../src/typespeed";
-import express from "express";
-import { expressjwt, GetVerificationKey } from "express-jwt";
-import * as jwt from 'jsonwebtoken';
-
-const jwtConfig: {
-    secret: jwt.Secret | GetVerificationKey;
-    algorithms: jwt.Algorithm[];
-    ignore: string[];
-} = config("jwt");
-
-export default class JwtAuthentication extends AuthenticationFactory {
-
-    @bean
-    public getJwtAuthentication(): AuthenticationFactory {
-        return new JwtAuthentication();
-    }
-
-    public preHandle(req: express.Request, res: express.Response, next: express.NextFunction): void {
-        if(!jwtConfig.ignore.includes(req.path)) {
-            const jwtMiddleware = expressjwt(jwtConfig);
-            jwtMiddleware(req, res, (err) => {  
-                if (err) {
-                    //next(err);
-                }
-            });
-        }
-        next();
-    }
-}

package/app/src/main.ts

@@ -1,24 +0,0 @@
-import { app, log, autoware, ServerFactory } from "../../src/typespeed";
-//import * as basicAuth from "express-basic-auth"
-let appServer = null;
-
-@app
-class Main {
-
-    @autoware
-    public server : ServerFactory;
-
-    public main(){
-        // this.server.setMiddleware(basicAuth({
-        //     users: { 'admin': 'supersecret' }
-        // }));
-        appServer = this.server.start(8081);
-        log('start application');
-    }
-}
-
-export default () => {
-    if (appServer != null) {
-        appServer.close();
-    }
-};

package/app/src/second-page.class.ts

@@ -1,43 +0,0 @@
-import { getMapping, postMapping, upload, jwt, log, component } from "../../src/typespeed";
-
-@component
-export default class SecondPage {
-
-    @getMapping("/second/setCookie")
-    setCookiePage(req, res) {
-        res.cookie("name", "zzz");
-        return "setCookie";
-    }
-
-    @getMapping("/second/getCookie")
-    getCookiePage(req, res) {
-        const cookieName = req.cookies.name;
-        return "getCookie: " + cookieName;
-    }
-
-    @getMapping("/second/testSession")
-    testForSession(req, res) {
-        req.session.view = req.session.view ? req.session.view + 1 : 1;
-        return "testForSession: " + req.session.view;
-    }
-
-    @postMapping("/upload")
-    @upload
-    public upload(req, res) {
-        const files = req.files;
-        log(files);
-        log("uploaded");
-        res.send("upload success");
-    }
-
-    @jwt({ secret: "shhhhhhared-secret", algorithms: ["HS256"] })
-    @postMapping("/form")
-    form(req, res) {
-        res.render("upload");
-    }
-
-    @getMapping("/second/testError")
-    testError(req, res) {
-        throw new Error('Test Error');
-    }
-}

package/app/src/test-bind.class.ts

@@ -1,41 +0,0 @@
-import { component, getMapping, bind, resource, autoware, bean, insert } from "../../src/typespeed";
-import UserModel from "./user-model.class";
-
-class TestBean {
-    name = "test-bean";
-}
-
-@component
-export default class TestBind {
-
-    @bean(TestBean)
-    getBeanInstance() { return new TestBean(); }
-
-    @autoware(TestBean)
-    private autowired: TestBean;
-
-    @resource(UserModel, "user")
-    private userModel: UserModel;
-
-    @getMapping("/bind/param/:id")
-    @bind({ id: "reqParam", name: "reqQuery" })
-    async bindParam(id: string, name: string) {
-        return { id, name };
-    }
-
-    @getMapping("/bind/token")
-    async bindToken(req, res) {
-        res.send(this.autowired.name + "|" + (this.userModel ? "model-ok" : "model-null"));
-    }
-
-    @getMapping("/bind/db")
-    async bindDb(req, res) {
-        const id = req.query.id || 1;
-        const newId = await this.addRowByBind("bind name " + id, id);
-        res.send("bind insert: " + newId);
-    }
-
-    @insert("Insert into `user` (id, name) values (#{id}, #{name})")
-    @bind({ name: 0, id: 1 })
-    private async addRowByBind(newName: string, id: number) { }
-}