alchemy 0.71.0 → 0.71.1

package/src/cloudflare/wrangler.json.ts

@@ -4,7 +4,6 @@ import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
 import { isSecret } from "../secret.ts";
-import { unencryptSecrets } from "./util/filter-env-bindings.ts";
 import { assertNever } from "../util/assert-never.ts";
 import type { Bindings, WorkerBindingRateLimit } from "./bindings.ts";
 import type { R2BucketJurisdiction } from "./bucket.ts";
@@ -12,6 +11,7 @@ import type { DurableObjectNamespace } from "./durable-object-namespace.ts";
 import type { EventSource } from "./event-source.ts";
 import { isQueueEventSource } from "./event-source.ts";
 import { isQueue } from "./queue.ts";
+import { unencryptSecrets } from "./util/filter-env-bindings.ts";
 import { isWorker, type Worker, type WorkerProps } from "./worker.ts";
 
 type WranglerJsonRateLimit = Omit<WorkerBindingRateLimit, "type"> & {
@@ -301,7 +301,7 @@ export interface WranglerJsonSpec {
    */
   ai?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -309,7 +309,7 @@ export interface WranglerJsonSpec {
    */
   browser?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -317,7 +317,7 @@ export interface WranglerJsonSpec {
    */
   images?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -330,7 +330,7 @@ export interface WranglerJsonSpec {
      * The ID of the KV namespace used during `wrangler dev`
      */
     preview_id?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -355,7 +355,7 @@ export interface WranglerJsonSpec {
      * The preview name of this R2 bucket at the edge.
      */
     preview_bucket_name?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -396,7 +396,7 @@ export interface WranglerJsonSpec {
   vectorize?: {
     binding: string;
     index_name: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -416,7 +416,7 @@ export interface WranglerJsonSpec {
      * The ID of the D1 database used during `wrangler dev`
      */
     preview_database_id?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -499,7 +499,7 @@ export interface WranglerJsonSpec {
   dispatch_namespaces?: {
     binding: string;
     namespace: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -559,7 +559,7 @@ function processBindings(
     binding: string;
     id: string;
     preview_id: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const durableObjects: {
     name: string;
@@ -592,7 +592,7 @@ function processBindings(
     database_name: string;
     migrations_dir?: string;
     preview_database_id: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const queues: {
     producers: { queue: string; binding: string }[];
@@ -608,7 +608,7 @@ function processBindings(
   const vectorizeIndexes: {
     binding: string;
     index_name: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const analyticsEngineDatasets: { binding: string; dataset: string }[] = [];
   const hyperdrive: {
@@ -625,7 +625,7 @@ function processBindings(
   const dispatchNamespaces: {
     binding: string;
     namespace: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const unsafeBindings: WranglerJsonRateLimit[] = [];
   const containers: {
@@ -693,9 +693,7 @@ function processBindings(
         binding: bindingName,
         id: id,
         preview_id: id,
-        ...("dev" in binding && binding.dev?.remote
-          ? { experimental_remote: true }
-          : {}),
+        ...("dev" in binding && binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (
       typeof binding === "object" &&
@@ -725,7 +723,7 @@ function processBindings(
         preview_bucket_name: name,
         jurisdiction:
           binding.jurisdiction === "default" ? undefined : binding.jurisdiction,
-        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
+        ...(binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (binding.type === "secret") {
       // Secret binding
@@ -753,7 +751,7 @@ function processBindings(
         database_name: binding.name,
         migrations_dir: binding.migrationsDir,
         preview_database_id: id,
-        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
+        ...(binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (binding.type === "queue") {
       const id =
@@ -769,7 +767,7 @@ function processBindings(
         binding: bindingName,
         index_name: binding.name,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       });
     } else if (binding.type === "browser") {
       if (spec.browser) {
@@ -778,7 +776,7 @@ function processBindings(
       spec.browser = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "ai") {
       if (spec.ai) {
@@ -787,7 +785,7 @@ function processBindings(
       spec.ai = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "images") {
       if (spec.images) {
@@ -796,7 +794,7 @@ function processBindings(
       spec.images = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "analytics_engine") {
       analyticsEngineDatasets.push({
@@ -837,7 +835,7 @@ function processBindings(
       dispatchNamespaces.push({
         binding: bindingName,
         namespace: binding.namespaceName,
-        experimental_remote: true,
+        remote: true,
       });
     } else if (binding.type === "ratelimit") {
       unsafeBindings.push({

package/src/cloudflare/zone.ts

@@ -414,7 +414,7 @@ export const Zone = Resource(
 
     // Add a small delay to ensure settings are propagated
     // TODO(michael): do we need this?
-    // https://github.com/sam-goodwin/alchemy/issues/681
+    // https://github.com/alchemy-run/alchemy/issues/681
     await new Promise((resolve) => setTimeout(resolve, 2000));
 
     // Update Bot Management configuration if provided

package/src/destroy.ts

@@ -14,6 +14,7 @@ import { isScope, type PendingDeletions, Scope } from "./scope.ts";
 import type { State } from "./state.ts";
 import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
+import { createAndSendEvent } from "./util/telemetry.ts";
 
 export function isDestroyedSignal(error: any): error is DestroyedSignal {
   return error instanceof Error && (error as any).kind === "DestroyedSignal";
@@ -109,6 +110,7 @@ export async function destroy(
     logger.warn(`Resource "${instance[ResourceFQN]}" has no scope`);
   }
   const quiet = options?.quiet ?? scope.quiet;
+  const start = performance.now();
 
   try {
     if (!quiet && !options?.noop) {
@@ -122,6 +124,15 @@ export async function destroy(
       });
     }
 
+    await createAndSendEvent({
+      event: "resource.start",
+      resource: instance[ResourceKind],
+      status: "deleting",
+      phase: "destroy",
+      duration: performance.now() - start,
+      replaced: !!options?.replace,
+    });
+
     let state: State;
     let props: ResourceProps | undefined;
     if (options?.replace) {
@@ -224,7 +235,28 @@ export async function destroy(
         status: "success",
       });
     }
+
+    await createAndSendEvent({
+      event: "resource.success",
+      resource: instance[ResourceKind],
+      status: "deleted",
+      phase: "destroy",
+      duration: performance.now() - start,
+      replaced: !!options?.replace,
+    });
   } catch (error) {
+    let errorToSend = error instanceof Error ? error : new Error(String(error));
+    await createAndSendEvent(
+      {
+        event: "resource.error",
+        resource: instance[ResourceKind],
+        duration: performance.now() - start,
+        phase: "destroy",
+        status: "deleting",
+        replaced: !!options?.replace,
+      },
+      errorToSend,
+    );
     logger.error(error);
     throw error;
   }

package/src/docker/image.ts

@@ -190,7 +190,7 @@ export const Image = Resource(
 
       // Add build arguments
       for (const [key, value] of Object.entries(buildOptions)) {
-        buildArgs.push("--build-arg", `${key}="${value}"`);
+        buildArgs.push("--build-arg", `${key}=${value}`);
       }
 
       buildArgs.push("-f", dockerfile);

package/src/resource.ts

@@ -179,7 +179,7 @@ export function Resource<
         const error = new Error(
           `Resource ${resourceID} already exists in the stack and is of a different type: '${otherResource?.[ResourceKind]}' !== '${type}'`,
         );
-        createAndSendEvent(
+        await createAndSendEvent(
           {
             event: "resource.error",
             resource: type,

package/src/scope.ts

@@ -116,6 +116,11 @@ export interface ScopeOptions extends ProviderCredentials {
    * `undefined` if the program was not run with `--app`
    */
   isSelected?: boolean;
+  /**
+   * @internal
+   * The timestamp when the scope was started.
+   */
+  startedAt?: DOMHighResTimeStamp;
 }
 
 /**
@@ -209,6 +214,7 @@ export class Scope {
   public readonly dotAlchemy: string;
   public readonly isSelected: boolean | undefined;
   public readonly profile: string | undefined;
+  public readonly startedAt: DOMHighResTimeStamp;
 
   // Provider credentials for scope-level credential overrides
   public readonly providerCredentials: ProviderCredentials;
@@ -216,7 +222,6 @@ export class Scope {
   private isErrored = false;
   private isSkipped = false;
   private finalized = false;
-  private startedAt = performance.now();
   private deferred: (() => Promise<any>)[] = [];
   private cleanups: (() => Promise<void>)[] = [];
 
@@ -249,6 +254,7 @@ export class Scope {
       isSelected,
       noTrack,
       profile,
+      startedAt,
       ...providerCredentials
     } = options;
 
@@ -257,7 +263,7 @@ export class Scope {
     this.parent = parent ?? Scope.getScope();
     this.rootDir = rootDir ?? this.parent?.rootDir ?? ALCHEMY_ROOT;
     this.isSelected = isSelected ?? this.parent?.isSelected;
-
+    this.startedAt = startedAt ?? this.parent?.startedAt ?? performance.now();
     this.dotAlchemy =
       dotAlchemy ??
       this.parent?.dotAlchemy ??
@@ -305,7 +311,7 @@ export class Scope {
       destroyStrategy ?? this.parent?.destroyStrategy ?? "sequential";
     if (this.local) {
       this.logger.warnOnce(
-        "Development mode is in beta. Please report any issues to https://github.com/sam-goodwin/alchemy/issues.",
+        "Development mode is in beta. Please report any issues to https://github.com/alchemy-run/alchemy/issues.",
       );
     }
 
@@ -515,10 +521,15 @@ export class Scope {
       this.parent === undefined ||
       this?.parent?.scopeName === this.root.scopeName;
     if (this.phase === "read") {
-      createAndSendEvent({
-        event: "alchemy.success",
-        duration: performance.now() - this.startedAt,
-      });
+      if (this.parent == null) {
+        await createAndSendEvent(
+          {
+            event: this.isErrored ? "alchemy.error" : "alchemy.success",
+            duration: performance.now() - this.startedAt,
+          },
+          this.isErrored ? new Error("Scope failed") : undefined,
+        );
+      }
       return;
     }
     if (this.finalized && !shouldForce) {
@@ -566,18 +577,17 @@ export class Scope {
         force: shouldForce,
         noop: options?.noop,
       });
-      createAndSendEvent({
-        event: "alchemy.success",
-        duration: performance.now() - this.startedAt,
-      });
     } else if (this.isErrored) {
       this.logger.warn("Scope is in error, skipping finalize");
-      createAndSendEvent(
+    }
+
+    if (this.parent == null) {
+      await createAndSendEvent(
         {
-          event: "alchemy.error",
+          event: this.isErrored ? "alchemy.error" : "alchemy.success",
           duration: performance.now() - this.startedAt,
         },
-        new Error("Scope failed"),
+        this.isErrored ? new Error("Scope failed") : undefined,
       );
     }
 
@@ -596,7 +606,7 @@ export class Scope {
         throw e;
       })) ?? [];
 
-    //todo(michael): remove once we deprecate doss; see: https://github.com/sam-goodwin/alchemy/issues/585
+    //todo(michael): remove once we deprecate doss; see: https://github.com/alchemy-run/alchemy/issues/585
     let hasCorruptedResources = false;
     if (pendingDeletions) {
       for (const { resource, oldProps } of pendingDeletions) {

package/src/state/instrumented-state-store.ts

@@ -30,7 +30,7 @@ export class InstrumentedStateStore<T extends StateStore>
       error = err;
       throw err;
     } finally {
-      createAndSendEvent(
+      await createAndSendEvent(
         {
           event,
           stateStore: this.stateStoreClass,

package/src/util/cli-args.ts

@@ -0,0 +1,11 @@
+export const cliArgs = process.argv.slice(2);
+
+export function parseOption<D extends string | undefined>(
+  option: string,
+  defaultValue?: D,
+): D {
+  const i = cliArgs.indexOf(option);
+  return (
+    i !== -1 && i + 1 < cliArgs.length ? cliArgs[i + 1] : defaultValue
+  ) as D;
+}

package/src/util/telemetry.ts

@@ -1,11 +1,15 @@
 import envPaths from "env-paths";
 import { exec } from "node:child_process";
 import fs from "node:fs/promises";
+import http from "node:http";
+import https from "node:https";
 import os from "node:os";
+import { URL } from "node:url";
 import path from "pathe";
 import pkg from "../../package.json" with { type: "json" };
 import type { Phase } from "../alchemy.ts";
 import { Scope } from "../scope.ts";
+import { parseOption } from "./cli-args.ts";
 import { logger } from "./logger.ts";
 import { memoize } from "./memoize.ts";
 
@@ -170,9 +174,25 @@ export const collectData = memoize(async (): Promise<GenericTelemetryData> => {
     getRuntime(),
     getEnvironment(),
   ]);
+
+  const sessionId =
+    parseOption("--telemetry-session-id") ??
+    process.env.ALCHEMY_TELEMETRY_SESSION_ID ??
+    //@ts-expect-error
+    globalThis.ALCHEMY_TELEMETRY_SESSION_ID ??
+    crypto.randomUUID();
+
+  const referrer =
+    parseOption("--telemetry-ref") ??
+    process.env.ALCHEMY_TELEMETRY_REF ??
+    //@ts-expect-error
+    globalThis.ALCHEMY_TELEMETRY_REF ??
+    "";
+
   return {
     userId: userId ?? "",
-    sessionId: crypto.randomUUID(),
+    sessionId,
+    referrer,
     platform: os.platform(),
     osVersion: os.release(),
     arch: os.arch(),
@@ -192,6 +212,7 @@ export const collectData = memoize(async (): Promise<GenericTelemetryData> => {
 export type GenericTelemetryData = {
   userId: string;
   sessionId: string;
+  referrer: string;
   platform: string;
   osVersion: string;
   arch: string;
@@ -287,7 +308,7 @@ export async function createAndSendEvent(
       ...(await collectData()),
       ...serializeError(error),
     };
-    await fetch(TELEMETRY_API_URL, {
+    await fetchNoResponse(TELEMETRY_API_URL, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -326,3 +347,48 @@ function serializeError(error: Error | undefined) {
     errorStack: "",
   };
 }
+
+async function fetchNoResponse(
+  url: string,
+  options: {
+    body?: string;
+    headers?: Record<string, string>;
+    method?: string;
+  } = {},
+) {
+  const parsedUrl = new URL(url);
+  const isHttps = parsedUrl.protocol === "https:";
+  const client = isHttps ? https : http;
+
+  const body = options.body || "";
+  const headers = {
+    ...options.headers,
+    "Content-Length": Buffer.byteLength(body),
+  };
+
+  const requestOptions = {
+    hostname: parsedUrl.hostname,
+    port: parsedUrl.port || (isHttps ? 443 : 80),
+    path: parsedUrl.pathname + parsedUrl.search,
+    method: options.method || "GET",
+    headers,
+  };
+
+  await new Promise<void>((resolve, reject) => {
+    const req = client.request(requestOptions);
+
+    req.on("error", (error) => {
+      reject(error);
+    });
+
+    if (body) {
+      req.write(body);
+    }
+
+    req.once("finish", () => {
+      resolve(void 0);
+    });
+
+    req.end();
+  });
+}

package/workers/tunnel-proxy.js

@@ -34,7 +34,7 @@ var h={async fetch(e,r){let n=new URL(e.url);n.host=r.TUNNEL_HOST;let l=new Head
             Alchemy</a>.</p>
       </div>
       <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
-        <p class="text-sm text-slate-500">Alchemy 0.71.0</p>
+        <p class="text-sm text-slate-500">Alchemy 0.71.1</p>
       </div>
     </div>
   </body>