@dbx-tools/appkit-lakebox 0.9.136 → 0.9.139

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-lakebox";
-export const PACKAGE_VERSION = "0.9.136";
+export const PACKAGE_VERSION = "0.9.139";
 export * as config from "./src/config.ts";
 export * as desktop from "./src/desktop.ts";
 export * as metrics from "./src/metrics.ts";

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-lakebox";
-export declare const PACKAGE_VERSION = "0.9.136";
+export declare const PACKAGE_VERSION = "0.9.139";
 export * as config from "./src/config.ts";
 export * as desktop from "./src/desktop.ts";
 export * as metrics from "./src/metrics.ts";

package/lib/index.js

@@ -2,7 +2,7 @@
 // Regenerated from the exporting modules in ./src.
 // Hand edits are overwritten on the next watch; this file is read-only.
 export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-lakebox";
-export const PACKAGE_VERSION = "0.9.136";
+export const PACKAGE_VERSION = "0.9.139";
 export * as config from "./src/config.js";
 export * as desktop from "./src/desktop.js";
 export * as metrics from "./src/metrics.js";
@@ -23,4 +23,4 @@ export { LakeboxControllerDefinitionSchema, LakeboxControllerServiceSchema } fro
 export { LAKEBOX_SKILLS_MOUNT } from "./src/skills.js";
 export { LAKEBOX_AGENT_USER, LAKEBOX_AGENT_HOME, LAKEBOX_STATE_ROOT, LAKEBOX_USERS_ROOT, LAKEBOX_RUNTIME_ROOT, LAKEBOX_RUN_ROOT, LAKEBOX_UID_MIN, LAKEBOX_UID_COUNT, LAKEBOX_PORT_MIN, LAKEBOX_PORT_COUNT } from "./src/user.js";
 export { LakeboxWorkspaceSandbox } from "./src/workspace.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRywyQkFBMkIsQ0FBQztBQUM5RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQztBQUN0QyxPQUFPLEtBQUssU0FBUyxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsaUNBQWlDLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUV0RyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsb0JBQW9CLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2pPLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXQtbGFrZWJveFwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjEzNlwiO1xuZXhwb3J0ICogYXMgY29uZmlnIGZyb20gXCIuL3NyYy9jb25maWcudHNcIjtcbmV4cG9ydCAqIGFzIGRlc2t0b3AgZnJvbSBcIi4vc3JjL2Rlc2t0b3AudHNcIjtcbmV4cG9ydCAqIGFzIG1ldHJpY3MgZnJvbSBcIi4vc3JjL21ldHJpY3MudHNcIjtcbmV4cG9ydCAqIGFzIHBsdWdpbiBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgKiBhcyByb3V0ZXMgZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0ICogYXMgcnVudGltZSBmcm9tIFwiLi9zcmMvcnVudGltZS50c1wiO1xuZXhwb3J0ICogYXMgc2VydmljZXMgZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgKiBhcyBza2lsbHMgZnJvbSBcIi4vc3JjL3NraWxscy50c1wiO1xuZXhwb3J0ICogYXMgdXNlciBmcm9tIFwiLi9zcmMvdXNlci50c1wiO1xuZXhwb3J0ICogYXMgd29ya3NwYWNlIGZyb20gXCIuL3NyYy93b3Jrc3BhY2UudHNcIjtcbmV4cG9ydCB7IExha2Vib3hQbHVnaW5Db25maWdTY2hlbWEgfSBmcm9tIFwiLi9zcmMvY29uZmlnLnRzXCI7XG5leHBvcnQgdHlwZSB7IFNlcmlhbGl6YWJsZUxha2Vib3hQbHVnaW5Db25maWcsIFJlc29sdmVkTGFrZWJveFBsdWdpbkNvbmZpZywgTGFrZWJveFBsdWdpbkNvbmZpZyB9IGZyb20gXCIuL3NyYy9jb25maWcudHNcIjtcbmV4cG9ydCB7IGRlc2t0b3BIdG1sSGVhZCB9IGZyb20gXCIuL3NyYy9kZXNrdG9wLnRzXCI7XG5leHBvcnQgeyBMYWtlYm94TWV0cmljcyB9IGZyb20gXCIuL3NyYy9tZXRyaWNzLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2Vib3hDb3VudGVycywgTGFrZWJveE1ldHJpY3NFdmVudHMgfSBmcm9tIFwiLi9zcmMvbWV0cmljcy50c1wiO1xuZXhwb3J0IHsgQXBwS2l0TGFrZWJveFBsdWdpbiwgbGFrZWJveCB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB7IExha2Vib3hSb3V0ZVJlZ2lzdHJ5IH0gZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBMYWtlYm94Um91dGVSZXNvbHV0aW9uLCBMYWtlYm94Um91dGVSZXNvbHZlciB9IGZyb20gXCIuL3NyYy9yb3V0ZXMudHNcIjtcbmV4cG9ydCB7IExha2Vib3hSdW50aW1lIH0gZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJveElkZW50aXR5UmVzb2x2ZXIsIExha2Vib3hMZWdhY3lQb29sIH0gZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB7IExha2Vib3hDb250cm9sbGVyRGVmaW5pdGlvblNjaGVtYSwgTGFrZWJveENvbnRyb2xsZXJTZXJ2aWNlU2NoZW1hIH0gZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2Vib3hDb250cm9sbGVyRGVmaW5pdGlvbiwgTGFrZWJveENvbnRyb2xsZXJTZXJ2aWNlLCBMYWtlYm94U2VydmljZVJvdXRlIH0gZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgeyBMQUtFQk9YX1NLSUxMU19NT1VOVCB9IGZyb20gXCIuL3NyYy9za2lsbHMudHNcIjtcbmV4cG9ydCB7IExBS0VCT1hfQUdFTlRfVVNFUiwgTEFLRUJPWF9BR0VOVF9IT01FLCBMQUtFQk9YX1NUQVRFX1JPT1QsIExBS0VCT1hfVVNFUlNfUk9PVCwgTEFLRUJPWF9SVU5USU1FX1JPT1QsIExBS0VCT1hfUlVOX1JPT1QsIExBS0VCT1hfVUlEX01JTiwgTEFLRUJPWF9VSURfQ09VTlQsIExBS0VCT1hfUE9SVF9NSU4sIExBS0VCT1hfUE9SVF9DT1VOVCB9IGZyb20gXCIuL3NyYy91c2VyLnRzXCI7XG5leHBvcnQgeyBMYWtlYm94V29ya3NwYWNlU2FuZGJveCB9IGZyb20gXCIuL3NyYy93b3Jrc3BhY2UudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJveFdvcmtzcGFjZVNhbmRib3hPcHRpb25zIH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS50c1wiO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRywyQkFBMkIsQ0FBQztBQUM5RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQztBQUN0QyxPQUFPLEtBQUssU0FBUyxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsaUNBQWlDLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUV0RyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsb0JBQW9CLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2pPLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXQtbGFrZWJveFwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjEzOVwiO1xuZXhwb3J0ICogYXMgY29uZmlnIGZyb20gXCIuL3NyYy9jb25maWcudHNcIjtcbmV4cG9ydCAqIGFzIGRlc2t0b3AgZnJvbSBcIi4vc3JjL2Rlc2t0b3AudHNcIjtcbmV4cG9ydCAqIGFzIG1ldHJpY3MgZnJvbSBcIi4vc3JjL21ldHJpY3MudHNcIjtcbmV4cG9ydCAqIGFzIHBsdWdpbiBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgKiBhcyByb3V0ZXMgZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0ICogYXMgcnVudGltZSBmcm9tIFwiLi9zcmMvcnVudGltZS50c1wiO1xuZXhwb3J0ICogYXMgc2VydmljZXMgZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgKiBhcyBza2lsbHMgZnJvbSBcIi4vc3JjL3NraWxscy50c1wiO1xuZXhwb3J0ICogYXMgdXNlciBmcm9tIFwiLi9zcmMvdXNlci50c1wiO1xuZXhwb3J0ICogYXMgd29ya3NwYWNlIGZyb20gXCIuL3NyYy93b3Jrc3BhY2UudHNcIjtcbmV4cG9ydCB7IExha2Vib3hQbHVnaW5Db25maWdTY2hlbWEgfSBmcm9tIFwiLi9zcmMvY29uZmlnLnRzXCI7XG5leHBvcnQgdHlwZSB7IFNlcmlhbGl6YWJsZUxha2Vib3hQbHVnaW5Db25maWcsIFJlc29sdmVkTGFrZWJveFBsdWdpbkNvbmZpZywgTGFrZWJveFBsdWdpbkNvbmZpZyB9IGZyb20gXCIuL3NyYy9jb25maWcudHNcIjtcbmV4cG9ydCB7IGRlc2t0b3BIdG1sSGVhZCB9IGZyb20gXCIuL3NyYy9kZXNrdG9wLnRzXCI7XG5leHBvcnQgeyBMYWtlYm94TWV0cmljcyB9IGZyb20gXCIuL3NyYy9tZXRyaWNzLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2Vib3hDb3VudGVycywgTGFrZWJveE1ldHJpY3NFdmVudHMgfSBmcm9tIFwiLi9zcmMvbWV0cmljcy50c1wiO1xuZXhwb3J0IHsgQXBwS2l0TGFrZWJveFBsdWdpbiwgbGFrZWJveCB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB7IExha2Vib3hSb3V0ZVJlZ2lzdHJ5IH0gZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBMYWtlYm94Um91dGVSZXNvbHV0aW9uLCBMYWtlYm94Um91dGVSZXNvbHZlciB9IGZyb20gXCIuL3NyYy9yb3V0ZXMudHNcIjtcbmV4cG9ydCB7IExha2Vib3hSdW50aW1lIH0gZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJveElkZW50aXR5UmVzb2x2ZXIsIExha2Vib3hMZWdhY3lQb29sIH0gZnJvbSBcIi4vc3JjL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB7IExha2Vib3hDb250cm9sbGVyRGVmaW5pdGlvblNjaGVtYSwgTGFrZWJveENvbnRyb2xsZXJTZXJ2aWNlU2NoZW1hIH0gZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2Vib3hDb250cm9sbGVyRGVmaW5pdGlvbiwgTGFrZWJveENvbnRyb2xsZXJTZXJ2aWNlLCBMYWtlYm94U2VydmljZVJvdXRlIH0gZnJvbSBcIi4vc3JjL3NlcnZpY2VzLnRzXCI7XG5leHBvcnQgeyBMQUtFQk9YX1NLSUxMU19NT1VOVCB9IGZyb20gXCIuL3NyYy9za2lsbHMudHNcIjtcbmV4cG9ydCB7IExBS0VCT1hfQUdFTlRfVVNFUiwgTEFLRUJPWF9BR0VOVF9IT01FLCBMQUtFQk9YX1NUQVRFX1JPT1QsIExBS0VCT1hfVVNFUlNfUk9PVCwgTEFLRUJPWF9SVU5USU1FX1JPT1QsIExBS0VCT1hfUlVOX1JPT1QsIExBS0VCT1hfVUlEX01JTiwgTEFLRUJPWF9VSURfQ09VTlQsIExBS0VCT1hfUE9SVF9NSU4sIExBS0VCT1hfUE9SVF9DT1VOVCB9IGZyb20gXCIuL3NyYy91c2VyLnRzXCI7XG5leHBvcnQgeyBMYWtlYm94V29ya3NwYWNlU2FuZGJveCB9IGZyb20gXCIuL3NyYy93b3Jrc3BhY2UudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJveFdvcmtzcGFjZVNhbmRib3hPcHRpb25zIH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS50c1wiO1xuIl19

package/package.json

@@ -19,7 +19,7 @@
     "projen": "projen"
   },
   "devDependencies": {
-    "@dbx-tools/auth": "^0.9.136",
+    "@dbx-tools/auth": "^0.9.139",
     "@types/express": "^5.0.5",
     "@types/json-schema": "^7",
     "@types/node": "^24.6.0",
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.136",
-    "@dbx-tools/appkit-mastra": "^0.9.136",
-    "@dbx-tools/core": "^0.9.136",
-    "@dbx-tools/lakebox": "^0.9.136",
-    "@dbx-tools/postgres": "^0.9.136",
-    "@dbx-tools/shared-core": "^0.9.136",
-    "@dbx-tools/shared-lakebox": "^0.9.136",
-    "@dbx-tools/ui": "^0.9.136",
+    "@dbx-tools/appkit": "^0.9.139",
+    "@dbx-tools/appkit-mastra": "^0.9.139",
+    "@dbx-tools/core": "^0.9.139",
+    "@dbx-tools/lakebox": "^0.9.139",
+    "@dbx-tools/postgres": "^0.9.139",
+    "@dbx-tools/shared-core": "^0.9.139",
+    "@dbx-tools/shared-lakebox": "^0.9.139",
+    "@dbx-tools/ui": "^0.9.139",
     "@mastra/core": "1.71.0",
     "http-proxy-3": "^1.23.1",
     "zod": "4.3.6"
@@ -99,7 +99,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.136",
+  "version": "0.9.139",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [

package/scripts/lakebox-service.py

@@ -62,6 +62,7 @@ def namespaced(args, log=None, check=True, capture=False):
         stdout=subprocess.PIPE if capture else sink,
         stderr=sink,
         text=True,
+        check=False,
     )
     if check and result.returncode != 0:
         raise RuntimeError(f"{args[0]} {args[1] if len(args) > 1 else ''} exited {result.returncode}")
@@ -135,9 +136,8 @@ def listener_owner(port):
 
 
 def port_open(port):
-    with contextlib.suppress(OSError):
-        with socket.create_connection(("127.0.0.1", port), timeout=0.5):
-            return True
+    with contextlib.suppress(OSError), socket.create_connection(("127.0.0.1", port), timeout=0.5):
+        return True
     return False
 
 
@@ -150,7 +150,10 @@ def ensure_storage():
         f'runroot = "{RUN}/storage"\ngraphroot = "{STORAGE}/storage"\n'
         '[storage.options.vfs]\nignore_chown_errors = "true"\n'
     )
-    if not os.path.exists(conf) or open(conf, encoding="utf-8").read() != content:
+    existing = None
+    with contextlib.suppress(FileNotFoundError), open(conf, encoding="utf-8") as handle:
+        existing = handle.read()
+    if existing != content:
         with open(conf, "w", encoding="utf-8") as handle:
             handle.write(content)
 
@@ -368,18 +371,31 @@ def remove(name):
     return {"removed": True}
 
 
-def describe(name, include_log=False):
-    definition = read_definition(name)
+def read_status(name):
     status = {}
-    with contextlib.suppress(FileNotFoundError, json.JSONDecodeError):
-        with open(f"{service_dir(name)}/status.json", encoding="utf-8") as handle:
-            status = json.load(handle)
+    with (
+        contextlib.suppress(FileNotFoundError, json.JSONDecodeError),
+        open(f"{service_dir(name)}/status.json", encoding="utf-8") as handle,
+    ):
+        status = json.load(handle)
+    return status
+
+
+def resolve_service_state(status, running, lock_is_held):
     state = status.get("state", "stopped")
-    running = crun_state(name) == "running"
     if state == "ready" and not running:
-        state = "stopped"
-    if state == "starting" and not running and not lock_held(name):
-        state = "error" if status.get("error") else "stopped"
+        return "stopped"
+    if state == "starting" and not running and not lock_is_held:
+        return "error" if status.get("error") else "stopped"
+    return state
+
+
+def describe(name, include_log=False):
+    definition = read_definition(name)
+    status = read_status(name)
+    running = crun_state(name) == "running"
+    lock_is_held = lock_held(name) if status.get("state") == "starting" and not running else False
+    state = resolve_service_state(status, running, lock_is_held)
     result = {"name": name, "state": state, "definition": definition}
     if status.get("error") and state == "error":
         result["error"] = status["error"]
@@ -389,12 +405,14 @@ def describe(name, include_log=False):
 
 
 def lock_held(name):
-    with contextlib.suppress(FileNotFoundError):
-        with open(f"{service_dir(name)}/.lock", "w", encoding="utf-8") as handle:
-            try:
-                fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            except BlockingIOError:
-                return True
+    with (
+        contextlib.suppress(FileNotFoundError),
+        open(f"{service_dir(name)}/.lock", "w", encoding="utf-8") as handle,
+    ):
+        try:
+            fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB)
+        except BlockingIOError:
+            return True
     return False
 
 
@@ -418,30 +436,53 @@ def tail(name, max_lines, max_chars):
     return "\n".join(text.splitlines()[-max_lines:])[-max_chars:]
 
 
+def put_command(encoded_definition):
+    definition = json.loads(base64.b64decode(encoded_definition))
+    name = definition["name"]
+    with locked(name):
+        write_json(f"{service_dir(name)}/service.json", definition)
+    return describe(name)
+
+
+def list_command():
+    return {"services": [describe(name, include_log=True) for name in names()]}
+
+
+def logs_command(name, max_lines, max_chars):
+    return {"log": tail(name, int(max_lines), int(max_chars))}
+
+
+def start_all_command():
+    return {"services": [start(name) for name in names() if read_definition(name).get("autostart")]}
+
+
+COMMANDS = {
+    "put": put_command,
+    "start": start,
+    "stop": stop,
+    "remove": remove,
+    "list": list_command,
+    "logs": logs_command,
+    "start-all": start_all_command,
+}
+
+
+def usage():
+    print(f"usage: lakebox-service {'|'.join(COMMANDS)}", file=sys.stderr)
+    raise SystemExit(2)
+
+
+def dispatch(command, args):
+    handler = COMMANDS.get(command)
+    if handler is None:
+        usage()
+    return handler(*args)
+
+
 def main():
-    command = sys.argv[1] if len(sys.argv) > 1 else ""
-    if command == "put":
-        definition = json.loads(base64.b64decode(sys.argv[2]))
-        name = definition["name"]
-        with locked(name):
-            write_json(f"{service_dir(name)}/service.json", definition)
-        output = describe(name)
-    elif command == "start":
-        output = start(sys.argv[2])
-    elif command == "stop":
-        output = stop(sys.argv[2])
-    elif command == "remove":
-        output = remove(sys.argv[2])
-    elif command == "list":
-        output = {"services": [describe(name, include_log=True) for name in names()]}
-    elif command == "logs":
-        output = {"log": tail(sys.argv[2], int(sys.argv[3]), int(sys.argv[4]))}
-    elif command == "start-all":
-        output = {"services": [start(name) for name in names() if read_definition(name).get("autostart")]}
-    else:
-        print("usage: lakebox-service put|start|stop|remove|list|logs|start-all", file=sys.stderr)
-        sys.exit(2)
-    json.dump(output, sys.stdout)
+    if len(sys.argv) < 2:
+        usage()
+    json.dump(dispatch(sys.argv[1], sys.argv[2:]), sys.stdout)
 
 
 if __name__ == "__main__":