Merge pull request #384 from IncognitoTGT/main

Better password protect + update UV

Author: xbubbo

config.js

@@ -1,5 +1,8 @@
 const config = {
-  passwordProtect: false,
-  password: 'password',
+  challenge: false,
+  users: {
+    // username: 'password', you can add multiple users.
+    interstellar: 'password',
+  }
 }
 export default config

index.js

@@ -10,15 +10,10 @@ const server = http.createServer()
 const app = express(server)
 const bareServer = createBareServer('/v/')
 const PORT = 8080
-if (config.passwordProtect) {
-  console.log("Password protection is enabled. Username is 'interstellar'.")
-  console.log('Password is: ' + config.password)
-  app.use(
-    basicAuth({
-      users: { interstellar: password },
-      challenge: true,
-    })
-  )
+if (config.challenge) {
+  console.log("Password protection is enabled. Usernames are: " + Object.keys(config.users))
+  console.log("Passwords are: " + Object.values(config.users))
+  app.use(basicAuth(config))
 }
 app.use(express.json())
 app.use(express.urlencoded({ extended: true }))

static/m/bundle.js

@@ -4,6 +4,7 @@ self.__uv$config = {
     encodeUrl: Ultraviolet.codec.xor.encode,
     decodeUrl: Ultraviolet.codec.xor.decode,
     handler: '/m/handler.js',
+    client: '/m/client.js',
     bundle: '/m/bundle.js',
     config: '/m/config.js',
     sw: '/m/sw.js',

static/m/client.js

@@ -1,8 +1,8 @@
-importScripts('/m/bundle.js')
-importScripts('/m/config.js')
-importScripts('/m/sw.js')
+/*global UVServiceWorker,__uv$config*/
+importScripts('/m/bundle.js');
+importScripts('/m/config.js');
+importScripts(__uv$config.sw || '/m/sw.js');
 
-const sw = new UVServiceWorker()
-let userKey = new URL(location).searchParams.get('userkey')
+const sw = new UVServiceWorker();
 
-self.addEventListener('fetch', (event) => event.respondWith(sw.fetch(event)))
+self.addEventListener('fetch', (event) => event.respondWith(sw.fetch(event)));