@inixiative/archive 0.9.0 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inixiative/archive",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -35,7 +35,7 @@
     "prepare": "if git rev-parse --git-dir >/dev/null 2>&1; then lefthook install; fi && prisma generate"
   },
   "dependencies": {
-    "@inixiative/signet": "^0.2.1",
+    "@inixiative/signet": "^0.3.0",
     "@prisma/client": "^6.6.0",
     "js-tiktoken": "1.0.21",
     "prisma": "^6.6.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.2",
-    "@inixiative/config": "^0.5.55",
+    "@inixiative/config": "^0.5.62",
     "@types/bun": "1.4.2",
     "lefthook": "2.1.9",
     "typescript": "6.0.3"

package/src/cli.ts

@@ -192,6 +192,8 @@ export async function runCli(args = Bun.argv.slice(2)) {
         sourceId: await local.sourceId(),
         directory: join(home, 'kingdom'),
         onReview: (review) => console.error(JSON.stringify(review)),
+        onError: (error) =>
+          console.error(`Still waiting: ${error instanceof Error ? error.message : String(error)}`),
         confirmOwner: async ({ ownerName }) => {
           if (v.yes) return true;
           if (!process.stdin.isTTY)

package/src/kingdom.ts

@@ -1,20 +1,6 @@
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
-import {
-  collectSignet,
-  generateSignetKey,
-  installationInquiries,
-  kingdomUrl,
-  registerInstallation,
-  requestRegistration,
-  SignetClient,
-  saveCollectedSignet,
-  writePrivateJson,
-} from '@inixiative/signet';
+import { pairInstallation, SignetClient } from '@inixiative/signet';
 import type { ArchiveDestination } from './config';
 
-const pollMs = 3000;
-
 /** Libraries this Archive's Signet may write to, as Kingdom describes them. */
 export async function writableLibraries(credentialFile: string) {
   const description = await (await SignetClient.fromFile(credentialFile)).describe();
@@ -36,74 +22,42 @@ type Pairing = {
   directory: string;
   onReview: (review: { reviewCode: string; review: string; expiresAt: string }) => void;
   confirmOwner: (owner: { ownerName: string | null; owner: unknown }) => Promise<boolean>;
-  sleep?: (ms: number) => Promise<unknown>;
+  onError?: (error: unknown) => void;
+  socketOptions?: { pollMs?: number; retryBaseMs?: number; authTimeoutMs?: number };
 };
 
-/** The key that names this Archive to one Kingdom; reused for every owner it registers with. */
-async function installationKey(directory: string) {
-  const keyFile = join(directory, 'installation-key.json');
-  if (!existsSync(keyFile)) await writePrivateJson(keyFile, generateSignetKey());
-  return keyFile;
-}
-
 /**
- * Registers this Archive with Kingdom as an Installation and asks to become an owner's local
- * Archive integration. A person claims the review code in Kingdom; once approved, the Archive
- * confirms the owner locally before collecting its Signet.
+ * Pairs this Archive with Kingdom as an Installation: a person claims the review code, the Archive
+ * confirms the owner locally, then collects the Signet for its local Archive integration.
  */
 export async function pairWithKingdom(input: Pairing) {
-  const kingdom = kingdomUrl(input.kingdom);
-  const directory = join(input.directory, new URL(kingdom).host);
-  const keyFile = await installationKey(directory);
-  await registerInstallation(kingdom, keyFile, {
+  const paired = await pairInstallation({
+    url: input.kingdom,
+    root: input.directory,
     kind: 'archive',
     name: input.name,
     sourceId: input.sourceId,
+    terms: {
+      name: input.name,
+      lifecycle: 'ongoing',
+      resources: [],
+      expiresAt: null,
+      maxRequests: null,
+      maxConcurrent: 4,
+    },
+    onReview: input.onReview,
+    confirmOwner: input.confirmOwner,
+    onError: input.onError,
+    socketOptions: input.socketOptions,
   });
-  const askedAt = Date.now();
-  const pending = await requestRegistration(kingdom, keyFile, {
-    name: input.name,
-    lifecycle: 'ongoing',
-    resources: [],
-    expiresAt: null,
-    maxRequests: null,
-    maxConcurrent: 4,
-  });
-  input.onReview({
-    reviewCode: pending.reviewCode,
-    review: `${kingdom}/dashboard?reviewSignet=${pending.reviewCode}`,
-    expiresAt: pending.expiresAt,
-  });
-  const sleep = input.sleep ?? Bun.sleep;
-  for (;;) {
-    const state = await installationInquiries(kingdom, keyFile);
-    if (state.declinedAt && Date.parse(state.declinedAt) >= askedAt)
-      throw new Error('The registration was declined in Kingdom');
-    const inquiry = state.inquiries.find(
-      (item) => item.type === 'registerIntegration' && Date.parse(item.createdAt) >= askedAt,
-    );
-    if (inquiry?.status === 'approved') {
-      if (!(await input.confirmOwner({ ownerName: inquiry.ownerName, owner: inquiry.owner })))
-        throw new Error('Not collected: the owner was not confirmed');
-      const collected = await collectSignet(kingdom, keyFile, inquiry.id);
-      if (!collected) throw new Error('Kingdom has not released the Signet yet; try again');
-      const credentialFile = join(directory, `signet-${collected.signetId}.json`);
-      await saveCollectedSignet(credentialFile, kingdom, keyFile, collected);
-      return {
-        paired: true,
-        owner: inquiry.ownerName,
-        integrationId: collected.integrationId,
-        credentialFile,
-        libraries: await writableLibraries(credentialFile),
-        next: 'archive connect --kind kingdom --url KINGDOM --credential-file FILE --integration-id ID --resource-id ID --project-id PROJECT',
-      };
-    }
-    if (inquiry && inquiry.status !== 'sent')
-      throw new Error(`The registration was ${inquiry.status} in Kingdom`);
-    if (!inquiry && !state.pending)
-      throw new Error('The review code expired before it was claimed; run archive pair again');
-    await sleep(pollMs);
-  }
+  return {
+    paired: true,
+    owner: paired.ownerName,
+    integrationId: paired.integrationId,
+    credentialFile: paired.credentialFile,
+    libraries: await writableLibraries(paired.credentialFile),
+    next: 'archive connect --kind kingdom --url KINGDOM --credential-file FILE --integration-id ID --resource-id ID --project-id PROJECT',
+  };
 }
 
 export async function verifyKingdomDestination(