odac 1.1.0 → 1.3.0

package/src/Odac.js

@@ -64,36 +64,41 @@ module.exports = {
     _odac.Var = (...args) => new (require('./Var.js'))(...args)
 
     if (req) {
-      _odac.Request = new (require('./Request.js'))(id, req, res, _odac)
-      _odac.Auth = new (require('./Auth.js'))(_odac.Request)
-      _odac.Token = new (require('./Token.js'))(_odac.Request)
-      _odac.Lang = new (require('./Lang.js'))(_odac)
-      if (res) {
-        _odac.View = new (require('./View.js'))(_odac)
-      }
-
-      _odac._intervals = []
-      _odac._timeouts = []
       _odac.setInterval = function (callback, delay, ...args) {
         const id = setInterval(callback, delay, ...args)
+        if (!_odac._intervals) _odac._intervals = []
         _odac._intervals.push(id)
         return id
       }
       _odac.setTimeout = function (callback, delay, ...args) {
         const id = setTimeout(callback, delay, ...args)
+        if (!_odac._timeouts) _odac._timeouts = []
         _odac._timeouts.push(id)
         return id
       }
       _odac.clearInterval = function (id) {
-        const index = _odac._intervals.indexOf(id)
+        const index = _odac._intervals?.indexOf(id) ?? -1
         if (index > -1) _odac._intervals.splice(index, 1)
         clearInterval(id)
       }
       _odac.clearTimeout = function (id) {
-        const index = _odac._timeouts.indexOf(id)
+        const index = _odac._timeouts?.indexOf(id) ?? -1
         if (index > -1) _odac._timeouts.splice(index, 1)
         clearTimeout(id)
       }
+
+      _odac._intervals = []
+      _odac._timeouts = []
+
+      if (typeof req === 'object') {
+        _odac.Request = new (require('./Request.js'))(id, req, res, _odac)
+        _odac.Auth = new (require('./Auth.js'))(_odac.Request)
+        _odac.Token = new (require('./Token.js'))(_odac.Request)
+      }
+      _odac.Lang = new (require('./Lang.js'))(_odac)
+      if (res) {
+        _odac.View = new (require('./View.js'))(_odac)
+      }
       _odac.cleanup = function () {
         for (const id of _odac._intervals) clearInterval(id)
         for (const id of _odac._timeouts) clearTimeout(id)
@@ -110,42 +115,49 @@ module.exports = {
       _odac.__ = function (...args) {
         return _odac.Lang.get(...args)
       }
-      _odac.abort = function (code) {
-        return _odac.Request.abort(code)
-      }
-      _odac.cookie = function (key, value, options) {
-        return _odac.Request.cookie(key, value, options)
-      }
-      _odac.direct = function (url) {
-        return _odac.Request.redirect(url)
+      if (typeof req === 'object') {
+        _odac.abort = function (code) {
+          return _odac.Request.abort(code)
+        }
+        _odac.cookie = function (key, value, options) {
+          return _odac.Request.cookie(key, value, options)
+        }
+        _odac.direct = function (url) {
+          return _odac.Request.redirect(url)
+        }
       }
       _odac.env = function (key, defaultValue) {
         return _odac.Env.get(key, defaultValue)
       }
-      _odac.return = function (data) {
-        return _odac.Request.end(data)
-      }
-      _odac.request = function (key) {
-        return _odac.Request.request(key)
-      }
-      _odac.set = function (key, value) {
-        return _odac.Request.set(key, value)
-      }
-      _odac.share = function (key, value) {
-        return _odac.Request.share(key, value)
-      }
-      _odac.token = function (hash) {
-        return hash ? _odac.Token.check(hash) : _odac.Token.generate()
-      }
-      _odac.validator = function () {
-        return new (require('./Validator.js'))(_odac.Request)
-      }
-      _odac.write = function (value) {
-        return _odac.Request.write(value)
-      }
-      _odac.stream = function (input) {
-        _odac.Request.clearTimeout()
-        return new (require('./Stream'))(_odac.Request.req, _odac.Request.res, input, _odac)
+      if (typeof req === 'object') {
+        _odac.return = function (data) {
+          return _odac.Request.end(data)
+        }
+        _odac.request = function (key) {
+          return _odac.Request.request(key)
+        }
+        _odac.set = function (key, value) {
+          return _odac.Request.set(key, value)
+        }
+        _odac.session = function (key, value) {
+          return _odac.Request.session(key, value)
+        }
+        _odac.share = function (key, value) {
+          return _odac.Request.share(key, value)
+        }
+        _odac.token = function (hash) {
+          return hash ? _odac.Token.check(hash) : _odac.Token.generate()
+        }
+        _odac.validator = function () {
+          return new (require('./Validator.js'))(_odac.Request)
+        }
+        _odac.write = function (value) {
+          return _odac.Request.write(value)
+        }
+        _odac.stream = function (input) {
+          _odac.Request.clearTimeout()
+          return new (require('./Stream'))(_odac.Request.req, _odac.Request.res, input, _odac)
+        }
       }
 
       if (global.Odac?.Route?.class) {

package/src/Request.js

@@ -35,7 +35,11 @@ class OdacRequest {
     if (!Odac.Route.routes[route]) route = 'www'
     this.route = route
     if (this.res) {
-      this.#timeout = setTimeout(() => !this.res.finished && this.abort(408), Odac.Config.request.timeout)
+      if (typeof this.#odac.setTimeout === 'function') {
+        this.#timeout = this.#odac.setTimeout(() => !this.res.finished && this.abort(408), Odac.Config.request.timeout)
+      } else {
+        this.#timeout = setTimeout(() => !this.res.finished && this.abort(408), Odac.Config.request.timeout)
+      }
     }
     this.#data()
     if (!Odac.Request) Odac.Request = {}
@@ -71,7 +75,7 @@ class OdacRequest {
     if (options.expires === undefined) options.expires = new Date(Date.now() + 1000 * 60 * 60 * 24 * 365).toUTCString()
     if (options.secure === undefined) options.secure = true
     if (options.httpOnly === undefined) options.httpOnly = true
-    if (options.sameSite === undefined) options.sameSite = 'Strict'
+    if (options.sameSite === undefined) options.sameSite = 'Lax'
     if (typeof value === 'object') value = JSON.stringify(value)
     let cookie = `${key}=${value}`
     for (const option of Object.keys(options)) if (options[option]) cookie += `; ${option}=${options[option]}`

package/src/Route/Cron.js

@@ -60,7 +60,7 @@ class Cron {
             if (job.lastRun && Math.floor(unix / 86400) % condition.value !== 0) shouldRun = false
             break
           case 'everyWeekDay':
-            if (job.lastRun && weekDay % condition.value !== 0) shouldRun = false
+            if (condition.value !== weekDay) shouldRun = false
             break
           case 'everyMonth':
             if (job.lastRun && (year * 12 + month) % condition.value !== 0) shouldRun = false
@@ -81,7 +81,9 @@ class Cron {
           if (job.function || fs.existsSync(job.path)) {
             if (!job.function) job.function = require(job.path)
             if (job.function && typeof job.function === 'function') {
-              job.function()
+              const _odac = global.Odac.instance(null, 'cron')
+              job.function(_odac)
+              if (_odac.cleanup) _odac.cleanup()
             }
           }
         } catch (error) {
@@ -109,22 +111,61 @@ class Cron {
       updated: new Date()
     })
     let id = this.#jobs.length - 1
-    return {
-      minute: value => this.#jobs[id].condition.push({type: 'minute', value: value}),
-      hour: value => this.#jobs[id].condition.push({type: 'hour', value: value}),
-      day: value => this.#jobs[id].condition.push({type: 'day', value: value}),
-      weekDay: value => this.#jobs[id].condition.push({type: 'weekDay', value: value}),
-      month: value => this.#jobs[id].condition.push({type: 'month', value: value}),
-      year: value => this.#jobs[id].condition.push({type: 'year', value: value}),
-      yearDay: value => this.#jobs[id].condition.push({type: 'yearDay', value: value}),
-      everyMinute: value => this.#jobs[id].condition.push({type: 'everyMinute', value: value}),
-      everyHour: value => this.#jobs[id].condition.push({type: 'everyHour', value: value}),
-      everyDay: value => this.#jobs[id].condition.push({type: 'everyDay', value: value}),
-      everyWeekDay: value => this.#jobs[id].condition.push({type: 'everyWeekDay', value: value}),
-      everyMonth: value => this.#jobs[id].condition.push({type: 'everyMonth', value: value}),
-      everyYear: value => this.#jobs[id].condition.push({type: 'everyYear', value: value}),
-      everyYearDay: value => this.#jobs[id].condition.push({type: 'everyYearDay', value: value})
+    const addCondition = (type, value) => {
+      this.#jobs[id].condition.push({type, value})
+      return chain
+    }
+
+    const chain = {
+      minute: value => addCondition('minute', value),
+      hour: value => addCondition('hour', value),
+      day: value => addCondition('day', value),
+      at: time => {
+        if (!/^\d{1,2}:\d{1,2}$/.test(time)) throw new Error('Invalid time format for .at(). Use HH:MM')
+        const [h, m] = time.split(':')
+        addCondition('hour', parseInt(h))
+        addCondition('minute', parseInt(m))
+        return chain
+      },
+      raw: pattern => {
+        const parts = pattern.split(' ').filter(p => p.trim() !== '')
+        if (parts.length !== 5) throw new Error('Invalid cron expression. Expected 5 fields (min hour day month weekDay)')
+
+        const [min, hour, day, month, weekDay] = parts
+        const parse = (val, type, everyType) => {
+          if (val === '*') return
+          if (val.startsWith('*/') && everyType) {
+            addCondition(everyType, parseInt(val.split('/')[1]))
+            return
+          }
+          if (!isNaN(val)) {
+            addCondition(type, parseInt(val))
+            return
+          }
+          throw new Error(`Unsupported cron value '${val}' for ${type}`)
+        }
+
+        parse(min, 'minute', 'everyMinute')
+        parse(hour, 'hour', 'everyHour')
+        parse(day, 'day', 'everyDay')
+        parse(month, 'month', 'everyMonth')
+        parse(weekDay, 'weekDay', null)
+
+        return chain
+      },
+      weekDay: value => addCondition('weekDay', value),
+      month: value => addCondition('month', value),
+      year: value => addCondition('year', value),
+      yearDay: value => addCondition('yearDay', value),
+      everyMinute: value => addCondition('everyMinute', value),
+      everyHour: value => addCondition('everyHour', value),
+      everyDay: value => addCondition('everyDay', value),
+      everyWeekDay: value => addCondition('everyWeekDay', value),
+      everyMonth: value => addCondition('everyMonth', value),
+      everyYear: value => addCondition('everyYear', value),
+      everyYearDay: value => addCondition('everyYearDay', value)
     }
+    return chain
   }
 }
 

package/src/Route/Internal.js

@@ -528,7 +528,7 @@ class Internal {
         if (error.message === 'Database connection failed') {
           return Odac.return({
             result: {success: false},
-            errors: {_odac_form: 'Database not configured. Please check your config.json'}
+            errors: {_odac_form: 'Database not configured. Please check your odac.json'}
           })
         }