@dbos-inc/create 1.3.8-preview → 1.3.11-preview
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/init.js +2 -2
- package/dist/init.js.map +1 -1
- package/package.json +1 -1
- package/templates/hello/dbos-config.yaml +8 -6
- package/templates/hello/knexfile.js +1 -0
- package/templates/hello/package-lock.json +2 -0
- package/templates/hello/start_postgres_docker.js +40 -0
- package/templates/hello/start_postgres_docker.bat +0 -36
- package/templates/hello/start_postgres_docker.sh +0 -23
package/dist/init.js
CHANGED
|
@@ -14,7 +14,7 @@ export const copy = async (src, targets, dest, { rename = identity } = {}) => {
|
|
|
14
14
|
dot: true,
|
|
15
15
|
absolute: false,
|
|
16
16
|
stats: false,
|
|
17
|
-
ignore: ['**/node_modules/**', '**/dist/**']
|
|
17
|
+
ignore: ['package-lock.json', '**/node_modules/**', '**/dist/**']
|
|
18
18
|
});
|
|
19
19
|
return Promise.all(sourceFiles.map(async (p) => {
|
|
20
20
|
const dirname = path.dirname(p);
|
|
@@ -99,7 +99,7 @@ export async function init(appName, templateName) {
|
|
|
99
99
|
packageJson.name = appName;
|
|
100
100
|
fs.writeFileSync(packageJsonName, JSON.stringify(packageJson, null, 2), 'utf-8');
|
|
101
101
|
execSync("npm install --no-fund --save @dbos-inc/dbos-sdk@latest", { cwd: appName, stdio: 'inherit' });
|
|
102
|
-
execSync("npm
|
|
102
|
+
execSync("npm i --no-fund", { cwd: appName, stdio: 'inherit' });
|
|
103
103
|
execSync("npm install --no-fund --save-dev @dbos-inc/dbos-cloud@latest", { cwd: appName, stdio: 'inherit' });
|
|
104
104
|
console.log("Application initialized successfully!");
|
|
105
105
|
}
|
package/dist/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAMpC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EACvB,GAAW,EACX,OAAiB,EACjB,IAAY,EACZ,EAAE,MAAM,GAAG,QAAQ,KAAiB,EAAE,EACtC,EAAE;IACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE;QACtC,GAAG,EAAE,GAAG;QACR,GAAG,EAAE,IAAI;QACT,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,CAAC,oBAAoB,EAAE,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,12 +4,14 @@
|
|
|
4
4
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/dbos-inc/dbos-sdk/main/dbos-config.schema.json
|
|
5
5
|
|
|
6
6
|
database:
|
|
7
|
-
hostname:
|
|
7
|
+
hostname: localhost
|
|
8
8
|
port: 5432
|
|
9
|
-
username:
|
|
9
|
+
username: postgres
|
|
10
10
|
password: ${PGPASSWORD}
|
|
11
|
-
app_db_name:
|
|
11
|
+
app_db_name: hello
|
|
12
12
|
connectionTimeoutMillis: 3000
|
|
13
|
-
app_db_client:
|
|
14
|
-
migrate:
|
|
15
|
-
|
|
13
|
+
app_db_client: knex
|
|
14
|
+
migrate:
|
|
15
|
+
- npx knex migrate:latest
|
|
16
|
+
rollback:
|
|
17
|
+
- npx knex migrate:rollback
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"axios": "1.6.7",
|
|
46
46
|
"commander": "12.0.0",
|
|
47
47
|
"fast-glob": "3.3.2",
|
|
48
|
+
"inquirer": "^8.2.6",
|
|
48
49
|
"kafkajs": "^2.2.4",
|
|
49
50
|
"knex": "3.1.0",
|
|
50
51
|
"koa": "2.15.0",
|
|
@@ -65,6 +66,7 @@
|
|
|
65
66
|
},
|
|
66
67
|
"devDependencies": {
|
|
67
68
|
"@prisma/client": "^5.3.1",
|
|
69
|
+
"@types/inquirer": "^8.2.10",
|
|
68
70
|
"@types/koa": "^2.15.0",
|
|
69
71
|
"@types/koa__cors": "^5.0.0",
|
|
70
72
|
"@types/koa__router": "^12.0.4",
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
const { execSync } = require('child_process');
|
|
2
|
+
|
|
3
|
+
// Default PostgreSQL port
|
|
4
|
+
let port = '5432';
|
|
5
|
+
|
|
6
|
+
// Set the host PostgreSQL port with the -p/--port flag.
|
|
7
|
+
process.argv.forEach((val, index) => {
|
|
8
|
+
if (val === '-p' || val === '--port') {
|
|
9
|
+
if (process.argv[index + 1]) {
|
|
10
|
+
port = process.argv[index + 1];
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
if (!process.env.PGPASSWORD) {
|
|
16
|
+
console.error("Error: PGPASSWORD is not set.");
|
|
17
|
+
process.exit(1);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
try {
|
|
21
|
+
execSync(`docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD="${process.env.PGPASSWORD}" --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p ${port}:5432 -d postgres:16.1`);
|
|
22
|
+
console.log("Waiting for PostgreSQL to start...");
|
|
23
|
+
|
|
24
|
+
let attempts = 30;
|
|
25
|
+
const checkDatabase = setInterval(() => {
|
|
26
|
+
try {
|
|
27
|
+
execSync('docker exec dbos-db psql -U postgres -c "SELECT 1;"', { stdio: 'ignore' });
|
|
28
|
+
console.log("PostgreSQL started!");
|
|
29
|
+
clearInterval(checkDatabase);
|
|
30
|
+
console.log("Database started successfully!");
|
|
31
|
+
} catch (error) {
|
|
32
|
+
if (--attempts === 0) {
|
|
33
|
+
clearInterval(checkDatabase);
|
|
34
|
+
console.error("Failed to start PostgreSQL.");
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}, 1000);
|
|
38
|
+
} catch (error) {
|
|
39
|
+
console.error("Error starting PostgreSQL in Docker:", error.message);
|
|
40
|
+
}
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
@echo off
|
|
2
|
-
|
|
3
|
-
setlocal ENABLEEXTENSIONS
|
|
4
|
-
|
|
5
|
-
echo Checking if PGPASSWORD is set.
|
|
6
|
-
if "%PGPASSWORD%"=="" (
|
|
7
|
-
echo Error: PGPASSWORD is not set.
|
|
8
|
-
exit /b 1
|
|
9
|
-
)
|
|
10
|
-
|
|
11
|
-
echo Starting PostgreSQL in a local Docker container
|
|
12
|
-
docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD=%PGPASSWORD% --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p 5432:5432 -d postgres:16.1
|
|
13
|
-
|
|
14
|
-
if %errorlevel% == 125 (
|
|
15
|
-
echo Error: Check if the Docker container already exists
|
|
16
|
-
exit /b 1
|
|
17
|
-
) else (
|
|
18
|
-
goto :start
|
|
19
|
-
)
|
|
20
|
-
|
|
21
|
-
:start
|
|
22
|
-
echo Waiting for PostgreSQL to start...
|
|
23
|
-
for /l %%i in (1,1,30) do (
|
|
24
|
-
docker exec dbos-db psql -U postgres -c "SELECT 1;" >NUL 2>&1
|
|
25
|
-
|
|
26
|
-
if %errorlevel% equ 0 (
|
|
27
|
-
(
|
|
28
|
-
echo PostgreSQL started!
|
|
29
|
-
goto :break
|
|
30
|
-
)
|
|
31
|
-
timeout /t 1 /nobreak
|
|
32
|
-
)
|
|
33
|
-
)
|
|
34
|
-
:break
|
|
35
|
-
|
|
36
|
-
echo Database started successfully^!
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
#!/bin/bash
|
|
2
|
-
set -e
|
|
3
|
-
|
|
4
|
-
# Check if PGPASSWORD is set
|
|
5
|
-
if [[ -z "${PGPASSWORD}" ]]; then
|
|
6
|
-
echo "Error: PGPASSWORD is not set." >&2
|
|
7
|
-
exit 1
|
|
8
|
-
fi
|
|
9
|
-
|
|
10
|
-
# Start Postgres in a local Docker container
|
|
11
|
-
docker run --rm --name=dbos-db --env=POSTGRES_PASSWORD=${PGPASSWORD} --env=PGDATA=/var/lib/postgresql/data --volume=/var/lib/postgresql/data -p 5432:5432 -d postgres:16.1
|
|
12
|
-
|
|
13
|
-
# Wait for PostgreSQL to start
|
|
14
|
-
echo "Waiting for PostgreSQL to start..."
|
|
15
|
-
for i in {1..30}; do
|
|
16
|
-
if docker exec dbos-db psql -U postgres -c "SELECT 1;" > /dev/null 2>&1; then
|
|
17
|
-
echo "PostgreSQL started!"
|
|
18
|
-
break
|
|
19
|
-
fi
|
|
20
|
-
sleep 1
|
|
21
|
-
done
|
|
22
|
-
|
|
23
|
-
echo "Database started successfully!"
|