Compare commits
127 Commits
Author | SHA1 | Date | |
---|---|---|---|
8802dbf1eb | |||
39fda18176 | |||
8e80aff920 | |||
|
c38a2471e4 | ||
35d261d4b2 | |||
|
b02ffaaf9a | ||
f12adfd289 | |||
|
4110fe3f62 | ||
446a5cda55 | |||
|
6f2cecc5f0 | ||
56d7f4c421 | |||
|
4c36aab240 | ||
|
ed054de84b | ||
|
dc47084bfa | ||
550c071e61 | |||
|
9ee78fcd8d | ||
4b38444b11 | |||
|
efd9452930 | ||
08eb6d6421 | |||
|
303e83b652 | ||
b4bd384d6f | |||
|
e1260e6768 | ||
6906b3fc56 | |||
|
301d28f7e8 | ||
f6dc8a1602 | |||
|
ba7c40c958 | ||
|
0568e01f9d | ||
db4820a0be | |||
|
926006b393 | ||
996feb90d5 | |||
|
9aa46eb7cc | ||
ee36e9e89e | |||
|
197abde058 | ||
|
ac36756492 | ||
|
12f5ef8e0f | ||
|
8a82e0a09c | ||
e61116c8ac | |||
fe0e406272 | |||
f3a6a0964f | |||
|
31987a9ebe | ||
62ec31f87a | |||
|
5f7942a90f | ||
|
45264c819e | ||
6fc20d1be2 | |||
|
80a8dd11c3 | ||
|
239ea87a24 | ||
0ff8c7be38 | |||
|
e28d09bd34 | ||
|
3380332d85 | ||
|
c5122709fc | ||
8938f262d7 | |||
|
156bba4cf6 | ||
346967d441 | |||
|
6565a345ff | ||
e33e92c776 | |||
|
633d915718 | ||
7bb3d4c11f | |||
|
1afc86950a | ||
5fcca57067 | |||
|
ca35f13a9e | ||
2e1c2ecd39 | |||
|
4b7a7b646e | ||
99ee35e1cd | |||
dadde8d983 | |||
3594dd92f7 | |||
d5f177cc4e | |||
3bf96a1519 | |||
|
7e7126d246 | ||
e962e0064b | |||
|
504f8d2a37 | ||
803d35c21d | |||
|
342857495e | ||
35339795b6 | |||
|
56f946b90f | ||
e1c6f2db92 | |||
|
4df81339a4 | ||
49a14de301 | |||
|
2b1fe976bb | ||
62d4d2e29b | |||
|
9032183197 | ||
a54f0f5f5f | |||
|
315000d8ac | ||
cb9e0ae43e | |||
|
89b4ffeeda | ||
a7b1e01802 | |||
|
d071f37550 | ||
09635c87b1 | |||
|
05206b7d5c | ||
ed5dd22c5a | |||
|
ccea98c735 | ||
a5167a9a96 | |||
0a1f51cc2b | |||
|
eb0b6060b0 | ||
|
f18ce94298 | ||
|
99164f94c8 | ||
|
01cbca34f1 | ||
960033dfe2 | |||
|
dd75f63d37 | ||
|
0dad2a4408 | ||
|
b2fefebc9f | ||
|
568ffe8183 | ||
0531ee5dd6 | |||
|
387a6789c8 | ||
|
33f393ea7e | ||
858d166b9d | |||
81bddc9fd2 | |||
3e95b450ce | |||
|
068d0a825e | ||
|
72c2c31f1f | ||
b817db50bd | |||
ae79a3e398 | |||
13d35f035c | |||
|
7f2a32bad7 | ||
4aa10ac1da | |||
|
996f939243 | ||
|
b9c4257973 | ||
|
e98f0cc857 | ||
|
7d34006c4e | ||
|
9946791091 | ||
|
17cb6547e0 | ||
|
b8fe798b11 | ||
|
a3821fe9a2 | ||
|
79e440d3b8 | ||
|
e2515777d8 | ||
|
a823b51b57 | ||
|
c51aa9b977 | ||
|
dcfa4b2bb7 |
19
.github/dependabot.yml
vendored
Normal file
19
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# To get started with Dependabot version updates, you'll need to specify which
|
||||||
|
# package ecosystems to update and where the package manifests are located.
|
||||||
|
# Please see the documentation for all configuration options:
|
||||||
|
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
|
||||||
|
# Maintain dependencies for GitHub Actions
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
|
||||||
|
# Maintain dependencies for Golang
|
||||||
|
- package-ecosystem: "gomod"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
19
.github/renovate.json
vendored
19
.github/renovate.json
vendored
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": [
|
|
||||||
"config:base"
|
|
||||||
],
|
|
||||||
"packageRules": [
|
|
||||||
{
|
|
||||||
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
|
|
||||||
"automerge": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"groupName": "all deps",
|
|
||||||
"separateMajorMinor": true,
|
|
||||||
"groupSlug": "all",
|
|
||||||
"packagePatterns": [
|
|
||||||
"*"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
13
.github/stale.sh
vendored
13
.github/stale.sh
vendored
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash -ex
|
|
||||||
|
|
||||||
export PATH=$PATH:$(pwd)/bin
|
|
||||||
export GO111MODULE=on
|
|
||||||
export GOBIN=$(pwd)/bin
|
|
||||||
|
|
||||||
#go get github.com/rvflash/goup@v0.4.1
|
|
||||||
|
|
||||||
#goup -v ./...
|
|
||||||
#go get github.com/psampaz/go-mod-outdated@v0.6.0
|
|
||||||
go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
|
|
||||||
|
|
||||||
#go list -u -m -json all | go-mod-outdated -update
|
|
20
.github/workflows/autoapprove.yml
vendored
Normal file
20
.github/workflows/autoapprove.yml
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
name: "autoapprove"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
types: [assigned, opened, synchronize, reopened]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
autoapprove:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: approve
|
||||||
|
uses: hmarr/auto-approve-action@v3
|
||||||
|
if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
|
||||||
|
id: approve
|
||||||
|
with:
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
21
.github/workflows/automerge.yml
vendored
Normal file
21
.github/workflows/automerge.yml
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
name: "automerge"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
types: [assigned, opened, synchronize, reopened]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
automerge:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.actor == 'vtolstov'
|
||||||
|
steps:
|
||||||
|
- name: merge
|
||||||
|
id: merge
|
||||||
|
run: gh pr merge --auto --merge "$PR_URL"
|
||||||
|
env:
|
||||||
|
PR_URL: ${{github.event.pull_request.html_url}}
|
||||||
|
GITHUB_TOKEN: ${{secrets.TOKEN}}
|
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@@ -3,19 +3,20 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- v3
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: test
|
name: test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: setup
|
- name: setup
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v3
|
||||||
with:
|
with:
|
||||||
go-version: 1.16
|
go-version: 1.17
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: ~/go/pkg/mod
|
path: ~/go/pkg/mod
|
||||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||||
@@ -31,9 +32,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: lint
|
- name: lint
|
||||||
uses: golangci/golangci-lint-action@v2
|
uses: golangci/golangci-lint-action@v3.4.0
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
|
78
.github/workflows/codeql-analysis.yml
vendored
Normal file
78
.github/workflows/codeql-analysis.yml
vendored
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
# For most projects, this workflow file will not need changing; you simply need
|
||||||
|
# to commit it to your repository.
|
||||||
|
#
|
||||||
|
# You may wish to alter this file to override the set of languages analyzed,
|
||||||
|
# or to provide custom queries or build logic.
|
||||||
|
#
|
||||||
|
# ******** NOTE ********
|
||||||
|
# We have attempted to detect the languages in your repository. Please check
|
||||||
|
# the `language` matrix defined below to confirm you have the correct set of
|
||||||
|
# supported CodeQL languages.
|
||||||
|
#
|
||||||
|
name: "codeql"
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_run:
|
||||||
|
workflows: ["prbuild"]
|
||||||
|
types:
|
||||||
|
- completed
|
||||||
|
push:
|
||||||
|
branches: [ master, v3 ]
|
||||||
|
pull_request:
|
||||||
|
# The branches below must be a subset of the branches above
|
||||||
|
branches: [ master, v3 ]
|
||||||
|
schedule:
|
||||||
|
- cron: '34 1 * * 0'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
analyze:
|
||||||
|
name: analyze
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
contents: read
|
||||||
|
security-events: write
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
language: [ 'go' ]
|
||||||
|
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
|
||||||
|
# Learn more:
|
||||||
|
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
- name: setup
|
||||||
|
uses: actions/setup-go@v3
|
||||||
|
with:
|
||||||
|
go-version: 1.17
|
||||||
|
# Initializes the CodeQL tools for scanning.
|
||||||
|
- name: init
|
||||||
|
uses: github/codeql-action/init@v2
|
||||||
|
with:
|
||||||
|
languages: ${{ matrix.language }}
|
||||||
|
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||||
|
# By default, queries listed here will override any specified in a config file.
|
||||||
|
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||||
|
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||||
|
|
||||||
|
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||||
|
# If this step fails, then you should remove it and run the build manually (see below)
|
||||||
|
- name: autobuild
|
||||||
|
uses: github/codeql-action/autobuild@v2
|
||||||
|
|
||||||
|
# ℹ️ Command-line programs to run using the OS shell.
|
||||||
|
# 📚 https://git.io/JvXDl
|
||||||
|
|
||||||
|
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||||
|
# and modify them (or add more) to build your code if your project
|
||||||
|
# uses a compiled language
|
||||||
|
|
||||||
|
#- run: |
|
||||||
|
# make bootstrap
|
||||||
|
# make release
|
||||||
|
|
||||||
|
- name: analyze
|
||||||
|
uses: github/codeql-action/analyze@v2
|
27
.github/workflows/dependabot-automerge.yml
vendored
Normal file
27
.github/workflows/dependabot-automerge.yml
vendored
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
name: "dependabot-automerge"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
types: [assigned, opened, synchronize, reopened]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
automerge:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.actor == 'dependabot[bot]'
|
||||||
|
steps:
|
||||||
|
- name: metadata
|
||||||
|
id: metadata
|
||||||
|
uses: dependabot/fetch-metadata@v1.3.6
|
||||||
|
with:
|
||||||
|
github-token: "${{ secrets.TOKEN }}"
|
||||||
|
- name: merge
|
||||||
|
id: merge
|
||||||
|
if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
|
||||||
|
run: gh pr merge --auto --merge "$PR_URL"
|
||||||
|
env:
|
||||||
|
PR_URL: ${{github.event.pull_request.html_url}}
|
||||||
|
GITHUB_TOKEN: ${{secrets.TOKEN}}
|
13
.github/workflows/pr.yml
vendored
13
.github/workflows/pr.yml
vendored
@@ -3,19 +3,20 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- v3
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: test
|
name: test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: setup
|
- name: setup
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v3
|
||||||
with:
|
with:
|
||||||
go-version: 1.16
|
go-version: 1.17
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: ~/go/pkg/mod
|
path: ~/go/pkg/mod
|
||||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||||
@@ -31,9 +32,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: lint
|
- name: lint
|
||||||
uses: golangci/golangci-lint-action@v2
|
uses: golangci/golangci-lint-action@v3.4.0
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
|
325
go.mod
325
go.mod
@@ -1,10 +1,323 @@
|
|||||||
module github.com/unistack-org/micro-broker-nats/v3
|
module go.unistack.org/micro-broker-nats/v3
|
||||||
|
|
||||||
go 1.15
|
go 1.22
|
||||||
|
|
||||||
|
toolchain go1.23.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/nats-io/nats-server/v2 v2.1.9 // indirect
|
github.com/nats-io/nats.go v1.37.0
|
||||||
github.com/nats-io/nats.go v1.10.0
|
go.unistack.org/micro/v3 v3.10.97
|
||||||
github.com/unistack-org/micro/v3 v3.3.0
|
golang.org/x/sync v0.8.0
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
cloud.google.com/go v0.110.0 // indirect
|
||||||
|
cloud.google.com/go/accessapproval v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/accesscontextmanager v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/aiplatform v1.37.0 // indirect
|
||||||
|
cloud.google.com/go/analytics v0.19.0 // indirect
|
||||||
|
cloud.google.com/go/apigateway v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/apigeeconnect v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/apigeeregistry v0.6.0 // indirect
|
||||||
|
cloud.google.com/go/apikeys v0.6.0 // indirect
|
||||||
|
cloud.google.com/go/appengine v1.7.1 // indirect
|
||||||
|
cloud.google.com/go/area120 v0.7.1 // indirect
|
||||||
|
cloud.google.com/go/artifactregistry v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/asset v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/assuredworkloads v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/automl v1.12.0 // indirect
|
||||||
|
cloud.google.com/go/baremetalsolution v0.5.0 // indirect
|
||||||
|
cloud.google.com/go/batch v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/beyondcorp v0.5.0 // indirect
|
||||||
|
cloud.google.com/go/bigquery v1.50.0 // indirect
|
||||||
|
cloud.google.com/go/billing v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/binaryauthorization v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/certificatemanager v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/channel v1.12.0 // indirect
|
||||||
|
cloud.google.com/go/cloudbuild v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/clouddms v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/cloudtasks v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/compute v1.19.1 // indirect
|
||||||
|
cloud.google.com/go/compute/metadata v0.2.3 // indirect
|
||||||
|
cloud.google.com/go/contactcenterinsights v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/container v1.15.0 // indirect
|
||||||
|
cloud.google.com/go/containeranalysis v0.9.0 // indirect
|
||||||
|
cloud.google.com/go/datacatalog v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/dataflow v0.8.0 // indirect
|
||||||
|
cloud.google.com/go/dataform v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/datafusion v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/datalabeling v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/dataplex v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/dataproc v1.12.0 // indirect
|
||||||
|
cloud.google.com/go/dataqna v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/datastore v1.11.0 // indirect
|
||||||
|
cloud.google.com/go/datastream v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/deploy v1.8.0 // indirect
|
||||||
|
cloud.google.com/go/dialogflow v1.32.0 // indirect
|
||||||
|
cloud.google.com/go/dlp v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/documentai v1.18.0 // indirect
|
||||||
|
cloud.google.com/go/domains v0.8.0 // indirect
|
||||||
|
cloud.google.com/go/edgecontainer v1.0.0 // indirect
|
||||||
|
cloud.google.com/go/errorreporting v0.3.0 // indirect
|
||||||
|
cloud.google.com/go/essentialcontacts v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/eventarc v1.11.0 // indirect
|
||||||
|
cloud.google.com/go/filestore v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/firestore v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/functions v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/gaming v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/gkebackup v0.4.0 // indirect
|
||||||
|
cloud.google.com/go/gkeconnect v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/gkehub v0.12.0 // indirect
|
||||||
|
cloud.google.com/go/gkemulticloud v0.5.0 // indirect
|
||||||
|
cloud.google.com/go/grafeas v0.2.0 // indirect
|
||||||
|
cloud.google.com/go/gsuiteaddons v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/iam v0.13.0 // indirect
|
||||||
|
cloud.google.com/go/iap v1.7.1 // indirect
|
||||||
|
cloud.google.com/go/ids v1.3.0 // indirect
|
||||||
|
cloud.google.com/go/iot v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/kms v1.10.1 // indirect
|
||||||
|
cloud.google.com/go/language v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/lifesciences v0.8.0 // indirect
|
||||||
|
cloud.google.com/go/logging v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/longrunning v0.4.1 // indirect
|
||||||
|
cloud.google.com/go/managedidentities v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/maps v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/mediatranslation v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/memcache v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/metastore v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/monitoring v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/networkconnectivity v1.11.0 // indirect
|
||||||
|
cloud.google.com/go/networkmanagement v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/networksecurity v0.8.0 // indirect
|
||||||
|
cloud.google.com/go/notebooks v1.8.0 // indirect
|
||||||
|
cloud.google.com/go/optimization v1.3.1 // indirect
|
||||||
|
cloud.google.com/go/orchestration v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/orgpolicy v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/osconfig v1.11.0 // indirect
|
||||||
|
cloud.google.com/go/oslogin v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/phishingprotection v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/policytroubleshooter v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/privatecatalog v0.8.0 // indirect
|
||||||
|
cloud.google.com/go/pubsub v1.30.0 // indirect
|
||||||
|
cloud.google.com/go/pubsublite v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/recaptchaenterprise v1.3.1 // indirect
|
||||||
|
cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 // indirect
|
||||||
|
cloud.google.com/go/recommendationengine v0.7.0 // indirect
|
||||||
|
cloud.google.com/go/recommender v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/redis v1.11.0 // indirect
|
||||||
|
cloud.google.com/go/resourcemanager v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/resourcesettings v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/retail v1.12.0 // indirect
|
||||||
|
cloud.google.com/go/run v0.9.0 // indirect
|
||||||
|
cloud.google.com/go/scheduler v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/secretmanager v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/security v1.13.0 // indirect
|
||||||
|
cloud.google.com/go/securitycenter v1.19.0 // indirect
|
||||||
|
cloud.google.com/go/servicecontrol v1.11.1 // indirect
|
||||||
|
cloud.google.com/go/servicedirectory v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/servicemanagement v1.8.0 // indirect
|
||||||
|
cloud.google.com/go/serviceusage v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/shell v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/spanner v1.45.0 // indirect
|
||||||
|
cloud.google.com/go/speech v1.15.0 // indirect
|
||||||
|
cloud.google.com/go/storage v1.29.0 // indirect
|
||||||
|
cloud.google.com/go/storagetransfer v1.8.0 // indirect
|
||||||
|
cloud.google.com/go/talent v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/texttospeech v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/tpu v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/trace v1.9.0 // indirect
|
||||||
|
cloud.google.com/go/translate v1.7.0 // indirect
|
||||||
|
cloud.google.com/go/video v1.15.0 // indirect
|
||||||
|
cloud.google.com/go/videointelligence v1.10.0 // indirect
|
||||||
|
cloud.google.com/go/vision v1.2.0 // indirect
|
||||||
|
cloud.google.com/go/vision/v2 v2.7.0 // indirect
|
||||||
|
cloud.google.com/go/vmmigration v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/vmwareengine v0.3.0 // indirect
|
||||||
|
cloud.google.com/go/vpcaccess v1.6.0 // indirect
|
||||||
|
cloud.google.com/go/webrisk v1.8.0 // indirect
|
||||||
|
cloud.google.com/go/websecurityscanner v1.5.0 // indirect
|
||||||
|
cloud.google.com/go/workflows v1.10.0 // indirect
|
||||||
|
dario.cat/mergo v1.0.0 // indirect
|
||||||
|
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 // indirect
|
||||||
|
gioui.org v0.0.0-20210308172011-57750fc8a0a6 // indirect
|
||||||
|
git.sr.ht/~sbinet/gg v0.3.1 // indirect
|
||||||
|
github.com/BurntSushi/toml v0.3.1 // indirect
|
||||||
|
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
|
||||||
|
github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
|
||||||
|
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
|
||||||
|
github.com/KimMachineGun/automemlimit v0.6.1 // indirect
|
||||||
|
github.com/OneOfOne/xxhash v1.2.2 // indirect
|
||||||
|
github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 // indirect
|
||||||
|
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 // indirect
|
||||||
|
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
|
||||||
|
github.com/andybalholm/brotli v1.0.4 // indirect
|
||||||
|
github.com/antihax/optional v1.0.0 // indirect
|
||||||
|
github.com/apache/arrow/go/v10 v10.0.1 // indirect
|
||||||
|
github.com/apache/arrow/go/v11 v11.0.0 // indirect
|
||||||
|
github.com/apache/thrift v0.16.0 // indirect
|
||||||
|
github.com/boombuler/barcode v1.0.1 // indirect
|
||||||
|
github.com/buger/jsonparser v1.1.1 // indirect
|
||||||
|
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
|
||||||
|
github.com/cespare/xxhash v1.1.0 // indirect
|
||||||
|
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||||
|
github.com/chzyer/logex v1.1.10 // indirect
|
||||||
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
|
||||||
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
|
||||||
|
github.com/cilium/ebpf v0.9.1 // indirect
|
||||||
|
github.com/client9/misspell v0.3.4 // indirect
|
||||||
|
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
|
||||||
|
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
|
||||||
|
github.com/containerd/cgroups/v3 v3.0.1 // indirect
|
||||||
|
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
|
||||||
|
github.com/creack/pty v1.1.9 // indirect
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/docker/go-units v0.4.0 // indirect
|
||||||
|
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 // indirect
|
||||||
|
github.com/dustin/go-humanize v1.0.0 // indirect
|
||||||
|
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
|
||||||
|
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
|
||||||
|
github.com/flowstack/go-jsonschema v0.1.1 // indirect
|
||||||
|
github.com/fogleman/gg v1.3.0 // indirect
|
||||||
|
github.com/frankban/quicktest v1.14.0 // indirect
|
||||||
|
github.com/ghodss/yaml v1.0.0 // indirect
|
||||||
|
github.com/go-fonts/dejavu v0.1.0 // indirect
|
||||||
|
github.com/go-fonts/latin-modern v0.2.0 // indirect
|
||||||
|
github.com/go-fonts/liberation v0.2.0 // indirect
|
||||||
|
github.com/go-fonts/stix v0.1.0 // indirect
|
||||||
|
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 // indirect
|
||||||
|
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
|
||||||
|
github.com/go-pdf/fpdf v0.6.0 // indirect
|
||||||
|
github.com/goccy/go-json v0.9.11 // indirect
|
||||||
|
github.com/godbus/dbus/v5 v5.0.4 // indirect
|
||||||
|
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
|
||||||
|
github.com/golang/glog v1.1.0 // indirect
|
||||||
|
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
|
||||||
|
github.com/golang/mock v1.6.0 // indirect
|
||||||
|
github.com/golang/protobuf v1.5.3 // indirect
|
||||||
|
github.com/golang/snappy v0.0.4 // indirect
|
||||||
|
github.com/google/btree v1.0.0 // indirect
|
||||||
|
github.com/google/flatbuffers v2.0.8+incompatible // indirect
|
||||||
|
github.com/google/gnostic v0.6.9 // indirect
|
||||||
|
github.com/google/go-cmp v0.6.0 // indirect
|
||||||
|
github.com/google/martian v2.1.0+incompatible // indirect
|
||||||
|
github.com/google/martian/v3 v3.3.2 // indirect
|
||||||
|
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
|
||||||
|
github.com/google/renameio v0.1.0 // indirect
|
||||||
|
github.com/google/uuid v1.3.0 // indirect
|
||||||
|
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
|
||||||
|
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
|
||||||
|
github.com/googleapis/go-type-adapters v1.0.0 // indirect
|
||||||
|
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 // indirect
|
||||||
|
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
|
||||||
|
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
|
||||||
|
github.com/hashicorp/golang-lru v0.5.1 // indirect
|
||||||
|
github.com/iancoleman/strcase v0.2.0 // indirect
|
||||||
|
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect
|
||||||
|
github.com/imdario/mergo v0.3.13 // indirect
|
||||||
|
github.com/jstemmer/go-junit-report v0.9.1 // indirect
|
||||||
|
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 // indirect
|
||||||
|
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
||||||
|
github.com/kisielk/gotool v1.0.0 // indirect
|
||||||
|
github.com/klauspost/asmfmt v1.3.2 // indirect
|
||||||
|
github.com/klauspost/compress v1.17.11 // indirect
|
||||||
|
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
|
||||||
|
github.com/kr/fs v0.1.0 // indirect
|
||||||
|
github.com/kr/pretty v0.3.0 // indirect
|
||||||
|
github.com/kr/pty v1.1.1 // indirect
|
||||||
|
github.com/kr/text v0.2.0 // indirect
|
||||||
|
github.com/lyft/protoc-gen-star v0.6.1 // indirect
|
||||||
|
github.com/lyft/protoc-gen-star/v2 v2.0.1 // indirect
|
||||||
|
github.com/mattn/go-isatty v0.0.16 // indirect
|
||||||
|
github.com/mattn/go-sqlite3 v1.14.14 // indirect
|
||||||
|
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
|
||||||
|
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
|
||||||
|
github.com/minio/highwayhash v1.0.2 // indirect
|
||||||
|
github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 // indirect
|
||||||
|
github.com/nats-io/nats-server/v2 v2.7.4 // indirect
|
||||||
|
github.com/nats-io/nkeys v0.4.7 // indirect
|
||||||
|
github.com/nats-io/nuid v1.0.1 // indirect
|
||||||
|
github.com/opencontainers/runtime-spec v1.0.2 // indirect
|
||||||
|
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
|
||||||
|
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
|
||||||
|
github.com/phpdave11/gofpdf v1.4.2 // indirect
|
||||||
|
github.com/phpdave11/gofpdi v1.0.13 // indirect
|
||||||
|
github.com/pierrec/lz4/v4 v4.1.15 // indirect
|
||||||
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
|
||||||
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
|
github.com/pkg/sftp v1.13.1 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/prashantv/gostub v1.1.0 // indirect
|
||||||
|
github.com/prometheus/client_model v0.3.0 // indirect
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
|
||||||
|
github.com/rogpeppe/fastuuid v1.2.0 // indirect
|
||||||
|
github.com/rogpeppe/go-internal v1.9.0 // indirect
|
||||||
|
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 // indirect
|
||||||
|
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 // indirect
|
||||||
|
github.com/sirupsen/logrus v1.8.1 // indirect
|
||||||
|
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
|
||||||
|
github.com/spf13/afero v1.9.2 // indirect
|
||||||
|
github.com/stoewer/go-strcase v1.2.0 // indirect
|
||||||
|
github.com/stretchr/objx v0.5.0 // indirect
|
||||||
|
github.com/stretchr/testify v1.8.3 // indirect
|
||||||
|
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
|
||||||
|
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
||||||
|
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
||||||
|
github.com/yuin/goldmark v1.4.13 // indirect
|
||||||
|
github.com/zeebo/assert v1.3.0 // indirect
|
||||||
|
github.com/zeebo/xxh3 v1.0.2 // indirect
|
||||||
|
go.opencensus.io v0.24.0 // indirect
|
||||||
|
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
|
||||||
|
go.uber.org/automaxprocs v1.6.0 // indirect
|
||||||
|
go.uber.org/goleak v1.1.12 // indirect
|
||||||
|
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
|
||||||
|
golang.org/x/crypto v0.28.0 // indirect
|
||||||
|
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
|
||||||
|
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
|
||||||
|
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
|
||||||
|
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
|
||||||
|
golang.org/x/mod v0.17.0 // indirect
|
||||||
|
golang.org/x/net v0.25.0 // indirect
|
||||||
|
golang.org/x/oauth2 v0.7.0 // indirect
|
||||||
|
golang.org/x/sys v0.26.0 // indirect
|
||||||
|
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 // indirect
|
||||||
|
golang.org/x/term v0.25.0 // indirect
|
||||||
|
golang.org/x/text v0.19.0 // indirect
|
||||||
|
golang.org/x/time v0.3.0 // indirect
|
||||||
|
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
|
||||||
|
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
|
||||||
|
gonum.org/v1/gonum v0.11.0 // indirect
|
||||||
|
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 // indirect
|
||||||
|
gonum.org/v1/plot v0.10.1 // indirect
|
||||||
|
google.golang.org/api v0.114.0 // indirect
|
||||||
|
google.golang.org/appengine v1.6.7 // indirect
|
||||||
|
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
|
||||||
|
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
|
||||||
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
|
||||||
|
google.golang.org/grpc v1.57.0 // indirect
|
||||||
|
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
|
||||||
|
google.golang.org/protobuf v1.35.1 // indirect
|
||||||
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||||
|
gopkg.in/errgo.v2 v2.1.0 // indirect
|
||||||
|
gopkg.in/yaml.v2 v2.2.3 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
honnef.co/go/tools v0.1.3 // indirect
|
||||||
|
lukechampine.com/uint128 v1.2.0 // indirect
|
||||||
|
modernc.org/cc/v3 v3.36.3 // indirect
|
||||||
|
modernc.org/ccgo/v3 v3.16.9 // indirect
|
||||||
|
modernc.org/ccorpus v1.11.6 // indirect
|
||||||
|
modernc.org/httpfs v1.0.6 // indirect
|
||||||
|
modernc.org/libc v1.17.1 // indirect
|
||||||
|
modernc.org/mathutil v1.5.0 // indirect
|
||||||
|
modernc.org/memory v1.2.1 // indirect
|
||||||
|
modernc.org/opt v0.1.3 // indirect
|
||||||
|
modernc.org/sqlite v1.18.1 // indirect
|
||||||
|
modernc.org/strutil v1.1.3 // indirect
|
||||||
|
modernc.org/tcl v1.13.1 // indirect
|
||||||
|
modernc.org/token v1.0.0 // indirect
|
||||||
|
modernc.org/z v1.5.1 // indirect
|
||||||
|
rsc.io/binaryregexp v0.2.0 // indirect
|
||||||
|
rsc.io/pdf v0.1.1 // indirect
|
||||||
|
rsc.io/quote/v3 v3.1.0 // indirect
|
||||||
|
rsc.io/sampler v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
207
nats.go
207
nats.go
@@ -9,10 +9,18 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
nats "github.com/nats-io/nats.go"
|
nats "github.com/nats-io/nats.go"
|
||||||
"github.com/unistack-org/micro/v3/broker"
|
"go.unistack.org/micro/v3/broker"
|
||||||
"github.com/unistack-org/micro/v3/logger"
|
"go.unistack.org/micro/v3/logger"
|
||||||
|
"go.unistack.org/micro/v3/metadata"
|
||||||
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var pPool = sync.Pool{
|
||||||
|
New: func() interface{} {
|
||||||
|
return &publication{msg: broker.NewMessage("")}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
type natsBroker struct {
|
type natsBroker struct {
|
||||||
sync.Once
|
sync.Once
|
||||||
sync.RWMutex
|
sync.RWMutex
|
||||||
@@ -31,17 +39,18 @@ type natsBroker struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type publication struct {
|
type publication struct {
|
||||||
t string
|
topic string
|
||||||
err error
|
err error
|
||||||
m *broker.Message
|
msg *broker.Message
|
||||||
|
ctx context.Context
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *publication) Topic() string {
|
func (p *publication) Topic() string {
|
||||||
return p.t
|
return p.topic
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *publication) Message() *broker.Message {
|
func (p *publication) Message() *broker.Message {
|
||||||
return p.m
|
return p.msg
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *publication) Ack() error {
|
func (p *publication) Ack() error {
|
||||||
@@ -49,10 +58,18 @@ func (p *publication) Ack() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *publication) SetError(err error) {
|
||||||
|
p.err = err
|
||||||
|
}
|
||||||
|
|
||||||
func (p *publication) Error() error {
|
func (p *publication) Error() error {
|
||||||
return p.err
|
return p.err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *publication) Context() context.Context {
|
||||||
|
return p.ctx
|
||||||
|
}
|
||||||
|
|
||||||
type subscriber struct {
|
type subscriber struct {
|
||||||
s *nats.Subscription
|
s *nats.Subscription
|
||||||
opts broker.SubscribeOptions
|
opts broker.SubscribeOptions
|
||||||
@@ -75,11 +92,7 @@ func (n *natsBroker) Address() string {
|
|||||||
return n.conn.ConnectedUrl()
|
return n.conn.ConnectedUrl()
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(n.addrs) > 0 {
|
return strings.Join(n.addrs, ",")
|
||||||
return n.addrs[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) setAddrs(addrs []string) []string {
|
func (n *natsBroker) setAddrs(addrs []string) []string {
|
||||||
@@ -101,13 +114,15 @@ func (n *natsBroker) setAddrs(addrs []string) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) Connect(ctx context.Context) error {
|
func (n *natsBroker) Connect(ctx context.Context) error {
|
||||||
n.Lock()
|
n.RLock()
|
||||||
defer n.Unlock()
|
|
||||||
|
|
||||||
if n.connected {
|
if n.connected {
|
||||||
|
n.RUnlock()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
n.RUnlock()
|
||||||
|
|
||||||
|
n.Lock()
|
||||||
|
defer n.Unlock()
|
||||||
status := nats.CLOSED
|
status := nats.CLOSED
|
||||||
if n.conn != nil {
|
if n.conn != nil {
|
||||||
status = n.conn.Status()
|
status = n.conn.Status()
|
||||||
@@ -125,7 +140,7 @@ func (n *natsBroker) Connect(ctx context.Context) error {
|
|||||||
c, err := opts.Connect()
|
c, err := opts.Connect()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if n.opts.Logger.V(logger.WarnLevel) {
|
if n.opts.Logger.V(logger.WarnLevel) {
|
||||||
n.opts.Logger.Warnf(n.opts.Context, "Error connecting to broker: %v", err)
|
n.opts.Logger.Error(n.opts.Context, "error connecting to broker", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return err
|
return err
|
||||||
@@ -137,12 +152,20 @@ func (n *natsBroker) Connect(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) Disconnect(ctx context.Context) error {
|
func (n *natsBroker) Disconnect(ctx context.Context) error {
|
||||||
|
n.RLock()
|
||||||
|
if !n.connected {
|
||||||
|
n.RUnlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
n.RUnlock()
|
||||||
|
|
||||||
n.Lock()
|
n.Lock()
|
||||||
defer n.Unlock()
|
defer n.Unlock()
|
||||||
|
|
||||||
// drain the connection if specified
|
// drain the connection if specified
|
||||||
if n.drain {
|
if n.drain {
|
||||||
n.conn.Drain()
|
if err := n.conn.Drain(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
n.closeCh <- nil
|
n.closeCh <- nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,19 +207,87 @@ func (n *natsBroker) Options() broker.Options {
|
|||||||
return n.opts
|
return n.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
|
func (n *natsBroker) BatchPublish(ctx context.Context, p []*broker.Message, opts ...broker.PublishOption) error {
|
||||||
|
var err error
|
||||||
|
msgs := make([]*nats.Msg, 0, len(p))
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
wg.Add(len(p))
|
||||||
|
|
||||||
|
options := broker.NewPublishOptions(opts...)
|
||||||
|
|
||||||
|
for _, m := range p {
|
||||||
|
rec := &nats.Msg{}
|
||||||
|
rec.Subject, _ = m.Header.Get(metadata.HeaderTopic)
|
||||||
|
if options.BodyOnly {
|
||||||
|
rec.Data = m.Body
|
||||||
|
} else if n.opts.Codec.String() == "noop" {
|
||||||
|
rec.Data = m.Body
|
||||||
|
rec.Header = make(nats.Header, len(m.Header))
|
||||||
|
for k, v := range m.Header {
|
||||||
|
rec.Header.Add(k, v)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rec.Data, err = n.opts.Codec.Marshal(m)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
msgs = append(msgs, rec)
|
||||||
|
}
|
||||||
|
|
||||||
n.RLock()
|
n.RLock()
|
||||||
defer n.RUnlock()
|
defer n.RUnlock()
|
||||||
|
|
||||||
if n.conn == nil {
|
g := errgroup.Group{}
|
||||||
return errors.New("not connected")
|
|
||||||
|
for _, ms := range msgs {
|
||||||
|
m := ms
|
||||||
|
g.Go(func() error {
|
||||||
|
return n.conn.PublishMsg(m)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := n.opts.Codec.Marshal(msg)
|
return g.Wait()
|
||||||
if err != nil {
|
}
|
||||||
return err
|
|
||||||
|
func (n *natsBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
|
||||||
|
var err error
|
||||||
|
|
||||||
|
n.RLock()
|
||||||
|
if n.conn == nil {
|
||||||
|
n.RUnlock()
|
||||||
|
return errors.New("not connected")
|
||||||
}
|
}
|
||||||
return n.conn.Publish(topic, b)
|
n.RUnlock()
|
||||||
|
|
||||||
|
options := broker.NewPublishOptions(opts...)
|
||||||
|
|
||||||
|
rec := &nats.Msg{}
|
||||||
|
rec.Subject, _ = msg.Header.Get(metadata.HeaderTopic)
|
||||||
|
if options.BodyOnly {
|
||||||
|
rec.Data = msg.Body
|
||||||
|
} else if n.opts.Codec.String() == "noop" {
|
||||||
|
rec.Data = msg.Body
|
||||||
|
rec.Header = make(nats.Header, len(msg.Header))
|
||||||
|
for k, v := range msg.Header {
|
||||||
|
rec.Header.Add(k, v)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rec.Data, err = n.opts.Codec.Marshal(msg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
n.RLock()
|
||||||
|
defer n.RUnlock()
|
||||||
|
|
||||||
|
return n.conn.PublishMsg(rec)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *natsBroker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
|
||||||
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
|
func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
|
||||||
@@ -207,29 +298,43 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
|
|||||||
}
|
}
|
||||||
n.RUnlock()
|
n.RUnlock()
|
||||||
|
|
||||||
opt := broker.NewSubscribeOptions(opts...)
|
options := broker.NewSubscribeOptions(opts...)
|
||||||
|
|
||||||
|
eh := n.opts.ErrorHandler
|
||||||
|
if options.ErrorHandler != nil {
|
||||||
|
eh = options.ErrorHandler
|
||||||
|
}
|
||||||
|
|
||||||
fn := func(msg *nats.Msg) {
|
fn := func(msg *nats.Msg) {
|
||||||
m := &broker.Message{}
|
pub := pPool.Get().(*publication)
|
||||||
pub := &publication{t: msg.Subject}
|
pub.msg.Header = nil
|
||||||
|
pub.msg.Body = nil
|
||||||
|
pub.topic = msg.Subject
|
||||||
|
pub.err = nil
|
||||||
|
pub.ctx = ctx
|
||||||
|
|
||||||
eh := n.opts.ErrorHandler
|
if options.BodyOnly {
|
||||||
if opt.ErrorHandler != nil {
|
pub.msg.Body = msg.Data
|
||||||
eh = opt.ErrorHandler
|
} else if n.opts.Codec.String() == "noop" {
|
||||||
}
|
pub.msg.Body = msg.Data
|
||||||
err := n.opts.Codec.Unmarshal(msg.Data, &m)
|
pub.msg.Header = metadata.New(len(msg.Header))
|
||||||
pub.err = err
|
for k, v := range msg.Header {
|
||||||
pub.m = m
|
pub.msg.Header.Set(k, strings.Join(v, ","))
|
||||||
if err != nil {
|
}
|
||||||
pub.m.Body = msg.Data
|
} else {
|
||||||
if eh != nil {
|
err := n.opts.Codec.Unmarshal(msg.Data, pub.msg)
|
||||||
eh(pub)
|
pub.err = err
|
||||||
} else {
|
if err != nil {
|
||||||
if n.opts.Logger.V(logger.ErrorLevel) {
|
pub.msg.Body = msg.Data
|
||||||
n.opts.Logger.Error(n.opts.Context, err)
|
if eh != nil {
|
||||||
}
|
eh(pub)
|
||||||
|
} else {
|
||||||
|
if n.opts.Logger.V(logger.ErrorLevel) {
|
||||||
|
n.opts.Logger.Error(n.opts.Context, "handler error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
return
|
|
||||||
}
|
}
|
||||||
if err := handler(pub); err != nil {
|
if err := handler(pub); err != nil {
|
||||||
pub.err = err
|
pub.err = err
|
||||||
@@ -237,7 +342,7 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
|
|||||||
eh(pub)
|
eh(pub)
|
||||||
} else {
|
} else {
|
||||||
if n.opts.Logger.V(logger.ErrorLevel) {
|
if n.opts.Logger.V(logger.ErrorLevel) {
|
||||||
n.opts.Logger.Error(n.opts.Context, err)
|
n.opts.Logger.Error(n.opts.Context, "handler error", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -247,8 +352,8 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
|
|||||||
var err error
|
var err error
|
||||||
|
|
||||||
n.RLock()
|
n.RLock()
|
||||||
if len(opt.Group) > 0 {
|
if len(options.Group) > 0 {
|
||||||
sub, err = n.conn.QueueSubscribe(topic, opt.Group, fn)
|
sub, err = n.conn.QueueSubscribe(topic, options.Group, fn)
|
||||||
} else {
|
} else {
|
||||||
sub, err = n.conn.Subscribe(topic, fn)
|
sub, err = n.conn.Subscribe(topic, fn)
|
||||||
}
|
}
|
||||||
@@ -256,7 +361,7 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &subscriber{s: sub, opts: opt}, nil
|
return &subscriber{s: sub, opts: options}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *natsBroker) String() string {
|
func (n *natsBroker) String() string {
|
||||||
@@ -317,9 +422,13 @@ func (n *natsBroker) onDisconnectedError(conn *nats.Conn, err error) {
|
|||||||
n.closeCh <- err
|
n.closeCh <- err
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewBroker(opts ...broker.Option) broker.Broker {
|
func NewBroker(opts ...broker.Option) *natsBroker {
|
||||||
options := broker.NewOptions(opts...)
|
options := broker.NewOptions(opts...)
|
||||||
|
|
||||||
|
if options.Codec.String() != "noop" {
|
||||||
|
options.Logger.Info(options.Context, "broker codec not noop, disable plain nats headers usage")
|
||||||
|
}
|
||||||
|
|
||||||
n := &natsBroker{
|
n := &natsBroker{
|
||||||
opts: options,
|
opts: options,
|
||||||
}
|
}
|
||||||
|
@@ -5,7 +5,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
nats "github.com/nats-io/nats.go"
|
nats "github.com/nats-io/nats.go"
|
||||||
"github.com/unistack-org/micro/v3/broker"
|
"go.unistack.org/micro/v3/broker"
|
||||||
)
|
)
|
||||||
|
|
||||||
var addrTestCases = []struct {
|
var addrTestCases = []struct {
|
||||||
|
@@ -2,7 +2,7 @@ package nats
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
nats "github.com/nats-io/nats.go"
|
nats "github.com/nats-io/nats.go"
|
||||||
"github.com/unistack-org/micro/v3/broker"
|
"go.unistack.org/micro/v3/broker"
|
||||||
)
|
)
|
||||||
|
|
||||||
type optionsKey struct{}
|
type optionsKey struct{}
|
||||||
|
Reference in New Issue
Block a user