chore: Wrangle various usages of create/open session, and rename to better match their purpose.

Author: jsantell

background-charm-service/cast-admin.ts

@@ -7,7 +7,7 @@ import {
   storage,
 } from "@commontools/runner";
 import { type DID, Identity } from "@commontools/identity";
-import { openSession } from "@commontools/identity";
+import { createAdminSession } from "@commontools/identity";
 import {
   bgUpdaterCharmsSchema,
   CELL_CAUSE,
@@ -37,7 +37,10 @@ if (!recipePath) {
 const toolshedUrl = Deno.env.get("TOOLSHED_API_URL") ??
   "https://toolshed.saga-castor.ts.net/";
 
-const identity = await getIdentity(Deno.env.get("IDENTITY"), Deno.env.get("OPERATOR_PASS"));
+const identity = await getIdentity(
+  Deno.env.get("IDENTITY"),
+  Deno.env.get("OPERATOR_PASS"),
+);
 
 storage.setRemoteStorage(new URL(toolshedUrl));
 setBobbyServerUrl(toolshedUrl);
@@ -89,7 +92,7 @@ async function castRecipe() {
     console.log("Casting recipe...");
 
     // Create session and charm manager (matching main.ts pattern)
-    const session = await openSession({
+    const session = await createAdminSession({
       identity,
       name: "recipe-caster",
       space: spaceId as DID,

background-charm-service/src/worker.ts

@@ -9,10 +9,10 @@ import {
   storage,
 } from "@commontools/runner";
 import {
+  createAdminSession,
   type DID,
   Identity,
   KeyPairRaw,
-  openSession,
 } from "@commontools/identity";
 
 let initialized = false;
@@ -58,7 +58,7 @@ async function setup(
 
   // Initialize session
   spaceId = did as DID;
-  currentSession = await openSession({
+  currentSession = await createAdminSession({
     identity,
     name: "~background-service-worker",
     space: spaceId,

cli/cast-recipe.ts

@@ -6,7 +6,7 @@ import {
   setBobbyServerUrl,
   storage,
 } from "@commontools/runner";
-import { type DID, Identity, openSessionFromPassphrase } from "@commontools/identity";
+import { createAdminSession, type DID, Identity } from "@commontools/identity";
 
 const { spaceId, targetCellCause, recipePath, cause, name, quit } = parseArgs(
   Deno.args,
@@ -64,8 +64,8 @@ async function castRecipe() {
     console.log("Recipe compiled successfully");
 
     // Create session and charm manager (matching main.ts pattern)
-    const session = await openSessionFromPassphrase({
-      passphrase: OPERATOR_PASS,
+    const session = await createAdminSession({
+      identity: signer,
       name: name!,
       space: spaceId as DID,
     });

cli/main.ts

@@ -7,7 +7,7 @@ import {
   setBobbyServerUrl,
   storage,
 } from "@commontools/runner";
-import { createSessionFromPassphrase } from "@commontools/identity";
+import { createSession, Identity } from "@commontools/identity";
 
 const { name, charmId, recipeFile, cause, quit } = parseArgs(Deno.args, {
   string: ["name", "charmId", "recipeFile", "cause"],
@@ -24,8 +24,9 @@ storage.setRemoteStorage(new URL(toolshedUrl));
 setBobbyServerUrl(toolshedUrl);
 
 async function main() {
-  const session = await createSessionFromPassphrase({
-    passphrase: OPERATOR_PASS,
+  const identity = await Identity.fromPassphrase(OPERATOR_PASS);
+  const session = await createSession({
+    identity,
     name: name!,
   });
 

identity/src/index.ts

@@ -2,4 +2,4 @@ export { PassKey } from "./pass-key.ts";
 export { Identity, VerifierIdentity } from "./identity.ts";
 export { KeyStore } from "./key-store.ts";
 export * from "./interface.ts";
-export { createSession, openSession, createSessionFromPassphrase, openSessionFromPassphrase, type Session } from "./session.ts";
+export { createAdminSession, createSession, type Session } from "./session.ts";

identity/src/session.ts

@@ -9,46 +9,22 @@ export type Session = {
   as: Identity;
 };
 
-export const openSessionFromPassphrase = async (
-  { passphrase, space, name }: {
-    passphrase: string;
-    space: DID;
-    name: string;
-  },
-) => ({
-  private: name.startsWith("~"),
-  name,
-  space,
-  as: await Identity.fromPassphrase(passphrase),
-});
-
-export const createSessionFromPassphrase = async (
-  { passphrase, name }: { passphrase: string; name: string },
-) => {
-  const account = await Identity.fromPassphrase(passphrase);
-  const space = await account.derive(name);
-
-  return {
-    private: name.startsWith("~"),
-    name,
-    space: space.did(),
-    as: space,
-  };
-};
-
-export const openSession = async (
+// Create a session where `Identity` is used directly and not derived.
+export const createAdminSession = async (
   { identity, space, name }: {
     identity: Identity;
     space: DID;
     name: string;
   },
-) => await ({
-  private: name.startsWith("~"),
-  name,
-  space,
-  as: identity,
-});
+) =>
+  await ({
+    private: name.startsWith("~"),
+    name,
+    space,
+    as: identity,
+  });
 
+// Create a session where `Identity` is used to derive a space key.
 export const createSession = async (
   { identity, name }: { identity: Identity; name: string },
 ) => {