@juit/capacitor-updater 0.1.0 → 0.1.2

package/README.md

@@ -72,3 +72,6 @@ created during an update with [`updateCapacitor(...)`](#updatecapacitor).
 
 This function is also asynchronous and will return a promise to a `boolean`
 indicating `true` when the path has been persisted.
+
+This function will also prune the updates directory from all previous, unused
+updates, preserving only the _current_ update.

package/dist/index.js

@@ -61,7 +61,7 @@ async function updateCapacitor(url, progressOrVerbose, maybeVerbose) {
       path: `${UPDATES_DIRECTORY}/${uuid}`,
       directory: Directory.Library
     });
-    const serverBasePath = new URL(uri, "file:///").pathname;
+    const serverBasePath = normalize(uri);
     log(`Update extracted to "${serverBasePath}"`);
     progress(1);
     return () => {
@@ -89,8 +89,29 @@ async function persistUpdates() {
     directory: Directory.Library,
     path: UPDATES_DIRECTORY
   });
-  const serverBasePathPrefix = new URL(uri, "file:///").pathname;
+  const serverBasePathPrefix = normalize(uri);
   const { path } = await WebView.getServerBasePath();
+  let files;
+  try {
+    const result = await Filesystem.readdir({
+      directory: Directory.Library,
+      path: UPDATES_DIRECTORY
+    });
+    files = result.files;
+  } catch (error) {
+    console.error(`Failed to read updates directory "${UPDATES_DIRECTORY}"`, error);
+    files = [];
+  }
+  for (const file of files) {
+    if (file.type !== "directory") continue;
+    if (normalize(path) === normalize(file.uri)) continue;
+    console.log(`Deleting old update directory "${file.name}"`);
+    await Filesystem.rmdir({
+      directory: Directory.Library,
+      path: `${UPDATES_DIRECTORY}/${file.name}`,
+      recursive: true
+    });
+  }
   if (path.startsWith(serverBasePathPrefix)) {
     console.log(`Persisting Capacitor updates from "${path}"`);
     await WebView.persistServerBasePath();
@@ -100,6 +121,9 @@ async function persistUpdates() {
     return false;
   }
 }
+function normalize(uriOrPath) {
+  return new URL(uriOrPath, "file:///").pathname.replaceAll(/\/+/g, "/").replace(/\/+$/, "");
+}
 export {
   persistUpdates,
   updateCapacitor

package/dist/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["data"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juit/capacitor-updater",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Capacitor utility to update an app from a ZIP file",
   "type": "module",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
     "@capacitor/filesystem": "^7.0.1"
   },
   "devDependencies": {
-    "@plugjs/build": "^0.6.40"
+    "@plugjs/build": "^0.6.41"
   },
   "files": [
     "*.md",