modal 0.3.10 → 0.3.12

package/dist/index.cjs

@@ -47,7 +47,8 @@ __export(index_exports, {
   RemoteError: () => RemoteError,
   Sandbox: () => Sandbox2,
   SandboxFile: () => SandboxFile,
-  Secret: () => Secret
+  Secret: () => Secret,
+  initializeClient: () => initializeClient
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -37858,12 +37859,11 @@ function readConfigFile() {
     if (err.code === "ENOENT") {
       return {};
     }
-    throw new Error(`Failed to read or parse .modal.toml: ${err.message}`);
+    return {};
   }
 }
 var config = readConfigFile();
 function getProfile(profileName) {
-  profileName = profileName || process.env["MODAL_PROFILE"] || void 0;
   if (!profileName) {
     for (const [name, profileData2] of Object.entries(config)) {
       if (profileData2.active) {
@@ -37872,45 +37872,61 @@ function getProfile(profileName) {
       }
     }
   }
-  if (profileName && !Object.hasOwn(config, profileName)) {
-    throw new Error(
-      `Profile "${profileName}" not found in .modal.toml. Please set the MODAL_PROFILE environment variable or specify a valid profile.`
-    );
-  }
-  const profileData = profileName ? config[profileName] : {};
-  const profile2 = {
+  const profileData = profileName && Object.hasOwn(config, profileName) ? config[profileName] : {};
+  const profile = {
     serverUrl: process.env["MODAL_SERVER_URL"] || profileData.server_url || "https://api.modal.com:443",
     tokenId: process.env["MODAL_TOKEN_ID"] || profileData.token_id,
     tokenSecret: process.env["MODAL_TOKEN_SECRET"] || profileData.token_secret,
     environment: process.env["MODAL_ENVIRONMENT"] || profileData.environment,
     imageBuilderVersion: process.env["MODAL_IMAGE_BUILDER_VERSION"] || profileData.imageBuilderVersion
   };
-  if (!profile2.tokenId || !profile2.tokenSecret) {
-    throw new Error(
-      `Profile "${profileName}" is missing token_id or token_secret. Please set them in .modal.toml or as environment variables.`
-    );
-  }
-  return profile2;
+  return profile;
 }
-var profile = getProfile(process.env["MODAL_PROFILE"] || void 0);
 function environmentName(environment) {
-  return environment || profile.environment || "";
+  return environment || clientProfile.environment || "";
 }
 function imageBuilderVersion(version) {
-  return version || profile.imageBuilderVersion || "2024.10";
+  return version || clientProfile.imageBuilderVersion || "2024.10";
 }
 
 // src/client.ts
-function authMiddleware(profile2) {
+var defaultProfile = getProfile(process.env["MODAL_PROFILE"]);
+var modalAuthToken;
+function authMiddleware(profile) {
   return async function* authMiddleware2(call, options) {
+    if (!profile.tokenId || !profile.tokenSecret) {
+      throw new Error(
+        `Profile is missing token_id or token_secret. Please set them in .modal.toml, or as environment variables, or initializeClient().`
+      );
+    }
+    const { tokenId, tokenSecret } = profile;
     options.metadata ??= new import_nice_grpc.Metadata();
     options.metadata.set(
       "x-modal-client-type",
       String(7 /* CLIENT_TYPE_LIBMODAL */)
     );
     options.metadata.set("x-modal-client-version", "1.0.0");
-    options.metadata.set("x-modal-token-id", profile2.tokenId);
-    options.metadata.set("x-modal-token-secret", profile2.tokenSecret);
+    options.metadata.set("x-modal-token-id", tokenId);
+    options.metadata.set("x-modal-token-secret", tokenSecret);
+    if (modalAuthToken) {
+      options.metadata.set("x-modal-auth-token", modalAuthToken);
+    }
+    const prevOnHeader = options.onHeader;
+    options.onHeader = (header) => {
+      const token = header.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnHeader?.(header);
+    };
+    const prevOnTrailer = options.onTrailer;
+    options.onTrailer = (trailer) => {
+      const token = trailer.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnTrailer?.(trailer);
+    };
     return yield* call.next(call.request, options);
   };
 }
@@ -38016,12 +38032,37 @@ var retryMiddleware = async function* retryMiddleware2(call, options) {
     }
   }
 };
-var channel = (0, import_nice_grpc.createChannel)(profile.serverUrl, void 0, {
-  "grpc.max_receive_message_length": 100 * 1024 * 1024,
-  "grpc.max_send_message_length": 100 * 1024 * 1024,
-  "grpc-node.flow_control_window": 64 * 1024 * 1024
-});
-var client = (0, import_nice_grpc.createClientFactory)().use(authMiddleware(profile)).use(retryMiddleware).use(timeoutMiddleware).create(ModalClientDefinition, channel);
+var inputPlaneClients = {};
+var getOrCreateInputPlaneClient = (serverUrl) => {
+  const client2 = inputPlaneClients[serverUrl];
+  if (client2) {
+    return client2;
+  }
+  const profile = { ...clientProfile, serverUrl };
+  const newClient = createClient(profile);
+  inputPlaneClients[serverUrl] = newClient;
+  return newClient;
+};
+function createClient(profile) {
+  const channel = (0, import_nice_grpc.createChannel)(profile.serverUrl, void 0, {
+    "grpc.max_receive_message_length": 100 * 1024 * 1024,
+    "grpc.max_send_message_length": 100 * 1024 * 1024,
+    "grpc-node.flow_control_window": 64 * 1024 * 1024
+  });
+  return (0, import_nice_grpc.createClientFactory)().use(authMiddleware(profile)).use(retryMiddleware).use(timeoutMiddleware).create(ModalClientDefinition, channel);
+}
+var clientProfile = defaultProfile;
+var client = createClient(clientProfile);
+function initializeClient(options) {
+  const mergedProfile = {
+    ...defaultProfile,
+    tokenId: options.tokenId,
+    tokenSecret: options.tokenSecret,
+    environment: options.environment || defaultProfile.environment
+  };
+  clientProfile = mergedProfile;
+  client = createClient(mergedProfile);
+}
 
 // src/image.ts
 var Image2 = class {
@@ -38659,8 +38700,20 @@ var App = class _App {
     });
     return new Sandbox2(createResp.sandboxId);
   }
-  async imageFromRegistry(tag) {
-    return await fromRegistryInternal(this.appId, tag);
+  async imageFromRegistry(tag, secret) {
+    let imageRegistryConfig;
+    if (secret) {
+      if (!(secret instanceof Secret)) {
+        throw new TypeError(
+          "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+        );
+      }
+      imageRegistryConfig = {
+        registryAuthType: 4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
+        secretId: secret.secretId
+      };
+    }
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
   async imageFromAwsEcr(tag, secret) {
     if (!(secret instanceof Secret)) {
@@ -38674,6 +38727,18 @@ var App = class _App {
     };
     return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
+  async imageFromGcpArtifactRegistry(tag, secret) {
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+      );
+    }
+    const imageRegistryConfig = {
+      registryAuthType: 2 /* REGISTRY_AUTH_TYPE_GCP */,
+      secretId: secret.secretId
+    };
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
+  }
 };
 
 // src/cls.ts
@@ -39064,7 +39129,22 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     return new _ControlPlaneInvocation(functionCallId);
   }
   async awaitOutput(timeout) {
-    return await pollFunctionOutput(this.functionCallId, timeout);
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await client.functionGetOutputs({
+      functionCallId: this.functionCallId,
+      maxValues: 1,
+      timeout: timeoutMillis / 1e3,
+      // Backend needs seconds
+      lastEntryId: "0-0",
+      clearOnSuccess: true,
+      requestedAt: timeNowSeconds()
+    });
+    return response.outputs ? response.outputs[0] : void 0;
   }
   async retry(retryCount) {
     if (!this.input) {
@@ -39082,33 +39162,70 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     this.inputJwt = functionRetryResponse.inputJwts[0];
   }
 };
+var InputPlaneInvocation = class _InputPlaneInvocation {
+  client;
+  functionId;
+  input;
+  attemptToken;
+  constructor(client2, functionId, input, attemptToken) {
+    this.client = client2;
+    this.functionId = functionId;
+    this.input = input;
+    this.attemptToken = attemptToken;
+  }
+  static async create(inputPlaneUrl, functionId, input) {
+    const functionPutInputsItem = {
+      idx: 0,
+      input
+    };
+    const client2 = getOrCreateInputPlaneClient(inputPlaneUrl);
+    const attemptStartResponse = await client2.attemptStart({
+      functionId,
+      input: functionPutInputsItem
+    });
+    return new _InputPlaneInvocation(
+      client2,
+      functionId,
+      functionPutInputsItem,
+      attemptStartResponse.attemptToken
+    );
+  }
+  async awaitOutput(timeout) {
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await this.client.attemptAwait({
+      attemptToken: this.attemptToken,
+      requestedAt: timeNowSeconds(),
+      timeoutSecs: timeoutMillis / 1e3
+    });
+    return response.output;
+  }
+  async retry(_retryCount) {
+    const attemptRetryResponse = await this.client.attemptRetry({
+      functionId: this.functionId,
+      input: this.input,
+      attemptToken: this.attemptToken
+    });
+    this.attemptToken = attemptRetryResponse.attemptToken;
+  }
+};
 function timeNowSeconds() {
   return Date.now() / 1e3;
 }
-async function pollFunctionOutput(functionCallId, timeout) {
+async function pollFunctionOutput(getOutput, timeout) {
   const startTime = Date.now();
   let pollTimeout = outputsTimeout;
   if (timeout !== void 0) {
     pollTimeout = Math.min(timeout, outputsTimeout);
   }
   while (true) {
-    let response;
-    try {
-      response = await client.functionGetOutputs({
-        functionCallId,
-        maxValues: 1,
-        timeout: pollTimeout / 1e3,
-        // Backend needs seconds
-        lastEntryId: "0-0",
-        clearOnSuccess: true,
-        requestedAt: timeNowSeconds()
-      });
-    } catch (err) {
-      throw new Error(`FunctionGetOutputs failed: ${err}`);
-    }
-    const outputs = response.outputs;
-    if (outputs.length > 0) {
-      return await processResult(outputs[0].result, outputs[0].dataFormat);
+    const output = await getOutput(pollTimeout);
+    if (output) {
+      return await processResult(output.result, output.dataFormat);
     }
     if (timeout !== void 0) {
       const remainingTime = timeout - (Date.now() - startTime);
@@ -39202,10 +39319,12 @@ var maxSystemRetries = 8;
 var Function_ = class _Function_ {
   functionId;
   methodName;
+  inputPlaneUrl;
   /** @ignore */
-  constructor(functionId, methodName) {
+  constructor(functionId, methodName, inputPlaneUrl) {
     this.functionId = functionId;
     this.methodName = methodName;
+    this.inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
@@ -39215,7 +39334,11 @@ var Function_ = class _Function_ {
         namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
-      return new _Function_(resp.functionId);
+      return new _Function_(
+        resp.functionId,
+        void 0,
+        resp.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof import_nice_grpc4.ClientError && err.code === import_nice_grpc4.Status.NOT_FOUND)
         throw new NotFoundError(`Function '${appName}/${name}' not found`);
@@ -39225,11 +39348,7 @@ var Function_ = class _Function_ {
   // Execute a single input into a remote Function.
   async remote(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
-    const invocation = await ControlPlaneInvocation.create(
-      this.functionId,
-      input,
-      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
-    );
+    const invocation = await this.#createRemoteInvocation(input);
     let retryCount = 0;
     while (true) {
       try {
@@ -39244,6 +39363,20 @@ var Function_ = class _Function_ {
       }
     }
   }
+  async #createRemoteInvocation(input) {
+    if (this.inputPlaneUrl) {
+      return await InputPlaneInvocation.create(
+        this.inputPlaneUrl,
+        this.functionId,
+        input
+      );
+    }
+    return await ControlPlaneInvocation.create(
+      this.functionId,
+      input,
+      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
+    );
+  }
   // Spawn a single input into a remote function.
   async spawn(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
@@ -39702,5 +39835,6 @@ var Queue = class _Queue {
   RemoteError,
   Sandbox,
   SandboxFile,
-  Secret
+  Secret,
+  initializeClient
 });

package/dist/index.d.cts

@@ -235,10 +235,25 @@ declare class App {
     /** Lookup a deployed app by name, or create if it does not exist. */
     static lookup(name: string, options?: LookupOptions): Promise<App>;
     createSandbox(image: Image, options?: SandboxCreateOptions): Promise<Sandbox>;
-    imageFromRegistry(tag: string): Promise<Image>;
+    imageFromRegistry(tag: string, secret?: Secret): Promise<Image>;
     imageFromAwsEcr(tag: string, secret: Secret): Promise<Image>;
+    imageFromGcpArtifactRegistry(tag: string, secret: Secret): Promise<Image>;
 }
 
+/** Options for initializing a client at runtime. */
+type ClientOptions = {
+    tokenId: string;
+    tokenSecret: string;
+    environment?: string;
+};
+/**
+ * Initialize the Modal client, passing in token authentication credentials.
+ *
+ * You should call this function at the start of your application if not
+ * configuring Modal with a `.modal.toml` file or environment variables.
+ */
+declare function initializeClient(options: ClientOptions): void;
+
 /** Options for `FunctionCall.get()`. */
 type FunctionCallGetOptions = {
     timeout?: number;
@@ -269,8 +284,9 @@ declare class Function_ {
     #private;
     readonly functionId: string;
     readonly methodName: string | undefined;
+    readonly inputPlaneUrl: string | undefined;
     /** @ignore */
-    constructor(functionId: string, methodName?: string);
+    constructor(functionId: string, methodName?: string, inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Function_>;
     remote(args?: any[], kwargs?: Record<string, any>): Promise<any>;
     spawn(args?: any[], kwargs?: Record<string, any>): Promise<FunctionCall>;
@@ -421,4 +437,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { App, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode };
+export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, initializeClient };

package/dist/index.d.ts

@@ -235,10 +235,25 @@ declare class App {
     /** Lookup a deployed app by name, or create if it does not exist. */
     static lookup(name: string, options?: LookupOptions): Promise<App>;
     createSandbox(image: Image, options?: SandboxCreateOptions): Promise<Sandbox>;
-    imageFromRegistry(tag: string): Promise<Image>;
+    imageFromRegistry(tag: string, secret?: Secret): Promise<Image>;
     imageFromAwsEcr(tag: string, secret: Secret): Promise<Image>;
+    imageFromGcpArtifactRegistry(tag: string, secret: Secret): Promise<Image>;
 }
 
+/** Options for initializing a client at runtime. */
+type ClientOptions = {
+    tokenId: string;
+    tokenSecret: string;
+    environment?: string;
+};
+/**
+ * Initialize the Modal client, passing in token authentication credentials.
+ *
+ * You should call this function at the start of your application if not
+ * configuring Modal with a `.modal.toml` file or environment variables.
+ */
+declare function initializeClient(options: ClientOptions): void;
+
 /** Options for `FunctionCall.get()`. */
 type FunctionCallGetOptions = {
     timeout?: number;
@@ -269,8 +284,9 @@ declare class Function_ {
     #private;
     readonly functionId: string;
     readonly methodName: string | undefined;
+    readonly inputPlaneUrl: string | undefined;
     /** @ignore */
-    constructor(functionId: string, methodName?: string);
+    constructor(functionId: string, methodName?: string, inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Function_>;
     remote(args?: any[], kwargs?: Record<string, any>): Promise<any>;
     spawn(args?: any[], kwargs?: Record<string, any>): Promise<FunctionCall>;
@@ -421,4 +437,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { App, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode };
+export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, initializeClient };

package/dist/index.js

@@ -37811,12 +37811,11 @@ function readConfigFile() {
     if (err.code === "ENOENT") {
       return {};
     }
-    throw new Error(`Failed to read or parse .modal.toml: ${err.message}`);
+    return {};
   }
 }
 var config = readConfigFile();
 function getProfile(profileName) {
-  profileName = profileName || process.env["MODAL_PROFILE"] || void 0;
   if (!profileName) {
     for (const [name, profileData2] of Object.entries(config)) {
       if (profileData2.active) {
@@ -37825,45 +37824,61 @@ function getProfile(profileName) {
       }
     }
   }
-  if (profileName && !Object.hasOwn(config, profileName)) {
-    throw new Error(
-      `Profile "${profileName}" not found in .modal.toml. Please set the MODAL_PROFILE environment variable or specify a valid profile.`
-    );
-  }
-  const profileData = profileName ? config[profileName] : {};
-  const profile2 = {
+  const profileData = profileName && Object.hasOwn(config, profileName) ? config[profileName] : {};
+  const profile = {
     serverUrl: process.env["MODAL_SERVER_URL"] || profileData.server_url || "https://api.modal.com:443",
     tokenId: process.env["MODAL_TOKEN_ID"] || profileData.token_id,
     tokenSecret: process.env["MODAL_TOKEN_SECRET"] || profileData.token_secret,
     environment: process.env["MODAL_ENVIRONMENT"] || profileData.environment,
     imageBuilderVersion: process.env["MODAL_IMAGE_BUILDER_VERSION"] || profileData.imageBuilderVersion
   };
-  if (!profile2.tokenId || !profile2.tokenSecret) {
-    throw new Error(
-      `Profile "${profileName}" is missing token_id or token_secret. Please set them in .modal.toml or as environment variables.`
-    );
-  }
-  return profile2;
+  return profile;
 }
-var profile = getProfile(process.env["MODAL_PROFILE"] || void 0);
 function environmentName(environment) {
-  return environment || profile.environment || "";
+  return environment || clientProfile.environment || "";
 }
 function imageBuilderVersion(version) {
-  return version || profile.imageBuilderVersion || "2024.10";
+  return version || clientProfile.imageBuilderVersion || "2024.10";
 }
 
 // src/client.ts
-function authMiddleware(profile2) {
+var defaultProfile = getProfile(process.env["MODAL_PROFILE"]);
+var modalAuthToken;
+function authMiddleware(profile) {
   return async function* authMiddleware2(call, options) {
+    if (!profile.tokenId || !profile.tokenSecret) {
+      throw new Error(
+        `Profile is missing token_id or token_secret. Please set them in .modal.toml, or as environment variables, or initializeClient().`
+      );
+    }
+    const { tokenId, tokenSecret } = profile;
     options.metadata ??= new Metadata();
     options.metadata.set(
       "x-modal-client-type",
       String(7 /* CLIENT_TYPE_LIBMODAL */)
     );
     options.metadata.set("x-modal-client-version", "1.0.0");
-    options.metadata.set("x-modal-token-id", profile2.tokenId);
-    options.metadata.set("x-modal-token-secret", profile2.tokenSecret);
+    options.metadata.set("x-modal-token-id", tokenId);
+    options.metadata.set("x-modal-token-secret", tokenSecret);
+    if (modalAuthToken) {
+      options.metadata.set("x-modal-auth-token", modalAuthToken);
+    }
+    const prevOnHeader = options.onHeader;
+    options.onHeader = (header) => {
+      const token = header.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnHeader?.(header);
+    };
+    const prevOnTrailer = options.onTrailer;
+    options.onTrailer = (trailer) => {
+      const token = trailer.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnTrailer?.(trailer);
+    };
     return yield* call.next(call.request, options);
   };
 }
@@ -37969,12 +37984,37 @@ var retryMiddleware = async function* retryMiddleware2(call, options) {
     }
   }
 };
-var channel = createChannel(profile.serverUrl, void 0, {
-  "grpc.max_receive_message_length": 100 * 1024 * 1024,
-  "grpc.max_send_message_length": 100 * 1024 * 1024,
-  "grpc-node.flow_control_window": 64 * 1024 * 1024
-});
-var client = createClientFactory().use(authMiddleware(profile)).use(retryMiddleware).use(timeoutMiddleware).create(ModalClientDefinition, channel);
+var inputPlaneClients = {};
+var getOrCreateInputPlaneClient = (serverUrl) => {
+  const client2 = inputPlaneClients[serverUrl];
+  if (client2) {
+    return client2;
+  }
+  const profile = { ...clientProfile, serverUrl };
+  const newClient = createClient(profile);
+  inputPlaneClients[serverUrl] = newClient;
+  return newClient;
+};
+function createClient(profile) {
+  const channel = createChannel(profile.serverUrl, void 0, {
+    "grpc.max_receive_message_length": 100 * 1024 * 1024,
+    "grpc.max_send_message_length": 100 * 1024 * 1024,
+    "grpc-node.flow_control_window": 64 * 1024 * 1024
+  });
+  return createClientFactory().use(authMiddleware(profile)).use(retryMiddleware).use(timeoutMiddleware).create(ModalClientDefinition, channel);
+}
+var clientProfile = defaultProfile;
+var client = createClient(clientProfile);
+function initializeClient(options) {
+  const mergedProfile = {
+    ...defaultProfile,
+    tokenId: options.tokenId,
+    tokenSecret: options.tokenSecret,
+    environment: options.environment || defaultProfile.environment
+  };
+  clientProfile = mergedProfile;
+  client = createClient(mergedProfile);
+}
 
 // src/image.ts
 var Image2 = class {
@@ -38612,8 +38652,20 @@ var App = class _App {
     });
     return new Sandbox2(createResp.sandboxId);
   }
-  async imageFromRegistry(tag) {
-    return await fromRegistryInternal(this.appId, tag);
+  async imageFromRegistry(tag, secret) {
+    let imageRegistryConfig;
+    if (secret) {
+      if (!(secret instanceof Secret)) {
+        throw new TypeError(
+          "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+        );
+      }
+      imageRegistryConfig = {
+        registryAuthType: 4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
+        secretId: secret.secretId
+      };
+    }
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
   async imageFromAwsEcr(tag, secret) {
     if (!(secret instanceof Secret)) {
@@ -38627,6 +38679,18 @@ var App = class _App {
     };
     return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
+  async imageFromGcpArtifactRegistry(tag, secret) {
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+      );
+    }
+    const imageRegistryConfig = {
+      registryAuthType: 2 /* REGISTRY_AUTH_TYPE_GCP */,
+      secretId: secret.secretId
+    };
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
+  }
 };
 
 // src/cls.ts
@@ -39017,7 +39081,22 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     return new _ControlPlaneInvocation(functionCallId);
   }
   async awaitOutput(timeout) {
-    return await pollFunctionOutput(this.functionCallId, timeout);
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await client.functionGetOutputs({
+      functionCallId: this.functionCallId,
+      maxValues: 1,
+      timeout: timeoutMillis / 1e3,
+      // Backend needs seconds
+      lastEntryId: "0-0",
+      clearOnSuccess: true,
+      requestedAt: timeNowSeconds()
+    });
+    return response.outputs ? response.outputs[0] : void 0;
   }
   async retry(retryCount) {
     if (!this.input) {
@@ -39035,33 +39114,70 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     this.inputJwt = functionRetryResponse.inputJwts[0];
   }
 };
+var InputPlaneInvocation = class _InputPlaneInvocation {
+  client;
+  functionId;
+  input;
+  attemptToken;
+  constructor(client2, functionId, input, attemptToken) {
+    this.client = client2;
+    this.functionId = functionId;
+    this.input = input;
+    this.attemptToken = attemptToken;
+  }
+  static async create(inputPlaneUrl, functionId, input) {
+    const functionPutInputsItem = {
+      idx: 0,
+      input
+    };
+    const client2 = getOrCreateInputPlaneClient(inputPlaneUrl);
+    const attemptStartResponse = await client2.attemptStart({
+      functionId,
+      input: functionPutInputsItem
+    });
+    return new _InputPlaneInvocation(
+      client2,
+      functionId,
+      functionPutInputsItem,
+      attemptStartResponse.attemptToken
+    );
+  }
+  async awaitOutput(timeout) {
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await this.client.attemptAwait({
+      attemptToken: this.attemptToken,
+      requestedAt: timeNowSeconds(),
+      timeoutSecs: timeoutMillis / 1e3
+    });
+    return response.output;
+  }
+  async retry(_retryCount) {
+    const attemptRetryResponse = await this.client.attemptRetry({
+      functionId: this.functionId,
+      input: this.input,
+      attemptToken: this.attemptToken
+    });
+    this.attemptToken = attemptRetryResponse.attemptToken;
+  }
+};
 function timeNowSeconds() {
   return Date.now() / 1e3;
 }
-async function pollFunctionOutput(functionCallId, timeout) {
+async function pollFunctionOutput(getOutput, timeout) {
   const startTime = Date.now();
   let pollTimeout = outputsTimeout;
   if (timeout !== void 0) {
     pollTimeout = Math.min(timeout, outputsTimeout);
   }
   while (true) {
-    let response;
-    try {
-      response = await client.functionGetOutputs({
-        functionCallId,
-        maxValues: 1,
-        timeout: pollTimeout / 1e3,
-        // Backend needs seconds
-        lastEntryId: "0-0",
-        clearOnSuccess: true,
-        requestedAt: timeNowSeconds()
-      });
-    } catch (err) {
-      throw new Error(`FunctionGetOutputs failed: ${err}`);
-    }
-    const outputs = response.outputs;
-    if (outputs.length > 0) {
-      return await processResult(outputs[0].result, outputs[0].dataFormat);
+    const output = await getOutput(pollTimeout);
+    if (output) {
+      return await processResult(output.result, output.dataFormat);
     }
     if (timeout !== void 0) {
       const remainingTime = timeout - (Date.now() - startTime);
@@ -39155,10 +39271,12 @@ var maxSystemRetries = 8;
 var Function_ = class _Function_ {
   functionId;
   methodName;
+  inputPlaneUrl;
   /** @ignore */
-  constructor(functionId, methodName) {
+  constructor(functionId, methodName, inputPlaneUrl) {
     this.functionId = functionId;
     this.methodName = methodName;
+    this.inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
@@ -39168,7 +39286,11 @@ var Function_ = class _Function_ {
         namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
-      return new _Function_(resp.functionId);
+      return new _Function_(
+        resp.functionId,
+        void 0,
+        resp.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof ClientError4 && err.code === Status4.NOT_FOUND)
         throw new NotFoundError(`Function '${appName}/${name}' not found`);
@@ -39178,11 +39300,7 @@ var Function_ = class _Function_ {
   // Execute a single input into a remote Function.
   async remote(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
-    const invocation = await ControlPlaneInvocation.create(
-      this.functionId,
-      input,
-      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
-    );
+    const invocation = await this.#createRemoteInvocation(input);
     let retryCount = 0;
     while (true) {
       try {
@@ -39197,6 +39315,20 @@ var Function_ = class _Function_ {
       }
     }
   }
+  async #createRemoteInvocation(input) {
+    if (this.inputPlaneUrl) {
+      return await InputPlaneInvocation.create(
+        this.inputPlaneUrl,
+        this.functionId,
+        input
+      );
+    }
+    return await ControlPlaneInvocation.create(
+      this.functionId,
+      input,
+      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
+    );
+  }
   // Spawn a single input into a remote function.
   async spawn(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
@@ -39654,5 +39786,6 @@ export {
   RemoteError,
   Sandbox2 as Sandbox,
   SandboxFile,
-  Secret
+  Secret,
+  initializeClient
 };

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "modal",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Modal client library for JavaScript",
   "license": "Apache-2.0",
   "homepage": "https://modal.com/docs",
-  "repository": "github:modal-labs/libmodal",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/modal-labs/libmodal.git"
+  },
   "bugs": "https://github.com/modal-labs/libmodal/issues",
   "type": "module",
   "sideEffects": false,
@@ -30,9 +33,9 @@
     "lint": "eslint",
     "prepare": "scripts/gen-proto.sh",
     "test": "vitest",
-    "preversion": "(git update-index --really-refresh && git diff-index --quiet HEAD) || (echo 'You must commit all changes before running npm version' && exit 1)",
-    "version": "npm run build && git add package.json package-lock.json && git commit -m \"modal-js/v$npm_package_version\" && git tag modal-js/v$npm_package_version",
-    "postversion": "git push && git push --tags && npm publish"
+    "version": "npm run check && git add -A && git commit -m \"modal-js/v$npm_package_version\"",
+    "prepublishOnly": "npm run build && git push",
+    "postpublish": "git tag modal-js/v$npm_package_version && git push --tags"
   },
   "dependencies": {
     "long": "^5.3.1",