Skip to content
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

Desktop: Bundle default plugins with desktop application #6679

Merged
merged 20 commits into from
Sep 1, 2022
Merged

Desktop: Bundle default plugins with desktop application #6679

Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0c95341
initial commit
mak2002 Jul 11, 2022
7e0aeae
add tests and plugin files for testing
mak2002 Jul 17, 2022
4e04b9e
Merge branch 'laurent22:dev' into bundle-default-plugins-1
mak2002 Jul 17, 2022
b926ee6
small fix
mak2002 Jul 17, 2022
e6ded17
update building script and refactor tests
mak2002 Jul 19, 2022
68a611f
add message when bundling plugins
mak2002 Jul 19, 2022
427da27
bundle plugins only when publishing desktop app
mak2002 Jul 20, 2022
a327f8a
update naming | remove tsc command
mak2002 Aug 4, 2022
4cf0d00
add new mock file
mak2002 Aug 5, 2022
267e5ed
Merge branch 'laurent22:dev' into bundle-default-plugins-1
mak2002 Aug 5, 2022
3d4bfd2
update tests with mock fetch
mak2002 Aug 15, 2022
cc59c90
Merge branch 'bundle-default-plugins-1' of https://github.com/mak2002…
mak2002 Aug 15, 2022
725e003
restore dir after running bundling plugins script
mak2002 Aug 15, 2022
e87edf5
update function for reading local plugins versions
mak2002 Aug 16, 2022
25f636d
Merge branch 'dev' into bundle-default-plugins-1
laurent22 Aug 27, 2022
c77c180
add types
mak2002 Aug 28, 2022
8c692f8
Merge branch 'bundle-default-plugins-1' of https://github.com/mak2002…
mak2002 Aug 28, 2022
e46c305
remove a new line
mak2002 Aug 28, 2022
ddf69ae
update mock value for NPM response
mak2002 Aug 28, 2022
15a3dae
update error messages
mak2002 Aug 28, 2022
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
12 changes: 6 additions & 6 deletions packages/tools/bundleDefaultPlugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@ export const localPluginsVersion = async (defaultPluginDir: string, defaultPlugi

async function downloadFile(url: string, outputPath: string) {
const response = await fetch(url);
laurent22 marked this conversation as resolved.
Show resolved Hide resolved
if (!response.ok) {
throw new Error(`Cannot download file from ${url}`);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too you might want to provide more info such as response.status or response.text

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 👍

}
await writeFile(outputPath, await response.buffer());
}

export async function extractPlugins(currentDir: string, defaultPluginDir: string, downloadedPluginsNames: PluginIdAndName) {
export async function extractPlugins(currentDir: string, defaultPluginDir: string, downloadedPluginsNames: PluginIdAndName): Promise<void> {
for (const pluginId of Object.keys(downloadedPluginsNames)) {
await execCommand2(`tar xzf ${currentDir}/${downloadedPluginsNames[pluginId]}`);
await move(`package/publish/${pluginId}.jpl`,`${defaultPluginDir}/${pluginId}/plugin.jpl`, { overwrite: true });
Expand All @@ -45,16 +48,15 @@ export async function extractPlugins(currentDir: string, defaultPluginDir: strin
}
}

export const downloadPlugins = async (localPluginsVersions: PluginAndVersion, defaultPluginsInfo: DefaultPluginsInfo, manifests: any): Promise<any> => {
export const downloadPlugins = async (localPluginsVersions: PluginAndVersion, defaultPluginsInfo: DefaultPluginsInfo, manifests: any): Promise<PluginIdAndName> => {

const downloadedPluginsNames: PluginIdAndName = {};
for (const pluginId of Object.keys(defaultPluginsInfo)) {
if (localPluginsVersions[pluginId] === defaultPluginsInfo[pluginId].version) continue;
const response = await fetch(`https://registry.npmjs.org/${manifests[pluginId]._npm_package_name}`);

if (!response.ok) {
const responseText = await response.text();
throw new Error(`Cannot download plugin file ${responseText.substr(0,500)}`);
throw new Error(`Cannot fetch ${manifests[pluginId]._npm_package_name} release info from NPM`);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually your previous code was good, as you were showing the actual error message. Any reason you removed it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, while testing locally I thought that .text() will show buffer data but on failing to fetch it won't have any buffer data to show 😅 . Restored the previous message.

}
const releaseText = await response.text();
const release = JSON.parse(releaseText);
Expand All @@ -64,8 +66,6 @@ export const downloadPlugins = async (localPluginsVersions: PluginAndVersion, de
const pluginName = `${manifests[pluginId]._npm_package_name}-${defaultPluginsInfo[pluginId].version}.tgz`;
await downloadFile(pluginUrl, pluginName);

if (!await pathExists(pluginName)) throw new Error(`${pluginName} cannot be downloaded`);

downloadedPluginsNames[pluginId] = pluginName;
}
return downloadedPluginsNames;
Expand Down