subenv

ab8a3741 · nanahira · 6d1321ad · ab8a3741 · ab8a3741 · ab8a3741
Commit ab8a3741 authored Aug 24, 2024 by nanahira
17 changed files
--- a/.dockerignore
+++ b/.dockerignore
@@ -112,3 +112,6 @@ dist
 Dockerfile
 .gitlab-ci.yml
 /config.yaml
+/ygopro-*
+/pack.db
--- a/.gitignore
+++ b/.gitignore
@@ -107,4 +107,5 @@ dist
 /output
 /config.yaml
-/ygopro-database
+/ygopro-*
+/pack.db
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,53 +6,47 @@ variables:
  GIT_DEPTH: "1"
  POST_DEPTH: 10
-zh-CN:
+.task:
  stage: generate
  tags: 
    - linux
-  image: node:buster
  variables:
    LOCALE: zh-CN
+    NPM_SCRIPT: start
+    CARD_SYMBOL: '简体中文卡'
+    FILE_SYMBOL: 'cn'
  script: ./ci-scripts/generate.sh
  artifacts:
    paths:
      - output
+zh-CN:
+  extends: .task
 en-US:
-  stage: generate
+  extends: .task
-  tags: 
-    - linux
-  image: node:buster
  variables:
    LOCALE: en-US
-  script: ./ci-scripts/generate.sh
-  artifacts:
-    paths:
-      - output
 ja-JP:
-  stage: generate
+  extends: .task
-  tags: 
-    - linux
-  image: node:buster
  variables:
    LOCALE: ja-JP
-  script: ./ci-scripts/generate.sh
-  artifacts:
-    paths:
-      - output
 ko-KR:
-  stage: generate
+  extends: .task
-  tags: 
-    - linux
-  image: node:buster
  variables:
    LOCALE: ko-KR
-  script: ./ci-scripts/generate.sh
-  artifacts:
+env408:
-    paths:
+  extends: .task
-      - output
+  variables:
+    LOCALE: zh-CN
+    NPM_SCRIPT: start:subenv
+    DATE: '2013-01-01'
+    CARD_SYMBOL: '408环境'
+    FILE_SYMBOL: 'env408'
 upload_to_minio:
  stage: deploy
@@ -61,6 +55,7 @@ upload_to_minio:
    - en-US
    - ja-JP
    - ko-KR
+    - env408
  tags: 
    - linux
  script:

--- a/ci-scripts/generate.sh
+++ b/ci-scripts/generate.sh
@@ -8,13 +8,14 @@ export OUTPUT_PATH="./output/$LOCALE"
 apt update ; apt -y install build-essential python3 sqlite3 git tar
 git clone --depth=1 https://code.mycard.moe/mycard/ygopro-database
+wget -O pack.db https://cdn02.moecube.com:444/ygopro-card-list/pack.db
 cp -rf ./ygopro-database/locales/ja-JP/cards.cdb "$JP_DATABASE_PATH"
 npm ci
 npm run build
-npm start
+npm run "$NPM_SCRIPT"
 cd "$OUTPUT_PATH"
-tar zcvf "../cn-data-$LOCALE.tar.gz" deck expansions
+tar zcvf "../$FILE_SYMBOL-data-$LOCALE.tar.gz" deck expansions
 cd ..
--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "ygopro-cn-database-generator",
  "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
  "requires": true,
-  "dependencies": {
+  "packages": {
-    "@types/bunyan": {
+    "": {
+      "name": "ygopro-cn-database-generator",
+      "version": "1.0.0",
+      "license": "AGPL-3.0",
+      "dependencies": {
+        "@types/bunyan": "^1.8.6",
+        "@types/node": "^14.11.5",
+        "@types/sqlite3": "^3.1.6",
+        "axios": "^0.20.0",
+        "bunyan": "^1.8.14",
+        "jinja-js": "^0.1.8",
+        "lodash": "^4.17.21",
+        "moment": "^2.30.1",
+        "sqlite": "^4.0.15",
+        "sqlite3": "^5.0.0",
+        "yaml": "^1.10.0"
+      },
+      "devDependencies": {
+        "@types/lodash": "^4.17.7",
+        "typescript": "^5.5.4"
+      }
+    },
+    "node_modules/@types/bunyan": {
      "version": "1.8.6",
      "resolved": "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz",
      "integrity": "sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==",
-      "requires": {
+      "dependencies": {
        "@types/node": "*"
      }
    },
-    "@types/node": {
+    "node_modules/@types/lodash": {
+      "version": "4.17.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
+      "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
      "version": "14.11.5",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.5.tgz",
      "integrity": "sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ=="
    },
-    "@types/sqlite3": {
+    "node_modules/@types/sqlite3": {
      "version": "3.1.6",
      "resolved": "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz",
      "integrity": "sha512-OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA==",
-      "requires": {
+      "dependencies": {
        "@types/node": "*"
      }
    },
-    "@types/underscore": {
+    "node_modules/abbrev": {
-      "version": "1.10.24",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.24.tgz",
-      "integrity": "sha512-T3NQD8hXNW2sRsSbLNjF/aBo18MyJlbw0lSpQHB/eZZtScPdexN4HSa8cByYwTw9Wy7KuOFr81mlDQcQQaZ79w=="
-    },
-    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
    },
-    "ajv": {
+    "node_modules/ajv": {
      "version": "6.12.5",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
        "json-schema-traverse": "^0.4.1",
        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
      }
    },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "aproba": {
+    "node_modules/aproba": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
    },
-    "are-we-there-yet": {
+    "node_modules/are-we-there-yet": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "requires": {
+      "deprecated": "This package is no longer supported.",
+      "dependencies": {
        "delegates": "^1.0.0",
        "readable-stream": "^2.0.6"
      }
    },
-    "asn1": {
+    "node_modules/asn1": {
      "version": "0.2.4",
      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "safer-buffer": "~2.1.0"
      }
    },
-    "assert-plus": {
+    "node_modules/assert-plus": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
    },
-    "asynckit": {
+    "node_modules/asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
      "optional": true
    },
-    "aws-sign2": {
+    "node_modules/aws-sign2": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
    },
-    "aws4": {
+    "node_modules/aws4": {
      "version": "1.10.1",
      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
      "optional": true
    },
-    "axios": {
+    "node_modules/axios": {
      "version": "0.20.0",
      "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
      "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
-      "requires": {
+      "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
+      "dependencies": {
        "follow-redirects": "^1.10.0"
      }
    },
-    "balanced-match": {
+    "node_modules/balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
    },
-    "bcrypt-pbkdf": {
+    "node_modules/bcrypt-pbkdf": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "tweetnacl": "^0.14.3"
      }
    },
-    "block-stream": {
+    "node_modules/block-stream": {
      "version": "0.0.9",
      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "inherits": "~2.0.0"
+      },
+      "engines": {
+        "node": "0.4 || >=0.5.8"
      }
    },
-    "brace-expansion": {
+    "node_modules/brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
+      "dependencies": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
      }
    },
-    "bunyan": {
+    "node_modules/bunyan": {
      "version": "1.8.14",
      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.14.tgz",
      "integrity": "sha512-LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==",
-      "requires": {
+      "engines": [
+        "node >=0.10.0"
+      ],
+      "bin": {
+        "bunyan": "bin/bunyan"
+      },
+      "optionalDependencies": {
        "dtrace-provider": "~0.8",
        "moment": "^2.19.3",
        "mv": "~2",
        "safe-json-stringify": "~1"
      }
    },
-    "caseless": {
+    "node_modules/caseless": {
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
      "optional": true
    },
-    "chownr": {
+    "node_modules/chownr": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
    },
-    "code-point-at": {
+    "node_modules/code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "combined-stream": {
+    "node_modules/combined-stream": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
      }
    },
-    "concat-map": {
+    "node_modules/concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
    },
-    "console-control-strings": {
+    "node_modules/console-control-strings": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
-    "core-util-is": {
+    "node_modules/core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
    },
-    "dashdash": {
+    "node_modules/dashdash": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
      }
    },
-    "debug": {
+    "node_modules/debug": {
      "version": "3.2.6",
      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "requires": {
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dependencies": {
        "ms": "^2.1.1"
      }
    },
-    "deep-extend": {
+    "node_modules/deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
    },
-    "delayed-stream": {
+    "node_modules/delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
    },
-    "delegates": {
+    "node_modules/delegates": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
    },
-    "detect-libc": {
+    "node_modules/detect-libc": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
    },
-    "dtrace-provider": {
+    "node_modules/dtrace-provider": {
      "version": "0.8.8",
      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
      "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==",
+      "hasInstallScript": true,
      "optional": true,
-      "requires": {
+      "dependencies": {
        "nan": "^2.14.0"
+      },
+      "engines": {
+        "node": ">=0.10"
      }
    },
-    "ecc-jsbn": {
+    "node_modules/ecc-jsbn": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "jsbn": "~0.1.0",
        "safer-buffer": "^2.1.0"
      }
    },
-    "extend": {
+    "node_modules/extend": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
      "optional": true
    },
-    "extsprintf": {
+    "node_modules/extsprintf": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "engines": [
+        "node >=0.6.0"
+      ],
      "optional": true
    },
-    "fast-deep-equal": {
+    "node_modules/fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
      "optional": true
    },
-    "fast-json-stable-stringify": {
+    "node_modules/fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
      "optional": true
    },
-    "follow-redirects": {
+    "node_modules/follow-redirects": {
      "version": "1.13.0",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      }
    },
-    "forever-agent": {
+    "node_modules/forever-agent": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
    },
-    "form-data": {
+    "node_modules/form-data": {
      "version": "2.3.3",
      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.6",
        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
      }
    },
-    "fs-minipass": {
+    "node_modules/fs-minipass": {
      "version": "1.2.7",
      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "requires": {
+      "dependencies": {
        "minipass": "^2.6.0"
      }
    },
-    "fs.realpath": {
+    "node_modules/fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
-    "fstream": {
+    "node_modules/fstream": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "graceful-fs": "^4.1.2",
        "inherits": "~2.0.0",
        "mkdirp": ">=0.5 0",
        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
      }
    },
-    "gauge": {
+    "node_modules/gauge": {
      "version": "2.7.4",
      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
+      "deprecated": "This package is no longer supported.",
+      "dependencies": {
        "aproba": "^1.0.3",
        "console-control-strings": "^1.0.0",
        "has-unicode": "^2.0.0",
@@ -333,281 +429,344 @@
        "wide-align": "^1.1.0"
      }
    },
-    "getpass": {
+    "node_modules/getpass": {
      "version": "0.1.7",
      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "assert-plus": "^1.0.0"
      }
    },
-    "glob": {
+    "node_modules/glob": {
      "version": "6.0.4",
      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "inflight": "^1.0.4",
        "inherits": "2",
        "minimatch": "2 || 3",
        "once": "^1.3.0",
        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
      }
    },
-    "graceful-fs": {
+    "node_modules/graceful-fs": {
      "version": "4.2.4",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
      "optional": true
    },
-    "har-schema": {
+    "node_modules/har-schema": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
    },
-    "har-validator": {
+    "node_modules/har-validator": {
      "version": "5.1.5",
      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "ajv": "^6.12.3",
        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
      }
    },
-    "has-unicode": {
+    "node_modules/has-unicode": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
    },
-    "http-signature": {
+    "node_modules/http-signature": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "assert-plus": "^1.0.0",
        "jsprim": "^1.2.2",
        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
      }
    },
-    "iconv-lite": {
+    "node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
+      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
      }
    },
-    "ignore-walk": {
+    "node_modules/ignore-walk": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
-      "requires": {
+      "dependencies": {
        "minimatch": "^3.0.4"
      }
    },
-    "inflight": {
+    "node_modules/inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
        "once": "^1.3.0",
        "wrappy": "1"
      }
    },
-    "inherits": {
+    "node_modules/inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
-    "ini": {
+    "node_modules/ini": {
      "version": "1.3.5",
      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
+      "engines": {
+        "node": "*"
+      }
    },
-    "is-fullwidth-code-point": {
+    "node_modules/is-fullwidth-code-point": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
+      "dependencies": {
        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
      }
    },
-    "is-typedarray": {
+    "node_modules/is-typedarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
      "optional": true
    },
-    "isarray": {
+    "node_modules/isarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
    },
-    "isexe": {
+    "node_modules/isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
      "optional": true
    },
-    "isstream": {
+    "node_modules/isstream": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
      "optional": true
    },
-    "jinja-js": {
+    "node_modules/jinja-js": {
      "version": "0.1.8",
      "resolved": "https://registry.npmjs.org/jinja-js/-/jinja-js-0.1.8.tgz",
-      "integrity": "sha1-CxPuuW6QmT8EBRTXzmT1N4b1hRE="
+      "integrity": "sha1-CxPuuW6QmT8EBRTXzmT1N4b1hRE=",
+      "bin": {
+        "jinjajs": "cli.js"
+      }
    },
-    "jsbn": {
+    "node_modules/jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
      "optional": true
    },
-    "json-schema": {
+    "node_modules/json-schema": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
      "optional": true
    },
-    "json-schema-traverse": {
+    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
      "optional": true
    },
-    "json-stringify-safe": {
+    "node_modules/json-stringify-safe": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
      "optional": true
    },
-    "jsprim": {
+    "node_modules/jsprim": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "engines": [
+        "node >=0.6.0"
+      ],
      "optional": true,
-      "requires": {
+      "dependencies": {
        "assert-plus": "1.0.0",
        "extsprintf": "1.3.0",
        "json-schema": "0.2.3",
        "verror": "1.10.0"
      }
    },
-    "mime-db": {
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/mime-db": {
      "version": "1.44.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
    },
-    "mime-types": {
+    "node_modules/mime-types": {
      "version": "2.1.27",
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
      }
    },
-    "minimatch": {
+    "node_modules/minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
+      "dependencies": {
        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
      }
    },
-    "minimist": {
+    "node_modules/minimist": {
      "version": "1.2.5",
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
    },
-    "minipass": {
+    "node_modules/minipass": {
      "version": "2.9.0",
      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "requires": {
+      "dependencies": {
        "safe-buffer": "^5.1.2",
        "yallist": "^3.0.0"
      }
    },
-    "minizlib": {
+    "node_modules/minizlib": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "requires": {
+      "dependencies": {
        "minipass": "^2.9.0"
      }
    },
-    "mkdirp": {
+    "node_modules/mkdirp": {
      "version": "0.5.5",
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "requires": {
+      "dependencies": {
        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
      }
    },
-    "moment": {
+    "node_modules/moment": {
-      "version": "2.29.1",
+      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "optional": true
+      "engines": {
+        "node": "*"
+      }
    },
-    "ms": {
+    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
-    "mv": {
+    "node_modules/mv": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "mkdirp": "~0.5.1",
        "ncp": "~2.0.0",
        "rimraf": "~2.4.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
      }
    },
-    "nan": {
+    "node_modules/nan": {
      "version": "2.14.1",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
      "optional": true
    },
-    "ncp": {
+    "node_modules/ncp": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-      "optional": true
+      "optional": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
    },
-    "needle": {
+    "node_modules/needle": {
      "version": "2.5.2",
      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
      "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
-      "requires": {
+      "dependencies": {
        "debug": "^3.2.6",
        "iconv-lite": "^0.4.4",
        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
      }
    },
-    "node-addon-api": {
+    "node_modules/node-addon-api": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz",
      "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="
    },
-    "node-gyp": {
+    "node_modules/node-gyp": {
      "version": "3.8.0",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "fstream": "^1.0.0",
        "glob": "^7.0.3",
        "graceful-fs": "^4.1.2",
@@ -621,28 +780,40 @@
        "tar": "^2.0.0",
        "which": "1"
      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "optional": true,
      "dependencies": {
-        "glob": {
+        "fs.realpath": "^1.0.0",
-          "version": "7.1.6",
+        "inflight": "^1.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+        "inherits": "2",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+        "minimatch": "^3.0.4",
-          "optional": true,
+        "once": "^1.3.0",
-          "requires": {
+        "path-is-absolute": "^1.0.0"
-            "fs.realpath": "^1.0.0",
+      },
-            "inflight": "^1.0.4",
+      "engines": {
-            "inherits": "2",
+        "node": "*"
-            "minimatch": "^3.0.4",
+      },
-            "once": "^1.3.0",
+      "funding": {
-            "path-is-absolute": "^1.0.0"
+        "url": "https://github.com/sponsors/isaacs"
-          }
-        }
      }
    },
-    "node-pre-gyp": {
+    "node_modules/node-pre-gyp": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
      "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
-      "requires": {
+      "deprecated": "Please upgrade to @mapbox/node-pre-gyp: the non-scoped node-pre-gyp package is deprecated and only the @mapbox scoped package will recieve updates in the future",
+      "dependencies": {
        "detect-libc": "^1.0.2",
        "mkdirp": "^0.5.1",
        "needle": "^2.2.1",
@@ -654,189 +825,239 @@
        "semver": "^5.3.0",
        "tar": "^4"
      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/node-pre-gyp/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
      "dependencies": {
-        "glob": {
+        "fs.realpath": "^1.0.0",
-          "version": "7.1.6",
+        "inflight": "^1.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+        "inherits": "2",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+        "minimatch": "^3.0.4",
-          "requires": {
+        "once": "^1.3.0",
-            "fs.realpath": "^1.0.0",
+        "path-is-absolute": "^1.0.0"
-            "inflight": "^1.0.4",
+      },
-            "inherits": "2",
+      "engines": {
-            "minimatch": "^3.0.4",
+        "node": "*"
-            "once": "^1.3.0",
+      },
-            "path-is-absolute": "^1.0.0"
+      "funding": {
-          }
+        "url": "https://github.com/sponsors/isaacs"
-        },
-        "nopt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "tar": {
-          "version": "4.4.13",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        }
      }
    },
-    "nopt": {
+    "node_modules/node-pre-gyp/node_modules/nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/node-pre-gyp/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/node-pre-gyp/node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/nopt": {
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
      }
    },
-    "npm-bundled": {
+    "node_modules/npm-bundled": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
-      "requires": {
+      "dependencies": {
        "npm-normalize-package-bin": "^1.0.1"
      }
    },
-    "npm-normalize-package-bin": {
+    "node_modules/npm-normalize-package-bin": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
    },
-    "npm-packlist": {
+    "node_modules/npm-packlist": {
      "version": "1.4.8",
      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-      "requires": {
+      "dependencies": {
        "ignore-walk": "^3.0.1",
        "npm-bundled": "^1.0.1",
        "npm-normalize-package-bin": "^1.0.1"
      }
    },
-    "npmlog": {
+    "node_modules/npmlog": {
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
+      "deprecated": "This package is no longer supported.",
+      "dependencies": {
        "are-we-there-yet": "~1.1.2",
        "console-control-strings": "~1.1.0",
        "gauge": "~2.7.3",
        "set-blocking": "~2.0.0"
      }
    },
-    "number-is-nan": {
+    "node_modules/number-is-nan": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "oauth-sign": {
+    "node_modules/oauth-sign": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
    },
-    "object-assign": {
+    "node_modules/object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "once": {
+    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
+      "dependencies": {
        "wrappy": "1"
      }
    },
-    "os-homedir": {
+    "node_modules/os-homedir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "os-tmpdir": {
+    "node_modules/os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "osenv": {
+    "node_modules/osenv": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "requires": {
+      "deprecated": "This package is no longer supported.",
+      "dependencies": {
        "os-homedir": "^1.0.0",
        "os-tmpdir": "^1.0.0"
      }
    },
-    "path-is-absolute": {
+    "node_modules/path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "performance-now": {
+    "node_modules/performance-now": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
      "optional": true
    },
-    "process-nextick-args": {
+    "node_modules/process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
    },
-    "psl": {
+    "node_modules/psl": {
      "version": "1.8.0",
      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
      "optional": true
    },
-    "punycode": {
+    "node_modules/punycode": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
    },
-    "qs": {
+    "node_modules/qs": {
      "version": "6.5.2",
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
    },
-    "rc": {
+    "node_modules/rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "requires": {
+      "dependencies": {
        "deep-extend": "^0.6.0",
        "ini": "~1.3.0",
        "minimist": "^1.2.0",
        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
      }
    },
-    "readable-stream": {
+    "node_modules/readable-stream": {
      "version": "2.3.7",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "requires": {
+      "dependencies": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
        "isarray": "~1.0.0",
@@ -846,12 +1067,13 @@
        "util-deprecate": "~1.0.1"
      }
    },
-    "request": {
+    "node_modules/request": {
      "version": "2.88.2",
      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "aws-sign2": "~0.7.0",
        "aws4": "^1.8.0",
        "caseless": "~0.12.0",
@@ -872,74 +1094,95 @@
        "tough-cookie": "~2.5.0",
        "tunnel-agent": "^0.6.0",
        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
      }
    },
-    "rimraf": {
+    "node_modules/rimraf": {
      "version": "2.4.5",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
      "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
      }
    },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
-    "safe-json-stringify": {
+    "node_modules/safe-json-stringify": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
      "optional": true
    },
-    "safer-buffer": {
+    "node_modules/safer-buffer": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
-    "sax": {
+    "node_modules/sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
-    "semver": {
+    "node_modules/semver": {
      "version": "5.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+      "bin": {
+        "semver": "bin/semver"
+      }
    },
-    "set-blocking": {
+    "node_modules/set-blocking": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
    },
-    "signal-exit": {
+    "node_modules/signal-exit": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
    },
-    "sqlite": {
+    "node_modules/sqlite": {
      "version": "4.0.15",
      "resolved": "https://registry.npmjs.org/sqlite/-/sqlite-4.0.15.tgz",
      "integrity": "sha512-irPPTrbVoDvwzRGpe0v8vxpNwMl+q0tXQzffQTcCUnaJzQFO0hfLLvFwGDKxd6vYBuvEr3uvPkObVoGOvVsmzA=="
    },
-    "sqlite3": {
+    "node_modules/sqlite3": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.0.tgz",
      "integrity": "sha512-rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw==",
-      "requires": {
+      "hasInstallScript": true,
+      "dependencies": {
        "node-addon-api": "2.0.0",
-        "node-gyp": "3.x",
        "node-pre-gyp": "^0.11.0"
+      },
+      "optionalDependencies": {
+        "node-gyp": "3.x"
+      },
+      "peerDependencies": {
+        "node-gyp": "3.x"
+      },
+      "peerDependenciesMeta": {
+        "node-gyp": {
+          "optional": true
+        }
      }
    },
-    "sshpk": {
+    "node_modules/sshpk": {
      "version": "1.16.1",
      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "asn1": "~0.2.3",
        "assert-plus": "^1.0.0",
        "bcrypt-pbkdf": "^1.0.0",
@@ -949,147 +1192,187 @@
        "jsbn": "~0.1.0",
        "safer-buffer": "^2.0.2",
        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
      }
    },
-    "string-width": {
+    "node_modules/string-width": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
+      "dependencies": {
        "code-point-at": "^1.0.0",
        "is-fullwidth-code-point": "^1.0.0",
        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
      }
    },
-    "string_decoder": {
+    "node_modules/strip-ansi": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
+      "dependencies": {
        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
      }
    },
-    "strip-json-comments": {
+    "node_modules/strip-json-comments": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
    },
-    "tar": {
+    "node_modules/tar": {
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "block-stream": "*",
        "fstream": "^1.0.12",
        "inherits": "2"
      }
    },
-    "tough-cookie": {
+    "node_modules/tough-cookie": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "psl": "^1.1.28",
        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
      }
    },
-    "tunnel-agent": {
+    "node_modules/tunnel-agent": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
      }
    },
-    "tweetnacl": {
+    "node_modules/tweetnacl": {
      "version": "0.14.5",
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
      "optional": true
    },
-    "typescript": {
+    "node_modules/typescript": {
-      "version": "4.0.3",
+      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-    },
+      "dev": true,
-    "underscore": {
+      "bin": {
-      "version": "1.11.0",
+        "tsc": "bin/tsc",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+        "tsserver": "bin/tsserver"
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
    },
-    "uri-js": {
+    "node_modules/uri-js": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "punycode": "^2.1.0"
      }
    },
-    "util-deprecate": {
+    "node_modules/util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
    },
-    "uuid": {
+    "node_modules/uuid": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "optional": true
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
    },
-    "verror": {
+    "node_modules/verror": {
      "version": "1.10.0",
      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "engines": [
+        "node >=0.6.0"
+      ],
      "optional": true,
-      "requires": {
+      "dependencies": {
        "assert-plus": "^1.0.0",
        "core-util-is": "1.0.2",
        "extsprintf": "^1.2.0"
      }
    },
-    "which": {
+    "node_modules/which": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
      "optional": true,
-      "requires": {
+      "dependencies": {
        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
      }
    },
-    "wide-align": {
+    "node_modules/wide-align": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "requires": {
+      "dependencies": {
        "string-width": "^1.0.2 || 2"
      }
    },
-    "wrappy": {
+    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
-    "yallist": {
+    "node_modules/yallist": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
    },
-    "yaml": {
+    "node_modules/yaml": {
      "version": "1.10.0",
      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
-      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="
+      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "engines": {
+        "node": ">= 6"
+      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
  "main": "run.ts",
  "scripts": {
    "build": "tsc",
-    "start": "node build/run.js | bunyan"
+    "start": "node build/run.js | bunyan",
+    "start:subenv": "node build/subenv.js | bunyan"
  },
  "repository": {
    "type": "git",
@@ -21,14 +22,17 @@
    "@types/bunyan": "^1.8.6",
    "@types/node": "^14.11.5",
    "@types/sqlite3": "^3.1.6",
-    "@types/underscore": "^1.10.24",
    "axios": "^0.20.0",
    "bunyan": "^1.8.14",
    "jinja-js": "^0.1.8",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
    "sqlite": "^4.0.15",
    "sqlite3": "^5.0.0",
-    "typescript": "^4.0.3",
-    "underscore": "^1.11.0",
    "yaml": "^1.10.0"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.17.7",
+    "typescript": "^5.5.4"
  }
 }
--- a/run.ts
+++ b/run.ts
 import { DBReader } from "./src/dbreader";
 import { NWFetcher } from "./src/nwfetcher";
-import _ from "underscore";
+import _ from "lodash";
 import { CNOCGFetcher } from "./src/cnocg";
 import { ExtraCards } from "./src/ExtraCards";
 import { DirectFetcher } from "./src/direct";
@@ -16,7 +16,6 @@ async function main() {
 	//const missingExtraCards = ExtraCards.filter(c => !cards.some(cc => c.code === cc.code));
 	//await dbreader.run(cards.concat(missingExtraCards));
 	const cards = await DirectFetcher.fetchOnce();
-	//console.log(cards);
 	await dbreader.run(cards);
 	process.exit();
 }

--- a/src/base.ts
+++ b/src/base.ts
 import { Config, loadConfig } from "./config";
 import bunyan from "bunyan";
-import _ from "underscore";
+import _ from "lodash";
 export default abstract class Base {
 	config: Config;

--- a/src/config.ts
+++ b/src/config.ts
@@ -5,7 +5,11 @@ export interface Config {
 	postDepth: number;
 	jpDatabasePath: string;
 	cnDatabasePath: string;
+	cardListDatabasePath: string;
 	outputPath: string;
+	descSymbol: string;
+	fileSymbol: string;
+	// cardListCondition?: string;
 }
 export async function loadConfig(): Promise<Config> {
@@ -14,6 +18,10 @@ export async function loadConfig(): Promise<Config> {
 		postDepth: process.env.POST_DEPTH ? parseInt(process.env.POST_DEPTH) : 5,
 		jpDatabasePath: process.env.JP_DATABASE_PATH || "./ygopro-database/locales/ja-JP/cards.cdb",
 		cnDatabasePath: process.env.SOURCE_TARGET_PATH || "./ygopro-database/locales/zh-CN/cards.cdb",
-		outputPath: process.env.OUTPUT_PATH || "./output"
+		cardListDatabasePath: process.env.CARD_LIST_DATABASE_PATH || "./pack.db",
+		outputPath: process.env.OUTPUT_PATH || "./output",
+		descSymbol: process.env.CARD_SYMBOL || "简体中文卡",
+		fileSymbol: process.env.FILE_SYMBOL || "cn",
+		// cardListCondition: process.env.CARD_LIST_CONDITION,
 	}
 }
--- a/src/dbreader.ts
+++ b/src/dbreader.ts
 import { open, Database } from "sqlite";
 import sqlite3 from "sqlite3";
-import _ from "underscore";
+import _ from "lodash";
 import Base from "./base";
 import { promises as fs } from "fs";
-import { generateBanlistFromCode } from "./utility";
+import { Banlist, generateBanlistFromCode, mergeBanlists } from "./utility";
 import { CardPool, DeckGenerator } from "./deck";
+import moment from "moment";
 const textsFields = ["id", "name", "desc"]
 for (let i = 1; i <= 16; ++i) {
@@ -66,7 +67,7 @@ export class Card {
 	}
 	async getRelatedCards(db: Database) {
 		const code = this.code;
-		const moreCodes: number[] = (await db.all('SELECT id FROM datas WHERE id > ? AND id <= ?', [code, code + 10])).map(m => m.id);
+		const moreCodes: number[] = (await db.all('SELECT id FROM datas WHERE id > ? AND id <= ?', [code, code + 20])).map(m => m.id);
 		const cards = await Promise.all(moreCodes.map(code => this.createCardFromRelatedCode(code, db)));
 		return cards;
 	}
@@ -114,7 +115,7 @@ export class DBReader extends Base {
 	jpdb: Database;
 	cndb: Database;
 	outputdb: Database;
-	private async openDatabase(path: string) {
+	async openDatabase(path: string) {
 		return await open({
 			filename: path,
 			driver: sqlite3.Database
@@ -134,9 +135,9 @@ export class DBReader extends Base {
 		}
 	}
 	private async openOutputDatabase() {
-		const fullPath = `${this.config.outputPath}/expansions/cn.cdb`;
+		const fullPath = `${this.config.outputPath}/expansions/${this.config.fileSymbol}.cdb`;
 		const createDirectoryPaths = [
-			`${this.config.outputPath}/deck/cn`,
+			`${this.config.outputPath}/deck/${this.config.fileSymbol}`,
 			`${this.config.outputPath}/expansions`
 		];
 		for (let createDirectoryPath of createDirectoryPaths) {
@@ -191,15 +192,18 @@ export class DBReader extends Base {
 		const otherCodes: number[] = (await this.cndb.all(sql)).map(m => m.id);
 		return otherCodes;
 	}
-	async generateBanlist(codes: number[]) {
+	async generateBanlist(codes: number[], extraBanlists: Banlist[] = []) {
 		const otherCodes = await this.getOtherCardCodes(codes);
 		const banlistString = await generateBanlistFromCode([
-			{
+			mergeBanlists([
-				name: "cn",
+				...extraBanlists,
-				list: [
+				{
-					otherCodes
+					name: moment().format('YYYY.MM') + ' ' + this.config.descSymbol,
-				]
+					list: [
-			}
+						otherCodes
+					]
+				}
+			]),
 		]);
 		await fs.writeFile(`${this.config.outputPath}/expansions/lflist.conf`, banlistString);
 	}
@@ -219,13 +223,15 @@ export class DBReader extends Base {
 		const cardPool = await this.categorizeCards(cards);
 		const deckGenerator = new DeckGenerator(cardPool);
 		const deckTexts = deckGenerator.getDeckTexts();
-		await Promise.all(_.range(deckTexts.length).map(i => fs.writeFile(`${this.config.outputPath}/deck/cn/cn_${i}.ydk`, deckTexts[i])));
+		await Promise.all(_.range(deckTexts.length).map(i => fs.writeFile(`${this.config.outputPath}/deck/${this.config.fileSymbol}/${this.config.fileSymbol}_${i}.ydk`, deckTexts[i])));
 	}
-	async run(cards: Card[]) {
+	async run(cards: Card[], options: {
+		extraBanlists?: Banlist[]
+	} = {}) {
 		await Promise.all(cards.map(card => card.loadData(this.cndb)));
-		const extendedCards = _.flatten(await Promise.all(cards.map(card => card.getRelatedCards(this.cndb))), true);
+		const extendedCards = (await Promise.all(cards.map(card => card.getRelatedCards(this.cndb)))).flat();
-		const allCards = cards.concat(extendedCards);
+		const allCards = _.uniqBy(cards.concat(extendedCards), (s) => s.code);
-		const queries = _.flatten(allCards.map(card => card.getSQLQueries()), true);
+		const queries = allCards.flatMap(card => card.getSQLQueries());
 		await this.openOutputDatabase();
 		await this.outputdb.run("BEGIN TRANSACTION;");
 		for (let query of queries) {
@@ -235,7 +241,7 @@ export class DBReader extends Base {
 		await this.outputdb.run("COMMIT;");
 		const allCodes = allCards.map(card => card.code);
 		this.log.info(`Database created.`);
-		await this.generateBanlist(allCodes);
+		await this.generateBanlist(allCodes, options.extraBanlists || []);
 		this.log.info(`LFList created.`);
 		await this.generatePatch(allCodes);
 		this.log.info(`Patch created.`);

--- a/src/deck.ts
+++ b/src/deck.ts
-import _ from "underscore";
+import _ from "lodash";
 import { promises as fs } from "fs";
 export interface CardPool {

--- a/src/direct.ts
+++ b/src/direct.ts
@@ -22,13 +22,13 @@ export class DirectFetcher extends Base {
 			const codeDifference = code - c;
 			// 新加入的卡号比某一卡号大，并且 10 以内，则新的卡是那张卡的关联卡，不入。
-			if (codeDifference > 0 && codeDifference <= 10) {
+			if (codeDifference > 0 && codeDifference <= 20) {
 				this.log.debug(`Skipped forward-related dup: ${code} ${c}`);
 				return;
 			}
 			// 新加入的卡号比某一卡号小，并且 10 以内，则把旧的卡删掉。-
-			if (codeDifference < 0 && codeDifference >= -10) {
+			if (codeDifference < 0 && codeDifference >= -20) {
 				this.log.debug(`Would remove backword-related dup: ${code} ${c}`);
 				posToRemove.push(i);
 			}

--- a/src/nwfetcher.ts
+++ b/src/nwfetcher.ts
 import axios from "axios";
-import _ from "underscore";
+import _ from "lodash";
 import Base from "./base";
 import { DBReader } from "./dbreader";
@@ -60,7 +60,7 @@ export class NWFetcher extends Base {
 	async fetch(): Promise<string[]> {
 		this.log.debug(`Started fetching...`);
 		const posts = await this.fetchPosts();
-		const strings = _.flatten(await Promise.all(posts.map(m => this.getAllStrings(m))), true);
+		const strings = (await Promise.all(posts.map(m => this.getAllStrings(m)))).flat();
 		this.log.debug(`Done.`);
 		return _.uniq(strings);
 	}

--- a/src/packdbfetcher.ts
+++ b/src/packdbfetcher.ts
+import _ from "lodash";
+import Base from "./base";
+import { Card, DBReader } from "./dbreader";
+export class PackDbFetcher extends Base { 
+  static async fetchOnce(dbreader: DBReader, cardListCondition?: string) {
+		const fetcher = new PackDbFetcher({ name: "Pack DB Fetcher", level: 'info' });
+		await fetcher.init();
+		return await fetcher.fetch(dbreader, cardListCondition);
+  }
+  async fetch(dbreader: DBReader, cardListCondition?: string) {
+    const packDb = await dbreader.openDatabase(this.config.cardListDatabasePath);
+    const packDbData = await packDb.all<{ id: number, pack_id: string, date: string }[]>("SELECT id FROM pack" + (cardListCondition ? ` WHERE ${cardListCondition}` : ""));
+    return packDbData.map(m => new Card(m.id));
+  }
+}
--- a/src/utility.ts
+++ b/src/utility.ts
-import _ from "underscore";
+import _ from "lodash";
 import jinja from "jinja-js";
 import { promises as fs } from "fs";
-interface Banlist {
+export interface Banlist {
 	name: string
 	list: number[][]
 }
@@ -11,3 +11,55 @@ export async function generateBanlistFromCode(banlists: Banlist[]) {
 	const template = await fs.readFile("./templates/lflist.conf.j2", "utf-8");
 	return jinja.render(template, { banlists });
 }
+export async function readLFList(content: string): Promise<Banlist[]> {
+	const lines = content.split("\n");
+	const ret: Banlist[] = [];
+	let name = "";
+	let list: number[][] = [];
+	const nextList = (nextName: string) => { 
+		if (list.length > 0) { 
+			ret.push({ name, list });
+		}
+		list = [];
+		name = nextName;
+	}
+	for (let line of lines) {
+		if (line.startsWith("#")) {
+			continue;
+		}
+		if(line.startsWith("!")) {
+			nextList(line.slice(1));
+			continue;
+		}
+		// xxxxxxxx 0
+		// use regex to match
+		const match = line.match(/^(\d{4,})\s(\d)/);
+		if(!match) {
+			continue;
+		}
+		const code = parseInt(match[1]);
+		const status = parseInt(match[2]);
+		list[status] ??= [];
+		list[status].push(code);
+	}
+	nextList('');
+	return ret;
+}
+export function mergeBanlists(lists: Banlist[]): Banlist {
+	const ret: Banlist = { name: lists[0].name, list: [] };
+	const existingCodes = new Set<number>();
+	for (let status = 0; status < 3; ++status) {
+		for (let list of lists) {
+			ret.list[status] ??= [];
+			for(let code of list.list[status] ?? []) {
+				if (!existingCodes.has(code)) {
+					ret.list[status].push(code);
+					existingCodes.add(code);
+				}
+			}
+		}
+	}
+	return ret;
+}
--- a/subenv.ts
+++ b/subenv.ts
+import { DBReader } from "./src/dbreader";
+import _ from "lodash";
+import { PackDbFetcher } from "./src/packdbfetcher";
+import axios from "axios";
+import { readLFList } from "./src/utility";
+import moment from "moment";
+const DATE = process.env.DATE;
+async function getBanlist() {
+	const lflistReq = await axios.get<string>("https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf", {
+		responseType: 'document'
+	});
+	const lflists = (await readLFList(lflistReq.data)).filter(l => !l.name.includes('TCG')).map(l => ({
+		...l,
+		date: moment(l.name.split(' ')[0], 'YYYY.MM')
+	})).filter(l => l.date.isBefore(DATE));
+	return _.maxBy(lflists, l => l.date.unix());
+}
+async function main() {
+	const dbreader = new DBReader({
+		name: "Database",
+		//level: Logger.DEBUG
+	});
+	await dbreader.init();
+	const cards = await PackDbFetcher.fetchOnce(dbreader, `date <= '${DATE}'`);
+	console.log(cards.length);
+	await dbreader.run(cards, {
+		extraBanlists: [await getBanlist()],
+	});
+	process.exit();
+}
+main();
--- a/test/deckgen.ts
+++ b/test/deckgen.ts
@@ -2,7 +2,7 @@ import { open, Database } from "sqlite";
 import sqlite3 from "sqlite3";
 import { promises as fs } from "fs";
 import { DeckGenerator } from "../src/deck";
-import _ from "underscore";
+import _ from "lodash";
 async function openDatabase(path: string) {
 	return await open({