Merge pull request #68 from ClayPulse/add-canvas

Shellishack · web-flow · commit a2018ede8793 · 2025-10-05T04:30:15.000+08:00
hotfix remote config parsing error
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -52,6 +52,7 @@
     "soft-cases-share",
     "stale-groups-poke",
     "tender-jeans-occur",
+    "tender-phones-ring",
     "tough-aliens-appear",
     "true-suits-fly",
     "vast-places-rhyme",
diff --git a/.changeset/tender-phones-ring.md b/.changeset/tender-phones-ring.md
@@ -0,0 +1,6 @@
+---
+"@pulse-editor/shared-utils": patch
+"@pulse-editor/react-api": patch
+---
+
+Make config type's version nullable
diff --git a/npm-packages/react-api/CHANGELOG.md b/npm-packages/react-api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pulse-editor/react-api
 
+## 0.1.1-alpha.43
+
+### Patch Changes
+
+- Make config type's version nullable
+- Updated dependencies
+  - @pulse-editor/shared-utils@0.1.1-alpha.43
+
 ## 0.1.1-alpha.42
 
 ### Patch Changes
diff --git a/npm-packages/react-api/package.json b/npm-packages/react-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pulse-editor/react-api",
-  "version": "0.1.1-alpha.42",
+  "version": "0.1.1-alpha.43",
   "main": "dist/main.js",
   "files": [
     "dist"
@@ -38,7 +38,7 @@
     "typescript-eslint": "^8.30.1"
   },
   "peerDependencies": {
-    "@pulse-editor/shared-utils": "0.1.1-alpha.42",
+    "@pulse-editor/shared-utils": "0.1.1-alpha.43",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   }
diff --git a/npm-packages/shared-utils/CHANGELOG.md b/npm-packages/shared-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pulse-editor/shared-utils
 
+## 0.1.1-alpha.43
+
+### Patch Changes
+
+- Make config type's version nullable
+
 ## 0.1.1-alpha.42
 
 ### Patch Changes
diff --git a/npm-packages/shared-utils/package.json b/npm-packages/shared-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pulse-editor/shared-utils",
-    "version": "0.1.1-alpha.42",
+    "version": "0.1.1-alpha.43",
     "main": "dist/main.js",
     "files": [
         "dist"
diff --git a/npm-packages/shared-utils/src/types/types.ts b/npm-packages/shared-utils/src/types/types.ts
@@ -119,7 +119,8 @@ export enum AppTypeEnum {
 export type AppConfig = {
   id: string;
   version: string;
-  libVersion: string;
+  libVersion?: string;
+  visibility?: string;
   author?: string;
   displayName?: string;
   description?: string;
@@ -133,8 +134,6 @@ export type AppConfig = {
   agents?: Agent[];
   // Exposed actions in the modular app
   preRegisteredActions?: Action[];
-  // Visibility
-  visibility: string;
   // Recommended dimensions for app view in canvas
   recommendedHeight?: number;
   recommendedWidth?: number;
diff --git a/package-lock.json b/package-lock.json
diff --git a/web/components/extension/extension-preview.tsx b/web/components/extension/extension-preview.tsx
@@ -101,16 +101,15 @@ export default function ExtensionPreview({
         ));
       setRemoteMFVersion(remoteMFVersion);
 
-      const remoteLibVersion =
-        extension.config.libVersion === "unknown"
-          ? (
-              await getRemoteLibVersion(
-                extension.remoteOrigin,
-                extension.config.id,
-                extension.config.version,
-              )
-            ).replace("^", "")
-          : extension.config.libVersion.replace("^", "");
+      const remoteLibVersion = (
+        extension.config.libVersion === undefined
+          ? await getRemoteLibVersion(
+              extension.remoteOrigin,
+              extension.config.id,
+              extension.config.version,
+            )
+          : extension.config.libVersion
+      )?.replace("^", "");
       setRemoteLibVersion(remoteLibVersion);
 
       const mfCompatible = await checkCompatibility(
diff --git a/web/components/interface/extension-suggestion-overlay.tsx b/web/components/interface/extension-suggestion-overlay.tsx
@@ -13,7 +13,7 @@ export default function ExtensionSuggestionOverlay() {
                 config: {
                   id: "extension-id",
                   version: "1.0.0",
-                  libVersion: "unknown",
+                  libVersion: undefined,
                   displayName: "Extension Name",
                   description: "Extension Description",
                   visibility: "public",
@@ -29,7 +29,7 @@ export default function ExtensionSuggestionOverlay() {
                 config: {
                   id: "extension-id",
                   version: "1.0.0",
-                  libVersion: "unknown",
+                  libVersion: undefined,
                   displayName: "Extension Name",
                   description: "Extension Description",
                   visibility: "public",
@@ -45,7 +45,7 @@ export default function ExtensionSuggestionOverlay() {
                 config: {
                   id: "extension-id",
                   version: "1.0.0",
-                  libVersion: "unknown",
+                  libVersion: undefined,
                   displayName: "Extension Name",
                   description: "Extension Description",
                   visibility: "public",
diff --git a/web/components/modals/extension-marketplace-modal.tsx b/web/components/modals/extension-marketplace-modal.tsx
@@ -1,6 +1,6 @@
 import { getRemoteMFVersion } from "@/lib/module-federation/version";
 import { fetchAPI } from "@/lib/pulse-editor-website/backend";
-import { ExtensionApp, AppMetaData, TabItem } from "@/lib/types";
+import { AppMetaData, ExtensionApp, TabItem } from "@/lib/types";
 import { useContext, useEffect, useState } from "react";
 import useSWR from "swr";
 import ExtensionGallery from "../extension/extension-gallery";
@@ -15,9 +15,9 @@ export default function ExtensionMarketplaceModal({
   isOpen: boolean;
   setIsOpen: (open: boolean) => void;
 }) {
-  const [installedExtensions, setInstalledExtensions] = useState<ExtensionApp[]>(
-    [],
-  );
+  const [installedExtensions, setInstalledExtensions] = useState<
+    ExtensionApp[]
+  >([]);
 
   const extensionCategories: TabItem[] = [
     {
@@ -71,7 +71,7 @@ export default function ExtensionMarketplaceModal({
             config: {
               id: extMeta.name,
               version: extMeta.version,
-              libVersion: extMeta.libVersion ?? "unknown",
+              libVersion: extMeta.libVersion,
               author: extMeta.user ? extMeta.user.name : extMeta.org.name,
               description: extMeta.description ?? "No description available",
               displayName: extMeta.displayName ?? extMeta.name,
diff --git a/web/lib/module-federation/remote.ts b/web/lib/module-federation/remote.ts
@@ -29,7 +29,7 @@ export function getRemoteServerBaseURL(
   return `${remoteOrigin}/${id}/${version}/server`;
 }
 
-export async function getRemoteManifest(
+export async function getRemoteClientManifest(
   remoteOrigin: string,
   id: string,
   version: string,
@@ -39,13 +39,13 @@ export async function getRemoteManifest(
   )
     .then((res) => res.json())
     .catch((err) => {
-      console.error("Failed to fetch remote manifest:", err);
+      console.warn("Failed to fetch remote manifest:", err);
       return null;
     });
   return mfManifest;
 }
 
-export function getRemoteConfig(
+export function getRemoteClientConfig(
   remoteOrigin: string,
   id: string,
   version: string,
@@ -55,7 +55,7 @@ export function getRemoteConfig(
   )
     .then((res) => res.json())
     .catch((err) => {
-      console.error("Failed to fetch remote config:", err);
+      console.warn("Failed to fetch remote config:", err);
       return null;
     });
   return config;
diff --git a/web/lib/module-federation/version.ts b/web/lib/module-federation/version.ts
@@ -2,7 +2,7 @@ import { AppConfig } from "@pulse-editor/shared-utils";
 import { satisfies } from "semver";
 import mfRuntime from "../../../node_modules/@module-federation/runtime/package.json";
 import packageJson from "../../package.json";
-import { getRemoteConfig, getRemoteManifest } from "./remote";
+import { getRemoteClientConfig, getRemoteClientManifest } from "./remote";
 
 export async function getHostMFVersion(): Promise<string> {
   return mfRuntime.version;
@@ -12,10 +12,10 @@ export async function getRemoteMFVersion(
   remoteOrigin: string,
   id: string,
   version: string,
-): Promise<string> {
-  const mfManifest = await getRemoteManifest(remoteOrigin, id, version);
+): Promise<string | undefined> {
+  const mfManifest = await getRemoteClientManifest(remoteOrigin, id, version);
   if (!mfManifest || !mfManifest.metaData) {
-    throw new Error("Remote MF manifest or metaData is undefined");
+    return undefined;
   }
   return mfManifest.metaData.pluginVersion;
 }
@@ -29,24 +29,24 @@ export async function getRemoteLibVersion(
   remoteOrigin: string,
   id: string,
   version: string,
-): Promise<string> {
-  const pulseConfig: AppConfig = await getRemoteConfig(
+): Promise<string | undefined> {
+  const pulseConfig: AppConfig = await getRemoteClientConfig(
     remoteOrigin,
     id,
     version,
   );
-  if (!pulseConfig) {
-    throw new Error("Remote pulse.config.json  undefined");
+  if (!pulseConfig || !pulseConfig.libVersion) {
+    return undefined;
   }
   const libVersion = pulseConfig.libVersion;
   return libVersion;
 }
 
 export async function checkCompatibility(
   hostVersion: string,
-  remoteVersion: string,
+  remoteVersion: string | undefined,
 ): Promise<boolean> {
-  if (remoteVersion === "unknown") {
+  if (remoteVersion === undefined) {
     console.warn("Could not determine remote versions. ");
     return false;
   }
diff --git a/web/lib/types.ts b/web/lib/types.ts
@@ -326,7 +326,7 @@ export type Session = {
 export type AppMetaData = {
   name: string;
   version: string;
-  libVersion: string;
+  libVersion?: string;
   mfVersion?: string;
   description?: string;
   displayName?: string;
diff --git a/web/package.json b/web/package.json
@@ -27,7 +27,7 @@
       "@langchain/core": "^0.3.66",
       "@langchain/openai": "^0.6.3",
       "@pulse-editor/capacitor-plugin": "file:../capacitor-plugin",
-      "@pulse-editor/shared-utils": "^0.1.1-alpha.41",
+      "@pulse-editor/shared-utils": "^0.1.1-alpha.43",
       "@ricky0123/vad-web": "^0.0.28",
       "@vercel/analytics": "^1.5.0",
       "@xyflow/react": "^12.8.5",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pulse-editor/shared-utils",`
`3`		`- "version": "0.1.1-alpha.42",`
	`3`	`+ "version": "0.1.1-alpha.43",`
`4`	`4`	`"main": "dist/main.js",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist"`