@nocobase/server 1.5.0-beta.1 → 1.6.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.5.0-beta.1",
+    "version": "1.6.0-alpha.2",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,22 +10,24 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.5.0-beta.1",
-        "@nocobase/actions": "1.5.0-beta.1",
-        "@nocobase/auth": "1.5.0-beta.1",
-        "@nocobase/cache": "1.5.0-beta.1",
-        "@nocobase/data-source-manager": "1.5.0-beta.1",
-        "@nocobase/database": "1.5.0-beta.1",
-        "@nocobase/evaluators": "1.5.0-beta.1",
-        "@nocobase/logger": "1.5.0-beta.1",
-        "@nocobase/resourcer": "1.5.0-beta.1",
-        "@nocobase/sdk": "1.5.0-beta.1",
-        "@nocobase/telemetry": "1.5.0-beta.1",
-        "@nocobase/utils": "1.5.0-beta.1",
+        "@nocobase/acl": "1.6.0-alpha.2",
+        "@nocobase/actions": "1.6.0-alpha.2",
+        "@nocobase/auth": "1.6.0-alpha.2",
+        "@nocobase/cache": "1.6.0-alpha.2",
+        "@nocobase/data-source-manager": "1.6.0-alpha.2",
+        "@nocobase/database": "1.6.0-alpha.2",
+        "@nocobase/evaluators": "1.6.0-alpha.2",
+        "@nocobase/lock-manager": "1.6.0-alpha.2",
+        "@nocobase/logger": "1.6.0-alpha.2",
+        "@nocobase/resourcer": "1.6.0-alpha.2",
+        "@nocobase/sdk": "1.6.0-alpha.2",
+        "@nocobase/telemetry": "1.6.0-alpha.2",
+        "@nocobase/utils": "1.6.0-alpha.2",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
         "@types/multer": "^1.4.5",
+        "async-mutex": "^0.5.0",
         "axios": "^1.7.0",
         "chalk": "^4.1.1",
         "commander": "^9.2.0",
@@ -54,5 +56,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "10c6f1f3d90e91f3aabfa80449c7ef062e90f6af"
+    "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee"
 }

package/lib/sync-manager.d.ts

@@ -1,46 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-/// <reference types="node" />
-import EventEmitter from 'node:events';
-import Application from './application';
-export declare abstract class SyncAdapter extends EventEmitter {
-    abstract get ready(): boolean;
-    abstract publish(data: SyncMessage): void | Promise<void>;
-}
-export type SyncMessageData = Record<string, string>;
-export type SyncEventCallback = (message: SyncMessageData) => void;
-export type SyncMessage = {
-    namespace: string;
-    nodeId: string;
-    appName: string;
-} & SyncMessageData;
-/**
- * @experimental
- */
-export declare class SyncManager {
-    private app;
-    private nodeId;
-    private eventEmitter;
-    private adapter;
-    private incomingBuffer;
-    private outgoingBuffer;
-    private flushTimer;
-    get available(): boolean;
-    private onMessage;
-    private onSync;
-    private onReady;
-    constructor(app: Application);
-    init(adapter: SyncAdapter): void;
-    subscribe(namespace: string, callback: SyncEventCallback): void;
-    unsubscribe(namespace: string, callback: SyncEventCallback): void;
-    /**
-     * Publish a message to the sync manager
-     */
-    publish(namespace: string, data?: SyncMessageData): void | Promise<void>;
-}

package/lib/sync-manager.js

@@ -1,137 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-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 __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 __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 sync_manager_exports = {};
-__export(sync_manager_exports, {
-  SyncAdapter: () => SyncAdapter,
-  SyncManager: () => SyncManager
-});
-module.exports = __toCommonJS(sync_manager_exports);
-var import_node_crypto = require("node:crypto");
-var import_node_events = __toESM(require("node:events"));
-var import_lodash = require("lodash");
-const _SyncAdapter = class _SyncAdapter extends import_node_events.default {
-};
-__name(_SyncAdapter, "SyncAdapter");
-let SyncAdapter = _SyncAdapter;
-const _SyncManager = class _SyncManager {
-  constructor(app) {
-    this.app = app;
-    this.nodeId = `${process.env.NODE_ID || (0, import_node_crypto.randomUUID)()}-${process.pid}`;
-  }
-  nodeId;
-  eventEmitter = new import_node_events.default();
-  adapter = null;
-  incomingBuffer = [];
-  outgoingBuffer = [];
-  flushTimer = null;
-  get available() {
-    return this.adapter ? this.adapter.ready : false;
-  }
-  onMessage(namespace, message) {
-    this.app.logger.info(`emit sync event in namespace ${namespace}`);
-    this.eventEmitter.emit(namespace, message);
-    const pluginInstance = this.app.pm.get(namespace);
-    pluginInstance.onSync(message);
-  }
-  onSync = /* @__PURE__ */ __name((messages) => {
-    this.app.logger.info("sync messages received, save into buffer:", messages);
-    if (this.flushTimer) {
-      clearTimeout(this.flushTimer);
-      this.flushTimer = null;
-    }
-    this.incomingBuffer = (0, import_lodash.uniqWith)(
-      this.incomingBuffer.concat(
-        messages.filter((item) => item.nodeId !== this.nodeId && item.appName === this.app.name).map(({ nodeId, appName, ...message }) => message)
-      ),
-      import_lodash.isEqual
-    );
-    this.flushTimer = setTimeout(() => {
-      this.incomingBuffer.forEach(({ namespace, ...message }) => {
-        this.onMessage(namespace, message);
-      });
-      this.incomingBuffer = [];
-    }, 1e3);
-  }, "onSync");
-  onReady = /* @__PURE__ */ __name(() => {
-    while (this.outgoingBuffer.length) {
-      const [namespace, data] = this.outgoingBuffer.shift();
-      this.publish(namespace, data);
-    }
-  }, "onReady");
-  init(adapter) {
-    if (this.adapter) {
-      throw new Error("sync adapter is already exists");
-    }
-    if (!adapter) {
-      return;
-    }
-    this.adapter = adapter;
-    this.adapter.on("message", this.onSync);
-    this.adapter.on("ready", this.onReady);
-  }
-  subscribe(namespace, callback) {
-    this.eventEmitter.on(namespace, callback);
-  }
-  unsubscribe(namespace, callback) {
-    this.eventEmitter.off(namespace, callback);
-  }
-  /**
-   * Publish a message to the sync manager
-   */
-  publish(namespace, data = {}) {
-    if (!this.adapter) {
-      return;
-    }
-    if (!this.adapter.ready) {
-      this.outgoingBuffer.push([namespace, data]);
-      this.app.logger.warn(`sync adapter is not ready for now, message will be send when it is ready`);
-      return;
-    }
-    this.app.logger.info(`publishing sync message from #${this.nodeId} (${this.app.name}) in namespace ${namespace}:`, {
-      data
-    });
-    return this.adapter.publish({ ...data, nodeId: this.nodeId, appName: this.app.name, namespace });
-  }
-};
-__name(_SyncManager, "SyncManager");
-let SyncManager = _SyncManager;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SyncAdapter,
-  SyncManager
-});