reorg in to folders

moribellamy · moribellamy · commit bffca7bf3697 · 2020-05-17T16:54:36.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
   "dependencies": {
     "google-fonts-plugin": "^5.0.2",
     "object-sizeof": "^1.6.0",
-    "purecss": "^2.0.3"
+    "purecss": "^2.0.3",
+    "vlq": "^1.0.1"
   }
 }
diff --git a/src/app.ts b/src/app.ts
@@ -6,8 +6,8 @@
 // Webpack uses MiniCssExtractPlugin when it sees this.
 import './scss/app.scss';
 
-import { grayTabby } from './ui';
-import { PAGE_LOAD } from './globals';
+import { grayTabby } from './app/ui';
+import { PAGE_LOAD } from './lib/globals';
 
 grayTabby().then(
   () => {
diff --git a/src/app/tabs.ts b/src/app/tabs.ts
@@ -2,10 +2,9 @@
  * Tab types and logic.
  */
 
-import { Tabs as WebextTabs } from 'webextension-polyfill-ts/dist/generated/tabs';
-import { erase, load, save, fieldKeeper, loadBatch } from './utils';
+import { erase, load, save, fieldKeeper, loadBatch } from '../lib/utils';
+import { BrowserTab } from '../lib/types';
 
-export type BrowserTab = WebextTabs.Tab;
 export type GrayTab = Pick<BrowserTab, 'url' | 'title'> & { key: number };
 
 export type GrayTabGroup = {
diff --git a/src/app/ui.ts b/src/app/ui.ts
@@ -5,8 +5,9 @@
  */
 
 import * as sizeof from 'object-sizeof';
-import { ARCHIVAL, BROWSER, DOCUMENT } from './globals';
-import { getOptions, setOptions } from './options';
+import * as vlq from 'vlq';
+import { ARCHIVAL, BROWSER, DOCUMENT } from '../lib/globals';
+import { getOptions, setOptions } from '../lib/options';
 import {
   dateFromKey,
   eraseTabGroup,
@@ -16,8 +17,8 @@ import {
   saveTabGroup,
   GrayTabGroup,
   GrayTab,
-  BrowserTab,
 } from './tabs';
+import { BrowserTab } from '../lib/types';
 
 function getDomain(url: string): string {
   return new URL(url).hostname;
@@ -250,6 +251,23 @@ class Debugger {
     await Promise.all(promises);
     console.log(sizeof.default(await loadAllTabGroups()));
   }
+
+  async groupMeta(): Promise<void> {
+    const retval: number[] = [];
+    let groups = await loadAllTabGroups();
+    const first = groups[0];
+    retval.push(first.date);
+    retval.push(first.tabs.length);
+    groups = groups.slice(1);
+    for (const group of groups) {
+      retval.push(group.date - first.date);
+      retval.push(group.tabs.length);
+    }
+    const encoding = vlq.encode(retval);
+    console.log(encoding);
+    console.log(sizeof.default(encoding));
+    console.log(JSON.stringify(retval));
+  }
 }
 
 declare global {
diff --git a/src/background.ts b/src/background.ts
@@ -7,73 +7,13 @@
  * Not included in coverage reports, so don't put non-trivial logic here.
  */
 
-import { Menus } from 'webextension-polyfill-ts';
-import {
-  archiveHandler,
-  archiveLeftHandler,
-  archiveOnlyHandler,
-  archiveOthersHandler,
-  archiveRightHandler,
-} from './archive';
-import { saveAsFavorites, restoreFavorites } from './options';
-import { BROWSER } from './globals';
+import { bindArchivalHandlers } from './bg/archive';
 
-async function init(): Promise<void> {
-  BROWSER.get().browserAction.onClicked.addListener(archiveHandler);
-  let isFirefox = false;
-  try {
-    const info = await BROWSER.get().runtime.getBrowserInfo();
-    if (info.name.toLowerCase() === 'firefox') {
-      isFirefox = true;
-    }
-  } catch {
-    // let isFirefox stay false
-  }
-
-  const contexts: Menus.ContextType[] = isFirefox ? ['tab', 'browser_action'] : ['browser_action'];
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: 'Save current tabs as favorites',
-    onclick: saveAsFavorites,
-  });
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: 'Restore favorite tabs',
-    onclick: restoreFavorites,
-  });
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: 'Archive...',
-    onclick: archiveOnlyHandler,
-  });
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: '  Left',
-    onclick: archiveLeftHandler,
-  });
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: '  Right',
-    onclick: archiveRightHandler,
-  });
-
-  BROWSER.get().contextMenus.create({
-    contexts: contexts,
-    title: '  Others',
-    onclick: archiveOthersHandler,
-  });
-}
-
-init().then(
+bindArchivalHandlers().then(
   () => {
     console.log('loaded graytabby backend');
   },
   err => {
-    console.error(err);
+    console.error('could not load graytabby backend', err);
   },
 );
diff --git a/src/bg/archive.ts b/src/bg/archive.ts
@@ -3,9 +3,9 @@
  */
 
 import { Menus } from 'webextension-polyfill-ts/dist/generated/menus';
-import { ARCHIVAL, BROWSER, PAGE_LOAD } from './globals';
-import { getOptions } from './options';
-import { BrowserTab } from './tabs';
+import { ARCHIVAL, BROWSER, PAGE_LOAD } from '../lib/globals';
+import { getOptions, restoreFavorites, saveAsFavorites } from '../lib/options';
+import { BrowserTab } from '../lib/types';
 
 export type OnClickData = Menus.OnClickData;
 
@@ -49,7 +49,6 @@ export function archivePlan(
   const seen: Set<string> = new Set();
 
   for (const tab of browserTabs) {
-    console.log('aaa', tab.url, tab.pinned);
     if (tab.url === homeURL || tab.pinned) continue;
     else if (seen.has(tab.url) && !archiveDupes) tabsToClose.push(tab);
     else if (shouldJustClose(tab.url)) tabsToClose.push(tab);
@@ -58,7 +57,6 @@ export function archivePlan(
       seen.add(tab.url);
     }
   }
-  console.log(tabsToArchive, tabsToClose);
   return [tabsToArchive, tabsToClose];
 }
 
@@ -139,3 +137,54 @@ export async function archiveRightHandler(_data: OnClickData, tab: BrowserTab):
 export async function archiveOnlyHandler(_data: OnClickData, tab: BrowserTab): Promise<void> {
   return doArchive(t => t.id == tab.id);
 }
+
+export async function bindArchivalHandlers(): Promise<void> {
+  BROWSER.get().browserAction.onClicked.addListener(archiveHandler);
+  let isFirefox = false;
+  try {
+    const info = await BROWSER.get().runtime.getBrowserInfo();
+    if (info.name.toLowerCase() === 'firefox') {
+      isFirefox = true;
+    }
+  } catch {
+    // let isFirefox stay false
+  }
+
+  const contexts: Menus.ContextType[] = isFirefox ? ['tab', 'browser_action'] : ['browser_action'];
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: 'Save current tabs as favorites',
+    onclick: saveAsFavorites,
+  });
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: 'Restore favorite tabs',
+    onclick: restoreFavorites,
+  });
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: 'Archive...',
+    onclick: archiveOnlyHandler,
+  });
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: '  Left',
+    onclick: archiveLeftHandler,
+  });
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: '  Right',
+    onclick: archiveRightHandler,
+  });
+
+  BROWSER.get().contextMenus.create({
+    contexts: contexts,
+    title: '  Others',
+    onclick: archiveOthersHandler,
+  });
+}
diff --git a/src/lib/brokers.ts b/src/lib/brokers.ts
diff --git a/src/lib/globals.ts b/src/lib/globals.ts
@@ -1,6 +1,6 @@
 import { browser } from 'webextension-polyfill-ts';
 import { Broker } from './brokers';
-import { BrowserTab } from './tabs';
+import { BrowserTab } from './types';
 
 class Wrapper<T> {
   wrapped: T;
diff --git a/src/lib/options.ts b/src/lib/options.ts
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -0,0 +1,3 @@
+import { Tabs as WebextTabs } from 'webextension-polyfill-ts/dist/generated/tabs';
+
+export type BrowserTab = WebextTabs.Tab;
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
diff --git a/tests/archive.test.ts b/tests/archive.test.ts
@@ -1,12 +1,21 @@
 import { expect } from 'chai';
 import * as mockBrowser from 'sinon-chrome';
-import { archivePlan } from '../src/archive';
-import { Broker, BrokerConsumer } from '../src/brokers';
-import { ARCHIVAL, DOCUMENT } from '../src/globals';
-import { dateFromKey, INDEX_V2_KEY, BrowserTab } from '../src/tabs';
-import { assertElement, initGrayTabby, testTab } from './utils';
+import { archivePlan } from '../src/bg/archive';
+import { Broker, BrokerConsumer } from '../src/lib/brokers';
+import { ARCHIVAL, DOCUMENT } from '../src/lib/globals';
+import { dateFromKey, INDEX_V2_KEY } from '../src/app/tabs';
+import { assertElement, initGrayTabby, testTab, stubGlobals, unstubGlobals } from './utils';
+import { BrowserTab } from '../src/lib/types';
 
 describe('archive operation', function() {
+  beforeEach(async function() {
+    await stubGlobals();
+  });
+
+  afterEach(function() {
+    unstubGlobals();
+  });
+
   it('should work', async function() {
     //TODO
     const archival = new Broker<BrowserTab[]>('moreTabs');
diff --git a/tests/grayTabby.test.ts b/tests/grayTabby.test.ts
@@ -1,7 +1,20 @@
-import { initGrayTabby } from './utils';
+import { initGrayTabby, stubGlobals, unstubGlobals } from './utils';
+import { bindArchivalHandlers } from '../src/bg/archive';
 
 describe('graytabby', function() {
-  it('should attach to dom without throwing', async () => {
+  beforeEach(async function() {
+    await stubGlobals();
+  });
+
+  afterEach(function() {
+    unstubGlobals();
+  });
+
+  it('frontend should attach to dom without throwing', async () => {
     await initGrayTabby();
   });
+
+  it('backend should register handlers without throwing', async () => {
+    await bindArchivalHandlers();
+  });
 });
diff --git a/tests/options.test.ts b/tests/options.test.ts
@@ -1,8 +1,17 @@
 import * as mockBrowser from 'sinon-chrome';
-import { getOptions, Options, OPTIONS_KEY } from '../src/options';
+import { getOptions, Options, OPTIONS_KEY } from '../src/lib/options';
 import { expect } from 'chai';
+import { unstubGlobals, stubGlobals } from './utils';
 
 describe('options', function() {
+  beforeEach(async function() {
+    await stubGlobals();
+  });
+
+  afterEach(function() {
+    unstubGlobals();
+  });
+
   it('should load old string format', async function() {
     const oldOptions: Options = {
       tabLimit: 10000,
diff --git a/tests/utils.ts b/tests/utils.ts
@@ -1,19 +1,28 @@
-import { BROWSER, DOCUMENT } from '../src/globals';
-import * as mockBrowser from 'sinon-chrome';
-import { JSDOM } from 'jsdom';
-import { INDEX_V1_KEY, INDEX_V2_KEY, BrowserTab } from '../src/tabs';
-import { OPTIONS_KEY } from '../src/options';
-import { grayTabby } from '../src/ui';
 import { expect } from 'chai';
+import { JSDOM } from 'jsdom';
+import * as mockBrowser from 'sinon-chrome';
+import { INDEX_V1_KEY, INDEX_V2_KEY } from '../src/app/tabs';
+import { grayTabby } from '../src/app/ui';
+import { BROWSER, DOCUMENT } from '../src/lib/globals';
+import { OPTIONS_KEY } from '../src/lib/options';
+import { BrowserTab } from '../src/lib/types';
 
-export async function initGrayTabby(): Promise<void> {
+export async function stubGlobals(): Promise<void> {
   BROWSER.set(<any>mockBrowser);
   const jsdom = await JSDOM.fromFile('src/app.html');
   DOCUMENT.set(jsdom.window.document);
   mockBrowser.tabs.query.returns([]);
   mockBrowser.storage.local.get.withArgs(INDEX_V1_KEY).returns('[]');
   mockBrowser.storage.local.get.withArgs(OPTIONS_KEY).returns([]);
   mockBrowser.storage.local.get.withArgs(INDEX_V2_KEY).returns([]);
+}
+
+export function unstubGlobals(): void {
+  BROWSER.set(null);
+  DOCUMENT.set(null);
+}
+
+export async function initGrayTabby(): Promise<void> {
   try {
     return await grayTabby();
   } catch (err) {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@`
`56`	`56`	`"dependencies": {`
`57`	`57`	`"google-fonts-plugin": "^5.0.2",`
`58`	`58`	`"object-sizeof": "^1.6.0",`
`59`		`- "purecss": "^2.0.3"`
	`59`	`+ "purecss": "^2.0.3",`
	`60`	`+ "vlq": "^1.0.1"`
`60`	`61`	`}`
`61`	`62`	`}`