update packs

Author: lagden

.eslintrc.cjs

@@ -0,0 +1,41 @@
+root: true
+env:
+  es2021: true
+  node: true
+parser: '@babel/eslint-parser'
+parserOptions:
+  ecmaVersion: 12
+  sourceType: module
+extends:
+  - xo
+  - plugin:unicorn/recommended
+rules:
+  indent: [error, tab]
+  linebreak-style: [error, unix]
+  quotes: [error, single]
+  semi:  [error, never]
+  semi-spacing:
+    - error
+    -
+      before: false
+      after: true
+  no-console: off
+  no-debugger: off
+  no-unused-expressions:
+    - error
+    -
+      allowShortCircuit: true
+      allowTernary: true
+      allowTaggedTemplates: true
+  camelcase: off
+  capitalized-comments: off
+  spaced-comment: off
+  padding-line-between-statements: off
+  no-undef-init: off
+  unicorn/filename-case: off
+  unicorn/prevent-abbreviations: off
+  unicorn/no-reduce: off
+  unicorn/no-array-reduce: off
+  # unicorn/no-abusive-eslint-disable: off
+  # Bug no ctx.body Koa
+  require-atomic-updates: off

.eslintrc.yml

@@ -31,12 +31,23 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - run: yarn set version berry
-      - run: >
-          echo 'nodeLinker: node-modules' >> .yarnrc.yml
-      - run: yarn cache clean --all
-      - run: YARN_CHECKSUM_BEHAVIOR=update yarn
-      - run: npm test
+      - name: Update yarn
+        run: yarn set version berry
+
+      - name: Log yarn version
+        run: yarn --version
+
+      - name: Generate simple .yarnrc.yml
+        run: |
+          echo "nodeLinker: node-modules" >> .yarnrc.yml
+
+      - name: Install dependencies
+        run: yarn install
+        env:
+          CI: true
+      
+      - name: Run test
+        run: npm test
         env:
           CI: true
           REDIS: 127.0.0.1:${{ job.services.redis.ports[6379] }}

.github/workflows/nodejs.yml

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 DIR="$(cd $(dirname $0) && pwd)"
 BIN_DIR="$(cd $DIR/.. && pwd)"
@@ -17,10 +17,10 @@ rm -rf \
 	"${CURR_FOLDER}/.yarn" \
 	"${CURR_FOLDER}/.pnp.*"
 
-yarn install
+npm install
 
-test $? -ne 0 && abort "yarn failed" || ok "zerado..."
+test $? -ne 0 && abort "npm failed" || ok "zerado..."
 
-yarn npm audit
+npm audit
 
 exit 0

bin/node/prod.js

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+DIR="$(cd $(dirname $0) && pwd)"
+BIN_DIR="$(cd $DIR/.. && pwd)"
+
+# Import functions
+. $BIN_DIR/helper/fn
+
+# Go to current directory
+CURR_FOLDER="$(pwd)"
+cd $CURR_FOLDER
+
+usage() {
+	cat <<-EOF
+
+  Usage: $0 [options]
+
+  Options:
+    -g        Generate .yarnrc.yml
+    -h        Show usage
+
+EOF
+exit 0
+}
+
+GEN=0
+while getopts ":g" opt
+do
+	case ${opt} in
+		b) GEN=1 ;;
+	esac
+done
+
+rm -rf \
+	"${CURR_FOLDER}/node_modules" \
+	"${CURR_FOLDER}/package-lock.json" \
+	"${CURR_FOLDER}/yarn.lock" \
+	"${CURR_FOLDER}/.yarn" \
+	"${CURR_FOLDER}/.pnp.*"
+
+if test "${GEN}" = "1"; then
+	echo "nodeLinker: node-modules" > "${CURR_FOLDER}/.yarnrc.yml"
+fi
+
+yarn install
+
+test $? -ne 0 && abort "yarn failed" || ok "zerado..."
+
+yarn npm audit
+
+exit 0

bin/node/zera bin/node/zera_npmbin/node/zera renamed to bin/node/zera_npm

@@ -27,30 +27,29 @@
     "node": ">=14.16"
   },
   "scripts": {
-    "eslint": "eslint --config .eslintrc.cjs --ext .js --ignore-path .gitignore .",
+    "eslint": "eslint --config .eslintrc.yml --ext .js --ignore-path .gitignore .",
     "pretest": "npm run eslint",
-    "test": "c8 --reporter=text --reporter=lcov ava"
+    "test": "c8 --reporter=text --reporter=text-summary --reporter=lcov ava --tap"
   },
   "dependencies": {
-    "@tadashi/connect-redis": "1.0.1",
-    "@tadashi/jsonb": "3.1.0"
+    "@tadashi/connect-redis": "2.1.0",
+    "@tadashi/jsonb": "4.0.0"
   },
   "peerDependencies": {
     "ioredis": ">= 4.19.4 < 5"
   },
   "devDependencies": {
-    "@babel/core": "7.14.6",
-    "@babel/eslint-parser": "7.14.7",
+    "@babel/core": "7.15.0",
+    "@babel/eslint-parser": "7.15.0",
     "@babel/plugin-syntax-top-level-await": "7.14.5",
-    "@babel/preset-env": "7.14.7",
+    "@babel/preset-env": "7.15.0",
     "@tadashi/sleep": "2.0.1",
     "ava": "3.15.0",
-    "c8": "7.7.3",
-    "eslint": "7.29.0",
-    "eslint-config-xo": "0.37.0",
-    "eslint-plugin-unicorn": "33.0.1",
-    "ioredis": "4.27.6",
-    "p-event": "4.2.0"
+    "c8": "7.8.0",
+    "eslint": "7.32.0",
+    "eslint-config-xo": "0.38.0",
+    "eslint-plugin-unicorn": "35.0.0",
+    "ioredis": "4.27.8"
   },
   "babel": {
     "presets": [

bin/node/zera_yarn

@@ -18,7 +18,7 @@ class Cache {
 		options.redis.keyPrefix = `${options.redis.keyPrefix}_${options.namespace}:`
 
 		this.namespace = '@ns'
-		this.redis = connect(addresses, options.redis)
+		this.redis = connect({...options.redis, addresses})
 	}
 
 	async get(key) {

package.json

@@ -1,5 +1,4 @@
 import test from 'ava'
-import pEvent from 'p-event'
 import sleep from '@tadashi/sleep'
 import Cache from '../src/cache-redis.js'
 
@@ -123,32 +122,10 @@ test('clear', async t => {
 	t.is(_clear, undefined)
 })
 
-test('error', async t => {
-	const _g = new Cache({
-		redis: {
-			retryStrategy: () => false,
-		},
-		addresses: 'xxx',
-	})
-	const error = await pEvent(_g.redis, 'error')
-	t.regex(error.code, /EAI_AGAIN|ENOTFOUND/)
-})
-
 test('hash', async t => {
 	const ts = Date.now()
 	const _z = new Cache()
 	await _z.redis.hset('room_id', 'user_id', ts)
 	const r = await _z.redis.hget('room_id', 'user_id')
 	t.is(Number(r), ts)
 })
-
-test('cluster', async t => {
-	const _x = new Cache({
-		redis: {
-			clusterRetryStrategy: () => false,
-		},
-		addresses: '127.0.0.1:6379,127.0.0.1:6379',
-	})
-	const error = await pEvent(_x.redis, 'error')
-	t.is(error.message, 'Failed to refresh slots cache.')
-})