@objectstack/runtime 10.0.0 → 10.2.0

package/dist/index.js

@@ -963,6 +963,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") {
@@ -1530,55 +1560,55 @@ 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:") {
       mkdirSync2(resolvePath2(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");
+    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.`
+        );
+      }
+      mkdirSync2(resolvePath2(filename, ".."), { recursive: true });
+      driverConfig = { filename };
+    }
+    let driverHandle;
+    try {
+      driverHandle = await createDefaultDatasourceDriverFactory().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;
     }
-    mkdirSync2(resolvePath2(filename, ".."), { recursive: true });
     driverPlugin = new DriverPlugin2(
-      new SqlDriver({
-        client: "better-sqlite3",
-        connection: { filename },
-        useNullAsDefault: true
-      })
+      driverHandle?.driver ?? driverHandle
     );
   }
   const artifactBundle = await loadArtifactBundle(artifactPath, {
@@ -2702,7 +2732,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;
@@ -4519,6 +4549,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);
       }