@logto/cli 1.34.0 → 1.36.0

package/lib/commands/database/alteration/index.js

@@ -28,28 +28,47 @@ export const getAvailableAlterations = async (pool, compareMode = 'gt') => {
         : getTimestampFromFilename(filename) <= databaseTimestamp);
 };
 const deployAlteration = async (pool, { path: filePath, filename }, action = 'up') => {
-    const { up, down } = await importAlterationScript(filePath);
+    const { up, down, beforeUp, beforeDown } = await importAlterationScript(filePath);
+    const timestamp = getTimestampFromFilename(filename);
     try {
-        await pool.transaction(async (connection) => {
-            if (action === 'up') {
+        if (action === 'up') {
+            if (beforeUp) {
+                await beforeUp(pool);
+            }
+            await pool.transaction(async (connection) => {
                 await up(connection);
-                await updateDatabaseTimestamp(connection, getTimestampFromFilename(filename));
+                await updateDatabaseTimestamp(connection, timestamp);
+            });
+        }
+        if (action === 'down') {
+            if (beforeDown) {
+                await beforeDown(pool);
             }
-            if (action === 'down') {
+            await pool.transaction(async (connection) => {
                 await down(connection);
-                const newTimestamp = getTimestampFromFilename(filename) - 1;
+                const newTimestamp = timestamp - 1;
                 if (newTimestamp > 0) {
                     await updateDatabaseTimestamp(connection, newTimestamp);
                 }
-            }
-        });
+            });
+        }
     }
     catch (error) {
         consoleLog.error(error);
         await pool.end();
-        consoleLog.fatal(`Error ocurred during running alteration ${chalk.blue(filename)}.\n\n` +
-            "  This alteration didn't change anything since it was in a transaction.\n" +
-            '  Try to fix the error and deploy again.');
+        const hasNonTransactionalSteps = 
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        (action === 'up' && beforeUp) || (action === 'down' && beforeDown);
+        if (hasNonTransactionalSteps) {
+            consoleLog.fatal(`Error occurred while running alteration ${chalk.blue(filename)}.\n\n` +
+                '  Non-transactional steps (`beforeUp`/`beforeDown`) may have been applied before the failure.\n' +
+                '  Inspect the database state, fix the issue, then rerun the alteration to reconcile state and timestamp.');
+        }
+        else {
+            consoleLog.fatal(`Error occurred while running alteration ${chalk.blue(filename)}.\n\n` +
+                "  This alteration didn't change anything since it was in a transaction.\n" +
+                '  Fix the error and deploy again.');
+        }
     }
     consoleLog.info(`Run alteration ${filename} \`${action}()\` function succeeded`);
 };

package/lib/commands/database/seed/tables.js

@@ -2,7 +2,7 @@ import { readdir, readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { createDefaultAdminConsoleConfig, defaultTenantId, adminTenantId, defaultManagementApi, createAdminDataInAdminTenant, createMeApiInAdminTenant, createDefaultSignInExperience, createAdminTenantSignInExperience, createDefaultAdminConsoleApplication, createCloudApi, createTenantApplicationRole, CloudScope, Roles, UsersRoles, LogtoConfigs, SignInExperiences, Applications, OrganizationUserRelations, getTenantOrganizationId, Users, OrganizationRoleUserRelations, TenantRole, AccountCenters, } from '@logto/schemas';
 import { getTenantRole } from '@logto/schemas';
-import { createDefaultAccountCenter } from '@logto/schemas/lib/seeds/account-center.js';
+import { createDefaultAccountCenter, createAdminTenantAccountCenter, } from '@logto/schemas/lib/seeds/account-center.js';
 import { Tenants } from '@logto/schemas/models';
 import { generateStandardId } from '@logto/shared';
 import { sql } from '@silverhand/slonik';
@@ -116,7 +116,7 @@ export const seedTables = async (connection, latestTimestamp, isCloud) => {
         connection.query(insertInto(createAdminTenantSignInExperience(), SignInExperiences.table)),
         connection.query(insertInto(createDefaultAdminConsoleApplication(), Applications.table)),
         connection.query(insertInto(createDefaultAccountCenter(defaultTenantId), AccountCenters.table)),
-        connection.query(insertInto(createDefaultAccountCenter(adminTenantId), AccountCenters.table)),
+        connection.query(insertInto(createAdminTenantAccountCenter(), AccountCenters.table)),
     ]);
     // The below seed data is for the Logto Cloud only. We put it here for the sake of simplicity.
     // The data is not harmful for OSS, since they are all admin tenant data. OSS will not use them

package/lib/database.js

@@ -1,9 +1,11 @@
-import { assert } from '@silverhand/essentials';
+import { parseTimeoutEnv } from '@logto/shared';
+import { assert, conditional } from '@silverhand/essentials';
 import { createPool, parseDsn, sql, stringifyDsn, createInterceptorsPreset, } from '@silverhand/slonik';
 import decamelize from 'decamelize';
 import { DatabaseError } from 'pg-protocol';
 import { convertToPrimitiveOrSql } from './sql.js';
 import { ConfigKey, consoleLog, getCliConfigWithPrompt } from './utils.js';
+const databaseStatementTimeout = parseTimeoutEnv(process.env.DATABASE_STATEMENT_TIMEOUT);
 export const defaultDatabaseUrl = 'postgresql://localhost:5432/logto';
 export const getDatabaseUrlFromConfig = async () => (await getCliConfigWithPrompt({
     key: ConfigKey.DatabaseUrl,
@@ -15,6 +17,7 @@ export const createPoolFromConfig = async () => {
     assert(parseDsn(databaseUrl).databaseName, new Error('Database name is required in URL'));
     return createPool(databaseUrl, {
         interceptors: createInterceptorsPreset(),
+        ...conditional(databaseStatementTimeout !== undefined && { statementTimeout: databaseStatementTimeout }),
     });
 };
 /**
@@ -41,6 +44,9 @@ export const createPoolAndDatabaseIfNeeded = async () => {
         const databaseName = dsn.databaseName ?? '?';
         const maintenancePool = await createPool(stringifyDsn({ ...dsn, databaseName: 'postgres' }), {
             interceptors: createInterceptorsPreset(),
+            ...(databaseStatementTimeout === undefined
+                ? {}
+                : { statementTimeout: databaseStatementTimeout }),
         });
         await maintenancePool.query(sql `
       create database ${sql.identifier([databaseName])}

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.34.0",
+    "version": "1.36.0",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -60,7 +60,7 @@ export const packageJson = {
         "p-retry": "^6.0.0",
         "pg-protocol": "^1.6.0",
         "semver": "^7.3.8",
-        "tar": "^7.0.0",
+        "tar": "^7.5.4",
         "yargs": "^17.6.0",
         "zod": "3.24.3"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.34.0",
+  "version": "1.36.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -42,13 +42,13 @@
     "p-retry": "^6.0.0",
     "pg-protocol": "^1.6.0",
     "semver": "^7.3.8",
-    "tar": "^7.0.0",
+    "tar": "^7.5.4",
     "yargs": "^17.6.0",
     "zod": "3.24.3",
-    "@logto/connector-kit": "^4.6.0",
-    "@logto/core-kit": "^2.6.1",
-    "@logto/schemas": "1.34.0",
-    "@logto/shared": "^3.3.0"
+    "@logto/core-kit": "^2.7.0",
+    "@logto/schemas": "1.36.0",
+    "@logto/shared": "^3.3.1",
+    "@logto/connector-kit": "^4.7.0"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "6.0.1",