@dxos/plugin-client 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/dist/lib/browser/chunk-JHSBBOCI.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/meta.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Plugin } from '@dxos/app-framework';\nimport { trim } from '@dxos/util';\n\nexport const meta: Plugin.Meta = {\n  id: 'org.dxos.plugin.client',\n  name: 'Client',\n  description: trim`\n    Core client connectivity and peer-to-peer networking infrastructure.\n    Manages identity, authentication, and real-time synchronization across devices.\n  `,\n};\n"],
+  "mappings": ";AAKA,SAASA,YAAY;AAEd,IAAMC,OAAoB;EAC/BC,IAAI;EACJC,MAAM;EACNC,aAAaC;;;;AAIf;",
+  "names": ["trim", "meta", "id", "name", "description", "trim"]
+}

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

@@ -2,15 +2,18 @@ import {
   Client,
   OperationResolver,
   SchemaDefs
-} from "../chunk-F7H2Y3Z2.mjs";
+} from "../chunk-GSVYEYVS.mjs";
 import {
   ClientEvents,
-  ClientOperation,
+  ClientOperation
+} from "../chunk-FVEKZBM7.mjs";
+import {
   meta
-} from "../chunk-4BZGRIFS.mjs";
+} from "../chunk-JHSBBOCI.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";
 
 // src/cli/commands/config/index.ts
 import * as Command2 from "@effect/cli/Command";
@@ -206,8 +209,8 @@ import { createEdgeIdentity } from "@dxos/client/edge";
 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());
   if (yield* CommandConfig5.isJson) {
     yield* Console5.log(JSON.stringify(status2, null, 2));
   } else if (status2.problems.length > 0) {
@@ -243,7 +246,7 @@ 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";
@@ -270,7 +273,7 @@ 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)
   });
@@ -395,7 +398,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, spaceIdWithDefault } from "@dxos/cli-util";
 import { ClientService as ClientService7 } from "@dxos/client";
 var mapCredentials = (credentials) => {
   return credentials.map((credential2) => ({
@@ -456,7 +459,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."));
@@ -667,12 +670,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, getProfileConfigPath } from "@dxos/client-protocol";
 import { trim } from "@dxos/util";
 
 // src/cli/commands/profile/util.ts
@@ -742,19 +746,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 = getProfileConfigPath(DX_CONFIG, 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 +774,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_CONFIG2, getProfileConfigPath as getProfileConfigPath2 } 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 = getProfileConfigPath2(DX_CONFIG2, profileName);
+  const pluginsPath = `${DX_CONFIG2}/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,7 +800,7 @@ 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";
@@ -801,7 +812,7 @@ 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;
@@ -922,31 +933,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_CONFIG3, 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 path = yield* Path5.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 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 +978,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 +988,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 +1023,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.addOperationResolverModule({
+    activate: OperationResolver
+  }),
   Plugin2.addModule((options) => ({
     id: Capability.getModuleTag(Client),
-    activatesOn: Common3.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activatesAfter: [
       ClientEvents.ClientReady
     ],
@@ -1023,23 +1047,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 {