velocious 1.0.41 → 1.0.42

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",

package/spec/dummy/src/config/testing.js

@@ -28,35 +28,7 @@ afterEach(async ({testArgs}) => {
     }
 
     if (truncate) {
-      await db.withDisabledForeignKeys(async () => {
-        let tries = 0
-
-        while(true) {
-          tries++
-
-          const tables = await db.getTables()
-          const truncateErrors = []
-
-          for (const table of tables) {
-            if (table.getName() != "schema_migrations") {
-              try {
-                await table.truncate({cascade: true})
-              } catch (error) {
-                console.error(error)
-                truncateErrors.push(error)
-              }
-            }
-          }
-
-          if (truncateErrors.length == 0) {
-            break
-          } else if (tries <= 5) {
-            // Retry
-          } else {
-            throw truncateErrors[0]
-          }
-        }
-      })
+      await db.truncateAllTables()
     }
   }
 })

package/src/configuration.js

@@ -77,9 +77,7 @@ export default class VelociousConfiguration {
     return this._directory
   }
 
-  getEnvironment() {
-    return digg(this, "_environment")
-  }
+  getEnvironment() { return digg(this, "_environment") }
 
   getLocaleFallbacks = () => this.localeFallbacks
   setLocaleFallbacks(newLocaleFallbacks) {

package/src/controller.js

@@ -32,17 +32,10 @@ export default class VelociousController {
     this._viewPath = viewPath
   }
 
-  getAction() {
-    return this._action
-  }
-
-  getParams() {
-    return this._params
-  }
-
-  getRequest() {
-    return this._request
-  }
+  getAction() { return this._action }
+  getConfiguration() { return this._configuration }
+  getParams() { return this._params }
+  getRequest() { return this._request }
 
   async _runBeforeCallbacks() {
     await this.logger.debug("_runBeforeCallbacks")
@@ -74,7 +67,7 @@ export default class VelociousController {
     await this.logger.debug("After runBeforeCallbacks")
   }
 
-  params = () => this._params
+  params() { return this._params }
 
   render({json, status, ...restArgs} = {}) {
     restArgsError(restArgs)
@@ -120,11 +113,6 @@ export default class VelociousController {
     throw new Error("renderText stub")
   }
 
-  request() {
-    return this._request
-  }
-
-  response() {
-    return this._response
-  }
+  request() { return this._request }
+  response() { return this._response }
 }

package/src/database/drivers/base.js

@@ -211,6 +211,38 @@ export default class VelociousDatabaseDriversBase {
     await this.query(`ROLLBACK TO SAVEPOINT ${savePointName}`)
   }
 
+  async truncateAllTables() {
+    await this.withDisabledForeignKeys(async () => {
+      let tries = 0
+
+      while(tries <= 5) {
+        tries++
+
+        const tables = await this.getTables()
+        const truncateErrors = []
+
+        for (const table of tables) {
+          if (table.getName() != "schema_migrations") {
+            try {
+              await table.truncate({cascade: true})
+            } catch (error) {
+              console.error(error)
+              truncateErrors.push(error)
+            }
+          }
+        }
+
+        if (truncateErrors.length == 0) {
+          break
+        } else if (tries <= 5) {
+          // Retry
+        } else {
+          throw truncateErrors[0]
+        }
+      }
+    })
+  }
+
   async update(...args) {
     const sql = this.updateSql(...args)
 

package/src/http-server/client/request-buffer/index.js

@@ -166,12 +166,16 @@ export default class RequestBuffer {
           this.multiPartyFormData = true
           this.setState("multi-part-form-data")
         } else {
-          if (!this.contentLength) throw new Error("Content length hasn't been set")
-
-          this.postBodyBuffer = new ArrayBuffer(this.contentLength)
-          this.postBodyChars = new Uint8Array(this.postBodyBuffer)
+          if (this.contentLength === 0) {
+            this.completeRequest()
+          } else if (!this.contentLength) {
+            throw new Error("Content length hasn't been set")
+          } else {
+            this.postBodyBuffer = new ArrayBuffer(this.contentLength)
+            this.postBodyChars = new Uint8Array(this.postBodyBuffer)
 
-          this.setState("post-body")
+            this.setState("post-body")
+          }
         }
       } else {
         throw new Error(`Unknown HTTP method: ${this.httpMethod}`)

package/src/http-server/client/request.js

@@ -7,13 +7,13 @@ export default class VelociousHttpServerClientRequest {
     this.requestParser = new RequestParser({configuration})
   }
 
-  baseURL = () => `${this.protocol()}://${this.hostWithPort()}`
-  feed = (data) => this.requestParser.feed(data)
-  header = (headerName) => this.requestParser.requestBuffer.getHeader(headerName)?.value
-  httpMethod = () => this.requestParser.getHttpMethod()
-  host = () => this.requestParser.getHost()
+  baseURL() { return `${this.protocol()}://${this.hostWithPort()}` }
+  feed(data) { return this.requestParser.feed(data) }
+  header(headerName) { return this.requestParser.requestBuffer.getHeader(headerName)?.value }
+  httpMethod() { return this.requestParser.getHttpMethod() }
+  host() { return this.requestParser.getHost() }
 
-  hostWithPort = () => {
+  hostWithPort() {
     const port = this.port()
     const protocol = this.protocol()
     let hostWithPort = `${this.host()}`

package/src/routes/base-route.js

@@ -1,4 +1,5 @@
 import GetRoute from "./get-route.js"
+import NamespaceRoute from "./namespace-route.js"
 import PostRoute from "./post-route.js"
 import ResourceRoute from "./resource-route.js"
 
@@ -20,6 +21,16 @@ export function initBaseRoute() {
       throw new Error(`No 'matchWithPath' implemented on ${this.constructor.name}`)
     }
 
+    namespace(name, callback) {
+      const route = new NamespaceRoute({name})
+
+      this.routes.push(route)
+
+      if (callback) {
+        callback(route)
+      }
+    }
+
     post(name, args) {
       const route = new PostRoute({name, args})
 

package/src/routes/namespace-route.js

@@ -0,0 +1,24 @@
+import BaseRoute, {initBaseRoute} from "./base-route.js"
+import escapeStringRegexp from "escape-string-regexp"
+
+initBaseRoute()
+
+export default class VelociousRouteNamespaceRoute extends BaseRoute {
+  constructor({name}) {
+    super()
+    this.name = name
+    this.regExp = new RegExp(`^(${escapeStringRegexp(name)})(.*)$`)
+  }
+
+  matchWithPath({params, path}) {
+    const match = path.match(this.regExp)
+
+    if (match) {
+      const [_beginnigSlash, _matchedName, restPath] = match
+
+      params.controller = this.name
+
+      return {restPath}
+    }
+  }
+}