@tachybase/module-multi-app 0.23.40 → 0.23.47

package/dist/node_modules/qs/test/utils.js

@@ -0,0 +1,150 @@
+'use strict';
+
+var test = require('tape');
+var inspect = require('object-inspect');
+var SaferBuffer = require('safer-buffer').Buffer;
+var forEach = require('for-each');
+var utils = require('../lib/utils');
+
+test('merge()', function (t) {
+    t.deepEqual(utils.merge(null, true), [null, true], 'merges true into null');
+
+    t.deepEqual(utils.merge(null, [42]), [null, 42], 'merges null into an array');
+
+    t.deepEqual(utils.merge({ a: 'b' }, { a: 'c' }), { a: ['b', 'c'] }, 'merges two objects with the same key');
+
+    var oneMerged = utils.merge({ foo: 'bar' }, { foo: { first: '123' } });
+    t.deepEqual(oneMerged, { foo: ['bar', { first: '123' }] }, 'merges a standalone and an object into an array');
+
+    var twoMerged = utils.merge({ foo: ['bar', { first: '123' }] }, { foo: { second: '456' } });
+    t.deepEqual(twoMerged, { foo: { 0: 'bar', 1: { first: '123' }, second: '456' } }, 'merges a standalone and two objects into an array');
+
+    var sandwiched = utils.merge({ foo: ['bar', { first: '123', second: '456' }] }, { foo: 'baz' });
+    t.deepEqual(sandwiched, { foo: ['bar', { first: '123', second: '456' }, 'baz'] }, 'merges an object sandwiched by two standalones into an array');
+
+    var nestedArrays = utils.merge({ foo: ['baz'] }, { foo: ['bar', 'xyzzy'] });
+    t.deepEqual(nestedArrays, { foo: ['baz', 'bar', 'xyzzy'] });
+
+    var noOptionsNonObjectSource = utils.merge({ foo: 'baz' }, 'bar');
+    t.deepEqual(noOptionsNonObjectSource, { foo: 'baz', bar: true });
+
+    var func = function f() {};
+    t.deepEqual(
+        utils.merge(func, { foo: 'bar' }),
+        [func, { foo: 'bar' }],
+        'functions can not be merged into'
+    );
+
+    func.bar = 'baz';
+    t.deepEqual(
+        utils.merge({ foo: 'bar' }, func),
+        { foo: 'bar', bar: 'baz' },
+        'functions can be merge sources'
+    );
+
+    t.test(
+        'avoids invoking array setters unnecessarily',
+        { skip: typeof Object.defineProperty !== 'function' },
+        function (st) {
+            var setCount = 0;
+            var getCount = 0;
+            var observed = [];
+            Object.defineProperty(observed, 0, {
+                get: function () {
+                    getCount += 1;
+                    return { bar: 'baz' };
+                },
+                set: function () { setCount += 1; }
+            });
+            utils.merge(observed, [null]);
+            st.equal(setCount, 0);
+            st.equal(getCount, 1);
+            observed[0] = observed[0]; // eslint-disable-line no-self-assign
+            st.equal(setCount, 1);
+            st.equal(getCount, 2);
+            st.end();
+        }
+    );
+
+    t.end();
+});
+
+test('assign()', function (t) {
+    var target = { a: 1, b: 2 };
+    var source = { b: 3, c: 4 };
+    var result = utils.assign(target, source);
+
+    t.equal(result, target, 'returns the target');
+    t.deepEqual(target, { a: 1, b: 3, c: 4 }, 'target and source are merged');
+    t.deepEqual(source, { b: 3, c: 4 }, 'source is untouched');
+
+    t.end();
+});
+
+test('combine()', function (t) {
+    t.test('both arrays', function (st) {
+        var a = [1];
+        var b = [2];
+        var combined = utils.combine(a, b);
+
+        st.deepEqual(a, [1], 'a is not mutated');
+        st.deepEqual(b, [2], 'b is not mutated');
+        st.notEqual(a, combined, 'a !== combined');
+        st.notEqual(b, combined, 'b !== combined');
+        st.deepEqual(combined, [1, 2], 'combined is a + b');
+
+        st.end();
+    });
+
+    t.test('one array, one non-array', function (st) {
+        var aN = 1;
+        var a = [aN];
+        var bN = 2;
+        var b = [bN];
+
+        var combinedAnB = utils.combine(aN, b);
+        st.deepEqual(b, [bN], 'b is not mutated');
+        st.notEqual(aN, combinedAnB, 'aN + b !== aN');
+        st.notEqual(a, combinedAnB, 'aN + b !== a');
+        st.notEqual(bN, combinedAnB, 'aN + b !== bN');
+        st.notEqual(b, combinedAnB, 'aN + b !== b');
+        st.deepEqual([1, 2], combinedAnB, 'first argument is array-wrapped when not an array');
+
+        var combinedABn = utils.combine(a, bN);
+        st.deepEqual(a, [aN], 'a is not mutated');
+        st.notEqual(aN, combinedABn, 'a + bN !== aN');
+        st.notEqual(a, combinedABn, 'a + bN !== a');
+        st.notEqual(bN, combinedABn, 'a + bN !== bN');
+        st.notEqual(b, combinedABn, 'a + bN !== b');
+        st.deepEqual([1, 2], combinedABn, 'second argument is array-wrapped when not an array');
+
+        st.end();
+    });
+
+    t.test('neither is an array', function (st) {
+        var combined = utils.combine(1, 2);
+        st.notEqual(1, combined, '1 + 2 !== 1');
+        st.notEqual(2, combined, '1 + 2 !== 2');
+        st.deepEqual([1, 2], combined, 'both arguments are array-wrapped when not an array');
+
+        st.end();
+    });
+
+    t.end();
+});
+
+test('isBuffer()', function (t) {
+    forEach([null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], function () {}, /a/g], function (x) {
+        t.equal(utils.isBuffer(x), false, inspect(x) + ' is not a buffer');
+    });
+
+    var fakeBuffer = { constructor: Buffer };
+    t.equal(utils.isBuffer(fakeBuffer), false, 'fake buffer is not a buffer');
+
+    var saferBuffer = SaferBuffer.from('abc');
+    t.equal(utils.isBuffer(saferBuffer), true, 'SaferBuffer instance is a buffer');
+
+    var buffer = Buffer.from && Buffer.alloc ? Buffer.from('abc') : new Buffer('abc');
+    t.equal(utils.isBuffer(buffer), true, 'real Buffer instance is a buffer');
+    t.end();
+});

package/dist/server/middlewares/app-selector.d.ts

@@ -1 +1 @@
-export declare function appSelectorMiddleware(app: any): (ctx: any, next: any) => Promise<void>;
+export declare function appSelectorMiddleware(app: any): (ctx: any, next: any) => Promise<any>;

package/dist/server/middlewares/app-selector.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,16 +16,39 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var app_selector_exports = {};
 __export(app_selector_exports, {
   appSelectorMiddleware: () => appSelectorMiddleware
 });
 module.exports = __toCommonJS(app_selector_exports);
+var import_qs = __toESM(require("qs"));
 function appSelectorMiddleware(app) {
   return async (ctx, next) => {
     const { req } = ctx;
-    if (!ctx.resolvedAppName && req.headers["x-hostname"]) {
+    let subAppName;
+    if (!ctx.resolvedAppName) {
+      if (req.headers["x-hostname"]) {
+        subAppName = req.headers["x-hostname"];
+      } else {
+        const url = req.url;
+        const [path, query] = url.split("?");
+        if (path === "/ws" && query) {
+          const queryObj = import_qs.default.parse(query);
+          subAppName = queryObj.__hostname;
+        }
+      }
+      if (!subAppName) {
+        return next();
+      }
       const repository = app.db.getRepository("applications");
       if (!repository) {
         await next();
@@ -31,7 +56,7 @@ function appSelectorMiddleware(app) {
       }
       const appInstance = await repository.findOne({
         filter: {
-          cname: req.headers["x-hostname"]
+          cname: subAppName
         }
       });
       if (appInstance) {

package/dist/server/migrations/20240820153000-add-apps-tmpl.js

@@ -22,7 +22,10 @@ __export(add_apps_tmpl_exports, {
 module.exports = __toCommonJS(add_apps_tmpl_exports);
 var import_server = require("@tachybase/server");
 class AddAppTmplMigration extends import_server.Migration {
-  appVersion = "<0.21.99";
+  constructor() {
+    super(...arguments);
+    this.appVersion = "<0.21.99";
+  }
   async up() {
     const Field = this.context.db.getRepository("fields");
     const existed = await Field.count({

package/dist/server/migrations/20241126124904-add-createdBy.js

@@ -22,9 +22,12 @@ __export(add_createdBy_exports, {
 module.exports = __toCommonJS(add_createdBy_exports);
 var import_server = require("@tachybase/server");
 class add_createdBy_default extends import_server.Migration {
-  on = "afterLoad";
-  // 'beforeLoad' or 'afterLoad'
-  appVersion = "<0.22.47";
+  constructor() {
+    super(...arguments);
+    this.on = "afterLoad";
+    // 'beforeLoad' or 'afterLoad'
+    this.appVersion = "<0.22.47";
+  }
   async up() {
     const userRepo = this.context.db.getRepository("users");
     const appRepo = this.context.db.getRepository("applications");

package/dist/server/server.d.ts

@@ -16,4 +16,9 @@ export declare class PluginMultiAppManager extends Plugin {
     setAppDbCreator(appDbCreator: AppDbCreator): void;
     beforeLoad(): void;
     load(): Promise<void>;
+    notifyStatusChange({ appName, status, options }: {
+        appName: any;
+        status: any;
+        options: any;
+    }): void;
 }

package/dist/server/server.js

@@ -157,9 +157,12 @@ const defaultAppOptionsFactory = (appName, mainApp, preset) => {
   };
 };
 class PluginMultiAppManager extends import_server.Plugin {
-  appDbCreator = defaultDbCreator;
-  appOptionsFactory = defaultAppOptionsFactory;
-  subAppUpgradeHandler = defaultSubAppUpgradeHandle;
+  constructor() {
+    super(...arguments);
+    this.appDbCreator = defaultDbCreator;
+    this.appOptionsFactory = defaultAppOptionsFactory;
+    this.subAppUpgradeHandler = defaultSubAppUpgradeHandle;
+  }
   static getDatabaseConfig(app) {
     let oldConfig = app.options.database instanceof import_database.Database ? app.options.database.options : app.options.database;
     if (!oldConfig && app.db) {
@@ -214,22 +217,11 @@ class PluginMultiAppManager extends import_server.Plugin {
     this.app.on("afterUpgrade", async (app, options) => {
       await this.subAppUpgradeHandler(app);
     });
-    import_server.AppSupervisor.getInstance().on("appStatusChanged", async ({ appName, status, options }) => {
-      var _a;
-      if (appName === "main") {
-        return;
-      }
-      const app = await import_server.AppSupervisor.getInstance().getApp(appName, {
-        withOutBootStrap: true
-      });
-      const level = ["error", "not_found"].includes(status) ? "error" : "info";
-      this.app.noticeManager.notify(import_constants.NOTIFY_STATUS_EVENT_KEY, {
-        app: appName,
-        status,
-        level,
-        message: (_a = options.error) == null ? void 0 : _a.message
-      });
+    const notifyStatusChange = this.notifyStatusChange.bind(this);
+    this.app.on("beforeStop", async (app) => {
+      import_server.AppSupervisor.getInstance().off("appStatusChanged", notifyStatusChange);
     });
+    import_server.AppSupervisor.getInstance().on("appStatusChanged", notifyStatusChange);
     this.app.acl.allow("applications", "listPinned", "loggedIn");
     this.app.acl.allow("applications", "list", "loggedIn");
     this.app.acl.registerSnippet({
@@ -258,6 +250,19 @@ class PluginMultiAppManager extends import_server.Plugin {
       this.app.resourcer.registerActionHandler(`applications:${key}`, action);
     }
   }
+  notifyStatusChange({ appName, status, options }) {
+    var _a;
+    if (appName === "main") {
+      return;
+    }
+    const level = ["error", "not_found"].includes(status) ? "error" : "info";
+    this.app.noticeManager.notify(import_constants.NOTIFY_STATUS_EVENT_KEY, {
+      app: appName,
+      status,
+      level,
+      message: (_a = options.error) == null ? void 0 : _a.message
+    });
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@tachybase/module-multi-app",
   "displayName": "Multi-app manager",
-  "version": "0.23.40",
+  "version": "0.23.47",
   "description": "Dynamically create multiple apps without separate deployments.",
   "keywords": [
     "System management"
   ],
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
-  "dependencies": {},
+  "dependencies": {
+    "qs": "^6.13.1"
+  },
   "devDependencies": {
     "@ant-design/icons": "^5.5.2",
     "antd": "5.22.5",
@@ -19,15 +21,15 @@
     "react": "~18.3.1",
     "react-i18next": "^15.2.0",
     "react-router-dom": "6.28.1",
-    "@tachybase/schema": "0.23.40"
+    "@tachybase/schema": "0.23.47"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.40",
-    "@tachybase/database": "0.23.40",
-    "@tachybase/client": "0.23.40",
-    "@tachybase/server": "0.23.40",
-    "@tachybase/utils": "0.23.40",
-    "@tachybase/test": "0.23.40"
+    "@tachybase/actions": "0.23.47",
+    "@tachybase/client": "0.23.47",
+    "@tachybase/database": "0.23.47",
+    "@tachybase/test": "0.23.47",
+    "@tachybase/server": "0.23.47",
+    "@tachybase/utils": "0.23.47"
   },
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
   "displayName.zh-CN": "多应用管理器",