tego 1.3.43 → 1.3.45

package/lib/index.js

@@ -24,8 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_preload = require("./preload");
 var import_node_perf_hooks = require("node:perf_hooks");
 var import_globals = __toESM(require("@tachybase/globals"));
-var import_server = require("@tachybase/server");
 var import_utils = require("@tachybase/utils");
+var import_core = require("@tego/core");
 var import_commander = require("commander");
 var import_config = require("./config");
 var import_plugin_presets = __toESM(require("./plugin-presets"));
@@ -41,7 +41,7 @@ const run = /* @__PURE__ */ __name(async () => {
   await (0, import_utils.createDevPluginsSymlink)();
   await (0, import_utils.createStoragePluginsSymlink)();
   console.log(`Engine loaded at ${import_node_perf_hooks.performance.now().toFixed(2)} ms`);
-  await import_server.Gateway.getInstance().run({
+  await import_core.Gateway.getInstance().run({
     mainAppOptions: await (0, import_config.getConfig)()
   });
 }, "run");

package/lib/plugin-presets.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '@tachybase/server';
+import { Plugin } from '@tego/core';
 export declare class PluginPresets extends Plugin {
     splitNames(name: string): string[];
     getBuiltInPlugins(): string[];

package/lib/plugin-presets.js

@@ -22,8 +22,8 @@ __export(plugin_presets_exports, {
   default: () => plugin_presets_default
 });
 module.exports = __toCommonJS(plugin_presets_exports);
-var import_server = require("@tachybase/server");
-const _PluginPresets = class _PluginPresets extends import_server.Plugin {
+var import_core = require("@tego/core");
+const _PluginPresets = class _PluginPresets extends import_core.Plugin {
   splitNames(name) {
     return (name || "").split(",").filter(Boolean);
   }
@@ -55,11 +55,11 @@ const _PluginPresets = class _PluginPresets extends import_server.Plugin {
   async getPackageJson(name) {
     let packageName = name;
     try {
-      packageName = await import_server.PluginManager.getPackageName(name);
+      packageName = await import_core.PluginManager.getPackageName(name);
     } catch (error) {
       packageName = name;
     }
-    const packageJson = await import_server.PluginManager.getPackageJson(packageName);
+    const packageJson = await import_core.PluginManager.getPackageJson(packageName);
     return packageJson;
   }
   async allPlugins() {

package/lib/utils.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_node_crypto = require("node:crypto");
 var import_node_fs = __toESM(require("node:fs"));
 var import_promises = require("node:fs/promises");
+var import_node_os = __toESM(require("node:os"));
 var import_node_path = require("node:path");
 var import_promises2 = require("node:stream/promises");
 var import_globals = __toESM(require("@tachybase/globals"));
@@ -79,20 +80,21 @@ function parseEnvironment() {
     DEFAULT_STORAGE_TYPE: "local",
     RUN_MODE: "engine",
     LOCAL_STORAGE_DEST: "storage/uploads",
-    PLUGIN_STORAGE_PATH: (0, import_node_path.resolve)(process.cwd(), "storage/plugins"),
+    PLUGIN_STORAGE_PATH: "storage/plugins",
     MFSU_AD: "none",
     WS_PATH: "/ws",
     SOCKET_PATH: "storage/gateway.sock",
-    PM2_HOME: (0, import_node_path.resolve)(process.cwd(), "./storage/.pm2"),
     PLUGIN_PACKAGE_PREFIX: "@tachybase/plugin-,@tachybase/module-",
     SERVER_TSCONFIG_PATH: "./tsconfig.server.json",
-    PLAYWRIGHT_AUTH_FILE: (0, import_node_path.resolve)(process.cwd(), "storage/playwright/.auth/admin.json"),
+    PLAYWRIGHT_AUTH_FILE: "storage/playwright/.auth/admin.json",
     CACHE_DEFAULT_STORE: "memory",
     CACHE_MEMORY_MAX: 2e3,
     PLUGIN_STATICS_PATH: "/static/plugins/",
     LOGGER_BASE_PATH: "storage/logs",
     APP_SERVER_BASE_URL: "",
-    APP_PUBLIC_PATH: "/"
+    APP_PUBLIC_PATH: "/",
+    TEGO_HOME: (0, import_node_path.join)(import_node_os.default.homedir(), ".tego"),
+    TEGO_RUNTIME_NAME: "current"
   };
   (0, import_dotenv.config)({
     path: (0, import_node_path.resolve)(process.cwd(), process.env.APP_ENV_PATH || ".env")
@@ -102,6 +104,9 @@ function parseEnvironment() {
       process.env[key] = env[key];
     }
   }
+  if (!process.env.TEGO_RUNTIME_HOME) {
+    process.env.TEGO_RUNTIME_HOME = (0, import_node_path.join)(process.env.TEGO_HOME, process.env.TEGO_RUNTIME_NAME);
+  }
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
     const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, "");
     const keys = ["API_BASE_PATH", "WS_PATH", "PLUGIN_STATICS_PATH"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tego",
-  "version": "1.3.43",
+  "version": "1.3.45",
   "description": "",
   "keywords": [
     "tego",
@@ -49,20 +49,20 @@
     "umzug": "3.8.2",
     "winston": "3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "@tachybase/acl": "1.3.43",
-    "@tachybase/auth": "1.3.43",
-    "@tachybase/cache": "1.3.43",
-    "@tachybase/data-source": "1.3.43",
-    "@tachybase/database": "1.3.43",
-    "@tachybase/actions": "1.3.43",
-    "@tachybase/evaluators": "1.3.43",
-    "@tachybase/globals": "1.3.43",
-    "@tachybase/loader": "1.3.43",
-    "@tachybase/logger": "1.3.43",
-    "@tachybase/server": "1.3.43",
-    "@tachybase/schema": "1.3.43",
-    "@tachybase/utils": "1.3.43",
-    "@tachybase/resourcer": "1.3.43"
+    "@tachybase/acl": "1.3.45",
+    "@tachybase/auth": "1.3.45",
+    "@tachybase/actions": "1.3.45",
+    "@tachybase/cache": "1.3.45",
+    "@tachybase/data-source": "1.3.45",
+    "@tachybase/evaluators": "1.3.45",
+    "@tachybase/globals": "1.3.45",
+    "@tachybase/database": "1.3.45",
+    "@tachybase/loader": "1.3.45",
+    "@tachybase/schema": "1.3.45",
+    "@tachybase/resourcer": "1.3.45",
+    "@tachybase/logger": "1.3.45",
+    "@tachybase/utils": "1.3.45",
+    "@tego/core": "1.3.45"
   },
   "devDependencies": {
     "@types/lodash": "4.17.20",

package/src/index.ts

@@ -2,9 +2,9 @@ import './preload';
 
 import { performance } from 'node:perf_hooks';
 import TachybaseGlobal from '@tachybase/globals';
-import { Gateway } from '@tachybase/server';
 import { createDevPluginsSymlink, createStoragePluginsSymlink } from '@tachybase/utils';
 
+import { Gateway } from '@tego/core';
 import { Command } from 'commander';
 
 import { getConfig } from './config';

package/src/plugin-presets.ts

@@ -1,5 +1,4 @@
-import { Plugin, PluginManager } from '@tachybase/server';
-
+import { Plugin, PluginManager } from '@tego/core';
 import _ from 'lodash';
 
 export class PluginPresets extends Plugin {

package/src/utils.ts

@@ -6,6 +6,7 @@ import fs, {
   createWriteStream,
 } from 'node:fs';
 import { mkdir, unlink } from 'node:fs/promises';
+import os from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import TachybaseGlobal from '@tachybase/globals';
@@ -51,20 +52,21 @@ export function parseEnvironment() {
     DEFAULT_STORAGE_TYPE: 'local',
     RUN_MODE: 'engine',
     LOCAL_STORAGE_DEST: 'storage/uploads',
-    PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
+    PLUGIN_STORAGE_PATH: 'storage/plugins',
     MFSU_AD: 'none',
     WS_PATH: '/ws',
     SOCKET_PATH: 'storage/gateway.sock',
-    PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
     PLUGIN_PACKAGE_PREFIX: '@tachybase/plugin-,@tachybase/module-',
     SERVER_TSCONFIG_PATH: './tsconfig.server.json',
-    PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), 'storage/playwright/.auth/admin.json'),
+    PLAYWRIGHT_AUTH_FILE: 'storage/playwright/.auth/admin.json',
     CACHE_DEFAULT_STORE: 'memory',
     CACHE_MEMORY_MAX: 2000,
     PLUGIN_STATICS_PATH: '/static/plugins/',
     LOGGER_BASE_PATH: 'storage/logs',
     APP_SERVER_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
+    TEGO_HOME: join(os.homedir(), '.tego'),
+    TEGO_RUNTIME_NAME: 'current',
   };
 
   config({
@@ -77,6 +79,10 @@ export function parseEnvironment() {
     }
   }
 
+  if (!process.env.TEGO_RUNTIME_HOME) {
+    process.env.TEGO_RUNTIME_HOME = join(process.env.TEGO_HOME!, process.env.TEGO_RUNTIME_NAME!);
+  }
+
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
     const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, '');
     const keys = ['API_BASE_PATH', 'WS_PATH', 'PLUGIN_STATICS_PATH'];