@haibun/utils 3.1.3 → 3.4.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/build/npm-link-haibuns.js +5 -5
- package/build/npm-link-haibuns.js.map +1 -1
- package/build/scaffold/scaffold.d.ts.map +1 -1
- package/build/scaffold/scaffold.js +4 -8
- package/build/scaffold/scaffold.js.map +1 -1
- package/build/vcapture/index.js +1 -1
- package/build/vcapture/index.js.map +1 -1
- package/build/vcapture/vcapture-lib.d.ts +1 -1
- package/build/vcapture/vcapture-lib.d.ts.map +1 -1
- package/build/vcapture/vcapture-lib.js.map +1 -1
- package/build/version.js +4 -9
- package/build/version.js.map +1 -1
- package/package.json +12 -4
- package/ref.package.json +2 -12
- package/scaffold/tsconfig.json.in +0 -1
- package/vcapture/Dockerfile +32 -3
- package/vcapture/README.md +115 -0
- package/vcapture/docker-compose.yml +32 -1
- package/vcapture/setup-audio.sh +24 -0
- package/vcapture/start-vnc.sh +30 -0
- package/vcapture/supervisord.conf +124 -0
- package/scaffold/.eslintrc.in +0 -20
- package/scaffold/.prettierrc.in +0 -6
- package/scaffold/jest.config.js.in +0 -12
|
@@ -4,10 +4,10 @@ import fs from 'fs';
|
|
|
4
4
|
const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
|
|
5
5
|
const dependencies = Object.keys(pkg.dependencies || {});
|
|
6
6
|
const devDependencies = Object.keys(pkg.devDependencies || {});
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
.
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
const res = [];
|
|
8
|
+
for (const i of [...dependencies, ...devDependencies]) {
|
|
9
|
+
console.log(`Linking ${i}`);
|
|
10
|
+
res.push(execSync(`npm link ${i}`).toString());
|
|
11
|
+
}
|
|
12
12
|
console.log(`>> ${res}`);
|
|
13
13
|
//# sourceMappingURL=npm-link-haibuns.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-link-haibuns.js","sourceRoot":"","sources":["../src/npm-link-haibuns.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;AACzD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AAE/D,MAAM,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"npm-link-haibuns.js","sourceRoot":"","sources":["../src/npm-link-haibuns.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;AACzD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AAE/D,MAAM,GAAG,GAAG,EAAE,CAAC;AACf,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC5B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AACjD,CAAC;AACD,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":";AAUA,KAAK,GAAG,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAIrC,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":";AAUA,KAAK,GAAG,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAIrC,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmH/K"}
|
|
@@ -15,15 +15,11 @@ export async function scaffoldHaibun(dest, opts) {
|
|
|
15
15
|
'@haibun/core': currentVersion,
|
|
16
16
|
'@haibun/cli': currentVersion,
|
|
17
17
|
},
|
|
18
|
-
devDependencies: ["@types/node", "
|
|
19
|
-
"eslint-config-prettier", "eslint-plugin-import", "eslint-plugin-prefer-arrow", "eslint-plugin-prettier", "vitest",
|
|
20
|
-
"prettier", "typescript"]
|
|
21
|
-
.reduce((a, i) => ({ ...a, [i]: refPackage.devDependencies[i] }), {}),
|
|
18
|
+
devDependencies: ["@types/node", "vitest", "typescript"].reduce((a, i) => ({ ...a, [i]: refPackage.devDependencies[i] }), {}),
|
|
22
19
|
scripts: {
|
|
23
20
|
test: 'vitest run',
|
|
24
21
|
"test-watch": 'vitest',
|
|
25
|
-
"build": "tsc"
|
|
26
|
-
lint: 'lint --ext .ts ./src/',
|
|
22
|
+
"build": "tsc"
|
|
27
23
|
},
|
|
28
24
|
dirs: [
|
|
29
25
|
'src',
|
|
@@ -38,7 +34,7 @@ export async function scaffoldHaibun(dest, opts) {
|
|
|
38
34
|
localDest = JSON.parse(localPackage);
|
|
39
35
|
pName = localDest.name.replace(/.*\//, '').replace(/[@]/, '_', 'g').replace(/-./g, (x) => x[1].toUpperCase());
|
|
40
36
|
}
|
|
41
|
-
catch (
|
|
37
|
+
catch (_e) {
|
|
42
38
|
if (!noPrompt) {
|
|
43
39
|
pName = await readPackageName();
|
|
44
40
|
localDest = { name: pName };
|
|
@@ -70,7 +66,7 @@ export async function scaffoldHaibun(dest, opts) {
|
|
|
70
66
|
}
|
|
71
67
|
}
|
|
72
68
|
writeFileSync(localPackageJson, JSON.stringify(localDest, null, 2));
|
|
73
|
-
for (const f of ['tsconfig.json'
|
|
69
|
+
for (const f of ['tsconfig.json']) {
|
|
74
70
|
writeIfMissing(f);
|
|
75
71
|
}
|
|
76
72
|
for (const d of what.dirs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAC,CAAE,mCAAmC;AACxF,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,IAA6G;IAC5J,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAElC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,MAAM,IAAI,GAAuD;QAC7D,YAAY,EAAE;YACV,cAAc,EAAE,cAAc;YAC9B,aAAa,EAAE,cAAc;SAChC;QACD,eAAe,EAAE,CAAC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":"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"}
|
package/build/vcapture/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { parseVCaptureArgs, runContainer } from "./vcapture-lib.js";
|
|
3
3
|
process.on('unhandledRejection', (err) => {
|
|
4
4
|
console.error('cli Unhandled Rejection:', err);
|
|
5
|
-
if (err && err.stack) {
|
|
5
|
+
if (err instanceof Error && err.stack) {
|
|
6
6
|
console.error(err.stack);
|
|
7
7
|
}
|
|
8
8
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vcapture/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vcapture/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,GAAY,EAAE,EAAE;IACjD,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IAC/C,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAEtF,YAAY,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AAErD,SAAS,SAAS,CAAC,QAAQ,GAAG,CAAC;IAC9B,OAAO,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iMAAiM,CAAC,CAAC;IACvQ,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC"}
|
|
@@ -7,7 +7,7 @@ export type TCaptureOptions = {
|
|
|
7
7
|
cliEnv: string[] | undefined;
|
|
8
8
|
featureFilter: string | undefined;
|
|
9
9
|
};
|
|
10
|
-
export declare const runContainer: (testToRun:
|
|
10
|
+
export declare const runContainer: (testToRun: string, includeDirs: string[], thisCaptureOptions: TCaptureOptions) => void;
|
|
11
11
|
export declare function getContainerSetup(thisRunOptions: TCaptureOptions, includeDirs: string[], testToRun: string): {
|
|
12
12
|
tmpFile: string;
|
|
13
13
|
composeEnvironment: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcapture-lib.d.ts","sourceRoot":"","sources":["../../src/vcapture/vcapture-lib.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,
|
|
1
|
+
{"version":3,"file":"vcapture-lib.d.ts","sourceRoot":"","sources":["../../src/vcapture/vcapture-lib.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,EAAE,aAAa,MAAM,EAAO,EAAE,oBAAoB,eAAe,SA6C9G,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM;;;;;;;EAuC1G;AAMD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI;;;;EAsEvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcapture-lib.js","sourceRoot":"","sources":["../../src/vcapture/vcapture-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAE5B,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAYtE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"vcapture-lib.js","sourceRoot":"","sources":["../../src/vcapture/vcapture-lib.ts"],"names":[],"mappings":"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"}
|
package/build/version.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
|
3
|
-
import prettier from 'prettier';
|
|
4
3
|
import { spawnCommand } from './util/index.js';
|
|
5
4
|
import { createVitest } from 'vitest/node';
|
|
6
5
|
const [, me, version, ...extra] = process.argv;
|
|
7
|
-
async function format(contents) {
|
|
8
|
-
return await prettier.format(JSON.stringify(contents), { parser: 'json' });
|
|
9
|
-
}
|
|
10
6
|
class Versioner {
|
|
11
7
|
version;
|
|
12
8
|
localAndExtraModules = {};
|
|
@@ -41,13 +37,12 @@ class Versioner {
|
|
|
41
37
|
async doVersion() {
|
|
42
38
|
const haibunPackageJson = this.updateHaibunPackageVersions();
|
|
43
39
|
haibunPackageJson.version = this.version;
|
|
44
|
-
writeFileSync('./package.json',
|
|
40
|
+
writeFileSync('./package.json', JSON.stringify(haibunPackageJson, null, 2));
|
|
45
41
|
this.setLocalAndExtraModules();
|
|
46
42
|
await this.forLocalAndExtraModules(this.updateModule);
|
|
47
43
|
this.updateSourceCurrentVersion();
|
|
48
44
|
await this.gitCommit('haibun', '.', ['./modules/core/src/currentVersion.ts']);
|
|
49
45
|
await this.forLocalAndExtraModules(this.npmInstall);
|
|
50
|
-
// biome-disable-next-line @typescript-eslint/no-misused-promises
|
|
51
46
|
await this.forLocalAndExtraModules(this.runTest);
|
|
52
47
|
await this.forLocalAndExtraModules(this.gitCommit);
|
|
53
48
|
await this.forLocalAndExtraModules(this.npmPublish);
|
|
@@ -98,7 +93,7 @@ class Versioner {
|
|
|
98
93
|
console.error(`git push failed for ${name}: ${e}`);
|
|
99
94
|
});
|
|
100
95
|
}
|
|
101
|
-
|
|
96
|
+
updateModule(name, location) {
|
|
102
97
|
const pkgFile = `${location}/package.json`;
|
|
103
98
|
const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
|
|
104
99
|
if (!pkg.publish && pkg.publish !== undefined) {
|
|
@@ -111,8 +106,8 @@ class Versioner {
|
|
|
111
106
|
pkg.version = this.version;
|
|
112
107
|
this.updateDependencies(pkg.dependencies);
|
|
113
108
|
this.updateDependencies(pkg.devDependencies);
|
|
114
|
-
writeFileSync(pkgFile,
|
|
115
|
-
return;
|
|
109
|
+
writeFileSync(pkgFile, JSON.stringify(pkg, null, 2));
|
|
110
|
+
return Promise.resolve();
|
|
116
111
|
}
|
|
117
112
|
updateDependencies(dependencies) {
|
|
118
113
|
for (const d in dependencies) {
|
package/build/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AAE/C,MAAM,SAAS;IAQM;IAPpB,oBAAoB,GAA+B,EAAE,CAAC;IAC9C,MAAM,GAAG,KAAK,CAAC;IACf,SAAS,GAAG,IAAI,CAAC;IACzB,SAAS,GAAG,KAAK,CAAC;IAElB,qBAAqB,GAA8B,EAAE,CAAC;IAEtD,YAAoB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAClC,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,wCAAwC,CAAC,CAAC;YACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACtB,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,CAAC,KAAK,aAAa,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,CAAC,KAAK,aAAa,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,KAAK,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,CAAC;YACjE,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS;QACd,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAC7D,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QACzC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAiE,CAAC,CAAC;QAC3G,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,sCAAsC,CAAC,CAAC,CAAC;QAC9E,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAGD,KAAK,CAAC,uBAAuB,CAAC,YAA+D;QAC5F,OAAO,CAAC,IAAI,CAAC,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACxE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAChE,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,6BAA6B;QAC3E,CAAC;IACF,CAAC;IAED,2BAA2B;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnC,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;YAChG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAW,OAAO,CAAC;QACnD,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,0BAA0B;QACjC,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACtE,aAAa,CAAC,kBAAkB,IAAI,mBAAmB,GAAG,EAAE,EAAE,kCAAkC,IAAI,CAAC,OAAO,MAAM,CAAC,CAAC;YACpH,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;IAED,uBAAuB;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;aAC1E,UAAU,CAAC,GAAG,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;aAC9D,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;QAC1C,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,MAAc;QAC5C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QACD,MAAM,YAAY,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1D,OAAO,CAAC,KAAK,CAAC,0BAA0B,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,MAAc;QACzC,MAAM,YAAY,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACvD,OAAO,CAAC,KAAK,CAAC,uBAAuB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,QAAgB;QAC1C,MAAM,OAAO,GAAG,GAAG,QAAQ,eAAe,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO;QACR,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,MAAM,KAAK,CAAC,aAAa,IAAI,sBAAsB,QAAQ,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAE7C,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,kBAAkB,CAAC,YAAuC;QACzD,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9B,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;gBAChC,CAAC;gBACD,IAAI,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBACjD,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,QAAgB,EAAE,gBAA0B,EAAE;QAC3E,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,EAAE,cAAc,CAAC,CAAC;QACpD,MAAM,YAAY,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,IAAI,eAAe,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7H,OAAO,CAAC,KAAK,CAAC,yBAAyB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,QAAgB;QAC3C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAExB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5D,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,MAAM,EAAE,KAAK,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;YACvD,MAAM,KAAK,CAAC;QACb,CAAC;gBAAS,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,QAAgB;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QACD,MAAM,YAAY,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,OAAO,CAAC,KAAK,CAAC,0BAA0B,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AAED,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/utils",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.4.0",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "index.js",
|
|
7
|
-
"files": [
|
|
7
|
+
"files": [
|
|
8
|
+
"ref.package.json",
|
|
9
|
+
"build/**",
|
|
10
|
+
"scaffold/**",
|
|
11
|
+
"vcapture/**"
|
|
12
|
+
],
|
|
8
13
|
"bin": {
|
|
9
14
|
"scaffold": "build/scaffold/index.js",
|
|
10
15
|
"version": "build/version.js",
|
|
@@ -22,5 +27,8 @@
|
|
|
22
27
|
"author": "",
|
|
23
28
|
"license": "ISC",
|
|
24
29
|
"gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5",
|
|
25
|
-
"dependencies": {
|
|
26
|
-
|
|
30
|
+
"dependencies": {
|
|
31
|
+
"@haibun/cli": "3.4.0",
|
|
32
|
+
"@haibun/core": "3.4.0"
|
|
33
|
+
}
|
|
34
|
+
}
|
package/ref.package.json
CHANGED
|
@@ -1,19 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"devDependencies": {
|
|
3
|
-
"@types/node": "
|
|
4
|
-
"@typescript-eslint/eslint-plugin": "^5.48.0",
|
|
5
|
-
"@typescript-eslint/parser": "^5.48.0",
|
|
6
|
-
"eslint": "^8.31.0",
|
|
7
|
-
"eslint-config-airbnb-typescript": "^17.0.0",
|
|
8
|
-
"eslint-config-prettier": "^8.6.0",
|
|
9
|
-
"eslint-plugin-import": "^2.22.1",
|
|
10
|
-
"eslint-plugin-prefer-arrow": "^1.2.2",
|
|
11
|
-
"eslint-plugin-prettier": "^4.2.1",
|
|
3
|
+
"@types/node": "~24",
|
|
12
4
|
"node-notifier": "^10.0.1",
|
|
13
|
-
"nodemon": "^1.3.3",
|
|
14
|
-
"prettier": "^2.8.1",
|
|
15
5
|
"ts-node": "^10.9.1",
|
|
16
6
|
"typescript": "^4.9.4",
|
|
17
7
|
"vitest": "^1.0.1"
|
|
18
8
|
}
|
|
19
|
-
}
|
|
9
|
+
}
|
package/vcapture/Dockerfile
CHANGED
|
@@ -30,6 +30,10 @@ RUN apt-get update && apt-get install -y \
|
|
|
30
30
|
xfce4 \
|
|
31
31
|
xfce4-terminal \
|
|
32
32
|
xterm \
|
|
33
|
+
# SSH server for VS Code Remote
|
|
34
|
+
openssh-server \
|
|
35
|
+
# Supervisor for robust process management
|
|
36
|
+
supervisor \
|
|
33
37
|
&& rm -rf /var/lib/apt/lists/*
|
|
34
38
|
|
|
35
39
|
RUN git clone https://github.com/novnc/noVNC.git /opt/noVNC && \
|
|
@@ -37,15 +41,40 @@ RUN git clone https://github.com/novnc/noVNC.git /opt/noVNC && \
|
|
|
37
41
|
|
|
38
42
|
RUN sed -i 's/geteuid/getppid/' /usr/bin/vlc
|
|
39
43
|
|
|
44
|
+
# Setup SSH
|
|
45
|
+
RUN mkdir /var/run/sshd && \
|
|
46
|
+
# Disable password auth, require keys
|
|
47
|
+
sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config && \
|
|
48
|
+
sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config && \
|
|
49
|
+
echo "PermitRootLogin no" >> /etc/ssh/sshd_config && \
|
|
50
|
+
echo "StrictModes no" >> /etc/ssh/sshd_config
|
|
51
|
+
|
|
52
|
+
# Setup node user for SSH (matches host UID 1000 usually)
|
|
53
|
+
RUN mkdir -p /home/node/.ssh && chmod 700 /home/node/.ssh && \
|
|
54
|
+
chown -R node:node /home/node/.ssh && \
|
|
55
|
+
# Allow node to run sudo without password
|
|
56
|
+
echo "node ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
|
|
57
|
+
|
|
40
58
|
WORKDIR /app
|
|
41
59
|
|
|
42
60
|
COPY package*.json *.sh ./
|
|
61
|
+
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
|
43
62
|
RUN chmod +x *.sh
|
|
44
63
|
|
|
64
|
+
# Set default password for node user (just in case UI prompts appear)
|
|
65
|
+
RUN echo "node:node" | chpasswd
|
|
66
|
+
|
|
45
67
|
RUN npm i # && npm install kokoro-js # kokoro-js is installed on demand
|
|
46
68
|
RUN npx playwright install --with-deps
|
|
47
69
|
|
|
48
|
-
RUN mkdir -p /run/user/1000 && chmod 700 /run/user/1000
|
|
70
|
+
RUN mkdir -p /run/user/1000 && chown node:node /run/user/1000 && chmod 700 /run/user/1000
|
|
71
|
+
RUN mkdir -p /app/output && chown node:node /app/output
|
|
72
|
+
|
|
73
|
+
# Expose ports
|
|
74
|
+
EXPOSE 22 5930 8080 9222
|
|
75
|
+
|
|
76
|
+
# Environment defaults
|
|
77
|
+
ENV DISPLAY=:99
|
|
78
|
+
ENV RES=1920x1080
|
|
49
79
|
|
|
50
|
-
|
|
51
|
-
ENTRYPOINT ["./entrypoint.sh"]
|
|
80
|
+
ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
# Haibun VCapture Container
|
|
2
|
+
|
|
3
|
+
A Docker container providing a graphical Linux environment for:
|
|
4
|
+
- **Recording sessions** with video/audio capture
|
|
5
|
+
- **Narrator testing** with TTS output
|
|
6
|
+
- **VS Code Remote Development** via SSH
|
|
7
|
+
|
|
8
|
+
## Quick Start
|
|
9
|
+
|
|
10
|
+
```bash
|
|
11
|
+
# Build and start
|
|
12
|
+
docker compose up -d --build
|
|
13
|
+
|
|
14
|
+
# Check health
|
|
15
|
+
docker compose ps
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
## Access Methods
|
|
19
|
+
|
|
20
|
+
### 1. VNC via Browser (noVNC)
|
|
21
|
+
Open http://localhost:8080 in your browser for a web-based VNC client.
|
|
22
|
+
|
|
23
|
+
### 2. Native VNC Client
|
|
24
|
+
Connect to `localhost:5930` with any VNC client (TigerVNC, RealVNC, etc.)
|
|
25
|
+
|
|
26
|
+
### 3. VS Code Remote SSH
|
|
27
|
+
|
|
28
|
+
Add to your `~/.ssh/config`:
|
|
29
|
+
```
|
|
30
|
+
Host haibun-recorder
|
|
31
|
+
HostName localhost
|
|
32
|
+
Port 2222
|
|
33
|
+
User node
|
|
34
|
+
IdentityFile ~/.ssh/id_rsa
|
|
35
|
+
```
|
|
36
|
+
|
|
37
|
+
Then in VS Code: `Remote-SSH: Connect to Host...` → `haibun-recorder`
|
|
38
|
+
|
|
39
|
+
## Ports
|
|
40
|
+
|
|
41
|
+
| Port | Service | Description |
|
|
42
|
+
|------|---------|-------------|
|
|
43
|
+
| 8080 | noVNC | Web-based VNC access |
|
|
44
|
+
| 5930 | VNC | Native VNC client access |
|
|
45
|
+
| 2222 | SSH | VS Code Remote / terminal |
|
|
46
|
+
| 9222 | Chrome DevTools | Playwright debugging |
|
|
47
|
+
|
|
48
|
+
## SSH Key Setup
|
|
49
|
+
|
|
50
|
+
Your `~/.ssh/id_rsa.pub` is mounted automatically. If you use a different key:
|
|
51
|
+
|
|
52
|
+
```yaml
|
|
53
|
+
volumes:
|
|
54
|
+
- ~/.ssh/your_key.pub:/home/dev/.ssh/authorized_keys:ro
|
|
55
|
+
```
|
|
56
|
+
|
|
57
|
+
## Recording Sessions
|
|
58
|
+
|
|
59
|
+
From inside the container (via SSH or VNC terminal):
|
|
60
|
+
|
|
61
|
+
```bash
|
|
62
|
+
./capture-start.sh # Start ffmpeg recording
|
|
63
|
+
# ... do your work ...
|
|
64
|
+
./capture-stop.sh # Stop and save to output/
|
|
65
|
+
```
|
|
66
|
+
|
|
67
|
+
Recordings are saved to `./output/` which is persisted on your host.
|
|
68
|
+
|
|
69
|
+
## Process Management
|
|
70
|
+
|
|
71
|
+
All services are managed by **supervisor** for robustness:
|
|
72
|
+
- Services auto-restart on failure
|
|
73
|
+
- Logs available in `./output/*.log`
|
|
74
|
+
- Check status: `docker compose exec haibun-recorder supervisorctl status`
|
|
75
|
+
|
|
76
|
+
## Customization
|
|
77
|
+
|
|
78
|
+
### Resolution
|
|
79
|
+
Change in docker-compose.yml:
|
|
80
|
+
```yaml
|
|
81
|
+
environment:
|
|
82
|
+
- RES=2560x1440
|
|
83
|
+
```
|
|
84
|
+
|
|
85
|
+
### SSH Key Location
|
|
86
|
+
If your public key is not at `~/.ssh/id_rsa.pub`, specify it:
|
|
87
|
+
|
|
88
|
+
```bash
|
|
89
|
+
SSH_PUBKEY_PATH=~/.ssh/id_ed25519.pub docker compose up -d
|
|
90
|
+
```
|
|
91
|
+
|
|
92
|
+
### Mount Your Project
|
|
93
|
+
By default, the parent directory (`../../..`) is mounted to `/workspace`. Override this:
|
|
94
|
+
|
|
95
|
+
```bash
|
|
96
|
+
WORKSPACE_MOUNT=~/my-project docker compose up -d
|
|
97
|
+
```
|
|
98
|
+
|
|
99
|
+
## Troubleshooting SSH
|
|
100
|
+
|
|
101
|
+
If prompted for a password:
|
|
102
|
+
1. Ensure you mounted the **public key** (`.pub`), not private key.
|
|
103
|
+
2. If host key changed: `ssh-keygen -R "[localhost]:2222"`
|
|
104
|
+
3. Bypass host key checks:
|
|
105
|
+
```bash
|
|
106
|
+
```
|
|
107
|
+
ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p 2222 node@localhost
|
|
108
|
+
```
|
|
109
|
+
|
|
110
|
+
### VNC Password
|
|
111
|
+
To secure VNC access (defaults to no password):
|
|
112
|
+
|
|
113
|
+
```bash
|
|
114
|
+
VNC_PASSWORD=mysecret docker compose up -d
|
|
115
|
+
```
|
|
@@ -5,5 +5,36 @@ services:
|
|
|
5
5
|
dockerfile: Dockerfile
|
|
6
6
|
working_dir: /app
|
|
7
7
|
ports:
|
|
8
|
-
- "8080:8080" # noVNC
|
|
8
|
+
- "8080:8080" # noVNC web interface
|
|
9
9
|
- "9222:9222" # Chrome DevTools
|
|
10
|
+
- "2222:22" # SSH for VS Code Remote
|
|
11
|
+
- "5930:5930" # VNC direct (optional, for native VNC clients)
|
|
12
|
+
volumes:
|
|
13
|
+
# Mount your SSH public key for authentication
|
|
14
|
+
# Override with: SSH_PUBKEY_PATH=~/.ssh/id_ed25519.pub docker compose up
|
|
15
|
+
- ${SSH_PUBKEY_PATH:-~/.ssh/id_rsa.pub}:/home/node/.ssh/authorized_keys:ro,z
|
|
16
|
+
# Persist output/recordings
|
|
17
|
+
- ./output:/app/output
|
|
18
|
+
# Mount your project directory (Usage: WORKSPACE_MOUNT=~/dev/repo docker compose up)
|
|
19
|
+
- ${WORKSPACE_MOUNT:-../../..}:/workspace:z
|
|
20
|
+
environment:
|
|
21
|
+
- DISPLAY=:99
|
|
22
|
+
- RES=1920x1080
|
|
23
|
+
- VNC_PASSWORD=${VNC_PASSWORD:-} # Optional: set password for VNC access
|
|
24
|
+
shm_size: 1gb
|
|
25
|
+
# Health check to ensure services are running
|
|
26
|
+
healthcheck:
|
|
27
|
+
test: ["CMD-SHELL", "x11vnc -version && pgrep -x Xvfb > /dev/null"]
|
|
28
|
+
interval: 30s
|
|
29
|
+
timeout: 10s
|
|
30
|
+
retries: 3
|
|
31
|
+
start_period: 15s
|
|
32
|
+
# Graceful shutdown
|
|
33
|
+
stop_grace_period: 30s
|
|
34
|
+
# Resource limits (optional)
|
|
35
|
+
deploy:
|
|
36
|
+
resources:
|
|
37
|
+
limits:
|
|
38
|
+
memory: 4G
|
|
39
|
+
reservations:
|
|
40
|
+
memory: 1G
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
# Setup virtual audio sink after pipewire-pulse is ready
|
|
3
|
+
|
|
4
|
+
echo "Waiting for PulseAudio to be ready..."
|
|
5
|
+
max_attempts=30
|
|
6
|
+
attempt=1
|
|
7
|
+
|
|
8
|
+
while ! pactl info >/dev/null 2>&1; do
|
|
9
|
+
echo "Waiting for audio services... attempt $attempt of $max_attempts"
|
|
10
|
+
if [ $attempt -ge $max_attempts ]; then
|
|
11
|
+
echo "Audio services failed to start after $max_attempts attempts"
|
|
12
|
+
exit 1
|
|
13
|
+
fi
|
|
14
|
+
sleep 1
|
|
15
|
+
attempt=$((attempt + 1))
|
|
16
|
+
done
|
|
17
|
+
|
|
18
|
+
echo "PulseAudio ready. Setting up virtual sink..."
|
|
19
|
+
pactl load-module module-virtual-sink sink_name=v1
|
|
20
|
+
pactl set-default-sink v1
|
|
21
|
+
pactl set-default-source v1.monitor
|
|
22
|
+
pactl info
|
|
23
|
+
|
|
24
|
+
echo "Audio setup complete."
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
# Start x11vnc with optional password support
|
|
3
|
+
# Use /home/node explicitly to avoid tilde expansion issues in supervisord
|
|
4
|
+
|
|
5
|
+
echo "START-VNC: Script started. USER=$(whoami) DISPLAY=$DISPLAY"
|
|
6
|
+
|
|
7
|
+
if [ -n "$VNC_PASSWORD" ]; then
|
|
8
|
+
# Trim whitespace (safe operation)
|
|
9
|
+
VNC_PASSWORD=$(echo "$VNC_PASSWORD" | xargs)
|
|
10
|
+
echo "START-VNC: VNC_PASSWORD is set (trimmed length: ${#VNC_PASSWORD}). Configuring password auth via file."
|
|
11
|
+
|
|
12
|
+
mkdir -p /home/node/.vnc
|
|
13
|
+
rm -f /home/node/.vnc/passwd
|
|
14
|
+
|
|
15
|
+
# Store password in file (standard VNC auth)
|
|
16
|
+
x11vnc -storepasswd "$VNC_PASSWORD" /home/node/.vnc/passwd
|
|
17
|
+
if [ $? -ne 0 ]; then
|
|
18
|
+
echo "START-VNC: Failed to store password!"
|
|
19
|
+
exit 1
|
|
20
|
+
fi
|
|
21
|
+
chmod 600 /home/node/.vnc/passwd
|
|
22
|
+
ls -l /home/node/.vnc/passwd
|
|
23
|
+
|
|
24
|
+
# Use -rfbauth (standard) with verbose logging
|
|
25
|
+
exec /usr/bin/x11vnc -rfbport 5930 -display ${DISPLAY:-:99} -forever -noxdamage -shared -noshm -listen 0.0.0.0 -verbose -rfbauth /home/node/.vnc/passwd
|
|
26
|
+
else
|
|
27
|
+
echo "START-VNC: VNC_PASSWORD is NOT set. Starting without password..."
|
|
28
|
+
echo "START-VNC: WARNING - No password set. Anyone can connect."
|
|
29
|
+
exec /usr/bin/x11vnc -rfbport 5930 -display ${DISPLAY:-:99} -forever -noxdamage -shared -noshm -listen 0.0.0.0 -verbose -nopw
|
|
30
|
+
fi
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
[supervisord]
|
|
2
|
+
nodaemon=true
|
|
3
|
+
logfile=/app/output/supervisord.log
|
|
4
|
+
pidfile=/var/run/supervisord.pid
|
|
5
|
+
user=root
|
|
6
|
+
|
|
7
|
+
[program:dbus]
|
|
8
|
+
command=/usr/bin/dbus-daemon --system --nofork
|
|
9
|
+
autostart=true
|
|
10
|
+
autorestart=true
|
|
11
|
+
priority=10
|
|
12
|
+
stdout_logfile=/dev/stdout
|
|
13
|
+
stdout_logfile_maxbytes=0
|
|
14
|
+
stderr_logfile=/dev/stderr
|
|
15
|
+
stderr_logfile_maxbytes=0
|
|
16
|
+
|
|
17
|
+
[program:xvfb]
|
|
18
|
+
command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_RES)sx24 -ac +extension GLX +render -noreset
|
|
19
|
+
user=node
|
|
20
|
+
autostart=true
|
|
21
|
+
autorestart=true
|
|
22
|
+
priority=20
|
|
23
|
+
stdout_logfile=/dev/stdout
|
|
24
|
+
stdout_logfile_maxbytes=0
|
|
25
|
+
stderr_logfile=/dev/stderr
|
|
26
|
+
stderr_logfile_maxbytes=0
|
|
27
|
+
|
|
28
|
+
[program:x11vnc]
|
|
29
|
+
command=/app/start-vnc.sh
|
|
30
|
+
user=node
|
|
31
|
+
environment=HOME="/home/node",USER="node",DISPLAY="%(ENV_DISPLAY)s",VNC_PASSWORD="%(ENV_VNC_PASSWORD)s"
|
|
32
|
+
autostart=true
|
|
33
|
+
autorestart=true
|
|
34
|
+
priority=30
|
|
35
|
+
startsecs=3
|
|
36
|
+
stdout_logfile=/dev/stdout
|
|
37
|
+
stdout_logfile_maxbytes=0
|
|
38
|
+
stderr_logfile=/dev/stderr
|
|
39
|
+
stderr_logfile_maxbytes=0
|
|
40
|
+
|
|
41
|
+
[program:novnc]
|
|
42
|
+
command=/opt/noVNC/utils/novnc_proxy --vnc localhost:5930 --listen 8080
|
|
43
|
+
autostart=true
|
|
44
|
+
autorestart=true
|
|
45
|
+
priority=40
|
|
46
|
+
startsecs=5
|
|
47
|
+
stdout_logfile=/dev/stdout
|
|
48
|
+
stdout_logfile_maxbytes=0
|
|
49
|
+
stderr_logfile=/dev/stderr
|
|
50
|
+
stderr_logfile_maxbytes=0
|
|
51
|
+
|
|
52
|
+
[program:pipewire]
|
|
53
|
+
command=/usr/bin/pipewire
|
|
54
|
+
environment=HOME="/home/node",XDG_RUNTIME_DIR="/run/user/1000"
|
|
55
|
+
user=node
|
|
56
|
+
autostart=true
|
|
57
|
+
autorestart=true
|
|
58
|
+
priority=50
|
|
59
|
+
stdout_logfile=/dev/stdout
|
|
60
|
+
stdout_logfile_maxbytes=0
|
|
61
|
+
stderr_logfile=/dev/stderr
|
|
62
|
+
stderr_logfile_maxbytes=0
|
|
63
|
+
|
|
64
|
+
[program:wireplumber]
|
|
65
|
+
command=/usr/bin/wireplumber
|
|
66
|
+
environment=HOME="/home/node",XDG_RUNTIME_DIR="/run/user/1000"
|
|
67
|
+
user=node
|
|
68
|
+
autostart=true
|
|
69
|
+
autorestart=true
|
|
70
|
+
priority=51
|
|
71
|
+
startsecs=2
|
|
72
|
+
stdout_logfile=/dev/stdout
|
|
73
|
+
stdout_logfile_maxbytes=0
|
|
74
|
+
stderr_logfile=/dev/stderr
|
|
75
|
+
stderr_logfile_maxbytes=0
|
|
76
|
+
|
|
77
|
+
[program:pipewire-pulse]
|
|
78
|
+
command=/usr/bin/pipewire-pulse
|
|
79
|
+
environment=HOME="/home/node",XDG_RUNTIME_DIR="/run/user/1000"
|
|
80
|
+
user=node
|
|
81
|
+
autostart=true
|
|
82
|
+
autorestart=true
|
|
83
|
+
priority=52
|
|
84
|
+
startsecs=3
|
|
85
|
+
stdout_logfile=/dev/stdout
|
|
86
|
+
stdout_logfile_maxbytes=0
|
|
87
|
+
stderr_logfile=/dev/stderr
|
|
88
|
+
stderr_logfile_maxbytes=0
|
|
89
|
+
|
|
90
|
+
[program:sshd]
|
|
91
|
+
command=/usr/sbin/sshd -D
|
|
92
|
+
autostart=true
|
|
93
|
+
autorestart=true
|
|
94
|
+
priority=60
|
|
95
|
+
stdout_logfile=/dev/stdout
|
|
96
|
+
stdout_logfile_maxbytes=0
|
|
97
|
+
stderr_logfile=/dev/stderr
|
|
98
|
+
stderr_logfile_maxbytes=0
|
|
99
|
+
|
|
100
|
+
[program:xfce4]
|
|
101
|
+
command=/usr/bin/xfce4-session
|
|
102
|
+
environment=HOME="/home/node",USER="node",DISPLAY="%(ENV_DISPLAY)s",XDG_RUNTIME_DIR="/run/user/1000"
|
|
103
|
+
user=node
|
|
104
|
+
autostart=true
|
|
105
|
+
autorestart=true
|
|
106
|
+
priority=70
|
|
107
|
+
startsecs=5
|
|
108
|
+
stdout_logfile=/dev/stdout
|
|
109
|
+
stdout_logfile_maxbytes=0
|
|
110
|
+
stderr_logfile=/dev/stderr
|
|
111
|
+
stderr_logfile_maxbytes=0
|
|
112
|
+
|
|
113
|
+
[program:audio-setup]
|
|
114
|
+
command=/app/setup-audio.sh
|
|
115
|
+
user=node
|
|
116
|
+
environment=HOME="/home/node",XDG_RUNTIME_DIR="/run/user/1000"
|
|
117
|
+
autostart=true
|
|
118
|
+
autorestart=false
|
|
119
|
+
startsecs=0
|
|
120
|
+
priority=55
|
|
121
|
+
stdout_logfile=/dev/stdout
|
|
122
|
+
stdout_logfile_maxbytes=0
|
|
123
|
+
stderr_logfile=/dev/stderr
|
|
124
|
+
stderr_logfile_maxbytes=0
|
package/scaffold/.eslintrc.in
DELETED
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"parser": "@typescript-eslint/parser",
|
|
3
|
-
"parserOptions": {
|
|
4
|
-
"ecmaVersion": 12,
|
|
5
|
-
"sourceType": "module",
|
|
6
|
-
},
|
|
7
|
-
"plugins": ["@typescript-eslint"],
|
|
8
|
-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
|
|
9
|
-
|
|
10
|
-
"rules": {
|
|
11
|
-
"@typescript-eslint/no-unused-vars": "warn",
|
|
12
|
-
// to enforce using type for object type definitions, can be type or interface
|
|
13
|
-
"@typescript-eslint/consistent-type-definitions": ["error", "type"],
|
|
14
|
-
},
|
|
15
|
-
|
|
16
|
-
"env": {
|
|
17
|
-
"browser": false,
|
|
18
|
-
"es2021": true
|
|
19
|
-
}
|
|
20
|
-
}
|
package/scaffold/.prettierrc.in
DELETED