@oondemand/oon-core-back 0.7.10 → 0.7.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oondemand/oon-core-back",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oondemand/oon-platform.git",

package/src/api/activation.routes.js

@@ -637,18 +637,51 @@ router.post(
       });
     }
 
-    const preview = await activationProviderPost(
-      req,
-      PATHS.validar,
-      providerPayload(req, codigoAtivacao),
-    );
+    const payload = providerPayload(req, codigoAtivacao, { nomeInstancia, metadata: {} });
+    const crypto = require("node:crypto");
+    const { fingerprint: _fingerprint, coreVersion: _coreVersion, appVersion: _appVersion, ...semanticPayload } = payload;
+    const payloadHash = crypto.createHash("sha256").update(JSON.stringify({ payload: semanticPayload, parametrosGlobais, parametrosAplicacao,
+      configurationVersion: config.configurationVersion })).digest("hex");
+    const requestedKey = req.headers["idempotency-key"];
+    if (requestedKey && (typeof requestedKey !== "string" || requestedKey.length < 8 || requestedKey.length > 120))
+      throw new GenericError("Chave de ativação inválida.", { statusCode: 422, code: "IDEMPOTENCY_KEY_REQUIRED" });
+    if (instance.activationRequest && (instance.activationRequest.payloadHash !== payloadHash
+      || requestedKey && requestedKey !== instance.activationRequest.key))
+      throw new GenericError("Retome a mesma intenção de ativação.", { statusCode: 409, code: "IDEMPOTENCY_CONFLICT" });
+    const preview = instance.activationRequest ? { data: {} } : await activationProviderPost(
+      req, PATHS.validar, providerPayload(req, codigoAtivacao));
     assertApp(preview.data);
 
-    const activated = await activationProviderPost(
-      req,
-      PATHS.ativar,
-      providerPayload(req, codigoAtivacao, { nomeInstancia, metadata: {} }),
-    );
+    // Persist identity before the provider can consume the activation code.
+    // A lost reply retries that command, including after process restart.
+    // Keep runtime-generated fields across replica/container replacement. The
+    // activation code itself is supplied again by the caller, never stored here.
+    const { codigoAtivacao: _code, ...providerContext } = payload;
+    const intent = instance.activationRequest || { key: requestedKey || crypto.randomUUID(), payloadHash, providerContext };
+    const Instance = require("../core/models/InstanciaEcossistema");
+    await Instance.updateOne({ _id: instance._id, activationRequest: null }, { $set: { activationRequest: intent } });
+    const saved = await Instance.findById(instance._id).select("+activationRequest").lean();
+    if (!saved || saved.activationRequest?.payloadHash !== payloadHash || requestedKey && saved.activationRequest.key !== requestedKey)
+      throw new GenericError("Outra intenção de ativação está pendente.", { statusCode: 409, code: "IDEMPOTENCY_CONFLICT" });
+    instance.activationRequest = saved.activationRequest;
+
+    let activated;
+    try {
+      activated = await activationProviderPost(req, PATHS.ativar,
+        { ...instance.activationRequest.providerContext, codigoAtivacao },
+        { "Idempotency-Key": instance.activationRequest.key });
+    } catch (error) {
+      // Only an explicit, durable provider outcome can release the local intent.
+      // Timeouts, generic 4xx/5xx and a used/revoked credential remain uncertain.
+      if (error.code === "ACTIVATION_NOT_COMMITTED"
+        && error.details?.operationId === instance.activationRequest.key
+        && error.details?.activationOutcome === "not_committed") {
+        await Instance.updateOne({ _id: instance._id, "activationRequest.key": instance.activationRequest.key,
+          "activationRequest.payloadHash": payloadHash, deploymentId: null, instanceId: null },
+        { $unset: { activationRequest: 1 } });
+      }
+      throw error;
+    }
     assertApp(activated.data);
 
     const token = activated.data?.credencial?.token || activated.data?.deploymentCredential?.token;
@@ -688,6 +721,7 @@ router.post(
       parametrosGlobais,
       parametrosAplicacao,
       configurationVersion: config.configurationVersion,
+      publicationIdentity: activated.data.publicationIdentity,
       ativadaEm: new Date(),
       ultimoErro: undefined,
     });
@@ -724,8 +758,11 @@ async function complete(req, instance, config) {
       {
         configurationVersion: config.configurationVersion,
         parametros: instance.parametrosGlobais,
+        ...(instance.publicationIdentity ? { publicationIdentity: instance.publicationIdentity } : {}),
       },
-      instanceHeaders(instance),
+      { ...instanceHeaders(instance), ...(instance.publicationIdentity ? {
+        "Idempotency-Key": `configuration:${instance.publicationIdentity.releaseId}:${config.configurationVersion}`,
+      } : {}) },
     );
 
     instance.status = "ativa";

package/src/core/models/InstanciaEcossistema.js

@@ -30,6 +30,8 @@ const schema = new mongoose.Schema(
     credentialAuthTag: { type: String, select: false },
     credentialVersion: Number,
     configurationVersion: Number,
+    publicationIdentity: { type: mongoose.Schema.Types.Mixed },
+    activationRequest: { type: mongoose.Schema.Types.Mixed, select: false },
     parametrosGlobais: { type: mongoose.Schema.Types.Mixed, default: {} },
     parametrosAplicacao: { type: mongoose.Schema.Types.Mixed, default: {} },
     tenant: { type: mongoose.Schema.Types.Mixed, default: {} },
@@ -54,6 +56,7 @@ const schema = new mongoose.Schema(
         delete ret.credentialEncrypted;
         delete ret.credentialIv;
         delete ret.credentialAuthTag;
+        delete ret.activationRequest;
         return ret;
       },
     },

package/src/core/utils/instanceActivation.js

@@ -127,9 +127,14 @@ function deploymentBootstrap() {
   }
   const tenancyModel =
     ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel;
-  if (tenancyModel !== "none") {
+  const shared = tenancyModel === "multi_tenant"
+    && (ctx.config.deploymentMode || ctx.config.ecosystem?.deploymentMode) === "shared"
+    && (ctx.config.availability || ctx.config.ecosystem?.availability) === "common"
+    && (ctx.config.accessMode || ctx.config.ecosystem?.accessMode) === "tenant_members"
+    && (ctx.config.authorizationMode || ctx.config.ecosystem?.authorizationMode) === "rbac";
+  if (tenancyModel !== "none" && !shared) {
     throw new GenericError(
-      "Bootstrap direto de deployment é permitido somente para Apps globais.",
+      "Bootstrap direto exige App global ou comum multi-tenant/shared.",
       { statusCode: 500, code: "DEPLOYMENT_BOOTSTRAP_TENANCY_INVALID" },
     );
   }
@@ -249,6 +254,8 @@ function clearInstanceIdentity(instance) {
   instance.credentialEncrypted = undefined;
   instance.credentialIv = undefined;
   instance.credentialAuthTag = undefined;
+  instance.publicationIdentity = undefined;
+  instance.activationRequest = undefined;
 }
 
 async function ensureInstance() {
@@ -273,7 +280,7 @@ async function ensureInstance() {
   }
 
   let instance = await Instancia.findOne().select(
-    "+credentialEncrypted +credentialIv +credentialAuthTag",
+    "+credentialEncrypted +credentialIv +credentialAuthTag +activationRequest",
   );
 
   if (!instance) {

package/src/index.js

@@ -23,6 +23,7 @@ const localDevelopment = require("./core/runtime/localDevelopment");
 const localExecutionPolicy = require("./core/runtime/localExecutionPolicy");
 
 module.exports = {
+  appArchitecture: require("./manifest/appArchitecture"),
   start, createApp, activate,
   defineCentral: define.defineCentral, defineModel: define.defineModel,
   defineCollection: define.defineCollection, defineDocument: define.defineDocument,

package/src/manifest/appArchitecture.js

@@ -0,0 +1,31 @@
+"use strict";
+
+// Canonical #290 contract. Deployment is a derived technical projection, never
+// a second architectural authority. This module has no commercial policy.
+const DEPLOYMENT_BY_TENANCY = Object.freeze({ none: "singleton", single_tenant: "dedicated", multi_tenant: "shared" });
+const AVAILABILITY_TENANCY = Object.freeze({
+  system: Object.freeze(["none"]), common: Object.freeze(["none", "multi_tenant"]),
+  self: Object.freeze(["single_tenant"]), licensed: Object.freeze(["single_tenant", "multi_tenant"]),
+});
+function invalid(code, field, message) {
+  throw Object.assign(new Error(message), { code, statusCode: 422, details: { field } });
+}
+function deriveDeploymentMode(tenancyModel) {
+  if (!Object.hasOwn(DEPLOYMENT_BY_TENANCY, tenancyModel)) invalid("APP_TENANCY_INVALID", "tenancyModel", "Modelo de tenancy inválido.");
+  return DEPLOYMENT_BY_TENANCY[tenancyModel];
+}
+function resolveAppArchitecture(input) {
+  const { availability, tenancyModel } = input || {};
+  const deploymentMode = deriveDeploymentMode(tenancyModel);
+  if (!Object.hasOwn(AVAILABILITY_TENANCY, availability) || !AVAILABILITY_TENANCY[availability].includes(tenancyModel)) {
+    invalid("APP_ARCHITECTURE_INVALID", "availability", "Disponibilidade e tenancy fora da matriz suportada.");
+  }
+  if (input.ecosystemRole && (input.ecosystemRole === "root") !== (availability === "system")) {
+    invalid("APP_ARCHITECTURE_INVALID", "ecosystemRole", "Somente a Central root usa availability=system.");
+  }
+  if (input.deploymentMode !== undefined && input.deploymentMode !== deploymentMode) {
+    invalid(input.deploymentMode === "hybrid" ? "APP_HYBRID_UNSUPPORTED" : "APP_DEPLOYMENT_CONTRADICTION", "deploymentMode", "Implantação legada deve concordar com tenancyModel; hybrid não é suportado.");
+  }
+  return Object.freeze({ availability, tenancyModel, deploymentMode });
+}
+module.exports = { DEPLOYMENT_BY_TENANCY, AVAILABILITY_TENANCY, deriveDeploymentMode, resolveAppArchitecture };

package/src/manifest/appManifest.js

@@ -5,6 +5,7 @@ const path = require("node:path");
 const ctx = require("../core/context");
 const corePackage = require("../../package.json");
 const { validateRbac } = require("./rbacManifest");
+const { deriveDeploymentMode, resolveAppArchitecture } = require("./appArchitecture");
 
 const APP_MANIFEST_FILENAME = "central.app.json";
 const APP_MANIFEST_SCHEMA_VERSION = 2;
@@ -13,10 +14,10 @@ const SUPPORTED_MODULES = Object.freeze([
   "collections", "documents", "pipelines", "assistants", "currencies",
 ]);
 const SUPPORTED_TENANCY_MODELS = Object.freeze(["none", "single_tenant", "multi_tenant"]);
-const SUPPORTED_AVAILABILITIES = Object.freeze(["system", "common", "licensed"]);
+const SUPPORTED_AVAILABILITIES = Object.freeze(["system", "common", "self", "licensed"]);
 const SUPPORTED_ACCESS_MODES = Object.freeze(["tenant_members", "explicit_users", "authenticated_users"]);
 const SUPPORTED_AUTHORIZATION_MODES = Object.freeze(["none", "rbac"]);
-const SUPPORTED_DEPLOYMENT_MODES = Object.freeze(["singleton", "shared", "dedicated", "hybrid"]);
+const SUPPORTED_DEPLOYMENT_MODES = Object.freeze(["singleton", "shared", "dedicated"]);
 const TRANSACTIONAL_EMAIL_CAPABILITY = "core.transactional-email";
 const EMAIL_SCOPE_POLICIES = Object.freeze(["app_only", "tenant_required", "tenant_override"]);
 const APP_KIND_ROLE = Object.freeze({
@@ -201,7 +202,7 @@ function dimensionsFor(manifest) {
     availability: manifest.availability || defaults.availability,
     accessMode: manifest.accessMode || defaults.accessMode,
     authorizationMode: manifest.authorizationMode || defaults.authorizationMode,
-    deploymentMode: manifest.deploymentMode || defaults.deploymentMode,
+    deploymentMode: deriveDeploymentMode(SUPPORTED_TENANCY_MODELS.includes(manifest.tenancyModel) ? manifest.tenancyModel : defaults.tenancyModel),
   };
 }
 
@@ -238,6 +239,11 @@ function validateAppManifest(input, { coreVersion = corePackage.version } = {})
   validateDimension(input.deploymentMode, "deploymentMode", SUPPORTED_DEPLOYMENT_MODES, issues);
   const dimensions = dimensionsFor(input);
   const role = APP_KIND_ROLE[input.appKind];
+  try {
+    resolveAppArchitecture({ ...dimensions, ecosystemRole: role, ...(input.deploymentMode !== undefined ? { deploymentMode: input.deploymentMode } : {}) });
+  } catch (error) {
+    addIssue(issues, error.details?.field || "tenancyModel", `${error.code}: ${error.message}`);
+  }
   if (role === "root" && (
     dimensions.tenancyModel !== "none" ||
     dimensions.availability !== "system" ||