@leemour/cli-messaging 0.86.0 → 0.88.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/README.md +1 -0
- package/dist/background/index.d.ts +5 -0
- package/dist/background/index.d.ts.map +1 -0
- package/dist/background/index.js +5 -0
- package/dist/background/index.js.map +1 -0
- package/dist/background/lock.d.ts +17 -0
- package/dist/background/lock.d.ts.map +1 -0
- package/dist/background/lock.js +34 -0
- package/dist/background/lock.js.map +1 -0
- package/dist/background/processes.d.ts.map +1 -0
- package/dist/background/processes.js.map +1 -0
- package/dist/background/system.d.ts +20 -0
- package/dist/background/system.d.ts.map +1 -0
- package/dist/background/system.js +39 -0
- package/dist/background/system.js.map +1 -0
- package/dist/background/units.d.ts +42 -0
- package/dist/background/units.d.ts.map +1 -0
- package/dist/background/units.js +178 -0
- package/dist/background/units.js.map +1 -0
- package/dist/cli/config-command.d.ts.map +1 -1
- package/dist/cli/config-command.js +17 -5
- package/dist/cli/config-command.js.map +1 -1
- package/dist/cli/context.d.ts +3 -0
- package/dist/cli/context.d.ts.map +1 -1
- package/dist/cli/context.js.map +1 -1
- package/dist/cli/index.d.ts +5 -3
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +4 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/messenger/account-command.d.ts +0 -3
- package/dist/cli/messenger/account-command.d.ts.map +1 -1
- package/dist/cli/messenger/account-command.js +20 -2
- package/dist/cli/messenger/account-command.js.map +1 -1
- package/dist/cli/messenger/account-sessions-command.d.ts.map +1 -1
- package/dist/cli/messenger/account-sessions-command.js +13 -0
- package/dist/cli/messenger/account-sessions-command.js.map +1 -1
- package/dist/cli/messenger/admin-moderation-command.d.ts +11 -0
- package/dist/cli/messenger/admin-moderation-command.d.ts.map +1 -0
- package/dist/cli/messenger/admin-moderation-command.js +83 -0
- package/dist/cli/messenger/admin-moderation-command.js.map +1 -0
- package/dist/cli/messenger/after.d.ts +2 -0
- package/dist/cli/messenger/after.d.ts.map +1 -1
- package/dist/cli/messenger/after.js +23 -2
- package/dist/cli/messenger/after.js.map +1 -1
- package/dist/cli/messenger/archive-commands.d.ts.map +1 -1
- package/dist/cli/messenger/archive-commands.js +4 -4
- package/dist/cli/messenger/archive-commands.js.map +1 -1
- package/dist/cli/messenger/ask.d.ts +2 -0
- package/dist/cli/messenger/ask.d.ts.map +1 -1
- package/dist/cli/messenger/ask.js +7 -0
- package/dist/cli/messenger/ask.js.map +1 -1
- package/dist/cli/messenger/backfill-command.d.ts +1 -1
- package/dist/cli/messenger/backfill-command.d.ts.map +1 -1
- package/dist/cli/messenger/backfill-command.js +27 -18
- package/dist/cli/messenger/backfill-command.js.map +1 -1
- package/dist/cli/messenger/backfill-jobs.d.ts +3 -2
- package/dist/cli/messenger/backfill-jobs.d.ts.map +1 -1
- package/dist/cli/messenger/backfill-jobs.js +1 -1
- package/dist/cli/messenger/backfill-jobs.js.map +1 -1
- package/dist/cli/messenger/chats-command.d.ts +0 -3
- package/dist/cli/messenger/chats-command.d.ts.map +1 -1
- package/dist/cli/messenger/chats-command.js +12 -25
- package/dist/cli/messenger/chats-command.js.map +1 -1
- package/dist/cli/messenger/context.d.ts +6 -1
- package/dist/cli/messenger/context.d.ts.map +1 -1
- package/dist/cli/messenger/context.js +3 -0
- package/dist/cli/messenger/context.js.map +1 -1
- package/dist/cli/messenger/download-command.js +6 -6
- package/dist/cli/messenger/download-command.js.map +1 -1
- package/dist/cli/messenger/hearing-command.d.ts +0 -2
- package/dist/cli/messenger/hearing-command.d.ts.map +1 -1
- package/dist/cli/messenger/hearing-command.js +4 -9
- package/dist/cli/messenger/hearing-command.js.map +1 -1
- package/dist/cli/messenger/inbox.d.ts +1 -8
- package/dist/cli/messenger/inbox.d.ts.map +1 -1
- package/dist/cli/messenger/inbox.js +8 -28
- package/dist/cli/messenger/inbox.js.map +1 -1
- package/dist/cli/messenger/messages-command.d.ts.map +1 -1
- package/dist/cli/messenger/messages-command.js +20 -13
- package/dist/cli/messenger/messages-command.js.map +1 -1
- package/dist/cli/messenger/port.d.ts +21 -2
- package/dist/cli/messenger/port.d.ts.map +1 -1
- package/dist/cli/messenger/port.js.map +1 -1
- package/dist/cli/messenger/review.d.ts +0 -4
- package/dist/cli/messenger/review.d.ts.map +1 -1
- package/dist/cli/messenger/review.js +8 -11
- package/dist/cli/messenger/review.js.map +1 -1
- package/dist/cli/messenger/serve-command.d.ts +1 -13
- package/dist/cli/messenger/serve-command.d.ts.map +1 -1
- package/dist/cli/messenger/serve-command.js +7 -32
- package/dist/cli/messenger/serve-command.js.map +1 -1
- package/dist/cli/messenger/server-command.d.ts +1 -17
- package/dist/cli/messenger/server-command.d.ts.map +1 -1
- package/dist/cli/messenger/server-command.js +6 -213
- package/dist/cli/messenger/server-command.js.map +1 -1
- package/dist/cli/messenger/store-maintenance-command.d.ts.map +1 -1
- package/dist/cli/messenger/store-maintenance-command.js +1 -1
- package/dist/cli/messenger/store-maintenance-command.js.map +1 -1
- package/dist/cli/messenger/transcribe-command.d.ts.map +1 -1
- package/dist/cli/messenger/transcribe-command.js +4 -1
- package/dist/cli/messenger/transcribe-command.js.map +1 -1
- package/dist/cli/settings.d.ts +25 -1
- package/dist/cli/settings.d.ts.map +1 -1
- package/dist/cli/settings.js +108 -34
- package/dist/cli/settings.js.map +1 -1
- package/dist/domain/models.d.ts +2 -0
- package/dist/domain/models.d.ts.map +1 -1
- package/dist/domain/send-time.d.ts +1 -1
- package/dist/domain/send-time.js +4 -4
- package/dist/domain/send-time.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/mcp/server.d.ts +4 -3
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tools/account.d.ts.map +1 -1
- package/dist/mcp/tools/account.js +1 -1
- package/dist/mcp/tools/account.js.map +1 -1
- package/dist/mcp/tools/chats.d.ts.map +1 -1
- package/dist/mcp/tools/chats.js +2 -2
- package/dist/mcp/tools/chats.js.map +1 -1
- package/dist/mcp/tools/contacts-write.d.ts +1 -1
- package/dist/mcp/tools/contacts-write.d.ts.map +1 -1
- package/dist/mcp/tools/contacts-write.js +19 -1
- package/dist/mcp/tools/contacts-write.js.map +1 -1
- package/dist/mcp/tools/inbox.d.ts.map +1 -1
- package/dist/mcp/tools/inbox.js +2 -3
- package/dist/mcp/tools/inbox.js.map +1 -1
- package/dist/mcp/tools/messages.d.ts.map +1 -1
- package/dist/mcp/tools/messages.js +1 -2
- package/dist/mcp/tools/messages.js.map +1 -1
- package/dist/mcp/tools/moderation.d.ts +8 -0
- package/dist/mcp/tools/moderation.d.ts.map +1 -0
- package/dist/mcp/tools/moderation.js +36 -0
- package/dist/mcp/tools/moderation.js.map +1 -0
- package/dist/mcp/tools/review.d.ts.map +1 -1
- package/dist/mcp/tools/review.js +3 -4
- package/dist/mcp/tools/review.js.map +1 -1
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js +2 -0
- package/dist/mcp/tools.js.map +1 -1
- package/dist/moderation/check.d.ts +83 -0
- package/dist/moderation/check.d.ts.map +1 -0
- package/dist/moderation/check.js +227 -0
- package/dist/moderation/check.js.map +1 -0
- package/dist/moderation/rules.d.ts +105 -0
- package/dist/moderation/rules.d.ts.map +1 -0
- package/dist/moderation/rules.js +158 -0
- package/dist/moderation/rules.js.map +1 -0
- package/dist/resolve.d.ts +1 -0
- package/dist/resolve.d.ts.map +1 -1
- package/dist/resolve.js +5 -5
- package/dist/resolve.js.map +1 -1
- package/dist/sends/permissions.d.ts +5 -3
- package/dist/sends/permissions.d.ts.map +1 -1
- package/dist/sends/permissions.js +29 -5
- package/dist/sends/permissions.js.map +1 -1
- package/dist/services/account.d.ts +17 -0
- package/dist/services/account.d.ts.map +1 -0
- package/dist/services/account.js +33 -0
- package/dist/services/account.js.map +1 -0
- package/dist/services/archive.d.ts +6 -3
- package/dist/services/archive.d.ts.map +1 -1
- package/dist/services/archive.js +10 -8
- package/dist/services/archive.js.map +1 -1
- package/dist/services/chats.d.ts +4 -1
- package/dist/services/chats.d.ts.map +1 -1
- package/dist/services/chats.js +15 -0
- package/dist/services/chats.js.map +1 -1
- package/dist/services/deps.d.ts +7 -1
- package/dist/services/deps.d.ts.map +1 -1
- package/dist/services/deps.js +2 -1
- package/dist/services/deps.js.map +1 -1
- package/dist/services/inbox.d.ts +4 -0
- package/dist/services/inbox.d.ts.map +1 -1
- package/dist/services/inbox.js +4 -0
- package/dist/services/inbox.js.map +1 -1
- package/dist/services/index.d.ts +8 -0
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +6 -0
- package/dist/services/index.js.map +1 -1
- package/dist/services/messages.d.ts +2 -0
- package/dist/services/messages.d.ts.map +1 -1
- package/dist/services/messages.js +11 -2
- package/dist/services/messages.js.map +1 -1
- package/dist/services/moderation.d.ts +33 -0
- package/dist/services/moderation.d.ts.map +1 -0
- package/dist/services/moderation.js +99 -0
- package/dist/services/moderation.js.map +1 -0
- package/dist/services/moment.d.ts +8 -0
- package/dist/services/moment.d.ts.map +1 -0
- package/dist/services/moment.js +24 -0
- package/dist/services/moment.js.map +1 -0
- package/dist/services/people.d.ts +3 -1
- package/dist/services/people.d.ts.map +1 -1
- package/dist/services/people.js +2 -0
- package/dist/services/people.js.map +1 -1
- package/dist/speech/hearing.d.ts +2 -0
- package/dist/speech/hearing.d.ts.map +1 -1
- package/dist/speech/hearing.js +8 -0
- package/dist/speech/hearing.js.map +1 -1
- package/dist/speech/transcribe.d.ts +5 -1
- package/dist/speech/transcribe.d.ts.map +1 -1
- package/dist/speech/transcribe.js +2 -2
- package/dist/speech/transcribe.js.map +1 -1
- package/dist/store/sqlite/drizzle/bun.js +1 -1
- package/dist/store/sqlite/drizzle/core.d.ts +1 -1
- package/dist/store/sqlite/drizzle/core.d.ts.map +1 -1
- package/dist/store/sqlite/drizzle/core.js +5 -3
- package/dist/store/sqlite/drizzle/core.js.map +1 -1
- package/dist/store/sqlite/drizzle/node.js +1 -1
- package/dist/store/sqlite/drizzle/{shared-JAIU3GYB.js → shared-VIVPOB3Q.js} +5 -1
- package/dist/store/sqlite/drizzle/{shared-JAIU3GYB.js.map → shared-VIVPOB3Q.js.map} +1 -1
- package/dist/store/sqlite/manifest.d.ts.map +1 -1
- package/dist/store/sqlite/manifest.js +1 -0
- package/dist/store/sqlite/manifest.js.map +1 -1
- package/dist/store/sqlite/migrations.generated.d.ts.map +1 -1
- package/dist/store/sqlite/migrations.generated.js +15 -0
- package/dist/store/sqlite/migrations.generated.js.map +1 -1
- package/dist/store/sqlite/schema.d.ts +494 -0
- package/dist/store/sqlite/schema.d.ts.map +1 -1
- package/dist/store/sqlite/schema.js +78 -1
- package/dist/store/sqlite/schema.js.map +1 -1
- package/package.json +5 -1
- package/parity.json +191 -65
- package/dist/cli/messenger/processes.d.ts.map +0 -1
- package/dist/cli/messenger/processes.js.map +0 -1
- /package/dist/{cli/messenger → background}/processes.d.ts +0 -0
- /package/dist/{cli/messenger → background}/processes.js +0 -0
package/README.md
CHANGED
|
@@ -76,6 +76,7 @@ the same day.
|
|
|
76
76
|
| `./store` | `openStore`, `MessageStore`, `storePath`, and the file format: `minCompatible` rises only in a breaking release |
|
|
77
77
|
| `./sends` | `sendGuard`, `SendJournal`, the journal's line format |
|
|
78
78
|
| `./services` | `servicesFor`, `Override` and the service names |
|
|
79
|
+
| `./background` | `lockPath`, `readLock`, `holdLock`, `releaseLock`, `servingProfiles`, `alive`, `carries`, `holdersOf`, `ServerSystem`, `thisMachine`, `platformFor` and the systemd and launchd units |
|
|
79
80
|
|
|
80
81
|
Everything else may change in any release, and still goes under "Changed — may break callers" when
|
|
81
82
|
it does. tg-cli and max-cli take new versions through Dependabot pull requests.
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export { holdLock, type Lock, lockPath, readLock, releaseLock, servingProfiles } from "./lock.js";
|
|
2
|
+
export { alive, carries, holdersOf } from "./processes.js";
|
|
3
|
+
export { type Ran, runProgram, type ServerSystem, thisMachine } from "./system.js";
|
|
4
|
+
export { launchd, locationVariables, noUnits, type Platform, platformFor, systemd, tail, type Unit } from "./units.js";
|
|
5
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/background/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AACjG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,EAAE,KAAK,GAAG,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export { holdLock, lockPath, readLock, releaseLock, servingProfiles } from "./lock.js";
|
|
2
|
+
export { alive, carries, holdersOf } from "./processes.js";
|
|
3
|
+
export { runProgram, thisMachine } from "./system.js";
|
|
4
|
+
export { launchd, locationVariables, noUnits, platformFor, systemd, tail } from "./units.js";
|
|
5
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/background/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AACjG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,EAAY,UAAU,EAAqB,WAAW,EAAE,MAAM,aAAa,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAiB,WAAW,EAAE,OAAO,EAAE,IAAI,EAAa,MAAM,YAAY,CAAA"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { AppIdentity } from "../cli/app.js";
|
|
2
|
+
export interface Lock {
|
|
3
|
+
pid: number;
|
|
4
|
+
startedAt: string;
|
|
5
|
+
/** Set once the connection is open and updates arrive — before it, `serve` is still starting. */
|
|
6
|
+
listeningAt?: string;
|
|
7
|
+
/** The CLI version this serve runs: after an update it goes on running the old code until restarted. */
|
|
8
|
+
version?: string;
|
|
9
|
+
}
|
|
10
|
+
export declare const lockPath: (app: AppIdentity, profile: string, env: NodeJS.ProcessEnv) => string;
|
|
11
|
+
export declare const readLock: (path: string) => Lock | undefined;
|
|
12
|
+
export declare const holdLock: (path: string, lock: Lock) => void;
|
|
13
|
+
/** Only the process that holds the lock removes it: one refused as a second serve must not free it. */
|
|
14
|
+
export declare const releaseLock: (path: string, pid?: number) => void;
|
|
15
|
+
/** The profiles a serve is running for now — what an update must restart for its new code to run. */
|
|
16
|
+
export declare const servingProfiles: (app: AppIdentity, env: NodeJS.ProcessEnv) => string[];
|
|
17
|
+
//# sourceMappingURL=lock.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../src/background/lock.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,MAAM,WAAW,IAAI;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,iGAAiG;IACjG,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,wGAAwG;IACxG,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,QAAQ,QAAS,WAAW,WAAW,MAAM,OAAO,MAAM,CAAC,UAAU,WAC0B,CAAA;AAE5G,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,IAAI,GAAG,SAO9C,CAAA;AAED,eAAO,MAAM,QAAQ,SAAU,MAAM,QAAQ,IAAI,SAA4D,CAAA;AAE7G,uGAAuG;AACvG,eAAO,MAAM,WAAW,SAAU,MAAM,uBAEvC,CAAA;AAED,qGAAqG;AACrG,eAAO,MAAM,eAAe,QAAS,WAAW,OAAO,MAAM,CAAC,UAAU,KAAG,MAAM,EAUhF,CAAA"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { existsSync, readdirSync, readFileSync, rmSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { resolvePaths, writeSecurely } from "@leemour/cli-core";
|
|
4
|
+
import { alive } from "./processes.js";
|
|
5
|
+
export const lockPath = (app, profile, env) => join(resolvePaths({ appName: app.appName, prefix: app.envPrefix, env }).state, "serve", `${profile}.lock`);
|
|
6
|
+
export const readLock = (path) => {
|
|
7
|
+
try {
|
|
8
|
+
const lock = JSON.parse(readFileSync(path, "utf8"));
|
|
9
|
+
return typeof lock.pid === "number" && typeof lock.startedAt === "string" ? lock : undefined;
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
export const holdLock = (path, lock) => writeSecurely(path, `${JSON.stringify(lock)}\n`, 0o600);
|
|
16
|
+
/** Only the process that holds the lock removes it: one refused as a second serve must not free it. */
|
|
17
|
+
export const releaseLock = (path, pid = process.pid) => {
|
|
18
|
+
if (readLock(path)?.pid === pid)
|
|
19
|
+
rmSync(path, { force: true });
|
|
20
|
+
};
|
|
21
|
+
/** The profiles a serve is running for now — what an update must restart for its new code to run. */
|
|
22
|
+
export const servingProfiles = (app, env) => {
|
|
23
|
+
const dir = dirname(lockPath(app, "default", env));
|
|
24
|
+
if (!existsSync(dir))
|
|
25
|
+
return [];
|
|
26
|
+
return readdirSync(dir)
|
|
27
|
+
.filter((name) => name.endsWith(".lock"))
|
|
28
|
+
.map((name) => name.slice(0, -".lock".length))
|
|
29
|
+
.filter((profile) => {
|
|
30
|
+
const lock = readLock(lockPath(app, profile, env));
|
|
31
|
+
return lock !== undefined && alive(lock.pid);
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=lock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/background/lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAWtC,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAgB,EAAE,OAAe,EAAE,GAAsB,EAAE,EAAE,CACpF,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,OAAO,CAAC,CAAA;AAE5G,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAoB,EAAE;IACzD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAkB,CAAA;QACpE,OAAO,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAa,CAAC,CAAC,CAAC,SAAS,CAAA;IACxG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,IAAU,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAE7G,uGAAuG;AACvG,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE;IAC7D,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG;QAAE,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,qGAAqG;AACrG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAgB,EAAE,GAAsB,EAAY,EAAE;IACpF,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAA;IAClD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAA;IAC/B,OAAO,WAAW,CAAC,GAAG,CAAC;SACpB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAC7C,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAClB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QAClD,OAAO,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processes.d.ts","sourceRoot":"","sources":["../../src/background/processes.ts"],"names":[],"mappings":"AAGA,mEAAmE;AACnE,eAAO,MAAM,KAAK,QAAS,MAAM,KAAG,OAOnC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO,QAAS,MAAM,UAAU,MAAM,KAAG,OAgBrD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,UAAW,MAAM,EAAE,KAAG,MAAM,EAAE,GAAG,SAiCtD,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processes.js","sourceRoot":"","sources":["../../src/background/processes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export interface Ran {
|
|
2
|
+
code: number;
|
|
3
|
+
stdout: string;
|
|
4
|
+
stderr: string;
|
|
5
|
+
}
|
|
6
|
+
/** What `server` asks of the machine. Tests hand one in; nothing else does. */
|
|
7
|
+
export interface ServerSystem {
|
|
8
|
+
platform: NodeJS.Platform;
|
|
9
|
+
run: (argv: string[], env: NodeJS.ProcessEnv) => Promise<Ran>;
|
|
10
|
+
/** The command line that starts this CLI: the node binary and the script, both absolute. */
|
|
11
|
+
entry: string[];
|
|
12
|
+
uid: number;
|
|
13
|
+
/** Starts `<cli> <argv>` apart from this process, writing to `log`, and answers its PID. */
|
|
14
|
+
spawn: (argv: string[], env: NodeJS.ProcessEnv, log: string) => number;
|
|
15
|
+
/** The pause between two looks at whether `serve` is listening yet. */
|
|
16
|
+
pause: () => Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
export declare const runProgram: (argv: string[], env: NodeJS.ProcessEnv) => Promise<Ran>;
|
|
19
|
+
export declare const thisMachine: () => ServerSystem;
|
|
20
|
+
//# sourceMappingURL=system.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/background/system.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAA;IACzB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7D,4FAA4F;IAC5F,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,4FAA4F;IAC5F,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IACtE,uEAAuE;IACvE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAED,eAAO,MAAM,UAAU,SAAU,MAAM,EAAE,OAAO,MAAM,CAAC,UAAU,KAAG,OAAO,CAAC,GAAG,CAU3E,CAAA;AAEJ,eAAO,MAAM,WAAW,QAAO,YAqB9B,CAAA"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { execFile, spawn } from "node:child_process";
|
|
2
|
+
import { closeSync, mkdirSync, openSync, realpathSync } from "node:fs";
|
|
3
|
+
import { dirname } from "node:path";
|
|
4
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
5
|
+
import { CliError } from "@leemour/cli-core";
|
|
6
|
+
export const runProgram = (argv, env) => new Promise((resolve, reject) => {
|
|
7
|
+
const [file = "", ...args] = argv;
|
|
8
|
+
execFile(file, args, { env, encoding: "utf8" }, (error, stdout, stderr) => {
|
|
9
|
+
if (error?.code === "ENOENT") {
|
|
10
|
+
reject(new CliError("configuration_error", `${file} was not found — this machine has no ${file} to run serve`));
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
resolve({ code: typeof error?.code === "number" ? error.code : error ? 1 : 0, stdout, stderr });
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
export const thisMachine = () => {
|
|
17
|
+
const entry = [process.execPath, realpathSync(process.argv[1] ?? "")];
|
|
18
|
+
return {
|
|
19
|
+
platform: process.platform,
|
|
20
|
+
run: runProgram,
|
|
21
|
+
entry,
|
|
22
|
+
uid: process.getuid?.() ?? 0,
|
|
23
|
+
spawn: (argv, env, log) => {
|
|
24
|
+
mkdirSync(dirname(log), { recursive: true, mode: 0o700 });
|
|
25
|
+
const out = openSync(log, "a", 0o600);
|
|
26
|
+
try {
|
|
27
|
+
const [file = "", ...rest] = entry;
|
|
28
|
+
const child = spawn(file, [...rest, ...argv], { detached: true, stdio: ["ignore", out, out], env });
|
|
29
|
+
child.unref();
|
|
30
|
+
return child.pid ?? 0;
|
|
31
|
+
}
|
|
32
|
+
finally {
|
|
33
|
+
closeSync(out);
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
pause: () => sleep(250),
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
//# sourceMappingURL=system.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/background/system.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAqB5C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAc,EAAE,GAAsB,EAAgB,EAAE,CACjF,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;QACxE,IAAK,KAAsC,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,QAAQ,CAAC,qBAAqB,EAAE,GAAG,IAAI,wCAAwC,IAAI,eAAe,CAAC,CAAC,CAAA;YAC/G,OAAM;QACR,CAAC;QACD,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IACjG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,WAAW,GAAG,GAAiB,EAAE;IAC5C,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACrE,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,EAAE,UAAU;QACf,KAAK;QACL,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC;QAC5B,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YACzD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;YACrC,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAA;gBAClC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;gBACnG,KAAK,CAAC,KAAK,EAAE,CAAA;gBACb,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;YACvB,CAAC;oBAAS,CAAC;gBACT,SAAS,CAAC,GAAG,CAAC,CAAA;YAChB,CAAC;QACH,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;KACxB,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { AppIdentity } from "../cli/app.js";
|
|
2
|
+
import type { ServerSystem } from "./system.js";
|
|
3
|
+
export interface Unit {
|
|
4
|
+
profile: string;
|
|
5
|
+
/** What `systemctl` or `launchctl` call it. */
|
|
6
|
+
name: string;
|
|
7
|
+
path: string;
|
|
8
|
+
logPath?: string;
|
|
9
|
+
/** What the unit runs, and the variables it runs with. */
|
|
10
|
+
command: string[];
|
|
11
|
+
environment: Record<string, string>;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Only the variables that say **where** the files are travel into the unit: a unit written from a
|
|
15
|
+
* development checkout must open that checkout's session and store, never the owner's real ones.
|
|
16
|
+
* Nothing that could hold a credential is copied.
|
|
17
|
+
*/
|
|
18
|
+
export declare const locationVariables: (app: AppIdentity, env: NodeJS.ProcessEnv) => Record<string, string>;
|
|
19
|
+
export interface Platform {
|
|
20
|
+
unit: (base: Omit<Unit, "name" | "path">) => Unit;
|
|
21
|
+
text: (unit: Unit, app: AppIdentity) => string;
|
|
22
|
+
start: (unit: Unit) => string[][];
|
|
23
|
+
stop: (unit: Unit) => string[][];
|
|
24
|
+
state: (unit: Unit) => Promise<{
|
|
25
|
+
loaded: boolean;
|
|
26
|
+
active: boolean;
|
|
27
|
+
pid?: number;
|
|
28
|
+
detail?: string;
|
|
29
|
+
}>;
|
|
30
|
+
logs: (unit: Unit, lines: number) => Promise<string>;
|
|
31
|
+
/** What must exist before the unit first runs. */
|
|
32
|
+
prepare?: (unit: Unit) => void;
|
|
33
|
+
/** How to have it start at every login too. */
|
|
34
|
+
atLogin: (unit: Unit) => string;
|
|
35
|
+
}
|
|
36
|
+
export declare const systemd: (app: AppIdentity, system: ServerSystem, env: NodeJS.ProcessEnv) => Platform;
|
|
37
|
+
export declare const launchd: (app: AppIdentity, system: ServerSystem, env: NodeJS.ProcessEnv) => Platform;
|
|
38
|
+
export declare const tail: (path: string | undefined, lines: number) => string;
|
|
39
|
+
/** Where there is neither: `start` still runs serve in the background; only `install` needs one of them. */
|
|
40
|
+
export declare const noUnits: (app: AppIdentity, system: ServerSystem) => Platform;
|
|
41
|
+
export declare const platformFor: (app: AppIdentity, system: ServerSystem, env: NodeJS.ProcessEnv) => Platform;
|
|
42
|
+
//# sourceMappingURL=units.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"units.d.ts","sourceRoot":"","sources":["../../src/background/units.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,WAAW,IAAI;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACpC;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QAAS,WAAW,OAAO,MAAM,CAAC,UAAU,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAOjG,CAAA;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,CAAA;IACjD,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,KAAK,MAAM,CAAA;IAC9C,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE,EAAE,CAAA;IACjC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE,EAAE,CAAA;IAChC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACnG,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,kDAAkD;IAClD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAA;IAC9B,+CAA+C;IAC/C,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAA;CAChC;AAaD,eAAO,MAAM,OAAO,QAAS,WAAW,UAAU,YAAY,OAAO,MAAM,CAAC,UAAU,KAAG,QAmExF,CAAA;AAID,eAAO,MAAM,OAAO,QAAS,WAAW,UAAU,YAAY,OAAO,MAAM,CAAC,UAAU,KAAG,QAgExF,CAAA;AAED,eAAO,MAAM,IAAI,SAAU,MAAM,GAAG,SAAS,SAAS,MAAM,KAAG,MACyD,CAAA;AAExH,4GAA4G;AAC5G,eAAO,MAAM,OAAO,QAAS,WAAW,UAAU,YAAY,KAAG,QAgBhE,CAAA;AAED,eAAO,MAAM,WAAW,QAAS,WAAW,UAAU,YAAY,OAAO,MAAM,CAAC,UAAU,KAAG,QAI5F,CAAA"}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { CliError } from "@leemour/cli-core";
|
|
4
|
+
/**
|
|
5
|
+
* Only the variables that say **where** the files are travel into the unit: a unit written from a
|
|
6
|
+
* development checkout must open that checkout's session and store, never the owner's real ones.
|
|
7
|
+
* Nothing that could hold a credential is copied.
|
|
8
|
+
*/
|
|
9
|
+
export const locationVariables = (app, env) => {
|
|
10
|
+
const names = [
|
|
11
|
+
...["CONFIG_DIR", "STATE_DIR", "CACHE_DIR"].map((name) => `${app.envPrefix}_${name}`),
|
|
12
|
+
"MESSAGING_STORE",
|
|
13
|
+
"MESSAGING_STATE_DIR",
|
|
14
|
+
];
|
|
15
|
+
return Object.fromEntries(names.flatMap((name) => (env[name] === undefined ? [] : [[name, env[name]]])));
|
|
16
|
+
};
|
|
17
|
+
const home = (env) => {
|
|
18
|
+
if (!env.HOME)
|
|
19
|
+
throw new CliError("configuration_error", "HOME is not set, so there is nowhere to put the unit");
|
|
20
|
+
return env.HOME;
|
|
21
|
+
};
|
|
22
|
+
/** `%` is a specifier in both; `$` is a variable only in `ExecStart=` — in `Environment=` it is itself. */
|
|
23
|
+
const systemdQuote = (value, { command = false } = {}) => {
|
|
24
|
+
const quoted = value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%");
|
|
25
|
+
return `"${command ? quoted.replaceAll("$", "$$$$") : quoted}"`;
|
|
26
|
+
};
|
|
27
|
+
export const systemd = (app, system, env) => {
|
|
28
|
+
const folder = join(env.XDG_CONFIG_HOME ?? join(home(env), ".config"), "systemd", "user");
|
|
29
|
+
const checked = async (argv) => {
|
|
30
|
+
const ran = await system.run(argv, env);
|
|
31
|
+
if (ran.code !== 0)
|
|
32
|
+
throw new CliError("configuration_error", `${argv.join(" ")} failed: ${ran.stderr.trim()}`);
|
|
33
|
+
return ran.stdout;
|
|
34
|
+
};
|
|
35
|
+
return {
|
|
36
|
+
unit: (base) => {
|
|
37
|
+
const name = `${app.command}-serve-${base.profile}.service`;
|
|
38
|
+
return { ...base, name, path: join(folder, name) };
|
|
39
|
+
},
|
|
40
|
+
text: (unit) => [
|
|
41
|
+
"[Unit]",
|
|
42
|
+
`Description=${app.command} serve — keep the local message archive current (profile ${unit.profile})`,
|
|
43
|
+
"",
|
|
44
|
+
"[Service]",
|
|
45
|
+
`ExecStart=${unit.command.map((word) => systemdQuote(word, { command: true })).join(" ")}`,
|
|
46
|
+
...Object.entries(unit.environment).map(([name, value]) => `Environment=${systemdQuote(`${name}=${value}`)}`),
|
|
47
|
+
"Restart=on-failure",
|
|
48
|
+
"RestartSec=30",
|
|
49
|
+
"",
|
|
50
|
+
"[Install]",
|
|
51
|
+
"WantedBy=default.target",
|
|
52
|
+
"",
|
|
53
|
+
].join("\n"),
|
|
54
|
+
start: (unit) => [
|
|
55
|
+
["systemctl", "--user", "daemon-reload"],
|
|
56
|
+
["systemctl", "--user", "start", unit.name],
|
|
57
|
+
],
|
|
58
|
+
stop: (unit) => [["systemctl", "--user", "stop", unit.name]],
|
|
59
|
+
state: async (unit) => {
|
|
60
|
+
const ran = await system.run([
|
|
61
|
+
"systemctl",
|
|
62
|
+
"--user",
|
|
63
|
+
"show",
|
|
64
|
+
unit.name,
|
|
65
|
+
"-p",
|
|
66
|
+
"LoadState",
|
|
67
|
+
"-p",
|
|
68
|
+
"ActiveState",
|
|
69
|
+
"-p",
|
|
70
|
+
"SubState",
|
|
71
|
+
"-p",
|
|
72
|
+
"MainPID",
|
|
73
|
+
], env);
|
|
74
|
+
const fields = Object.fromEntries(ran.stdout
|
|
75
|
+
.split("\n")
|
|
76
|
+
.filter((line) => line.includes("="))
|
|
77
|
+
.map((line) => [line.slice(0, line.indexOf("=")), line.slice(line.indexOf("=") + 1)]));
|
|
78
|
+
const pid = Number(fields.MainPID);
|
|
79
|
+
return {
|
|
80
|
+
loaded: fields.LoadState === "loaded",
|
|
81
|
+
active: fields.ActiveState === "active",
|
|
82
|
+
...(pid > 0 ? { pid } : {}),
|
|
83
|
+
...(fields.ActiveState ? { detail: `${fields.ActiveState} (${fields.SubState})` } : {}),
|
|
84
|
+
};
|
|
85
|
+
},
|
|
86
|
+
logs: (unit, lines) => checked(["journalctl", "--user", "-u", unit.name, "-n", String(lines), "--no-pager"]),
|
|
87
|
+
atLogin: (unit) => `at every login too: systemctl --user enable ${unit.name.replace(/\.service$/, "")}`,
|
|
88
|
+
};
|
|
89
|
+
};
|
|
90
|
+
const xml = (value) => value.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">");
|
|
91
|
+
export const launchd = (app, system, env) => {
|
|
92
|
+
const folder = join(home(env), "Library", "LaunchAgents");
|
|
93
|
+
const domain = `gui/${system.uid}`;
|
|
94
|
+
return {
|
|
95
|
+
unit: (base) => {
|
|
96
|
+
const name = `${app.appName}.serve.${base.profile}`;
|
|
97
|
+
return { ...base, name, path: join(folder, `${name}.plist`) };
|
|
98
|
+
},
|
|
99
|
+
text: (unit) => [
|
|
100
|
+
'<?xml version="1.0" encoding="UTF-8"?>',
|
|
101
|
+
'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
|
|
102
|
+
'<plist version="1.0">',
|
|
103
|
+
"<dict>",
|
|
104
|
+
` <key>Label</key><string>${xml(unit.name)}</string>`,
|
|
105
|
+
" <key>ProgramArguments</key>",
|
|
106
|
+
" <array>",
|
|
107
|
+
...unit.command.map((word) => ` <string>${xml(word)}</string>`),
|
|
108
|
+
" </array>",
|
|
109
|
+
" <key>EnvironmentVariables</key>",
|
|
110
|
+
" <dict>",
|
|
111
|
+
...Object.entries(unit.environment).map(([name, value]) => ` <key>${xml(name)}</key><string>${xml(value)}</string>`),
|
|
112
|
+
" </dict>",
|
|
113
|
+
// launchd loads every agent here at login; disabled, it waits for `server start` to enable it.
|
|
114
|
+
" <key>Disabled</key><true/>",
|
|
115
|
+
" <key>RunAtLoad</key><true/>",
|
|
116
|
+
" <key>KeepAlive</key><dict><key>SuccessfulExit</key><false/></dict>",
|
|
117
|
+
" <key>ThrottleInterval</key><integer>30</integer>",
|
|
118
|
+
` <key>StandardOutPath</key><string>${xml(unit.logPath ?? "")}</string>`,
|
|
119
|
+
` <key>StandardErrorPath</key><string>${xml(unit.logPath ?? "")}</string>`,
|
|
120
|
+
"</dict>",
|
|
121
|
+
"</plist>",
|
|
122
|
+
"",
|
|
123
|
+
].join("\n"),
|
|
124
|
+
// RunAtLoad makes loading the agent the start; `enable` overrides the file's Disabled until `disable`.
|
|
125
|
+
start: (unit) => [
|
|
126
|
+
["launchctl", "enable", `${domain}/${unit.name}`],
|
|
127
|
+
["launchctl", "bootstrap", domain, unit.path],
|
|
128
|
+
],
|
|
129
|
+
stop: (unit) => [
|
|
130
|
+
["launchctl", "bootout", `${domain}/${unit.name}`],
|
|
131
|
+
["launchctl", "disable", `${domain}/${unit.name}`],
|
|
132
|
+
],
|
|
133
|
+
state: async (unit) => {
|
|
134
|
+
const ran = await system.run(["launchctl", "print", `${domain}/${unit.name}`], env);
|
|
135
|
+
if (ran.code !== 0)
|
|
136
|
+
return { loaded: false, active: false };
|
|
137
|
+
const state = /^\s*state = (.+)$/m.exec(ran.stdout)?.[1]?.trim();
|
|
138
|
+
const pid = Number(/^\s*pid = (\d+)$/m.exec(ran.stdout)?.[1]);
|
|
139
|
+
return {
|
|
140
|
+
loaded: true,
|
|
141
|
+
active: state === "running",
|
|
142
|
+
...(pid > 0 ? { pid } : {}),
|
|
143
|
+
...(state ? { detail: state } : {}),
|
|
144
|
+
};
|
|
145
|
+
},
|
|
146
|
+
// launchd opens the log itself and does not create its folder.
|
|
147
|
+
prepare: (unit) => {
|
|
148
|
+
if (unit.logPath)
|
|
149
|
+
mkdirSync(dirname(unit.logPath), { recursive: true, mode: 0o700 });
|
|
150
|
+
},
|
|
151
|
+
logs: async (unit, lines) => tail(unit.logPath, lines),
|
|
152
|
+
atLogin: () => "from then on it also starts at every login, until `server stop`",
|
|
153
|
+
};
|
|
154
|
+
};
|
|
155
|
+
export const tail = (path, lines) => path && existsSync(path) ? `${readFileSync(path, "utf8").split("\n").filter(Boolean).slice(-lines).join("\n")}\n` : "";
|
|
156
|
+
/** Where there is neither: `start` still runs serve in the background; only `install` needs one of them. */
|
|
157
|
+
export const noUnits = (app, system) => {
|
|
158
|
+
const refuse = () => {
|
|
159
|
+
throw new CliError("validation_error", `${app.command} server install knows systemd (Linux) and launchd (macOS), not ${system.platform} — \`${app.command} server start\` runs serve without a unit`);
|
|
160
|
+
};
|
|
161
|
+
return {
|
|
162
|
+
unit: (base) => ({ ...base, name: `${app.command}-serve-${base.profile}`, path: "" }),
|
|
163
|
+
text: refuse,
|
|
164
|
+
start: refuse,
|
|
165
|
+
stop: refuse,
|
|
166
|
+
state: async () => ({ loaded: false, active: false }),
|
|
167
|
+
logs: async () => "",
|
|
168
|
+
atLogin: () => "",
|
|
169
|
+
};
|
|
170
|
+
};
|
|
171
|
+
export const platformFor = (app, system, env) => {
|
|
172
|
+
if (system.platform === "linux")
|
|
173
|
+
return systemd(app, system, env);
|
|
174
|
+
if (system.platform === "darwin")
|
|
175
|
+
return launchd(app, system, env);
|
|
176
|
+
return noUnits(app, system);
|
|
177
|
+
};
|
|
178
|
+
//# sourceMappingURL=units.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"units.js","sourceRoot":"","sources":["../../src/background/units.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-command.d.ts","sourceRoot":"","sources":["../../src/cli/config-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,KAAK,WAAW,EAAW,MAAM,UAAU,CAAA;AAEpD,OAAO,EAAE,KAAK,aAAa,EAA2B,MAAM,eAAe,CAAA;AAE3E;;;GAGG;AACH,eAAO,MAAM,aAAa,QAAS,WAAW,UAAU,aAAa,KAAG,
|
|
1
|
+
{"version":3,"file":"config-command.d.ts","sourceRoot":"","sources":["../../src/cli/config-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,KAAK,WAAW,EAAW,MAAM,UAAU,CAAA;AAEpD,OAAO,EAAE,KAAK,aAAa,EAA2B,MAAM,eAAe,CAAA;AAE3E;;;GAGG;AACH,eAAO,MAAM,aAAa,QAAS,WAAW,UAAU,aAAa,KAAG,OAiFvE,CAAA"}
|
|
@@ -15,8 +15,10 @@ export const configCommand = (app, config) => {
|
|
|
15
15
|
command
|
|
16
16
|
.command("show")
|
|
17
17
|
.description("the profile, the profiles that exist, and each setting with where it came from")
|
|
18
|
+
.option("--bot", "the settings a bot command on this profile gets, rather than the personal account's")
|
|
18
19
|
.action(function () {
|
|
19
|
-
const
|
|
20
|
+
const bot = this.opts().bot === true;
|
|
21
|
+
const { settings, renderer, env } = baseContext(this, (flags, options) => config.resolveSettings(flags, { ...options, ...(bot ? { kind: "bot" } : {}) }));
|
|
20
22
|
const overridden = pathsAreOverridden({ appName: app.appName, prefix: app.envPrefix, env });
|
|
21
23
|
renderer.result({
|
|
22
24
|
profile: settings.profile,
|
|
@@ -25,7 +27,9 @@ export const configCommand = (app, config) => {
|
|
|
25
27
|
configFile: settings.configPath,
|
|
26
28
|
configFound: settings.configFound,
|
|
27
29
|
pathsOverridden: overridden,
|
|
28
|
-
settings: [...config.allSettings, "commandTimeoutMs"]
|
|
30
|
+
settings: [...config.allSettings, "commandTimeoutMs"]
|
|
31
|
+
.filter((setting) => bot || setting !== "readOtherBots")
|
|
32
|
+
.map((setting) => sourced(settings, setting)),
|
|
29
33
|
});
|
|
30
34
|
if (overridden) {
|
|
31
35
|
renderer.note(`${envName(app, "CONFIG_DIR")}, ${envName(app, "STATE_DIR")} or ${envName(app, "CACHE_DIR")} is set — ` +
|
|
@@ -35,7 +39,9 @@ export const configCommand = (app, config) => {
|
|
|
35
39
|
for (const action of ["set", "unset"]) {
|
|
36
40
|
const sub = annotate(command.command(action), { mutates: true })
|
|
37
41
|
.argument("<setting>", `one of: ${config.allSettings.join(", ")}`)
|
|
38
|
-
.option("--defaults", "change what every profile gets, rather than this profile")
|
|
42
|
+
.option("--defaults", "change what every profile gets, rather than this profile")
|
|
43
|
+
.option("--personal", "only for personal accounts — the personal section of the file")
|
|
44
|
+
.option("--bot", "only for bots — the bot section of the file");
|
|
39
45
|
if (action === "set")
|
|
40
46
|
sub
|
|
41
47
|
.argument("<value>", "a number, true or false, or for allow a list like send,reaction")
|
|
@@ -44,7 +50,11 @@ export const configCommand = (app, config) => {
|
|
|
44
50
|
sub.description("remove a setting from the configuration file");
|
|
45
51
|
sub.action(function (setting, given) {
|
|
46
52
|
const { settings, renderer, env } = baseContext(this, config.resolveSettings);
|
|
47
|
-
const defaults = this.opts()
|
|
53
|
+
const { defaults: everyone, personal, bot, } = this.opts();
|
|
54
|
+
const defaults = everyone === true;
|
|
55
|
+
if (personal && bot)
|
|
56
|
+
throw new CliError("validation_error", "--personal and --bot name different sections; use one");
|
|
57
|
+
const kind = bot ? "bot" : personal ? "personal" : undefined;
|
|
48
58
|
const lock = envName(app, "PROFILE_LOCK");
|
|
49
59
|
if (defaults && env[lock]) {
|
|
50
60
|
// The defaults are every other profile's settings too.
|
|
@@ -54,10 +64,11 @@ export const configCommand = (app, config) => {
|
|
|
54
64
|
profile: defaults ? undefined : settings.profile,
|
|
55
65
|
setting,
|
|
56
66
|
value: action === "set" ? String(given) : undefined,
|
|
67
|
+
kind,
|
|
57
68
|
});
|
|
58
69
|
renderer.result({
|
|
59
70
|
configFile: settings.configPath,
|
|
60
|
-
scope: defaults ?
|
|
71
|
+
scope: scopeOf(kind, defaults ? undefined : settings.profile),
|
|
61
72
|
setting,
|
|
62
73
|
value: saved,
|
|
63
74
|
});
|
|
@@ -65,6 +76,7 @@ export const configCommand = (app, config) => {
|
|
|
65
76
|
}
|
|
66
77
|
return command;
|
|
67
78
|
};
|
|
79
|
+
const scopeOf = (kind, profile) => [kind, profile === undefined ? "defaults" : `profiles.${profile}`].filter(Boolean).join(".");
|
|
68
80
|
/** A shared setting from what was resolved; a messenger's own from the file, where it lives. */
|
|
69
81
|
const sourced = (settings, setting) => {
|
|
70
82
|
if (setting in settings.sources) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-command.js","sourceRoot":"","sources":["../../src/cli/config-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAoB,OAAO,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAsB,QAAQ,EAAiB,MAAM,eAAe,CAAA;AAE3E;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAgB,EAAE,MAAqB,EAAW,EAAE;IAChF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,qDAAqD,CAAC,CAAA;IAExG,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,gFAAgF,CAAC;SAC7F,MAAM,CAAC;QACN,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"config-command.js","sourceRoot":"","sources":["../../src/cli/config-command.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/context.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Renderer, RenderFormat, Streams } from "@leemour/cli-core";
|
|
2
2
|
import type { Command } from "commander";
|
|
3
|
+
import type { OpenRecognizer } from "../speech/transcribe.js";
|
|
3
4
|
import type { AppIdentity } from "./app.js";
|
|
4
5
|
import { type Closeable } from "./deadline.js";
|
|
5
6
|
import type { EventSink } from "./runs/events.js";
|
|
@@ -20,6 +21,8 @@ export interface BaseEnvironment {
|
|
|
20
21
|
answer?: (question: string) => Promise<string | null> | string | null;
|
|
21
22
|
/** Set by `run()`; a command's run is recorded only when it is known whose run it is. */
|
|
22
23
|
app?: AppIdentity;
|
|
24
|
+
/** The local speech recognizer in place of the downloaded model; tests hand one in. */
|
|
25
|
+
recognizer?: OpenRecognizer;
|
|
23
26
|
}
|
|
24
27
|
export declare const provide: (program: Command, environment: BaseEnvironment) => void;
|
|
25
28
|
export declare const environmentOf: <E extends BaseEnvironment = BaseEnvironment>(command: Command) => E;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/cli/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,eAAe,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE1E,uGAAuG;AACvG,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,qFAAqF;IACrF,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;IACnD,gGAAgG;IAChG,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAA;IACrE,yFAAyF;IACzF,GAAG,CAAC,EAAE,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/cli/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,eAAe,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE1E,uGAAuG;AACvG,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,qFAAqF;IACrF,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;IACnD,gGAAgG;IAChG,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAA;IACrE,yFAAyF;IACzF,GAAG,CAAC,EAAE,WAAW,CAAA;IACjB,uFAAuF;IACvF,UAAU,CAAC,EAAE,cAAc,CAAA;CAC5B;AAID,eAAO,MAAM,OAAO,YAAa,OAAO,eAAe,eAAe,KAAG,IAExE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,eAAe,GAAG,eAAe,WAAW,OAAO,KAAG,CAC9C,CAAA;AAEhD,2EAA2E;AAC3E,eAAO,MAAM,SAAS,YAAa,OAAO;;;;;CAOzC,CAAA;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,YAAY,CAAA;IACpB,mFAAmF;IACnF,KAAK,EAAE,OAAO,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB;;;;OAIG;IACH;;;OAGG;IACH,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACjH,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAA;CACtC;AAED,KAAK,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,cAAc,KAAK,QAAQ,CAAA;AAEzE,2EAA2E;AAC3E,eAAO,MAAM,WAAW,YAAa,OAAO,mBAAmB,OAAO,KAAG,WAyCxE,CAAA"}
|
package/dist/cli/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/cli/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/cli/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAG5C,OAAO,EAAkB,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAqB9C,MAAM,YAAY,GAAG,IAAI,OAAO,EAA4B,CAAA;AAE5D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAE,WAA4B,EAAQ,EAAE;IAC9E,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAA8C,OAAgB,EAAK,EAAE,CAChG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAM,CAAA;AAEhD,2EAA2E;AAC3E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IAC/C,OAAO,aAAa,CAAC;QACnB,GAAG,OAAO,CAAC,eAAe,EAAE;QAC5B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;KACtC,CAAC,CAAA;AACJ,CAAC,CAAA;AAyBD,2EAA2E;AAC3E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,eAAwB,EAAe,EAAE;IACrF,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IAC1C,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAA;IAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,eAAe,EAAe,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IACjF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;QACzD,GAAG,QAAQ;QACX,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,WAAW,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC;KACnE,CAAC,CAAA;IACF,MAAM,UAAU,GAAgB,EAAE,CAAA;IAElC,OAAO;QACL,QAAQ;QACR,QAAQ;QACR,MAAM;QACN,KAAK;QACL,OAAO;QACP,GAAG;QACH,0GAA0G;QAC1G,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAC9C,WAAW,CAAC,GAAG;YACb,CAAC,CAAC,QAAQ,CACN;gBACE,GAAG,EAAE,WAAW,CAAC,GAAG;gBACpB,OAAO,EAAE,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC;gBACrC,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,UAAU,EAAE,QAAQ,CAAC,cAAc;gBACnC,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,eAAe;gBAClC,MAAM;gBACN,OAAO;gBACP,GAAG;aACJ,EACD,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAC5G;YACH,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACvG,KAAK,EAAE,CAAC,SAAS,EAAE,EAAE;YACnB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC5B,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,mGAAmG;AACnG,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAU,EAAE;IAC/C,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,IAAI,OAAO,GAAmB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM;QAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACpH,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC,CAAA"}
|
package/dist/cli/index.d.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
export { guardedClose, guardedCreatePoll, guardedVote } from "../sends/polls.js";
|
|
2
2
|
export { INBOX_CHATS, newIn, REVIEW_CHATS, reviewIn, unanswered, unreadIn } from "../services/inbox.js";
|
|
3
|
+
export { momentOf } from "../services/moment.js";
|
|
4
|
+
export { maskedAccount } from "../services/people.js";
|
|
3
5
|
export { type AppIdentity, envName } from "./app.js";
|
|
4
6
|
export { CONTRACT, commandsCommand } from "./commands-command.js";
|
|
5
7
|
export { configCommand } from "./config-command.js";
|
|
6
8
|
export { type BaseContext, type BaseEnvironment, baseContext, environmentOf, outputFor, provide, } from "./context.js";
|
|
7
9
|
export { type Closeable, withDeadline } from "./deadline.js";
|
|
8
10
|
export { isCliFailure, isCommanderFailure } from "./failures.js";
|
|
9
|
-
export { accountCommand
|
|
11
|
+
export { accountCommand } from "./messenger/account-command.js";
|
|
10
12
|
export { accountFileFor, rememberAccount } from "./messenger/accounts.js";
|
|
11
13
|
export { storeCommand } from "./messenger/archive-commands.js";
|
|
12
14
|
export { chatsCommand } from "./messenger/chats-command.js";
|
|
@@ -16,7 +18,7 @@ export { contactsCommand } from "./messenger/contacts-command.js";
|
|
|
16
18
|
export { type ConnectOptions, type Fetching, type Messenger, type MessengerContext, messengerContext, } from "./messenger/context.js";
|
|
17
19
|
export { doctorCommand } from "./messenger/doctor-command.js";
|
|
18
20
|
export { recipientsCommand, sendsCommand } from "./messenger/guard-commands.js";
|
|
19
|
-
export { inboxCommand
|
|
21
|
+
export { inboxCommand } from "./messenger/inbox.js";
|
|
20
22
|
export { type McpEnvironment, mcpCommand, serverEntry } from "./messenger/mcp-command.js";
|
|
21
23
|
export { messagesCommand, sendCommand } from "./messenger/messages-command.js";
|
|
22
24
|
export { deleteCommand } from "./messenger/messages-delete-command.js";
|
|
@@ -39,6 +41,6 @@ export { runsCommand } from "./runs/command.js";
|
|
|
39
41
|
export { type CacheEvent, type DiagnosticEvent, type EventSink, providerErrorKey, type RequestEvent, renderEvent, type WarningEvent, } from "./runs/events.js";
|
|
40
42
|
export { crashOf, type Recording, type RecordingOptions, recorded, startRecording, wasSettled, } from "./runs/recording.js";
|
|
41
43
|
export { findRun, KEEP_RUNS_FOR_DAYS, listRuns, pruneRuns, type RunMetadata, readEvents, runsDirFor, runtime, startRun, } from "./runs/run.js";
|
|
42
|
-
export { type Config, type Configuration, count, first, flag, fromFile, type GlobalFlags, parseDuration, plain, type ResolveOptions, type Settings, type SettingsExtension, type Source, settingsFor, } from "./settings.js";
|
|
44
|
+
export { type Config, type Configuration, count, first, flag, fromFile, type GlobalFlags, type ProfileKind, parseDuration, plain, type ResolveOptions, type Settings, type SettingsExtension, type Source, settingsFor, } from "./settings.js";
|
|
43
45
|
export { skillCommand } from "./skill-command.js";
|
|
44
46
|
//# sourceMappingURL=index.d.ts.map
|