@amalgm/apps 0.1.3-preview.37556900944 → 0.1.3-preview.44182717274
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/PURPOSE.md +24 -12
- package/README.md +39 -32
- package/dist/apps.d.ts +9 -7
- package/dist/apps.js +54 -45
- package/dist/apps.js.map +1 -1
- package/dist/command-surface.d.ts +3 -7
- package/dist/command-surface.js +9 -29
- package/dist/command-surface.js.map +1 -1
- package/dist/construct-surface.js +45 -17
- package/dist/construct-surface.js.map +1 -1
- package/dist/construct.d.ts +0 -5
- package/dist/construct.js +0 -22
- package/dist/construct.js.map +1 -1
- package/dist/folders.d.ts +40 -0
- package/dist/folders.js +94 -0
- package/dist/folders.js.map +1 -0
- package/dist/identity.d.ts +1 -2
- package/dist/identity.js +1 -13
- package/dist/identity.js.map +1 -1
- package/dist/index.d.ts +1 -6
- package/dist/index.js +1 -5
- package/dist/index.js.map +1 -1
- package/dist/layout.d.ts +20 -0
- package/dist/layout.js +27 -0
- package/dist/layout.js.map +1 -0
- package/dist/logs.js +2 -0
- package/dist/logs.js.map +1 -1
- package/dist/mcp-server.d.ts +1 -1
- package/dist/mcp-server.js +3 -33
- package/dist/mcp-server.js.map +1 -1
- package/dist/ownership.d.ts +1 -1
- package/dist/ownership.js +5 -4
- package/dist/ownership.js.map +1 -1
- package/dist/package.js +10 -2
- package/dist/package.js.map +1 -1
- package/dist/presentation.d.ts +1 -3
- package/dist/presentation.js +1 -12
- package/dist/presentation.js.map +1 -1
- package/dist/releases.d.ts +4 -6
- package/dist/releases.js +15 -24
- package/dist/releases.js.map +1 -1
- package/dist/runtime.js +4 -4
- package/dist/runtime.js.map +1 -1
- package/dist/schema.js +2 -13
- package/dist/schema.js.map +1 -1
- package/dist/store.d.ts +9 -3
- package/dist/store.js +20 -14
- package/dist/store.js.map +1 -1
- package/dist/supervisor.d.ts +2 -2
- package/dist/supervisor.js +11 -11
- package/dist/supervisor.js.map +1 -1
- package/dist/types.d.ts +14 -11
- package/docs/SHELL_INTEGRATION.md +23 -5
- package/docs/STATUS.md +31 -28
- package/docs/SUPERVISION.md +14 -15
- package/package.json +7 -18
- package/skills/apps/SKILL.md +56 -73
- package/dist/bin/apps.d.ts +0 -2
- package/dist/bin/apps.js +0 -6
- package/dist/bin/apps.js.map +0 -1
- package/dist/bin/mcp.d.ts +0 -2
- package/dist/bin/mcp.js +0 -15
- package/dist/bin/mcp.js.map +0 -1
- package/dist/cli.d.ts +0 -15
- package/dist/cli.js +0 -116
- package/dist/cli.js.map +0 -1
- package/dist/http.d.ts +0 -30
- package/dist/http.js +0 -77
- package/dist/http.js.map +0 -1
package/dist/index.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
export { Apps } from './apps.js';
|
|
2
|
-
export {
|
|
3
|
-
export { appCommandDefinition, appCommandDefinitions, createAppCommands } from './command-surface.js';
|
|
2
|
+
export { appCommandDefinitions, createAppCommands } from './command-surface.js';
|
|
4
3
|
export { appConstructSurface } from './construct-surface.js';
|
|
5
4
|
export { decodeConstructPayload, encodeConstructPayload } from './construct.js';
|
|
6
|
-
export { linkedToolEnvironment } from './presentation.js';
|
|
7
5
|
export * from './lease.js';
|
|
8
6
|
export { createMcpTools } from './mcp.js';
|
|
9
7
|
export { createMcpServer } from './mcp-server.js';
|
|
10
|
-
export { createAppsHttpServer } from './http.js';
|
|
11
|
-
export { unpackPackage } from './package.js';
|
|
12
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAKhF,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/layout.d.ts
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One app's folder in the user's apps root: its identity file, its source
|
|
3
|
+
* when Amalgm owns it, and `.private/` for every file Amalgm makes for the
|
|
4
|
+
* app. `.private/` never leaves this computer.
|
|
5
|
+
*/
|
|
6
|
+
declare function appLayout(root: string, folder: string): {
|
|
7
|
+
dir: string;
|
|
8
|
+
identity: string;
|
|
9
|
+
private: string;
|
|
10
|
+
/** Where a release is built before it is kept. */
|
|
11
|
+
build: string;
|
|
12
|
+
/** One immutable built release. */
|
|
13
|
+
release: (id: string) => string;
|
|
14
|
+
/** The copy of a release one deployment runs from. */
|
|
15
|
+
deployment: (id: string) => string;
|
|
16
|
+
/** The app's own data, handed to it as AMALGM_APP_DATA_DIR. */
|
|
17
|
+
data: string;
|
|
18
|
+
log: string;
|
|
19
|
+
};
|
|
20
|
+
export { appLayout };
|
package/dist/layout.js
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { entityLayout } from '@amalgm/core/identity';
|
|
3
|
+
/**
|
|
4
|
+
* One app's folder in the user's apps root: its identity file, its source
|
|
5
|
+
* when Amalgm owns it, and `.private/` for every file Amalgm makes for the
|
|
6
|
+
* app. `.private/` never leaves this computer.
|
|
7
|
+
*/
|
|
8
|
+
function appLayout(root, folder) {
|
|
9
|
+
const entity = entityLayout('app', root, folder);
|
|
10
|
+
const inPrivate = (...parts) => path.resolve(entity.private, ...parts);
|
|
11
|
+
return {
|
|
12
|
+
dir: path.resolve(entity.dir),
|
|
13
|
+
identity: path.resolve(entity.identity),
|
|
14
|
+
private: path.resolve(entity.private),
|
|
15
|
+
/** Where a release is built before it is kept. */
|
|
16
|
+
build: inPrivate('build'),
|
|
17
|
+
/** One immutable built release. */
|
|
18
|
+
release: (id) => inPrivate('releases', id),
|
|
19
|
+
/** The copy of a release one deployment runs from. */
|
|
20
|
+
deployment: (id) => inPrivate('current', id),
|
|
21
|
+
/** The app's own data, handed to it as AMALGM_APP_DATA_DIR. */
|
|
22
|
+
data: inPrivate('data'),
|
|
23
|
+
log: inPrivate('logs', 'app.log'),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export { appLayout };
|
|
27
|
+
//# sourceMappingURL=layout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;GAIG;AACH,SAAS,SAAS,CAAC,IAAY,EAAE,MAAc;IAC7C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,CAAC,GAAG,KAAe,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACjF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;QAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACrC,kDAAkD;QAClD,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;QACzB,mCAAmC;QACnC,OAAO,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;QAClD,sDAAsD;QACtD,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;QACpD,+DAA+D;QAC/D,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;QACvB,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
package/dist/logs.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
2
3
|
const DEFAULT_MAX_LOG_BYTES = 10 * 1024 * 1024;
|
|
3
4
|
// Copy-truncate: the newest maxBytes move to `.1` and the live file empties in
|
|
4
5
|
// place. An app appending through an inherited descriptor follows the
|
|
@@ -21,6 +22,7 @@ function capLog(file, maxBytes = DEFAULT_MAX_LOG_BYTES) {
|
|
|
21
22
|
// The app writes its own log, so its output never depends on the owner that
|
|
22
23
|
// started it staying alive. The caller closes the descriptor after spawn.
|
|
23
24
|
function openLog(file, maxBytes = DEFAULT_MAX_LOG_BYTES) {
|
|
25
|
+
fs.mkdirSync(path.dirname(file), { recursive: true });
|
|
24
26
|
capLog(file, maxBytes);
|
|
25
27
|
return fs.openSync(file, 'a');
|
|
26
28
|
}
|
package/dist/logs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../src/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../src/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAE/C,+EAA+E;AAC/E,sEAAsE;AACtE,8EAA8E;AAC9E,SAAS,MAAM,CAAC,IAAY,EAAE,QAAQ,GAAG,qBAAqB;IAC5D,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,IAAI,IAAI,IAAI,QAAQ;QAAE,OAAO;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC;QACH,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;IACtD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;IACD,EAAE,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC3B,CAAC;AAED,4EAA4E;AAC5E,0EAA0E;AAC1E,SAAS,OAAO,CAAC,IAAY,EAAE,QAAQ,GAAG,qBAAqB;IAC7D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,OAAO,CAAC,IAAY,EAAE,KAAa;IAC1C,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAClD,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;AACjF,CAAC;AAED,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC"}
|
package/dist/mcp-server.d.ts
CHANGED
package/dist/mcp-server.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
import readline from 'node:readline';
|
|
2
|
-
import { Apps } from './apps.js';
|
|
3
1
|
import { createMcpTools } from './mcp.js';
|
|
4
|
-
import { errorCode } from './boundaries.js';
|
|
5
2
|
function descriptor(tool) {
|
|
6
3
|
const { handler, ...definition } = tool;
|
|
7
4
|
return definition;
|
|
8
5
|
}
|
|
9
|
-
function createMcpServer(options
|
|
10
|
-
const apps = options.apps
|
|
6
|
+
function createMcpServer(options) {
|
|
7
|
+
const apps = options.apps;
|
|
11
8
|
const tools = createMcpTools(apps);
|
|
12
9
|
const byName = new Map(tools.map((tool) => [tool.name, tool]));
|
|
13
10
|
async function handle(message) {
|
|
@@ -32,34 +29,7 @@ function createMcpServer(options = {}) {
|
|
|
32
29
|
return undefined;
|
|
33
30
|
throw Object.assign(new Error(`Method not found: ${message.method}`), { code: -32601 });
|
|
34
31
|
}
|
|
35
|
-
|
|
36
|
-
await apps.boot();
|
|
37
|
-
const lines = readline.createInterface({ input, crlfDelay: Infinity });
|
|
38
|
-
lines.on('line', async (line) => {
|
|
39
|
-
let message;
|
|
40
|
-
try {
|
|
41
|
-
message = JSON.parse(line);
|
|
42
|
-
const result = await handle(message);
|
|
43
|
-
if (message.id === undefined || result === undefined)
|
|
44
|
-
return;
|
|
45
|
-
output.write(`${JSON.stringify({ jsonrpc: '2.0', id: message.id, result })}\n`);
|
|
46
|
-
}
|
|
47
|
-
catch (error) {
|
|
48
|
-
if (message?.id === undefined)
|
|
49
|
-
return;
|
|
50
|
-
output.write(`${JSON.stringify({
|
|
51
|
-
jsonrpc: '2.0',
|
|
52
|
-
id: message.id,
|
|
53
|
-
error: {
|
|
54
|
-
code: errorCode(error) || -32603,
|
|
55
|
-
message: error instanceof Error ? error.message : String(error),
|
|
56
|
-
},
|
|
57
|
-
})}\n`);
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
return lines;
|
|
61
|
-
}
|
|
62
|
-
return { apps, handle, start, tools };
|
|
32
|
+
return { apps, handle, tools };
|
|
63
33
|
}
|
|
64
34
|
export { createMcpServer };
|
|
65
35
|
//# sourceMappingURL=mcp-server.js.map
|
package/dist/mcp-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,SAAS,UAAU,CAAC,IAAa;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC;IACxC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,eAAe,CAAC,OAAyB;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAE/D,KAAK,UAAU,MAAM,CAAC,OAAuB;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YACpC,OAAO;gBACL,eAAe,EAAE,OAAO,CAAC,MAAM,EAAE,eAAe,IAAI,YAAY;gBAChE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE;gBAC/C,UAAU,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE;aACtD,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY;YAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7E,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrG,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;YAAE,OAAO,SAAS,CAAC;QACnE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,OAAO,EAAE,eAAe,EAAE,CAAC"}
|
package/dist/ownership.d.ts
CHANGED
package/dist/ownership.js
CHANGED
|
@@ -4,8 +4,9 @@ import net from 'node:net';
|
|
|
4
4
|
import os from 'node:os';
|
|
5
5
|
import path from 'node:path';
|
|
6
6
|
import { errorCode } from './boundaries.js';
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
/** One socket per catalog folder: whoever listens on it owns that catalog. */
|
|
8
|
+
function socketPath(dir) {
|
|
9
|
+
const digest = crypto.createHash('sha256').update(dir).digest('hex').slice(0, 24);
|
|
9
10
|
return process.platform === 'win32'
|
|
10
11
|
? `\\\\.\\pipe\\amalgm-apps-${digest}`
|
|
11
12
|
: path.join(os.tmpdir(), `amalgm-apps-${digest}.sock`);
|
|
@@ -26,8 +27,8 @@ class Ownership {
|
|
|
26
27
|
socket;
|
|
27
28
|
server = null;
|
|
28
29
|
pending = null;
|
|
29
|
-
constructor(
|
|
30
|
-
this.socket = socketPath(
|
|
30
|
+
constructor(dir) {
|
|
31
|
+
this.socket = socketPath(dir);
|
|
31
32
|
}
|
|
32
33
|
acquire() {
|
|
33
34
|
if (this.server)
|
package/dist/ownership.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownership.js","sourceRoot":"","sources":["../src/ownership.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,SAAS,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"ownership.js","sourceRoot":"","sources":["../src/ownership.ts"],"names":[],"mappings":"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"}
|
package/dist/package.js
CHANGED
|
@@ -2,10 +2,13 @@ import crypto from 'node:crypto';
|
|
|
2
2
|
import fs from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { minimatch } from 'minimatch';
|
|
5
|
+
import { ENTITY_KINDS, LOCAL_DIR_NAME, PRIVATE_DIR_NAME, isLocalOnlyPath } from '@amalgm/core/identity';
|
|
5
6
|
import { MANIFEST_FILE, readManifest } from './manifest.js';
|
|
6
7
|
const MAX_FILE_BYTES = 8 * 1024 * 1024;
|
|
7
8
|
const MAX_TOTAL_BYTES = 100 * 1024 * 1024;
|
|
8
|
-
|
|
9
|
+
// `.amalgm/` and `.private/` are this computer's own and never travel in a package.
|
|
10
|
+
const EXCLUDED_DIRS = new Set(['.git', '.hg', '.svn', 'node_modules', LOCAL_DIR_NAME, PRIVATE_DIR_NAME]);
|
|
11
|
+
const IDENTITY_FILE = ENTITY_KINDS.app.identityFile;
|
|
9
12
|
const SECRET_NAMES = new Set([
|
|
10
13
|
'.env',
|
|
11
14
|
'.env.local',
|
|
@@ -33,6 +36,10 @@ function safeRelative(file) {
|
|
|
33
36
|
|| value.split('/').includes('..')) {
|
|
34
37
|
throw new Error(`Invalid app file path: ${value}`);
|
|
35
38
|
}
|
|
39
|
+
// Unpacked into an app's folder, a package never writes its identity file or `.private/`.
|
|
40
|
+
if (value === IDENTITY_FILE || isLocalOnlyPath(value)) {
|
|
41
|
+
throw new Error(`App package carries a file only the app's folder may hold: ${value}`);
|
|
42
|
+
}
|
|
36
43
|
return value;
|
|
37
44
|
}
|
|
38
45
|
function normalizedManifestFile(manifest) {
|
|
@@ -82,7 +89,8 @@ function collectPackage(rootDir) {
|
|
|
82
89
|
excluded.push({ path: relative, reason: 'symlink' });
|
|
83
90
|
continue;
|
|
84
91
|
}
|
|
85
|
-
|
|
92
|
+
// The manifest is added normalized below; the identity file names the folder, not the app's source.
|
|
93
|
+
if (!entry.isFile() || relative === MANIFEST_FILE || relative === IDENTITY_FILE)
|
|
86
94
|
continue;
|
|
87
95
|
const includePattern = include.find(([, pattern]) => matches(relative, pattern));
|
|
88
96
|
if (!includePattern)
|
package/dist/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAU5D,MAAM,cAAc,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AACvC,MAAM,eAAe,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;AAC1C,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
package/dist/presentation.d.ts
CHANGED
|
@@ -7,10 +7,8 @@ declare function appEnvironment(options: AppsOptions, app: AppRecord): NodeJS.Pr
|
|
|
7
7
|
*/
|
|
8
8
|
declare function hostEnvironment(): NodeJS.ProcessEnv;
|
|
9
9
|
declare function appProcessEnvironment(app: AppRecord, supplied: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
10
|
-
/** What a tool linked to this app is told at call time: where the app is. */
|
|
11
|
-
declare function linkedToolEnvironment(app: AppRecord | null): Record<string, string>;
|
|
12
10
|
declare function replacePort(command: string, port: number): string;
|
|
13
11
|
declare function appView(service: Apps, app: AppRecord | null): AppView | null;
|
|
14
12
|
declare function eligibleRoutes(service: Apps): AppRoute[];
|
|
15
13
|
declare function queueRoutes(service: Apps, reason: string): Promise<unknown>;
|
|
16
|
-
export { appEnvironment, appProcessEnvironment, appView, eligibleRoutes, hostEnvironment,
|
|
14
|
+
export { appEnvironment, appProcessEnvironment, appView, eligibleRoutes, hostEnvironment, queueRoutes, replacePort, };
|
package/dist/presentation.js
CHANGED
|
@@ -32,17 +32,6 @@ function appProcessEnvironment(app, supplied) {
|
|
|
32
32
|
AMALGM_APP_DATA_DIR: app.dataDir,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
/** What a tool linked to this app is told at call time: where the app is. */
|
|
36
|
-
function linkedToolEnvironment(app) {
|
|
37
|
-
if (!app)
|
|
38
|
-
return {};
|
|
39
|
-
return {
|
|
40
|
-
AMALGM_APP_ID: app.id,
|
|
41
|
-
AMALGM_APP_URL: app.publicUrl,
|
|
42
|
-
AMALGM_APP_PORT: String(app.port),
|
|
43
|
-
AMALGM_APP_DATA_DIR: app.dataDir,
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
35
|
function replacePort(command, port) {
|
|
47
36
|
return command.replace(/\{port\}/g, String(port));
|
|
48
37
|
}
|
|
@@ -81,5 +70,5 @@ function queueRoutes(service, reason) {
|
|
|
81
70
|
});
|
|
82
71
|
return service.routeQueue;
|
|
83
72
|
}
|
|
84
|
-
export { appEnvironment, appProcessEnvironment, appView, eligibleRoutes, hostEnvironment,
|
|
73
|
+
export { appEnvironment, appProcessEnvironment, appView, eligibleRoutes, hostEnvironment, queueRoutes, replacePort, };
|
|
85
74
|
//# sourceMappingURL=presentation.js.map
|
package/dist/presentation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../src/presentation.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,SAAS,cAAc,CAAC,OAAoB,EAAE,GAAc;IAC1D,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,WAAW,KAAK,UAAU;QACxD,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC;QAC1B,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAChC,OAAO;QACL,GAAG,QAAQ;QACX,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe;IACtB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACjE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;AAChH,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAc,EAAE,QAA2B;IACxE,OAAO;QACL,GAAG,eAAe,EAAE;QACpB,GAAG,QAAQ;QACX,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QACtB,aAAa,EAAE,GAAG,CAAC,EAAE;QACrB,cAAc,EAAE,GAAG,CAAC,MAAM;QAC1B,cAAc,EAAE,GAAG,CAAC,SAAS;QAC7B,mBAAmB,EAAE,GAAG,CAAC,OAAO;KACjC,CAAC;AACJ,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../src/presentation.ts"],"names":[],"mappings":"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"}
|
package/dist/releases.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ import type { Apps } from './apps.js';
|
|
|
2
2
|
import type { Store } from './store.js';
|
|
3
3
|
import type { AppRecord, Deployment, Release, RunCommand } from './types.js';
|
|
4
4
|
interface ReleasesOptions {
|
|
5
|
-
|
|
5
|
+
/** The user's apps root; releases sit in each app folder's `.private/`. */
|
|
6
|
+
root: string;
|
|
6
7
|
store: Store;
|
|
7
8
|
buildEnv?: (app: AppRecord) => NodeJS.ProcessEnv;
|
|
8
9
|
runCommand?: RunCommand;
|
|
@@ -10,18 +11,15 @@ interface ReleasesOptions {
|
|
|
10
11
|
}
|
|
11
12
|
declare function releaseId(appId: string, digest: string): string;
|
|
12
13
|
declare class Releases {
|
|
13
|
-
readonly
|
|
14
|
+
readonly root: string;
|
|
14
15
|
readonly store: Store;
|
|
15
16
|
readonly buildEnv: (app: AppRecord) => NodeJS.ProcessEnv;
|
|
16
17
|
readonly run: RunCommand;
|
|
17
18
|
readonly buildTimeoutMs: number | undefined;
|
|
18
|
-
readonly releasesDir: string;
|
|
19
|
-
readonly deploymentsDir: string;
|
|
20
|
-
readonly tempDir: string;
|
|
21
19
|
constructor(options: ReleasesOptions);
|
|
22
20
|
prepare(app: AppRecord, sourceDir: string): Promise<Release>;
|
|
23
21
|
createDeployment(app: AppRecord, release: Release, reason: string): Promise<Deployment>;
|
|
24
|
-
removeDeployment(deployment: Deployment
|
|
22
|
+
removeDeployment(app: AppRecord, deployment: Deployment): void;
|
|
25
23
|
}
|
|
26
24
|
/**
|
|
27
25
|
* Make a release the app's running deployment. The previous deployment is the
|
package/dist/releases.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import crypto from 'node:crypto';
|
|
2
2
|
import fs from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import { appLayout } from './layout.js';
|
|
4
5
|
import { collectPackage, digestPackage, materialize } from './package.js';
|
|
5
6
|
import { runCommand } from './command.js';
|
|
6
7
|
import { errorMessage } from './boundaries.js';
|
|
@@ -9,38 +10,31 @@ function releaseId(appId, digest) {
|
|
|
9
10
|
return `rel-${identity.slice(0, 24)}`;
|
|
10
11
|
}
|
|
11
12
|
class Releases {
|
|
12
|
-
|
|
13
|
+
root;
|
|
13
14
|
store;
|
|
14
15
|
buildEnv;
|
|
15
16
|
run;
|
|
16
17
|
buildTimeoutMs;
|
|
17
|
-
releasesDir;
|
|
18
|
-
deploymentsDir;
|
|
19
|
-
tempDir;
|
|
20
18
|
constructor(options) {
|
|
21
|
-
this.
|
|
19
|
+
this.root = options.root;
|
|
22
20
|
this.store = options.store;
|
|
23
21
|
this.buildEnv = options.buildEnv || (() => process.env);
|
|
24
22
|
this.run = options.runCommand || runCommand;
|
|
25
23
|
this.buildTimeoutMs = options.buildTimeoutMs;
|
|
26
|
-
this.releasesDir = path.join(this.stateDir, 'releases');
|
|
27
|
-
this.deploymentsDir = path.join(this.stateDir, 'deployments');
|
|
28
|
-
this.tempDir = path.join(this.stateDir, 'tmp');
|
|
29
|
-
for (const directory of [this.releasesDir, this.deploymentsDir, this.tempDir]) {
|
|
30
|
-
fs.mkdirSync(directory, { recursive: true });
|
|
31
|
-
}
|
|
32
24
|
}
|
|
33
25
|
async prepare(app, sourceDir) {
|
|
34
26
|
const pkg = collectPackage(sourceDir);
|
|
35
27
|
const digest = digestPackage(pkg);
|
|
36
28
|
const id = releaseId(app.id, digest);
|
|
37
|
-
const
|
|
29
|
+
const layout = appLayout(this.root, app.folder);
|
|
30
|
+
const directory = layout.release(id);
|
|
38
31
|
const existing = this.store.getRelease(id);
|
|
39
|
-
if (existing && fs.existsSync(
|
|
32
|
+
if (existing && fs.existsSync(directory))
|
|
40
33
|
return existing;
|
|
41
34
|
fs.mkdirSync(path.dirname(directory), { recursive: true });
|
|
42
35
|
if (!fs.existsSync(directory)) {
|
|
43
|
-
|
|
36
|
+
fs.mkdirSync(layout.build, { recursive: true });
|
|
37
|
+
const staging = fs.mkdtempSync(path.join(layout.build, `${id}-`));
|
|
44
38
|
try {
|
|
45
39
|
materialize(pkg.files, staging);
|
|
46
40
|
if (pkg.manifest.buildCommand) {
|
|
@@ -74,16 +68,16 @@ class Releases {
|
|
|
74
68
|
id,
|
|
75
69
|
appId: app.id,
|
|
76
70
|
digest,
|
|
77
|
-
directory,
|
|
78
71
|
manifest: pkg.manifest,
|
|
79
72
|
createdAt: new Date().toISOString(),
|
|
80
73
|
});
|
|
81
74
|
}
|
|
82
75
|
async createDeployment(app, release, reason) {
|
|
83
76
|
const id = `dep-${crypto.randomUUID()}`;
|
|
84
|
-
const
|
|
77
|
+
const layout = appLayout(this.root, app.folder);
|
|
78
|
+
const directory = layout.deployment(id);
|
|
85
79
|
await fs.promises.mkdir(path.dirname(directory), { recursive: true });
|
|
86
|
-
await fs.promises.cp(release.
|
|
80
|
+
await fs.promises.cp(layout.release(release.id), directory, {
|
|
87
81
|
recursive: true,
|
|
88
82
|
errorOnExist: true,
|
|
89
83
|
force: false,
|
|
@@ -93,15 +87,12 @@ class Releases {
|
|
|
93
87
|
id,
|
|
94
88
|
appId: app.id,
|
|
95
89
|
releaseId: release.id,
|
|
96
|
-
directory,
|
|
97
90
|
reason,
|
|
98
91
|
createdAt: new Date().toISOString(),
|
|
99
92
|
});
|
|
100
93
|
}
|
|
101
|
-
removeDeployment(deployment) {
|
|
102
|
-
|
|
103
|
-
return;
|
|
104
|
-
fs.rmSync(deployment.directory, { recursive: true, force: true });
|
|
94
|
+
removeDeployment(app, deployment) {
|
|
95
|
+
fs.rmSync(appLayout(this.root, app.folder).deployment(deployment.id), { recursive: true, force: true });
|
|
105
96
|
}
|
|
106
97
|
}
|
|
107
98
|
/**
|
|
@@ -121,12 +112,12 @@ async function activateRelease(service, app, release, reason) {
|
|
|
121
112
|
try {
|
|
122
113
|
const activated = await service.supervisor.start(app.id);
|
|
123
114
|
if (previous)
|
|
124
|
-
service.releases.removeDeployment(previous);
|
|
115
|
+
service.releases.removeDeployment(app, previous);
|
|
125
116
|
return activated;
|
|
126
117
|
}
|
|
127
118
|
catch (error) {
|
|
128
119
|
service.store.failDeployment(deployment.id, errorMessage(error));
|
|
129
|
-
service.releases.removeDeployment(deployment);
|
|
120
|
+
service.releases.removeDeployment(app, deployment);
|
|
130
121
|
if (previous) {
|
|
131
122
|
service.store.activate(app.id, previous.id);
|
|
132
123
|
try {
|
package/dist/releases.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"releases.js","sourceRoot":"","sources":["../src/releases.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"releases.js","sourceRoot":"","sources":["../src/releases.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime.js
CHANGED
|
@@ -11,8 +11,8 @@ import { Supervisor } from './supervisor.js';
|
|
|
11
11
|
function createRuntime(service, options) {
|
|
12
12
|
const customRunCommand = options.runCommand;
|
|
13
13
|
const customSpawn = options.spawn;
|
|
14
|
-
const store =
|
|
15
|
-
const ownership =
|
|
14
|
+
const store = new Store(path.join(service.dir, 'apps.db'), service.root);
|
|
15
|
+
const ownership = new Ownership(service.dir);
|
|
16
16
|
const operations = new Operations(ownership, () => service.changes.settle());
|
|
17
17
|
const faults = new Faults({
|
|
18
18
|
store,
|
|
@@ -20,7 +20,7 @@ function createRuntime(service, options) {
|
|
|
20
20
|
onError: options.onError,
|
|
21
21
|
});
|
|
22
22
|
const releases = new Releases({
|
|
23
|
-
|
|
23
|
+
root: service.root,
|
|
24
24
|
store,
|
|
25
25
|
buildTimeoutMs: options.buildTimeoutMs,
|
|
26
26
|
runCommand: typeof customRunCommand === 'function'
|
|
@@ -30,7 +30,7 @@ function createRuntime(service, options) {
|
|
|
30
30
|
});
|
|
31
31
|
const changed = (app) => service.changed(app);
|
|
32
32
|
const supervisor = new Supervisor({
|
|
33
|
-
|
|
33
|
+
root: service.root,
|
|
34
34
|
store,
|
|
35
35
|
settleMs: options.settleMs,
|
|
36
36
|
stopGraceMs: options.stopGraceMs,
|
package/dist/runtime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,SAAS,aAAa,CAAC,OAAa,EAAE,OAAoB;IACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAClC,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/schema.js
CHANGED
|
@@ -8,8 +8,8 @@ function migrate(db) {
|
|
|
8
8
|
app_ref TEXT NOT NULL UNIQUE,
|
|
9
9
|
public_url TEXT NOT NULL,
|
|
10
10
|
port INTEGER NOT NULL UNIQUE,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
folder TEXT NOT NULL UNIQUE COLLATE NOCASE,
|
|
12
|
+
source_dir TEXT,
|
|
13
13
|
active_release_id TEXT,
|
|
14
14
|
active_deployment_id TEXT,
|
|
15
15
|
active_generation_id TEXT,
|
|
@@ -31,7 +31,6 @@ function migrate(db) {
|
|
|
31
31
|
id TEXT PRIMARY KEY,
|
|
32
32
|
app_id TEXT NOT NULL REFERENCES apps(id) ON DELETE CASCADE,
|
|
33
33
|
digest TEXT NOT NULL,
|
|
34
|
-
directory TEXT NOT NULL,
|
|
35
34
|
manifest_json TEXT NOT NULL,
|
|
36
35
|
created_at TEXT NOT NULL,
|
|
37
36
|
UNIQUE(app_id, digest)
|
|
@@ -41,7 +40,6 @@ function migrate(db) {
|
|
|
41
40
|
id TEXT NOT NULL UNIQUE,
|
|
42
41
|
app_id TEXT NOT NULL REFERENCES apps(id) ON DELETE CASCADE,
|
|
43
42
|
release_id TEXT NOT NULL REFERENCES releases(id),
|
|
44
|
-
directory TEXT NOT NULL,
|
|
45
43
|
reason TEXT NOT NULL,
|
|
46
44
|
status TEXT NOT NULL,
|
|
47
45
|
error TEXT,
|
|
@@ -69,15 +67,6 @@ function migrate(db) {
|
|
|
69
67
|
CREATE INDEX IF NOT EXISTS generations_app_sequence
|
|
70
68
|
ON process_generations(app_id, sequence DESC);
|
|
71
69
|
`);
|
|
72
|
-
// An installation that predates constructs has apps but no version column;
|
|
73
|
-
// its apps hold no recorded version until their next deliberate change.
|
|
74
|
-
addColumn(db, 'apps', 'construct_version', 'TEXT');
|
|
75
|
-
}
|
|
76
|
-
function addColumn(db, table, column, type) {
|
|
77
|
-
const columns = db.prepare(`PRAGMA table_info(${table})`).all();
|
|
78
|
-
if (columns.some((existing) => existing.name === column))
|
|
79
|
-
return;
|
|
80
|
-
db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
|
|
81
70
|
}
|
|
82
71
|
export { migrate };
|
|
83
72
|
//# sourceMappingURL=schema.js.map
|