Add beaker.templates internal web api

Author: pfrazee

crawler/util.js

@@ -54,7 +54,6 @@ exports.doCrawl = async function (archive, crawlSource, crawlDataset, crawlDatas
 }
 
 const doCheckpoint = exports.doCheckpoint = async function (crawlDataset, crawlDatasetVersion, crawlSource, crawlSourceVersion) {
-  
   await db.run(`DELETE FROM crawl_sources_meta WHERE crawlDataset = ? AND crawlSourceId = ?`, [crawlDataset, crawlSource.id])
   await db.run(`
     INSERT

dbs/schemas/profile-data.sql.js

@@ -100,6 +100,18 @@ CREATE TABLE watchlist (
   FOREIGN KEY (profileId) REFERENCES profiles (id) ON DELETE CASCADE
 );
 
+-- list of the users current templates
+CREATE TABLE templates (
+  profileId INTEGER,
+  url TEXT NOT NULL,
+  title TEXT,
+  screenshot,
+  createdAt INTEGER DEFAULT (strftime('%s', 'now')),
+
+  PRIMARY KEY (profileId, url),
+  FOREIGN KEY (profileId) REFERENCES profiles (id) ON DELETE CASCADE
+);
+
 -- list of sites being crawled
 CREATE TABLE crawl_sources (
   id INTEGER PRIMARY KEY NOT NULL,
@@ -157,19 +169,6 @@ CREATE TABLE crawl_followgraph (
   FOREIGN KEY (crawlSourceId) REFERENCES crawl_sources (id) ON DELETE CASCADE
 );
 
--- list of the users current templates
--- deprecated (may return)
-CREATE TABLE templates (
-  profileId INTEGER,
-  url TEXT NOT NULL,
-  title TEXT,
-  screenshot,
-  createdAt INTEGER DEFAULT (strftime('%s', 'now')),
-
-  PRIMARY KEY (profileId, url),
-  FOREIGN KEY (profileId) REFERENCES profiles (id) ON DELETE CASCADE
-);
-
 -- a list of the draft-dats for a master-dat
 -- deprecated
 CREATE TABLE archive_drafts (

web-apis/bg.js

@@ -10,6 +10,7 @@ const downloadsManifest = require('./manifests/internal/downloads')
 const historyManifest = require('./manifests/internal/history')
 const sitedataManifest = require('./manifests/internal/sitedata')
 const watchlistManifest = require('./manifests/internal/watchlist')
+const templatesManifest = require('./manifests/internal/templates')
 const crawlerManifest = require('./manifests/internal/crawler')
 const postsManifest = require('./manifests/internal/posts')
 const followgraphManifest = require('./manifests/internal/followgraph')
@@ -20,6 +21,7 @@ const bookmarksAPI = require('./bg/bookmarks')
 const historyAPI = require('./bg/history')
 const sitedataAPI = require('../dbs/sitedata').WEBAPI
 const watchlistAPI = require('./bg/watchlist')
+const templatesAPI = require('./bg/templates')
 const crawlerAPI = require('../crawler').WEBAPI
 const postsAPI = require('./bg/posts')
 const followgraphAPI = require('./bg/followgraph')
@@ -56,6 +58,7 @@ exports.setup = function () {
   globals.rpcAPI.exportAPI('history', historyManifest, historyAPI, internalOnly)
   globals.rpcAPI.exportAPI('sitedata', sitedataManifest, sitedataAPI, internalOnly)
   globals.rpcAPI.exportAPI('watchlist', watchlistManifest, watchlistAPI, internalOnly)
+  globals.rpcAPI.exportAPI('templates', templatesManifest, templatesAPI, internalOnly)
   globals.rpcAPI.exportAPI('crawler', crawlerManifest, crawlerAPI, internalOnly)
   globals.rpcAPI.exportAPI('posts', postsManifest, postsAPI, internalOnly)
   globals.rpcAPI.exportAPI('followgraph', followgraphManifest, followgraphAPI, internalOnly)

web-apis/bg/archives.js

@@ -1,7 +1,6 @@
 const path = require('path')
 const mkdirp = require('mkdirp')
 const jetpack = require('fs-jetpack')
-const templatesDb = require('../../dbs/templates')
 const datDns = require('../../dat/dns')
 const datLibrary = require('../../dat/library')
 const datGC = require('../../dat/garbage-collector')
@@ -266,25 +265,6 @@ module.exports = {
     return archiveDraftsDb.remove(0, masterKey, draftKey)
   },
 
-  // templates
-  // =
-
-  async getTemplate (url) {
-    return templatesDb.get(0, url)
-  },
-
-  async listTemplates () {
-    return templatesDb.list(0)
-  },
-
-  async putTemplate (url, {title, screenshot}) {
-    return templatesDb.put(0, url, {title, screenshot})
-  },
-
-  async removeTemplate (url) {
-    return templatesDb.remove(0, url)
-  },
-
   // internal management
   // =
 

web-apis/bg/templates.js

@@ -0,0 +1,22 @@
+const templatesDb = require('../../dbs/templates')
+
+// exported api
+// =
+
+module.exports = {
+  async get (url) {
+    return templatesDb.get(0, url)
+  },
+
+  async list () {
+    return templatesDb.list(0)
+  },
+
+  async put (url, {title, screenshot}) {
+    return templatesDb.put(0, url, {title, screenshot})
+  },
+
+  async remove (url) {
+    return templatesDb.remove(0, url)
+  }
+}

web-apis/fg/beaker.js

@@ -8,6 +8,7 @@ const downloadsManifest = require('../manifests/internal/downloads')
 const historyManifest = require('../manifests/internal/history')
 const sitedataManifest = require('../manifests/internal/sitedata')
 const watchlistManifest = require('../manifests/internal/watchlist')
+const templatesManifest = require('../manifests/internal/templates')
 const crawlerManifest = require('../manifests/internal/crawler')
 const postsManifest = require('../manifests/internal/posts')
 const followgraphManifest = require('../manifests/internal/followgraph')
@@ -25,6 +26,7 @@ exports.setup = function (rpc) {
     const historyRPC = rpc.importAPI('history', historyManifest, opts)
     const sitedataRPC = rpc.importAPI('sitedata', sitedataManifest, opts)
     const watchlistRPC = rpc.importAPI('watchlist', watchlistManifest, opts)
+    const templatesRPC = rpc.importAPI('templates', templatesManifest, opts)
     const crawlerRPC = rpc.importAPI('crawler', crawlerManifest, opts)
     const postsRPC = rpc.importAPI('posts', postsManifest, opts)
     const followgraphRPC = rpc.importAPI('followgraph', followgraphManifest, opts)
@@ -49,10 +51,6 @@ exports.setup = function (rpc) {
     beaker.archives.listDrafts = archivesRPC.listDrafts
     beaker.archives.addDraft = archivesRPC.addDraft
     beaker.archives.removeDraft = archivesRPC.removeDraft
-    beaker.archives.getTemplate = archivesRPC.getTemplate
-    beaker.archives.listTemplates = archivesRPC.listTemplates
-    beaker.archives.putTemplate = archivesRPC.putTemplate
-    beaker.archives.removeTemplate = archivesRPC.removeTemplate
     beaker.archives.touch = archivesRPC.touch
     beaker.archives.clearFileCache = archivesRPC.clearFileCache
     beaker.archives.clearGarbage = archivesRPC.clearGarbage
@@ -160,6 +158,13 @@ exports.setup = function (rpc) {
     beaker.watchlist.remove = watchlistRPC.remove
     beaker.watchlist.createEventsStream = () => fromEventStream(watchlistRPC.createEventsStream())
 
+    // beaker.templates
+    beaker.templates = {}
+    beaker.templates.get = templatesRPC.get
+    beaker.templates.list = templatesRPC.list
+    beaker.templates.put = templatesRPC.put
+    beaker.templates.remove = templatesRPC.remove
+
     // beaker.crawler
     beaker.crawler = {}
     beaker.crawler.getCrawlStates = crawlerRPC.getCrawlStates

web-apis/manifests/internal/archives.js

@@ -27,12 +27,6 @@ module.exports = {
   addDraft: 'promise',
   removeDraft: 'promise',
 
-  // templates
-  getTemplate: 'promise',
-  listTemplates: 'promise',
-  putTemplate: 'promise',
-  removeTemplate: 'promise',
-
   // internal management
   touch: 'promise',
   clearFileCache: 'promise',

web-apis/manifests/internal/templates.js

@@ -0,0 +1,6 @@
+module.exports = {
+  get: 'promise',
+  list: 'promise',
+  put: 'promise',
+  remove: 'promise'
+}