alchemy 0.76.0 → 0.77.0

package/src/planetscale/role.ts

@@ -51,6 +51,12 @@ export interface RoleProps extends PlanetScaleProps {
    * @default true
    */
   delete?: boolean;
+
+  /**
+   * successor role
+   * @default postgres
+   */
+  successor?: string | Role;
 }
 
 /**
@@ -123,6 +129,11 @@ export interface Role extends Omit<RoleProps, "inheritedRoles"> {
    * The roles that this role inherits from.
    */
   inheritedRoles: InheritedRole[];
+
+  /**
+   * The successor role
+   */
+  successor: string;
 }
 
 /**
@@ -198,10 +209,18 @@ export const Role = Resource(
       : props.inheritedRoles.inheritedRoles;
     const shouldDelete = props.delete ?? false;
 
+    const successorRole =
+      typeof props.successor === "string"
+        ? props.successor
+        : (props.successor?.name ?? "postgres");
+
     switch (this.phase) {
       case "delete": {
         if (shouldDelete && this.output?.id) {
           const res = await api.deleteRole({
+            body: {
+              successor: successorRole,
+            },
             path: {
               organization,
               database,
@@ -275,6 +294,7 @@ export const Role = Resource(
           expiresAt: data.expires_at,
           databaseName: data.database_name,
           inheritedRoles,
+          successor: successorRole,
           connectionUrl: alchemy.secret(
             `postgresql://${data.username}:${data.password}@${data.access_host_url}:5432/${data.database_name}?sslmode=verify-full`,
           ),
@@ -284,9 +304,16 @@ export const Role = Resource(
         };
       }
       case "update": {
-        // According to the types, the only property that can be updated is the name.
-        // However, I was getting 500 errors when trying to update the name, so we'll just replace.
-        return this.replace();
+        if (successorRole !== this.output.successor) {
+          // According to the types, the only property that can be updated is the name.
+          // However, I was getting 500 errors when trying to update the name, so we'll just replace.
+          return this.replace();
+        } else {
+          return {
+            ...this.output,
+            successor: successorRole,
+          };
+        }
       }
     }
   },

package/src/prisma-postgres/api.ts

@@ -56,6 +56,7 @@ export function createPrismaApi(
       throwOnError: true,
       headers: {
         Authorization: `Bearer ${serviceToken}`,
+        "User-Agent": "alchemy/1.0",
       },
     }),
   );

package/src/scope.ts

@@ -1,4 +1,7 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import fs from "node:fs/promises";
 import util from "node:util";
 import path from "pathe";
 import pc from "picocolors";
@@ -357,6 +360,30 @@ export class Scope {
     return result.extracted as any;
   }
 
+  public async exec(
+    id: string,
+    command: string,
+  ): Promise<{ exitCode: number; stdout: string; stderr: string }> {
+    const logFilePath = path.join(this.dotAlchemy, "logs", `${id}.log`);
+    const [cmd, ...args] = command.split(/\s+/);
+    const child = spawn(cmd, args, { stdio: "pipe" });
+    await once(child, "spawn"); // throws if command not found
+    await fs.mkdir(path.dirname(logFilePath), { recursive: true });
+    const logFile = await fs.open(logFilePath, "w");
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+      logFile.write(chunk);
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+      logFile.write(chunk);
+    });
+    const [exitCode] = (await once(child, "exit")) as [number];
+    return { exitCode, stdout, stderr };
+  }
+
   /**
    * @internal
    */

package/src/serde.ts

@@ -183,7 +183,7 @@ export async function deserialize(
             "See: https://alchemy.run/concepts/secret/#encryption-password",
         );
       }
-      if (typeof value["@secret"] === "object") {
+      if (typeof value["@secret"] === "object" && "data" in value["@secret"]) {
         return new Secret(
           JSON.parse(
             await decryptWithKey(value["@secret"].data, scope.password),

package/src/util/telemetry.ts

@@ -354,6 +354,7 @@ async function fetchNoResponse(
     body?: string;
     headers?: Record<string, string>;
     method?: string;
+    timeout?: number;
   } = {},
 ) {
   const parsedUrl = new URL(url);
@@ -372,12 +373,16 @@ async function fetchNoResponse(
     path: parsedUrl.pathname + parsedUrl.search,
     method: options.method || "GET",
     headers,
+    signal: AbortSignal.timeout(options?.timeout ?? 3000),
   };
 
   await new Promise<void>((resolve, reject) => {
     const req = client.request(requestOptions);
 
     req.on("error", (error) => {
+      if (error.name === "AbortError" && !SUPPRESS_TELEMETRY_ERRORS) {
+        logger.warn("Telemetry request timed out");
+      }
       reject(error);
     });