Skip to content

Commit

Permalink
fix: app subprocess restart not running onEnable lifecycle (#34172)
Browse files Browse the repository at this point in the history
  • Loading branch information
d-gubert committed Dec 12, 2024
1 parent 78e0010 commit e3ac726
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilled-seas-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/apps-engine': patch
---

Fixes the subprocess restarting routine failing to correctly restart apps in some cases
8 changes: 8 additions & 0 deletions packages/apps-engine/src/server/AppManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,10 @@ export class AppManager {
result = false;

await app.setStatus(status, silenceStatus);

// If some error has happened in initialization, like license or installations invalidation
// we need to store this on the DB regardless of what the parameter requests
saveToDb = true;
}

if (saveToDb) {
Expand Down Expand Up @@ -1111,6 +1115,10 @@ export class AppManager {
}

console.error(e);

// If some error has happened during enabling, like license or installations invalidation
// we need to store this on the DB regardless of what the parameter requests
saveToDb = true;
}

if (enable) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import { type Readable, EventEmitter } from 'stream';
import debugFactory from 'debug';
import * as jsonrpc from 'jsonrpc-lite';

import { AppStatus } from '../../../definition/AppStatus';
import { LivenessManager } from './LivenessManager';

Check failure on line 8 in packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

`./LivenessManager` import should occur after import of `../../storage`
import { ProcessMessenger } from './ProcessMessenger';

Check failure on line 9 in packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

`./ProcessMessenger` import should occur after import of `../../storage`
import { bundleLegacyApp } from './bundler';

Check failure on line 10 in packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

`./bundler` import should occur after import of `../../storage`
import { decoder } from './codec';

Check failure on line 11 in packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

`./codec` import should occur after import of `../../storage`
import { AppStatus, AppStatusUtils } from '../../../definition/AppStatus';
import type { AppMethod } from '../../../definition/metadata';
import type { AppManager } from '../../AppManager';
import type { AppBridges } from '../../bridges';
import type { IParseAppPackageResult } from '../../compiler';
import { AppConsole, type ILoggerStorageEntry } from '../../logging';
import type { AppAccessorManager, AppApiManager } from '../../managers';
import type { AppLogStorage, IAppStorageItem } from '../../storage';
import { LivenessManager } from './LivenessManager';
import { ProcessMessenger } from './ProcessMessenger';
import { bundleLegacyApp } from './bundler';
import { decoder } from './codec';

const baseDebug = debugFactory('appsEngine:runtime:deno');

Expand Down Expand Up @@ -107,7 +107,11 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
private readonly livenessManager: LivenessManager;

// We need to keep the appSource around in case the Deno process needs to be restarted
constructor(manager: AppManager, private readonly appPackage: IParseAppPackageResult, private readonly storageItem: IAppStorageItem) {
constructor(

Check failure on line 110 in packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Replace `⏎········manager:·AppManager,⏎········private·readonly·appPackage:·IParseAppPackageResult,⏎········private·readonly·storageItem:·IAppStorageItem,⏎····` with `manager:·AppManager,·private·readonly·appPackage:·IParseAppPackageResult,·private·readonly·storageItem:·IAppStorageItem`
manager: AppManager,
private readonly appPackage: IParseAppPackageResult,
private readonly storageItem: IAppStorageItem,
) {
super();

this.debug = baseDebug.extend(appPackage.info.id);
Expand Down Expand Up @@ -286,6 +290,10 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
await this.sendRequest({ method: 'app:initialize' });
await this.sendRequest({ method: 'app:setStatus', params: [this.storageItem.status] });

if (AppStatusUtils.isEnabled(this.storageItem.status)) {
await this.sendRequest({ method: 'app:onEnable' });
}

this.state = 'ready';

logger.info('Successfully restarted app subprocess');
Expand Down

0 comments on commit e3ac726

Please sign in to comment.