sketch out new source API implementation

dev/u-wave-dev-server

@@ -6,8 +6,8 @@ const argv = require('minimist')(process.argv.slice(2));
 const concat = require('concat-stream');
 const explain = require('explain-error');
 const announce = require('u-wave-announce');
-const ytSource = require('u-wave-source-youtube');
-const scSource = require('u-wave-source-soundcloud');
+const YouTubeSource = require('../../u-wave-source-youtube').default;
+const scSource = require('../../u-wave-source-soundcloud');
 const recaptchaTestKeys = require('recaptcha-test-keys');
 const debug = require('debug')('uwave:dev-server');
 const dotenv = require('dotenv');
@@ -64,15 +64,10 @@ async function start() {
     seed: Buffer.from('8286a5e55c62d93a042b8c56c8face52c05354c288807d941751f0e9060c2ded', 'hex'),
   });
 
-  uw.use(async function configureSources(uw) {
-    if (process.env.YOUTUBE_API_KEY) {
-      uw.source(ytSource, {
-        key: process.env.YOUTUBE_API_KEY,
-      });
-    }
-    uw.source(scSource, {
-      key: process.env.SOUNDCLOUD_API_KEY,
-    });
+  uw.useSource(YouTubeSource);
+
+  uw.useSource(scSource, {
+    key: process.env.SOUNDCLOUD_API_KEY ?? null,
   });
 
   await uw.listen();

package.json

@@ -16,6 +16,10 @@
       "import": "./src/index.mjs",
       "default": "./src/index.js"
     },
+    "./source": {
+      "import": "./src/source/index.mjs",
+      "default": "./src/source/index.js"
+    },
     "./package.json": "./package.json"
   },
   "type": "commonjs",
@@ -44,6 +48,7 @@
     "http-errors": "^2.0.0",
     "i18next": "^21.0.2",
     "ioredis": "^5.0.1",
+    "json-schema-merge-allof": "^0.8.1",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.15",
     "make-promises-safe": "^5.1.0",

src/HttpApi.js

@@ -12,11 +12,12 @@ const debug = require('debug')('uwave:http-api');
 // routes
 const authenticate = require('./routes/authenticate');
 const bans = require('./routes/bans');
+const imports = require('./routes/import');
+const now = require('./routes/now');
 const search = require('./routes/search');
 const server = require('./routes/server');
+const sources = require('./routes/sources');
 const users = require('./routes/users');
-const now = require('./routes/now');
-const imports = require('./routes/import');
 
 // middleware
 const addFullUrl = require('./middleware/addFullUrl');
@@ -120,6 +121,7 @@ async function httpApi(uw, options) {
     .use('/now', now())
     .use('/search', search())
     .use('/server', server())
+    .use('/sources', sources())
     .use('/users', users());
 
   uw.express = express();