@dxos/plugin-client 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/dist/lib/browser/cli/index.mjs

@@ -1,16 +1,11 @@
-import {
-  Client,
-  OperationResolver,
-  SchemaDefs
-} from "../chunk-F7H2Y3Z2.mjs";
-import {
-  ClientEvents,
-  ClientOperation,
-  meta
-} from "../chunk-4BZGRIFS.mjs";
+import "../chunk-J5LGTIGS.mjs";
 
 // src/cli/plugin.ts
-import { Capability, Common as Common3, Plugin as Plugin2 } from "@dxos/app-framework";
+import { ActivationEvents, Capability, Plugin as Plugin2 } from "@dxos/app-framework";
+import { AppActivationEvents, AppPlugin } from "@dxos/app-toolkit";
+import { Client, OperationHandler, SchemaDefs } from "#capabilities";
+import { meta } from "#meta";
+import { ClientEvents } from "#types";
 
 // src/cli/commands/config/index.ts
 import * as Command2 from "@effect/cli/Command";
@@ -22,12 +17,15 @@ import * as Effect from "effect/Effect";
 import * as Yaml from "yaml";
 import { CommandConfig } from "@dxos/cli-util";
 import { ConfigService } from "@dxos/client";
+import { DX_CONFIG, getProfileConfigPath } from "@dxos/client-protocol";
 var view = Command.make("view", {}, Effect.fnUntraced(function* () {
   const config2 = yield* ConfigService;
-  const { json } = yield* CommandConfig;
+  const { json, profile: profile2 } = yield* CommandConfig;
+  const configPath = getProfileConfigPath(DX_CONFIG, profile2);
   if (json) {
     yield* Console.log(JSON.stringify(config2.values, null, 2));
   } else {
+    yield* Console.log(`Path: ${configPath}`);
     yield* Console.log(Yaml.stringify(config2.values));
   }
 }));
@@ -86,7 +84,6 @@ var printDevices = (devices) => {
 var handler = Effect2.fn(function* () {
   const { json } = yield* CommandConfig2;
   const client = yield* ClientService;
-  yield* Effect2.tryPromise(() => client.spaces.waitUntilReady());
   const device2 = client.halo.device;
   if (!device2) {
     if (json) {
@@ -122,7 +119,6 @@ import { ClientService as ClientService2 } from "@dxos/client";
 var handler2 = Effect3.fn(function* () {
   const { json } = yield* CommandConfig3;
   const client = yield* ClientService2;
-  yield* Effect3.tryPromise(() => client.spaces.waitUntilReady());
   const devices = client.halo.devices.get();
   if (json) {
     yield* Console3.log(JSON.stringify(mapDevices(devices), null, 2));
@@ -144,7 +140,6 @@ import { ClientService as ClientService3 } from "@dxos/client";
 var handler3 = Effect4.fn(function* ({ label }) {
   const { json } = yield* CommandConfig4;
   const client = yield* ClientService3;
-  yield* Effect4.tryPromise(() => client.spaces.waitUntilReady());
   const device2 = client.halo.device;
   if (!device2) {
     if (json) {
@@ -203,11 +198,16 @@ import * as Option from "effect/Option";
 import { CommandConfig as CommandConfig5 } from "@dxos/cli-util";
 import { ClientService as ClientService4 } from "@dxos/client";
 import { createEdgeIdentity } from "@dxos/client/edge";
+import { Context } from "@dxos/context";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/edge/status.ts";
 var getStatus = () => Effect5.gen(function* () {
   const client = yield* ClientService4;
   const identity2 = createEdgeIdentity(client);
-  client.edge.setIdentity(identity2);
-  const status2 = yield* Effect5.tryPromise(() => client.edge.getStatus());
+  client.edge.http.setIdentity(identity2);
+  const status2 = yield* Effect5.tryPromise(() => client.edge.http.getStatus(Context.default(void 0, {
+    F: __dxlog_file,
+    L: 20
+  })));
   if (yield* CommandConfig5.isJson) {
     yield* Console5.log(JSON.stringify(status2, null, 2));
   } else if (status2.problems.length > 0) {
@@ -243,11 +243,14 @@ import * as Options2 from "@effect/cli/Options";
 import * as Console6 from "effect/Console";
 import * as Effect6 from "effect/Effect";
 import * as Option2 from "effect/Option";
-import { Common, Plugin } from "@dxos/app-framework";
+import { Capabilities, Plugin } from "@dxos/app-framework";
 import { CommandConfig as CommandConfig6, flushAndSync, spaceLayer } from "@dxos/cli-util";
 import { print as print3 } from "@dxos/cli-util";
 import { ClientService as ClientService5 } from "@dxos/client";
 import { invariant } from "@dxos/invariant";
+import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
+import { MembershipPolicy } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { ClientOperation } from "#operations";
 
 // src/cli/commands/halo/util.ts
 import { FormBuilder as FormBuilder2 } from "@dxos/cli-util";
@@ -256,13 +259,13 @@ var printIdentity = (identity2) => FormBuilder2.make({
 }).pipe(FormBuilder2.set("identityKey", identity2.identityKey.truncate()), FormBuilder2.set("displayName", identity2.profile?.displayName ?? "<none>"), FormBuilder2.build);
 
 // src/cli/commands/halo/create/create.ts
-var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/create/create.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/create/create.ts";
 var handler4 = Effect6.fn(function* ({ agent, displayName }) {
   const { json } = yield* CommandConfig6;
   const client = yield* ClientService5;
   invariant(!client.halo.identity.get(), "Identity already exists", {
-    F: __dxlog_file,
-    L: 30,
+    F: __dxlog_file2,
+    L: 32,
     S: this,
     A: [
       "!client.halo.identity.get()",
@@ -270,16 +273,23 @@ var handler4 = Effect6.fn(function* ({ agent, displayName }) {
     ]
   });
   const manager = yield* Plugin.Service;
-  const { invoke } = manager.capabilities.get(Common.Capability.OperationInvoker);
+  const { invoke } = manager.capabilities.get(Capabilities.OperationInvoker);
   const identity2 = yield* invoke(ClientOperation.CreateIdentity, {
     displayName: Option2.getOrUndefined(displayName)
   });
   if (agent) {
     yield* invoke(ClientOperation.CreateAgent);
   }
-  yield* Effect6.promise(() => client.spaces.waitUntilReady());
-  yield* Effect6.promise(() => client.spaces.default.waitUntilReady());
-  const space = client.spaces.default;
+  const { PERSONAL_SPACE_TAG, setPersonalSpace } = yield* Effect6.tryPromise(() => import("@dxos/app-toolkit"));
+  const space = yield* Effect6.promise(() => client.spaces.create({}, {
+    tags: [
+      PERSONAL_SPACE_TAG
+    ],
+    membershipPolicy: MembershipPolicy.LOCKED
+  }));
+  yield* Effect6.promise(() => space.waitUntilReady());
+  yield* Effect6.promise(() => space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED));
+  setPersonalSpace(space);
   yield* flushAndSync({
     indexes: true
   }).pipe(Effect6.provide(spaceLayer(Option2.some(space.id))));
@@ -313,7 +323,7 @@ import { CommandConfig as CommandConfig7 } from "@dxos/cli-util";
 import { ClientService as ClientService6 } from "@dxos/client";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { schema } from "@dxos/protocols/proto";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/credential/add/add.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/credential/add/add.ts";
 var handler5 = Effect7.fn(function* ({ credential: credential2 }) {
   const { json } = yield* CommandConfig7;
   const client = yield* ClientService6;
@@ -324,7 +334,7 @@ var handler5 = Effect7.fn(function* ({ credential: credential2 }) {
     }).pipe(Prompt.run);
   }
   invariant2(credentialHex, "Invalid credential.", {
-    F: __dxlog_file2,
+    F: __dxlog_file3,
     L: 26,
     S: this,
     A: [
@@ -395,7 +405,7 @@ import * as Console8 from "effect/Console";
 import * as Duration from "effect/Duration";
 import * as Effect8 from "effect/Effect";
 import * as Option4 from "effect/Option";
-import { CommandConfig as CommandConfig8, Common as Common2, FormBuilder as FormBuilder3, getSpace, printList as printList2, spaceIdWithDefault } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig8, Common, FormBuilder as FormBuilder3, getSpace, printList as printList2 } from "@dxos/cli-util";
 import { ClientService as ClientService7 } from "@dxos/client";
 var mapCredentials = (credentials) => {
   return credentials.map((credential2) => ({
@@ -415,11 +425,9 @@ var printCredential = (credential2) => {
 var handler6 = Effect8.fn(function* ({ type, spaceId, timeout: timeout2, delay }) {
   const { json } = yield* CommandConfig8;
   const client = yield* ClientService7;
-  yield* Effect8.tryPromise(() => client.spaces.waitUntilReady());
   let credentials;
-  const resolvedSpaceId = yield* spaceIdWithDefault(spaceId);
   if (Option4.isSome(spaceId)) {
-    const space = yield* getSpace(resolvedSpaceId);
+    const space = yield* getSpace(spaceId.value);
     credentials = yield* Effect8.tryPromise(() => space.internal.getCredentials());
   } else {
     const identity2 = client.halo.identity;
@@ -456,7 +464,7 @@ var handler6 = Effect8.fn(function* ({ type, spaceId, timeout: timeout2, delay }
 });
 var list2 = Command11.make("list", {
   type: Options3.text("type").pipe(Options3.withDescription("Filter by credential type."), Options3.optional),
-  spaceId: Common2.spaceId.pipe(Options3.withDescription("Space ID to show credentials from."), Options3.optional),
+  spaceId: Common.spaceId.pipe(Options3.withDescription("Space ID to show credentials from."), Options3.optional),
   timeout: Options3.integer("timeout").pipe(Options3.withDescription("Time in milliseconds to wait for at least one credential before listing."), Options3.withDefault(500)),
   delay: Options3.integer("delay").pipe(Options3.withDescription("Delay in milliseconds before listing."), Options3.withDefault(250))
 }, handler6).pipe(Command11.withDescription("List HALO credentials."));
@@ -487,7 +495,6 @@ var handler7 = Effect9.fn(function* () {
       yield* Console9.log("Identity not initialized.");
     }
   } else {
-    yield* Effect9.tryPromise(() => client.spaces.waitUntilReady());
     if (json) {
       yield* Console9.log(JSON.stringify({
         identityKey: identity2.identityKey.toHex(),
@@ -511,7 +518,6 @@ import { ClientService as ClientService9 } from "@dxos/client";
 var handler8 = Effect10.fn(function* () {
   const { json } = yield* CommandConfig10;
   const client = yield* ClientService9;
-  yield* Effect10.tryPromise(() => client.spaces.waitUntilReady());
   const identity2 = client.halo.identity.get();
   const device2 = client.halo.device;
   if (json) {
@@ -536,7 +542,7 @@ import * as Effect11 from "effect/Effect";
 import { CommandConfig as CommandConfig11, print as print6 } from "@dxos/cli-util";
 import { ClientService as ClientService10 } from "@dxos/client";
 import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/recover/recover.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/halo/recover/recover.ts";
 var recover = Command15.make("recover", {
   recoveryCode: Args2.text({
     name: "recoveryCode"
@@ -545,7 +551,7 @@ var recover = Command15.make("recover", {
   const { json } = yield* CommandConfig11;
   const client = yield* ClientService10;
   invariant3(!client.halo.identity.get(), "Identity already exists", {
-    F: __dxlog_file3,
+    F: __dxlog_file4,
     L: 25,
     S: this,
     A: [
@@ -576,7 +582,6 @@ import { ClientService as ClientService11 } from "@dxos/client";
 var handler9 = Effect12.fn(function* () {
   const { json } = yield* CommandConfig12;
   const client = yield* ClientService11;
-  yield* Effect12.tryPromise(() => client.spaces.waitUntilReady());
   const identityService = client.services.services.IdentityService;
   if (!identityService) {
     if (json) {
@@ -610,7 +615,6 @@ import { ClientService as ClientService12 } from "@dxos/client";
 var handler10 = Effect13.fn(function* ({ displayName }) {
   const { json } = yield* CommandConfig13;
   const client = yield* ClientService12;
-  yield* Effect13.tryPromise(() => client.spaces.waitUntilReady());
   const identity2 = client.halo.identity.get();
   if (!identity2) {
     if (json) {
@@ -667,12 +671,13 @@ import * as Command25 from "@effect/cli/Command";
 import * as Command19 from "@effect/cli/Command";
 import * as Options5 from "@effect/cli/Options";
 import * as FileSystem from "@effect/platform/FileSystem";
+import * as Path from "@effect/platform/Path";
 import * as Console14 from "effect/Console";
 import * as Effect14 from "effect/Effect";
 import * as Option6 from "effect/Option";
 import * as Record from "effect/Record";
 import { CommandConfig as CommandConfig14, print as print8 } from "@dxos/cli-util";
-import { DX_CONFIG, getProfilePath } from "@dxos/client-protocol";
+import { DX_CONFIG as DX_CONFIG2, getProfileConfigPath as getProfileConfigPath2 } from "@dxos/client-protocol";
 import { trim } from "@dxos/util";
 
 // src/cli/commands/profile/util.ts
@@ -742,19 +747,23 @@ var create2 = Command19.make("create", {
 }, Effect14.fnUntraced(function* ({ template, name }) {
   const { json } = yield* CommandConfig14;
   const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
   const profileName = name.pipe(Option6.getOrElse(() => template));
-  const profilePath = `${getProfilePath(DX_CONFIG, profileName)}.yml`;
-  if (yield* fs.exists(profilePath)) {
+  const configPath = getProfileConfigPath2(DX_CONFIG2, profileName);
+  if (yield* fs.exists(configPath)) {
     throw new Error(`Profile ${profileName} already exists`);
   }
-  yield* fs.writeFileString(profilePath, TEMPLATES[template]);
+  yield* fs.makeDirectory(path.dirname(configPath), {
+    recursive: true
+  });
+  yield* fs.writeFileString(configPath, TEMPLATES[template]);
   if (json) {
     yield* Console14.log(JSON.stringify({
       name: profileName,
-      path: profilePath
+      path: configPath
     }, null, 2));
   } else {
-    yield* Console14.log(print8(printProfileCreated(profileName, profilePath)));
+    yield* Console14.log(print8(printProfileCreated(profileName, configPath)));
   }
 }));
 
@@ -766,14 +775,17 @@ import * as Console15 from "effect/Console";
 import * as Effect15 from "effect/Effect";
 import * as Option7 from "effect/Option";
 import { CommandConfig as CommandConfig15, print as print9 } from "@dxos/cli-util";
-import { DX_CONFIG as DX_CONFIG2, getProfilePath as getProfilePath2 } from "@dxos/client-protocol";
+import { DX_CONFIG as DX_CONFIG3, getProfileConfigPath as getProfileConfigPath3 } from "@dxos/client-protocol";
 var del = Command20.make("delete", {
   name: Options6.text("name").pipe(Options6.withDescription("Profile name"), Options6.optional)
 }, Effect15.fnUntraced(function* ({ name }) {
   const { json } = yield* CommandConfig15;
   const fs = yield* FileSystem3.FileSystem;
   const profileName = name.pipe(Option7.getOrElse(() => "default"));
-  yield* fs.remove(`${getProfilePath2(DX_CONFIG2, profileName)}.yml`);
+  const configPath = getProfileConfigPath3(DX_CONFIG3, profileName);
+  const pluginsPath = `${DX_CONFIG3}/plugins/${profileName}.yml`;
+  yield* fs.remove(configPath).pipe(Effect15.ignore);
+  yield* fs.remove(pluginsPath).pipe(Effect15.ignore);
   if (json) {
     yield* Console15.log(JSON.stringify({
       name: profileName,
@@ -789,19 +801,19 @@ import * as Command21 from "@effect/cli/Command";
 import * as Options7 from "@effect/cli/Options";
 import * as Prompt2 from "@effect/cli/Prompt";
 import * as FileSystem5 from "@effect/platform/FileSystem";
-import * as Path from "@effect/platform/Path";
+import * as Path3 from "@effect/platform/Path";
 import * as Console16 from "effect/Console";
 import * as Effect16 from "effect/Effect";
 import * as Option8 from "effect/Option";
 import { CommandConfig as CommandConfig16 } from "@dxos/cli-util";
 import { ConfigService as ConfigService2 } from "@dxos/config";
 import { log as log17 } from "@dxos/log";
-var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/profile/import.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/cli/commands/profile/import.ts";
 var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
   const dataDirValue = Option8.getOrUndefined(dataDir);
   const { json, profile: profile2 } = yield* CommandConfig16;
   const fs = yield* FileSystem5.FileSystem;
-  const path = yield* Path.Path;
+  const path = yield* Path3.Path;
   const config2 = yield* ConfigService2;
   const { createLevel, createStorageObjects, importProfileData, decodeProfileArchive } = yield* Effect16.promise(() => import("@dxos/client-services"));
   let storageConfig;
@@ -829,7 +841,7 @@ var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
     log17.error("data directory already exists", {
       path: storageConfig.dataRoot
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 61,
       S: this,
       C: (f, a) => f(...a)
@@ -922,31 +934,31 @@ var inspect = Command22.make("inspect", {
 // src/cli/commands/profile/list.ts
 import * as Command23 from "@effect/cli/Command";
 import * as FileSystem9 from "@effect/platform/FileSystem";
-import * as Path3 from "@effect/platform/Path";
+import * as Path5 from "@effect/platform/Path";
 import * as Console18 from "effect/Console";
 import * as Effect18 from "effect/Effect";
 import * as Yaml2 from "yaml";
 import { CommandConfig as CommandConfig18, printList as printList3 } from "@dxos/cli-util";
 import { Config } from "@dxos/client";
-import { DX_CONFIG as DX_CONFIG3, DX_DATA, getProfilePath as getProfilePath3 } from "@dxos/client-protocol";
+import { DX_CONFIG as DX_CONFIG4, DX_DATA, getProfilePath } from "@dxos/client-protocol";
 var list3 = Command23.make("list", {}, Effect18.fnUntraced(function* () {
   const { profile: currentProfile } = yield* CommandConfig18;
   const fs = yield* FileSystem9.FileSystem;
-  const path = yield* Path3.Path;
-  const profileDir = path.join(DX_CONFIG3, "profile");
-  const files = yield* fs.readDirectory(profileDir);
-  const profiles = yield* Effect18.forEach(files, Effect18.fnUntraced(function* (filename) {
-    const ext = path.extname(filename);
-    const name = filename.slice(0, -ext.length);
-    const fullPath = path.join(DX_CONFIG3, "profile", filename);
-    const configContent = yield* fs.readFileString(fullPath);
-    const configValues = Yaml2.parse(configContent);
+  const path = yield* Path5.Path;
+  const profileDir = path.join(DX_CONFIG4, "profile");
+  const entries = yield* fs.readDirectory(profileDir);
+  const profileFiles = entries.filter((entry) => entry.endsWith(".yml"));
+  const profiles = yield* Effect18.forEach(profileFiles, (filename) => Effect18.gen(function* () {
+    const name = filename.slice(0, -4);
+    const configPath = path.join(profileDir, filename);
+    const configContent = yield* fs.readFileString(configPath).pipe(Effect18.catchTag("SystemError", () => Effect18.succeed("{}")));
+    const configValues = Yaml2.parse(configContent) ?? {};
     const config2 = new Config(configValues);
     return {
       name,
       isCurrent: name === currentProfile,
-      fullPath,
-      storagePath: getProfilePath3(configValues?.runtime?.client?.storage.dataRoot ?? DX_DATA, name),
+      fullPath: configPath,
+      storagePath: getProfilePath(configValues?.runtime?.client?.storage?.dataRoot ?? DX_DATA, name),
       edge: config2.values.runtime?.services?.edge?.url
     };
   }));
@@ -967,7 +979,7 @@ import * as FileSystem11 from "@effect/platform/FileSystem";
 import * as Console19 from "effect/Console";
 import * as Effect19 from "effect/Effect";
 import { CommandConfig as CommandConfig19, print as print11 } from "@dxos/cli-util";
-import { DX_DATA as DX_DATA2, getProfilePath as getProfilePath4 } from "@dxos/client-protocol";
+import { DX_DATA as DX_DATA2, getProfilePath as getProfilePath2 } from "@dxos/client-protocol";
 import { ConfigService as ConfigService3 } from "@dxos/config";
 var reset = Command24.make("reset", {
   force: Options9.boolean("force", {
@@ -977,7 +989,7 @@ var reset = Command24.make("reset", {
   const fs = yield* FileSystem11.FileSystem;
   const config2 = yield* ConfigService3;
   const { json, profile: profile2 } = yield* CommandConfig19;
-  const path = config2.values.runtime?.client?.storage?.dataRoot ?? getProfilePath4(DX_DATA2, profile2);
+  const path = config2.values.runtime?.client?.storage?.dataRoot ?? getProfilePath2(DX_DATA2, profile2);
   if (!force) {
     const confirmed = yield* Prompt3.confirm({
       message: `Are you sure you want to reset the profile (${profile2})?`,
@@ -1012,9 +1024,22 @@ var profile = Command25.make("profile").pipe(Command25.withDescription("Profile
 
 // src/cli/plugin.ts
 var ClientPlugin = Plugin2.define(meta).pipe(
+  // TODO(wittjosiah): Could some of these commands make use of operations?
+  AppPlugin.addCommandModule({
+    commands: [
+      config,
+      device,
+      edge,
+      halo,
+      profile
+    ]
+  }),
+  AppPlugin.addOperationHandlerModule({
+    activate: OperationHandler
+  }),
   Plugin2.addModule((options) => ({
     id: Capability.getModuleTag(Client),
-    activatesOn: Common3.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activatesAfter: [
       ClientEvents.ClientReady
     ],
@@ -1023,23 +1048,10 @@ var ClientPlugin = Plugin2.define(meta).pipe(
   Plugin2.addModule({
     activatesOn: ClientEvents.ClientReady,
     activatesBefore: [
-      Common3.ActivationEvent.SetupSchema
+      AppActivationEvents.SetupSchema
     ],
     activate: SchemaDefs
   }),
-  // TODO(wittjosiah): Could some of these commands make use of operations?
-  Common3.Plugin.addCommandModule({
-    commands: [
-      config,
-      device,
-      edge,
-      halo,
-      profile
-    ]
-  }),
-  Common3.Plugin.addOperationResolverModule({
-    activate: () => OperationResolver()
-  }),
   Plugin2.make
 );
 export {