Skip to content

fix: remove apps-engine dependency on internal package #36007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 6 commits into from
May 20, 2025
Merged

fix: remove apps-engine dependency on internal package #36007

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8ea2f8
Remove dependency on internal package from apps-engine
d-gubert May 15, 2025
b4f7354
Add changeset
d-gubert May 15, 2025
f1d06dd
Fix create function return value
d-gubert May 16, 2025
8be6aad
Update yarn.lock
d-gubert May 19, 2025
765e8b2
Merge branch 'develop' into fix/apps-engine-invalid-dependency
kodiakhq[bot] May 19, 2025
63e6248
Merge branch 'develop' into fix/apps-engine-invalid-dependency
kodiakhq[bot] May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/stale-walls-move.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/apps-engine': patch
'@rocket.chat/meteor': patch
---

Fixes the Apps-Engine package installation, removing the dependency on an internal package
8 changes: 5 additions & 3 deletions apps/meteor/ee/server/apps/storage/AppRealStorage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage';
import { AppMetadataStorage } from '@rocket.chat/apps-engine/server/storage';
import type { Apps } from '@rocket.chat/models';
import { removeEmpty } from '@rocket.chat/tools';
import type { UpdateFilter } from 'mongodb';

export class AppRealStorage extends AppMetadataStorage {
Expand All @@ -18,10 +19,11 @@ export class AppRealStorage extends AppMetadataStorage {
throw new Error('App already exists.');
}

const id = (await this.db.insertOne(item)).insertedId as unknown as string;
item._id = id;
const nonEmptyItem = removeEmpty(item);
const id = (await this.db.insertOne(nonEmptyItem)).insertedId as unknown as string;
nonEmptyItem._id = id;

return item;
return nonEmptyItem;
}

public async retrieveOne(id: string): Promise<IAppStorageItem> {
Expand Down
1 change: 0 additions & 1 deletion packages/apps-engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
},
"dependencies": {
"@msgpack/msgpack": "3.0.0-beta2",
"@rocket.chat/tools": "workspace:^",
"adm-zip": "^0.5.16",
"debug": "^4.3.7",
"esbuild": "^0.25.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/apps-engine/src/server/AppManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { Buffer } from 'buffer';

import { removeEmpty } from '@rocket.chat/tools';

import type { IGetAppsFilter } from './IGetAppsFilter';
import { ProxiedApp } from './ProxiedApp';
import type { PersistenceBridge, UserBridge } from './bridges';
Expand Down Expand Up @@ -609,7 +607,7 @@ export class AppManager {
}

descriptor.signature = await this.getSignatureManager().signApp(descriptor);
const created = await this.appMetadataStorage.create(removeEmpty(descriptor));
const created = await this.appMetadataStorage.create(descriptor);

if (!created) {
aff.setStorageError('Failed to create the App, the storage did not return it.');
Expand Down