@objectstack/rest 9.0.0 → 9.1.0

package/dist/index.d.cts

@@ -268,6 +268,14 @@ declare class RestServer {
      * next request.
      */
     private resolveHostnameCached;
+    /**
+     * Resolve the environment a request targets: explicit id → tenant hostname
+     * → `X-Environment-Id` header → single-project default. Returns undefined
+     * for control-plane requests. Shared by every per-environment service
+     * resolution (protocol, analytics, …) so they can never disagree about
+     * which kernel a request belongs to.
+     */
+    private resolveRequestEnvironmentId;
     private resolveProtocol;
     /**
      * Resolve the i18n service for the request's project (or control plane

package/dist/index.d.ts

@@ -268,6 +268,14 @@ declare class RestServer {
      * next request.
      */
     private resolveHostnameCached;
+    /**
+     * Resolve the environment a request targets: explicit id → tenant hostname
+     * → `X-Environment-Id` header → single-project default. Returns undefined
+     * for control-plane requests. Shared by every per-environment service
+     * resolution (protocol, analytics, …) so they can never disagree about
+     * which kernel a request belongs to.
+     */
+    private resolveRequestEnvironmentId;
     private resolveProtocol;
     /**
      * Resolve the i18n service for the request's project (or control plane

package/dist/index.js

@@ -506,37 +506,49 @@ var RestServer = class {
     this.hostnameCache.set(host, { value: result, expiresAt: now + this.hostnameCacheTtlMs });
     return result;
   }
-  async resolveProtocol(environmentId, req) {
-    if (environmentId === "platform") return this.protocol;
-    if (!environmentId && req && this.envRegistry && this.kernelManager) {
+  /**
+   * Resolve the environment a request targets: explicit id → tenant hostname
+   * → `X-Environment-Id` header → single-project default. Returns undefined
+   * for control-plane requests. Shared by every per-environment service
+   * resolution (protocol, analytics, …) so they can never disagree about
+   * which kernel a request belongs to.
+   */
+  async resolveRequestEnvironmentId(environmentId, req) {
+    if (environmentId) return environmentId;
+    if (req && this.envRegistry && this.kernelManager) {
       const host = this.extractHostname(req);
       if (host) {
         try {
           const result = await this.resolveHostnameCached(host);
-          if (result?.environmentId) environmentId = result.environmentId;
+          if (result?.environmentId) return result.environmentId;
         } catch {
         }
       }
-      if (!environmentId && typeof this.envRegistry.resolveById === "function") {
+      if (typeof this.envRegistry.resolveById === "function") {
         const headerVal = this.extractProjectIdHeader(req);
         if (headerVal) {
           try {
             const driver = await this.envRegistry.resolveById(headerVal);
-            if (driver) environmentId = headerVal;
+            if (driver) return headerVal;
           } catch {
           }
         }
       }
     }
-    if (!environmentId && this.defaultEnvironmentIdProvider) {
+    if (this.defaultEnvironmentIdProvider) {
       try {
         const def = this.defaultEnvironmentIdProvider();
-        if (def) environmentId = def;
+        if (def) return def;
       } catch {
       }
     }
-    if (!environmentId || !this.kernelManager) return this.protocol;
-    const kernel = await this.kernelManager.getOrCreate(environmentId);
+    return void 0;
+  }
+  async resolveProtocol(environmentId, req) {
+    if (environmentId === "platform") return this.protocol;
+    const envId = await this.resolveRequestEnvironmentId(environmentId, req);
+    if (!envId || !this.kernelManager) return this.protocol;
+    const kernel = await this.kernelManager.getOrCreate(envId);
     return kernel.getServiceAsync("protocol");
   }
   /**
@@ -2931,7 +2943,16 @@ var RestServer = class {
    */
   registerAnalyticsEndpoints(basePath) {
     const isScoped = basePath.includes("/environments/:environmentId");
-    const resolveService = async (environmentId) => {
+    const resolveService = async (environmentId, req) => {
+      try {
+        const envId = await this.resolveRequestEnvironmentId(environmentId, req);
+        if (envId && envId !== "platform" && this.kernelManager) {
+          const kernel = await this.kernelManager.getOrCreate(envId);
+          const svc = await kernel.getServiceAsync("analytics").catch(() => void 0);
+          if (svc) return svc;
+        }
+      } catch {
+      }
       if (!this.analyticsServiceProvider) return void 0;
       try {
         return await this.analyticsServiceProvider(environmentId);
@@ -2947,7 +2968,7 @@ var RestServer = class {
           const environmentId = isScoped ? req.params?.environmentId : void 0;
           const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(environmentId);
+          const svc = await resolveService(environmentId, req);
           if (!svc || typeof svc.queryDataset !== "function") {
             return res.status(501).json({
               code: "NOT_IMPLEMENTED",
@@ -2962,10 +2983,11 @@ var RestServer = class {
               message: "body.selection.measures must be a non-empty array of measure names."
             });
           }
+          const previewDrafts = body.previewDrafts === true || req.query?.preview === "draft";
           let dataset = body.dataset;
           if (!dataset && body.datasetName) {
             const p = await this.resolveProtocol(environmentId, req);
-            const items = await p.getMetaItems?.({ type: "dataset" }).catch(() => null);
+            const items = await p.getMetaItems?.({ type: "dataset", previewDrafts }).catch(() => null);
             const list = Array.isArray(items?.items) ? items.items : Array.isArray(items) ? items : [];
             dataset = list.find((d) => d?.name === body.datasetName);
             if (!dataset) {
@@ -2985,7 +3007,12 @@ var RestServer = class {
               detail: String(verr?.message ?? verr).slice(0, 1e3)
             });
           }
-          const result = await svc.queryDataset(dataset, selection, context ?? void 0);
+          const result = await svc.queryDataset(
+            dataset,
+            selection,
+            context ?? void 0,
+            previewDrafts ? { previewDrafts: true } : void 0
+          );
           res.json(result);
         } catch (error) {
           const msg = String(error?.message ?? error ?? "");
@@ -3613,6 +3640,34 @@ var RestServer = class {
     };
     decisionRoute("approve");
     decisionRoute("reject");
+    this.routeManager.register({
+      method: "POST",
+      path: `${dataPath}/approvals/requests/:id/recall`,
+      handler: async (req, res) => {
+        try {
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
+          if (this.enforceAuth(req, res, context)) return;
+          const svc = await resolveService(environmentId);
+          if (!svc || typeof svc.recall !== "function") return respond501(res);
+          const body = req.body ?? {};
+          try {
+            const out = await svc.recall(req.params.id, {
+              actorId: body.actorId ?? body.actor_id ?? context?.userId,
+              comment: body.comment
+            }, context ?? {});
+            res.json(out);
+          } catch (err) {
+            if (handleApprovalError(res, err)) return;
+            throw err;
+          }
+        } catch (error) {
+          logError("[REST] recall approval error:", error);
+          res.status(500).json({ code: "APPROVAL_RECALL_FAILED", error: String(error?.message ?? error).slice(0, 500) });
+        }
+      },
+      metadata: { summary: "Recall (withdraw) an approval request", tags: ["approvals"] }
+    });
     this.routeManager.register({
       method: "GET",
       path: `${dataPath}/approvals/requests/:id/actions`,