@rmdes/indiekit-endpoint-activitypub 0.1.9 → 0.1.10

package/index.js

@@ -180,7 +180,7 @@ export default class ActivityPubEndpoint {
     router.get("/admin/activities", activitiesController(mp));
     router.get("/admin/migrate", migrateGetController(mp, this.options));
     router.post("/admin/migrate", migratePostController(mp, this.options));
-    router.post("/admin/migrate/import", express.json({ limit: "5mb" }), migrateImportController(mp, this.options));
+    router.post("/admin/migrate/import", migrateImportController(mp, this.options));
 
     return router;
   }

package/lib/controllers/migrate.js

@@ -7,8 +7,6 @@
  */
 
 import {
-  parseMastodonFollowingCsv,
-  parseMastodonFollowersList,
   bulkImportFollowing,
   bulkImportFollowers,
 } from "../migration.js";
@@ -56,19 +54,20 @@ export function migratePostController(mountPath, pluginOptions) {
 }
 
 /**
- * JSON endpoint for CSV import — receives { csvContent, importTypes }
- * via fetch() to bypass Express's app-level urlencoded body size limit.
+ * JSON endpoint for import — receives { handles, importTypes }.
+ * CSV is parsed client-side to extract handles only, keeping the
+ * JSON payload small enough for Express's default body parser limit.
  */
 export function migrateImportController(mountPath, pluginOptions) {
   return async (request, response, next) => {
     try {
       const { application } = request.app.locals;
-      const { csvContent, importTypes } = request.body;
+      const { handles, importTypes } = request.body;
 
-      if (!csvContent?.trim()) {
+      if (!Array.isArray(handles) || handles.length === 0) {
         return response.status(400).json({
           type: "error",
-          text: "No CSV content provided.",
+          text: "No handles provided.",
         });
       }
 
@@ -84,15 +83,13 @@ export function migrateImportController(mountPath, pluginOptions) {
       let followersResult = { imported: 0, failed: 0, errors: [] };
 
       if (importFollowing && followingCollection) {
-        const handles = parseMastodonFollowingCsv(csvContent);
-        console.log(`[ActivityPub] Migration: parsed ${handles.length} following handles from CSV`);
+        console.log(`[ActivityPub] Migration: importing ${handles.length} following handles`);
         followingResult = await bulkImportFollowing(handles, followingCollection);
       }
 
       if (importFollowers && followersCollection) {
-        const entries = parseMastodonFollowersList(csvContent);
-        console.log(`[ActivityPub] Migration: parsed ${entries.length} follower entries from CSV`);
-        followersResult = await bulkImportFollowers(entries, followersCollection);
+        console.log(`[ActivityPub] Migration: importing ${handles.length} follower entries`);
+        followersResult = await bulkImportFollowers(handles, followersCollection);
       }
 
       const totalFailed = followingResult.failed + followersResult.failed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",

package/views/activitypub-migrate.njk

@@ -76,7 +76,7 @@
              @change="readFile($event)">
       <template x-if="fileName">
         <p class="hint" style="margin-top: 0.5em">
-          <strong x-text="fileName"></strong> — <span x-text="lineCount + ' lines'"></span>
+          <strong x-text="fileName"></strong> — <span x-text="handles.length + ' accounts found'"></span>
         </p>
       </template>
       <template x-if="fileError">
@@ -85,7 +85,7 @@
     </div>
 
     <button class="button" type="button"
-            :disabled="importing || !csvContent"
+            :disabled="importing || handles.length === 0"
             @click="startImport()">
       <span x-show="!importing">{{ __("activitypub.migrate.importButton") }}</span>
       <span x-show="importing" x-text="statusText"></span>
@@ -119,7 +119,7 @@
   <script>
   function csvImport(mountPath) {
     return {
-      csvContent: '',
+      handles: [],
       fileName: '',
       lineCount: 0,
       fileError: '',
@@ -129,9 +129,14 @@
       resultText: '',
       resultErrors: [],
 
+      /**
+       * Parse CSV client-side — extract handles (first column) only.
+       * This keeps the JSON payload small (handles only, no raw CSV),
+       * avoiding Express's default 100KB body parser limit.
+       */
       readFile(event) {
         var self = this;
-        self.csvContent = '';
+        self.handles = [];
         self.fileName = '';
         self.lineCount = 0;
         self.fileError = '';
@@ -151,9 +156,19 @@
         var reader = new FileReader();
         reader.onload = function(e) {
           var text = e.target.result;
-          self.csvContent = text;
+          var lines = text.split('\n').filter(function(l) { return l.trim(); });
           self.fileName = file.name;
-          self.lineCount = text.split('\n').filter(function(l) { return l.trim(); }).length;
+          self.lineCount = lines.length;
+
+          // Extract handles: skip header, take first CSV column, keep only valid handles
+          var parsed = [];
+          for (var i = 1; i < lines.length; i++) {
+            var handle = lines[i].split(',')[0].trim();
+            if (handle && handle.indexOf('@') !== -1) {
+              parsed.push(handle);
+            }
+          }
+          self.handles = parsed;
         };
         reader.onerror = function() {
           self.fileError = 'Could not read file';
@@ -183,12 +198,19 @@
           return;
         }
 
+        if (self.handles.length === 0) {
+          self.importing = false;
+          self.resultType = 'error';
+          self.resultText = 'No valid handles found in the CSV file.';
+          return;
+        }
+
         try {
           var res = await fetch(mountPath + '/admin/migrate/import', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
-              csvContent: self.csvContent,
+              handles: self.handles,
               importTypes: importTypes
             })
           });