Prep 1.6.7

assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "The official JavaScript client for the Phoenix web framework.",
   "license": "MIT",
   "main": "./assets/js/phoenix/index.js",

installer/mix.exs

@@ -6,7 +6,7 @@ end
 defmodule Phx.New.MixProject do
   use Mix.Project
 
-  @version "1.6.6"
+  @version "1.6.7"
   @scm_url "https://github.com/phoenixframework/phoenix"
 
   # If the elixir requirement is updated, we need to update:

mix.exs

@@ -8,7 +8,7 @@ defmodule Phoenix.MixProject do
     end
   end
 
-  @version "1.6.6"
+  @version "1.6.7"
   @scm_url "https://github.com/phoenixframework/phoenix"
 
   # If the elixir requirement is updated, we need to make the installer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "The official JavaScript client for the Phoenix web framework.",
   "license": "MIT",
   "module": "./priv/static/phoenix.mjs",

priv/static/phoenix.js

@@ -1,11 +1,21 @@
 var Phoenix = (() => {
   var __defProp = Object.defineProperty;
-  var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+  var __getOwnPropNames = Object.getOwnPropertyNames;
+  var __hasOwnProp = Object.prototype.hasOwnProperty;
   var __export = (target, all) => {
-    __markAsModule(target);
     for (var name in all)
       __defProp(target, name, { get: all[name], enumerable: true });
   };
+  var __copyProps = (to, from, except, desc) => {
+    if (from && typeof from === "object" || typeof from === "function") {
+      for (let key of __getOwnPropNames(from))
+        if (!__hasOwnProp.call(to, key) && key !== except)
+          __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+    }
+    return to;
+  };
+  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
   // js/phoenix/index.js
   var phoenix_exports = {};
@@ -32,7 +42,7 @@ var Phoenix = (() => {
   // js/phoenix/constants.js
   var globalSelf = typeof self !== "undefined" ? self : null;
   var phxWindow = typeof window !== "undefined" ? window : null;
-  var global = globalSelf || phxWindow || void 0;
+  var global = globalSelf || phxWindow || global;
   var DEFAULT_VSN = "2.0.0";
   var SOCKET_STATES = { connecting: 0, open: 1, closing: 2, closed: 3 };
   var DEFAULT_TIMEOUT = 1e4;
@@ -457,13 +467,13 @@ var Phoenix = (() => {
     endpointURL() {
       return Ajax.appendParams(this.pollEndpoint, { token: this.token });
     }
-    closeAndRetry() {
-      this.close();
+    closeAndRetry(code, reason, wasClean) {
+      this.close(code, reason, wasClean);
       this.readyState = SOCKET_STATES.connecting;
     }
     ontimeout() {
       this.onerror("timeout");
-      this.closeAndRetry();
+      this.closeAndRetry(1005, "timeout", false);
     }
     poll() {
       if (!(this.readyState === SOCKET_STATES.open || this.readyState === SOCKET_STATES.connecting)) {
@@ -490,17 +500,17 @@ var Phoenix = (() => {
             break;
           case 410:
             this.readyState = SOCKET_STATES.open;
-            this.onopen();
+            this.onopen({});
             this.poll();
             break;
           case 403:
-            this.onerror();
-            this.close();
+            this.onerror(403);
+            this.close(1008, "forbidden", false);
             break;
           case 0:
           case 500:
-            this.onerror();
-            this.closeAndRetry();
+            this.onerror(500);
+            this.closeAndRetry(1011, "internal server error", 500);
             break;
           default:
             throw new Error(`unhandled poll status ${status}`);
@@ -511,13 +521,18 @@ var Phoenix = (() => {
       Ajax.request("POST", this.endpointURL(), "application/json", body, this.timeout, this.onerror.bind(this, "timeout"), (resp) => {
         if (!resp || resp.status !== 200) {
           this.onerror(resp && resp.status);
-          this.closeAndRetry();
+          this.closeAndRetry(1011, "internal server error", false);
         }
       });
     }
-    close(_code, _reason) {
+    close(code, reason, wasClean) {
       this.readyState = SOCKET_STATES.closed;
-      this.onclose();
+      let opts = Object.assign({ code: 1e3, reason: void 0, wasClean: true }, { code, reason, wasClean });
+      if (typeof CloseEvent !== "undefined") {
+        this.onclose(new CloseEvent("close", opts));
+      } else {
+        this.onclose(opts);
+      }
     }
   };
 
@@ -1085,5 +1100,5 @@ var Phoenix = (() => {
       }
     }
   };
-  return phoenix_exports;
+  return __toCommonJS(phoenix_exports);
 })();

priv/static/phoenix.mjs

@@ -13,7 +13,7 @@ var closure = (value) => {
 // js/phoenix/constants.js
 var globalSelf = typeof self !== "undefined" ? self : null;
 var phxWindow = typeof window !== "undefined" ? window : null;
-var global = globalSelf || phxWindow || void 0;
+var global = globalSelf || phxWindow || global;
 var DEFAULT_VSN = "2.0.0";
 var SOCKET_STATES = { connecting: 0, open: 1, closing: 2, closed: 3 };
 var DEFAULT_TIMEOUT = 1e4;
@@ -438,13 +438,13 @@ var LongPoll = class {
   endpointURL() {
     return Ajax.appendParams(this.pollEndpoint, { token: this.token });
   }
-  closeAndRetry() {
-    this.close();
+  closeAndRetry(code, reason, wasClean) {
+    this.close(code, reason, wasClean);
     this.readyState = SOCKET_STATES.connecting;
   }
   ontimeout() {
     this.onerror("timeout");
-    this.closeAndRetry();
+    this.closeAndRetry(1005, "timeout", false);
   }
   poll() {
     if (!(this.readyState === SOCKET_STATES.open || this.readyState === SOCKET_STATES.connecting)) {
@@ -471,17 +471,17 @@ var LongPoll = class {
           break;
         case 410:
           this.readyState = SOCKET_STATES.open;
-          this.onopen();
+          this.onopen({});
           this.poll();
           break;
         case 403:
-          this.onerror();
-          this.close();
+          this.onerror(403);
+          this.close(1008, "forbidden", false);
           break;
         case 0:
         case 500:
-          this.onerror();
-          this.closeAndRetry();
+          this.onerror(500);
+          this.closeAndRetry(1011, "internal server error", 500);
           break;
         default:
           throw new Error(`unhandled poll status ${status}`);
@@ -492,13 +492,18 @@ var LongPoll = class {
     Ajax.request("POST", this.endpointURL(), "application/json", body, this.timeout, this.onerror.bind(this, "timeout"), (resp) => {
       if (!resp || resp.status !== 200) {
         this.onerror(resp && resp.status);
-        this.closeAndRetry();
+        this.closeAndRetry(1011, "internal server error", false);
       }
     });
   }
-  close(_code, _reason) {
+  close(code, reason, wasClean) {
     this.readyState = SOCKET_STATES.closed;
-    this.onclose();
+    let opts = Object.assign({ code: 1e3, reason: void 0, wasClean: true }, { code, reason, wasClean });
+    if (typeof CloseEvent !== "undefined") {
+      this.onclose(new CloseEvent("close", opts));
+    } else {
+      this.onclose(opts);
+    }
   }
 };