@objectstack/runtime 10.0.0 → 10.3.0

package/dist/index.cjs

@@ -987,6 +987,36 @@ var init_app_plugin = __esm({
               error: err?.message ?? String(err)
             });
           }
+          try {
+            const dsDefs = this.bundle.datasources;
+            const dsList = Array.isArray(dsDefs) ? dsDefs : dsDefs && typeof dsDefs === "object" ? Object.entries(dsDefs).map(([name, def]) => ({ name, ...def })) : [];
+            if (dsList.length > 0) {
+              let connection;
+              try {
+                connection = ctx.getService("datasource-connection");
+              } catch {
+                connection = void 0;
+              }
+              if (typeof connection?.connectDeclared === "function") {
+                const objects = Array.isArray(this.bundle.objects) ? this.bundle.objects : [];
+                const results = await connection.connectDeclared({ datasources: dsList, objects });
+                const connected = results.filter((r) => r.status === "connected");
+                if (connected.length > 0) {
+                  ctx.logger.info("Auto-connected declared datasources", {
+                    appId,
+                    connected: connected.map((r) => r.name)
+                  });
+                }
+              } else {
+                ctx.logger.debug("No datasource-connection service \u2014 declared datasources stay metadata-only", { appId });
+              }
+            }
+          } catch (err) {
+            ctx.logger.error(
+              `[AppPlugin] declared-datasource auto-connect failed for app '${appId}': ${err?.message ?? String(err)}`
+            );
+            throw err;
+          }
           try {
             const metadata = ctx.getService("metadata");
             if (typeof metadata?.registerInMemory === "function") {
@@ -1549,55 +1579,56 @@ async function createStandaloneStack(config) {
   const explicitDriver = cfg.databaseDriver ?? process.env.OS_DATABASE_DRIVER?.trim();
   const dbDriver = explicitDriver ?? detectDriverFromUrl(dbUrl);
   let driverPlugin;
-  if (dbDriver === "memory") {
-    const { InMemoryDriver } = await import("@objectstack/driver-memory");
-    driverPlugin = new DriverPlugin2(new InMemoryDriver());
-  } else if (dbDriver === "postgres") {
-    const { SqlDriver } = await import("@objectstack/driver-sql");
-    driverPlugin = new DriverPlugin2(
-      new SqlDriver({
-        client: "pg",
-        connection: dbUrl,
-        pool: { min: 0, max: 5 }
-      })
-    );
-  } else if (dbDriver === "mongodb") {
-    let MongoDBDriver;
-    try {
-      ({ MongoDBDriver } = await import("@objectstack/driver-mongodb"));
-    } catch (err) {
-      throw new Error(
-        `[StandaloneStack] mongodb URL detected but @objectstack/driver-mongodb is not installed. Add it as a dependency or pass an explicit driverPlugin. (${err?.message ?? err})`
-      );
-    }
-    driverPlugin = new DriverPlugin2(new MongoDBDriver({ url: dbUrl }));
-  } else if (dbDriver === "sqlite-wasm") {
+  if (dbDriver === "sqlite-wasm") {
     const { SqliteWasmDriver } = await import("@objectstack/driver-sqlite-wasm");
-    const filename = dbUrl.replace(/^wasm-sqlite:(\/\/)?/i, "").replace(/^file:(\/\/)?/i, "");
-    if (filename && filename !== ":memory:") {
+    const filename = dbUrl.replace(/^wasm-sqlite:(\/\/)?/i, "").replace(/^file:(\/\/)?/i, "") || ":memory:";
+    if (filename !== ":memory:") {
       (0, import_node_fs2.mkdirSync)((0, import_node_path3.resolve)(filename, ".."), { recursive: true });
     }
     driverPlugin = new DriverPlugin2(
       new SqliteWasmDriver({
-        filename: filename || ":memory:",
-        persist: filename && filename !== ":memory:" ? "on-write" : void 0
+        filename,
+        persist: filename !== ":memory:" ? "on-write" : void 0
       })
     );
   } else {
-    const { SqlDriver } = await import("@objectstack/driver-sql");
-    const filename = dbUrl.replace(/^file:(\/\/)?/, "");
-    if (!filename || /^[a-z][a-z0-9+.-]*:\/\//i.test(filename)) {
-      throw new Error(
-        `[StandaloneStack] sqlite driver was selected but the URL does not look like a file path: "${dbUrl}". Use file:/path/to/db.sqlite, or set OS_DATABASE_DRIVER explicitly.`
-      );
+    const { createDefaultDatasourceDriverFactory } = await import("@objectstack/service-datasource");
+    const factoryDev = cfg.dev ?? process.env.NODE_ENV === "development";
+    let driverId;
+    let driverConfig;
+    if (dbDriver === "memory") {
+      driverId = "memory";
+      driverConfig = {};
+    } else if (dbDriver === "postgres") {
+      driverId = "postgres";
+      driverConfig = { url: dbUrl };
+    } else if (dbDriver === "mongodb") {
+      driverId = "mongodb";
+      driverConfig = { url: dbUrl };
+    } else {
+      driverId = "sqlite";
+      const filename = dbUrl.replace(/^file:(\/\/)?/, "");
+      if (!filename || /^[a-z][a-z0-9+.-]*:\/\//i.test(filename)) {
+        throw new Error(
+          `[StandaloneStack] sqlite driver was selected but the URL does not look like a file path: "${dbUrl}". Use file:/path/to/db.sqlite, or set OS_DATABASE_DRIVER explicitly.`
+        );
+      }
+      (0, import_node_fs2.mkdirSync)((0, import_node_path3.resolve)(filename, ".."), { recursive: true });
+      driverConfig = { filename };
+    }
+    let driverHandle;
+    try {
+      driverHandle = await createDefaultDatasourceDriverFactory({ dev: factoryDev }).create({ driver: driverId, config: driverConfig });
+    } catch (err) {
+      if (dbDriver === "mongodb") {
+        throw new Error(
+          `[StandaloneStack] mongodb URL detected but @objectstack/driver-mongodb is not installed. Add it as a dependency or pass an explicit driverPlugin. (${err?.message ?? err})`
+        );
+      }
+      throw err;
     }
-    (0, import_node_fs2.mkdirSync)((0, import_node_path3.resolve)(filename, ".."), { recursive: true });
     driverPlugin = new DriverPlugin2(
-      new SqlDriver({
-        client: "better-sqlite3",
-        connection: { filename },
-        useNullAsDefault: true
-      })
+      driverHandle?.driver ?? driverHandle
     );
   }
   const artifactBundle = await loadArtifactBundle(artifactPath, {
@@ -1677,7 +1708,14 @@ var init_standalone_stack = __esm({
        * Explicit `databaseUrl` / `OS_DATABASE_URL` / `OS_HOME` still take
        * precedence over this default.
        */
-      projectRoot: import_zod.z.string().optional()
+      projectRoot: import_zod.z.string().optional(),
+      /**
+       * Dev gate for the sqlite driver factory's native-better-sqlite3 → wasm →
+       * in-memory step-down (#2229). When omitted, defaults to
+       * `process.env.NODE_ENV === 'development'`. In production a native load
+       * failure is NOT silently swapped for wasm/mingo (fail-closed).
+       */
+      dev: import_zod.z.boolean().optional()
     });
   }
 });
@@ -2203,14 +2241,12 @@ async function resolveExecutionContext(opts) {
   } else {
     ctx.org_user_ids = [userId];
   }
-  const upsRows = await tryFind(
-    ql,
-    "sys_user_permission_set",
-    tenantId ? { user_id: userId, organization_id: tenantId } : { user_id: userId },
-    100
-  );
+  const upsRows = await tryFind(ql, "sys_user_permission_set", { user_id: userId }, 100);
   const psIds = new Set(
-    upsRows.map((r) => r.permission_set_id ?? r.permissionSetId).filter(Boolean)
+    upsRows.filter((r) => {
+      const org = r.organization_id ?? r.organizationId ?? null;
+      return !(org && tenantId && org !== tenantId);
+    }).map((r) => r.permission_set_id ?? r.permissionSetId).filter(Boolean)
   );
   if (ctx.roles.length > 0) {
     const roleRows = await tryFind(ql, "sys_role", { name: { $in: ctx.roles } }, 100);
@@ -2770,7 +2806,7 @@ var _HttpDispatcher = class _HttpDispatcher {
    */
   async enforceProjectMembership(context, path) {
     if (!this.enforceMembership) return null;
-    const skipPaths = ["/auth", "/cloud", "/health", "/discovery"];
+    const skipPaths = ["/auth", "/cloud", "/health", "/ready", "/discovery"];
     if (skipPaths.some((p) => path.startsWith(p))) return null;
     if (/(^|\/)share-links\/[^/]+\/(resolve|messages)$/.test(path)) return null;
     const environmentId = context.environmentId;
@@ -4216,6 +4252,28 @@ var _HttpDispatcher = class _HttpDispatcher {
     if (!ql || typeof ql.executeAction !== "function") {
       return { handled: true, response: this.error("Data engine not available", 503) };
     }
+    try {
+      const actionSchema = (typeof ql.getSchema === "function" ? ql.getSchema(objectName) : void 0) ?? ql.registry?.getObject?.(objectName);
+      const actionDef = Array.isArray(actionSchema?.actions) ? actionSchema.actions.find((a) => a?.name === actionName) : void 0;
+      const required = Array.isArray(actionDef?.requiredPermissions) ? actionDef.requiredPermissions : [];
+      if (required.length > 0) {
+        const execCtx = _context?.executionContext;
+        if (!execCtx?.isSystem) {
+          const held = new Set(execCtx?.systemPermissions ?? []);
+          const missing = required.filter((perm) => !held.has(perm));
+          if (missing.length > 0) {
+            return {
+              handled: true,
+              response: this.error(
+                `Action '${actionName}' on '${objectName}' requires capability [${required.join(", ")}] \u2014 caller is missing [${missing.join(", ")}]`,
+                403
+              )
+            };
+          }
+        }
+      }
+    } catch {
+    }
     const tryExecute = async (obj) => {
       return ql.executeAction(obj, actionName, actionContext);
     };
@@ -4587,6 +4645,10 @@ var _HttpDispatcher = class _HttpDispatcher {
           })
         };
       }
+      if (cleanPath === "/ready" && method === "GET") {
+        const state = typeof this.kernel?.getState === "function" ? this.kernel.getState() : "running";
+        return state === "running" ? { handled: true, response: this.success({ status: "ready", state }) } : { handled: true, response: this.error("Service not ready", 503, { state }) };
+      }
       if (cleanPath.startsWith("/auth")) {
         return this.handleAuth(cleanPath.substring(5), method, body, context);
       }
@@ -5264,6 +5326,14 @@ function createDispatcherPlugin(config = {}) {
           errorResponse(err, res);
         }
       });
+      server.get(`${prefix}/ready`, async (_req, res) => {
+        try {
+          const result = await dispatcher.dispatch("GET", "/ready", void 0, {}, { request: _req });
+          sendResult(result, res);
+        } catch (err) {
+          errorResponse(err, res);
+        }
+      });
       server.post(`${prefix}/auth/login`, async (req, res) => {
         try {
           const result = await dispatcher.handleAuth("login", "POST", req.body, { request: req });