turtb 0.5.2 → 0.5.3

package/lib/utils/handleRedirect.js

@@ -1,11 +1,9 @@
-import { logDebug, logError, logInfo } from './logger.js'
+import { logError } from './logger.js'
 
 /**
  * @typedef {import('../turtle/connections/TurtleDB.js').TurtleDB} TurtleDB
  */
 
-export const defaultPublicKey = 'ctclduqytfepmxfpxe8561b8h75l4u5n2t3sxlrmfc889xjz57'
-
 /**
  *
  * @param {URL} url
@@ -16,12 +14,9 @@ export const defaultPublicKey = 'ctclduqytfepmxfpxe8561b8h75l4u5n2t3sxlrmfc889xj
  * @param {(href: string) => void} redirect
  * @param {(type: string, body: string) => void} reply
  */
-export const handleRedirect = async (url, address, turtleDB, publicKey = defaultPublicKey, turtleDBFolder, redirect, reply) => {
+export const handleRedirect = async (url, address, turtleDB, publicKey, turtleDBFolder, redirect, reply) => {
+  if (url.endsWith('/')) url = `${url}index.html`
   const type = url.split('.').pop()
-  if (url === '/') {
-    console.log('let us index')
-    return redirect('/index.html')
-  }
   try {
     let directories = url.split('/')
     if (directories[0] === '') directories.shift()
@@ -30,60 +25,18 @@ export const handleRedirect = async (url, address, turtleDB, publicKey = default
     if (/^[0-9A-Za-z]{50}$/.test(directories[0])) {
       urlPublicKey = directories.shift()
     }
-    if (directories[directories.length - 1] === '') {
-      directories[directories.length - 1] = 'index.html'
-      return redirect(`/${urlPublicKey}/index.html`)
-    }
-    const unfilteredLength = directories.length
     directories = directories.filter(Boolean)
-    if (unfilteredLength !== directories.length) {
-      return redirect(`/${urlPublicKey}/${directories.join('/')}`)
-    }
     const turtleBranch = await turtleDB.summonBoundTurtleBranch(urlPublicKey)
     const body = turtleBranch.lookupFile(directories.join('/'), false, +address)
     if (body) {
       return reply(type, body)
     } else {
-      try {
-        const symlink = turtleBranch.lookupFile(directories[0])?.symlink
-        if (symlink) {
-          console.log(symlink)
-          const symlinkPublicKey = symlink.match(/.*\/(?<publicKey>[0-9A-Za-z]{50})$/)?.groups?.publicKey
-          if (symlinkPublicKey) {
-            return redirect(`/${symlinkPublicKey}/${directories.slice(1).join('/')}`)
-          }
-        }
-        const configJson = turtleBranch.lookupFile('config.json')
-        const packageJson = turtleBranch.lookupFile('package.json')
-        if (configJson) {
-          const config = JSON.parse(configJson)
-          logInfo(() => console.log({ config }))
-          const branchGroups = ['fsReadWrite', 'fsReadOnly']
-          for (const branchGroup of branchGroups) {
-            const branches = config[branchGroup]
-            if (branches) {
-              for (const { name, key } of branches) {
-                if (name && key) {
-                  if (directories[0] === name) {
-                    return redirect(`/${key}/${directories.slice(1).join('/')}`)
-                  }
-                }
-              }
-            }
-          }
-        } else if (packageJson) {
-          const aliases = JSON.parse(packageJson).turtle.aliases
-          if (aliases && directories.join('/').startsWith(`${turtleDBFolder}/aliases/`)) {
-            directories.shift()
-            const name = directories.shift()
-            const key = aliases[name]
-            if (key) {
-              return redirect(`/${key}/${directories.join('/')}`)
-            }
-          }
+      const symlink = turtleBranch.lookupFile(directories[0])?.symlink
+      if (symlink) {
+        const symlinkPublicKey = symlink.match(/\b(?<publicKey>[0-9A-Za-z]{50})\/?$/)?.groups?.publicKey
+        if (symlinkPublicKey) {
+          return handleRedirect(`/${directories.slice(1).join('/')}`, address, turtleDB, symlinkPublicKey, turtleDBFolder, redirect, reply)
         }
-      } catch {
-        logDebug(() => console.log('not found, no config', url.pathname))
       }
     }
   } catch (error) {

package/lib/utils/webSocketMuxFactory.js

@@ -15,10 +15,10 @@ const allServiceWorkers = new Set()
  * @param {(tbMux: TurtleBranchMultiplexer) => void} callback
  * @param {Recaller} [recaller=turtleDB.recaller]
  */
-export async function webSocketMuxFactory (turtleDB, callback, recaller = turtleDB.recaller) {
+export async function webSocketMuxFactory (turtleDB, defaultPublicKey, callback, recaller = turtleDB.recaller) {
   try {
     const serviceWorkerRegistration = await navigator.serviceWorker.register(
-      '/service-worker.js',
+      `/service-worker.js?cpk=${defaultPublicKey}`,
       { type: 'module', scope: '/' }
     )
     logInfo(() => console.log(' ^^^^^^^ register complete', serviceWorkerRegistration))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtb",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "binary for turtledb projects",
   "repository": "git@github.com:dtudury/turtb.git",
   "author": "David Tudury <david.tudury@gmail.com>",

package/src/webSync.js

@@ -28,7 +28,7 @@ export async function webSync (port, basePublicKey, turtleDB, https, insecure, c
   const root = join(process.cwd(), basePublicKey)
   const app = express()
   app.use((req, _res, next) => {
-    logDebug(() => console.log(req.method, req.url, req.originalUrl))
+    logDebug(() => console.log(req.method, req.url))
     next()
   })
   app.use(async (req, res, next) => {
@@ -37,11 +37,12 @@ export async function webSync (port, basePublicKey, turtleDB, https, insecure, c
       res.send(JSON.stringify({ workspace: { uuid, root } }))
       return
     }
-    handleRedirect(req.url, +req.params.address, turtleDB, basePublicKey, turtleDBFolder, href => {
+    handleRedirect(req.path, +req.params.address, turtleDB, basePublicKey, turtleDBFolder, href => {
       res.redirect(302, href)
     }, (type, body) => {
       if (!body) return next()
       res.type(type)
+      res.cookie('cpk', basePublicKey)
       res.send(body)
     })
   })