@appsemble/cli 0.36.3 → 0.36.5-test.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.36.3/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.36.5-test.0/config/assets/logo.svg) Appsemble CLI
 
 > Manage apps and blocks from the command line.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/cli)](https://www.npmjs.com/package/@appsemble/cli)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.36.3/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.36.3)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.36.5-test.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.36.5-test.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -323,5 +323,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.36.3/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.36.5-test.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/cleanupExpiredDomains.d.ts

@@ -0,0 +1,6 @@
+import { type Argv } from 'yargs';
+import { type BaseArguments } from '../types.js';
+export declare const command = "cleanup-expired-domains";
+export declare const description = "Sends emails to organization owners for app and app collection domains that have expired more than a week ago and sets the domain to null.";
+export declare function builder(yargs: Argv): Argv<any>;
+export declare function handler(argv: BaseArguments): Promise<void>;

package/commands/cleanupExpiredDomains.js

@@ -0,0 +1,64 @@
+import { serverImport } from '../lib/serverImport.js';
+export const command = 'cleanup-expired-domains';
+export const description = 'Sends emails to organization owners for app and app collection domains that have expired more than a week ago and sets the domain to null.';
+export function builder(yargs) {
+    return yargs
+        .option('database-host', {
+        desc: 'The host of the database to connect to. This defaults to the connected database container.',
+    })
+        .option('database-port', {
+        desc: 'The port of the database to connect to.',
+        type: 'number',
+        default: 5432,
+    })
+        .option('database-ssl', {
+        desc: 'Use SSL to connect to the database.',
+        type: 'boolean',
+    })
+        .option('database-name', {
+        desc: 'The name of the database to connect to.',
+        implies: ['database-user', 'database-password'],
+    })
+        .option('database-user', {
+        desc: 'The user to use to login to the database.',
+        implies: ['database-name', 'database-password'],
+    })
+        .option('database-password', {
+        desc: 'The password to use to login to the database.',
+        implies: ['database-name', 'database-user'],
+    })
+        .option('database-url', {
+        desc: 'A connection string for the database to connect to. This is an alternative to the separate database related variables.',
+        conflicts: ['database-host', 'database-name', 'database-user', 'database-password'],
+    })
+        .option('smtp-host', {
+        desc: 'The host of the SMTP server to connect to.',
+    })
+        .option('smtp-port', {
+        desc: 'The port of the SMTP server to connect to.',
+        type: 'number',
+    })
+        .option('smtp-secure', {
+        desc: 'Use TLS when connecting to the SMTP server.',
+        type: 'boolean',
+        default: false,
+    })
+        .option('smtp-user', {
+        desc: 'The user to use to login to the SMTP server.',
+        implies: ['smtp-pass', 'smtp-from'],
+    })
+        .option('smtp-pass', {
+        desc: 'The password to use to login to the SMTP server.',
+        implies: ['smtp-user', 'smtp-from'],
+    })
+        .option('smtp-from', {
+        desc: 'The address to use when sending emails.',
+        implies: ['smtp-user', 'smtp-pass'],
+    });
+}
+export async function handler(argv) {
+    const { cleanupExpiredDomains, setArgv } = await serverImport('setArgv', 'cleanupExpiredDomains');
+    setArgv(argv);
+    return cleanupExpiredDomains();
+}
+//# sourceMappingURL=cleanupExpiredDomains.js.map

package/commands/reencryptSecrets.d.ts

@@ -0,0 +1,6 @@
+import { type Argv } from 'yargs';
+import { type BaseArguments } from '../types.js';
+export declare const command = "reencrypt-secrets";
+export declare const description = "Re-encrypts all secrets in the database using the current AES secret. Use this when rotating from an old AES secret to a new one.";
+export declare function builder(yargs: Argv): Argv<any>;
+export declare function handler(argv: BaseArguments): Promise<void>;

package/commands/reencryptSecrets.js

@@ -0,0 +1,45 @@
+import { serverImport } from '../lib/serverImport.js';
+export const command = 'reencrypt-secrets';
+export const description = 'Re-encrypts all secrets in the database using the current AES secret. Use this when rotating from an old AES secret to a new one.';
+export function builder(yargs) {
+    return yargs
+        .option('old-aes-secret', {
+        desc: 'The old AES secret that was used to encrypt the secrets',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('database-host', {
+        desc: 'The host of the database to connect to. This defaults to the connected database container.',
+    })
+        .option('database-port', {
+        desc: 'The port of the database to connect to.',
+        type: 'number',
+        default: 5432,
+    })
+        .option('database-ssl', {
+        desc: 'Use SSL to connect to the database.',
+        type: 'boolean',
+    })
+        .option('database-name', {
+        desc: 'The name of the database to connect to.',
+        implies: ['database-user', 'database-password'],
+    })
+        .option('database-user', {
+        desc: 'The user to use to login to the database.',
+        implies: ['database-name', 'database-password'],
+    })
+        .option('database-password', {
+        desc: 'The password to use to login to the database.',
+        implies: ['database-name', 'database-user'],
+    })
+        .option('database-url', {
+        desc: 'A connection string for the database to connect to. This is an alternative to the separate database related variables.',
+        conflicts: ['database-host', 'database-name', 'database-user', 'database-password'],
+    });
+}
+export async function handler(argv) {
+    const { reencryptSecrets, setArgv } = await serverImport('setArgv', 'reencryptSecrets');
+    setArgv(argv);
+    return reencryptSecrets(argv);
+}
+//# sourceMappingURL=reencryptSecrets.js.map

package/commands/restoreDataFromBackup.js

@@ -3,6 +3,9 @@ export const command = 'restore-data-from-backup';
 export const description = 'Restore appsemble data from a specified backup for the main database and app databases';
 export function builder(yargs) {
     return yargs
+        .option('aesSecret', {
+        desc: 'Aes Secret used for encrypting DB password in the backup DB',
+    })
         .option('database-host', {
         desc: 'The host of the database to connect to. This defaults to the connected database container.',
     })
@@ -31,7 +34,7 @@ export function builder(yargs) {
         desc: 'A connection string for the database to connect to. This is an alternative to the separate database related variables.',
         conflicts: ['database-host', 'database-name', 'database-user', 'database-password'],
     })
-        .option('appsembleBackupFile', {
+        .option('restoreBackupFilename', {
         type: 'string',
         describe: 'The appsemble backup file to restore data from, e.g., appsemble_prod_backup_20250101.sql.gz',
         demandOption: true,

package/index.js

@@ -11,6 +11,7 @@ import * as chargeOrganizationSubscriptions from './commands/chargeOrganizationS
 import * as checkDownMigrations from './commands/checkDownMigrations.js';
 import * as checkAppMigrations from './commands/checkMigrations.js';
 import * as cleanupDemoAppMembers from './commands/cleanupDemoAppMembers.js';
+import * as cleanupExpiredDomains from './commands/cleanupExpiredDomains.js';
 import * as cleanupResourcesAndAssets from './commands/cleanupResourcesAndAssets.js';
 import * as cleanupSoftDeletedRecords from './commands/cleanupSoftDeletedRecords.js';
 import * as config from './commands/config/index.js';
@@ -20,6 +21,7 @@ import * as login from './commands/login.js';
 import * as logout from './commands/logout.js';
 import * as migrate from './commands/migrate.js';
 import * as migrateAppDefinitions from './commands/migrateAppDefinitions.js';
+import * as reencryptSecrets from './commands/reencryptSecrets.js';
 import * as organization from './commands/organization/index.js';
 import * as resource from './commands/resource/index.js';
 import * as restoreDataFromBackup from './commands/restoreDataFromBackup.js';
@@ -62,6 +64,7 @@ let parser = yargs(process.argv.slice(2))
     .command(backupProductionData)
     .command(restoreDataFromBackup)
     .command(cleanupDemoAppMembers)
+    .command(cleanupExpiredDomains)
     .command(cleanupSoftDeletedRecords)
     .command(checkAppMigrations)
     .command(checkDownMigrations)
@@ -71,6 +74,7 @@ let parser = yargs(process.argv.slice(2))
     .command(logout)
     .command(migrate)
     .command(migrateAppDefinitions)
+    .command(reencryptSecrets)
     .command(organization)
     .command(resource)
     .command(runCronJobs)

package/lib/serverImport.d.ts

@@ -4,4 +4,4 @@
  * @param members The names of the exported member to import.
  * @returns The exported member.
  */
-export declare function serverImport<T extends 'backupProductionData' | 'chargeOrganizationSubscriptions' | 'checkDownMigrations' | 'checkMigrations' | 'cleanupDemoAppMembers' | 'cleanupResourcesAndAssets' | 'cleanupSoftDeletedRecords' | 'fuzzMigrations' | 'migrate' | 'migrateAppDefinitions' | 'restoreDataFromBackup' | 'runCronJobs' | 'scaleContainers' | 'setArgv' | 'start' | 'synchronizeTrainings'>(...members: T[]): Promise<Record<T, any>>;
+export declare function serverImport<T extends 'backupProductionData' | 'chargeOrganizationSubscriptions' | 'checkDownMigrations' | 'checkMigrations' | 'cleanupDemoAppMembers' | 'cleanupExpiredDomains' | 'cleanupResourcesAndAssets' | 'cleanupSoftDeletedRecords' | 'fuzzMigrations' | 'migrate' | 'migrateAppDefinitions' | 'reencryptSecrets' | 'restoreDataFromBackup' | 'runCronJobs' | 'scaleContainers' | 'setArgv' | 'start' | 'synchronizeTrainings'>(...members: T[]): Promise<Record<T, any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.3",
+  "version": "0.36.5-test.0",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,11 +44,12 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.36.3",
-    "@appsemble/types": "0.36.3",
-    "@appsemble/lang-sdk": "0.36.3",
-    "@appsemble/utils": "0.36.3",
+    "@appsemble/node-utils": "0.36.5-test.0",
+    "@appsemble/types": "0.36.5-test.0",
+    "@appsemble/lang-sdk": "0.36.5-test.0",
+    "@appsemble/utils": "0.36.5-test.0",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
+    "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
     "@odata/parser": "^0.2.0",
     "axios": "^1.0.0",
@@ -60,7 +61,6 @@
     "fast-glob": "^3.0.0",
     "form-data": "^4.0.4",
     "global-cache-dir": "^6.0.0",
-    "@inquirer/prompts": "^8.0.0",
     "jsonschema": "~1.4.1",
     "koa": "^3.0.0",
     "koa-compose": "^4.0.0",
@@ -80,7 +80,7 @@
     "prettier": "^3.0.0",
     "raw-body": "^2.0.0",
     "read-package-up": "^11.0.0",
-    "sharp": "^0.32.0",
+    "sharp": "0.34.5",
     "ts-json-schema-generator": "^1.0.0",
     "type-fest": "^4.0.0",
     "url": "0.11.4",
@@ -89,16 +89,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.36.3",
-    "@appsemble/server": "0.36.3",
-    "axios-test-instance": "7.0.0",
-    "bcrypt": "5.1.1",
-    "big-integer": "1.6.52",
-    "default-browser": "5.4.0",
-    "is-inside-container": "1.0.0",
-    "titleize": "4.0.0",
-    "untildify": "6.0.0",
-    "yoctocolors-cjs": "2.1.3",
+    "@appsemble/types": "0.36.5-test.0",
+    "@appsemble/server": "0.36.5-test.0",
     "@types/concat-stream": "2.0.3",
     "@types/koa__cors": "5.0.1",
     "@types/koa-compress": "4.0.7",
@@ -106,9 +98,17 @@
     "@types/normalize-path": "3.0.2",
     "@types/postcss-import": "14.0.3",
     "@types/postcss-url": "10.0.4",
+    "axios-test-instance": "7.0.0",
+    "bcrypt": "5.1.1",
+    "big-integer": "1.6.52",
     "concat-stream": "2.0.0",
+    "default-browser": "5.5.0",
+    "is-inside-container": "1.0.0",
+    "sequelize": "6.37.7",
+    "titleize": "4.0.0",
+    "untildify": "6.0.0",
     "vitest": "2.1.9",
-    "sequelize": "6.37.7"
+    "yoctocolors-cjs": "2.1.3"
   },
   "optionalDependencies": {
     "keytar": "^7.0.0"

package/templates/apps/empty/app-definition.yaml

@@ -6,7 +6,7 @@ pages:
   - name: Example Page A
     blocks:
       - type: action-button
-        version: 0.36.3
+        version: 0.36.5-test.0
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.36.3
+        version: 0.36.5-test.0
         parameters:
           icon: arrow-left
         actions:

package/templates/blocks/mini-jsx/package.json

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.3",
+    "@appsemble/sdk": "0.36.5-test.0",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.36.3",
-    "@appsemble/sdk": "0.36.3",
+    "@appsemble/preact": "0.36.5-test.0",
+    "@appsemble/sdk": "0.36.5-test.0",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.3"
+    "@appsemble/sdk": "0.36.5-test.0"
   }
 }