chanjs 1.0.45 → 1.1.0

package/core/config.js

@@ -1,33 +1,40 @@
-const path = require('path');
+import path from 'path';
+import { createRequire } from 'module';
+import { pathToFileURL } from 'url';
 
 /**
- * @description 根目录
+ * @description 根目录（ESM 兼容写法）
  */
+const __dirname = path.dirname(new URL(import.meta.url).pathname);
+console.log(__dirname)
 const ROOT_PATH = process.cwd();
-// 读取package.json文件
-const {version='1.0.0',author='明空'} = require(path.join(ROOT_PATH, 'package.json'));
+
+// 异步读取 package.json（ESM 标准方式）
+const packageUrl = pathToFileURL(path.join(ROOT_PATH, 'package.json')).href;
+const { default: pkg } = await import(packageUrl,{ assert: { type: 'json' } });
+const { version = '1.0.0', author = '明空' } = pkg;
 
 /**
  * @description 程序目录
  */
 const APP_PATH = path.join(ROOT_PATH, 'app');
 
-let config = {
-  JSON_LIMIT:"100kb",
-  logger : {
+const baseConfig = {
+  JSON_LIMIT: "100kb",
+  logger: {
     level: 'dev',
   },
   version,
   author,
-  env:'dev',
-  template:'default',
-  views:[], //模板路径
-  static:[{  //静态文件路径
+  env: 'dev',
+  template: 'default',
+  views: [],
+  static: [{
     prefix: "/public/",
     dir: ["app/public"],
     maxAge: 0,
   }],
-  database:{
+  database: {
     client: "mysql2",
     host: "localhost",
     port: "3306",
@@ -36,10 +43,11 @@ let config = {
     database: "chancms",
     charset: "utf8mb4",
   }
-}
+};
 
-module.exports = {
+// 导出配置对象
+export default {
   ROOT_PATH,
-  APP_PATH, 
-  ...config
-}
+  APP_PATH,
+  ...baseConfig
+};

package/core/helper.js

@@ -1,11 +1,11 @@
-const knex = require('knex');
+import knex from 'knex';
 
 /**
  * @description 实例化一个类，并将该类的所有方法绑定到一个新的对象上。
  * @param {Function} className - 需要实例化的类。
  *@returns {Object} 包含绑定方法的对象。
  */
-exports.bindClass = function(className) {
+ export const bindClass = function(className) {
   let obj = {};
   const cls = new className();
   Object.getOwnPropertyNames(cls.constructor.prototype).forEach(
@@ -22,7 +22,7 @@ exports.bindClass = function(className) {
 }
 
 
-exports.createKnex = function(opt) {
+export const createKnex = function(opt) {
     let config = {
         host:"localhost",
         port:"3306",
@@ -63,7 +63,7 @@ exports.createKnex = function(opt) {
  * @returns Array 
  * @description 将web模块放到最后加载
  */
-exports.loadWebToEnd = function(module=[]){
+export const loadWebToEnd = function(module=[]){
   const index = module.indexOf('web');
   if (index !== -1) {
       const web = module.splice(index, 1);

package/core/lib/cache.js

@@ -104,7 +104,7 @@ class Cache {
     }
 }
 
-module.exports = new Cache();
+export default new Cache();
   
 //   // 示例用法
 //   const cache = new SimpleCache(100); // 设置缓存最大容量为 100

package/core/lib/controller.js

@@ -65,4 +65,4 @@ class Controller {
   }
 }
 
-module.exports = Controller;
+export default Controller;

package/core/lib/extend.js

@@ -1,8 +1,10 @@
-const express = require("express");
-module.exports = (app)=>{
+import express from "express";
+export default (app)=>{
     app.plus = {
         setStatic:function ({prefix,dir,maxAge}) {
             app.use(prefix, express.static(dir, { maxAge: maxAge || 0 }));
         }
     }
-}
+}
+
+ 

package/core/lib/index.js

@@ -1,11 +1,12 @@
-const express = require("express");
-const cookieParser = require("cookie-parser");
-const favicon = require("serve-favicon");
-const morgan = require("morgan");
-const path = require("path");
-const view = require("./view.js");
-module.exports = async function (app, config) {
-  const { logger, APP_PATH, cookieKey, static, JSON_LIMIT, appName, version } =
+import express from "express";
+import cookieParser from "cookie-parser";
+import favicon from "serve-favicon";
+
+import morgan from "morgan";
+import path from "path";
+import view from "./view.js";
+export default async function (app, config) {
+  const { logger, APP_PATH, cookieKey, statics, JSON_LIMIT, appName, version } =
     config;
 
   app.use(morgan(logger.level));
@@ -14,8 +15,8 @@ module.exports = async function (app, config) {
   app.use(express.json({ limit: JSON_LIMIT }));
   app.use(express.urlencoded({ extended: false }));
   view(app, config);
-  if (static.length > 0) {
-    static.forEach((item) => {
+  if (statics.length > 0) {
+    statics.forEach((item) => {
       const { prefix, dir, maxAge } = item;
       app.use(prefix, express.static(dir, { maxAge: maxAge || 0 }));
     });

package/core/lib/service.js

@@ -105,6 +105,43 @@ async  update({query, params} = {}) {
 }
 
 
+/**
+ * @description 批量更新多条记录（基于事务保证原子性）
+ * @param {Array<{query: Object, params: Object}>} updates - 更新操作数组，每个元素包含查询条件和更新内容
+ * @returns {Promise<{ affectedRows: number[] }>} 返回每个操作影响的行数数组
+ */
+async updateMany(updates = []) {
+  // 参数合法性校验
+  if (!Array.isArray(updates)) {
+      throw new Error('参数必须为数组格式');
+  }
+
+  // 获取事务对象
+  const trx = await this.knex.transaction();
+  
+  try {
+      const affectedRows = [];
+      // 循环处理每个更新操作
+      for (const { query, params } of updates) {
+          // 执行单个更新操作，使用事务对象替换原有knex实例
+          const result = await trx(this.model)
+              .where(query)
+              .update(params);
+          affectedRows.push(result);
+      }
+      // 提交事务
+      await trx.commit();
+      // 返回影响行数数组（与入参顺序一致）
+      return { affectedRows };
+  } catch (err) {
+      // 回滚事务
+      await trx.rollback();
+      // 错误向上抛出，由调用者处理
+      throw err;
+  }
+}
+
+
 
 
  /**
@@ -159,5 +196,4 @@ async  update({query, params} = {}) {
   }
   
 }
-
-module.exports = BaseService;
+export default BaseService;

package/core/lib/view.js

@@ -1,7 +1,10 @@
-const path = require("path");
-const template = require("art-template");
-const dayjs = require("dayjs");
+import path from "path";
+import dayjs from 'dayjs';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
+const template = require("art-template");
 // 注册 dateFormat 函数
 template.defaults.imports.dateFormat = function (date, format) {
   if (!date) {
@@ -20,7 +23,7 @@ template.defaults.imports.dateFormat = function (date, format) {
   return date.format(format);
 };
 
-module.exports = (app, config) => {
+export default (app, config) => {
   const { APP_PATH, views, env } = config;
  //合并插件中的view
   const all = [...views, 'app/modules/web/view'];

package/index.js

@@ -1,14 +1,17 @@
-const express = require("express");
-const path = require("path");
-const fs = require("fs");
-const cors = require("cors");
-const config = require("./core/config.js");
-const {bindClass,createKnex,loadWebToEnd} = require("./core/helper.js");
-const Controller = require("./core/lib/controller.js");
-const Service = require("./core/lib/service.js");
-const cache = require('./core/lib/cache.js');
-const core = require("./core/lib/index.js");
-const extend = require("./core/lib/extend.js");
+import express from "express";
+import path from "path";
+import fs from "fs";
+import cors from "cors";
+import { pathToFileURL } from 'url';  // 新增顶部导入
+import config from "./core/config.js";
+import {bindClass,createKnex,loadWebToEnd} from "./core/helper.js";
+
+import Controller from "./core/lib/controller.js";
+
+import Service from "./core/lib/service.js";
+import cache from './core/lib/cache.js';
+import core from "./core/lib/index.js";
+import extend from "./core/lib/extend.js";
 /**
  * @description 基于express封装的mvc框架，遵循约定优于配置原则
  */
@@ -21,45 +24,38 @@ class Chan {
   static Controller = Controller;
  
   constructor() {
-    this.init();
+    this.app = express();
+    this.router = express.Router();
   }
 
-  init() {
-    const startTime = performance.now();
-    this.app = express();
+  async init() {
     extend(this.app);
-    this.router = express.Router();
-    this.loadConfig();
-    this.loadExtends();
+    await this.loadConfig();
+    await this.loadExtends();
     this.loadCore();
     this.loadKnex();
     this.loadCors();
-    // 记录结束时间
-    const endTime = performance.now();
-    console.log(`Chanjs init: ${endTime - startTime} ms`);
   }
 
 
-
-  loadConfig() {
+  async loadConfig() {
     const configPath = path.join(Chan.config.APP_PATH, "config/index.js");
     if (fs.existsSync(configPath)) {
-      const config = require(configPath);
-      Chan.config = { ...Chan.config, ...config };
+      const configUrl = pathToFileURL(configPath).href; // 新增转换
+      const configModule = await import(configUrl);     // 使用 URL 导入
+      Chan.config = { ...Chan.config, ...configModule.default }; // 注意 default
     }
   }
 
-  loadExtends() {
+  async loadExtends() {
     const extendPath = path.join(Chan.config.APP_PATH, "extend");
     if (fs.existsSync(extendPath)) {
-      let controllers = fs
-        .readdirSync(extendPath)
-        .filter((file) => file.endsWith(".js"));
-      for (let i = 0, file; i < controllers.length; i++) {
-        file = controllers[i];
-        const helper = require(path.join(extendPath, file));
-        const fileName = file.replace(".js", "");
-        Chan.helper[fileName] = helper;
+      const files = fs.readdirSync(extendPath).filter(file => file.endsWith(".js"));
+      for (const file of files) {
+        const filePath = path.join(extendPath, file);
+        const fileUrl = pathToFileURL(filePath).href;  // 转换路径
+        const helperModule = await import(fileUrl);    // 使用 URL 导入
+        Chan.helper[file.replace(".js", "")] = helperModule?.default || helperModule; // 注意 default
       }
     }
   }
@@ -90,14 +86,10 @@ class Chan {
     cb && cb();
   }
   //启动
-  start(cb) {
-    const startTime = performance.now();
-    this.loadModules();
-    this.loadPlugins();
-    this.loadCommonRouter();
-     // 记录结束时间
-    const endTime = performance.now();
-    console.log(`Chanjs load modules: ${endTime - startTime} ms`);
+  async start(cb) {
+    await this.loadPlugins();
+    await this.loadModules();
+    await this.loadCommonRouter();
     cb && cb();
   }
 
@@ -107,63 +99,69 @@ class Chan {
   }
 
   // 加载插件
-  loadPlugins() {
-    this.loadModules("plugins");
+  async loadPlugins() {
+   await this.loadModules("plugins");
   }
 
   /**
    * @description 模块加载入口（路由&控制器& 服务）
    */
-  loadModules(modules = "modules") {
+  async loadModules(modules = "modules") {
     const configPath = path.join(Chan.config.APP_PATH, modules);
+    console.log('configPath',configPath);
     if (fs.existsSync(configPath)) {
-      //模块名称
       const dirs = loadWebToEnd(Chan.config[modules]);
+      console.log('dirs',dirs);
       Chan[modules] = {};
+  
       // 先加载所有服务
-      dirs.forEach((item) => {
+      for (const item of dirs) {
         Chan[modules][item] = {
           service: {},
           controller: {},
         };
-        this.loadServices(modules, item);
-      });
-
+        await this.loadServices(modules, item); // 确保每个模块的服务加载完成
+      }
+  
       // 加载控制器和路由
-      dirs.forEach((item) => {
-        this.loadModule(modules, item);
-      });
+      for (const item of dirs) {
+        await this.loadModule(modules, item); // 确保每个模块的加载完成
+      }
     }
   }
+  
 
   /**
    * @description 加载模块，包括 controller service router
    * @param {String} moduleName 模块名称
    */
-  loadModule(modules, moduleName) {
-    this.loadControllers(modules, moduleName);
-    this.loadRoutes(modules, moduleName);
+  async loadModule(modules, moduleName) {
+    await this.loadControllers(modules, moduleName); // 确保控制器加载完成
+    await this.loadRoutes(modules, moduleName); // 然后加载路由
   }
 
-  loadFiles(modules, moduleName, type) {
+  async loadFiles(modules, moduleName, type) {
     const dir = path.join(Chan.config.APP_PATH, modules, moduleName, type);
     if (fs.existsSync(dir)) {
       const files = fs.readdirSync(dir).filter(file => file.endsWith(".js"));
-      files.forEach(file => {
-        const module = require(path.join(dir, file));
+      for (const file of files) { // 使用 for...of 确保异步操作顺序
+        const filePath = path.join(dir, file);
+        const fileUrl = pathToFileURL(filePath).href;
+        const module = await import(fileUrl);
         const name = file.replace(".js", "");
-        Chan[modules][moduleName][type][name] = { ...bindClass(module) };
-      });
+        Chan[modules][moduleName][type][name] = { ...bindClass(module.default) };
+      }
     }
   }
+  
 
   /**
    * @description 扫描模块下所有service
    * @param {*} moduleDir 模块路径
    * @param {*} moduleName 模块名称
    */
-  loadServices(modules, moduleName) {
-    this.loadFiles(modules, moduleName, "service");
+  async loadServices(modules, moduleName) {
+   await this.loadFiles(modules, moduleName, "service");
   }
 
   /**
@@ -171,8 +169,8 @@ class Chan {
    * @param {*} moduleDir 模块路径
    * @param {*} moduleName 模块名称
    */
-  loadControllers(modules, moduleName) {
-    this.loadFiles(modules, moduleName, "controller");
+  async loadControllers(modules, moduleName) {
+    await this.loadFiles(modules, moduleName, "controller");
   }
 
   /**
@@ -180,26 +178,23 @@ class Chan {
    * @param {*} moduleDir 模块路径
    * @param {*} moduleName 模块名称
    */
-  loadRoutes(modules, moduleName) {
-    const routersDir = path.join(
-      Chan.config.APP_PATH,
-      modules,
-      moduleName,
-      "router.js"
-    );
+  async loadRoutes(modules, moduleName) {
+    const routersDir = path.join(Chan.config.APP_PATH, modules, moduleName, "router.js");
     if (fs.existsSync(routersDir)) {
-      const routes = require(routersDir);
-      routes({ router: this.router, modules: Chan[modules], app: this.app });
+      const routeUrl = pathToFileURL(routersDir).href; // 转换路径
+      const routes = await import(routeUrl);           // 使用 URL 导入
+      routes.default({ router: this.router, modules: Chan[modules], app: this.app });
     }
   }
 
   //通用路由，加载错误处理和500路由和爬虫处理
-  loadCommonRouter() {
+  async loadCommonRouter() {
     try {
       const baseRouterPath = path.join(Chan.config.APP_PATH, "router.js");
       if (fs.existsSync(baseRouterPath)) {
-        const _router = require(baseRouterPath);
-        _router(this.app, this.router, Chan.config);
+        const routerUrl = pathToFileURL(baseRouterPath).href; // 转换路径
+        const _router = await import(routerUrl);              // 使用 URL 导入
+        _router.default(this.app, this.router, Chan.config);  // 注意 default
       }
     } catch (error) {
       console.log(error);
@@ -214,4 +209,4 @@ class Chan {
   }
 }
 global.Chan = Chan;
-module.exports = Chan;
+export default Chan;

package/package.json

@@ -1,6 +1,7 @@
 {
+  "type": "module",
   "name": "chanjs",
-  "version": "1.0.45",
+  "version": "1.1.0",
   "description": "chanjs基于express 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",
@@ -12,6 +13,7 @@
     "chancms",
     "nodejs"
   ],
+  "engines": { "node": ">=20.0.0" },
   "author": "明空",
   "license": "ISC",
   "dependencies": {