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.

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

fix: Acode ignoring main, readme and icon fields in plugin manifest #1085

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
21 changes: 20 additions & 1 deletion src/lib/installPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default async function installPlugin(
const zip = new JSZip();
await zip.loadAsync(plugin);

if (!zip.files["plugin.json"] || !zip.files["main.js"]) {
if (!zip.files["plugin.json"]) {
throw new Error(strings["invalid plugin"]);
}

Expand All @@ -86,6 +86,25 @@ export default async function installPlugin(
await zip.files["plugin.json"].async("text"),
);

/** patch main in manifest */
if (!zip.files[pluginJson.main]) {
pluginJson.main = "main.js";
}

/** patch icon in manifest */
if (!zip.files[pluginJson.icon]) {
pluginJson.icon = "icon.png";
}

/** patch readme in manifest */
if (!zip.files[pluginJson.readme]) {
pluginJson.readme = "readme.md";
}

if (!zip.files[pluginJson.main]) {
throw new Error(strings["invalid plugin"]);
}

if (!isDependency && pluginJson.dependencies) {
const manifests = await resolveDepsManifest(pluginJson.dependencies);

Expand Down
15 changes: 14 additions & 1 deletion src/lib/loadPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,21 @@ export default async function loadPlugin(pluginId, justInstalled = false) {
const baseUrl = await helpers.toInternalUri(Url.join(PLUGIN_DIR, pluginId));
const cacheFile = Url.join(CACHE_STORAGE, pluginId);

const pluginJson = await fsOperation(
Url.join(PLUGIN_DIR, pluginId, "plugin.json"),
).readFile("json");

let mainUrl;
if (
await fsOperation(Url.join(PLUGIN_DIR, pluginId, pluginJson.main)).exists()
) {
mainUrl = Url.join(baseUrl, pluginJson.main);
} else {
mainUrl = Url.join(baseUrl, "main.js");
}

return new Promise((resolve, reject) => {
const $script = <script src={Url.join(baseUrl, "main.js")}></script>;
const $script = <script src={mainUrl}></script>;

$script.onerror = (error) => {
reject(
Expand Down
4 changes: 2 additions & 2 deletions src/pages/plugin/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ export default async function PluginInclude(
).readFile("json");
const { author } = installedPlugin;
const description = await fsOperation(
Url.join(PLUGIN_DIR, id, "readme.md"),
Url.join(PLUGIN_DIR, id, installedPlugin.readme),
).readFile("utf8");
const iconUrl = await helpers.toInternalUri(
Url.join(PLUGIN_DIR, id, "icon.png"),
Url.join(PLUGIN_DIR, id, installedPlugin.icon),
);
const iconData = await fsOperation(iconUrl).readFile();
const icon = URL.createObjectURL(
Expand Down
2 changes: 1 addition & 1 deletion src/pages/plugins/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ export default function PluginsInclude(updates) {
if (!((updates && updates.includes(id)) || !updates)) return;
const url = Url.join(item.url, "plugin.json");
const plugin = await fsOperation(url).readFile("json");
const iconUrl = getLocalRes(id, "icon.png");
const iconUrl = getLocalRes(id, plugin.icon);
plugin.icon = await helpers.toInternalUri(iconUrl);
plugin.installed = true;
plugins.installed.push(plugin);
Expand Down
2 changes: 1 addition & 1 deletion src/sidebarApps/extensions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ async function listInstalledPlugins() {
const id = Url.basename(item.url);
const url = Url.join(item.url, "plugin.json");
const plugin = await fsOperation(url).readFile("json");
const iconUrl = getLocalRes(id, "icon.png");
const iconUrl = getLocalRes(id, plugin.icon);
plugin.icon = await helpers.toInternalUri(iconUrl);
plugin.installed = true;
return plugin;
Expand Down
Loading