Remove runbox7lib-related files, speed up folder size calculations

package.json

@@ -23,10 +23,7 @@
     "start-e2e-server": "start-test mockserver 15000 start-use-mockserver",
     "run-cypress-tests": "cypress run",
     "cypress-e2e": "start-test start-e2e-server 4201 run-cypress-tests",
-    "ci-tests": "node run-ci-tests.js",
-    "lib": "node ngmakelib-conf.js",
-    "libwatch": "node ngmakelib-conf.js --watch",
-    "publishlib": "cd .ngmakelibtmp/dist && npm publish"
+    "ci-tests": "node run-ci-tests.js"
   },
   "dependencies": {
     "@angular/animations": "9.0.0",
@@ -57,7 +54,7 @@
     "moment-timezone": "^0.5.28",
     "npm": "^6.14.5",
     "rrule": "^2.6.4",
-    "runbox-searchindex": "^0.1.0",
+    "runbox-searchindex": "https://registry.npmjs.org/@runbox-tadzik/runbox-searchindex/-/runbox-searchindex-0.2.0.tgz",
     "rxjs": "^6.5.5",
     "rxjs-compat": "^6.5.5",
     "tinymce": "^5.2.2",
@@ -83,7 +80,6 @@
     "karma-firefox-launcher": "^1.3.0",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.5.3",
-    "ngmakelib": "^0.2.6",
     "protractor": "^7.0.0",
     "start-server-and-test": "^1.11.0",
     "ts-loader": "^6.2.2",

src/app/app.component.ts

@@ -30,19 +30,17 @@ import { MatIconRegistry } from '@angular/material/icon';
 import { MatSidenav } from '@angular/material/sidenav';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MoveMessageDialogComponent } from './actions/movemessage.action';
-import { Router, RouterOutlet, ActivatedRoute, NavigationEnd } from '@angular/router';
+import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
 import { DomSanitizer } from '@angular/platform-browser';
 import { HttpClient } from '@angular/common/http';
-import { MessageTableRow, MessageTableRowTool } from './messagetable/messagetablerow';
 import { MessageListService } from './rmmapi/messagelist.service';
-import { MessageInfo } from './xapian/messageinfo';
-import { InfoDialog, InfoParams } from './dialog/info.dialog';
-import { RunboxMe, RunboxWebmailAPI, FolderListEntry, MessageFlagChange } from './rmmapi/rbwebmail';
+import { MessageInfo } from 'runbox-searchindex/messageinfo';
+import { RunboxWebmailAPI, FolderListEntry, MessageFlagChange } from './rmmapi/rbwebmail';
 import { DraftDeskService } from './compose/draftdesk.service';
 import { RMM7MessageActions } from './mailviewer/rmm7messageactions';
 import { FolderListComponent, CreateFolderEvent, RenameFolderEvent, MoveFolderEvent } from './folder/folder.module';
-import { SimpleInputDialog, SimpleInputDialogParams, ProgressDialog } from './dialog/dialog.module';
-import { map, first, take, skip, bufferCount, mergeMap, filter, tap, throttleTime ,  debounceTime } from 'rxjs/operators';
+import { ProgressDialog } from './dialog/dialog.module';
+import { map, take, skip, bufferCount, mergeMap, filter, tap, throttleTime ,  debounceTime } from 'rxjs/operators';
 import { ConfirmDialog } from './dialog/confirmdialog.component';
 import { WebSocketSearchService } from './websocketsearch/websocketsearch.service';
 import { WebSocketSearchMailRow } from './websocketsearch/websocketsearchmailrow.class';

src/app/compose/compose.component.ts

@@ -36,7 +36,7 @@ import { DialogService } from '../dialog/dialog.service';
 import { TinyMCEPlugin } from '../rmm/plugin/tinymce.plugin';
 import { RecipientsService } from './recipients.service';
 import { isValidEmailArray } from './emailvalidator';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 import { AppSettingsService } from '../app-settings';
 
 declare const tinymce: any;

src/app/compose/draftdesk.service.spec.ts

@@ -19,7 +19,7 @@
 
 import {DraftFormModel} from './draftdesk.service';
 import { FromAddress } from '../rmmapi/from_address';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 
 
 describe('DraftDesk', () => {

src/app/compose/draftdesk.service.ts

@@ -20,8 +20,8 @@
 import { Injectable } from '@angular/core';
 import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
 import { FromAddress } from '../rmmapi/from_address';
-import { MessageInfo } from '../xapian/messageinfo';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MessageInfo } from 'runbox-searchindex/messageinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 import { Observable, from, of, AsyncSubject } from 'rxjs';
 import { map, mergeMap, bufferCount, take } from 'rxjs/operators';
 

src/app/compose/emailvalidator.ts

@@ -17,7 +17,7 @@
 // along with Runbox 7. If not, see <https://www.gnu.org/licenses/>.
 // ---------- END RUNBOX LICENSE ----------
 
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 
 const EMAIL_REGEXP =
     // tslint:disable-next-line:max-line-length

src/app/compose/mailrecipientinput.component.ts

@@ -27,7 +27,7 @@ import { ENTER } from '@angular/cdk/keycodes';
 import { debounceTime } from 'rxjs/operators';
 import { RecipientsService } from './recipients.service';
 import { Recipient } from './recipient';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 import { isValidEmailArray } from './emailvalidator';
 
 const COMMA = 188;

src/app/compose/recipients.service.spec.ts

@@ -25,11 +25,11 @@ import { SearchService } from '../xapian/searchservice';
 import { StorageService } from '../storage.service';
 import { AsyncSubject, of, Subject } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { XapianAPI } from '../xapian/rmmxapianapi';
+import { XapianAPI } from 'runbox-searchindex/rmmxapianapi';
 import { xapianLoadedSubject } from '../xapian/xapianwebloader';
 import { Contact } from '../contacts-app/contact';
 import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 
 declare var FS;
 declare var MEMFS;

src/app/compose/recipients.service.ts

@@ -23,7 +23,7 @@ import { SearchService } from '../xapian/searchservice';
 import { ContactsService } from '../contacts-app/contacts.service';
 import { ContactKind, Contact } from '../contacts-app/contact';
 import { isValidEmail } from './emailvalidator';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 import { Recipient } from './recipient';
 import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
 import * as moment from 'moment';

src/app/popular-recipients/popular-recipients.component.spec.ts

@@ -25,7 +25,7 @@ import { MatIconModule } from '@angular/material/icon';
 
 import { PopularRecipientsComponent } from './popular-recipients.component';
 import { RecipientsService } from '../compose/recipients.service';
-import { MailAddressInfo } from '../common/mailaddressinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 
 import { of } from 'rxjs';
 

src/app/rmmapi/messagelist.service.ts

@@ -17,16 +17,18 @@
 // along with Runbox 7. If not, see <https://www.gnu.org/licenses/>.
 // ---------- END RUNBOX LICENSE ----------
 
-import {throwError as observableThrowError,  BehaviorSubject ,  Observable, ReplaySubject } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
+
+import { throwError as observableThrowError, BehaviorSubject, ReplaySubject } from 'rxjs';
+import { catchError, distinctUntilChanged, map, filter, take } from 'rxjs/operators';
+
+import { MessageInfo } from 'runbox-searchindex/messageinfo';
+
 import { RunboxWebmailAPI, FolderListEntry } from './rbwebmail';
 import { SearchService } from '../xapian/searchservice';
-import { MessageInfo } from '../xapian/messageinfo';
 import { AppComponent } from '../app.component';
 import { CanvasTableColumn } from '../canvastable/canvastable';
 import { MessageTableRowTool } from '../messagetable/messagetablerow';
-import { catchError, map, filter, take } from 'rxjs/operators';
 
 export class FolderMessageCountEntry {
     constructor(
@@ -112,8 +114,11 @@ export class MessageListService {
                 const folderCounts = {};
                 for (const folder of folders) {
                     const path = folder.folderPath;
+
                     if (xapianFolders.has(path)) {
-                        folderCounts[path] = this.searchservice.getMessageCountsForFolder(path);
+                        const res = this.searchservice.api.getFolderMessageCounts(folder.folderName);
+
+                        folderCounts[path] = new FolderMessageCountEntry(res[1], res[0]);
                     } else {
                         folderCounts[path] = FolderMessageCountEntry.of(folder);
                     }

src/app/rmmapi/rbwebmail.ts

@@ -18,11 +18,10 @@
 // ---------- END RUNBOX LICENSE ----------
 
 import { Injectable, NgZone } from '@angular/core';
-import { Router } from '@angular/router';
-import { Observable ,  of, from ,  Subject ,  AsyncSubject } from 'rxjs';
+import { Observable, of, Subject, AsyncSubject } from 'rxjs';
 import { share } from 'rxjs/operators';
-import { MessageInfo } from '../xapian/messageinfo';
-import { MailAddressInfo } from './../common/mailaddressinfo';
+import { MessageInfo } from 'runbox-searchindex/messageinfo';
+import { MailAddressInfo } from 'runbox-searchindex/mailaddressinfo';
 
 import { Contact } from '../contacts-app/contact';
 import { RunboxCalendar } from '../calendar-app/runbox-calendar';
@@ -31,13 +30,10 @@ import { Product } from '../account-app/product';
 import { DraftFormModel } from '../compose/draftdesk.service';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { catchError, map, mergeMap, tap, bufferCount } from 'rxjs/operators';
+import { map, mergeMap, tap } from 'rxjs/operators';
 
-import { ProgressDialog } from '../dialog/dialog.module';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { RunboxLocale } from '../rmmapi/rblocale';
-import { ProgressSnackbarComponent } from '../dialog/progresssnackbar.component';
-import { Profile } from '../profiles/profile';
 import { RMM } from '../rmm';
 import { FromAddress } from './from_address';