change redlock

4b2f46c8 · nanahira · 30655491 · 4b2f46c8 · 4b2f46c8 · 4b2f46c8
Commit 4b2f46c8 authored Aug 02, 2022 by nanahira
Showing with 26 additions and 26 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -1

package-lock.json package-lock.json +22 -22

package.json package.json +1 -1

src/def.ts src/def.ts +1 -1

src/drivers/redis.ts src/drivers/redis.ts +1 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,6 @@ deploy_npm:
  script:
    - apt update;apt -y install coreutils
    - echo $NPMRC | base64 --decode > ~/.npmrc
-    - npm publish . || true
+    - npm publish . --access public && curl -X PUT "https://registry-direct.npmmirror.com/$(cat package.json | jq '.name' | sed 's/\"//g')/sync?sync_upstream=true" || true
  only:
    - master
--- a/package-lock.json
+++ b/package-lock.json
 {
-  "name": "myproject",
+  "name": "aragami",
  "version": "1.0.4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "name": "myproject",
+      "name": "aragami",
      "version": "1.0.4",
      "license": "MIT",
      "dependencies": {
+        "@nanahira/redlock": "^1.0.0",
        "better-lock": "^2.0.3",
        "class-transformer": "^0.5.1",
        "encoded-buffer": "^0.2.6",
        "ioredis": "^5.2.2",
        "lodash": "^4.17.21",
        "lru-cache": "^7.13.1",
-        "redlock": "^5.0.0-beta.2",
        "typed-reflector": "^1.0.11"
      },
      "devDependencies": {
@@ -1061,6 +1061,17 @@
        "@jridgewell/sourcemap-codec": "^1.4.10"
      }
    },
+    "node_modules/@nanahira/redlock": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nanahira/redlock/-/redlock-1.0.0.tgz",
+      "integrity": "sha512-kf48X8tSbZm1DQT3Aj3B/Fza+L9toi5+j47BX9WJ9hIqyuCDRWMC2wQOJB1XAcOFZ+FGrfAjTa21bdTEuVlYeQ==",
+      "dependencies": {
+        "node-abort-controller": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4092,17 +4103,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/redlock": {
-      "version": "5.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/redlock/-/redlock-5.0.0-beta.2.tgz",
-      "integrity": "sha512-2RDWXg5jgRptDrB1w9O/JgSZC0j7y4SlaXnor93H/UJm/QyDiFgBKNtrh0TI6oCXqYSaSoXxFh6Sd3VtYfhRXw==",
-      "dependencies": {
-        "node-abort-controller": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
    "node_modules/reflect-metadata": {
      "version": "0.1.13",
      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -5698,6 +5698,14 @@
        "@jridgewell/sourcemap-codec": "^1.4.10"
      }
    },
+    "@nanahira/redlock": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nanahira/redlock/-/redlock-1.0.0.tgz",
+      "integrity": "sha512-kf48X8tSbZm1DQT3Aj3B/Fza+L9toi5+j47BX9WJ9hIqyuCDRWMC2wQOJB1XAcOFZ+FGrfAjTa21bdTEuVlYeQ==",
+      "requires": {
+        "node-abort-controller": "^3.0.1"
+      }
+    },
    "@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7963,14 +7971,6 @@
        "redis-errors": "^1.0.0"
      }
    },
-    "redlock": {
-      "version": "5.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/redlock/-/redlock-5.0.0-beta.2.tgz",
-      "integrity": "sha512-2RDWXg5jgRptDrB1w9O/JgSZC0j7y4SlaXnor93H/UJm/QyDiFgBKNtrh0TI6oCXqYSaSoXxFh6Sd3VtYfhRXw==",
-      "requires": {
-        "node-abort-controller": "^3.0.1"
-      }
-    },
    "reflect-metadata": {
      "version": "0.1.13",
      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",

--- a/package.json
+++ b/package.json
@@ -54,13 +54,13 @@
    "typescript": "^4.7.4"
  },
  "dependencies": {
+    "@nanahira/redlock": "^1.0.0",
    "better-lock": "^2.0.3",
    "class-transformer": "^0.5.1",
    "encoded-buffer": "^0.2.6",
    "ioredis": "^5.2.2",
    "lodash": "^4.17.21",
    "lru-cache": "^7.13.1",
-    "redlock": "^5.0.0-beta.2",
    "typed-reflector": "^1.0.11"
  }
 }
--- a/src/def.ts
+++ b/src/def.ts
 import { RedisOptions } from 'ioredis';
-import { Settings } from 'redlock';
+import { Settings } from '@nanahira/redlock';

 export type RedisDriverOptions = RedisOptions & {
  uri?: string;

--- a/src/drivers/redis.ts
+++ b/src/drivers/redis.ts
 import { BaseDriver } from '../base-driver';
 import Redis from 'ioredis';
-import Redlock from 'redlock';
+import Redlock from '@nanahira/redlock';
 import { RedisDriverOptions } from '../def';

 export class RedisDriver extends BaseDriver {