@moltzap/client 2026.503.3 → 2026.504.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth.d.ts +10 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +8 -5
- package/dist/auth.js.map +1 -1
- package/dist/channel-core.d.ts +1 -4
- package/dist/channel-core.d.ts.map +1 -1
- package/dist/channel-core.js +0 -9
- package/dist/channel-core.js.map +1 -1
- package/dist/channel-core.test.js +90 -71
- package/dist/channel-core.test.js.map +1 -1
- package/dist/cli/commands/agents.d.ts.map +1 -1
- package/dist/cli/commands/agents.js +5 -3
- package/dist/cli/commands/agents.js.map +1 -1
- package/dist/cli/commands/apps.d.ts +9 -27
- package/dist/cli/commands/apps.d.ts.map +1 -1
- package/dist/cli/commands/apps.js +36 -57
- package/dist/cli/commands/apps.js.map +1 -1
- package/dist/cli/commands/apps.test.js +63 -75
- package/dist/cli/commands/apps.test.js.map +1 -1
- package/dist/cli/commands/contacts.d.ts +1 -5
- package/dist/cli/commands/contacts.d.ts.map +1 -1
- package/dist/cli/commands/contacts.js +14 -27
- package/dist/cli/commands/contacts.js.map +1 -1
- package/dist/cli/commands/conversations-v2.test.js +34 -29
- package/dist/cli/commands/conversations-v2.test.js.map +1 -1
- package/dist/cli/commands/conversations.d.ts +7 -3
- package/dist/cli/commands/conversations.d.ts.map +1 -1
- package/dist/cli/commands/conversations.js +63 -48
- package/dist/cli/commands/conversations.js.map +1 -1
- package/dist/cli/commands/messages.d.ts +7 -3
- package/dist/cli/commands/messages.d.ts.map +1 -1
- package/dist/cli/commands/messages.js +13 -15
- package/dist/cli/commands/messages.js.map +1 -1
- package/dist/cli/commands/messages.test.js +30 -31
- package/dist/cli/commands/messages.test.js.map +1 -1
- package/dist/cli/commands/ping.d.ts +9 -0
- package/dist/cli/commands/ping.d.ts.map +1 -1
- package/dist/cli/commands/ping.js +17 -4
- package/dist/cli/commands/ping.js.map +1 -1
- package/dist/cli/commands/presence.d.ts.map +1 -1
- package/dist/cli/commands/presence.js +6 -4
- package/dist/cli/commands/presence.js.map +1 -1
- package/dist/cli/commands/register.d.ts.map +1 -1
- package/dist/cli/commands/register.js +2 -1
- package/dist/cli/commands/register.js.map +1 -1
- package/dist/cli/commands/send.d.ts.map +1 -1
- package/dist/cli/commands/send.js +22 -11
- package/dist/cli/commands/send.js.map +1 -1
- package/dist/cli/commands/send.test.js +12 -9
- package/dist/cli/commands/send.test.js.map +1 -1
- package/dist/cli/commands/status.js +2 -2
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/test-transport.d.ts +10 -0
- package/dist/cli/commands/test-transport.d.ts.map +1 -0
- package/dist/cli/commands/test-transport.js +29 -0
- package/dist/cli/commands/test-transport.js.map +1 -0
- package/dist/cli/commands/whoami.d.ts.map +1 -1
- package/dist/cli/commands/whoami.js +5 -1
- package/dist/cli/commands/whoami.js.map +1 -1
- package/dist/cli/config.d.ts +42 -6
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +91 -27
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/http-client.d.ts +11 -1
- package/dist/cli/http-client.d.ts.map +1 -1
- package/dist/cli/http-client.js +13 -4
- package/dist/cli/http-client.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +2 -3
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/profile.d.ts +3 -4
- package/dist/cli/profile.d.ts.map +1 -1
- package/dist/cli/profile.js +42 -29
- package/dist/cli/profile.js.map +1 -1
- package/dist/cli/runtime.d.ts.map +1 -1
- package/dist/cli/runtime.js +9 -4
- package/dist/cli/runtime.js.map +1 -1
- package/dist/cli/socket-client.d.ts +29 -4
- package/dist/cli/socket-client.d.ts.map +1 -1
- package/dist/cli/socket-client.js +52 -21
- package/dist/cli/socket-client.js.map +1 -1
- package/dist/cli/transport.d.ts +6 -9
- package/dist/cli/transport.d.ts.map +1 -1
- package/dist/cli/transport.js +47 -37
- package/dist/cli/transport.js.map +1 -1
- package/dist/cli/transport.test.js +19 -16
- package/dist/cli/transport.test.js.map +1 -1
- package/dist/index.d.ts +2 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/internal/__tests__/app-callback-partition-key.test.d.ts +2 -0
- package/dist/internal/__tests__/app-callback-partition-key.test.d.ts.map +1 -0
- package/dist/internal/__tests__/app-callback-partition-key.test.js +33 -0
- package/dist/internal/__tests__/app-callback-partition-key.test.js.map +1 -0
- package/dist/internal/__tests__/app-callback-partition-worker.test.d.ts +2 -0
- package/dist/internal/__tests__/app-callback-partition-worker.test.d.ts.map +1 -0
- package/dist/internal/__tests__/{s2c-partition-worker.test.js → app-callback-partition-worker.test.js} +6 -8
- package/dist/internal/__tests__/app-callback-partition-worker.test.js.map +1 -0
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher-real-ws.test.d.ts +2 -0
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher-real-ws.test.d.ts.map +1 -0
- package/dist/internal/__tests__/{s2c-partitioned-dispatcher-real-ws.test.js → app-callback-partitioned-dispatcher-real-ws.test.js} +69 -93
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher-real-ws.test.js.map +1 -0
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher.test.d.ts +2 -0
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher.test.d.ts.map +1 -0
- package/dist/internal/__tests__/{s2c-partitioned-dispatcher.test.js → app-callback-partitioned-dispatcher.test.js} +36 -69
- package/dist/internal/__tests__/app-callback-partitioned-dispatcher.test.js.map +1 -0
- package/dist/internal/__tests__/app-callback-test-requests.d.ts +58 -0
- package/dist/internal/__tests__/app-callback-test-requests.d.ts.map +1 -0
- package/dist/internal/__tests__/app-callback-test-requests.js +124 -0
- package/dist/internal/__tests__/app-callback-test-requests.js.map +1 -0
- package/dist/internal/{s2c-dispatcher-errors.d.ts → app-callback-dispatcher-errors.d.ts} +5 -21
- package/dist/internal/app-callback-dispatcher-errors.d.ts.map +1 -0
- package/dist/internal/{s2c-dispatcher-errors.js → app-callback-dispatcher-errors.js} +3 -13
- package/dist/internal/app-callback-dispatcher-errors.js.map +1 -0
- package/dist/internal/app-callback-partition-key.d.ts +68 -0
- package/dist/internal/app-callback-partition-key.d.ts.map +1 -0
- package/dist/internal/app-callback-partition-key.js +90 -0
- package/dist/internal/app-callback-partition-key.js.map +1 -0
- package/dist/internal/{s2c-partition-worker.d.ts → app-callback-partition-worker.d.ts} +5 -5
- package/dist/internal/app-callback-partition-worker.d.ts.map +1 -0
- package/dist/internal/{s2c-partition-worker.js → app-callback-partition-worker.js} +5 -5
- package/dist/internal/app-callback-partition-worker.js.map +1 -0
- package/dist/internal/{s2c-partitioned-dispatcher.d.ts → app-callback-partitioned-dispatcher.d.ts} +9 -10
- package/dist/internal/app-callback-partitioned-dispatcher.d.ts.map +1 -0
- package/dist/internal/{s2c-partitioned-dispatcher.js → app-callback-partitioned-dispatcher.js} +13 -21
- package/dist/internal/app-callback-partitioned-dispatcher.js.map +1 -0
- package/dist/runtime/close-info.d.ts +15 -16
- package/dist/runtime/close-info.d.ts.map +1 -1
- package/dist/runtime/close-info.js +12 -8
- package/dist/runtime/close-info.js.map +1 -1
- package/dist/runtime/errors.d.ts +2 -28
- package/dist/runtime/errors.d.ts.map +1 -1
- package/dist/runtime/errors.js +0 -9
- package/dist/runtime/errors.js.map +1 -1
- package/dist/runtime/errors.test.js +4 -3
- package/dist/runtime/errors.test.js.map +1 -1
- package/dist/runtime/frame.d.ts +17 -18
- package/dist/runtime/frame.d.ts.map +1 -1
- package/dist/runtime/frame.js +86 -31
- package/dist/runtime/frame.js.map +1 -1
- package/dist/runtime/frame.test.js +15 -11
- package/dist/runtime/frame.test.js.map +1 -1
- package/dist/runtime/index.d.ts +1 -1
- package/dist/runtime/index.d.ts.map +1 -1
- package/dist/runtime/index.js +1 -1
- package/dist/runtime/index.js.map +1 -1
- package/dist/runtime/local-service-commands.d.ts +7 -0
- package/dist/runtime/local-service-commands.d.ts.map +1 -0
- package/dist/runtime/local-service-commands.js +6 -0
- package/dist/runtime/local-service-commands.js.map +1 -0
- package/dist/runtime/runtime.test.js +3 -3
- package/dist/runtime/runtime.test.js.map +1 -1
- package/dist/runtime/subscribers.d.ts +37 -33
- package/dist/runtime/subscribers.d.ts.map +1 -1
- package/dist/runtime/subscribers.js +22 -21
- package/dist/runtime/subscribers.js.map +1 -1
- package/dist/runtime/subscribers.test.js +50 -31
- package/dist/runtime/subscribers.test.js.map +1 -1
- package/dist/service.d.ts +24 -39
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +190 -171
- package/dist/service.js.map +1 -1
- package/dist/service.test.js +117 -175
- package/dist/service.test.js.map +1 -1
- package/dist/test/index.d.ts +9 -1
- package/dist/test/index.d.ts.map +1 -1
- package/dist/test/index.js +14 -3
- package/dist/test/index.js.map +1 -1
- package/dist/test-utils/channel-service-fixture.d.ts +1 -2
- package/dist/test-utils/channel-service-fixture.d.ts.map +1 -1
- package/dist/test-utils/channel-service-fixture.js +28 -20
- package/dist/test-utils/channel-service-fixture.js.map +1 -1
- package/dist/test-utils/conformance-adapter.d.ts +2 -2
- package/dist/test-utils/conformance-adapter.d.ts.map +1 -1
- package/dist/test-utils/conformance-adapter.js +78 -54
- package/dist/test-utils/conformance-adapter.js.map +1 -1
- package/dist/test-utils/fake-service.d.ts +14 -39
- package/dist/test-utils/fake-service.d.ts.map +1 -1
- package/dist/test-utils/fake-service.js +33 -39
- package/dist/test-utils/fake-service.js.map +1 -1
- package/dist/test-utils/ids.d.ts +9 -0
- package/dist/test-utils/ids.d.ts.map +1 -0
- package/dist/test-utils/ids.js +52 -0
- package/dist/test-utils/ids.js.map +1 -0
- package/dist/test-utils/index.d.ts +10 -2
- package/dist/test-utils/index.d.ts.map +1 -1
- package/dist/test-utils/index.js +25 -9
- package/dist/test-utils/index.js.map +1 -1
- package/dist/ws-client.d.ts +59 -64
- package/dist/ws-client.d.ts.map +1 -1
- package/dist/ws-client.js +228 -175
- package/dist/ws-client.js.map +1 -1
- package/dist/ws-client.test.js +190 -176
- package/dist/ws-client.test.js.map +1 -1
- package/package.json +3 -3
- package/dist/cli/commands/permissions.d.ts +0 -66
- package/dist/cli/commands/permissions.d.ts.map +0 -1
- package/dist/cli/commands/permissions.js +0 -101
- package/dist/cli/commands/permissions.js.map +0 -1
- package/dist/cli/commands/permissions.test.d.ts +0 -2
- package/dist/cli/commands/permissions.test.d.ts.map +0 -1
- package/dist/cli/commands/permissions.test.js +0 -126
- package/dist/cli/commands/permissions.test.js.map +0 -1
- package/dist/internal/__tests__/s2c-partition-key.test.d.ts +0 -2
- package/dist/internal/__tests__/s2c-partition-key.test.d.ts.map +0 -1
- package/dist/internal/__tests__/s2c-partition-key.test.js +0 -230
- package/dist/internal/__tests__/s2c-partition-key.test.js.map +0 -1
- package/dist/internal/__tests__/s2c-partition-worker.test.d.ts +0 -2
- package/dist/internal/__tests__/s2c-partition-worker.test.d.ts.map +0 -1
- package/dist/internal/__tests__/s2c-partition-worker.test.js.map +0 -1
- package/dist/internal/__tests__/s2c-partitioned-dispatcher-real-ws.test.d.ts +0 -2
- package/dist/internal/__tests__/s2c-partitioned-dispatcher-real-ws.test.d.ts.map +0 -1
- package/dist/internal/__tests__/s2c-partitioned-dispatcher-real-ws.test.js.map +0 -1
- package/dist/internal/__tests__/s2c-partitioned-dispatcher.test.d.ts +0 -2
- package/dist/internal/__tests__/s2c-partitioned-dispatcher.test.d.ts.map +0 -1
- package/dist/internal/__tests__/s2c-partitioned-dispatcher.test.js.map +0 -1
- package/dist/internal/s2c-dispatcher-errors.d.ts.map +0 -1
- package/dist/internal/s2c-dispatcher-errors.js.map +0 -1
- package/dist/internal/s2c-partition-key.d.ts +0 -71
- package/dist/internal/s2c-partition-key.d.ts.map +0 -1
- package/dist/internal/s2c-partition-key.js +0 -140
- package/dist/internal/s2c-partition-key.js.map +0 -1
- package/dist/internal/s2c-partition-worker.d.ts.map +0 -1
- package/dist/internal/s2c-partition-worker.js.map +0 -1
- package/dist/internal/s2c-partitioned-dispatcher.d.ts.map +0 -1
- package/dist/internal/s2c-partitioned-dispatcher.js.map +0 -1
package/dist/cli/config.d.ts
CHANGED
|
@@ -9,6 +9,41 @@ export interface MoltZapConfig {
|
|
|
9
9
|
apiKey?: string;
|
|
10
10
|
agentName?: string;
|
|
11
11
|
}
|
|
12
|
+
export type CliConfigError = ConfigReadError | ConfigWriteError | ConfigInvalidError | AuthNotConfiguredError;
|
|
13
|
+
declare const ConfigReadError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
14
|
+
readonly _tag: "ConfigReadError";
|
|
15
|
+
} & Readonly<A>;
|
|
16
|
+
export declare class ConfigReadError extends ConfigReadError_base<{
|
|
17
|
+
readonly cause: unknown;
|
|
18
|
+
readonly message: string;
|
|
19
|
+
readonly path: string;
|
|
20
|
+
}> {
|
|
21
|
+
}
|
|
22
|
+
declare const ConfigWriteError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
23
|
+
readonly _tag: "ConfigWriteError";
|
|
24
|
+
} & Readonly<A>;
|
|
25
|
+
export declare class ConfigWriteError extends ConfigWriteError_base<{
|
|
26
|
+
readonly cause: unknown;
|
|
27
|
+
readonly message: string;
|
|
28
|
+
readonly path: string;
|
|
29
|
+
}> {
|
|
30
|
+
}
|
|
31
|
+
declare const ConfigInvalidError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
32
|
+
readonly _tag: "ConfigInvalidError";
|
|
33
|
+
} & Readonly<A>;
|
|
34
|
+
export declare class ConfigInvalidError extends ConfigInvalidError_base<{
|
|
35
|
+
readonly cause: unknown;
|
|
36
|
+
readonly message: string;
|
|
37
|
+
readonly path: string;
|
|
38
|
+
}> {
|
|
39
|
+
}
|
|
40
|
+
declare const AuthNotConfiguredError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
41
|
+
readonly _tag: "AuthNotConfiguredError";
|
|
42
|
+
} & Readonly<A>;
|
|
43
|
+
export declare class AuthNotConfiguredError extends AuthNotConfiguredError_base<{
|
|
44
|
+
readonly message: string;
|
|
45
|
+
}> {
|
|
46
|
+
}
|
|
12
47
|
export declare function getConfigPath(): string;
|
|
13
48
|
/**
|
|
14
49
|
* Load and validate the CLI config. Merges on-disk JSON with env overrides
|
|
@@ -16,17 +51,18 @@ export declare function getConfigPath(): string;
|
|
|
16
51
|
* Missing file resolves with defaults; parse errors surface as typed
|
|
17
52
|
* failures so callers see them instead of getting silent defaults.
|
|
18
53
|
*/
|
|
19
|
-
export declare const loadConfig: Effect.Effect<MoltZapConfig,
|
|
54
|
+
export declare const loadConfig: Effect.Effect<MoltZapConfig, ConfigReadError | ConfigInvalidError>;
|
|
20
55
|
/** Write a new config blob to disk. Used by `moltzap register` post-registration. */
|
|
21
|
-
export declare const writeConfig: (config: MoltZapConfig) => Effect.Effect<void,
|
|
56
|
+
export declare const writeConfig: (config: MoltZapConfig) => Effect.Effect<void, ConfigWriteError>;
|
|
22
57
|
/** Load-modify-write helper. */
|
|
23
|
-
export declare const updateConfig: (updater: (config: MoltZapConfig) => MoltZapConfig) => Effect.Effect<void,
|
|
58
|
+
export declare const updateConfig: (updater: (config: MoltZapConfig) => MoltZapConfig) => Effect.Effect<void, ConfigInvalidError | ConfigReadError | ConfigWriteError>;
|
|
24
59
|
/** WebSocket server URL (env-overridable). */
|
|
25
|
-
export declare const getServerUrl: Effect.Effect<string,
|
|
60
|
+
export declare const getServerUrl: Effect.Effect<string, ConfigInvalidError | ConfigReadError>;
|
|
26
61
|
/** HTTP base URL — ws/wss → http/https. */
|
|
27
|
-
export declare const getHttpUrl: Effect.Effect<string,
|
|
62
|
+
export declare const getHttpUrl: Effect.Effect<string, ConfigInvalidError | ConfigReadError>;
|
|
28
63
|
/** Resolve agent API key. Fails if neither env nor config has one set. */
|
|
29
64
|
export declare const resolveAuth: Effect.Effect<{
|
|
30
65
|
agentKey: string;
|
|
31
|
-
},
|
|
66
|
+
}, AuthNotConfiguredError | ConfigInvalidError | ConfigReadError>;
|
|
67
|
+
export {};
|
|
32
68
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/cli/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,MAAM,EAAU,MAAM,QAAQ,CAAC;AAEtE;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,MAAM,MAAM,cAAc,GACtB,eAAe,GACf,gBAAgB,GAChB,kBAAkB,GAClB,sBAAsB,CAAC;;;;AAE3B,qBAAa,eAAgB,SAAQ,qBAAoC;IACvE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,4BAE1C;IACA,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;CAAG;AAeL,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAsDD;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,aAAa,EACb,eAAe,GAAG,kBAAkB,CAoDpC,CAAC;AAEH,qFAAqF;AACrF,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAoBnC,CAAC;AAEL,gCAAgC;AAChC,eAAO,MAAM,YAAY,GACvB,SAAS,CAAC,MAAM,EAAE,aAAa,KAAK,aAAa,KAChD,MAAM,CAAC,MAAM,CACd,IAAI,EACJ,kBAAkB,GAAG,eAAe,GAAG,gBAAgB,CAEoB,CAAC;AAE9E,8CAA8C;AAC9C,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CACtC,MAAM,EACN,kBAAkB,GAAG,eAAe,CACa,CAAC;AAEpD,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,MAAM,EACN,kBAAkB,GAAG,eAAe,CAGrC,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,CACrC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EACpB,sBAAsB,GAAG,kBAAkB,GAAG,eAAe,CAW9D,CAAC"}
|
package/dist/cli/config.js
CHANGED
|
@@ -1,33 +1,67 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
2
|
import * as path from "node:path";
|
|
3
3
|
import * as os from "node:os";
|
|
4
|
-
import { Config, ConfigProvider, Effect } from "effect";
|
|
4
|
+
import { Config, ConfigProvider, Data, Effect, Option } from "effect";
|
|
5
5
|
const CONFIG_DIR = path.join(os.homedir(), ".moltzap");
|
|
6
6
|
const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
|
|
7
7
|
const DEFAULT_SERVER_URL = "wss://api.moltzap.xyz";
|
|
8
|
+
const CONFIG_FILE_MODE = 0o600;
|
|
9
|
+
const JSON_INDENT_SPACES = 2;
|
|
10
|
+
export class ConfigReadError extends Data.TaggedError("ConfigReadError") {
|
|
11
|
+
}
|
|
12
|
+
export class ConfigWriteError extends Data.TaggedError("ConfigWriteError") {
|
|
13
|
+
}
|
|
14
|
+
export class ConfigInvalidError extends Data.TaggedError("ConfigInvalidError") {
|
|
15
|
+
}
|
|
16
|
+
export class AuthNotConfiguredError extends Data.TaggedError("AuthNotConfiguredError") {
|
|
17
|
+
}
|
|
8
18
|
/** Effect.Config schema. Matches the on-disk JSON shape. */
|
|
9
19
|
const ConfigSchema = Config.all({
|
|
10
20
|
serverUrl: Config.string("serverUrl").pipe(Config.withDefault(DEFAULT_SERVER_URL)),
|
|
11
21
|
apiKey: Config.option(Config.string("apiKey")),
|
|
12
22
|
agentName: Config.option(Config.string("agentName")),
|
|
13
23
|
});
|
|
24
|
+
const EnvOverrideSchema = Config.all({
|
|
25
|
+
apiKey: Config.option(Config.string("MOLTZAP_API_KEY")),
|
|
26
|
+
serverUrl: Config.option(Config.string("MOLTZAP_SERVER_URL")),
|
|
27
|
+
});
|
|
14
28
|
export function getConfigPath() {
|
|
15
29
|
return CONFIG_PATH;
|
|
16
30
|
}
|
|
31
|
+
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
17
32
|
/** Read the on-disk JSON (best-effort: ENOENT → empty object). */
|
|
18
|
-
const readJsonFile = () => Effect.
|
|
19
|
-
|
|
20
|
-
try
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
33
|
+
const readJsonFile = () => Effect.gen(function* () {
|
|
34
|
+
const text = yield* Effect.try({
|
|
35
|
+
try: () => fs.readFileSync(CONFIG_PATH, "utf-8"),
|
|
36
|
+
catch: (err) => err,
|
|
37
|
+
}).pipe(Effect.catchAll((err) => {
|
|
38
|
+
const code = err.code;
|
|
39
|
+
return code === "ENOENT"
|
|
40
|
+
? Effect.succeed(null)
|
|
41
|
+
: Effect.fail(new ConfigReadError({
|
|
42
|
+
cause: err,
|
|
43
|
+
message: `Failed to read ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
|
|
44
|
+
path: CONFIG_PATH,
|
|
45
|
+
}));
|
|
46
|
+
}));
|
|
47
|
+
if (text === null)
|
|
48
|
+
return {};
|
|
49
|
+
const parsed = yield* Effect.try({
|
|
50
|
+
try: () => JSON.parse(text),
|
|
51
|
+
catch: (err) => new ConfigReadError({
|
|
52
|
+
cause: err,
|
|
53
|
+
message: `Failed to parse ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
|
|
54
|
+
path: CONFIG_PATH,
|
|
55
|
+
}),
|
|
56
|
+
});
|
|
57
|
+
if (!isRecord(parsed)) {
|
|
58
|
+
return yield* Effect.fail(new ConfigReadError({
|
|
59
|
+
cause: "config root is not a JSON object",
|
|
60
|
+
message: `Failed to parse ${CONFIG_PATH}: config root is not a JSON object`,
|
|
61
|
+
path: CONFIG_PATH,
|
|
62
|
+
}));
|
|
63
|
+
}
|
|
64
|
+
return parsed;
|
|
31
65
|
});
|
|
32
66
|
/**
|
|
33
67
|
* Load and validate the CLI config. Merges on-disk JSON with env overrides
|
|
@@ -38,28 +72,56 @@ const readJsonFile = () => Effect.try({
|
|
|
38
72
|
export const loadConfig = Effect.gen(function* () {
|
|
39
73
|
const json = yield* readJsonFile();
|
|
40
74
|
const env = {};
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
75
|
+
const envOverrides = yield* EnvOverrideSchema.pipe(Effect.withConfigProvider(ConfigProvider.fromEnv()), Effect.orElseSucceed(() => ({
|
|
76
|
+
apiKey: Option.none(),
|
|
77
|
+
serverUrl: Option.none(),
|
|
78
|
+
})));
|
|
79
|
+
Option.match(envOverrides.serverUrl, {
|
|
80
|
+
onNone: () => undefined,
|
|
81
|
+
onSome: (value) => {
|
|
82
|
+
env.serverUrl = value;
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
Option.match(envOverrides.apiKey, {
|
|
86
|
+
onNone: () => undefined,
|
|
87
|
+
onSome: (value) => {
|
|
88
|
+
env.apiKey = value;
|
|
89
|
+
},
|
|
90
|
+
});
|
|
45
91
|
const provider = ConfigProvider.fromJson({ ...json, ...env });
|
|
46
|
-
const value = yield* ConfigSchema.pipe(Effect.withConfigProvider(provider), Effect.mapError((cause) => new
|
|
92
|
+
const value = yield* ConfigSchema.pipe(Effect.withConfigProvider(provider), Effect.mapError((cause) => new ConfigInvalidError({
|
|
93
|
+
cause,
|
|
94
|
+
message: `Invalid config in ${CONFIG_PATH}: ${cause}`,
|
|
95
|
+
path: CONFIG_PATH,
|
|
96
|
+
})));
|
|
47
97
|
const result = { serverUrl: value.serverUrl };
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
98
|
+
Option.match(value.apiKey, {
|
|
99
|
+
onNone: () => undefined,
|
|
100
|
+
onSome: (value) => {
|
|
101
|
+
result.apiKey = value;
|
|
102
|
+
},
|
|
103
|
+
});
|
|
104
|
+
Option.match(value.agentName, {
|
|
105
|
+
onNone: () => undefined,
|
|
106
|
+
onSome: (value) => {
|
|
107
|
+
result.agentName = value;
|
|
108
|
+
},
|
|
109
|
+
});
|
|
52
110
|
return result;
|
|
53
111
|
});
|
|
54
112
|
/** Write a new config blob to disk. Used by `moltzap register` post-registration. */
|
|
55
113
|
export const writeConfig = (config) => Effect.try({
|
|
56
114
|
try: () => {
|
|
57
115
|
fs.mkdirSync(CONFIG_DIR, { recursive: true });
|
|
58
|
-
fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null,
|
|
59
|
-
mode:
|
|
116
|
+
fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, JSON_INDENT_SPACES) + "\n", {
|
|
117
|
+
mode: CONFIG_FILE_MODE,
|
|
60
118
|
});
|
|
61
119
|
},
|
|
62
|
-
catch: (err) => new
|
|
120
|
+
catch: (err) => new ConfigWriteError({
|
|
121
|
+
cause: err,
|
|
122
|
+
message: `Failed to write ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
|
|
123
|
+
path: CONFIG_PATH,
|
|
124
|
+
}),
|
|
63
125
|
});
|
|
64
126
|
/** Load-modify-write helper. */
|
|
65
127
|
export const updateConfig = (updater) => loadConfig.pipe(Effect.flatMap((current) => writeConfig(updater(current))));
|
|
@@ -70,5 +132,7 @@ export const getHttpUrl = getServerUrl.pipe(Effect.map((url) => url.replace(/^ws
|
|
|
70
132
|
/** Resolve agent API key. Fails if neither env nor config has one set. */
|
|
71
133
|
export const resolveAuth = loadConfig.pipe(Effect.flatMap((config) => config.apiKey
|
|
72
134
|
? Effect.succeed({ agentKey: config.apiKey })
|
|
73
|
-
: Effect.fail(new
|
|
135
|
+
: Effect.fail(new AuthNotConfiguredError({
|
|
136
|
+
message: "No agent registered. Run `moltzap register` first.",
|
|
137
|
+
}))));
|
|
74
138
|
//# sourceMappingURL=config.js.map
|
package/dist/cli/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import type { HttpClientError } from "@effect/platform";
|
|
3
|
+
import { type CliConfigError } from "./config.js";
|
|
3
4
|
import type { Register, Static } from "@moltzap/protocol";
|
|
4
5
|
type RegisterResult = Static<typeof Register.resultSchema>;
|
|
5
|
-
|
|
6
|
+
declare const CliHttpStatusError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
7
|
+
readonly _tag: "CliHttpStatusError";
|
|
8
|
+
} & Readonly<A>;
|
|
9
|
+
export declare class CliHttpStatusError extends CliHttpStatusError_base<{
|
|
10
|
+
readonly status: number;
|
|
11
|
+
readonly responseText: string;
|
|
12
|
+
readonly message: string;
|
|
13
|
+
}> {
|
|
14
|
+
}
|
|
15
|
+
export declare function registerAgent(name: string, inviteCode: string, description?: string): Effect.Effect<RegisterResult, CliConfigError | CliHttpStatusError | HttpClientError.HttpClientError>;
|
|
6
16
|
export {};
|
|
7
17
|
//# sourceMappingURL=http-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/cli/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/cli/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE1D,KAAK,cAAc,GAAG,MAAM,CAAC,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC;;;;AAI3D,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;CAAG;AA2CL,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,CACd,cAAc,EACd,cAAc,GAAG,kBAAkB,GAAG,eAAe,CAAC,eAAe,CACtE,CAMA"}
|
package/dist/cli/http-client.js
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
1
|
+
import { Data, Effect } from "effect";
|
|
2
2
|
import { HttpClient, HttpClientRequest } from "@effect/platform";
|
|
3
3
|
import { NodeHttpClient } from "@effect/platform-node";
|
|
4
4
|
import { getHttpUrl, resolveAuth } from "./config.js";
|
|
5
|
+
const HTTP_SUCCESS_MIN = 200;
|
|
6
|
+
const HTTP_REDIRECT_MIN = 300;
|
|
7
|
+
export class CliHttpStatusError extends Data.TaggedError("CliHttpStatusError") {
|
|
8
|
+
}
|
|
5
9
|
/**
|
|
6
10
|
* POST JSON to a MoltZap REST endpoint. Transport failures surface as the
|
|
7
11
|
* typed `HttpClientError` union (`RequestError | ResponseError`); non-2xx
|
|
8
|
-
* responses surface as `
|
|
12
|
+
* responses surface as `CliHttpStatusError`.
|
|
9
13
|
*/
|
|
10
14
|
function postJson(path, body, opts) {
|
|
11
15
|
return Effect.gen(function* () {
|
|
@@ -16,9 +20,14 @@ function postJson(path, body, opts) {
|
|
|
16
20
|
const client = yield* HttpClient.HttpClient;
|
|
17
21
|
const request = HttpClientRequest.post(`${baseUrl}${path}`).pipe(HttpClientRequest.setHeaders(headers), HttpClientRequest.bodyUnsafeJson(body));
|
|
18
22
|
const response = yield* client.execute(request);
|
|
19
|
-
if (response.status <
|
|
23
|
+
if (response.status < HTTP_SUCCESS_MIN ||
|
|
24
|
+
response.status >= HTTP_REDIRECT_MIN) {
|
|
20
25
|
const text = yield* response.text;
|
|
21
|
-
return yield* Effect.fail(new
|
|
26
|
+
return yield* Effect.fail(new CliHttpStatusError({
|
|
27
|
+
status: response.status,
|
|
28
|
+
responseText: text,
|
|
29
|
+
message: `HTTP ${response.status}: ${text}`,
|
|
30
|
+
}));
|
|
22
31
|
}
|
|
23
32
|
return (yield* response.json);
|
|
24
33
|
}).pipe(Effect.provide(NodeHttpClient.layer));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/cli/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/cli/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAC;AAI3E,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAM,OAAO,kBAAmB,SAAQ,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAI3E;CAAG;AAEL;;;;GAIG;AACH,SAAS,QAAQ,CACf,IAAY,EACZ,IAAa,EACb,IAA2B;IAK3B,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QAClC,MAAM,OAAO,GAA2B,IAAI,EAAE,MAAM;YAClD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,CAC9D,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,EACrC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CACvC,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChD,IACE,QAAQ,CAAC,MAAM,GAAG,gBAAgB;YAClC,QAAQ,CAAC,MAAM,IAAI,iBAAiB,EACpC,CAAC;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,kBAAkB,CAAC;gBACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE;aAC5C,CAAC,CACH,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC;IACrC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,UAAkB,EAClB,WAAoB;IAKpB,OAAO,QAAQ,CACb,uBAAuB,EACvB,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,EACjC,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;AACJ,CAAC"}
|
package/dist/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAoCA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,aAAa,CAAC,MAAM,CAAC,KAC1B;IACD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAqDrB,CAAC"}
|
package/dist/cli/index.js
CHANGED
|
@@ -9,7 +9,6 @@ import { contactsCommand } from "./commands/contacts.js";
|
|
|
9
9
|
import { conversationsCommand, historyCommand, } from "./commands/conversations.js";
|
|
10
10
|
import { inviteCommand } from "./commands/invite.js";
|
|
11
11
|
import { messagesCommand } from "./commands/messages.js";
|
|
12
|
-
import { permissionsCommand } from "./commands/permissions.js";
|
|
13
12
|
import { pingCommand } from "./commands/ping.js";
|
|
14
13
|
import { presenceCommand } from "./commands/presence.js";
|
|
15
14
|
import { registerCommand } from "./commands/register.js";
|
|
@@ -119,11 +118,11 @@ const moltzap = Command.make("moltzap").pipe(Command.withDescription("MoltZap CL
|
|
|
119
118
|
agentsCommand,
|
|
120
119
|
// sbd#177 v2 additions:
|
|
121
120
|
appsCommand,
|
|
122
|
-
permissionsCommand,
|
|
123
121
|
messagesCommand,
|
|
124
122
|
]));
|
|
125
123
|
const cli = Command.run(moltzap, { name: "moltzap", version });
|
|
126
|
-
const
|
|
124
|
+
const NODE_ARGV_USER_ARGS_OFFSET = 2;
|
|
125
|
+
const { impersonateKey, profileName, rest } = extractGlobalFlags(process.argv.slice(NODE_ARGV_USER_ARGS_OFFSET));
|
|
127
126
|
const resolverInput = {};
|
|
128
127
|
if (impersonateKey !== undefined)
|
|
129
128
|
resolverInput.impersonateKey = impersonateKey;
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EACL,oBAAoB,EACpB,cAAc,GACf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/profile.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
1
|
+
import { Brand, Effect } from "effect";
|
|
2
2
|
/**
|
|
3
3
|
* Branded profile name. Enforces the same NAME_PATTERN already gated by
|
|
4
4
|
* `commands/register.ts`: `/^[a-z0-9][a-z0-9-]{1,30}[a-z0-9]$/`.
|
|
5
5
|
*/
|
|
6
|
-
export type ProfileName = string &
|
|
7
|
-
|
|
8
|
-
};
|
|
6
|
+
export type ProfileName = string & Brand.Brand<"ProfileName">;
|
|
7
|
+
export declare const ProfileName: Brand.Brand.Constructor<ProfileName>;
|
|
9
8
|
/** Sentinel used when the caller addresses the legacy top-level record. */
|
|
10
9
|
export type DefaultProfileId = "default";
|
|
11
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cli/profile.ts"],"names":[],"mappings":"AAqBA,OAAO,
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cli/profile.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,KAAK,EAAgC,MAAM,EAAU,MAAM,QAAQ,CAAC;AAI7E;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;AAC9D,eAAO,MAAM,WAAW,sCAA+B,CAAC;AAExD,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAwBzC;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC3D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAID,sDAAsD;AACtD,MAAM,MAAM,YAAY,GACpB,oBAAoB,GACpB,yBAAyB,GACzB,uBAAuB,GACvB,sBAAsB,GACtB,uBAAuB,CAAC;;;;AAE5B,qBAAa,oBAAqB,SAAQ,0BAExC;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,yBAA0B,SAAQ,+BAE7C;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,uBAAwB,SAAQ,6BAE3C;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,4BAE1C;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG;;;;AAEL,qBAAa,uBAAwB,SAAQ,6BAE3C;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG;AAIL;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAC3B,KAAK,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,uBAAuB,CAgBpD,CAAC;AA4EF;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAC3C,aAAa,EACb,sBAAsB,CA2BtB,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,WAAW,GAAG,SAAS,KAC5B,MAAM,CAAC,MAAM,CACd,aAAa,EACb,oBAAoB,GAAG,sBAAsB,CAiB3C,CAAC;AAEL;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,WAAW,GAAG,gBAAgB,EACpC,QAAQ,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,sBAAsB,CA0CnE,CAAC;AAEL;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC;IAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE,EAAE,KAAK,CAC9B,CAAC;AAI7B;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAE1D,CAAC"}
|
package/dist/cli/profile.js
CHANGED
|
@@ -19,10 +19,15 @@
|
|
|
19
19
|
import * as fs from "node:fs";
|
|
20
20
|
import * as os from "node:os";
|
|
21
21
|
import * as path from "node:path";
|
|
22
|
-
import { Data, Effect } from "effect";
|
|
22
|
+
import { Brand, Config, ConfigProvider, Data, Effect, Option } from "effect";
|
|
23
|
+
export const ProfileName = Brand.nominal();
|
|
23
24
|
const NAME_PATTERN = /^[a-z0-9][a-z0-9-]{1,30}[a-z0-9]$/;
|
|
24
25
|
const DEFAULT_SERVER_URL = "wss://api.moltzap.xyz";
|
|
25
|
-
const
|
|
26
|
+
const CONFIG_FILE_MODE = 0o600;
|
|
27
|
+
const JSON_INDENT_SPACES = 2;
|
|
28
|
+
const ConfigHome = Config.option(Config.string("MOLTZAP_CONFIG_HOME"));
|
|
29
|
+
const getConfigHomeSync = () => Option.getOrUndefined(Effect.runSync(ConfigHome.pipe(Effect.withConfigProvider(ConfigProvider.fromEnv()))));
|
|
30
|
+
const getConfigDir = () => getConfigHomeSync() ?? path.join(os.homedir(), ".moltzap");
|
|
26
31
|
const getConfigFilePathSync = () => path.join(getConfigDir(), "config.json");
|
|
27
32
|
export class ProfileNotFoundError extends Data.TaggedError("ProfileNotFoundError") {
|
|
28
33
|
}
|
|
@@ -49,7 +54,7 @@ export const parseProfileName = (raw) => {
|
|
|
49
54
|
reason: "must be 3-32 chars, lowercase alphanumeric and hyphens, cannot start or end with a hyphen",
|
|
50
55
|
}));
|
|
51
56
|
}
|
|
52
|
-
return Effect.succeed(raw);
|
|
57
|
+
return Effect.succeed(ProfileName(raw));
|
|
53
58
|
};
|
|
54
59
|
const isRecord = (x) => typeof x === "object" && x !== null && !Array.isArray(x);
|
|
55
60
|
const decodeProfileRecord = (raw, fallbackServerUrl) => {
|
|
@@ -67,29 +72,37 @@ const decodeProfileRecord = (raw, fallbackServerUrl) => {
|
|
|
67
72
|
}
|
|
68
73
|
return record;
|
|
69
74
|
};
|
|
70
|
-
const readRawConfig = () => Effect.
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
try
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
75
|
+
const readRawConfig = () => Effect.gen(function* () {
|
|
76
|
+
const configPath = getConfigFilePathSync();
|
|
77
|
+
const text = yield* Effect.try({
|
|
78
|
+
try: () => fs.readFileSync(configPath, "utf-8"),
|
|
79
|
+
catch: (err) => err,
|
|
80
|
+
}).pipe(Effect.catchAll((err) => {
|
|
81
|
+
const code = err.code;
|
|
82
|
+
return code === "ENOENT"
|
|
83
|
+
? Effect.succeed(null)
|
|
84
|
+
: Effect.fail(new ProfileConfigReadError({
|
|
85
|
+
path: configPath,
|
|
86
|
+
cause: err,
|
|
87
|
+
}));
|
|
88
|
+
}));
|
|
89
|
+
if (text === null) {
|
|
90
|
+
return { raw: {}, existed: false };
|
|
91
|
+
}
|
|
92
|
+
const parsed = yield* Effect.try({
|
|
93
|
+
try: () => JSON.parse(text),
|
|
94
|
+
catch: (err) => new ProfileConfigReadError({
|
|
95
|
+
path: configPath,
|
|
96
|
+
cause: err,
|
|
97
|
+
}),
|
|
98
|
+
});
|
|
99
|
+
if (!isRecord(parsed)) {
|
|
100
|
+
return yield* Effect.fail(new ProfileConfigReadError({
|
|
101
|
+
path: configPath,
|
|
102
|
+
cause: "config root is not a JSON object",
|
|
103
|
+
}));
|
|
104
|
+
}
|
|
105
|
+
return { raw: parsed, existed: true };
|
|
93
106
|
});
|
|
94
107
|
/**
|
|
95
108
|
* Load the full layered config view. Missing file resolves to an empty
|
|
@@ -118,7 +131,7 @@ export const loadLayeredConfig = Effect.gen(function* () {
|
|
|
118
131
|
continue; // tolerate malformed entries
|
|
119
132
|
const record = decodeProfileRecord(value, serverUrl);
|
|
120
133
|
if (record !== undefined) {
|
|
121
|
-
profiles.set(name, record);
|
|
134
|
+
profiles.set(ProfileName(name), record);
|
|
122
135
|
}
|
|
123
136
|
}
|
|
124
137
|
}
|
|
@@ -184,8 +197,8 @@ export const writeProfile = (name, record) => Effect.gen(function* () {
|
|
|
184
197
|
yield* Effect.try({
|
|
185
198
|
try: () => {
|
|
186
199
|
fs.mkdirSync(configDir, { recursive: true });
|
|
187
|
-
fs.writeFileSync(configPath, JSON.stringify(next, null,
|
|
188
|
-
mode:
|
|
200
|
+
fs.writeFileSync(configPath, JSON.stringify(next, null, JSON_INDENT_SPACES) + "\n", {
|
|
201
|
+
mode: CONFIG_FILE_MODE,
|
|
189
202
|
});
|
|
190
203
|
},
|
|
191
204
|
catch: (err) => new ProfileConfigWriteError({ path: configPath, cause: err }),
|
package/dist/cli/profile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/cli/profile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/cli/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/cli/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/cli/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAIL,MAAM,IAAI,YAAY,EACtB,QAAQ,EACT,MAAM,QAAQ,CAAC;AAChB,OAAO,IAAI,MAAM,MAAM,CAAC;AAiCxB;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,oCAyBxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,mDAOtB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,QAmB/B,CAAC;AAEL,oEAAoE;AACpE,eAAO,MAAM,SAAS,6BAAO,CAAC"}
|
package/dist/cli/runtime.js
CHANGED
|
@@ -9,11 +9,16 @@
|
|
|
9
9
|
* as an Effect `Logger` so `Effect.logInfo(...).pipe(Effect.annotateLogs(...))`
|
|
10
10
|
* inside commands routes through the same output format.
|
|
11
11
|
*/
|
|
12
|
-
import { Logger as EffectLogger, LogLevel } from "effect";
|
|
12
|
+
import { Config, ConfigProvider, Effect, Logger as EffectLogger, LogLevel, } from "effect";
|
|
13
13
|
import pino from "pino";
|
|
14
|
+
const CliRuntimeEnv = Config.all({
|
|
15
|
+
logLevel: Config.string("MOLTZAP_LOG_LEVEL").pipe(Config.withDefault("info")),
|
|
16
|
+
nodeEnv: Config.string("NODE_ENV").pipe(Config.withDefault("development")),
|
|
17
|
+
});
|
|
18
|
+
const runtimeEnv = Effect.runSync(CliRuntimeEnv.pipe(Effect.withConfigProvider(ConfigProvider.fromEnv())));
|
|
14
19
|
const PINO = pino({
|
|
15
|
-
level:
|
|
16
|
-
transport:
|
|
20
|
+
level: runtimeEnv.logLevel,
|
|
21
|
+
transport: runtimeEnv.nodeEnv !== "production"
|
|
17
22
|
? { target: "pino-pretty", options: { colorize: true } }
|
|
18
23
|
: undefined,
|
|
19
24
|
});
|
|
@@ -69,7 +74,7 @@ export const LoggerLive = EffectLogger.replace(EffectLogger.defaultLogger, effec
|
|
|
69
74
|
* Used when composing layers at the CLI entrypoint.
|
|
70
75
|
*/
|
|
71
76
|
export const minLogLevel = (() => {
|
|
72
|
-
const env =
|
|
77
|
+
const env = runtimeEnv.logLevel.toLowerCase();
|
|
73
78
|
switch (env) {
|
|
74
79
|
case "trace":
|
|
75
80
|
return LogLevel.Trace;
|