@subiz/widget-v4 4.1.214 → 4.1.216

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.214",
+	"version": "4.1.216",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",

package/src/chatbox/ChatButton.js

@@ -391,6 +391,7 @@ export default class ChatButton extends Com {
 
 		let imgurl = sb.get(accountSetting, 'desktop_button.background_image_url')
 		let maskurl = sb.get(accountSetting, 'desktop_button.background_mask_url')
+		// Keep configured dimensions even when the image fails; default only missing dimensions to 70px.
 		let imgwidth = sb.get(accountSetting, 'desktop_button.width') || 70
 		let imgheight = sb.get(accountSetting, 'desktop_button.height') || 70
 
@@ -450,18 +451,10 @@ export default class ChatButton extends Com {
 			appearance.maskAsset ? prepareButtonMask(appearance.maskAsset) : Promise.resolve(null),
 		])
 		const stale = () => !this._isMounted || this._buttonImageVersion !== version
-		if (stale()) {
-			if (mask) URL.revokeObjectURL(mask)
-			return
-		}
+		if (stale()) return
 		const fallback = loaded.some((success) => !success) || (!!appearance.maskAsset && !mask)
 		const ready = !fallback || (await preloadButtonImage(defaultBubble))
-		if (stale()) {
-			if (mask) URL.revokeObjectURL(mask)
-			return
-		}
-		if (this._buttonMaskUrl) URL.revokeObjectURL(this._buttonMaskUrl)
-		this._buttonMaskUrl = mask
+		if (stale()) return
 		// Commit the hidden style before revealing even when images are cached.
 		// Otherwise older browsers can paint only the final state and skip the transition.
 		if (this._buttonElement) window.getComputedStyle(this._buttonElement).transform
@@ -470,7 +463,6 @@ export default class ChatButton extends Com {
 	}
 
 	componentWillUnmount() {
-		if (this._buttonMaskUrl) URL.revokeObjectURL(this._buttonMaskUrl)
 		if (this._animateTimeout) clearTimeout(this._animateTimeout)
 	}
 
@@ -478,12 +470,13 @@ export default class ChatButton extends Com {
 		if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_button = sb.Date.now()
 		const appearance = this.getButtonAppearance()
 		let {imgsrc, imgurl, maskurl, background, position, imgwidth, imgheight} = appearance
+		const fallback = this.state.readyImageKey === appearance.key && this.state.fallbackButtonImage
 		// Never attach a remote CSS mask while the local copy is being prepared.
 		if (appearance.maskAsset) {
 			maskurl = this.state.readyImageKey === appearance.key ? this.state.buttonMaskUrl : ''
 			if (imgsrc === appearance.maskAsset) imgsrc = maskurl || ''
 		}
-		if (this.state.readyImageKey === appearance.key && this.state.fallbackButtonImage) {
+		if (fallback) {
 			imgsrc = imgurl = defaultBubble
 			maskurl = ''
 		}
@@ -548,7 +541,12 @@ export default class ChatButton extends Com {
 			`
 		}
 
+		if (fallback) {
+			imgcontainerstyle += `width: ${imgwidth}px !important; height: ${imgheight}px !important;`
+		}
+
 		let cls = 'chat-button chat-button--' + position
+		if (fallback) cls += ' chat-button--fallback'
 		// dont render till all image is loaded
 
 		let whiteBgStyle = `
@@ -679,18 +677,22 @@ function preloadButtonImage(src, {crossOrigin = false} = {}) {
 	})
 }
 
-// CSS masks use a separate CORS image request. Pin the loaded bytes locally so
-// revealing the white backing never races another network request by CSS.
+// Pin the mask bytes with a data URL: some sites allow data: images but block blob:.
+// If inline images or fetch are blocked, preload the original URL with CORS for CSS masks.
 async function prepareButtonMask(src) {
-	let url
 	try {
 		const response = await fetch(src)
 		if (!response.ok) return null
-		url = URL.createObjectURL(await response.blob())
-		if (await preloadButtonImage(url)) return url
+		const blob = await response.blob()
+		const url = await new Promise((resolve) => {
+			const reader = new FileReader()
+			reader.onload = () => resolve(reader.result)
+			reader.onerror = reader.onabort = () => resolve('')
+			reader.readAsDataURL(blob)
+		})
+		if (url && await preloadButtonImage(url)) return url
 	} catch (_) {
-		// Use the bundled fallback if the custom mask cannot be loaded.
+		// A blocked fetch or failed conversion does not mean the original image is unavailable.
 	}
-	if (url) URL.revokeObjectURL(url)
-	return null
+	return await preloadButtonImage(src, {crossOrigin: true}) ? src : null
 }

package/src/lib.js

@@ -235,13 +235,13 @@ class Widget {
 		}
 
 		const payload = formRequest(formid, values, options)
-		return formResult(await this.store.api.submitWebsiteForm(formid, payload), 'submit')
+		return this.store.submitWebsiteForm(formid, payload)
 	}
 
 	async getFormStatus(formid) {
 		validateWebsiteFormId(formid)
 		await this.store.readyGate.entry()
-		return formResult(await this.store.api.getWebsiteFormStatus(formid), 'status')
+		return this.store.getFormStatus(formid)
 	}
 
 	// req.bot_id != "" -> start conversation with bot id
@@ -418,19 +418,3 @@ function formRequest(formid, fields, options = {}) {
 		}),
 	}
 }
-
-function formResult(response, operation) {
-	const body = response && response.body
-	const detail = (response && response.error) || (body && body.error)
-	const status = response && response.code
-	const valid = operation === 'submit'
-		? body && typeof body.conversation_id === 'string' && body.conversation_id && typeof body.submission_id === 'string' && body.submission_id
-		: body && typeof body.submitted === 'boolean' && typeof body.status === 'string'
-	if (detail || !(status >= 200 && status < 300) || !valid) {
-		const error = new Error('Subiz form request failed')
-		error.code = (detail && detail.code) || 'form_request_failed'
-		error.status = status
-		throw error
-	}
-	return body
-}

package/src/store/api.js

@@ -277,9 +277,6 @@ export default class {
 	submitWebsiteForm = (formid, payload) => this.websiteFormRequest()
 		.post(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/submissions`, payload)
 
-	getWebsiteFormStatus = (formid) => this.websiteFormRequest()
-		.get(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/status`)
-
 	submitForm = (form_id, page_url, device, data, user) =>
 		this.apireq
 			.addQuery('x-referer', sb.get(location, 'origin', ''))

package/src/store/store.js

@@ -955,6 +955,37 @@ export default class Store {
 		}
 	}
 
+	async submitWebsiteForm(formid, payload) {
+		await this.readyGate.entry()
+		const key = websiteFormStorageKey(this.api, formid)
+		const kv = this.kv
+		const values = sb.cloneDeep(payload.values)
+		const result = formResult(await this.api.submitWebsiteForm(formid, payload))
+		try {
+			kv.put(key, {conversation_id: result.conversation_id, values, expires_at: sb.Date.now() + 7 * 24 * 60 * 60 * 1000})
+		} catch (_) { /* Storage failure must not make callers retry a successful submission. */ }
+		return result
+	}
+
+	getFormStatus(formid) {
+		const key = websiteFormStorageKey(this.api, formid)
+		try {
+			const receipt = this.kv.match(key)
+			if (!receipt) return {submitted: false, status: 'not_found'}
+			if (!Number.isFinite(receipt.expires_at) || typeof receipt.conversation_id !== 'string' || !receipt.conversation_id) {
+				this.kv.del(key)
+				return {submitted: false, status: 'not_found'}
+			}
+			if (receipt.expires_at <= sb.Date.now()) {
+				this.kv.del(key)
+				return {submitted: false, status: 'expired'}
+			}
+			return {submitted: true, status: 'found', conversation_id: receipt.conversation_id, values: Array.isArray(receipt.values) ? sb.cloneDeep(receipt.values) : []}
+		} catch (_) {
+			return {submitted: false, status: 'storage_unavailable'}
+		}
+	}
+
 	async submitForm(formid, data, user) {
 		await this.readyGate.entry()
 		if (user) await this.setUser(user)
@@ -1117,6 +1148,9 @@ export default class Store {
 	async _onWs(ev) {
 		if (this._die) return
 		if (!ev || !ev.type) return
+		// Website form conversations are handled in the agent inbox, not the chat widget.
+		// Ignore their realtime events before an unknown conversation triggers a GET.
+		if (sb.get(ev, 'touchpoint.channel') === 'form' || sb.get(ev, 'data.conversation.touchpoint.channel') === 'form') return
 		ev.created = sb.getMs(ev.created)
 		if (ev.type === 'user_info_updated') {
 			return
@@ -1916,3 +1950,21 @@ var xhrsend = function (method, url, body, cb) {
 }
 
 const dieErr = new Error('sdk unloaded')
+
+function websiteFormStorageKey(api, formid) {
+	return 'sbz_form_submitted:' + sb.stringify([api.accid, api.uid, formid])
+}
+
+function formResult(response) {
+	const body = response && response.body
+	const detail = (response && response.error) || (body && body.error)
+	const status = response && response.code
+	const valid = body && typeof body.conversation_id === 'string' && body.conversation_id && typeof body.submission_id === 'string' && body.submission_id
+	if (detail || !(status >= 200 && status < 300) || !valid) {
+		const error = new Error('Subiz form request failed')
+		error.code = (detail && detail.code) || 'form_request_failed'
+		error.status = status
+		throw error
+	}
+	return body
+}

package/up

@@ -1,6 +1,22 @@
 #!/bin/sh
 set -e # exit when any command fails
 
+# The storage client still references ssl.PROTOCOL_TLSv1; the local Python 3.14
+# uses OpenSSL 4, which removed the underlying legacy API.
+# Respect an explicit interpreter; otherwise prefer a compatible installed Python.
+if [ -z "${CLOUDSDK_PYTHON:-}" ]; then
+	for python in python3.13 python3.12 python3.11 python3.10; do
+		if command -v "$python" >/dev/null 2>&1; then
+			CLOUDSDK_PYTHON=$(command -v "$python")
+			export CLOUDSDK_PYTHON
+			break
+		fi
+	done
+fi
+
+# Fail before rebuilding if gcloud cannot load the upload command.
+gcloud storage cp --help >/dev/null
+
 # safety first
 echo "Clean"
 #rm -rf node_modules && rm -rf package-lock.json && npm i --no-optional
@@ -17,8 +33,10 @@ echo "Build OK. New version hash: $(cat dist/HASH)"
 # DEPLOY TO WIDGET SERVER
 # (do not deploy dist/HASH)
 mv dist/HASH dist/.HASH
+trap 'if [ -f dist/.HASH ]; then mv dist/.HASH dist/HASH; fi' 0
 gcloud storage cp -r --cache-control="public, max-age=31536000" --gzip-local="html,js,css,svg,jpg,png" dist/* gs://public-gcs.subiz-cdn.com/widget-v4/public/
 mv dist/.HASH dist/HASH
+trap - 0
 
 if [ "$1" = 'prod' ]; then
 	gcloud storage cp --cache-control="public, max-age=10" --content-type="text/plain" dist/HASH gs://public-gcs.subiz-cdn.com/widget-v4/public/

package/dist/.HASH

@@ -1 +0,0 @@
-1a12a372880