@arcblock/did-connect-service 4.1.40 → 4.1.41

package/dist/app-identity.d.ts

@@ -0,0 +1,211 @@
+/**
+ * App identity — the single resolver for "what is this app called and what does it
+ * look like" (did#247, S4 of ArcBlock/arc#7073).
+ *
+ * Every surface that shows the app's identity (name / description / icon / logos /
+ * theme) resolves it here instead of reading D1 and layering fallbacks on its own:
+ * `resolveAppInfo`, `BrandingHandler` (logo serving, letter-mark fallback, theme CSS,
+ * OG text), `BlockletJsHandler` (`__blocklet__.js`), the login page, the homepage and
+ * the access-key page name.
+ *
+ * Layers, highest first (no new layer is introduced here — this is convergence only):
+ *
+ *   name         instance app:branding.name → instance legacy app:name → package name
+ *                → deployment name → built-in default
+ *   description  instance app:branding.description (any string, "" included)
+ *                → package description → absent
+ *   icon         instance app:branding.icon
+ *   logos        instance app:logos.<type> (R2 key)
+ *   theme        instance app:theme, deep-merged over the built-in palettes
+ *
+ * connect-service never reads the app package itself (arc#7073 red line 1): the
+ * package layer only ever arrives as host-supplied {@link PackageBranding}, and it is
+ * never written back into D1 (red line 2).
+ *
+ * ## Per-field origin
+ *
+ * Every field carries `from`. `"instance"` means the value is configured on the
+ * instance whose identity is being resolved — nothing else. When the host asserted a
+ * request's instance X (route-context `instanceDid`, or an opted-in `X-Instance-Did`)
+ * but a surface read another scope's rows (e.g. `__blocklet__.js` reading the
+ * handler's construction instance), those rows are passed with `scope: "fallback"`
+ * and labelled `"deployment"` — see {@link identityScopeFor}. The arc-side lesson
+ * recorded on `resolveRawInstanceBranding` (services/shared/src/identity.ts) is that a
+ * ROOT fallback masquerading as instance-configured branding permanently outranks the
+ * package layer. With no asserted instance (a root / control-plane request), the
+ * construction rows ARE the instance's own and are labelled `"instance"`.
+ *
+ * Precedence note for S5: fallback-scope rows currently OUTRANK the package layer
+ * (they sit where instance rows sit, only relabelled) — byte-identical to today. S5
+ * must decide explicitly whether the order becomes own instance > package > fallback.
+ *
+ * ## Which layers a surface honors is the caller's input, not a flag
+ *
+ * The surfaces do not all honor the same layers today, and S4 preserves that byte for
+ * byte (locked by test/app-identity-baseline.test.ts). The resolver is pure and takes
+ * only the layers it is given, so each divergence is expressed by what the caller
+ * passes:
+ *
+ *   - Letter-mark logo fallback: passes only the instance `branding` row and the
+ *     deployment name — legacy app:name and package branding never reach the initial.
+ *   - Embedded (Node) host: builds its handler identity with no instance rows at all,
+ *     so legacy app:name is never honored there (per-request surfaces still overlay
+ *     the request-scope app:branding).
+ *   - Per-request surfaces pass the handler's build-time identity as `inherited`: the
+ *     request-scope instance rows sit on top of it, and it replaces the
+ *     package / deployment / default layers for name and description.
+ *   - The scope (which instance's rows are read) stays where it is today at each call
+ *     site; see `readInstanceIdentityRows`.
+ *   - Logos and theme are also taken from `inherited` for any slot the request-scope rows
+ *     do not configure, so a later layer (package logos in S5, palette in S8) is added
+ *     once, in the build-time identity. Today the build-time identity carries no logos or
+ *     theme, so this is byte-identical.
+ */
+import { type AppInfo, type PackageBranding } from "./package-branding.js";
+export type Origin = "instance" | "package" | "deployment" | "default";
+/** Logo slots (`app:logos.<type>` = R2 key on the instance layer). */
+export declare const LOGO_TYPES: readonly ["square", "squareDark", "rect", "rectDark", "favicon", "splashPortrait", "splashLandscape", "ogImage"];
+export type LogoType = (typeof LOGO_TYPES)[number];
+/**
+ * The D1 settings keys that carry app identity. Every identity SURFACE reads them through
+ * `readInstanceIdentityRows` / `instanceIdentityRowsFromSettings`. Raw reads remain in the
+ * admin CRUD endpoints, instance listings and federation/invite paths (see the did#253
+ * PR's unconverged-readers table).
+ */
+export declare const IDENTITY_SETTING_KEYS: {
+    readonly branding: "app:branding";
+    readonly legacyName: "app:name";
+    readonly logos: "app:logos";
+    readonly theme: "app:theme";
+};
+export type IdentityRowField = keyof typeof IDENTITY_SETTING_KEYS;
+/**
+ * Raw identity rows of one instance, as stored. A field that is `null`/`undefined`
+ * is "not configured" (or not read by this caller).
+ */
+export interface InstanceIdentityRows {
+    branding?: string | null;
+    legacyName?: string | null;
+    logos?: string | null;
+    theme?: string | null;
+    /**
+     * `"own"` (default): the rows belong to the instance being resolved.
+     * `"fallback"`: the caller read a stand-in scope (the deployment's root instance)
+     * because it cannot scope to the requesting instance — values are used unchanged
+     * but labelled `"deployment"`, never `"instance"`.
+     */
+    scope?: "own" | "fallback";
+}
+export interface AppIdentityInput {
+    instance?: InstanceIdentityRows;
+    /**
+     * An identity already resolved for this app (the handler's build-time identity).
+     * When given, it replaces the package / deployment / default layers for name and
+     * description — including an empty inherited name — and keeps its own origins. Its
+     * logos / blurhash / theme fill whatever the request-scope rows do not configure.
+     */
+    inherited?: AppIdentity;
+    /** Host-supplied package branding. Ignored when `inherited` is given. */
+    packageBranding?: PackageBranding;
+    /** Deployment-global name (`CONNECT_APP_NAME` / embedded `appName`). `""` counts as set. */
+    deploymentName?: string;
+    /** Built-in last resort for the name. Default `"DID Connect"`. */
+    defaultName?: string;
+}
+export interface AppIdentity {
+    v: 1;
+    /** Fingerprint of the instance + package components (and the inherited identity). */
+    etag: string;
+    name: {
+        value: string;
+        from: Origin;
+    };
+    description: {
+        value?: string;
+        from: Origin;
+    };
+    icon: {
+        value?: string;
+        from: Origin;
+    };
+    /** Configured slots. `key` is the R2 key for instance slots; later layers may omit it. */
+    logos: Partial<Record<LogoType, {
+        from: Origin;
+        key?: string;
+    }>>;
+    /** `app:logos.blurhash`, passed through as stored. */
+    blurhash?: {
+        value: unknown;
+        from: Origin;
+    };
+    theme: {
+        /** `formatThemeForOutput` of the stored theme (`{}` when none). */
+        value: any;
+        /**
+         * The prefer the stored theme declares — current concept's prefer, else the
+         * top-level prefer — with no default. The login page uses this rule; it differs
+         * from `value.prefer` (which defaults to "system" and ignores the top-level prefer
+         * in the concepts shape) and both are preserved as-is.
+         */
+        prefer?: unknown;
+        from: Origin;
+    };
+}
+/** A stored JSON object row, or `{}` for absent / malformed / non-object rows. */
+export declare function parseSettingObject(raw: string | null | undefined): Record<string, any>;
+export declare function resolveAppIdentity(input: AppIdentityInput): AppIdentity;
+/** The legacy `AppInfo` shape (`resolveAppInfo`'s output) of an identity. */
+export declare function toAppInfo(identity: AppIdentity): AppInfo;
+/**
+ * Wrap an `AppInfo` a host resolved on its own (no per-field origins available) as an
+ * identity. Labelled `"deployment"`: it is host/deployment-supplied, and must never
+ * read as instance-configured.
+ */
+export declare function identityFromAppInfo(appInfo: AppInfo): AppIdentity;
+interface SettingReader {
+    getSetting(instanceDid: string, key: string): Promise<string | null>;
+}
+/**
+ * Read the requested identity rows of `instanceDid` (one `getSetting` per field, in
+ * parallel). The caller owns the scope decision — which instance's rows answer this
+ * request — and says so via `scope`.
+ */
+export declare function readInstanceIdentityRows(store: SettingReader, instanceDid: string, fields: readonly IdentityRowField[], scope?: "own" | "fallback"): Promise<InstanceIdentityRows>;
+/**
+ * The requested identity rows out of an already-loaded settings map (e.g. from
+ * `listSettings`). Pass `fields` explicitly: a surface that does not honor a layer
+ * (e.g. legacy `app:name`) must not receive it just because the map happens to hold it.
+ */
+export declare function instanceIdentityRowsFromSettings(settings: ReadonlyMap<string, string | null> | undefined, fields?: readonly IdentityRowField[], scope?: "own" | "fallback"): InstanceIdentityRows;
+/**
+ * The `scope` of rows read from `readInstanceDid`, given the instance the HOST asserted
+ * for this request — the route-context `instanceDid`, or `X-Instance-Did` only on an
+ * embedded host that opted in with `trustInstanceHeader` (the same signal that decides
+ * branding scope; never a raw client header).
+ *
+ *   - nothing asserted (root / control-plane request, single-tenant) → `"own"`
+ *   - asserted X and the rows are X's → `"own"`
+ *   - asserted X but the rows are another scope's (or no scope) → `"fallback"`
+ */
+export declare function identityScopeFor(readInstanceDid: string | undefined, assertedInstanceDid: string | undefined): "own" | "fallback";
+/** The slots a logo type falls back through, most specific first. */
+export declare function logoFallbackChain(type: string): readonly string[];
+/**
+ * The slot that answers `type`: the FIRST configured slot along its fallback chain.
+ * That slot decides — a miss on its bytes serves the generated fallback, it does not
+ * continue down the chain.
+ */
+export declare function resolveLogoSlot(identity: AppIdentity, type: string): {
+    slot: LogoType;
+    from: Origin;
+    key?: string;
+} | null;
+/** `resolveAppInfo`'s historical signature, now a view over {@link resolveAppIdentity}. */
+export declare function resolveAppInfo(params: {
+    brandingRaw: string | null;
+    legacyAppName: string | null;
+    packageBranding?: PackageBranding;
+    deploymentName?: string;
+}): AppInfo;
+export {};
+//# sourceMappingURL=app-identity.d.ts.map

package/dist/app-identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-identity.d.ts","sourceRoot":"","sources":["../src/app-identity.ts"],"names":[],"mappings":"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"}

package/dist/app-identity.js

@@ -0,0 +1,343 @@
+/**
+ * App identity — the single resolver for "what is this app called and what does it
+ * look like" (did#247, S4 of ArcBlock/arc#7073).
+ *
+ * Every surface that shows the app's identity (name / description / icon / logos /
+ * theme) resolves it here instead of reading D1 and layering fallbacks on its own:
+ * `resolveAppInfo`, `BrandingHandler` (logo serving, letter-mark fallback, theme CSS,
+ * OG text), `BlockletJsHandler` (`__blocklet__.js`), the login page, the homepage and
+ * the access-key page name.
+ *
+ * Layers, highest first (no new layer is introduced here — this is convergence only):
+ *
+ *   name         instance app:branding.name → instance legacy app:name → package name
+ *                → deployment name → built-in default
+ *   description  instance app:branding.description (any string, "" included)
+ *                → package description → absent
+ *   icon         instance app:branding.icon
+ *   logos        instance app:logos.<type> (R2 key)
+ *   theme        instance app:theme, deep-merged over the built-in palettes
+ *
+ * connect-service never reads the app package itself (arc#7073 red line 1): the
+ * package layer only ever arrives as host-supplied {@link PackageBranding}, and it is
+ * never written back into D1 (red line 2).
+ *
+ * ## Per-field origin
+ *
+ * Every field carries `from`. `"instance"` means the value is configured on the
+ * instance whose identity is being resolved — nothing else. When the host asserted a
+ * request's instance X (route-context `instanceDid`, or an opted-in `X-Instance-Did`)
+ * but a surface read another scope's rows (e.g. `__blocklet__.js` reading the
+ * handler's construction instance), those rows are passed with `scope: "fallback"`
+ * and labelled `"deployment"` — see {@link identityScopeFor}. The arc-side lesson
+ * recorded on `resolveRawInstanceBranding` (services/shared/src/identity.ts) is that a
+ * ROOT fallback masquerading as instance-configured branding permanently outranks the
+ * package layer. With no asserted instance (a root / control-plane request), the
+ * construction rows ARE the instance's own and are labelled `"instance"`.
+ *
+ * Precedence note for S5: fallback-scope rows currently OUTRANK the package layer
+ * (they sit where instance rows sit, only relabelled) — byte-identical to today. S5
+ * must decide explicitly whether the order becomes own instance > package > fallback.
+ *
+ * ## Which layers a surface honors is the caller's input, not a flag
+ *
+ * The surfaces do not all honor the same layers today, and S4 preserves that byte for
+ * byte (locked by test/app-identity-baseline.test.ts). The resolver is pure and takes
+ * only the layers it is given, so each divergence is expressed by what the caller
+ * passes:
+ *
+ *   - Letter-mark logo fallback: passes only the instance `branding` row and the
+ *     deployment name — legacy app:name and package branding never reach the initial.
+ *   - Embedded (Node) host: builds its handler identity with no instance rows at all,
+ *     so legacy app:name is never honored there (per-request surfaces still overlay
+ *     the request-scope app:branding).
+ *   - Per-request surfaces pass the handler's build-time identity as `inherited`: the
+ *     request-scope instance rows sit on top of it, and it replaces the
+ *     package / deployment / default layers for name and description.
+ *   - The scope (which instance's rows are read) stays where it is today at each call
+ *     site; see `readInstanceIdentityRows`.
+ *   - Logos and theme are also taken from `inherited` for any slot the request-scope rows
+ *     do not configure, so a later layer (package logos in S5, palette in S8) is added
+ *     once, in the build-time identity. Today the build-time identity carries no logos or
+ *     theme, so this is byte-identical.
+ */
+import { packageBrandingCacheToken, sanitizePackageBranding, } from "./package-branding.js";
+import { formatThemeForOutput } from "./theme-utils.js";
+/** Logo slots (`app:logos.<type>` = R2 key on the instance layer). */
+export const LOGO_TYPES = [
+    "square",
+    "squareDark",
+    "rect",
+    "rectDark",
+    "favicon",
+    "splashPortrait",
+    "splashLandscape",
+    "ogImage",
+];
+/**
+ * The D1 settings keys that carry app identity. Every identity SURFACE reads them through
+ * `readInstanceIdentityRows` / `instanceIdentityRowsFromSettings`. Raw reads remain in the
+ * admin CRUD endpoints, instance listings and federation/invite paths (see the did#253
+ * PR's unconverged-readers table).
+ */
+export const IDENTITY_SETTING_KEYS = {
+    branding: "app:branding",
+    legacyName: "app:name",
+    logos: "app:logos",
+    theme: "app:theme",
+};
+// ─── Parsing ──────────────────────────────────────────────────────────────
+function parseJson(raw) {
+    if (!raw)
+        return undefined;
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return undefined;
+    }
+}
+/** A stored JSON object row, or `{}` for absent / malformed / non-object rows. */
+export function parseSettingObject(raw) {
+    const parsed = parseJson(raw);
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)
+        ? parsed
+        : {};
+}
+function nonEmptyString(value) {
+    return typeof value === "string" && value ? value : undefined;
+}
+/** Mirrors formatThemeForOutput's own branching: does the stored theme configure anything? */
+function themeIsConfigured(theme) {
+    if (Array.isArray(theme.concepts) && theme.currentConceptId) {
+        return theme.concepts.some((c) => c?.id === theme.currentConceptId);
+    }
+    return Boolean(theme.light || theme.dark || theme.common || theme.prefer || theme.name);
+}
+function declaredPrefer(theme) {
+    const concept = Array.isArray(theme.concepts)
+        ? theme.concepts.find((c) => c?.id === theme.currentConceptId)
+        : undefined;
+    return concept?.prefer || theme.prefer;
+}
+// ─── Fingerprint ──────────────────────────────────────────────────────────
+/** FNV-1a 32-bit, seeded — two seeds give a 64-bit (16 hex) fingerprint. Not a MAC. */
+function fnv1a(input, seed) {
+    let hash = seed >>> 0;
+    for (let i = 0; i < input.length; i++) {
+        hash ^= input.charCodeAt(i);
+        hash = Math.imul(hash, 0x01000193) >>> 0;
+    }
+    return hash.toString(16).padStart(8, "0");
+}
+function fingerprint(parts) {
+    const canonical = JSON.stringify(parts);
+    return `v1-${fnv1a(canonical, 0x811c9dc5)}${fnv1a(canonical, 0x9747b28c)}`;
+}
+// ─── Resolver ─────────────────────────────────────────────────────────────
+export function resolveAppIdentity(input) {
+    const rows = input.instance ?? {};
+    const instanceFrom = rows.scope === "fallback" ? "deployment" : "instance";
+    const inherited = input.inherited;
+    const packageBranding = inherited ? undefined : sanitizePackageBranding(input.packageBranding);
+    const branding = parseSettingObject(rows.branding);
+    const logosRow = parseSettingObject(rows.logos);
+    // name
+    let name;
+    const brandingName = nonEmptyString(branding.name);
+    const legacyName = nonEmptyString(rows.legacyName);
+    const packageName = packageBranding?.name || undefined;
+    if (brandingName !== undefined)
+        name = { value: brandingName, from: instanceFrom };
+    else if (legacyName !== undefined)
+        name = { value: legacyName, from: instanceFrom };
+    else if (inherited)
+        name = { ...inherited.name };
+    else if (packageName !== undefined)
+        name = { value: packageName, from: "package" };
+    else if (input.deploymentName !== undefined)
+        name = { value: input.deploymentName, from: "deployment" };
+    else
+        name = { value: input.defaultName ?? "DID Connect", from: "default" };
+    // description
+    let description;
+    if (typeof branding.description === "string")
+        description = { value: branding.description, from: instanceFrom };
+    else if (inherited)
+        description = { ...inherited.description };
+    else if (packageBranding !== undefined && Object.hasOwn(packageBranding, "description")) {
+        description = { value: packageBranding.description, from: "package" };
+    }
+    else
+        description = { from: "default" };
+    // icon (instance only; inherited keeps its own)
+    const brandingIcon = nonEmptyString(branding.icon);
+    const icon = brandingIcon !== undefined
+        ? { value: brandingIcon, from: instanceFrom }
+        : inherited
+            ? { ...inherited.icon }
+            : { from: "default" };
+    // logos
+    const logos = {};
+    for (const type of LOGO_TYPES) {
+        const key = nonEmptyString(logosRow[type]);
+        if (key !== undefined)
+            logos[type] = { from: instanceFrom, key };
+        else if (inherited?.logos[type])
+            logos[type] = { ...inherited.logos[type] };
+    }
+    const blurhash = logosRow.blurhash
+        ? { value: logosRow.blurhash, from: instanceFrom }
+        : inherited?.blurhash
+            ? { ...inherited.blurhash }
+            : undefined;
+    // theme
+    const storedTheme = parseJson(rows.theme);
+    const themeObject = typeof storedTheme === "object" && storedTheme !== null
+        ? storedTheme
+        : undefined;
+    // Non-object JSON values (a bare string/number) reach formatThemeForOutput as-is —
+    // exactly what __blocklet__.js did — and resolve to the default palette.
+    const themeInput = storedTheme === undefined || storedTheme === null ? {} : storedTheme;
+    const ownTheme = {
+        value: formatThemeForOutput(themeInput),
+        ...(themeObject && declaredPrefer(themeObject) !== undefined ? { prefer: declaredPrefer(themeObject) } : {}),
+        from: themeObject && themeIsConfigured(themeObject) ? instanceFrom : "default",
+    };
+    // An inherited NON-default theme (a later layer) fills in when the request-scope row
+    // configures none. A default inherited theme never replaces the computed one, so
+    // bytes stay exactly what the row alone produces today.
+    const theme = ownTheme.from === "default" && inherited && inherited.theme.from !== "default"
+        ? { ...inherited.theme }
+        : ownTheme;
+    const etag = fingerprint([
+        rows.branding ?? null,
+        rows.legacyName ?? null,
+        rows.logos ?? null,
+        rows.theme ?? null,
+        rows.scope ?? "own",
+        inherited ? inherited.etag : packageBrandingCacheToken(packageBranding),
+        inherited ? null : (input.deploymentName ?? null),
+        inherited ? null : (input.defaultName ?? null),
+    ]);
+    return {
+        v: 1,
+        etag,
+        name,
+        description,
+        icon,
+        logos,
+        ...(blurhash ? { blurhash } : {}),
+        theme,
+    };
+}
+// ─── AppInfo bridge ───────────────────────────────────────────────────────
+/** The legacy `AppInfo` shape (`resolveAppInfo`'s output) of an identity. */
+export function toAppInfo(identity) {
+    return {
+        name: identity.name.value,
+        ...(identity.description.value !== undefined ? { description: identity.description.value } : {}),
+        ...(identity.icon.value ? { icon: identity.icon.value } : {}),
+    };
+}
+/**
+ * Wrap an `AppInfo` a host resolved on its own (no per-field origins available) as an
+ * identity. Labelled `"deployment"`: it is host/deployment-supplied, and must never
+ * read as instance-configured.
+ */
+export function identityFromAppInfo(appInfo) {
+    return {
+        v: 1,
+        etag: fingerprint(["appInfo", appInfo.name, appInfo.description ?? null, appInfo.icon ?? null]),
+        name: { value: appInfo.name, from: "deployment" },
+        description: appInfo.description !== undefined
+            ? { value: appInfo.description, from: "deployment" }
+            : { from: "default" },
+        icon: appInfo.icon !== undefined ? { value: appInfo.icon, from: "deployment" } : { from: "default" },
+        logos: {},
+        theme: { value: formatThemeForOutput({}), from: "default" },
+    };
+}
+/**
+ * Read the requested identity rows of `instanceDid` (one `getSetting` per field, in
+ * parallel). The caller owns the scope decision — which instance's rows answer this
+ * request — and says so via `scope`.
+ */
+export async function readInstanceIdentityRows(store, instanceDid, fields, scope = "own") {
+    const values = await Promise.all(fields.map((f) => store.getSetting(instanceDid, IDENTITY_SETTING_KEYS[f])));
+    const rows = {};
+    fields.forEach((f, i) => {
+        rows[f] = values[i] ?? null;
+    });
+    rows.scope = scope;
+    return rows;
+}
+/**
+ * The requested identity rows out of an already-loaded settings map (e.g. from
+ * `listSettings`). Pass `fields` explicitly: a surface that does not honor a layer
+ * (e.g. legacy `app:name`) must not receive it just because the map happens to hold it.
+ */
+export function instanceIdentityRowsFromSettings(settings, fields = ["branding", "legacyName", "logos", "theme"], scope = "own") {
+    const rows = {};
+    for (const f of fields)
+        rows[f] = settings?.get(IDENTITY_SETTING_KEYS[f]) ?? null;
+    rows.scope = scope;
+    return rows;
+}
+/**
+ * The `scope` of rows read from `readInstanceDid`, given the instance the HOST asserted
+ * for this request — the route-context `instanceDid`, or `X-Instance-Did` only on an
+ * embedded host that opted in with `trustInstanceHeader` (the same signal that decides
+ * branding scope; never a raw client header).
+ *
+ *   - nothing asserted (root / control-plane request, single-tenant) → `"own"`
+ *   - asserted X and the rows are X's → `"own"`
+ *   - asserted X but the rows are another scope's (or no scope) → `"fallback"`
+ */
+export function identityScopeFor(readInstanceDid, assertedInstanceDid) {
+    if (!assertedInstanceDid)
+        return "own";
+    return readInstanceDid && sameInstance(readInstanceDid, assertedInstanceDid) ? "own" : "fallback";
+}
+/** did:abt: prefix and bare address name the same instance; opaque keys compare exactly. */
+function sameInstance(a, b) {
+    const bare = (v) => (v.startsWith("did:abt:") ? v.slice("did:abt:".length) : v);
+    return bare(a) === bare(b);
+}
+// ─── Logo slot resolution ─────────────────────────────────────────────────
+const LOGO_FALLBACK_CHAINS = {
+    square: ["square"],
+    squareDark: ["squareDark", "square"],
+    rect: ["rect", "square"],
+    rectDark: ["rectDark", "squareDark", "rect", "square"],
+    favicon: ["favicon", "square"],
+    splashPortrait: ["splashPortrait"],
+    splashLandscape: ["splashLandscape"],
+    ogImage: ["ogImage"],
+};
+/** The slots a logo type falls back through, most specific first. */
+export function logoFallbackChain(type) {
+    return LOGO_FALLBACK_CHAINS[type] ?? [type];
+}
+/**
+ * The slot that answers `type`: the FIRST configured slot along its fallback chain.
+ * That slot decides — a miss on its bytes serves the generated fallback, it does not
+ * continue down the chain.
+ */
+export function resolveLogoSlot(identity, type) {
+    for (const slot of logoFallbackChain(type)) {
+        const hit = identity.logos[slot];
+        if (hit)
+            return { slot: slot, ...hit };
+    }
+    return null;
+}
+/** `resolveAppInfo`'s historical signature, now a view over {@link resolveAppIdentity}. */
+export function resolveAppInfo(params) {
+    return toAppInfo(resolveAppIdentity({
+        instance: { branding: params.brandingRaw, legacyName: params.legacyAppName },
+        packageBranding: params.packageBranding,
+        deploymentName: params.deploymentName,
+    }));
+}
+//# sourceMappingURL=app-identity.js.map

package/dist/app-identity.js.map

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

package/dist/blocklet-service-rpc-types.d.ts

@@ -30,6 +30,12 @@ export interface MemberWithUserInfoDTO extends StoredMembershipDTO {
     avatar?: string;
     approved: number;
 }
+/** Mention search hit. No email, phone, or credential fields. */
+export interface PublicMemberDTO {
+    did: string;
+    fullName: string | null;
+    avatar: string | null;
+}
 export interface StoredUserDTO {
     did: string;
     pk: string;
@@ -124,6 +130,12 @@ export interface BlockletServiceRPCInterface {
     /** Membership count without materialising the list — for `stat`-shaped callers. */
     countMemberships(instanceDid: string): Promise<number>;
     listMembershipsWithUserInfo(instanceDid: string): Promise<MemberWithUserInfoDTO[]>;
+    /**
+     * Approved members of one instance whose fullName contains `query` or whose
+     * DID starts with it. Blank query returns []. `limit` is capped at 10.
+     * Authorization is the caller's job; this never returns email or other secrets.
+     */
+    searchMembersPublic(instanceDid: string, query: string, limit: number): Promise<PublicMemberDTO[]>;
     createMembership(userDid: string, instanceDid: string, role: string, invitedBy?: string): Promise<void>;
     updateMembershipRole(userDid: string, instanceDid: string, role: string): Promise<void>;
     deleteMembership(userDid: string, instanceDid: string): Promise<void>;

package/dist/blocklet-service-rpc-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocklet-service-rpc-types.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC9C,UAAU,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,YAAY,GAAG,OAAO,GAAG,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yGAAyG;IACzG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,iFAAiF;AACjF,MAAM,MAAM,cAAc,GACtB;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC;AAIrC,MAAM,WAAW,2BAA2B;IAG1C,oDAAoD;IACpD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAEvD;wFACoF;IACpF,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAEjF,2CAA2C;IAC3C,eAAe,CACb,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAErC,4DAA4D;IAC5D,aAAa,CACX,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CACN;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAA;KAAE,GACnD;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAA;KAAE,CACxC,CAAC;IAKF,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IACzF,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACrE,mFAAmF;IACnF,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACnF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAGhE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACrE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACxG,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAG/D,uBAAuB,CACrB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC;QAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAG1D,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC7E,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAKzD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IACzD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC7D,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9G,UAAU,CAAC,MAAM,EAAE;QACjB,GAAG,EAAE,MAAM,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAG1E,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC7F,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAG3C,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEzE;;;;;;;OAOG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE7E,qHAAqH;IACrH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEtD,uFAAuF;IACvF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAM1F,+EAA+E;IAC/E,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChE,sFAAsF;IACtF,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7E,oCAAoC;IACpC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,2CAA2C;IAC3C,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3D"}
+{"version":3,"file":"blocklet-service-rpc-types.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc-types.ts"],"names":[],"mappings":"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"}