@ubiquity-os/plugin-sdk 3.12.0 → 3.12.2

package/dist/configuration.js

@@ -175,6 +175,9 @@ function resolveManifestUrl(pluginUrl) {
     while (pathname.endsWith("/") && pathname.length > 1) {
       pathname = pathname.slice(0, -1);
     }
+    if (pathname === "/") {
+      pathname = EMPTY_STRING;
+    }
     if (pathname.endsWith(".json")) {
       parsed.search = EMPTY_STRING;
       parsed.hash = EMPTY_STRING;
@@ -462,7 +465,7 @@ var ConfigurationHandler = class {
     return { config: targetRepoConfiguration, imports, errors, rawData };
   }
   _decodeConfiguration(location, config) {
-    this._logger.info("Decoding configuration", { owner: location.owner, repository: location.repo });
+    this._logger.debug("Decoding configuration", { owner: location.owner, repository: location.repo });
     try {
       const configSchemaWithDefaults = import_value.Value.Default(configSchema, config);
       const errors = import_value.Value.Errors(configSchema, configSchemaWithDefaults);
@@ -557,7 +560,7 @@ var ConfigurationHandler = class {
         ...ref ? { ref } : {},
         mediaType: { format: "raw" }
       });
-      logOk(this._logger, "Configuration file found", { owner, repository, filePath, rateLimitRemaining: headers?.["x-ratelimit-remaining"] });
+      this._logger.debug("Configuration file found", { owner, repository, filePath, rateLimitRemaining: headers?.["x-ratelimit-remaining"] });
       return data;
     } catch (err) {
       this._handleDownloadError(err, { owner, repository, filePath });
@@ -581,11 +584,11 @@ var ConfigurationHandler = class {
    * Parse the raw YAML content and returns the loaded YAML, or errors if any.
    */
   parseYaml(data) {
-    this._logger.info("Will attempt to parse YAML data");
+    this._logger.debug("Will attempt to parse YAML data");
     try {
       if (data) {
         const parsedData = import_js_yaml.default.load(data);
-        logOk(this._logger, "Parsed yaml data successfully");
+        this._logger.debug("Parsed yaml data successfully");
         return { yaml: parsedData ?? null, errors: null };
       }
     } catch (error) {
@@ -610,10 +613,15 @@ var ConfigurationHandler = class {
     return isGithubPlugin(plugin) ? this._fetchActionManifest(plugin) : this._fetchWorkerManifest(plugin);
   }
   async _fetchWorkerManifest(url) {
-    if (this._manifestCache[url]) {
-      return this._manifestCache[url];
+    const manifestUrl = resolveManifestUrl(url);
+    if (!manifestUrl) {
+      this._logger.warn("Invalid plugin URL; cannot fetch manifest", { pluginUrl: url });
+      return null;
+    }
+    const manifestKey = `url:${manifestUrl}`;
+    if (this._manifestCache[manifestKey]) {
+      return this._manifestCache[manifestKey];
     }
-    const manifestUrl = `${url}/manifest.json`;
     try {
       const result = await fetch(manifestUrl);
       if (!result.ok) {
@@ -622,7 +630,7 @@ var ConfigurationHandler = class {
       }
       const jsonData = await result.json();
       const manifest = this._decodeManifest(jsonData);
-      this._manifestCache[url] = manifest;
+      this._manifestCache[manifestKey] = manifest;
       return manifest;
     } catch (e) {
       this._logger.error("Could not find a manifest for Worker", { manifestUrl, err: e });
@@ -693,7 +701,7 @@ var ConfigurationHandler = class {
           return manifest;
         }
       } catch (e) {
-        this._logger.warn("Could not find a valid manifest", { owner, repo, err: e });
+        this._logger.warn(`Could not find a valid manifest for ${owner}/${repo}${ref ? "@" + ref : ""}`, { owner, repo, ref, err: e });
       }
       return null;
     })();

package/dist/configuration.mjs

@@ -136,6 +136,9 @@ function resolveManifestUrl(pluginUrl) {
     while (pathname.endsWith("/") && pathname.length > 1) {
       pathname = pathname.slice(0, -1);
     }
+    if (pathname === "/") {
+      pathname = EMPTY_STRING;
+    }
     if (pathname.endsWith(".json")) {
       parsed.search = EMPTY_STRING;
       parsed.hash = EMPTY_STRING;
@@ -423,7 +426,7 @@ var ConfigurationHandler = class {
     return { config: targetRepoConfiguration, imports, errors, rawData };
   }
   _decodeConfiguration(location, config) {
-    this._logger.info("Decoding configuration", { owner: location.owner, repository: location.repo });
+    this._logger.debug("Decoding configuration", { owner: location.owner, repository: location.repo });
     try {
       const configSchemaWithDefaults = Value.Default(configSchema, config);
       const errors = Value.Errors(configSchema, configSchemaWithDefaults);
@@ -518,7 +521,7 @@ var ConfigurationHandler = class {
         ...ref ? { ref } : {},
         mediaType: { format: "raw" }
       });
-      logOk(this._logger, "Configuration file found", { owner, repository, filePath, rateLimitRemaining: headers?.["x-ratelimit-remaining"] });
+      this._logger.debug("Configuration file found", { owner, repository, filePath, rateLimitRemaining: headers?.["x-ratelimit-remaining"] });
       return data;
     } catch (err) {
       this._handleDownloadError(err, { owner, repository, filePath });
@@ -542,11 +545,11 @@ var ConfigurationHandler = class {
    * Parse the raw YAML content and returns the loaded YAML, or errors if any.
    */
   parseYaml(data) {
-    this._logger.info("Will attempt to parse YAML data");
+    this._logger.debug("Will attempt to parse YAML data");
     try {
       if (data) {
         const parsedData = YAML.load(data);
-        logOk(this._logger, "Parsed yaml data successfully");
+        this._logger.debug("Parsed yaml data successfully");
         return { yaml: parsedData ?? null, errors: null };
       }
     } catch (error) {
@@ -571,10 +574,15 @@ var ConfigurationHandler = class {
     return isGithubPlugin(plugin) ? this._fetchActionManifest(plugin) : this._fetchWorkerManifest(plugin);
   }
   async _fetchWorkerManifest(url) {
-    if (this._manifestCache[url]) {
-      return this._manifestCache[url];
+    const manifestUrl = resolveManifestUrl(url);
+    if (!manifestUrl) {
+      this._logger.warn("Invalid plugin URL; cannot fetch manifest", { pluginUrl: url });
+      return null;
+    }
+    const manifestKey = `url:${manifestUrl}`;
+    if (this._manifestCache[manifestKey]) {
+      return this._manifestCache[manifestKey];
     }
-    const manifestUrl = `${url}/manifest.json`;
     try {
       const result = await fetch(manifestUrl);
       if (!result.ok) {
@@ -583,7 +591,7 @@ var ConfigurationHandler = class {
       }
       const jsonData = await result.json();
       const manifest = this._decodeManifest(jsonData);
-      this._manifestCache[url] = manifest;
+      this._manifestCache[manifestKey] = manifest;
       return manifest;
     } catch (e) {
       this._logger.error("Could not find a manifest for Worker", { manifestUrl, err: e });
@@ -654,7 +662,7 @@ var ConfigurationHandler = class {
           return manifest;
         }
       } catch (e) {
-        this._logger.warn("Could not find a valid manifest", { owner, repo, err: e });
+        this._logger.warn(`Could not find a valid manifest for ${owner}/${repo}${ref ? "@" + ref : ""}`, { owner, repo, ref, err: e });
       }
       return null;
     })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubiquity-os/plugin-sdk",
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "SDK for plugin support.",
   "author": "Ubiquity DAO",
   "license": "MIT",