Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(driver): implement redis driver by jlenon7 · Pull Request #2 · AthennaIO/Cache · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
services:
redis:
image: redis
ports:
- '6382:6379'
strategy:
matrix:
node-version:
Expand All@@ -32,25 +37,3 @@ jobs:

- name: Test code compilation
run: npm run build

windows:
runs-on: windows-latest
strategy:
matrix:
node-version:
- 21.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Run tests
run: npm run test:coverage

- name: Test code compilation
run: npm run build
8 changes: 8 additions & 0 deletions compose.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_db_redis
image: redis:6.2-alpine
ports:
- '6382:6379'
42 changes: 42 additions & 0 deletions configurer/cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import { Env } from '@athenna/config'

export default {
/*
|--------------------------------------------------------------------------
| Default Cache Store Name
|--------------------------------------------------------------------------
|
| Athenna's cache API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default store.
|
*/

default: Env('CACHE_STORE', 'memory'),

/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may configure the store connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Athenna. You are free to add more.
|
| Drivers: "redis", "memory"
|
*/

stores: {
memory: {
driver: 'memory'
},

redis: {
driver: 'redis',

url: Env('REDIS_URL', 'redis://localhost:6379?database=0')
}
}
}

8 changes: 8 additions & 0 deletions configurer/docker/redis/file.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
version: '3'

services:
redis:
container_name: athenna_redis
image: redis
ports:
- '6379:6379'
14 changes: 14 additions & 0 deletions configurer/docker/redis/service.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
/**
* @athenna/cache
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

export default {
container_name: 'athenna_redis',
image: 'redis',
ports: ['6379:6379']
}
58 changes: 57 additions & 1 deletion configurer/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,18 @@
* file that was distributed with this source code.
*/

import { File, Path } from '@athenna/common'
import { BaseConfigurer } from '@athenna/artisan'
import { File, Path, Parser, Module } from '@athenna/common'

export default class CacheConfigurer extends BaseConfigurer {
public async configure() {
const stores = await this.prompt.checkbox(
'Which cache stores do you plan to use?',
['redis', 'memory']
)

const task = this.logger.task()
const hasSelectedRedis = stores.find(store => store === 'redis')

task.addPromise(`Create cache.${Path.ext()} config file`, () => {
return new File('./cache').copy(Path.config(`cache.${Path.ext()}`))
Expand All@@ -24,6 +30,56 @@ export default class CacheConfigurer extends BaseConfigurer {
.save()
})

task.addPromise('Update .env, .env.test and .env.example', () => {
let envs = '\nCACHE_STORE=memory\n'

if (hasSelectedRedis) {
envs += 'REDIS_URL=redis://localhost:6379?database=0\n'
}

return new File(Path.pwd('.env'), '')
.append(envs)
.then(() => new File(Path.pwd('.env.test'), '').append(envs))
.then(() => new File(Path.pwd('.env.example'), '').append(envs))
})

if (hasSelectedRedis) {
task.addPromise('Add service to docker-compose.yml file', async () => {
const hasDockerCompose = await File.exists(
Path.pwd('docker-compose.yml')
)

if (hasDockerCompose) {
const docker = await new File(
Path.pwd('docker-compose.yml')
).getContentAsYaml()

docker.services.redis = await Module.get(
import('./docker/redis/service.js')
)

return new File(Path.pwd('docker-compose.yml')).setContent(
Parser.objectToYamlString(docker)
)
}

return new File(`./docker/redis/file.yml`).copy(
Path.pwd('docker-compose.yml')
)
})
}

const libraries = {
redis: ['redis'],
memory: ['lru-cache']
}

task.addPromise(`Install ${stores.join(', ')} libraries`, () => {
return stores.athenna.concurrently(store => {
return this.npm.install(libraries[store])
})
})

await task.run()

console.log()
Expand Down
104 changes: 98 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/cache",
"version": "5.1.0",
"version": "5.2.0",
"description": "The cache handler for Athenna Framework.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand DownExpand Up@@ -70,7 +70,9 @@
"eslint-plugin-promise": "^6.6.0",
"husky": "^3.1.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.8"
"lru-cache": "^11.1.0",
"prettier": "^2.8.8",
"redis": "^5.8.1"
},
"c8": {
"all": true,
Expand DownExpand Up@@ -164,8 +166,5 @@
}
]
}
},
"dependencies": {
"lru-cache": "^11.1.0"
}
}
Loading