feat: always listen for deps:status messages and keep the usePackageJ…

…son context up to date
srcbookdev · Oct 23, 2024 · fa9eaeb · fa9eaeb
1 parent df2229c
commit fa9eaeb
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/packages/web/src/components/apps/use-package-json.tsx b/packages/web/src/components/apps/use-package-json.tsx
@@ -53,8 +53,8 @@ export function PackageJsonProvider({ channel, children }: ProviderPropsType) {
   }, [channel]);
 
   useEffect(() => {
-    const callback = ({ status }: DepsInstallStatusPayloadType) => {
-      setStatus(status);
+    const callback = (payload: DepsInstallStatusPayloadType) => {
+      setStatus(payload.status);
     };
     channel.on('deps:install:status', callback);
 
@@ -82,20 +82,27 @@ export function PackageJsonProvider({ channel, children }: ProviderPropsType) {
         };
         channel.on('deps:install:log', logCallback);
 
-        const statusCallback = ({ status, code }: DepsInstallStatusPayloadType) => {
-          channel.off('deps:install:log', logCallback);
-          channel.off('deps:install:status', statusCallback);
-
-          addLog(
-            'info',
-            'srcbook',
-            `${!packages ? 'npm install' : `npm install ${packages.join(' ')}`} exited with status code ${code}`,
-          );
-
-          if (status === 'complete') {
-            resolve();
-          } else {
-            reject(new Error(`Error running npm install: ${contents}`));
+        const statusCallback = (payload: DepsInstallStatusPayloadType) => {
+          switch (payload.status) {
+            case "installing":
+              break;
+            case "failed":
+            case "complete":
+              channel.off('deps:install:log', logCallback);
+              channel.off('deps:install:status', statusCallback);
+
+              addLog(
+                'info',
+                'srcbook',
+                `${!packages ? 'npm install' : `npm install ${packages.join(' ')}`} exited with status code ${payload.code}`,
+              );
+
+              if (payload.status === 'complete') {
+                resolve();
+              } else {
+                reject(new Error(`Error running npm install: ${contents}`));
+              }
+              break;
           }
         };
         channel.on('deps:install:status', statusCallback);