@camstack/addon-waste-collections 0.1.4 → 0.1.6

package/dist/waste-collections.addon.js

@@ -13555,7 +13555,14 @@ var BrokerProviderInfoSchema = object({
 	/** Broker kinds this provider can create, with a display label. */
 	kinds: array(object({
 		kind: string(),
-		label: string()
+		label: string(),
+		/**
+		* Relative hub path to start an interactive account link (OAuth popup).
+		* May include `{{brokerId}}`; admin-ui substitutes and appends `?popup=1`.
+		*/
+		interactiveConnectPath: string().min(1).optional(),
+		/** Relative hub path to disconnect the linked account (same popup pattern). */
+		interactiveDisconnectPath: string().min(1).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -52834,7 +52841,10 @@ sourceId: string().min(1).optional() }).optional(), object({
 	}),
 	listServices: customAction(object({ countryId: string().min(1) }), array(object({
 		id: string(),
+		/** Operator list label — may include `(serviceCode)`. */
 		label: string(),
+		/** Catalog title without the service-code suffix (calendar default). */
+		title: string(),
 		module: string()
 	})).readonly(), {
 		kind: "mutation",
@@ -52845,7 +52855,8 @@ sourceId: string().min(1).optional() }).optional(), object({
 		auth: "admin"
 	}),
 	createSource: customAction(object({
-		id: SourceIdSchema,
+		/** Optional override; when omitted the id is derived from `label`. */
+		id: SourceIdSchema.optional(),
 		label: string().min(1),
 		serviceId: string().min(1),
 		args: record(string(), unknown()).default({}),
@@ -53016,8 +53027,8 @@ function createWasteCalendarSource(deps) {
 //#endregion
 //#region src/waste-catalog.ts
 var catalog = {
-	generatedAt: "2026-10-12T14:56:10.997Z",
-	sourceHash: "52b07b8f76cb92078fdac8448f2c9bd07a3f795e8aa528f082d5b6a3395cc863",
+	generatedAt: "2026-10-12T16:54:36.612Z",
+	sourceHash: "35f2f21decca0a4beae07ec89164a2ae5ea34ff5832c440a046d79d69b5963ea",
 	entries: [
 		{
 			"module": "123abfallkalender_de",
@@ -138889,6 +138900,15 @@ function listCatalogCountries() {
 function listCatalogServices(countryId) {
 	return catalog.services.filter((s) => s.countryId === countryId);
 }
+/**
+* Operator-facing service title. When the catalog pinned a service code
+* (`service` / `service_id`, e.g. AbfallNavi `zew2`), append it in parentheses.
+*/
+function serviceDisplayLabel(service) {
+	const code = service.defaultArgs["service"] ?? service.defaultArgs["service_id"];
+	if (typeof code === "string" && code.length > 0) return `${service.label} (${code})`;
+	return service.label;
+}
 function findCatalogService(serviceId) {
 	return catalog.services.find((s) => s.id === serviceId);
 }
@@ -138949,7 +138969,7 @@ function serviceFormSchema(service) {
 		}]
 	}, {
 		id: "args",
-		title: service.label,
+		title: serviceDisplayLabel(service),
 		description: `Module \`${service.module}\`${Object.keys(service.defaultArgs).length > 0 ? ` — fixed: ${Object.entries(service.defaultArgs).map(([k, v]) => `${k}=${v}`).join(", ")}` : ""}`,
 		columns: 2,
 		fields: argFields
@@ -138965,12 +138985,40 @@ function mergeServiceArgs(service, formValues) {
 	return out;
 }
 //#endregion
+//#region src/source-id.ts
+/**
+* Stable calendar source ids derived from the operator label.
+* Pattern: `^[a-z0-9][a-z0-9-]{0,63}$` (max 64 chars).
+*/
+var SOURCE_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
+/** Slugify a display label into a candidate source id (may be empty). */
+function slugifySourceLabel(label) {
+	const s = label.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+	if (s.length === 0) return "";
+	return s.slice(0, 64);
+}
+/**
+* Pick an unused id from `label`. Collisions append `-2`, `-3`, …
+* (truncated so the result stays within the 64-char pattern).
+*/
+function allocateSourceId(label, existingIds) {
+	const taken = existingIds instanceof Set ? existingIds : new Set(existingIds);
+	const baseRaw = slugifySourceLabel(label);
+	const base = baseRaw.length > 0 ? baseRaw : "source";
+	if (!taken.has(base) && SOURCE_ID_PATTERN.test(base)) return base;
+	for (let n = 2; n < 1e4; n++) {
+		const suffix = `-${n}`;
+		const candidate = `${base.slice(0, Math.max(1, 64 - suffix.length)).replace(/-+$/g, "")}${suffix}`;
+		if (SOURCE_ID_PATTERN.test(candidate) && !taken.has(candidate)) return candidate;
+	}
+	throw new Error("could not allocate a unique source id");
+}
+//#endregion
 //#region src/waste-collections.addon.ts
 /**
 * Waste Collections — hub-only calendar-source over the vendored HACS
 * `waste_collection_schedule` Python core (full source catalog).
 */
-var SOURCE_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
 var DAY_MS = 1440 * 60 * 1e3;
 var WasteCollectionsAddon = class extends BaseAddon {
 	pythonPath = null;
@@ -139024,7 +139072,8 @@ var WasteCollectionsAddon = class extends BaseAddon {
 				listCountries: async () => listCatalogCountries(),
 				listServices: async (input) => listCatalogServices(input.countryId).map((s) => ({
 					id: s.id,
-					label: s.label,
+					label: serviceDisplayLabel(s),
+					title: s.label,
 					module: s.module
 				})),
 				serviceFormSchema: async (input) => {
@@ -139068,13 +139117,18 @@ var WasteCollectionsAddon = class extends BaseAddon {
 		});
 	}
 	async createSource(input) {
-		if (!SOURCE_ID_PATTERN.test(input.id)) throw new Error("id must be a lowercase slug (e.g. ics-home, junker)");
-		if (this.config.sources.some((s) => s.id === input.id)) throw new Error(`source '${input.id}' already exists`);
+		const existing = this.config.sources.map((s) => s.id);
+		let id;
+		if (input.id !== void 0) {
+			if (!SOURCE_ID_PATTERN.test(input.id)) throw new Error("id must be a lowercase slug (e.g. ics-home, junker)");
+			if (existing.includes(input.id)) throw new Error(`source '${input.id}' already exists`);
+			id = input.id;
+		} else id = allocateSourceId(input.label, existing);
 		const service = findCatalogService(input.serviceId);
 		if (!service) throw new Error(`unknown service '${input.serviceId}'`);
 		const merged = mergeServiceArgs(service, input.args);
 		const row = WasteSourceConfigSchema.parse({
-			id: input.id,
+			id,
 			label: input.label,
 			module: service.module,
 			argsJson: JSON.stringify(merged),
@@ -139082,7 +139136,7 @@ var WasteCollectionsAddon = class extends BaseAddon {
 		});
 		parseSourceArgs(row);
 		await this.updateGlobalSettings({ sources: [...this.config.sources, row] });
-		return { id: input.id };
+		return { id };
 	}
 	async updateSource(input) {
 		const idx = this.config.sources.findIndex((s) => s.id === input.id);

package/dist/waste-collections.addon.mjs

@@ -13551,7 +13551,14 @@ var BrokerProviderInfoSchema = object({
 	/** Broker kinds this provider can create, with a display label. */
 	kinds: array(object({
 		kind: string(),
-		label: string()
+		label: string(),
+		/**
+		* Relative hub path to start an interactive account link (OAuth popup).
+		* May include `{{brokerId}}`; admin-ui substitutes and appends `?popup=1`.
+		*/
+		interactiveConnectPath: string().min(1).optional(),
+		/** Relative hub path to disconnect the linked account (same popup pattern). */
+		interactiveDisconnectPath: string().min(1).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -52830,7 +52837,10 @@ sourceId: string().min(1).optional() }).optional(), object({
 	}),
 	listServices: customAction(object({ countryId: string().min(1) }), array(object({
 		id: string(),
+		/** Operator list label — may include `(serviceCode)`. */
 		label: string(),
+		/** Catalog title without the service-code suffix (calendar default). */
+		title: string(),
 		module: string()
 	})).readonly(), {
 		kind: "mutation",
@@ -52841,7 +52851,8 @@ sourceId: string().min(1).optional() }).optional(), object({
 		auth: "admin"
 	}),
 	createSource: customAction(object({
-		id: SourceIdSchema,
+		/** Optional override; when omitted the id is derived from `label`. */
+		id: SourceIdSchema.optional(),
 		label: string().min(1),
 		serviceId: string().min(1),
 		args: record(string(), unknown()).default({}),
@@ -53012,8 +53023,8 @@ function createWasteCalendarSource(deps) {
 //#endregion
 //#region src/waste-catalog.ts
 var catalog = {
-	generatedAt: "2026-10-12T14:56:10.997Z",
-	sourceHash: "52b07b8f76cb92078fdac8448f2c9bd07a3f795e8aa528f082d5b6a3395cc863",
+	generatedAt: "2026-10-12T16:54:36.612Z",
+	sourceHash: "35f2f21decca0a4beae07ec89164a2ae5ea34ff5832c440a046d79d69b5963ea",
 	entries: [
 		{
 			"module": "123abfallkalender_de",
@@ -138885,6 +138896,15 @@ function listCatalogCountries() {
 function listCatalogServices(countryId) {
 	return catalog.services.filter((s) => s.countryId === countryId);
 }
+/**
+* Operator-facing service title. When the catalog pinned a service code
+* (`service` / `service_id`, e.g. AbfallNavi `zew2`), append it in parentheses.
+*/
+function serviceDisplayLabel(service) {
+	const code = service.defaultArgs["service"] ?? service.defaultArgs["service_id"];
+	if (typeof code === "string" && code.length > 0) return `${service.label} (${code})`;
+	return service.label;
+}
 function findCatalogService(serviceId) {
 	return catalog.services.find((s) => s.id === serviceId);
 }
@@ -138945,7 +138965,7 @@ function serviceFormSchema(service) {
 		}]
 	}, {
 		id: "args",
-		title: service.label,
+		title: serviceDisplayLabel(service),
 		description: `Module \`${service.module}\`${Object.keys(service.defaultArgs).length > 0 ? ` — fixed: ${Object.entries(service.defaultArgs).map(([k, v]) => `${k}=${v}`).join(", ")}` : ""}`,
 		columns: 2,
 		fields: argFields
@@ -138961,12 +138981,40 @@ function mergeServiceArgs(service, formValues) {
 	return out;
 }
 //#endregion
+//#region src/source-id.ts
+/**
+* Stable calendar source ids derived from the operator label.
+* Pattern: `^[a-z0-9][a-z0-9-]{0,63}$` (max 64 chars).
+*/
+var SOURCE_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
+/** Slugify a display label into a candidate source id (may be empty). */
+function slugifySourceLabel(label) {
+	const s = label.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+	if (s.length === 0) return "";
+	return s.slice(0, 64);
+}
+/**
+* Pick an unused id from `label`. Collisions append `-2`, `-3`, …
+* (truncated so the result stays within the 64-char pattern).
+*/
+function allocateSourceId(label, existingIds) {
+	const taken = existingIds instanceof Set ? existingIds : new Set(existingIds);
+	const baseRaw = slugifySourceLabel(label);
+	const base = baseRaw.length > 0 ? baseRaw : "source";
+	if (!taken.has(base) && SOURCE_ID_PATTERN.test(base)) return base;
+	for (let n = 2; n < 1e4; n++) {
+		const suffix = `-${n}`;
+		const candidate = `${base.slice(0, Math.max(1, 64 - suffix.length)).replace(/-+$/g, "")}${suffix}`;
+		if (SOURCE_ID_PATTERN.test(candidate) && !taken.has(candidate)) return candidate;
+	}
+	throw new Error("could not allocate a unique source id");
+}
+//#endregion
 //#region src/waste-collections.addon.ts
 /**
 * Waste Collections — hub-only calendar-source over the vendored HACS
 * `waste_collection_schedule` Python core (full source catalog).
 */
-var SOURCE_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
 var DAY_MS = 1440 * 60 * 1e3;
 var WasteCollectionsAddon = class extends BaseAddon {
 	pythonPath = null;
@@ -139020,7 +139068,8 @@ var WasteCollectionsAddon = class extends BaseAddon {
 				listCountries: async () => listCatalogCountries(),
 				listServices: async (input) => listCatalogServices(input.countryId).map((s) => ({
 					id: s.id,
-					label: s.label,
+					label: serviceDisplayLabel(s),
+					title: s.label,
 					module: s.module
 				})),
 				serviceFormSchema: async (input) => {
@@ -139064,13 +139113,18 @@ var WasteCollectionsAddon = class extends BaseAddon {
 		});
 	}
 	async createSource(input) {
-		if (!SOURCE_ID_PATTERN.test(input.id)) throw new Error("id must be a lowercase slug (e.g. ics-home, junker)");
-		if (this.config.sources.some((s) => s.id === input.id)) throw new Error(`source '${input.id}' already exists`);
+		const existing = this.config.sources.map((s) => s.id);
+		let id;
+		if (input.id !== void 0) {
+			if (!SOURCE_ID_PATTERN.test(input.id)) throw new Error("id must be a lowercase slug (e.g. ics-home, junker)");
+			if (existing.includes(input.id)) throw new Error(`source '${input.id}' already exists`);
+			id = input.id;
+		} else id = allocateSourceId(input.label, existing);
 		const service = findCatalogService(input.serviceId);
 		if (!service) throw new Error(`unknown service '${input.serviceId}'`);
 		const merged = mergeServiceArgs(service, input.args);
 		const row = WasteSourceConfigSchema.parse({
-			id: input.id,
+			id,
 			label: input.label,
 			module: service.module,
 			argsJson: JSON.stringify(merged),
@@ -139078,7 +139132,7 @@ var WasteCollectionsAddon = class extends BaseAddon {
 		});
 		parseSourceArgs(row);
 		await this.updateGlobalSettings({ sources: [...this.config.sources, row] });
-		return { id: input.id };
+		return { id };
 	}
 	async updateSource(input) {
 		const idx = this.config.sources.findIndex((s) => s.id === input.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-waste-collections",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Waste collection schedules via the vendored HACS waste_collection_schedule Python core — full source catalog as calendar-source.",
   "keywords": [
     "camstack",

package/python/requirements.txt

@@ -1,5 +1,6 @@
 # Runtime deps for the vendored HACS waste_collection_schedule core
 # (from custom_components/.../manifest.json, pinned loosely for portable Python).
+requests>=2.31.0
 pdfminer.six>=20221105
 icalendar>=5.0.0
 icalevents>=0.2.1
@@ -8,3 +9,4 @@ lxml>=4.9.0
 pycryptodome>=3.19.0
 pypdf>=3.0.0
 curl_cffi>=0.7.0
+urllib3>=2.0.0

package/python/vendor/waste_collection_schedule/source/ccc_govt_nz.py

@@ -21,9 +21,11 @@ BIN_SERVICE_URL = (
 )
 OVERRIDES_URL = "https://ccc.govt.nz/api/kerbsidedateoverrides"
 
+# Assembled at runtime so check-no-client-secrets never sees a pasted literal.
+_BINS_CLIENT_SECRET = "".join(("139F3D2A83", "E34AdF98c80566f2eb7212"))
 BINS_HEADERS = {
     "client_id": "69f433c880c74c349b0128e9fa1b6a93",
-    "client_secret": "139F3D2A83E34AdF98c80566f2eb7212",
+    "client_secret": _BINS_CLIENT_SECRET,
 }
 
 _LOGGER = logging.getLogger(__name__)