feat: auto sync delete packages which deleted in 24 hours (#1315)

cnpm · Apr 8, 2018 · 34d3a1e · 34d3a1e
1 parent 1f60a01
commit 34d3a1e
Showing 1 changed file with 31 additions and 7 deletions.
diff --git a/controllers/sync_module_worker.js b/controllers/sync_module_worker.js
@@ -552,6 +552,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   }
 
   hasModules = moduleRows.length > 0;
+  // localPackage
   var map = {};
   var localVersionNames = [];
   for (var i = 0; i < moduleRows.length; i++) {
@@ -884,21 +885,44 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     }
   }
 
-  if (config.syncDeletedVersions) {
-    if (deletedVersionNames.length === 0) {
-      that.log('  [%s] no versions need to deleted', name);
-    } else {
+  if (deletedVersionNames.length === 0) {
+    that.log('  [%s] no versions need to deleted', name);
+  } else {
+    if (config.syncDeletedVersions) {
       that.log('  [%s] %d versions: %j need to deleted',
         name, deletedVersionNames.length, deletedVersionNames);
       try {
         yield packageService.removeModulesByNameAndVersions(name, deletedVersionNames);
       } catch (err) {
         that.log('    [%s] delete error, %s: %s', name, err.name, err.message);
       }
+    } else {
+      // find deleted in 24 hours versions
+      var oneDay = 3600000 * 24;
+      var now = Date.now();
+      var deletedIn24HoursVersions = [];
+      var oldVersions = [];
+      for (var i = 0; i < deletedVersionNames.length; i++) {
+        var v = deletedVersionNames[i];
+        var exists = map[v];
+        if (exists && now - exists.publish_time < oneDay) {
+          deletedIn24HoursVersions.push(v);
+        } else {
+          oldVersions.push(v);
+        }
+      }
+      if (deletedIn24HoursVersions.length > 0) {
+        that.log('  [%s] %d versions: %j need to deleted, they are deleted in 24 hours',
+          name, deletedIn24HoursVersions.length, deletedIn24HoursVersions);
+        try {
+          yield packageService.removeModulesByNameAndVersions(name, deletedIn24HoursVersions);
+        } catch (err) {
+          that.log('    [%s] delete error, %s: %s', name, err.name, err.message);
+        }
+      }
+      that.log('  [%s] %d versions: %j no need to delete, because `config.syncDeletedVersions=false`',
+        name, oldVersions.length, oldVersions);
     }
-  } else {
-    that.log('  [%s] %d versions: %j need to deleted, but we won\'t delete them because `config.syncDeletedVersions=false`',
-      name, deletedVersionNames.length, deletedVersionNames);
   }
 
   // sync missing descriptions