@takeshape/cli 8.167.1 → 8.168.0

package/dist/util/pusher.d.ts

@@ -1,4 +1,10 @@
-export function handleWarning(type: any, error: any): void;
-export function handleAction(callback: any): (action: any) => void;
-export function subscribe(params: any, callback: any): Promise<void>;
+import { LoggedInCliConfig } from '../types';
+export interface ServerAction {
+    type: string;
+    meta?: Record<string, unknown>;
+    payload: Record<string, unknown>;
+}
+export declare type ServerActionHandler = (action: ServerAction) => void;
+export declare function handleAction(callback: ServerActionHandler): (action: ServerAction) => void;
+export declare function subscribe(params: LoggedInCliConfig, callback: ServerActionHandler): Promise<void>;
 //# sourceMappingURL=pusher.d.ts.map

package/dist/util/pusher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../src/util/pusher.js"],"names":[],"mappings":"AAIA,2DAIC;AAID,mEAUC;AAED,qEAYC"}
+{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../src/util/pusher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,oBAAY,mBAAmB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;AAEjE,wBAAgB,YAAY,CAAC,QAAQ,EAAE,mBAAmB,YACxC,YAAY,UAS7B;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,mBAAmB,iBAcvF"}

package/dist/util/pusher.js

@@ -4,25 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleAction = handleAction;
-exports.handleWarning = handleWarning;
 exports.subscribe = subscribe;
 
 var _api = _interopRequireDefault(require("./api"));
 
-var _pusherClient = _interopRequireDefault(require("pusher-client"));
-
-var _log = _interopRequireDefault(require("../log"));
+var _pusherJs = _interopRequireDefault(require("pusher-js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function handleWarning(type, error) {
-  if (type === 'Error' && error.type === 'WebSocketError') {
-    (0, _log.default)('Disconnected from TakeShape. Restart this process to resume live content updates.');
-  }
-}
-
-_pusherClient.default.warn = handleWarning;
-
 function handleAction(callback) {
   return action => {
     if (action.type === 'content/CONTENT_UPDATED' || action.type === 'content/CONTENT_CREATED' || action.type === 'content/CONTENT_DELETED') {
@@ -32,13 +21,13 @@ function handleAction(callback) {
 }
 
 async function subscribe(params, callback) {
-  var _params$linkedApiKey;
-
   const config = await (0, _api.default)(params, 'GET', `/project/${params.projectId}/pusher-client-config`);
-  const pusher = new _pusherClient.default(config.key, {
-    authEndpoint: `${params.endpoint}/project/channel-auth?auth=${(_params$linkedApiKey = params.linkedApiKey) === null || _params$linkedApiKey === void 0 ? void 0 : _params$linkedApiKey.apiKey}`,
-    cluster: config.cluster,
-    encrypted: true
+  const pusher = new _pusherJs.default(config.key, {
+    channelAuthorization: {
+      endpoint: `${params.endpoint}/project/channel-auth?auth=${params.authToken}`,
+      transport: 'ajax'
+    },
+    cluster: config.cluster
   });
   const channel = pusher.subscribe(`presence-project.${params.projectId}`);
   channel.bind('server-action', handleAction(callback));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "8.167.1",
+  "version": "8.168.0",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -25,10 +25,10 @@
     "@graphql-codegen/typescript": "^2.4.5",
     "@graphql-tools/graphql-file-loader": "^7.3.3",
     "@graphql-tools/load": "^7.5.1",
-    "@takeshape/schema": "8.167.1",
-    "@takeshape/ssg": "8.167.1",
-    "@takeshape/streams": "8.167.1",
-    "@takeshape/util": "8.167.1",
+    "@takeshape/schema": "8.168.0",
+    "@takeshape/ssg": "8.168.0",
+    "@takeshape/streams": "8.168.0",
+    "@takeshape/util": "8.168.0",
     "archiver": "^1.3.0",
     "async-retry": "^1.2.1",
     "bluebird": "^3.4.6",
@@ -54,7 +54,7 @@
     "open": "^7.0.3",
     "ora": "^3.4.0",
     "pretty-bytes": "^5.3.0",
-    "pusher-client": "^1.1.0",
+    "pusher-js": "^7.1.1-beta",
     "request": "^2.88.0",
     "semver": "^6.3.0",
     "stream-to-promise": "^2.2.0",