Skip to content

Commit 66ec264

Browse files
MClarkDevMClarkDev
committed
Merging v2.5
https://git.mclarkdev.com/BarcodeAPI.org/server/pulls/17
2 parents b8913e3 + e972ffa commit 66ec264

File tree

121 files changed

+2781
-1014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+2781
-1014
lines changed

‎.env‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
# Override default log directory (logs)
2-
#LOG_DIR=logs
3-
41
# Override default log name (server)
52
#LOG_NAME=server
63

7-
# Enable debug logging
8-
#LOG_DEBUG=on
9-
10-
# Set GELF application name
11-
LOG_GELF_APP=BarcodeAPI
12-
13-
# Set GELF log server
14-
#LOG_GELF_SERVER=
4+
# List of log streams
5+
LOG_STREAMS=console:/;file:/

‎config/apptest/admins.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"admin": "5E884898DA28047151D0E56F8DC6292773603D0D6AABBDD62A11EF721D1542D8"
3+
}

‎config/apptest/app.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"types": [
3+
"UPC_E",
4+
"UPC_A",
5+
"EAN8",
6+
"EAN13",
7+
"CODABAR",
8+
"ITF14",
9+
"Code39",
10+
"Code128",
11+
"Aztec",
12+
"QRCode",
13+
"DataMatrix",
14+
"PDF417",
15+
"USPSMail",
16+
"RoyalMail",
17+
"AprilTag"
18+
],
19+
"tasks": [],
20+
"cache": {
21+
"_snapshots": "./cache/",
22+
"barcode": {
23+
"life": 10080,
24+
"shortLife": 240
25+
},
26+
"session": {
27+
"life": 20160,
28+
"shortLife": 60
29+
},
30+
"limiter": {
31+
"life": 4320,
32+
"shortLife": 360
33+
},
34+
"share": {
35+
"life": 129600,
36+
"shortLife": 360
37+
}
38+
},
39+
"client": {
40+
"cacheStatic": 1440,
41+
"cacheBarcode": 1440
42+
}
43+
}
44+

‎config/apptest/blacklist.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"blacklist": [
3+
"^_tstblk_$"
4+
]
5+
}

‎config/apptest/plans.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"free": {
3+
"limit": 1000,
4+
"enforce": true,
5+
"batch": 25,
6+
"description": "System Test: Up to 1,000 tokens per day.",
7+
"support": "Not safe for Humans."
8+
},
9+
"paid": [
10+
{
11+
"name": "AppTest Subscribers",
12+
"description": "System Test: More tokens for paying users.",
13+
"support": "Application is provided as-is.",
14+
"price": [
15+
{
16+
"name": "$10/mo",
17+
"link": false
18+
},
19+
{
20+
"name": "$100/yr",
21+
"link": false
22+
}
23+
]
24+
}
25+
]
26+
}
27+

‎config/apptest/subscribers.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"subscribers": [
3+
{
4+
"customer": "AppTest",
5+
"subscribed": 1735693200000,
6+
"active": true,
7+
"enforce": true,
8+
"limit": 1000,
9+
"batch": 100,
10+
"ips": [],
11+
"keys": [
12+
"appTest"
13+
]
14+
},
15+
{
16+
"customer": "BarcodeAPI.org",
17+
"subscribed": 1735693200000,
18+
"active": true,
19+
"enforce": false,
20+
"limit": -1,
21+
"batch": 500,
22+
"ips": [
23+
"127.0.0.1"
24+
],
25+
"keys": []
26+
}
27+
]
28+
}

‎config/community/admins.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"admin": "changeme"
3+
}

config/app.json renamed to config/community/app.json

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"DataMatrix",
1414
"PDF417",
1515
"USPSMail",
16-
"RoyalMail"
16+
"RoyalMail",
17+
"AprilTag"
1718
],
1819
"tasks": [
1920
{
@@ -44,7 +45,7 @@
4445
{
4546
"name": "Limiter Minting",
4647
"impl": ".LimiterMintingTask",
47-
"interval": 60
48+
"interval": 600
4849
},
4950
{
5051
"name": "Share Cleanup",
@@ -71,50 +72,8 @@
7172
"shortLife": 360
7273
}
7374
},
74-
"limits": {
75-
"enforce": false,
76-
"default": 10000
77-
},
78-
"blacklist": [
79-
"^_tstblk_$"
80-
],
8175
"client": {
8276
"cacheStatic": 1440,
8377
"cacheBarcode": 1440
84-
},
85-
"plans": [
86-
{
87-
"name": "Pro Tier",
88-
"description": "Starting at 25,000 tokens per day.",
89-
"support": "Basic technical support.",
90-
"price": [
91-
{
92-
"name": "$15/mo",
93-
"link": false
94-
},
95-
{
96-
"name": "$150/yr",
97-
"link": false
98-
}
99-
]
100-
},
101-
{
102-
"name": "Enterprise",
103-
"description": "Starting at 125,000 tokens per day.",
104-
"support": "Priority support, 24/7.",
105-
"price": [
106-
{
107-
"name": "$75/mo",
108-
"link": false
109-
},
110-
{
111-
"name": "$750/yr",
112-
"link": false
113-
}
114-
]
115-
}
116-
],
117-
"logins": {
118-
"admin": "5E884898DA28047151D0E56F8DC6292773603D0D6AABBDD62A11EF721D1542D8"
11978
}
120-
}
79+
}

‎config/community/blacklist.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"blacklist": [
3+
]
4+
}

‎config/community/plans.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"free": {
3+
"limit": -1,
4+
"enforce": false,
5+
"batch": 5000,
6+
"description": "Self hosted community server.",
7+
"support": "Contact server admin for details."
8+
},
9+
"paid": []
10+
}

0 commit comments

Comments
 (0)