@subiz/widget-v4 4.1.214 → 4.1.215

package/dist/screenshoot.js

@@ -4588,7 +4588,6 @@ let trackResponseFn = (param, done) => {
     _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
     _defineProperty(this, "websiteFormRequest", () => this.apireq.setBaseUrl(this.ApiURL.replace(/\/4\.[01]\/?$/, '/4.1')));
     _defineProperty(this, "submitWebsiteForm", (formid, payload) => this.websiteFormRequest().post(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/submissions`, payload));
-    _defineProperty(this, "getWebsiteFormStatus", formid => this.websiteFormRequest().get(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/status`));
     _defineProperty(this, "submitForm", (form_id, page_url, device, data, user) => this.apireq.addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, {
       by: {
         id: this.uid,
@@ -6580,6 +6579,53 @@ class Store {
       this.reconnectGate.open();
     }
   }
+  async submitWebsiteForm(formid, payload) {
+    await this.readyGate.entry();
+    const key = websiteFormStorageKey(this.api, formid);
+    const kv = this.kv;
+    const result = formResult(await this.api.submitWebsiteForm(formid, payload));
+    try {
+      kv.put(key, {
+        conversation_id: result.conversation_id,
+        expires_at: util/* default */.A.Date.now() + 7 * 24 * 60 * 60 * 1000
+      });
+    } catch (_) {}
+    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 <= util/* default */.A.Date.now()) {
+        this.kv.del(key);
+        return {
+          submitted: false,
+          status: 'expired'
+        };
+      }
+      return {
+        submitted: true,
+        status: 'found',
+        conversation_id: receipt.conversation_id
+      };
+    } catch (_) {
+      return {
+        submitted: false,
+        status: 'storage_unavailable'
+      };
+    }
+  }
   async submitForm(formid, data, user) {
     await this.readyGate.entry();
     if (user) await this.setUser(user);
@@ -6707,6 +6753,7 @@ class Store {
   async _onWs(ev) {
     if (this._die) return;
     if (!ev || !ev.type) return;
+    if (util/* default */.A.get(ev, 'touchpoint.channel') === 'form' || util/* default */.A.get(ev, 'data.conversation.touchpoint.channel') === 'form') return;
     ev.created = util/* default */.A.getMs(ev.created);
     if (ev.type === 'user_info_updated') {
       return;
@@ -7462,6 +7509,22 @@ var xhrsend = function (method, url, body, cb) {
   request.send(body);
 };
 const dieErr = new Error('sdk unloaded');
+function websiteFormStorageKey(api, formid) {
+  return 'sbz_form_submitted:' + util/* default */.A.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;
+}
 // EXTERNAL MODULE: ./src/common.js
 var common = __webpack_require__(2840);
 // EXTERNAL MODULE: ./node_modules/preact/dist/preact.module.js
@@ -14186,12 +14249,12 @@ class lib_Widget {
       return this.store.sendConversion(formid, values, impressiontoken);
     }
     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);
   }
   startConvo(req) {
     req = util/* default */.A.cloneDeep(req) || {};
@@ -14332,19 +14395,6 @@ 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;
-}
 ;// ./screenshoot.js
 
 let accid = 'acqsulrowbxiugvginhw';

package/package.json

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

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,36 @@ export default class Store {
 		}
 	}
 
+	async submitWebsiteForm(formid, payload) {
+		await this.readyGate.entry()
+		const key = websiteFormStorageKey(this.api, formid)
+		const kv = this.kv
+		const result = formResult(await this.api.submitWebsiteForm(formid, payload))
+		try {
+			kv.put(key, {conversation_id: result.conversation_id, 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}
+		} catch (_) {
+			return {submitted: false, status: 'storage_unavailable'}
+		}
+	}
+
 	async submitForm(formid, data, user) {
 		await this.readyGate.entry()
 		if (user) await this.setUser(user)
@@ -1117,6 +1147,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 +1949,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
+}