@nocobase/server 0.15.0-alpha.4 → 0.16.0-alpha.1

package/lib/application.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="koa-bodyparser" />
 import { ACL } from '@nocobase/acl';
 import { AuthManager, AuthManagerOptions } from '@nocobase/auth';
-import { Cache, ICacheConfig } from '@nocobase/cache';
+import { CacheManagerOptions, Cache, CacheManager } from '@nocobase/cache';
 import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/database';
 import { AppLoggerOptions, Logger } from '@nocobase/logger';
 import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
@@ -25,7 +25,7 @@ export interface ResourcerOptions {
 }
 export interface ApplicationOptions {
     database?: IDatabaseOptions | Database;
-    cache?: ICacheConfig | ICacheConfig[];
+    cacheManager?: CacheManagerOptions;
     resourcer?: ResourcerOptions;
     bodyParser?: any;
     cors?: any;
@@ -101,7 +101,10 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get logger(): Logger;
     protected _resourcer: Resourcer;
     get resourcer(): Resourcer;
+    protected _cacheManager: CacheManager;
+    get cacheManager(): CacheManager;
     protected _cache: Cache;
+    set cache(cache: Cache);
     get cache(): Cache;
     protected _cli: AppCommand;
     get cli(): AppCommand;
@@ -149,9 +152,6 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     restart(options?: StartOptions): Promise<void>;
     stop(options?: any): Promise<void>;
     destroy(options?: any): Promise<void>;
-    dbVersionCheck(options?: {
-        exit?: boolean;
-    }): Promise<boolean>;
     isInstalled(): Promise<boolean>;
     install(options?: InstallOptions): Promise<void>;
     upgrade(options?: any): Promise<void>;

package/lib/application.js

@@ -34,7 +34,6 @@ __export(application_exports, {
 module.exports = __toCommonJS(application_exports);
 var import_actions = require("@nocobase/actions");
 var import_auth = require("@nocobase/auth");
-var import_cache = require("@nocobase/cache");
 var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_utils = require("@nocobase/utils");
@@ -52,6 +51,7 @@ var import_application_version = require("./helpers/application-version");
 var import_locale = require("./locale");
 var import_plugin_manager = require("./plugin-manager");
 var import_cron_job_manager = require("./cron/cron-job-manager");
+var import_cache2 = require("./cache");
 const packageJson = require("../package.json");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
@@ -99,7 +99,14 @@ const _Application = class _Application extends import_koa.default {
   get resourcer() {
     return this._resourcer;
   }
+  _cacheManager;
+  get cacheManager() {
+    return this._cacheManager;
+  }
   _cache;
+  set cache(cache) {
+    this._cache = cache;
+  }
   get cache() {
     return this._cache;
   }
@@ -207,7 +214,11 @@ const _Application = class _Application extends import_koa.default {
       if (!oldDb.closed()) {
         await oldDb.close();
       }
+      if (this._cacheManager) {
+        await this._cacheManager.close();
+      }
     }
+    this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
     this.setMaintainingMessage("init plugins");
     await this.pm.initPlugins();
     this.setMaintainingMessage("start load");
@@ -243,7 +254,7 @@ const _Application = class _Application extends import_koa.default {
     }
     this._authenticated = true;
     await this.db.auth();
-    await this.dbVersionCheck({ exit: true });
+    await this.db.checkVersion();
     await this.db.prepare();
   }
   async runCommand(command, ...args) {
@@ -395,33 +406,6 @@ const _Application = class _Application extends import_koa.default {
     await this.emitAsync("afterDestroy", this, options);
     this.logger.debug("finish destroy app");
   }
-  async dbVersionCheck(options) {
-    const r = await this.db.version.satisfies({
-      mysql: ">=8.0.17",
-      sqlite: "3.x",
-      postgres: ">=10"
-    });
-    if (!r) {
-      console.log(import_chalk.default.red("The database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+"));
-      if (options == null ? void 0 : options.exit) {
-        process.exit();
-      }
-      return false;
-    }
-    if (this.db.inDialect("mysql")) {
-      const result = await this.db.sequelize.query(`SHOW VARIABLES LIKE 'lower_case_table_names'`, { plain: true });
-      if ((result == null ? void 0 : result.Value) === "1" && !this.db.options.underscored) {
-        console.log(
-          `Your database lower_case_table_names=1, please add ${import_chalk.default.yellow("DB_UNDERSCORED=true")} to the .env file`
-        );
-        if (options == null ? void 0 : options.exit) {
-          process.exit();
-        }
-        return false;
-      }
-    }
-    return true;
-  }
   async isInstalled() {
     return await this.db.collectionExistsInDb("applicationVersion") || await this.db.collectionExistsInDb("collections");
   }
@@ -515,10 +499,10 @@ const _Application = class _Application extends import_koa.default {
     this._resourcer = (0, import_helper.createResourcer)(options);
     this._cli = this.createCli();
     this._i18n = (0, import_helper.createI18n)(options);
-    this._cache = (0, import_cache.createCache)(options.cache);
     this.context.db = this._db;
     this.context.logger = this._logger;
     this.context.resourcer = this._resourcer;
+    this.context.cacheManager = this._cacheManager;
     this.context.cache = this._cache;
     const plugins = this._pm ? this._pm.options.plugins : options.plugins;
     this._pm = new import_plugin_manager.PluginManager({

package/lib/cache/index.d.ts

@@ -0,0 +1,3 @@
+import { CacheManagerOptions, CacheManager } from '@nocobase/cache';
+import Application from '../application';
+export declare const createCacheManager: (app: Application, options: CacheManagerOptions) => Promise<CacheManager>;

package/lib/cache/index.js

@@ -0,0 +1,35 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cache_exports = {};
+__export(cache_exports, {
+  createCacheManager: () => createCacheManager
+});
+module.exports = __toCommonJS(cache_exports);
+var import_cache = require("@nocobase/cache");
+const createCacheManager = /* @__PURE__ */ __name(async (app, options) => {
+  const cacheManager = new import_cache.CacheManager(options);
+  const defaultCache = await cacheManager.createCache({ name: app.name });
+  app.cache = defaultCache;
+  app.context.cache = defaultCache;
+  return cacheManager;
+}, "createCacheManager");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createCacheManager
+});

package/lib/locale/locale.js

@@ -21,7 +21,6 @@ __export(locale_exports, {
   Locale: () => Locale
 });
 module.exports = __toCommonJS(locale_exports);
-var import_cache = require("@nocobase/cache");
 var import_utils = require("@nocobase/utils");
 var import_resource = require("./resource");
 const _Locale = class _Locale {
@@ -31,7 +30,6 @@ const _Locale = class _Locale {
   localeFn = /* @__PURE__ */ new Map();
   constructor(app) {
     this.app = app;
-    this.cache = (0, import_cache.createCache)();
     this.app.on("afterLoad", async () => {
       this.app.log.debug("load locale resource");
       this.app.setMaintainingMessage("load locale resource");
@@ -41,6 +39,11 @@ const _Locale = class _Locale {
     });
   }
   async load() {
+    this.cache = await this.app.cacheManager.createCache({
+      name: "locale",
+      prefix: "locale",
+      store: "memory"
+    });
     await this.get(this.defaultLang);
   }
   setLocaleFn(name, fn) {
@@ -51,7 +54,7 @@ const _Locale = class _Locale {
       resources: await this.getCacheResources(lang)
     };
     for (const [name, fn] of this.localeFn) {
-      const result = await this.wrapCache(`locale:${name}:${lang}`, async () => await fn(lang));
+      const result = await this.wrapCache(`${name}:${lang}`, async () => await fn(lang));
       if (result) {
         defaults[name] = result;
       }
@@ -59,19 +62,12 @@ const _Locale = class _Locale {
     return defaults;
   }
   async wrapCache(key, fn) {
-    const result = await this.cache.get(key);
-    if (result) {
-      return result;
-    }
-    const value = await fn();
-    if (import_utils.lodash.isEmpty(value)) {
-      return value;
-    }
-    await this.cache.set(key, value);
-    return value;
+    return await this.cache.wrapWithCondition(key, fn, {
+      isCacheable: (val) => !import_utils.lodash.isEmpty(val)
+    });
   }
   async getCacheResources(lang) {
-    return await this.wrapCache(`locale:resources:${lang}`, () => this.getResources(lang));
+    return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
   getResources(lang) {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.15.0-alpha.4",
+  "version": "0.16.0-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,16 +10,16 @@
     "@koa/cors": "^3.1.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.15.0-alpha.4",
-    "@nocobase/actions": "0.15.0-alpha.4",
-    "@nocobase/auth": "0.15.0-alpha.4",
-    "@nocobase/cache": "0.15.0-alpha.4",
-    "@nocobase/database": "0.15.0-alpha.4",
-    "@nocobase/evaluators": "0.15.0-alpha.4",
-    "@nocobase/logger": "0.15.0-alpha.4",
-    "@nocobase/resourcer": "0.15.0-alpha.4",
-    "@nocobase/sdk": "0.15.0-alpha.4",
-    "@nocobase/utils": "0.15.0-alpha.4",
+    "@nocobase/acl": "0.16.0-alpha.1",
+    "@nocobase/actions": "0.16.0-alpha.1",
+    "@nocobase/auth": "0.16.0-alpha.1",
+    "@nocobase/cache": "0.16.0-alpha.1",
+    "@nocobase/database": "0.16.0-alpha.1",
+    "@nocobase/evaluators": "0.16.0-alpha.1",
+    "@nocobase/logger": "0.16.0-alpha.1",
+    "@nocobase/resourcer": "0.16.0-alpha.1",
+    "@nocobase/sdk": "0.16.0-alpha.1",
+    "@nocobase/utils": "0.16.0-alpha.1",
     "@types/decompress": "4.2.4",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -52,5 +52,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "380045c660ea0432f3e8fd7cf01c3cfe7275db34"
+  "gitHead": "e8aaf48d169448376a06d87f090786cd7649255e"
 }