@objectstack/runtime 7.1.0 → 7.2.1

package/dist/index.d.cts

@@ -12,6 +12,7 @@ export { CapturedError, ErrorReporter, InMemoryErrorReporter, InMemoryMetricsReg
 import { MiddlewareConfig, MiddlewareType } from '@objectstack/spec/system';
 import { EnvironmentArtifact } from '@objectstack/spec/cloud';
 export { RestApiPluginConfig, RestServer, RouteEntry, RouteGroupBuilder, RouteManager, createRestApiPlugin } from '@objectstack/rest';
+export { _resetEnvDeprecationWarnings, readEnvWithDeprecation } from '@objectstack/types';
 
 interface RuntimeConfig {
     /**
@@ -1940,11 +1941,21 @@ interface MarketplaceProxyPluginConfig {
      * Override the LRU upper bound. Defaults to 200 entries.
      */
     cacheMaxEntries?: number;
+    /**
+     * Public R2 base URL for marketplace snapshots. When set, GETs for
+     * snapshot-backed paths (`/packages`, `/packages/:id`,
+     * `/packages/:id/versions/:vid/manifest`) are fetched directly from
+     * R2 (CF edge) — bypassing the cloud control plane entirely.
+     * Defaults to the value of OS_MARKETPLACE_PUBLIC_BASE_URL. Empty
+     * string disables the public fast-path (legacy cloud-proxy only).
+     */
+    publicMarketplaceBaseUrl?: string;
 }
 declare class MarketplaceProxyPlugin implements Plugin {
     readonly name = "com.objectstack.runtime.marketplace-proxy";
-    readonly version = "1.0.0";
+    readonly version = "1.1.0";
     private readonly cloudUrl;
+    private readonly publicBaseUrl;
     private readonly cache;
     constructor(config?: MarketplaceProxyPluginConfig);
     init: (_ctx: PluginContext) => Promise<void>;

package/dist/index.d.ts

@@ -12,6 +12,7 @@ export { CapturedError, ErrorReporter, InMemoryErrorReporter, InMemoryMetricsReg
 import { MiddlewareConfig, MiddlewareType } from '@objectstack/spec/system';
 import { EnvironmentArtifact } from '@objectstack/spec/cloud';
 export { RestApiPluginConfig, RestServer, RouteEntry, RouteGroupBuilder, RouteManager, createRestApiPlugin } from '@objectstack/rest';
+export { _resetEnvDeprecationWarnings, readEnvWithDeprecation } from '@objectstack/types';
 
 interface RuntimeConfig {
     /**
@@ -1940,11 +1941,21 @@ interface MarketplaceProxyPluginConfig {
      * Override the LRU upper bound. Defaults to 200 entries.
      */
     cacheMaxEntries?: number;
+    /**
+     * Public R2 base URL for marketplace snapshots. When set, GETs for
+     * snapshot-backed paths (`/packages`, `/packages/:id`,
+     * `/packages/:id/versions/:vid/manifest`) are fetched directly from
+     * R2 (CF edge) — bypassing the cloud control plane entirely.
+     * Defaults to the value of OS_MARKETPLACE_PUBLIC_BASE_URL. Empty
+     * string disables the public fast-path (legacy cloud-proxy only).
+     */
+    publicMarketplaceBaseUrl?: string;
 }
 declare class MarketplaceProxyPlugin implements Plugin {
     readonly name = "com.objectstack.runtime.marketplace-proxy";
-    readonly version = "1.0.0";
+    readonly version = "1.1.0";
     private readonly cloudUrl;
+    private readonly publicBaseUrl;
     private readonly cache;
     constructor(config?: MarketplaceProxyPluginConfig);
     init: (_ctx: PluginContext) => Promise<void>;

package/dist/index.js

@@ -1202,6 +1202,7 @@ __export(app_plugin_exports, {
   collectBundleFunctions: () => collectBundleFunctions,
   collectBundleHooks: () => collectBundleHooks
 });
+import { readEnvWithDeprecation } from "@objectstack/types";
 function collectBundleHooks(bundle) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -1591,7 +1592,7 @@ var init_app_plugin = __esm({
             } catch (e) {
               ctx.logger.warn("[Seeder] Failed to register seed-datasets/seed-replayer service", { error: e?.message });
             }
-            const multiTenant = String(process.env.OS_MULTI_TENANT ?? "false").toLowerCase() !== "false";
+            const multiTenant = String(readEnvWithDeprecation("OS_MULTI_ORG_ENABLED", "OS_MULTI_TENANT") ?? "false").toLowerCase() !== "false";
             if (multiTenant) {
               ctx.logger.info("[Seeder] multi-tenant mode \u2014 skipping inline seed; per-org replay will run on sys_organization insert");
             } else {
@@ -2245,6 +2246,7 @@ import { resolve as resolvePath2 } from "path";
 import { mkdirSync } from "fs";
 import { homedir } from "os";
 import { z } from "zod";
+import { readEnvWithDeprecation as readEnvWithDeprecation2 } from "@objectstack/types";
 function resolveObjectStackHome() {
   const raw = process.env.OS_HOME?.trim();
   if (raw && raw.length > 0) {
@@ -2294,7 +2296,7 @@ async function createStandaloneStack(config) {
   const environmentId = cfg.environmentId ?? process.env.OS_ENVIRONMENT_ID ?? "proj_local";
   const artifactPathInput = cfg.artifactPath ?? process.env.OS_ARTIFACT_PATH ?? resolvePath2(cwd, "dist/objectstack.json");
   const artifactPath = isHttpUrl(artifactPathInput) ? artifactPathInput : artifactPathInput.startsWith("/") ? artifactPathInput : resolvePath2(cwd, artifactPathInput);
-  const dbUrl = cfg.databaseUrl ?? process.env.OS_DATABASE_URL?.trim() ?? process.env.TURSO_DATABASE_URL?.trim() ?? (process.env.OS_HOME?.trim() ? `file:${resolvePath2(resolveObjectStackHome(), "data/standalone.db")}` : cfg.projectRoot ? `file:${resolvePath2(cfg.projectRoot, ".objectstack/data/standalone.db")}` : `file:${resolvePath2(resolveObjectStackHome(), "data/standalone.db")}`);
+  const dbUrl = cfg.databaseUrl ?? readEnvWithDeprecation2("OS_DATABASE_URL", "DATABASE_URL")?.trim() ?? process.env.TURSO_DATABASE_URL?.trim() ?? (process.env.OS_HOME?.trim() ? `file:${resolvePath2(resolveObjectStackHome(), "data/standalone.db")}` : cfg.projectRoot ? `file:${resolvePath2(cfg.projectRoot, ".objectstack/data/standalone.db")}` : `file:${resolvePath2(resolveObjectStackHome(), "data/standalone.db")}`);
   const explicitDriver = cfg.databaseDriver ?? process.env.OS_DATABASE_DRIVER?.trim();
   const dbDriver = explicitDriver ?? detectDriverFromUrl(dbUrl);
   let driverPlugin;
@@ -2457,6 +2459,7 @@ init_seed_loader();
 
 // src/http-dispatcher.ts
 import { getEnv, resolveLocale } from "@objectstack/core";
+import { readEnvWithDeprecation as readEnvWithDeprecation3 } from "@objectstack/types";
 import { CoreServiceName } from "@objectstack/spec/system";
 import { pluralToSingular } from "@objectstack/spec/shared";
 
@@ -3947,7 +3950,7 @@ var _HttpDispatcher = class _HttpDispatcher {
         }
       }
       if (parts.length === 3 && parts[0] === "admin" && parts[1] === "platform-sso" && parts[2] === "backfill" && m === "POST") {
-        const baseSecret = (process.env.OS_AUTH_SECRET ?? process.env.AUTH_SECRET ?? "").trim();
+        const baseSecret = (readEnvWithDeprecation3("OS_AUTH_SECRET", ["AUTH_SECRET", "BETTER_AUTH_SECRET"]) ?? "").trim();
         if (!baseSecret) {
           return { handled: true, response: this.error("OS_AUTH_SECRET not configured on this worker", 503) };
         }
@@ -4137,7 +4140,7 @@ var _HttpDispatcher = class _HttpDispatcher {
         });
         try {
           const { seedPlatformSsoClient: seedPlatformSsoClient2 } = await Promise.resolve().then(() => (init_platform_sso(), platform_sso_exports));
-          const baseSecret = (process.env.OS_AUTH_SECRET ?? process.env.AUTH_SECRET ?? "").trim();
+          const baseSecret = (readEnvWithDeprecation3("OS_AUTH_SECRET", ["AUTH_SECRET", "BETTER_AUTH_SECRET"]) ?? "").trim();
           if (baseSecret) {
             await seedPlatformSsoClient2({
               ql,
@@ -7607,6 +7610,7 @@ init_driver_plugin();
 init_app_plugin();
 import { createHmac as createHmac2 } from "crypto";
 import { ObjectKernel as ObjectKernel3 } from "@objectstack/core";
+import { readEnvWithDeprecation as readEnvWithDeprecation4 } from "@objectstack/types";
 
 // src/cloud/capability-loader.ts
 var CAPABILITY_PROVIDERS = {
@@ -7744,7 +7748,7 @@ var ArtifactKernelFactory = class {
     this.envRegistry = config.envRegistry;
     this.logger = config.logger ?? console;
     this.kernelConfig = config.kernelConfig;
-    this.authBaseSecret = (config.authBaseSecret ?? process.env.OS_AUTH_SECRET ?? process.env.AUTH_SECRET ?? "").trim();
+    this.authBaseSecret = (config.authBaseSecret ?? readEnvWithDeprecation4("OS_AUTH_SECRET", ["AUTH_SECRET", "BETTER_AUTH_SECRET"]) ?? "").trim();
   }
   async create(environmentId) {
     let cached = this.envRegistry.peekById(environmentId);
@@ -7857,7 +7861,7 @@ var ArtifactKernelFactory = class {
       this.logger.warn?.("[ArtifactKernelFactory] OS_AUTH_SECRET not set \u2014 per-project AuthPlugin skipped (auth endpoints will return 404)", { environmentId });
     }
     try {
-      const multiTenant = String(process.env.OS_MULTI_TENANT ?? "false").toLowerCase() !== "false";
+      const multiTenant = String(readEnvWithDeprecation4("OS_MULTI_ORG_ENABLED", "OS_MULTI_TENANT") ?? "false").toLowerCase() !== "false";
       if (multiTenant) {
         try {
           const { OrgScopingPlugin } = await import("@objectstack/plugin-org-scoping");
@@ -8394,6 +8398,36 @@ function resolveCloudUrl(explicit) {
   return picked.replace(/\/+$/, "");
 }
 
+// src/cloud/marketplace-public-url.ts
+function resolveMarketplacePublicBaseUrl(explicit) {
+  const raw = (explicit ?? process.env.OS_MARKETPLACE_PUBLIC_BASE_URL ?? "").trim();
+  const lower = raw.toLowerCase();
+  if (!raw || lower === "off" || lower === "none" || lower === "disabled" || lower === "false") {
+    return "";
+  }
+  return raw.replace(/\/+$/, "");
+}
+function publicMarketplaceKeyForApiPath(pathname) {
+  const prefix = "/api/v1/marketplace/packages";
+  if (pathname === prefix) return "packages.json";
+  if (!pathname.startsWith(`${prefix}/`)) return null;
+  const tail = pathname.slice(prefix.length + 1);
+  if (!tail) return null;
+  const parts = tail.split("/");
+  if (parts.length === 1) {
+    const id = decodeURIComponent(parts[0] ?? "");
+    if (!id) return null;
+    return `packages/${encodeURIComponent(id)}.json`;
+  }
+  if (parts.length === 4 && parts[1] === "versions" && parts[3] === "manifest") {
+    const id = decodeURIComponent(parts[0] ?? "");
+    const versionId = decodeURIComponent(parts[2] ?? "");
+    if (!id || !versionId) return null;
+    return `packages/${encodeURIComponent(id)}/versions/${encodeURIComponent(versionId)}/manifest.json`;
+  }
+  return null;
+}
+
 // src/cloud/marketplace-proxy-plugin.ts
 var MARKETPLACE_PREFIX = "/api/v1/marketplace";
 var DEFAULT_LRU_MAX = 200;
@@ -8433,7 +8467,7 @@ var LruTtlCache = class {
 var MarketplaceProxyPlugin = class _MarketplaceProxyPlugin {
   constructor(config = {}) {
     this.name = "com.objectstack.runtime.marketplace-proxy";
-    this.version = "1.0.0";
+    this.version = "1.1.0";
     this.init = async (_ctx) => {
     };
     this.start = async (ctx) => {
@@ -8451,7 +8485,11 @@ var MarketplaceProxyPlugin = class _MarketplaceProxyPlugin {
         }
         const rawApp = httpServer.getRawApp();
         const cloudUrl = this.cloudUrl;
+        const publicBaseUrl = this.publicBaseUrl;
         const cache = this.cache;
+        if (publicBaseUrl) {
+          ctx.logger?.info?.(`[MarketplaceProxyPlugin] public R2 fast-path enabled \u2192 ${publicBaseUrl}`);
+        }
         const handler = async (c, next) => {
           if (!cloudUrl) {
             return c.json({
@@ -8467,8 +8505,18 @@ var MarketplaceProxyPlugin = class _MarketplaceProxyPlugin {
             if (incomingUrl.pathname.startsWith(`${MARKETPLACE_PREFIX}/install-local`)) {
               return next();
             }
-            const target = `${cloudUrl}${incomingUrl.pathname}${incomingUrl.search}`;
             const method = String(c.req.method ?? "GET").toUpperCase();
+            if (publicBaseUrl && (method === "GET" || method === "HEAD")) {
+              const r2Resp = await tryPublicMarketplaceFetch(
+                publicBaseUrl,
+                incomingUrl,
+                method,
+                c.req.header("accept"),
+                ctx.logger
+              );
+              if (r2Resp) return r2Resp;
+            }
+            const target = `${cloudUrl}${incomingUrl.pathname}${incomingUrl.search}`;
             if (method !== "GET" && method !== "HEAD") {
               return c.json({
                 success: false,
@@ -8549,12 +8597,82 @@ var MarketplaceProxyPlugin = class _MarketplaceProxyPlugin {
       });
     };
     this.cloudUrl = resolveCloudUrl(config.controlPlaneUrl);
+    this.publicBaseUrl = resolveMarketplacePublicBaseUrl(config.publicMarketplaceBaseUrl);
     const envFlag = (process.env.OS_MARKETPLACE_CACHE ?? "").trim().toLowerCase();
     const envDisabled = ["off", "false", "0", "no", "disable", "disabled"].includes(envFlag);
     const disabled = config.cacheDisabled ?? envDisabled;
     this.cache = disabled ? null : new LruTtlCache(Math.max(8, config.cacheMaxEntries ?? DEFAULT_LRU_MAX));
   }
 };
+async function tryPublicMarketplaceFetch(publicBaseUrl, incomingUrl, method, acceptHeader, logger) {
+  const key = publicMarketplaceKeyForApiPath(incomingUrl.pathname);
+  if (!key) return null;
+  const target = `${publicBaseUrl}/${key}`;
+  let resp;
+  try {
+    resp = await fetch(target, {
+      method: "GET",
+      headers: {
+        "Accept": acceptHeader || "application/json",
+        "User-Agent": `objectos-marketplace-proxy/public-r2`
+      }
+    });
+  } catch (err) {
+    logger?.warn?.(`[MarketplaceProxyPlugin] public R2 fetch failed (${target}): ${err?.message ?? err}`);
+    return null;
+  }
+  if (resp.status === 404) return null;
+  if (!resp.ok) {
+    logger?.warn?.(`[MarketplaceProxyPlugin] public R2 ${target} returned ${resp.status} \u2014 falling back to cloud`);
+    return null;
+  }
+  const isList = key === "packages.json";
+  const hasFilters = isList && (incomingUrl.searchParams.has("q") || incomingUrl.searchParams.has("category") || incomingUrl.searchParams.has("limit") || incomingUrl.searchParams.has("offset"));
+  if (!hasFilters) {
+    const headers2 = new Headers();
+    const ct = resp.headers.get("content-type") ?? "application/json; charset=utf-8";
+    headers2.set("content-type", ct);
+    const cc = resp.headers.get("cache-control");
+    if (cc) headers2.set("cache-control", cc);
+    const etag = resp.headers.get("etag");
+    if (etag) headers2.set("etag", etag);
+    headers2.set("x-cache", "PUBLIC-R2");
+    const body2 = method === "HEAD" ? null : resp.body;
+    return new Response(body2, { status: 200, headers: headers2 });
+  }
+  let snapshot;
+  try {
+    snapshot = await resp.json();
+  } catch (err) {
+    logger?.warn?.(`[MarketplaceProxyPlugin] public R2 list snapshot parse failed: ${err?.message ?? err}`);
+    return null;
+  }
+  const items = Array.isArray(snapshot?.data?.items) ? snapshot.data.items : [];
+  const q = (incomingUrl.searchParams.get("q") ?? "").trim().toLowerCase();
+  const category = (incomingUrl.searchParams.get("category") ?? "").trim();
+  const limit = Math.min(Math.max(Number(incomingUrl.searchParams.get("limit") ?? 50), 1), 100);
+  const offset = Math.max(Number(incomingUrl.searchParams.get("offset") ?? 0), 0);
+  let filtered = items;
+  if (q) {
+    filtered = filtered.filter((r) => {
+      const dn = String(r?.display_name ?? "").toLowerCase();
+      const mid = String(r?.manifest_id ?? "").toLowerCase();
+      return dn.includes(q) || mid.includes(q);
+    });
+  }
+  if (category) {
+    filtered = filtered.filter((r) => String(r?.category ?? "") === category);
+  }
+  const total = filtered.length;
+  const page = filtered.slice(offset, offset + limit);
+  const body = JSON.stringify({ success: true, data: { items: page, total, limit, offset } });
+  const headers = new Headers({
+    "content-type": "application/json; charset=utf-8",
+    "cache-control": "public, max-age=30",
+    "x-cache": "PUBLIC-R2-FILTERED"
+  });
+  return new Response(method === "HEAD" ? null : body, { status: 200, headers });
+}
 var PASSTHROUGH_HEADERS = ["content-type", "cache-control", "etag", "last-modified", "vary"];
 function collectHeaders(src) {
   const out = {};
@@ -8946,6 +9064,7 @@ async function createObjectOSStack(config) {
 // src/cloud/marketplace-install-local-plugin.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
 import { join, resolve } from "path";
+import { readEnvWithDeprecation as readEnvWithDeprecation5 } from "@objectstack/types";
 var ROUTE_BASE = "/api/v1/marketplace/install-local";
 var DEFAULT_DIR = ".objectstack/installed-packages";
 function safeFilename(manifestId) {
@@ -9038,22 +9157,55 @@ var MarketplaceInstallLocalPlugin = class {
         return c.json({ success: false, error: { code: "bad_request", message: "packageId is required." } }, 400);
       }
       let payload;
-      try {
-        const url = `${this.cloudUrl}/api/v1/marketplace/packages/${encodeURIComponent(packageId)}/versions/${encodeURIComponent(versionId)}/manifest`;
-        const resp = await fetch(url, { headers: { "Accept": "application/json" } });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
+      const publicBase = resolveMarketplacePublicBaseUrl();
+      const fetchAttempts = [];
+      if (publicBase) {
+        fetchAttempts.push({
+          label: "public-r2",
+          url: `${publicBase}/packages/${encodeURIComponent(packageId)}/versions/${encodeURIComponent(versionId)}/manifest.json`
+        });
+      }
+      fetchAttempts.push({
+        label: "cloud",
+        url: `${this.cloudUrl}/api/v1/marketplace/packages/${encodeURIComponent(packageId)}/versions/${encodeURIComponent(versionId)}/manifest`
+      });
+      let lastErrStatus = 0;
+      let lastErrText = "";
+      for (const attempt of fetchAttempts) {
+        try {
+          const resp = await fetch(attempt.url, { headers: { "Accept": "application/json" } });
+          if (!resp.ok) {
+            lastErrStatus = resp.status;
+            lastErrText = (await resp.text().catch(() => "")).slice(0, 200);
+            if (attempt.label === "public-r2" && resp.status === 404) {
+              ctx.logger?.info?.(`[MarketplaceInstallLocal] public-r2 miss for ${packageId}@${versionId}, falling back to cloud`);
+              continue;
+            }
+            if (attempt.label === "public-r2" && resp.status >= 500) {
+              ctx.logger?.warn?.(`[MarketplaceInstallLocal] public-r2 ${resp.status}, falling back to cloud`);
+              continue;
+            }
+            break;
+          }
+          payload = await resp.json();
+          lastErrStatus = 0;
+          break;
+        } catch (err) {
+          if (attempt.label === "public-r2") {
+            ctx.logger?.warn?.(`[MarketplaceInstallLocal] public-r2 fetch error: ${err?.message ?? err}, falling back to cloud`);
+            continue;
+          }
           return c.json({
             success: false,
-            error: { code: "cloud_fetch_failed", message: `Cloud returned ${resp.status}: ${text.slice(0, 200)}` }
-          }, resp.status === 404 ? 404 : 502);
+            error: { code: "cloud_fetch_failed", message: err?.message ?? String(err) }
+          }, 502);
         }
-        payload = await resp.json();
-      } catch (err) {
+      }
+      if (!payload) {
         return c.json({
           success: false,
-          error: { code: "cloud_fetch_failed", message: err?.message ?? String(err) }
-        }, 502);
+          error: { code: "cloud_fetch_failed", message: `Cloud returned ${lastErrStatus}: ${lastErrText}` }
+        }, lastErrStatus === 404 ? 404 : 502);
       }
       const data = payload?.data ?? payload;
       const manifest = data?.manifest;
@@ -9435,7 +9587,7 @@ var MarketplaceInstallLocalPlugin = class {
         }
       }
       if (opts.seedNow && datasets.length > 0) {
-        const multiTenant = String(process.env.OS_MULTI_TENANT ?? "false").toLowerCase() !== "false";
+        const multiTenant = String(readEnvWithDeprecation5("OS_MULTI_ORG_ENABLED", "OS_MULTI_TENANT") ?? "false").toLowerCase() !== "false";
         try {
           const ql = ctx.getService("objectql");
           let metadata;
@@ -9586,6 +9738,7 @@ import {
   createRestApiPlugin
 } from "@objectstack/rest";
 export * from "@objectstack/core";
+import { readEnvWithDeprecation as readEnvWithDeprecation6, _resetEnvDeprecationWarnings } from "@objectstack/types";
 export {
   AppPlugin,
   ArtifactApiClient,
@@ -9623,6 +9776,7 @@ export {
   SandboxError,
   SeedLoaderService,
   UnimplementedScriptRunner,
+  _resetEnvDeprecationWarnings,
   actionBodyRunnerFactory,
   backfillPlatformSsoClients,
   buildPlatformSsoRedirectUri,
@@ -9647,6 +9801,7 @@ export {
   mergeRuntimeModule,
   parseTraceparent,
   readArtifactSource,
+  readEnvWithDeprecation6 as readEnvWithDeprecation,
   resolveCloudUrl,
   resolveDefaultArtifactPath,
   resolveErrorReporter,