@x1id/resolve 0.13.0 → 0.14.0

package/dist/index.js

@@ -100,8 +100,8 @@ const SUBNAME_RESERVED_SUFFIXES = new Set([
  * name (owner-approved disambiguation order: subname before scoped-TLD). The
  * shape is a single interior dot with non-empty halves, a `parent` that is not
  * a reserved suffix, and a `label` with no further dot (a deeper `a.b.c` is
- * sub-subname territory the one-level program does not support → stays
- * `unrecognized`). Whether `@parent` is actually a registered handle is a chain
+ * sub-subname territory handled by {@link subSubnameCandidate}, NOT a one-level
+ * subname). Whether `@parent` is actually a registered handle is a chain
  * fact the resolver establishes separately. Both halves are normalized for real
  * at resolve; a parent that cannot be a handle (e.g. > 32 bytes) simply fails
  * the registration check and falls through to the scoped path.
@@ -116,11 +116,36 @@ function subnameCandidate(input) {
     const label = t.slice(0, dot);
     const parent = t.slice(dot + 1);
     if (label.includes("."))
-        return null; // a.b.c — a true sub-subname, unsupported
+        return null; // a.b.c — a sub-subname (see subSubnameCandidate)
     if (SUBNAME_RESERVED_SUFFIXES.has(parent))
         return null; // never conflate with X1NS / external
     return { label, parent };
 }
+/**
+ * Classify `input` as a `leaf.mid.root` SUB-SUBNAME candidate by SHAPE ONLY (no
+ * chain read) — a THIRD naming level (#7375 two-level), `deep.pay.jack`: a
+ * sub-subname `leaf` under a subname `mid.root` under the handle `@root`. Shape:
+ * EXACTLY three dot-separated non-empty segments, no leading `@`, and a `root`
+ * (last) segment that is not a reserved suffix (so `a.b.sol`/`a.b.x1` stay with
+ * the X1NS / universal path, never a native sub-subname). FOUR or more segments
+ * → `null` (the program is two levels deep only). Whether `@root` is a
+ * registered handle and `mid.root` a live subname are chain facts the resolver
+ * establishes separately ({@link Resolver.resolve}'s `resolveSubSubname`).
+ */
+function subSubnameCandidate(input) {
+    const t = input.trim().toLowerCase();
+    if (!t || t.startsWith("@"))
+        return null;
+    const parts = t.split(".");
+    if (parts.length !== 3)
+        return null; // exactly three segments; 4+ → not a sub-subname
+    const [leaf, mid, root] = parts;
+    if (!leaf || !mid || !root)
+        return null; // no empty segment (e.g. `a..c`, `.a.b`)
+    if (SUBNAME_RESERVED_SUFFIXES.has(root))
+        return null; // never conflate with X1NS / external
+    return { leaf, mid, root };
+}
 // `Primary` pointer account (`["primary", owner]` under the registry):
 //   disc(8) | owner(32) | handle(32) | set_at(i64 LE, 8) | bump(1) = 81 bytes
 const PRIMARY_LEN = 81;
@@ -460,6 +485,156 @@ export function createResolver(config) {
         }
         return value;
     }
+    /**
+     * Resolve a `leaf.mid.root` SUB-SUBNAME (#7375 two-level, owner decision
+     * 2026-09-24) — a sub-subname `leaf` under a subname `mid.root` under the
+     * handle `@root`, e.g. `deep.pay.jack`. Called ONLY for an exactly-3-segment,
+     * non-`@`, non-X1NS input (the native parser's `unrecognized` fall-through).
+     *
+     * Returns `null` — the signal to fall through to `unrecognized` — when the
+     * input was never a sub-subname at all: `@root` is NOT a registered handle,
+     * or there is no `mid` subname account under it. Those cases are "this 3-dot
+     * name is not one of ours", not an error. Once the `mid` subname ACCOUNT
+     * exists we are COMMITTED: every outcome is a `Resolved` or a throw
+     * (`not-found` / `no-record-for-chain`), never a fall-through and never a
+     * wrong address.
+     *
+     * A sub-subname has NO owner (like every subname); it resolves PURELY through
+     * its per-chain `Record`s, EVERY chain included. ALL THREE staleness layers of
+     * docs/record-trust.md (generalized to three levels — see app's subSubname.ts)
+     * are enforced:
+     *   1. `mid.createdAt >= root.registeredAt` — the level-2 subname belongs to
+     *      the handle's CURRENT owner (the subname scan's `.live` flag). A `mid`
+     *      stranded by a parent transfer/re-registration → `not-found`.
+     *   2. `leaf.createdAt >= mid.createdAt` — the sub-subname belongs to the
+     *      CURRENT incarnation of its immediate parent subname (that PDA is reused
+     *      across revoke + re-create). The second scan's `.live` flag, re-checked
+     *      inside `resolveSubnameRecords`.
+     *   3. `record.updatedAt >= leaf.createdAt` — the record belongs to the
+     *      CURRENT incarnation of the sub-subname itself (ordinary record staleness
+     *      with the leaf's `createdAt` as the epoch).
+     * Nothing is hand-derived: both levels are located by the program-scoped
+     * `getProgramAccounts` scan (`fetchSubnames`, which IS the ownership check),
+     * the mid subname's pubkey standing in for the parent at the lower level — the
+     * same account type and formula, one level deeper.
+     */
+    async function resolveSubSubname(leafRaw, midRaw, rootRaw, chain, input) {
+        // The root half must canonicalize as a handle; if it cannot, `@root` can
+        // never be a registered handle → not a sub-subname, fall through.
+        let rootCanonical;
+        try {
+            rootCanonical = normalizeHandle(rootRaw);
+        }
+        catch {
+            return null;
+        }
+        // The mid + leaf halves must also canonicalize as handle labels. Defer a
+        // non-canonical verdict until the branch (mid-account existence) is decided,
+        // exactly as `resolveSubname` defers its `subLabel`.
+        let midLabel = null;
+        let leafLabel = null;
+        try {
+            midLabel = normalizeHandle(midRaw);
+        }
+        catch {
+            midLabel = null;
+        }
+        try {
+            leafLabel = normalizeHandle(leafRaw);
+        }
+        catch {
+            leafLabel = null;
+        }
+        if (midLabel !== null && leafLabel !== null && ttl > 0) {
+            const hit = cache.get(`subsubname:${rootCanonical}:${midLabel}:${leafLabel}:${chain}`);
+            if (hit && hit.expires > Date.now())
+                return hit.value;
+        }
+        // Is `@root` a REGISTERED handle? If not, `a.b.c` was never a sub-subname.
+        // `not-found`/`invalid-handle` → fall through; a real error propagates.
+        let root;
+        try {
+            root = await fetchHandle(rootCanonical, input);
+        }
+        catch (e) {
+            if (e instanceof ResolveError && (e.code === "not-found" || e.code === "invalid-handle")) {
+                return null;
+            }
+            throw e;
+        }
+        // A non-canonical mid can never match a stored subname label → not a
+        // sub-subname (fall through), same as a missing mid account below.
+        if (midLabel === null)
+            return null;
+        // Locate the level-2 (mid) subname under the handle. Its EXISTENCE (a label
+        // match) is the COMMIT POINT: a missing mid subname means `a.b.c` names
+        // nothing of ours → fall through to `unrecognized`; a mid subname that
+        // EXISTS is the point of no return. `fetchSubnames` flags each `.live`
+        // against `root.registeredAt` — staleness LAYER 1.
+        const subs = await fetchSubnames(rpc, programBase58, root.pda, root.handle.registeredAt);
+        const mid = subs.find((s) => s.label === midLabel);
+        if (!mid)
+            return null; // no such mid subname → unrecognized
+        // COMMITTED to the sub-subname interpretation from here.
+        const leafDisplay = leafLabel ?? leafRaw.trim().toLowerCase();
+        const display = `${leafDisplay}.${midLabel}.${rootCanonical}`;
+        const midDisplay = `${midLabel}.${rootCanonical}`;
+        // Staleness LAYER 1 — a mid subname stranded by a parent transfer/
+        // re-registration belongs to a PREVIOUS owner; nothing under it may resolve.
+        if (!mid.live) {
+            throw new ResolveError("not-found", `${midDisplay} was created before the current @${rootCanonical} registration — ${display} belongs to a previous owner`, input);
+        }
+        if (leafLabel === null) {
+            throw new ResolveError("not-found", `"${input.trim()}" is not a sub-subname of ${midDisplay}`, input);
+        }
+        // Locate the level-3 (leaf) sub-subname under the mid subname — the SAME
+        // program scan + `Subname` account type, the mid subname's pubkey standing
+        // in for the parent and its `createdAt` for `parentRegisteredAt`. The
+        // resulting `.live` flag is staleness LAYER 2 (leaf.createdAt >= mid.createdAt).
+        const subsubs = await fetchSubnames(rpc, programBase58, mid.account, mid.createdAt);
+        const leaf = subsubs.find((s) => s.label === leafLabel);
+        if (!leaf) {
+            throw new ResolveError("not-found", `${display} is not a sub-subname of ${midDisplay}`, input);
+        }
+        // Staleness LAYER 2 — a leaf stranded by its parent subname being revoked +
+        // re-created belongs to a previous incarnation and must never resolve.
+        if (!leaf.live) {
+            throw new ResolveError("not-found", `${display} was created before the current ${midDisplay} subname — it belongs to a previous incarnation`, input);
+        }
+        // Read the leaf's LIVE records. `resolveSubnameRecords` re-applies LAYER 2
+        // (leaf.createdAt >= mid.createdAt) AND LAYER 3 (record.updatedAt >=
+        // leaf.createdAt), dropping any stale record — the only safe entry point.
+        const leafSubname = {
+            parent: leaf.parent,
+            label: leaf.label,
+            createdAt: leaf.createdAt,
+            bump: leaf.bump,
+        };
+        const records = await resolveSubnameRecords(rpc, programBase58, leaf.account, leafSubname, mid.createdAt);
+        const record = records.find((r) => !r.stale && r.coinType === CHAIN_COIN_TYPE[chain]);
+        if (!record) {
+            throw new ResolveError("no-record-for-chain", `${display} has no ${chain} record`, input);
+        }
+        const value = {
+            input,
+            name: display,
+            // A sub-subname is its own namespace — never "handle", "subname", or the
+            // root's — so a consumer branching on the namespace treats it distinctly.
+            namespace: "sub-subname",
+            address: record.address,
+            chain,
+            // Like a subname record: `unverified` unless the record itself is
+            // co-signed (sub-subname records are always unverified on chain in v1).
+            verification: record.verified ? "verified" : "unverified",
+        };
+        if (ttl > 0) {
+            cache.set(`subsubname:${rootCanonical}:${midLabel}:${leafLabel}:${chain}`, {
+                value,
+                expires: Date.now() + ttl,
+            });
+        }
+        return value;
+    }
     /** See `Resolver.records`. */
     async function records(input) {
         const parsed = parseName(input); // throws with a specific code
@@ -477,12 +652,17 @@ export function createResolver(config) {
         }
         catch (e) {
             // A dotted, non-`@`, non-X1NS name is `unrecognized` to the strict native
-            // parser — but it MAY be a SUBNAME `label.parent` (#7375) or a scoped
-            // customer-TLD name `name.tld` (#8484/#8485). Owner-approved
-            // disambiguation order: try the subname interpretation FIRST (when
-            // `@parent` is a registered handle), then the scoped path. Each re-throws
-            // / falls through so `.sol`/`.eth`/unknown TLDs behave exactly as before.
-            // Any other code (ambiguous / invalid-*) is preserved verbatim.
+            // parser — but it MAY be a one-level SUBNAME `label.parent` (#7375), a
+            // two-level SUB-SUBNAME `leaf.mid.root` (#7375 two-level, 3 segments), or
+            // a scoped customer-TLD name `name.tld` (#8484/#8485). Owner-approved
+            // disambiguation order: the subname interpretation FIRST (when `@parent`
+            // is a registered handle), then the sub-subname interpretation (when
+            // `@root` is a registered handle AND `mid.root` an existing subname), then
+            // the scoped path. `subnameCandidate`/`scopedTldCandidate` are both
+            // 2-segment-only and `subSubnameCandidate` is 3-segment-only, so each
+            // input matches at most one; each re-throws / falls through so
+            // `.sol`/`.eth`/unknown TLDs behave exactly as before. Any other code
+            // (ambiguous / invalid-*) is preserved verbatim.
             if (e instanceof ResolveError && e.code === "unrecognized") {
                 const sub = subnameCandidate(input);
                 if (sub) {
@@ -493,6 +673,15 @@ export function createResolver(config) {
                     if (resolved !== null)
                         return resolved;
                 }
+                const subsub = subSubnameCandidate(input);
+                if (subsub) {
+                    // `null` ⇒ `@root` is not a handle, or `mid.root` is not a subname ⇒
+                    // not a sub-subname; fall through to `unrecognized`. A committed
+                    // sub-subname path either returns a `Resolved` or throws.
+                    const resolved = await resolveSubSubname(subsub.leaf, subsub.mid, subsub.root, chain, input);
+                    if (resolved !== null)
+                        return resolved;
+                }
                 const cand = scopedTldCandidate(input);
                 if (cand)
                     return resolveScoped(cand.sub, cand.tld, chain, input);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x1id/resolve",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Resolve @handles and X1NS names on X1. Never silently picks between namespaces.",
   "type": "module",
   "main": "./dist/index.js",