odac 0.9.0 → 1.0.0

package/test/server/Service.test_.js

@@ -47,9 +47,9 @@ describe('Service', () => {
   beforeEach(() => {
     jest.clearAllMocks()
 
-    // Setup global Candy mock
+    // Setup global Odac mock
     setupGlobalMocks()
-    mockCandy = global.Candy
+    mockCandy = global.Odac
 
     // Mock child_process module
     mockChildProcess = createMockChildProcess()
@@ -700,14 +700,14 @@ describe('Service', () => {
       await Service.check()
 
       expect(fs.writeFile).toHaveBeenCalledWith(
-        '/home/user/.candypack/logs/test-service.js.log',
+        '/home/user/.odac/logs/test-service.js.log',
         expect.stringContaining(stdoutData),
         'utf8',
         expect.any(Function)
       )
 
       expect(fs.writeFile).toHaveBeenCalledWith(
-        '/home/user/.candypack/logs/test-service.js.err.log',
+        '/home/user/.odac/logs/test-service.js.err.log',
         expect.stringContaining(stderrData),
         'utf8',
         expect.any(Function)
@@ -836,7 +836,7 @@ describe('Service', () => {
 
       await Service.init()
 
-      expect(fs.readFile).toHaveBeenCalledWith('/home/user/.candypack/logs/test-service.js.log', 'utf8', expect.any(Function))
+      expect(fs.readFile).toHaveBeenCalledWith('/home/user/.odac/logs/test-service.js.log', 'utf8', expect.any(Function))
     })
 
     test('should calculate and report service uptime correctly', async () => {
@@ -1008,14 +1008,14 @@ describe('Service', () => {
 
       // Should write to both regular log and error log
       expect(fs.writeFile).toHaveBeenCalledWith(
-        '/home/user/.candypack/logs/test-service.js.log',
+        '/home/user/.odac/logs/test-service.js.log',
         expect.stringContaining('[ERR]'),
         'utf8',
         expect.any(Function)
       )
 
       expect(fs.writeFile).toHaveBeenCalledWith(
-        '/home/user/.candypack/logs/test-service.js.err.log',
+        '/home/user/.odac/logs/test-service.js.err.log',
         expect.stringContaining(errorMessage),
         'utf8',
         expect.any(Function)

package/test/server/Subdomain.test.js

@@ -21,8 +21,8 @@ describe('Subdomain', () => {
     setupGlobalMocks()
 
     // Set up the Log mock before requiring Subdomain
-    const {mockCandy} = require('./__mocks__/globalCandy')
-    mockCandy.setMock('core', 'Log', {
+    const {mockOdac} = require('./__mocks__/globalOdac')
+    mockOdac.setMock('core', 'Log', {
       init: jest.fn().mockReturnValue({
         log: mockLog,
         error: mockError
@@ -58,11 +58,11 @@ describe('Subdomain', () => {
       result: jest.fn((success, data) => ({success, data}))
     }
 
-    // Configure global Candy mocks
-    global.Candy.setMock('core', 'Config', {config: mockConfig})
-    global.Candy.setMock('server', 'DNS', mockDNS)
-    global.Candy.setMock('server', 'SSL', mockSSL)
-    global.Candy.setMock('server', 'Api', mockApi)
+    // Configure global Odac mocks
+    global.Odac.setMock('core', 'Config', {config: mockConfig})
+    global.Odac.setMock('server', 'DNS', mockDNS)
+    global.Odac.setMock('server', 'SSL', mockSSL)
+    global.Odac.setMock('server', 'Api', mockApi)
 
     // Mock the __ function to return the key with placeholders replaced correctly
     global.__ = jest.fn((key, ...args) => {

package/test/server/Web/Firewall.test.js

@@ -1,4 +1,3 @@
-
 // Mock dependencies
 const mockLog = {
   log: jest.fn(),
@@ -8,25 +7,26 @@ const mockLog = {
 
 // Global config store
 let mockConfigData = {
-    firewall: {
-        enabled: true,
-        rateLimit: {
-            enabled: true,
-            windowMs: 1000,
-            max: 2
-        },
-        blacklist: [],
-        whitelist: []
-    }
+  firewall: {
+    enabled: true,
+    rateLimit: {
+      enabled: true,
+      windowMs: 1000,
+      max: 2
+    },
+    blacklist: [],
+    whitelist: []
+  }
 }
 
-// Mock Candy global
-global.Candy = {
-  core: jest.fn((module) => {
+// Mock Odac global
+global.Odac = {
+  core: jest.fn(module => {
     if (module === 'Log') return mockLog
-    if (module === 'Config') return {
-      config: mockConfigData
-    }
+    if (module === 'Config')
+      return {
+        config: mockConfigData
+      }
     return {}
   })
 }
@@ -40,136 +40,136 @@ describe('Firewall', () => {
     jest.clearAllMocks()
     // Reset config
     mockConfigData.firewall = {
+      enabled: true,
+      rateLimit: {
         enabled: true,
-        rateLimit: {
-            enabled: true,
-            windowMs: 1000,
-            max: 2
-        },
-        blacklist: [],
-        whitelist: []
+        windowMs: 1000,
+        max: 2
+      },
+      blacklist: [],
+      whitelist: []
     }
     firewall = new Firewall()
   })
 
   test('should allow requests from normal IPs', () => {
-    const req = { socket: { remoteAddress: '127.0.0.1' }, headers: {} }
+    const req = {socket: {remoteAddress: '127.0.0.1'}, headers: {}}
     expect(firewall.check(req).allowed).toBe(true)
   })
 
   test('should block requests from blacklisted IPs', () => {
     firewall.addBlock('1.2.3.4')
-    const req = { socket: { remoteAddress: '1.2.3.4' }, headers: {} }
+    const req = {socket: {remoteAddress: '1.2.3.4'}, headers: {}}
     const result = firewall.check(req)
     expect(result.allowed).toBe(false)
     expect(result.reason).toBe('blacklist')
   })
 
   test('should allow requests from whitelisted IPs even if rate limited', () => {
-      // Mock rate limit config to be very strict
-      mockConfigData.firewall.rateLimit.max = 0
-      firewall = new Firewall() // reload config
+    // Mock rate limit config to be very strict
+    mockConfigData.firewall.rateLimit.max = 0
+    firewall = new Firewall() // reload config
 
-      firewall.addWhitelist('1.2.3.4')
+    firewall.addWhitelist('1.2.3.4')
 
-      const req = { socket: { remoteAddress: '1.2.3.4' }, headers: {} }
+    const req = {socket: {remoteAddress: '1.2.3.4'}, headers: {}}
 
-      expect(firewall.check(req).allowed).toBe(true)
+    expect(firewall.check(req).allowed).toBe(true)
   })
 
   test('should enforce rate limits', () => {
-      const req = { socket: { remoteAddress: '10.0.0.1' }, headers: {} }
-
-      // Config is max 2 per 1000ms
-      expect(firewall.check(req).allowed).toBe(true) // 1
-      expect(firewall.check(req).allowed).toBe(true) // 2
-      const result = firewall.check(req) // 3 - blocked
-      expect(result.allowed).toBe(false)
-      expect(result.reason).toBe('rate_limit')
+    const req = {socket: {remoteAddress: '10.0.0.1'}, headers: {}}
+
+    // Config is max 2 per 1000ms
+    expect(firewall.check(req).allowed).toBe(true) // 1
+    expect(firewall.check(req).allowed).toBe(true) // 2
+    const result = firewall.check(req) // 3 - blocked
+    expect(result.allowed).toBe(false)
+    expect(result.reason).toBe('rate_limit')
   })
 
   test('should reset rate limits after window', async () => {
-      const req = { socket: { remoteAddress: '10.0.0.2' }, headers: {} }
+    const req = {socket: {remoteAddress: '10.0.0.2'}, headers: {}}
 
-      expect(firewall.check(req).allowed).toBe(true) // 1
-      expect(firewall.check(req).allowed).toBe(true) // 2
-      expect(firewall.check(req).allowed).toBe(false) // 3
+    expect(firewall.check(req).allowed).toBe(true) // 1
+    expect(firewall.check(req).allowed).toBe(true) // 2
+    expect(firewall.check(req).allowed).toBe(false) // 3
 
-      // Wait for window to pass (1000ms)
-      await new Promise(resolve => setTimeout(resolve, 1100))
+    // Wait for window to pass (1000ms)
+    await new Promise(resolve => setTimeout(resolve, 1100))
 
-      expect(firewall.check(req).allowed).toBe(true) // Should be allowed again
+    expect(firewall.check(req).allowed).toBe(true) // Should be allowed again
   })
 
   test('should handle IPv6 mapped IPv4 addresses', () => {
-      const req = { socket: { remoteAddress: '::ffff:127.0.0.1' }, headers: {} }
-      expect(firewall.check(req).allowed).toBe(true)
+    const req = {socket: {remoteAddress: '::ffff:127.0.0.1'}, headers: {}}
+    expect(firewall.check(req).allowed).toBe(true)
 
-      firewall.addBlock('127.0.0.1')
-      expect(firewall.check(req).allowed).toBe(false)
+    firewall.addBlock('127.0.0.1')
+    expect(firewall.check(req).allowed).toBe(false)
   })
 
   test('should use x-forwarded-for if socket address is missing', () => {
-      const req = { socket: {}, headers: { 'x-forwarded-for': '1.2.3.4' } }
-      firewall.addBlock('1.2.3.4')
-      expect(firewall.check(req).allowed).toBe(false)
+    const req = {socket: {}, headers: {'x-forwarded-for': '1.2.3.4'}}
+    firewall.addBlock('1.2.3.4')
+    expect(firewall.check(req).allowed).toBe(false)
   })
 
   test('should handle x-forwarded-for with multiple IPs', () => {
-      // First IP is client
-      const req = { socket: {}, headers: { 'x-forwarded-for': '1.2.3.4, 5.6.7.8' } }
-      firewall.addBlock('1.2.3.4')
-      const result = firewall.check(req)
-      expect(result.allowed).toBe(false)
-      expect(result.reason).toBe('blacklist')
+    // First IP is client
+    const req = {socket: {}, headers: {'x-forwarded-for': '1.2.3.4, 5.6.7.8'}}
+    firewall.addBlock('1.2.3.4')
+    const result = firewall.check(req)
+    expect(result.allowed).toBe(false)
+    expect(result.reason).toBe('blacklist')
   })
 
   test('should handle x-forwarded-for with spaces', () => {
-      const req = { socket: {}, headers: { 'x-forwarded-for': ' 1.2.3.4 , 5.6.7.8 ' } }
-      firewall.addBlock('1.2.3.4')
-      expect(firewall.check(req).allowed).toBe(false)
+    const req = {socket: {}, headers: {'x-forwarded-for': ' 1.2.3.4 , 5.6.7.8 '}}
+    firewall.addBlock('1.2.3.4')
+    expect(firewall.check(req).allowed).toBe(false)
   })
 
   test('should allow everything when disabled', () => {
-      mockConfigData.firewall.enabled = false
-      firewall = new Firewall() // reload config
+    mockConfigData.firewall.enabled = false
+    firewall = new Firewall() // reload config
 
-      firewall.addBlock('1.2.3.4') // even if blocked
-      const req = { socket: { remoteAddress: '1.2.3.4' }, headers: {} }
+    firewall.addBlock('1.2.3.4') // even if blocked
+    const req = {socket: {remoteAddress: '1.2.3.4'}, headers: {}}
 
-      expect(firewall.check(req).allowed).toBe(true)
+    expect(firewall.check(req).allowed).toBe(true)
   })
 
   test('should remove block', () => {
-      firewall.addBlock('1.2.3.4')
-      const req = { socket: { remoteAddress: '1.2.3.4' }, headers: {} }
-      expect(firewall.check(req).allowed).toBe(false)
+    firewall.addBlock('1.2.3.4')
+    const req = {socket: {remoteAddress: '1.2.3.4'}, headers: {}}
+    expect(firewall.check(req).allowed).toBe(false)
 
-      firewall.removeBlock('1.2.3.4')
-      expect(firewall.check(req).allowed).toBe(true)
+    firewall.removeBlock('1.2.3.4')
+    expect(firewall.check(req).allowed).toBe(true)
   })
 
   test('should remove whitelist', () => {
-      // Set strict rate limit
-      mockConfigData.firewall.rateLimit.max = 0
-      firewall = new Firewall()
+    // Set strict rate limit
+    mockConfigData.firewall.rateLimit.max = 0
+    firewall = new Firewall()
 
-      firewall.addWhitelist('1.2.3.4')
-      const req = { socket: { remoteAddress: '1.2.3.4' }, headers: {} }
-      expect(firewall.check(req).allowed).toBe(true)
+    firewall.addWhitelist('1.2.3.4')
+    const req = {socket: {remoteAddress: '1.2.3.4'}, headers: {}}
+    expect(firewall.check(req).allowed).toBe(true)
 
-      firewall.removeWhitelist('1.2.3.4')
-      expect(firewall.check(req).allowed).toBe(false) // rate limited
+    firewall.removeWhitelist('1.2.3.4')
+    expect(firewall.check(req).allowed).toBe(false) // rate limited
   })
 
   test('should persist changes to config', () => {
-      firewall.addBlock('1.1.1.1')
-      expect(mockConfigData.firewall.blacklist).toContain('1.1.1.1')
+    firewall.addBlock('1.1.1.1')
+    expect(mockConfigData.firewall.blacklist).toContain('1.1.1.1')
 
-      firewall.addWhitelist('2.2.2.2')
-      expect(mockConfigData.firewall.whitelist).toContain('2.2.2.2')
+    firewall.addWhitelist('2.2.2.2')
+    expect(mockConfigData.firewall.whitelist).toContain('2.2.2.2')
 
-      firewall.removeBlock('1.1.1.1')
-      expect(mockConfigData.firewall.blacklist).not.toContain('1.1.1.1')
+    firewall.removeBlock('1.1.1.1')
+    expect(mockConfigData.firewall.blacklist).not.toContain('1.1.1.1')
   })
 })