@arcblock/did-connect-service 4.1.40 → 4.1.42

package/dist/handlers/blocklet-js-handler.js

@@ -1,6 +1,6 @@
+import { advertisesLogoSlot, identityFromAppInfo, identityScopeFor, instanceIdentityRowsFromSettings, resolveAppIdentity, } from "../app-identity.js";
 import { resolveWalletIdentity } from "../identity/wallet-identity.js";
 import { DEFAULT_LANGUAGE_ROWS } from "../locale.js";
-import { formatThemeForOutput } from "../theme-utils.js";
 export class BlockletJsHandler {
     options;
     appDid;
@@ -8,7 +8,10 @@ export class BlockletJsHandler {
     appPk;
     // Server-side cache — avoids D1 listSettings + JSON.parse on every page load.
     // Invalidated naturally when handler is rebuilt (via _handlerCache TTL/invalidation).
-    _cache = null;
+    // Keyed by identity scope: the same construction rows resolve differently as the
+    // instance's own rows ("own", above the package layer) and as a stand-in
+    // ("fallback", below it), so one body must never answer both.
+    _cache = new Map();
     static CACHE_TTL = 60_000; // 60s — matches client Cache-Control
     constructor(options) {
         this.options = options;
@@ -17,15 +20,22 @@ export class BlockletJsHandler {
         this.appPid = identity.appPid;
         this.appPk = identity.appPk;
     }
-    async fetch(request) {
+    /**
+     * @param assertedInstanceDid the instance the HOST asserted for this request (route
+     *   context, or an opted-in `X-Instance-Did`). Used only to label the identity's
+     *   origin; the body always comes from this handler's own instance scope.
+     */
+    async fetch(request, assertedInstanceDid) {
         const url = new URL(request.url);
         // Fast path: endsWith check avoids regex on every request
         if (!url.pathname.endsWith("/__blocklet__.js") && !url.pathname.endsWith("/__meta__.js"))
             return null;
         const isJson = url.searchParams.get("type") === "json";
+        const scope = identityScopeFor(this.options.instanceDid || "_global_", assertedInstanceDid);
         // Serve from cache if fresh
-        if (this._cache && Date.now() - this._cache.at < BlockletJsHandler.CACHE_TTL) {
-            return new Response(isJson ? this._cache.json : this._cache.js, {
+        const cached = this._cache.get(scope);
+        if (cached && Date.now() - cached.at < BlockletJsHandler.CACHE_TTL) {
+            return new Response(isJson ? cached.json : cached.js, {
                 headers: {
                     "Content-Type": isJson ? "application/json" : "application/javascript; charset=utf-8",
                     "Cache-Control": "public, max-age=60",
@@ -33,10 +43,10 @@ export class BlockletJsHandler {
             });
         }
         // Build fresh data and populate cache
-        const data = await this.buildBlockletData(request);
+        const data = await this.buildBlockletData(request, scope);
         const json = JSON.stringify(data);
         const js = `window.blocklet = ${json};`;
-        this._cache = { js, json, at: Date.now() };
+        this._cache.set(scope, { js, json, at: Date.now() });
         return new Response(isJson ? json : js, {
             headers: {
                 "Content-Type": isJson ? "application/json" : "application/javascript; charset=utf-8",
@@ -44,7 +54,7 @@ export class BlockletJsHandler {
             },
         });
     }
-    async buildBlockletData(request) {
+    async buildBlockletData(request, scope) {
         const origin = new URL(request.url).origin;
         const store = this.options.store;
         const instanceDid = this.options.instanceDid || "_global_";
@@ -87,14 +97,30 @@ export class BlockletJsHandler {
                 return fallback;
             }
         };
+        // Identity fields (name / description / logos / theme) come from the single
+        // resolver. The rows are read from THIS handler's instance scope, never from the
+        // request's X-Instance-Did (preserved as-is — see the did#246 baseline). When the
+        // host asserted a different instance for this request, the construction rows are a
+        // stand-in and are labelled `scope: "fallback"` — decided by the host-asserted
+        // instance, never by a raw request header — without changing any output byte.
+        const base = this.options.appIdentity
+            ?? (this.options.appInfo ? identityFromAppInfo(this.options.appInfo) : undefined);
+        const identity = resolveAppIdentity({
+            instance: instanceIdentityRowsFromSettings(settingsMap, 
+            // Legacy app:name is NOT a per-request layer here: it only reaches this
+            // surface through the build-time identity (CF honors it, embedded does not).
+            ["branding", "logos", "theme"], scope),
+            inherited: base,
+            defaultName: "App",
+        });
+        // Non-identity branding fields (url, copyright, …) still come from the raw row.
+        // passportColor is identity (package layer, S8) and comes from the resolver.
         const branding = parse("app:branding", {});
-        const logos = parse("app:logos", {});
         const orgConfig = parse("app:org", { enabled: false });
         const didConnectConfig = parse("app:didConnect", { showDidColor: true, showAppInfo: true });
         const inviteConfig = parse("app:invite", { enabled: false });
         const fedConfig = parse("federation:config", {});
         const navigation = parse("app:navigation", []);
-        const theme = parse("app:theme", {});
         const languages = parse("app:languages", DEFAULT_LANGUAGE_ROWS.map((row) => ({ code: row.code, name: row.name })));
         const mountPoints = parse("app:mountPoints", []);
         // Phase 3c keys — must stay aligned
@@ -152,15 +178,13 @@ export class BlockletJsHandler {
             appId: this.appDid,
             appPid: this.appPid,
             appPk: this.appPk,
-            appName: branding.name || this.options.appInfo?.name || "App",
-            appDescription: typeof branding.description === "string"
-                ? branding.description
-                : this.options.appInfo?.description ?? "",
+            appName: identity.name.value || "App",
+            appDescription: identity.description.value ?? "",
             appUrl: branding.url || origin,
             did: this.appDid,
             status: "running",
             tenantMode: branding.tenantMode || "single",
-            passportColor: branding.passportColor || "#1DC1C7",
+            passportColor: identity.passportColor?.value || "#1DC1C7",
             alsoKnownAs: [],
             trustedFactories: [],
             domainAliases: branding.domainAliases || [],
@@ -175,16 +199,22 @@ export class BlockletJsHandler {
             version: branding.version || "1.0.0",
             componentId: this.appDid,
             isComponent: false,
-            // --- Brand assets (R2 key → URL path conversion) ---
-            // appLogo always returns a valid URL (fallback to default logo endpoint)
+            // --- Brand assets (slot → URL path) ---
+            // appLogo always returns a valid URL (fallback to default logo endpoint). A variant
+            // is advertised when its own slot is configured or its fallback chain reaches the
+            // package logo (did#248) — see advertisesLogoSlot.
             appLogo: "/.well-known/service/blocklet/logo",
-            appLogoDark: logos.squareDark ? "/.well-known/service/blocklet/logo-dark" : "",
-            appLogoRect: logos.rect ? "/.well-known/service/blocklet/logo-rect" : "",
-            appLogoRectDark: logos.rectDark ? "/.well-known/service/blocklet/logo-rect-dark" : "",
-            appSplashPortrait: logos.splashPortrait ? "/.well-known/service/blocklet/splash/portrait" : "",
-            appSplashLandscape: logos.splashLandscape ? "/.well-known/service/blocklet/splash/landscape" : "",
-            appOgImage: logos.ogImage ? "/.well-known/service/blocklet/og-image" : "",
-            blurhash: logos.blurhash || {},
+            appLogoDark: advertisesLogoSlot(identity, "squareDark") ? "/.well-known/service/blocklet/logo-dark" : "",
+            appLogoRect: advertisesLogoSlot(identity, "rect") ? "/.well-known/service/blocklet/logo-rect" : "",
+            appLogoRectDark: advertisesLogoSlot(identity, "rectDark") ? "/.well-known/service/blocklet/logo-rect-dark" : "",
+            appSplashPortrait: advertisesLogoSlot(identity, "splashPortrait")
+                ? "/.well-known/service/blocklet/splash/portrait"
+                : "",
+            appSplashLandscape: advertisesLogoSlot(identity, "splashLandscape")
+                ? "/.well-known/service/blocklet/splash/landscape"
+                : "",
+            appOgImage: advertisesLogoSlot(identity, "ogImage") ? "/.well-known/service/blocklet/og-image" : "",
+            blurhash: identity.blurhash?.value || {},
             // --- Config ---
             webWalletUrl: "https://web.abtwallet.io",
             preferences: {},
@@ -192,7 +222,7 @@ export class BlockletJsHandler {
             updatedAt: latestUpdate || 0,
             copyright: branding.copyright || {},
             navigation,
-            theme: formatThemeForOutput(theme),
+            theme: identity.theme.value,
             optionalComponents: [],
             enableDocker: false,
             enableDockerNetwork: false,

package/dist/handlers/blocklet-js-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"blocklet-js-handler.js","sourceRoot":"","sources":["../../src/handlers/blocklet-js-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blocklet-js-handler.js","sourceRoot":"","sources":["../../src/handlers/blocklet-js-handler.ts"],"names":[],"mappings":"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"}

package/dist/handlers/branding-handler.d.ts

@@ -4,17 +4,76 @@
  * Public routes (before enforceAccess): Logo access, Theme anti-FOUC
  * Admin routes (after enforceAccess): Branding/Theme/Navigation CRUD, Logo upload/delete
  */
+import { type AppIdentity } from "../app-identity.js";
+import { type Logger } from "../logger.js";
 import type { OgWorkerRenderer } from "../og/worker.js";
 import type { AppInfo } from "../package-branding.js";
 import type { D1Store } from "../store/d1-store.js";
+/**
+ * Host-injected cache purge for an instance's public branding paths.
+ *
+ * connect-service never talks to a CDN itself: a host whose runtime caches the
+ * public branding paths beyond their own `max-age` (arc's Cloudflare worker keeps
+ * `/favicon.ico` and the logo paths at the edge for 30 days) injects this, the
+ * same way it injects `r2` / `ogRenderer` / `getAccountState`. It is called after
+ * a successful branding save with the instance whose branding changed, the host
+ * the admin saved from, and the path list to purge — always
+ * {@link BRANDING_PUBLIC_PATHS}.
+ *
+ * `host` is the saving request's own URL host (`new URL(request.url).host`, so a
+ * non-default port is kept); no header is consulted. It lets a host that cannot
+ * enumerate an instance's domains (arc-services) purge at least the one the admin
+ * is on; expanding to the instance's other hosts stays the host's job.
+ *
+ * Best effort: a rejection (or a throw) is logged and swallowed — the save it
+ * follows has already committed and still answers `{ ok: true }`.
+ */
+export type PurgeBrandingPaths = (input: {
+    instanceDid: string;
+    host: string;
+    paths: readonly string[];
+}) => Promise<void> | void;
 export interface BrandingHandlerOptions {
     store: D1Store;
     r2?: R2Bucket;
     instanceDid?: string;
+    /**
+     * Whether the `X-Instance-Did` request header is host-asserted and may select the
+     * branding scope (only when no explicit scope is passed to fetchPublic/fetchAdmin).
+     * Set ONLY by hosts whose runtime sets or strips that header itself (the embedded
+     * Node host: arc's reserved routes). Default false: the header is ignored.
+     */
+    trustInstanceHeader?: boolean;
     /** Deployment RP name used only by the generated default logo fallback. */
     rpName?: string;
-    /** Resolved per-instance identity used by dynamic OG text only. */
+    /** The handler's build-time app identity — the layer under the request-scope rows in dynamic OG text. */
+    appIdentity?: AppIdentity;
+    /** @deprecated Pass `appIdentity`. A bare AppInfo is wrapped via `identityFromAppInfo`. */
     appInfo?: AppInfo;
+    /**
+     * The identity BELOW the instance layer — package → deployment → default, resolved
+     * with no instance rows. It is what removing an instance override falls back to, so
+     * the admin API reports sources against it (did#249). A host whose `appIdentity`
+     * already folds in instance rows (Workers `buildHandler`, cached for minutes) must
+     * pass it, or a just-restored slot would still read as overridden from that cached
+     * copy. Omitted → `appIdentity` when it carries no instance-origin field, else the
+     * deployment name alone.
+     */
+    baseIdentity?: AppIdentity;
+    /**
+     * Whether this host's pages honor the legacy D1 `app:name` key as a name layer.
+     * Workers `buildHandler` does (it reads it into the build-time identity); the embedded
+     * Node host does not (did#246 baseline). The admin sources report the name the host's
+     * pages actually show, so a host that ignores the key sets this false. Default true.
+     */
+    honorsLegacyName?: boolean;
+    /**
+     * Host hook run after a successful branding write, for a host that caches an identity
+     * built from this instance's rows (Workers `buildHandler` → `invalidateConfigCache`).
+     * Without it, public surfaces built on that cached identity (login page, passkey RP
+     * name, `__blocklet__.js`) keep a restored override until the cache expires.
+     */
+    invalidateIdentityCache?: (instanceDid: string) => void;
     /** Node-only: dynamic OG generator from `@arcblock/did-connect-service/og-node`.
      *  When absent, /og.png falls back to the static /og-image R2 lookup. */
     ogGenerator?: {
@@ -22,41 +81,68 @@ export interface BrandingHandlerOptions {
     };
     /** Worker-compatible byte renderer. Takes precedence over the Node generator. */
     ogRenderer?: OgWorkerRenderer;
+    /** Host purge hook run after a successful branding save. Omitted → no purge (unchanged behaviour). */
+    purgeBrandingPaths?: PurgeBrandingPaths;
+    /** Where a failed purge is reported. Omitted → `consoleLogger`. */
+    logger?: Logger;
 }
 export declare class BrandingHandler {
     private options;
     private _themeCache;
     private static THEME_CACHE_TTL;
+    private _requestScope;
     constructor(options: BrandingHandlerOptions);
     /**
      * Public routes — Logo access + Theme anti-FOUC endpoints.
      * Called BEFORE enforceAccess in auth-handler route().
      */
-    fetchPublic(request: Request): Promise<Response | null>;
+    fetchPublic(request: Request, scopeInstanceDid?: string): Promise<Response | null>;
     /**
      * Admin routes — Branding/Theme/Navigation CRUD.
      * Called AFTER enforceAccess in auth-handler route() (requires admin).
      */
-    fetchAdmin(request: Request): Promise<Response | null>;
+    fetchAdmin(request: Request, scopeInstanceDid?: string): Promise<Response | null>;
     /**
-     * Per-request instance scope: multi-tenant hosts (e.g. arc's Node daemon
-     * serving many blocklets) inject `X-Instance-Did` per request so each
-     * blocklet/site gets its own branding row. Falls back to the
-     * constructor-fixed instance (single-tenant deployments) and then to the
-     * global scope. Same pattern the login flow already uses.
-     *
-     * Trust note: the header must be set by the HOSTING runtime (which owns
-     * host→blocklet resolution), never passed through from clients.
+     * The instance this request's branding reads/writes are scoped to. Precedence:
+     *   1. the explicit scope the caller passed (auth-handler: route-context instance,
+     *      else the header when the host owns it, else the construction instance) —
+     *      the same scope the admin gate authorized against;
+     *   2. `X-Instance-Did`, only when `trustInstanceHeader` — a host opts in only if its
+     *      runtime sets the header itself and strips any client-supplied value; for a
+     *      host that does not, the header must stay untrusted (the default);
+     *   3. the constructor instance, then the global scope.
      */
     private instanceDidFor;
+    /**
+     * This request's identity rows. Branding always reads the host-asserted instance (or,
+     * with none asserted, the construction instance), so the rows are that scope's own.
+     */
+    private identityRows;
+    /** The handler's build-time identity — the layer under the request-scope rows. */
+    private get base();
+    /** See {@link BrandingHandlerOptions.baseIdentity}. */
+    private belowInstance;
     private localeFor;
     private serveLogo;
     private serveOg;
     resolveLogoType(pathname: string): string | null;
+    /** @deprecated Use `logoFallbackChain` from app-identity.ts (the single definition). */
     getFallbackChain(type: string): string[];
     private defaultLogoResponse;
     private getBranding;
     private updateBranding;
+    /**
+     * Run the host's purge hook for `instanceDid`, if one was injected. Awaited so a
+     * Workers host does not cancel it with the response, but contained: a rejection
+     * or throw is logged and swallowed, because the branding write is the primary
+     * operation and the purge is only an optimization over the origin's max-age.
+     */
+    /**
+     * Run the host's identity-cache hook for `instanceDid`, if one was injected. Contained
+     * like the purge below: it is a public host option, and the save has already committed.
+     */
+    private invalidateIdentity;
+    private purgePublicPaths;
     private uploadLogo;
     private deleteLogo;
     private getTheme;

package/dist/handlers/branding-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branding-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/branding-handler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAGpD,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;6EACyE;IACzE,WAAW,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC;IACvD,iFAAiF;IACjF,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED,qBAAa,eAAe;IASd,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,WAAW,CAAqD;IACxE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAU;gBAEpB,OAAO,EAAE,sBAAsB;IAEnD;;;OAGG;IACG,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgC7D;;;OAGG;IACG,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IA+B5D;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;YAIR,SAAS;YAKT,SAAS;YAuDT,OAAO;IAoIrB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAmBhD,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;YAc1B,mBAAmB;YA0BnB,WAAW;YAmBX,cAAc;YAgDd,UAAU;YAgDV,UAAU;YAYV,QAAQ;YAMR,WAAW;YAuBX,gBAAgB;YAoBhB,cAAc;YAkDd,iBAAiB;YAajB,aAAa;YAMb,gBAAgB;CAW/B"}
+{"version":3,"file":"branding-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/branding-handler.ts"],"names":[],"mappings":"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"}