@notionhq/custom-blocks-host 0.1.9 → 0.1.10

package/README.md

@@ -151,19 +151,25 @@ the ID in the `init` message. The host ignores a result with a different ID.
 If no result arrives, or only a stale valid result arrives, before the timeout,
 initialization ends with `no_init_result`.
 
-Hosts validate each inbound sandbox message with `sandboxToHostMessageSchema`
-before acting on it. If validation fails, the host uses `readIncomingType()` to
-identify the message and applies these rules:
-
-- A malformed `connect` with a readable `initializationId` gets `init.error`
-  with code `invalid_connect_payload`.
-- A malformed `initResult` gets one `invalidSandboxMessage` NACK. The host then
-  cancels the handshake and fails with the host-only `invalid_init_result_payload`
-  error. The host does not wait for the `no_init_result` timeout.
-- Any other malformed sandbox message gets one `invalidSandboxMessage` NACK.
-  The sandbox logs this NACK and does not reply.
-- Never reply to a sandbox-sent NACK with a host-sent NACK. The host should
-  not respond to `invalidHostMessage` or `invalidSandboxMessage` messages.
+The host validates each inbound sandbox message with `sandboxToHostMessageSchema`
+before it handles the message. If parsing fails, the host uses `readIncomingType()`
+to identify the attempted message. It replies with `invalidSandboxMessage`, a
+negative acknowledgment (NACK). The host never sends a NACK in response to a NACK.
+
+Malformed sandbox messages do not change the host's initialization state or
+timeout, except in these two cases:
+
+- The host expects `connect` and receives a malformed `connect` with a readable
+  `initializationId`. The host sends `init.error` with `invalid_connect_payload`
+  instead of a NACK, then fails initialization.
+- The host expects `initResult` and receives a malformed `initResult` with the
+  active `initializationId`. The host sends a NACK and fails initialization with
+  `invalid_init_result_payload`. This error code describes a local host failure.
+  The host does not send it in `initResult.error`.
+
+A malformed `initResult` with a missing or stale ID does not end initialization
+or reset its timeout. Malformed messages do not restart initialization after
+it succeeds or fails.
 
 The host accepts a valid `initResult.error` as a terminal initialization
 failure. It logs and ignores a valid `initResult` with a stale

package/dist/createCustomBlockHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,kBAAkB,EACvB,MAAM,8CAA8C,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAavF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAA;AActG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAIhF,OAAO,KAAK,EACX,iCAAiC,EACjC,2BAA2B,EAC3B,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EACX,uBAAuB,EACvB,oCAAoC,EACpC,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAU5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,EAAE,2BAA2B,CAAA;IACzC,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV,6FAA6F;IAC7F,uBAAuB,CAAC,EAAE,CACzB,KAAK,EAAE,oCAAoC,KACvC,IAAI,CAAA;IACT;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;IACtC,eAAe,EAAE,CAAC,YAAY,EAAE,kBAAkB,KAAK,IAAI,CAAA;IAC3D,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,YAAY,EAAE,kBAAkB,CAAA;KAAE,KAAK,IAAI,CAAA;CAClE,CAAA;AAMD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CA+dvB"}
+{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,kBAAkB,EACvB,MAAM,8CAA8C,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAavF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAA;AAatG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAGhF,OAAO,KAAK,EACX,iCAAiC,EACjC,2BAA2B,EAC3B,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EACX,uBAAuB,EACvB,oCAAoC,EACpC,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAS5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,EAAE,2BAA2B,CAAA;IACzC,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV,6FAA6F;IAC7F,uBAAuB,CAAC,EAAE,CACzB,KAAK,EAAE,oCAAoC,KACvC,IAAI,CAAA;IACT;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;IACtC,eAAe,EAAE,CAAC,YAAY,EAAE,kBAAkB,KAAK,IAAI,CAAA;IAC3D,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,YAAY,EAAE,kBAAkB,CAAA;KAAE,KAAK,IAAI,CAAA;CAClE,CAAA;AAED,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CAsYvB"}

package/dist/createCustomBlockHost.js

@@ -1,17 +1,11 @@
 import { DEFAULT_CONTRAST_MODE, } from "./protocol/contrast.js";
-import { sandboxToHostMessageSchema } from "./protocol/messages/sandboxToHost.js";
 import { CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION } from "./protocol/protocolVersion.js";
-import * as v from "valibot";
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js";
 import { createInitializationController } from "./lifecycle/initializationController.js";
-import { getInvalidSandboxMessageResponse } from "./messages/invalidSandboxMessage.js";
+import { createSandboxMessageRouter } from "./messages/sandboxMessageRouter.js";
 import { QuerySubscriptions, } from "./queries/querySubscriptions.js";
 import { validateQueryDataSourceFilter } from "./queries/validateQueryDataSourceFilter.js";
 import { validateQueryDataSourceSorts } from "./queries/validateQueryDataSourceSorts.js";
-import { unreachable } from "./utils.js";
-const initializationIdentitySchema = v.object({
-    initializationId: v.string(),
-});
 export function createCustomBlockHost(options) {
     const { iframe, initialState, handlers, onManifest, onInitialized, onInitializationFailure, onRestartRequired, onLog, sandboxOrigin, minBridgeProtocolVersion: configuredMinBridgeProtocolVersion, noConnectTimeoutMs, noInitResultTimeoutMs, } = options;
     const minBridgeProtocolVersion = Math.max(configuredMinBridgeProtocolVersion ?? CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION, CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION);
@@ -224,101 +218,25 @@ export function createCustomBlockHost(options) {
         onRestartRequired,
         onInitializationFailure,
     });
-    function onInvalidSandboxMessage(data, issues) {
-        emit("warn", {
-            message: "Ignored unsupported sandbox message",
-            payload: data,
-            issues,
-        });
-        const response = getInvalidSandboxMessageResponse(data);
-        const parsedIdentity = v.safeParse(initializationIdentitySchema, data);
-        const initializationId = parsedIdentity.success
-            ? parsedIdentity.output.initializationId
-            : undefined;
-        if (response.incomingType === "connect") {
-            if (initializationController.handleInvalidConnect(initializationId)) {
-                if (initializationId === undefined && response.nack !== undefined) {
-                    post(response.nack);
-                }
-                return;
-            }
-        }
-        if (response.incomingType === "initResult" &&
-            initializationController.handleInvalidInitResult()) {
-            if (response.nack !== undefined) {
-                post(response.nack);
-            }
-            return;
-        }
-        if (response.nack !== undefined) {
-            post(response.nack);
-        }
-    }
-    function onMessage(event) {
-        // Ignore messages from windows other than this host's iframe.
-        if (event.source !== iframe.contentWindow) {
-            return;
-        }
-        // Ignore messages that do not come from the configured sandbox origin.
-        if (event.origin !== sandboxOrigin) {
-            return;
-        }
-        const parsed = v.safeParse(sandboxToHostMessageSchema, event.data);
-        if (!parsed.success) {
-            onInvalidSandboxMessage(event.data, parsed.issues);
-            return;
-        }
-        const message = parsed.output;
-        emit("in", message);
-        if (message.type !== "connect" &&
-            message.type !== "initResult" &&
-            initializationController.status !== "success") {
-            // Ignore all non-handshake messages until initialization succeeds.
-            if (message.type !== "resize") {
-                emit("warn", {
-                    message: `Ignored ${message.type} before initialization completed`,
-                    payload: message,
-                });
-            }
-            return;
-        }
-        switch (message.type) {
-            case "connect":
-                initializationController.handleConnect(message);
-                return;
-            case "initResult":
-                initializationController.handleInitResult(message);
-                return;
-            case "queryDataSource":
-                void handleQuery(message);
-                return;
-            case "unsubscribeDataSourceQuery":
-                querySubscriptions.unsubscribe(message.subscriptionId);
-                return;
-            case "createPage":
-                void handleCreatePage(message);
-                return;
-            case "getPage":
-                void handleGetPage(message);
-                return;
-            case "getUser":
-                void handleGetUser(message);
-                return;
-            case "listUsers":
-                void handleListUsers(message);
-                return;
-            case "updatePage":
-                void handleUpdatePage(message);
-                return;
-            case "resize":
-                handlers.resize?.(message);
-                return;
-            case "invalidHostMessage":
-                return;
-            default:
-                unreachable(message);
-        }
-    }
+    const onMessage = createSandboxMessageRouter({
+        iframe,
+        sandboxOrigin,
+        getInitStatus: () => initializationController.status,
+        emit,
+        post,
+        onInvalidConnect: initializationController.handleInvalidConnect,
+        onInvalidInitResult: initializationController.handleInvalidInitResult,
+        onConnect: initializationController.handleConnect,
+        onInitResult: initializationController.handleInitResult,
+        onQueryDataSource: handleQuery,
+        onUnsubscribeDataSourceQuery: message => querySubscriptions.unsubscribe(message.subscriptionId),
+        onCreatePage: handleCreatePage,
+        onGetPage: handleGetPage,
+        onGetUser: handleGetUser,
+        onListUsers: handleListUsers,
+        onUpdatePage: handleUpdatePage,
+        onResize: message => handlers.resize?.(message),
+    });
     window.addEventListener("message", onMessage);
     iframe.addEventListener("load", initializationController.onIframeLoad);
     return {

package/dist/lifecycle/initializationController.d.ts

@@ -45,8 +45,14 @@ export type InitializationController = {
     readonly hasConnectedSandbox: boolean;
     handleConnect: (message: ConnectMessage) => void;
     handleInitResult: (message: InitResultMessage) => void;
-    handleInvalidConnect: (initializationId?: string) => boolean;
-    handleInvalidInitResult: () => boolean;
+    handleInvalidConnect: (args: {
+        initializationId: string;
+        error: CustomBlockInitErrorInfo;
+    }) => "initErrorSent" | "nack";
+    handleInvalidInitResult: (args: {
+        initializationId: string | undefined;
+        error: CustomBlockInitErrorInfo;
+    }) => void;
     onIframeLoad: () => void;
     stop: () => void;
 };

package/dist/lifecycle/initializationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initializationController.d.ts","sourceRoot":"","sources":["../../src/lifecycle/initializationController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAA;AACtG,OAAO,KAAK,EACX,wBAAwB,EAExB,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAA;AAGhF,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,UAAU,EACV,MAAM,YAAY,CAAA;AAKnB,KAAK,mBAAmB,GAAG;IAC1B,KAAK,EAAE,WAAW,CAAA;IAClB,YAAY,EAAE,kBAAkB,CAAA;IAChC,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,eAAe,CAAA;IACrB,WAAW,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,yBAAyB,GAC3B;IACA,MAAM,EAAE,SAAS,CAAA;IACjB,QAAQ,EAAE,mBAAmB,CAAA;IAC7B,WAAW,EAAE,iCAAiC,CAAA;CAC7C,GACD;IACA,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,wBAAwB,CAAA;CAC9B,CAAA;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC7C,OAAO,EAAE,aAAa,CAAA;IACtB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;IACnC,WAAW,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,yBAAyB,CAAA;IAC1E,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,4BAA4B,EAAE,MAAM,IAAI,CAAA;IACxC,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,uBAAuB,CAAC,EAAE,CACzB,KAAK,EAAE,oCAAoC,KACvC,IAAI,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,aAAa,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAChD,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,gBAAgB,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC5D,uBAAuB,EAAE,MAAM,OAAO,CAAA;IACtC,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,IAAI,EAAE,MAAM,IAAI,CAAA;CAChB,CAAA;AAED,wBAAgB,8BAA8B,CAC7C,OAAO,EAAE,+BAA+B,GACtC,wBAAwB,CAuO1B"}
+{"version":3,"file":"initializationController.d.ts","sourceRoot":"","sources":["../../src/lifecycle/initializationController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAA;AACtG,OAAO,KAAK,EACX,wBAAwB,EAExB,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAA;AAGhF,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,UAAU,EACV,MAAM,YAAY,CAAA;AAKnB,KAAK,mBAAmB,GAAG;IAC1B,KAAK,EAAE,WAAW,CAAA;IAClB,YAAY,EAAE,kBAAkB,CAAA;IAChC,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,eAAe,CAAA;IACrB,WAAW,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,yBAAyB,GAC3B;IACA,MAAM,EAAE,SAAS,CAAA;IACjB,QAAQ,EAAE,mBAAmB,CAAA;IAC7B,WAAW,EAAE,iCAAiC,CAAA;CAC7C,GACD;IACA,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,wBAAwB,CAAA;CAC9B,CAAA;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC7C,OAAO,EAAE,aAAa,CAAA;IACtB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;IACnC,WAAW,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,yBAAyB,CAAA;IAC1E,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,4BAA4B,EAAE,MAAM,IAAI,CAAA;IACxC,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,uBAAuB,CAAC,EAAE,CACzB,KAAK,EAAE,oCAAoC,KACvC,IAAI,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,aAAa,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAChD,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,IAAI,EAAE;QAC5B,gBAAgB,EAAE,MAAM,CAAA;QACxB,KAAK,EAAE,wBAAwB,CAAA;KAC/B,KAAK,eAAe,GAAG,MAAM,CAAA;IAC9B,uBAAuB,EAAE,CAAC,IAAI,EAAE;QAC/B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,KAAK,EAAE,wBAAwB,CAAA;KAC/B,KAAK,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,IAAI,EAAE,MAAM,IAAI,CAAA;CAChB,CAAA;AAED,wBAAgB,8BAA8B,CAC7C,OAAO,EAAE,+BAA+B,GACtC,wBAAwB,CAyP1B"}

package/dist/lifecycle/initializationController.js

@@ -21,7 +21,8 @@ export function createInitializationController(options) {
             noInitResultTimeoutId = undefined;
         }
     }
-    function sendInitError(initializationId, error) {
+    function sendInitError(args) {
+        const { initializationId, error } = args;
         if (initStatus !== "waitingForConnect") {
             return;
         }
@@ -42,7 +43,10 @@ export function createInitializationController(options) {
         }
         const preparation = prepareInit(connect);
         if (preparation.status === "error") {
-            sendInitError(connect.initializationId, preparation.error);
+            sendInitError({
+                initializationId: connect.initializationId,
+                error: preparation.error,
+            });
             return false;
         }
         initStatus = "waitingForInitResult";
@@ -96,7 +100,10 @@ export function createInitializationController(options) {
             const initError = initErrorForFailureReason("invalid_protocol_version", {
                 currentBridgeProtocolVersion: message.bridgeProtocolVersion,
             });
-            sendInitError(message.initializationId, initError);
+            sendInitError({
+                initializationId: message.initializationId,
+                error: initError,
+            });
             return;
         }
         if (message.bridgeProtocolVersion < minBridgeProtocolVersion) {
@@ -104,44 +111,46 @@ export function createInitializationController(options) {
                 currentBridgeProtocolVersion: message.bridgeProtocolVersion,
                 minBridgeProtocolVersion,
             });
-            sendInitError(message.initializationId, initError);
+            sendInitError({
+                initializationId: message.initializationId,
+                error: initError,
+            });
             return;
         }
         // If the sandbox reported an error during `connect`, return it as an `init` error.
         if (message.status === "error") {
-            sendInitError(message.initializationId, message.error);
+            sendInitError({
+                initializationId: message.initializationId,
+                error: message.error,
+            });
             return;
         }
         if (sendInit(message)) {
             hasConnectedSandbox = true;
         }
     }
-    function handleInvalidConnect(initializationId) {
+    function handleInvalidConnect(args) {
+        const { initializationId, error } = args;
         if (initStatus !== "waitingForConnect") {
-            return false;
+            // `connect` messages received when not waiting for one are NACKed like generic invalid messages.
+            return "nack";
         }
-        const error = initErrorForFailureReason("invalid_connect_payload");
-        if (initializationId === undefined) {
-            initStatus = "error";
-            clearNoConnectTimeout();
-            warn(error);
-            onInitializationFailure?.(error);
-        }
-        else {
-            sendInitError(initializationId, error);
-        }
-        return true;
+        // The sandbox awaits `init`. Reply with `init.error` using its initialization ID.
+        sendInitError({ initializationId, error });
+        return "initErrorSent";
     }
-    function handleInvalidInitResult() {
-        if (initStatus !== "waitingForInitResult") {
-            return false;
+    function handleInvalidInitResult(args) {
+        const { initializationId, error } = args;
+        if (initStatus !== "waitingForInitResult" ||
+            initializationId === undefined ||
+            initializationId !== activeInitializationId) {
+            return;
         }
+        clearNoConnectTimeout();
         clearNoInitResultTimeout();
         initStatus = "error";
-        const error = initErrorForFailureReason("invalid_init_result_payload");
         warn(error);
         onInitializationFailure?.(error);
-        return true;
     }
     function onIframeLoad() {
         clearNoConnectTimeout();

package/dist/messages/invalidSandboxMessage.js

@@ -1,4 +1,4 @@
-import { readIncomingType } from "../protocol/incomingType.js";
+import { readIncomingType } from "../protocol/messages/incomingType.js";
 export function getInvalidSandboxMessageResponse(data) {
     const incomingType = readIncomingType(data);
     if (incomingType === "invalidHostMessage" ||

package/dist/messages/sandboxMessageRouter.d.ts

@@ -0,0 +1,35 @@
+import type { ConnectMessage } from "../protocol/messages/connect.js";
+import type { CreatePageMessage } from "../protocol/messages/createPage.js";
+import type { GetPageMessage } from "../protocol/messages/getPage.js";
+import type { GetUserMessage } from "../protocol/messages/getUser.js";
+import type { HostToSandboxMessage } from "../protocol/messages/hostToSandbox.js";
+import type { InitResultMessage } from "../protocol/messages/initResult.js";
+import type { ListUsersMessage } from "../protocol/messages/listUsers.js";
+import type { QueryDataSourceMessage } from "../protocol/messages/queryDataSource.js";
+import type { ResizeMessage } from "../protocol/messages/resize.js";
+import type { UnsubscribeDataSourceQueryMessage } from "../protocol/messages/unsubscribeDataSourceQuery.js";
+import type { UpdatePageMessage } from "../protocol/messages/updatePage.js";
+import type { InitializationController } from "../lifecycle/initializationController.js";
+import type { InitStatus } from "../lifecycle/types.js";
+import type { CustomBlockHostLogDirection } from "./types.js";
+export type SandboxMessageRouterOptions = {
+    iframe: HTMLIFrameElement;
+    sandboxOrigin: string;
+    getInitStatus: () => InitStatus;
+    emit: (direction: CustomBlockHostLogDirection, payload: unknown) => void;
+    post: (message: HostToSandboxMessage) => void;
+    onInvalidConnect: InitializationController["handleInvalidConnect"];
+    onInvalidInitResult: InitializationController["handleInvalidInitResult"];
+    onConnect: (message: ConnectMessage) => void;
+    onInitResult: (message: InitResultMessage) => void;
+    onQueryDataSource: (message: QueryDataSourceMessage) => void | Promise<void>;
+    onUnsubscribeDataSourceQuery: (message: UnsubscribeDataSourceQueryMessage) => void;
+    onCreatePage: (message: CreatePageMessage) => void | Promise<void>;
+    onGetPage: (message: GetPageMessage) => void | Promise<void>;
+    onGetUser: (message: GetUserMessage) => void | Promise<void>;
+    onListUsers: (message: ListUsersMessage) => void | Promise<void>;
+    onUpdatePage: (message: UpdatePageMessage) => void | Promise<void>;
+    onResize: (message: ResizeMessage) => void;
+};
+export declare function createSandboxMessageRouter(options: SandboxMessageRouterOptions): (event: MessageEvent) => void;
+//# sourceMappingURL=sandboxMessageRouter.d.ts.map

package/dist/messages/sandboxMessageRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sandboxMessageRouter.d.ts","sourceRoot":"","sources":["../../src/messages/sandboxMessageRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAA;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAEhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAA;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AAExF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,yEAAyE,CAAA;AAChI,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAGhG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AAM7D,MAAM,MAAM,2BAA2B,GAAG;IACzC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,UAAU,CAAA;IAC/B,IAAI,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IACxE,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,gBAAgB,EAAE,wBAAwB,CAAC,sBAAsB,CAAC,CAAA;IAClE,mBAAmB,EAAE,wBAAwB,CAAC,yBAAyB,CAAC,CAAA;IACxE,SAAS,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAC5C,YAAY,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IAClD,iBAAiB,EAAE,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5E,4BAA4B,EAAE,CAC7B,OAAO,EAAE,iCAAiC,KACtC,IAAI,CAAA;IACT,YAAY,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,SAAS,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,SAAS,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,WAAW,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAChE,YAAY,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;CAC1C,CAAA;AAED,wBAAgB,0BAA0B,CACzC,OAAO,EAAE,2BAA2B,GAClC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CA8H/B"}

package/dist/messages/sandboxMessageRouter.js

@@ -0,0 +1,107 @@
+import { isInitHandshakeMessage } from "../protocol/messages/isInitHandshakeMessage.js";
+import { sandboxToHostMessageSchema } from "../protocol/messages/sandboxToHost.js";
+import * as v from "valibot";
+import { initErrorForFailureReason } from "../lifecycle/initErrors.js";
+import { unreachable } from "../utils.js";
+import { getInvalidSandboxMessageResponse } from "./invalidSandboxMessage.js";
+const initializationIdentitySchema = v.object({
+    initializationId: v.string(),
+});
+export function createSandboxMessageRouter(options) {
+    const { iframe, sandboxOrigin, getInitStatus, emit, post, onInvalidConnect, onInvalidInitResult, onConnect, onInitResult, onQueryDataSource, onUnsubscribeDataSourceQuery, onCreatePage, onGetPage, onGetUser, onListUsers, onUpdatePage, onResize, } = options;
+    function onInvalidSandboxMessage(data, issues) {
+        emit("warn", {
+            message: "Ignored unsupported sandbox message",
+            payload: data,
+            issues,
+        });
+        const response = getInvalidSandboxMessageResponse(data);
+        if (response.incomingType === "connect") {
+            const parsedIdentity = v.safeParse(initializationIdentitySchema, data);
+            if (parsedIdentity.success) {
+                const responseType = onInvalidConnect({
+                    initializationId: parsedIdentity.output.initializationId,
+                    error: initErrorForFailureReason("invalid_connect_payload"),
+                });
+                if (responseType === "initErrorSent") {
+                    // The controller already sent `init.error`, so no need to also send a NACK.
+                    return;
+                }
+            }
+        }
+        if (response.incomingType === "initResult") {
+            const parsedIdentity = v.safeParse(initializationIdentitySchema, data);
+            onInvalidInitResult({
+                initializationId: parsedIdentity.success
+                    ? parsedIdentity.output.initializationId
+                    : undefined,
+                error: initErrorForFailureReason("invalid_init_result_payload"),
+            });
+        }
+        // Other messages get NACKed indicating they were invalid and skipped
+        if (response.nack !== undefined) {
+            post(response.nack);
+        }
+    }
+    return function onMessage(event) {
+        // Verify the sender is this host's iframe, not another window with the same origin.
+        const isExpectedSource = event.source === iframe.contentWindow;
+        // Verify the sender's origin, since the iframe can navigate to another origin.
+        const isExpectedOrigin = event.origin === sandboxOrigin;
+        if (!isExpectedSource || !isExpectedOrigin) {
+            return;
+        }
+        // Parse and validate the message from the sandbox.
+        const parsed = v.safeParse(sandboxToHostMessageSchema, event.data);
+        if (!parsed.success) {
+            onInvalidSandboxMessage(event.data, parsed.issues);
+            return;
+        }
+        const message = parsed.output;
+        if (!isInitHandshakeMessage(message) && getInitStatus() !== "success") {
+            emit("warn", {
+                message: `Ignored ${message.type} before initialization completed`,
+                payload: message,
+            });
+            return;
+        }
+        emit("in", message);
+        switch (message.type) {
+            case "connect":
+                onConnect(message);
+                return;
+            case "initResult":
+                onInitResult(message);
+                return;
+            case "queryDataSource":
+                void onQueryDataSource(message);
+                return;
+            case "unsubscribeDataSourceQuery":
+                onUnsubscribeDataSourceQuery(message);
+                return;
+            case "createPage":
+                void onCreatePage(message);
+                return;
+            case "getPage":
+                void onGetPage(message);
+                return;
+            case "getUser":
+                void onGetUser(message);
+                return;
+            case "listUsers":
+                void onListUsers(message);
+                return;
+            case "updatePage":
+                void onUpdatePage(message);
+                return;
+            case "resize":
+                onResize(message);
+                return;
+            case "invalidHostMessage":
+                // The inbound log records this rejection. Do not reply, to avoid an error-response loop.
+                return;
+            default:
+                unreachable(message);
+        }
+    };
+}

package/dist/messages/types.d.ts

@@ -1,4 +1,3 @@
-import type { BridgeMessagePayload } from "../protocol/messagePayload.js";
 import type { CreatePageMessage } from "../protocol/messages/createPage.js";
 import type { CreatePageResultMessage, CustomBlockCreatePageErrorInfo } from "../protocol/messages/createPageResult.js";
 import type { CustomBlockGetPageErrorInfo, GetPageMessage, GetPageResultMessage } from "../protocol/messages/getPage.js";
@@ -6,6 +5,7 @@ import type { CustomBlockGetUserErrorInfo, GetUserMessage, GetUserResultMessage
 import type { CustomBlockInitErrorInfo } from "../protocol/messages/init.js";
 import type { CustomBlockInitResultErrorInfo } from "../protocol/messages/initResult.js";
 import type { CustomBlockListUsersErrorInfo, ListUsersMessage, ListUsersResultMessage } from "../protocol/messages/listUsers.js";
+import type { BridgeMessagePayload } from "../protocol/messages/messagePayload.js";
 import type { QueryDataSourceMessage } from "../protocol/messages/queryDataSource.js";
 import type { ResizeMessage } from "../protocol/messages/resize.js";
 import type { UpdatePageMessage } from "../protocol/messages/updatePage.js";

package/dist/messages/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/messages/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAA;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EACX,uBAAuB,EACvB,8BAA8B,EAC9B,MAAM,+DAA+D,CAAA;AACtE,OAAO,KAAK,EACX,2BAA2B,EAC3B,cAAc,EACd,oBAAoB,EACpB,MAAM,sDAAsD,CAAA;AAC7D,OAAO,KAAK,EACX,2BAA2B,EAC3B,cAAc,EACd,oBAAoB,EACpB,MAAM,sDAAsD,CAAA;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAA;AACjG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yDAAyD,CAAA;AAC7G,OAAO,KAAK,EACX,6BAA6B,EAC7B,gBAAgB,EAChB,sBAAsB,EACtB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EACX,8BAA8B,EAC9B,uBAAuB,EACvB,MAAM,+DAA+D,CAAA;AACtE,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,qBAAqB,CAAA;AAE/E,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAErC,MAAM,MAAM,+BAA+B,GAAG,oBAAoB,CACjE,uBAAuB,EACvB,8BAA8B,CAC9B,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG,oBAAoB,CAC9D,oBAAoB,EACpB,2BAA2B,CAC3B,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG,oBAAoB,CACjE,uBAAuB,EACvB,8BAA8B,CAC9B,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG,oBAAoB,CAC9D,oBAAoB,EACpB,2BAA2B,CAC3B,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,CAChE,sBAAsB,EACtB,6BAA6B,CAC7B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,eAAe,EAAE,CAChB,OAAO,EAAE,sBAAsB,KAC3B,YAAY,CAAC,oCAAoC,CAAC,CAAA;IACvD,UAAU,CAAC,EAAE,CACZ,OAAO,EAAE,iBAAiB,KACtB,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAClD,OAAO,CAAC,EAAE,CACT,OAAO,EAAE,cAAc,KACnB,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAC/C,OAAO,CAAC,EAAE,CACT,OAAO,EAAE,cAAc,KACnB,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAC/C,SAAS,CAAC,EAAE,CACX,OAAO,EAAE,gBAAgB,KACrB,YAAY,CAAC,8BAA8B,CAAC,CAAA;IACjD,UAAU,CAAC,EAAE,CACZ,OAAO,EAAE,iBAAiB,KACtB,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAClD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,oCAAoC,GAC7C,wBAAwB,GACxB,8BAA8B,CAAA;AAEjC,MAAM,MAAM,2BAA2B,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/messages/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EACX,uBAAuB,EACvB,8BAA8B,EAC9B,MAAM,+DAA+D,CAAA;AACtE,OAAO,KAAK,EACX,2BAA2B,EAC3B,cAAc,EACd,oBAAoB,EACpB,MAAM,sDAAsD,CAAA;AAC7D,OAAO,KAAK,EACX,2BAA2B,EAC3B,cAAc,EACd,oBAAoB,EACpB,MAAM,sDAAsD,CAAA;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAA;AACjG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,yDAAyD,CAAA;AAC7G,OAAO,KAAK,EACX,6BAA6B,EAC7B,gBAAgB,EAChB,sBAAsB,EACtB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAA;AACvG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EACX,8BAA8B,EAC9B,uBAAuB,EACvB,MAAM,+DAA+D,CAAA;AACtE,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,qBAAqB,CAAA;AAE/E,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAErC,MAAM,MAAM,+BAA+B,GAAG,oBAAoB,CACjE,uBAAuB,EACvB,8BAA8B,CAC9B,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG,oBAAoB,CAC9D,oBAAoB,EACpB,2BAA2B,CAC3B,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG,oBAAoB,CACjE,uBAAuB,EACvB,8BAA8B,CAC9B,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG,oBAAoB,CAC9D,oBAAoB,EACpB,2BAA2B,CAC3B,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,CAChE,sBAAsB,EACtB,6BAA6B,CAC7B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,eAAe,EAAE,CAChB,OAAO,EAAE,sBAAsB,KAC3B,YAAY,CAAC,oCAAoC,CAAC,CAAA;IACvD,UAAU,CAAC,EAAE,CACZ,OAAO,EAAE,iBAAiB,KACtB,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAClD,OAAO,CAAC,EAAE,CACT,OAAO,EAAE,cAAc,KACnB,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAC/C,OAAO,CAAC,EAAE,CACT,OAAO,EAAE,cAAc,KACnB,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAC/C,SAAS,CAAC,EAAE,CACX,OAAO,EAAE,gBAAgB,KACrB,YAAY,CAAC,8BAA8B,CAAC,CAAA;IACjD,UAAU,CAAC,EAAE,CACZ,OAAO,EAAE,iBAAiB,KACtB,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAClD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,oCAAoC,GAC7C,wBAAwB,GACxB,8BAA8B,CAAA;AAEjC,MAAM,MAAM,2BAA2B,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAAA"}

package/dist/protocol/index.d.ts

@@ -15,9 +15,7 @@ export * from "./dataSources/propertySchema.js";
 export * from "./dataSources/recordPointer.js";
 export * from "./errors.js";
 export * from "./ids.js";
-export * from "./incomingType.js";
 export * from "./manifest.js";
-export * from "./messagePayload.js";
 export * from "./messages/connect.js";
 export * from "./messages/contrastModeChanged.js";
 export * from "./messages/createPage.js";
@@ -27,11 +25,14 @@ export * from "./messages/dataSourcesChanged.js";
 export * from "./messages/getPage.js";
 export * from "./messages/getUser.js";
 export * from "./messages/hostToSandbox.js";
+export * from "./messages/incomingType.js";
 export * from "./messages/init.js";
 export * from "./messages/initResult.js";
 export * from "./messages/invalidHostMessage.js";
 export * from "./messages/invalidSandboxMessage.js";
+export * from "./messages/isInitHandshakeMessage.js";
 export * from "./messages/listUsers.js";
+export * from "./messages/messagePayload.js";
 export * from "./messages/pageChanged.js";
 export * from "./messages/parentChanged.js";
 export * from "./messages/queryDataSource.js";

package/dist/protocol/index.js

@@ -15,9 +15,7 @@ export * from "./dataSources/propertySchema.js";
 export * from "./dataSources/recordPointer.js";
 export * from "./errors.js";
 export * from "./ids.js";
-export * from "./incomingType.js";
 export * from "./manifest.js";
-export * from "./messagePayload.js";
 export * from "./messages/connect.js";
 export * from "./messages/contrastModeChanged.js";
 export * from "./messages/createPage.js";
@@ -27,11 +25,14 @@ export * from "./messages/dataSourcesChanged.js";
 export * from "./messages/getPage.js";
 export * from "./messages/getUser.js";
 export * from "./messages/hostToSandbox.js";
+export * from "./messages/incomingType.js";
 export * from "./messages/init.js";
 export * from "./messages/initResult.js";
 export * from "./messages/invalidHostMessage.js";
 export * from "./messages/invalidSandboxMessage.js";
+export * from "./messages/isInitHandshakeMessage.js";
 export * from "./messages/listUsers.js";
+export * from "./messages/messagePayload.js";
 export * from "./messages/pageChanged.js";
 export * from "./messages/parentChanged.js";
 export * from "./messages/queryDataSource.js";

package/dist/protocol/messages/isInitHandshakeMessage.d.ts

@@ -0,0 +1,4 @@
+import type { HostToSandboxMessage } from "./hostToSandbox.js";
+import type { SandboxToHostMessage } from "./sandboxToHost.js";
+/** Returns whether a message belongs to the initialization handshake. */
+export declare function isInitHandshakeMessage(message: SandboxToHostMessage | HostToSandboxMessage): boolean;

package/dist/protocol/messages/isInitHandshakeMessage.js

@@ -0,0 +1,11 @@
+/** Returns whether a message belongs to the initialization handshake. */
+export function isInitHandshakeMessage(message) {
+    switch (message.type) {
+        case "connect":
+        case "init":
+        case "initResult":
+            return true;
+        default:
+            return false;
+    }
+}

package/dist/protocol/{messagePayload.d.ts → messages/messagePayload.d.ts}

@@ -1,4 +1,4 @@
-import type { CustomBlockErrorInfo } from "./errors.js";
+import type { CustomBlockErrorInfo } from "../errors.js";
 type WithTypedErrorInfo<T, TErrorInfo extends CustomBlockErrorInfo | undefined> = TErrorInfo extends CustomBlockErrorInfo ? T extends {
     error: CustomBlockErrorInfo;
 } ? Omit<T, "error"> & {

package/dist/queries/types.d.ts

@@ -1,4 +1,4 @@
-import type { BridgeMessagePayload } from "../protocol/messagePayload.js";
+import type { BridgeMessagePayload } from "../protocol/messages/messagePayload.js";
 import type { CustomBlockQueryDataSourceErrorInfo, QueryDataSourceResultMessage } from "../protocol/messages/queryDataSourceResult.js";
 export type CustomBlockHostQueryDataSourceResult = BridgeMessagePayload<QueryDataSourceResultMessage, CustomBlockQueryDataSourceErrorInfo>;
 //# sourceMappingURL=types.d.ts.map

package/dist/queries/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/queries/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAA;AAC9F,OAAO,KAAK,EACX,mCAAmC,EACnC,4BAA4B,EAC5B,MAAM,oEAAoE,CAAA;AAE3E,MAAM,MAAM,oCAAoC,GAAG,oBAAoB,CACtE,4BAA4B,EAC5B,mCAAmC,CACnC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/queries/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAA;AACvG,OAAO,KAAK,EACX,mCAAmC,EACnC,4BAA4B,EAC5B,MAAM,oEAAoE,CAAA;AAE3E,MAAM,MAAM,oCAAoC,GAAG,oBAAoB,CACtE,4BAA4B,EAC5B,mCAAmC,CACnC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@notionhq/custom-blocks-host",
-	"version": "0.1.9",
+	"version": "0.1.10",
 	"description": "Reusable host runtime for Notion custom blocks.",
 	"license": "MIT",
 	"type": "module",

package/src/createCustomBlockHost.ts

@@ -26,7 +26,6 @@ import type { PageChangedMessage } from "@notionhq/custom-blocks-protocol/messag
 import type { ParentChangedMessage } from "@notionhq/custom-blocks-protocol/messages/parentChanged.js"
 import type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
 import type { QueryDataSourceResultMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSourceResult.js"
-import { sandboxToHostMessageSchema } from "@notionhq/custom-blocks-protocol/messages/sandboxToHost.js"
 import type { ThemeChangedMessage } from "@notionhq/custom-blocks-protocol/messages/themeChanged.js"
 import type { UpdatePageMessage } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"
 import type { UpdatePageResultMessage } from "@notionhq/custom-blocks-protocol/messages/updatePageResult.js"
@@ -35,14 +34,13 @@ import type { NotionParent } from "@notionhq/custom-blocks-protocol/parent.js"
 import { CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION } from "@notionhq/custom-blocks-protocol/protocolVersion.js"
 import type { NotionTheme } from "@notionhq/custom-blocks-protocol/theme.js"
 import type { NotionUser } from "@notionhq/custom-blocks-protocol/users/user.js"
-import * as v from "valibot"
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js"
 import { createInitializationController } from "./lifecycle/initializationController.js"
 import type {
 	CustomBlockHostDataSourcesPayload,
 	CustomBlockHostInitialState,
 } from "./lifecycle/types.js"
-import { getInvalidSandboxMessageResponse } from "./messages/invalidSandboxMessage.js"
+import { createSandboxMessageRouter } from "./messages/sandboxMessageRouter.js"
 import type {
 	CustomBlockHostHandlers,
 	CustomBlockHostInitializationFailure,
@@ -55,7 +53,6 @@ import {
 import type { CustomBlockHostQueryDataSourceResult } from "./queries/types.js"
 import { validateQueryDataSourceFilter } from "./queries/validateQueryDataSourceFilter.js"
 import { validateQueryDataSourceSorts } from "./queries/validateQueryDataSourceSorts.js"
-import { unreachable } from "./utils.js"
 
 export type CustomBlockHostOptions = {
 	iframe: HTMLIFrameElement
@@ -96,10 +93,6 @@ export type CustomBlockHostHandle = {
 	refreshQuery: (args: { dataSourceId: NotionDataSourceId }) => void
 }
 
-const initializationIdentitySchema = v.object({
-	initializationId: v.string(),
-})
-
 export function createCustomBlockHost(
 	options: CustomBlockHostOptions,
 ): CustomBlockHostHandle {
@@ -363,115 +356,26 @@ export function createCustomBlockHost(
 		onInitializationFailure,
 	})
 
-	function onInvalidSandboxMessage(
-		data: unknown,
-		issues: readonly v.BaseIssue<unknown>[],
-	) {
-		emit("warn", {
-			message: "Ignored unsupported sandbox message",
-			payload: data,
-			issues,
-		})
-		const response = getInvalidSandboxMessageResponse(data)
-
-		const parsedIdentity = v.safeParse(initializationIdentitySchema, data)
-		const initializationId = parsedIdentity.success
-			? parsedIdentity.output.initializationId
-			: undefined
-		if (response.incomingType === "connect") {
-			if (initializationController.handleInvalidConnect(initializationId)) {
-				if (initializationId === undefined && response.nack !== undefined) {
-					post(response.nack)
-				}
-				return
-			}
-		}
-		if (
-			response.incomingType === "initResult" &&
-			initializationController.handleInvalidInitResult()
-		) {
-			if (response.nack !== undefined) {
-				post(response.nack)
-			}
-			return
-		}
-		if (response.nack !== undefined) {
-			post(response.nack)
-		}
-	}
-
-	function onMessage(event: MessageEvent) {
-		// Ignore messages from windows other than this host's iframe.
-		if (event.source !== iframe.contentWindow) {
-			return
-		}
-
-		// Ignore messages that do not come from the configured sandbox origin.
-		if (event.origin !== sandboxOrigin) {
-			return
-		}
-
-		const parsed = v.safeParse(sandboxToHostMessageSchema, event.data)
-		if (!parsed.success) {
-			onInvalidSandboxMessage(event.data, parsed.issues)
-			return
-		}
-
-		const message = parsed.output
-		emit("in", message)
-
-		if (
-			message.type !== "connect" &&
-			message.type !== "initResult" &&
-			initializationController.status !== "success"
-		) {
-			// Ignore all non-handshake messages until initialization succeeds.
-			if (message.type !== "resize") {
-				emit("warn", {
-					message: `Ignored ${message.type} before initialization completed`,
-					payload: message,
-				})
-			}
-			return
-		}
-
-		switch (message.type) {
-			case "connect":
-				initializationController.handleConnect(message)
-				return
-			case "initResult":
-				initializationController.handleInitResult(message)
-				return
-			case "queryDataSource":
-				void handleQuery(message)
-				return
-			case "unsubscribeDataSourceQuery":
-				querySubscriptions.unsubscribe(message.subscriptionId)
-				return
-			case "createPage":
-				void handleCreatePage(message)
-				return
-			case "getPage":
-				void handleGetPage(message)
-				return
-			case "getUser":
-				void handleGetUser(message)
-				return
-			case "listUsers":
-				void handleListUsers(message)
-				return
-			case "updatePage":
-				void handleUpdatePage(message)
-				return
-			case "resize":
-				handlers.resize?.(message)
-				return
-			case "invalidHostMessage":
-				return
-			default:
-				unreachable(message)
-		}
-	}
+	const onMessage = createSandboxMessageRouter({
+		iframe,
+		sandboxOrigin,
+		getInitStatus: () => initializationController.status,
+		emit,
+		post,
+		onInvalidConnect: initializationController.handleInvalidConnect,
+		onInvalidInitResult: initializationController.handleInvalidInitResult,
+		onConnect: initializationController.handleConnect,
+		onInitResult: initializationController.handleInitResult,
+		onQueryDataSource: handleQuery,
+		onUnsubscribeDataSourceQuery: message =>
+			querySubscriptions.unsubscribe(message.subscriptionId),
+		onCreatePage: handleCreatePage,
+		onGetPage: handleGetPage,
+		onGetUser: handleGetUser,
+		onListUsers: handleListUsers,
+		onUpdatePage: handleUpdatePage,
+		onResize: message => handlers.resize?.(message),
+	})
 
 	window.addEventListener("message", onMessage)
 	iframe.addEventListener("load", initializationController.onIframeLoad)

package/src/lifecycle/initializationController.ts

@@ -65,8 +65,14 @@ export type InitializationController = {
 	readonly hasConnectedSandbox: boolean
 	handleConnect: (message: ConnectMessage) => void
 	handleInitResult: (message: InitResultMessage) => void
-	handleInvalidConnect: (initializationId?: string) => boolean
-	handleInvalidInitResult: () => boolean
+	handleInvalidConnect: (args: {
+		initializationId: string
+		error: CustomBlockInitErrorInfo
+	}) => "initErrorSent" | "nack"
+	handleInvalidInitResult: (args: {
+		initializationId: string | undefined
+		error: CustomBlockInitErrorInfo
+	}) => void
 	onIframeLoad: () => void
 	stop: () => void
 }
@@ -109,10 +115,11 @@ export function createInitializationController(
 		}
 	}
 
-	function sendInitError(
-		initializationId: string,
-		error: CustomBlockInitErrorInfo,
-	) {
+	function sendInitError(args: {
+		initializationId: string
+		error: CustomBlockInitErrorInfo
+	}) {
+		const { initializationId, error } = args
 		if (initStatus !== "waitingForConnect") {
 			return
 		}
@@ -134,7 +141,10 @@ export function createInitializationController(
 		}
 		const preparation = prepareInit(connect)
 		if (preparation.status === "error") {
-			sendInitError(connect.initializationId, preparation.error)
+			sendInitError({
+				initializationId: connect.initializationId,
+				error: preparation.error,
+			})
 			return false
 		}
 		initStatus = "waitingForInitResult"
@@ -191,7 +201,10 @@ export function createInitializationController(
 			const initError = initErrorForFailureReason("invalid_protocol_version", {
 				currentBridgeProtocolVersion: message.bridgeProtocolVersion,
 			})
-			sendInitError(message.initializationId, initError)
+			sendInitError({
+				initializationId: message.initializationId,
+				error: initError,
+			})
 			return
 		}
 		if (message.bridgeProtocolVersion < minBridgeProtocolVersion) {
@@ -202,13 +215,19 @@ export function createInitializationController(
 					minBridgeProtocolVersion,
 				},
 			)
-			sendInitError(message.initializationId, initError)
+			sendInitError({
+				initializationId: message.initializationId,
+				error: initError,
+			})
 			return
 		}
 
 		// If the sandbox reported an error during `connect`, return it as an `init` error.
 		if (message.status === "error") {
-			sendInitError(message.initializationId, message.error)
+			sendInitError({
+				initializationId: message.initializationId,
+				error: message.error,
+			})
 			return
 		}
 
@@ -217,32 +236,37 @@ export function createInitializationController(
 		}
 	}
 
-	function handleInvalidConnect(initializationId?: string): boolean {
+	function handleInvalidConnect(args: {
+		initializationId: string
+		error: CustomBlockInitErrorInfo
+	}): "initErrorSent" | "nack" {
+		const { initializationId, error } = args
 		if (initStatus !== "waitingForConnect") {
-			return false
-		}
-		const error = initErrorForFailureReason("invalid_connect_payload")
-		if (initializationId === undefined) {
-			initStatus = "error"
-			clearNoConnectTimeout()
-			warn(error)
-			onInitializationFailure?.(error)
-		} else {
-			sendInitError(initializationId, error)
+			// `connect` messages received when not waiting for one are NACKed like generic invalid messages.
+			return "nack"
 		}
-		return true
+		// The sandbox awaits `init`. Reply with `init.error` using its initialization ID.
+		sendInitError({ initializationId, error })
+		return "initErrorSent"
 	}
 
-	function handleInvalidInitResult(): boolean {
-		if (initStatus !== "waitingForInitResult") {
-			return false
+	function handleInvalidInitResult(args: {
+		initializationId: string | undefined
+		error: CustomBlockInitErrorInfo
+	}): void {
+		const { initializationId, error } = args
+		if (
+			initStatus !== "waitingForInitResult" ||
+			initializationId === undefined ||
+			initializationId !== activeInitializationId
+		) {
+			return
 		}
+		clearNoConnectTimeout()
 		clearNoInitResultTimeout()
 		initStatus = "error"
-		const error = initErrorForFailureReason("invalid_init_result_payload")
 		warn(error)
 		onInitializationFailure?.(error)
-		return true
 	}
 
 	function onIframeLoad() {

package/src/messages/invalidSandboxMessage.ts

@@ -1,4 +1,4 @@
-import { readIncomingType } from "@notionhq/custom-blocks-protocol/incomingType.js"
+import { readIncomingType } from "@notionhq/custom-blocks-protocol/messages/incomingType.js"
 import type { InvalidSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/invalidSandboxMessage.js"
 
 export type InvalidSandboxMessageResponse = {

package/src/messages/sandboxMessageRouter.ts

@@ -0,0 +1,176 @@
+import type { ConnectMessage } from "@notionhq/custom-blocks-protocol/messages/connect.js"
+import type { CreatePageMessage } from "@notionhq/custom-blocks-protocol/messages/createPage.js"
+import type { GetPageMessage } from "@notionhq/custom-blocks-protocol/messages/getPage.js"
+import type { GetUserMessage } from "@notionhq/custom-blocks-protocol/messages/getUser.js"
+import type { HostToSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
+import type { InitResultMessage } from "@notionhq/custom-blocks-protocol/messages/initResult.js"
+import { isInitHandshakeMessage } from "@notionhq/custom-blocks-protocol/messages/isInitHandshakeMessage.js"
+import type { ListUsersMessage } from "@notionhq/custom-blocks-protocol/messages/listUsers.js"
+import type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
+import type { ResizeMessage } from "@notionhq/custom-blocks-protocol/messages/resize.js"
+import { sandboxToHostMessageSchema } from "@notionhq/custom-blocks-protocol/messages/sandboxToHost.js"
+import type { UnsubscribeDataSourceQueryMessage } from "@notionhq/custom-blocks-protocol/messages/unsubscribeDataSourceQuery.js"
+import type { UpdatePageMessage } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"
+import * as v from "valibot"
+import { initErrorForFailureReason } from "../lifecycle/initErrors.js"
+import type { InitializationController } from "../lifecycle/initializationController.js"
+import type { InitStatus } from "../lifecycle/types.js"
+import { unreachable } from "../utils.js"
+import { getInvalidSandboxMessageResponse } from "./invalidSandboxMessage.js"
+import type { CustomBlockHostLogDirection } from "./types.js"
+
+const initializationIdentitySchema = v.object({
+	initializationId: v.string(),
+})
+
+export type SandboxMessageRouterOptions = {
+	iframe: HTMLIFrameElement
+	sandboxOrigin: string
+	getInitStatus: () => InitStatus
+	emit: (direction: CustomBlockHostLogDirection, payload: unknown) => void
+	post: (message: HostToSandboxMessage) => void
+	onInvalidConnect: InitializationController["handleInvalidConnect"]
+	onInvalidInitResult: InitializationController["handleInvalidInitResult"]
+	onConnect: (message: ConnectMessage) => void
+	onInitResult: (message: InitResultMessage) => void
+	onQueryDataSource: (message: QueryDataSourceMessage) => void | Promise<void>
+	onUnsubscribeDataSourceQuery: (
+		message: UnsubscribeDataSourceQueryMessage,
+	) => void
+	onCreatePage: (message: CreatePageMessage) => void | Promise<void>
+	onGetPage: (message: GetPageMessage) => void | Promise<void>
+	onGetUser: (message: GetUserMessage) => void | Promise<void>
+	onListUsers: (message: ListUsersMessage) => void | Promise<void>
+	onUpdatePage: (message: UpdatePageMessage) => void | Promise<void>
+	onResize: (message: ResizeMessage) => void
+}
+
+export function createSandboxMessageRouter(
+	options: SandboxMessageRouterOptions,
+): (event: MessageEvent) => void {
+	const {
+		iframe,
+		sandboxOrigin,
+		getInitStatus,
+		emit,
+		post,
+		onInvalidConnect,
+		onInvalidInitResult,
+		onConnect,
+		onInitResult,
+		onQueryDataSource,
+		onUnsubscribeDataSourceQuery,
+		onCreatePage,
+		onGetPage,
+		onGetUser,
+		onListUsers,
+		onUpdatePage,
+		onResize,
+	} = options
+
+	function onInvalidSandboxMessage(
+		data: unknown,
+		issues: readonly v.BaseIssue<unknown>[],
+	) {
+		emit("warn", {
+			message: "Ignored unsupported sandbox message",
+			payload: data,
+			issues,
+		})
+		const response = getInvalidSandboxMessageResponse(data)
+
+		if (response.incomingType === "connect") {
+			const parsedIdentity = v.safeParse(initializationIdentitySchema, data)
+			if (parsedIdentity.success) {
+				const responseType = onInvalidConnect({
+					initializationId: parsedIdentity.output.initializationId,
+					error: initErrorForFailureReason("invalid_connect_payload"),
+				})
+				if (responseType === "initErrorSent") {
+					// The controller already sent `init.error`, so no need to also send a NACK.
+					return
+				}
+			}
+		}
+
+		if (response.incomingType === "initResult") {
+			const parsedIdentity = v.safeParse(initializationIdentitySchema, data)
+			onInvalidInitResult({
+				initializationId: parsedIdentity.success
+					? parsedIdentity.output.initializationId
+					: undefined,
+				error: initErrorForFailureReason("invalid_init_result_payload"),
+			})
+		}
+
+		// Other messages get NACKed indicating they were invalid and skipped
+		if (response.nack !== undefined) {
+			post(response.nack)
+		}
+	}
+
+	return function onMessage(event: MessageEvent) {
+		// Verify the sender is this host's iframe, not another window with the same origin.
+		const isExpectedSource = event.source === iframe.contentWindow
+		// Verify the sender's origin, since the iframe can navigate to another origin.
+		const isExpectedOrigin = event.origin === sandboxOrigin
+		if (!isExpectedSource || !isExpectedOrigin) {
+			return
+		}
+
+		// Parse and validate the message from the sandbox.
+		const parsed = v.safeParse(sandboxToHostMessageSchema, event.data)
+		if (!parsed.success) {
+			onInvalidSandboxMessage(event.data, parsed.issues)
+			return
+		}
+
+		const message = parsed.output
+		if (!isInitHandshakeMessage(message) && getInitStatus() !== "success") {
+			emit("warn", {
+				message: `Ignored ${message.type} before initialization completed`,
+				payload: message,
+			})
+			return
+		}
+
+		emit("in", message)
+		switch (message.type) {
+			case "connect":
+				onConnect(message)
+				return
+			case "initResult":
+				onInitResult(message)
+				return
+			case "queryDataSource":
+				void onQueryDataSource(message)
+				return
+			case "unsubscribeDataSourceQuery":
+				onUnsubscribeDataSourceQuery(message)
+				return
+			case "createPage":
+				void onCreatePage(message)
+				return
+			case "getPage":
+				void onGetPage(message)
+				return
+			case "getUser":
+				void onGetUser(message)
+				return
+			case "listUsers":
+				void onListUsers(message)
+				return
+			case "updatePage":
+				void onUpdatePage(message)
+				return
+			case "resize":
+				onResize(message)
+				return
+			case "invalidHostMessage":
+				// The inbound log records this rejection. Do not reply, to avoid an error-response loop.
+				return
+			default:
+				unreachable(message)
+		}
+	}
+}

package/src/messages/types.ts

@@ -1,4 +1,3 @@
-import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messagePayload.js"
 import type { CreatePageMessage } from "@notionhq/custom-blocks-protocol/messages/createPage.js"
 import type {
 	CreatePageResultMessage,
@@ -21,6 +20,7 @@ import type {
 	ListUsersMessage,
 	ListUsersResultMessage,
 } from "@notionhq/custom-blocks-protocol/messages/listUsers.js"
+import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messages/messagePayload.js"
 import type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
 import type { ResizeMessage } from "@notionhq/custom-blocks-protocol/messages/resize.js"
 import type { UpdatePageMessage } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"

package/src/queries/types.ts

@@ -1,4 +1,4 @@
-import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messagePayload.js"
+import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messages/messagePayload.js"
 import type {
 	CustomBlockQueryDataSourceErrorInfo,
 	QueryDataSourceResultMessage,