Fixing token spend, embed base64 in html response, subscribers by app, and more.

MClarkDev · MClarkDev · commit 45bbee6c5320 · 2025-11-14T12:31:59.000-05:00
diff --git a/config/apptest/subscribers.json b/config/apptest/subscribers.json
@@ -10,7 +10,8 @@
 			"ips": [],
 			"keys": [
 				"appTest"
-			]
+			],
+			"apps": []
 		},
 		{
 			"customer": "BarcodeAPI.org",
@@ -22,7 +23,8 @@
 			"ips": [
 				"127.0.0.1"
 			],
-			"keys": []
+			"keys": [],
+			"apps": []
 		}
 	]
-}
+}
diff --git a/config/types/AprilTag.json b/config/types/AprilTag.json
@@ -18,7 +18,8 @@
 	"checkdigit": 0,
 	"nonprinting": false,
 	"example": [
-		"tag36h11:0"
+		"tag36h11:0",
+		"tag16h5:0"
 	],
 	"pattern": {
 		"auto": "^tag.*:[0-9]{1,5}$",
diff --git a/config/types/EAN13.json b/config/types/EAN13.json
@@ -19,7 +19,8 @@
 	"checkdigit": 13,
 	"nonprinting": false,
 	"example": [
-		"1234567890128"
+		"1234567890128",
+		"1123332122321+11252"
 	],
 	"pattern": {
 		"auto": "^[0-9]{13}$",
diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>com.mclarkdev.tools</groupId>
 			<artifactId>liblog</artifactId>
-			<version>1.6.6</version>
+			<version>1.6.7</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/org/barcodeapi/server/admin/CacheDumpHandler.java b/src/main/java/org/barcodeapi/server/admin/CacheDumpHandler.java
@@ -53,7 +53,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.setHeader("Content-Disposition", "attachment, filename=cache.json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("code", 200)//
diff --git a/src/main/java/org/barcodeapi/server/admin/CacheFlushHandler.java b/src/main/java/org/barcodeapi/server/admin/CacheFlushHandler.java
@@ -36,7 +36,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("code", 200)//
 				.put("message", "caches flushed")//
diff --git a/src/main/java/org/barcodeapi/server/admin/LimiterFlushHandler.java b/src/main/java/org/barcodeapi/server/admin/LimiterFlushHandler.java
@@ -32,7 +32,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 			// Print failure to client
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject()//
 					.put("code", 400)//
 					.put("message", "limiter not found")//
@@ -42,7 +42,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("code", 200)//
 				.put("message", "limiter flushed")//
diff --git a/src/main/java/org/barcodeapi/server/admin/LimiterListHandler.java b/src/main/java/org/barcodeapi/server/admin/LimiterListHandler.java
@@ -37,7 +37,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("limiters", byKey)//
 		).toString());
diff --git a/src/main/java/org/barcodeapi/server/admin/ServerStatsHandler.java b/src/main/java/org/barcodeapi/server/admin/ServerStatsHandler.java
@@ -34,7 +34,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(stats.toString());
 	}
 }
diff --git a/src/main/java/org/barcodeapi/server/admin/SessionFlushHandler.java b/src/main/java/org/barcodeapi/server/admin/SessionFlushHandler.java
@@ -30,7 +30,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("message", "sessions flushed")//
 				.put("count", count)//
diff --git a/src/main/java/org/barcodeapi/server/admin/SessionListHandler.java b/src/main/java/org/barcodeapi/server/admin/SessionListHandler.java
@@ -34,7 +34,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("sessions", sessions)//
 				.put("count", sessions.length())//
diff --git a/src/main/java/org/barcodeapi/server/admin/ShareListHandler.java b/src/main/java/org/barcodeapi/server/admin/ShareListHandler.java
@@ -34,7 +34,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("shares", shares)//
 				.put("count", shares.length())//
diff --git a/src/main/java/org/barcodeapi/server/admin/SubscriberReloadHandler.java b/src/main/java/org/barcodeapi/server/admin/SubscriberReloadHandler.java
@@ -29,7 +29,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println((new JSONObject()//
 				.put("code", 200)//
 				.put("message", "users reloaded")//
diff --git a/src/main/java/org/barcodeapi/server/api/BarcodeAPIHandler.java b/src/main/java/org/barcodeapi/server/api/BarcodeAPIHandler.java
@@ -83,7 +83,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 
 				case JSON:
 					// Output as JSON encoded (base64)
-					format = formatRequested;
+					format = Format.JSON;
 					bytes = barcode.encodeJSON().getBytes();
 					break;
 
@@ -121,8 +121,10 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 
 		} catch (GenerationException e) {
 
-			// Log the generation failure
-			LibLog._clogF("E6009", c.getUri(), e.getMessage());
+			// Log the generation failure (if not empty)
+			if (!(e.getExceptionType() == ExceptionType.EMPTY)) {
+				LibLog._clogF("E6009", c.getUri(), e.getMessage());
+			}
 
 			// Set status headers for failure
 			r.setStatus(e.getExceptionType().getStatusCode());
@@ -133,8 +135,10 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 
 			// Replace barcode with failure barcode
 			barcode = e.getExceptionType().getBarcodeImage();
-			bytes = barcode.getBarcodeData();
+
+			// Assign output fields
 			format = Format.PNG;
+			bytes = barcode.getBarcodeData();
 		} catch (Exception | Error e) {
 
 			LibLog._log("Unhandled exception!", e);
@@ -146,8 +150,9 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 		r.setHeader("X-RateLimit-Tokens", limiter.getTokenCountStr());
 
 		// Add content headers type and length
-		r.setHeader("Content-Type", format.getMime());
-		r.setHeader("Content-Length", Long.toString(bytes.length));
+		r.setContentType(format.getMime());
+		r.setHeader("Content-Length", //
+				Long.toString(bytes.length));
 
 		// Add the barcode type and detail headers
 		r.setHeader("X-Barcode-Type", barcode.getBarcodeType().getName());
diff --git a/src/main/java/org/barcodeapi/server/api/BulkHandler.java b/src/main/java/org/barcodeapi/server/api/BulkHandler.java
@@ -102,7 +102,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws Servlet
 			}
 
 			// Response headers for file download
-			r.setHeader("Content-Type", "application/zip");
+			r.setContentType("application/zip");
 			r.setHeader("Content-Disposition", "filename=barcodes.zip");
 
 			// Advise current token spend and count
@@ -119,7 +119,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws Servlet
 
 			// Print error to client
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 400)//
 					.put("message", "failed to process bulk request")//
@@ -129,7 +129,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws Servlet
 
 			// Print unknown failure to client
 			r.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 500)//
 					.put("message", "unknown error")//
diff --git a/src/main/java/org/barcodeapi/server/api/DecodeHandler.java b/src/main/java/org/barcodeapi/server/api/DecodeHandler.java
@@ -116,7 +116,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 			// Send response to client
 			r.setStatus(HttpServletResponse.SC_OK);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 200)//
 					.put("text", text)//
@@ -127,7 +127,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 			// Send error to client
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 400)//
 					.put("message", "no barcode found")//
@@ -136,7 +136,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 			// Send error to client
 			r.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 500)//
 					.put("text", "decode failed")//
diff --git a/src/main/java/org/barcodeapi/server/api/InfoHandler.java b/src/main/java/org/barcodeapi/server/api/InfoHandler.java
@@ -27,7 +27,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");	
 		r.getOutputStream().println((new JSONObject()//
 				.put("uptime", ServerRuntime.getTimeRunning())//
 				.put("hostname", ServerRuntime.getHostname())//
diff --git a/src/main/java/org/barcodeapi/server/api/LimiterHandler.java b/src/main/java/org/barcodeapi/server/api/LimiterHandler.java
@@ -24,7 +24,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(//
 				c.getLimiter().asJSON().toString(4));
 	}
diff --git a/src/main/java/org/barcodeapi/server/api/PlansHandler.java b/src/main/java/org/barcodeapi/server/api/PlansHandler.java
@@ -29,7 +29,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(plansInfo.toString());
 	}
 }
diff --git a/src/main/java/org/barcodeapi/server/api/SessionHandler.java b/src/main/java/org/barcodeapi/server/api/SessionHandler.java
@@ -31,7 +31,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 
 		if (!c.hasSession()) {
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 400)//
 					.put("message", "no session in request")//
@@ -58,7 +58,7 @@ protected void doGET(RequestContext c, HttpServletResponse r) throws IOException
 
 		// Print response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(//
 				c.getSession().asJSON().toString(4));
 	}
diff --git a/src/main/java/org/barcodeapi/server/api/ShareHandler.java b/src/main/java/org/barcodeapi/server/api/ShareHandler.java
@@ -48,7 +48,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws IOExcep
 		default:
 			// Print error to client
 			r.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 405)//
 					.put("message", "method not allowed")//
@@ -74,7 +74,7 @@ private void doShareGet(RequestContext c, HttpServletResponse r) throws IOExcept
 
 		if (obj == null) {
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 400)//
 					.put("message", "share not found")//
@@ -87,7 +87,7 @@ private void doShareGet(RequestContext c, HttpServletResponse r) throws IOExcept
 
 		// Print share data to the client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(shareData);
 	}
 
@@ -117,7 +117,7 @@ private void doSharePost(RequestContext c, HttpServletResponse r) throws IOExcep
 
 			// Print failure to client
 			r.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println((new JSONObject() //
 					.put("code", 400)//
 					.put("message", "invalid share data")//
@@ -149,7 +149,7 @@ private void doSharePost(RequestContext c, HttpServletResponse r) throws IOExcep
 
 		// Print share key to the client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "text/plain");
+		r.setContentType("application/json");
 		r.getOutputStream().println(share.getHash());
 	}
 }
diff --git a/src/main/java/org/barcodeapi/server/api/TypeHandler.java b/src/main/java/org/barcodeapi/server/api/TypeHandler.java
@@ -57,7 +57,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 			// Print all types response to client
 			r.setStatus(HttpServletResponse.SC_OK);
-			r.setHeader("Content-Type", "application/json");
+			r.setContentType("application/json");
 			r.getOutputStream().println(typesComplete);
 			return;
 		}
@@ -75,7 +75,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc
 
 		// Print single type response to client
 		r.setStatus(HttpServletResponse.SC_OK);
-		r.setHeader("Content-Type", "application/json");
+		r.setContentType("application/json");
 		r.getOutputStream().println(typesConfig.get(type));
 	}
 }
diff --git a/src/main/java/org/barcodeapi/server/cache/CachedBarcode.java b/src/main/java/org/barcodeapi/server/cache/CachedBarcode.java
@@ -125,8 +125,13 @@ public String encodeJSON() {
 		).toString();
 	}
 
+	/**
+	 * Returns an HTML page with the barcode embedded as Base-64.
+	 * 
+	 * @return barcode in an HTML format page
+	 */
 	public String encodeHTML() {
-		return String.format("<html><body><img src='/api/%s/%s'/></body><html>", //
-				getBarcodeType().getTargets()[0], getBarcodeStringEncoded());
+		return String.format(//
+				"<html><body><img src='data:image/png;base64,%s'/></body><html>", encodeBase64());
 	}
 }
diff --git a/src/main/java/org/barcodeapi/server/cache/CachedLimiter.java b/src/main/java/org/barcodeapi/server/cache/CachedLimiter.java
diff --git a/src/main/java/org/barcodeapi/server/cache/Subscriber.java b/src/main/java/org/barcodeapi/server/cache/Subscriber.java
diff --git a/src/main/java/org/barcodeapi/server/cache/SubscriberCache.java b/src/main/java/org/barcodeapi/server/cache/SubscriberCache.java
diff --git a/src/main/java/org/barcodeapi/server/core/RequestContext.java b/src/main/java/org/barcodeapi/server/core/RequestContext.java
diff --git a/src/main/java/org/barcodeapi/server/gen/impl/DefaultBarcode4JProvider.java b/src/main/java/org/barcodeapi/server/gen/impl/DefaultBarcode4JProvider.java
diff --git a/src/main/java/org/barcodeapi/server/tasks/LimiterCleanupTask.java b/src/main/java/org/barcodeapi/server/tasks/LimiterCleanupTask.java
diff --git a/src/main/resources/strings/codes.en_US.properties b/src/main/resources/strings/codes.en_US.properties

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected void onRequest(RequestContext c, HttpServletResponse r) throws JSONExc`
`34`	`34`
`35`	`35`	`// Print response to client`
`36`	`36`	`r.setStatus(HttpServletResponse.SC_OK);`
`37`		`- r.setHeader("Content-Type", "application/json");`
	`37`	`+ r.setContentType("application/json");`
`38`	`38`	`r.getOutputStream().println(stats.toString());`
`39`	`39`	`}`
`40`	`40`	`}`