arcadible 0.1.16 → 0.1.18

package/bin/arc-deploy.js

@@ -50,10 +50,10 @@ const conf = {
 
 // [function]
 
-const handler = function ({ git, json, pb, quiet, sw }) {
+const handler = function ({ json, pb, quiet, sw }) {
   return {
     onAccountRefresh(refresh) {
-      sw.start(git || json || quiet);
+      sw.start(json || quiet);
       return refresh(true);
     },
     onDeployBegin() {
@@ -73,7 +73,7 @@ const handler = function ({ git, json, pb, quiet, sw }) {
               pb.stop();
             }
             log.pw(`⚠ ${message}`);
-            sw.start(git || json || quiet);
+            sw.start(json || quiet);
             if (pb) {
               pb.start();
             }
@@ -82,7 +82,7 @@ const handler = function ({ git, json, pb, quiet, sw }) {
       }
     },
     onPredeployBegin() {
-      sw.start(git || json || quiet);
+      sw.start(json || quiet);
     },
     onUploadProgress(step) {
       if (!json && !quiet) {
@@ -111,7 +111,7 @@ const start = function (argv) {
       }
       sw.stop();
       sw = new SpinnerWheel("Checking login... %s");
-      return whoami({ handler: handler({ git, json, pb, quiet, sw }) });
+      return whoami({ handler: handler({ json, pb, quiet, sw }) });
     })
     .then((current) => {
       const session = current?.session;
@@ -126,7 +126,7 @@ const start = function (argv) {
         // predeploy
         predeploy({
           git,
-          handler: handler({ git, json, pb, quiet, sw }),
+          handler: handler({ json, pb, quiet, sw }),
           root,
           session,
         }),
@@ -162,7 +162,7 @@ const start = function (argv) {
       return deploy({
         artifact,
         git,
-        handler: handler({ git, json, pb, quiet, sw }),
+        handler: handler({ json, pb, quiet, sw }),
         root,
         session,
       });

package/package.json

@@ -58,5 +58,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.16"
+  "version": "0.1.18"
 }

package/src/action/login/flow.js

@@ -31,16 +31,16 @@ const POLL = {
 
 const postFlow = function ({ expiresAt, secret, type }) {
   const form = new FormData();
-  form.append("expires_at", expiresAt.toISOString());
   form.append("secret", secret);
   form.append("type", type);
+  form.append("expires_at", expiresAt.toISOString());
   return api.postFlow(form);
 };
 
 // [function]
 
-const getFlow = function ({ id, secret: token }) {
-  return api.getFlow(id, { token });
+const flow = function ({ id, secret: token }) {
+  return api.flow(id, { token });
 };
 
 // [function]
@@ -56,8 +56,8 @@ const createFlow = function ({ expiresAt, secret, type }, onLoginCreated) {
 
 // [function]
 
-const pollFlow = function ({ id, secret }, onLoginPoll) {
-  return getFlow({ id, secret }).then(({ data, status }) => {
+const pollFlow = function (value, onLoginPoll) {
+  return flow(value).then(({ data, status }) => {
     if (onLoginPoll) {
       onLoginPoll({ status });
     }
@@ -89,7 +89,7 @@ const main = function ({ onLoginCreated, onLoginPoll }) {
   ).then(({ id }) => {
     const timeout = Math.max(0, expiresAt.getTime() - Date.now() - time.s(15));
     return poll(
-      (flow) => pollFlow(flow, onLoginPoll),
+      (value) => pollFlow(value, onLoginPoll),
       { id, secret },
       { ...POLL, timeout },
     );

package/src/action/predeploy/ac.js

@@ -31,7 +31,7 @@ const uploadBuild = function (
 
 const ensureVersion = function (session, { id, version }, cb) {
   const token = session?.access_token;
-  return api.getGameBuild(id, version, { token }).then(
+  return api.gameBuild(id, version, { token }).then(
     () => cb(new Error(phrase.versionExists(version))),
     (err) => {
       if (err.status === 404) {

package/src/api.js

@@ -18,39 +18,39 @@ const endpoint = function (path) {
 
 // [function]
 
-const postAuthRefresh = function (form, options) {
-  return request.post(endpoint("/auth/refresh"), form, options);
+const postAuthRefresh = function (form, opts) {
+  return request.post(endpoint("/auth/refresh"), form, opts);
 };
 
 // [function]
 
-const postFlow = function (form, options) {
-  return request.post(endpoint("/flows"), form, options);
+const postFlow = function (form, opts) {
+  return request.post(endpoint("/flows"), form, opts);
 };
 
 // [function]
 
-const getFlow = function (flow, options) {
-  return request.get(endpoint(`/flows/${flow}`), options);
+const flow = function (id, opts) {
+  return request.get(endpoint(`/flows/${id}`), opts);
 };
 
 // [function]
 
-const postUpload = function (form, options) {
-  return request.post(endpoint("/uploads"), form, options);
+const postUpload = function (form, opts) {
+  return request.post(endpoint("/uploads"), form, opts);
 };
 
 // [function]
 
-const getGameBuild = function (game, version, options) {
-  return request.get(endpoint(`/games/${game}/builds/${version}`), options);
+const gameBuild = function (id, version, opts) {
+  return request.get(endpoint(`/games/${id}/builds/${version}`), opts);
 };
 
 // [export]
 
 module.exports = {
-  getFlow,
-  getGameBuild,
+  flow,
+  gameBuild,
   postAuthRefresh,
   postFlow,
   postUpload,

package/src/prompt/template.js

@@ -10,7 +10,7 @@ module.exports = {
   select: {
     choices: [
       {
-        description: "Zero-build static starter.",
+        description: "Plain JavaScript starter.",
         name: "Default",
         value: `${REPO}/starter`,
       },

package/src/util/progress.js

@@ -30,7 +30,7 @@ const formatBytes = function (bytes) {
 
 // [function]
 
-const formatValue = function (value, options, type) {
+const formatValue = function (value, opts, type) {
   if (type === "percentage") {
     return value;
   }

package/src/util/request.js

@@ -27,39 +27,46 @@ const parse = function (resp) {
 
 // [function]
 
-const send = function (method, url, body, { token } = {}) {
-  const headers = {
-    "X-Arc-Client-Id": CLIENT_ID,
-    "X-Arc-Client-Version": CLIENT_VERSION,
-  };
+const send = function (method, url, form, { token } = {}) {
+  const headers = [
+    ["X-Arcadible-Client-Id", CLIENT_ID],
+    ["X-Arcadible-Client-Version", CLIENT_VERSION],
+  ];
   if (token) {
-    headers.authorization = `Bearer ${token}`;
+    headers.push(["Authorization", `Bearer ${token}`]);
   }
-  return fetch(url, { body, headers, method }).then(parse);
+  if (form) {
+    headers.push(["Content-Type", "application/json"]);
+  }
+  return fetch(url, {
+    body: form ? JSON.stringify(Object.fromEntries(form)) : null,
+    headers,
+    method,
+  }).then(parse);
 };
 
 // [function]
 
-const get = function (url, options) {
-  return send("GET", url, null, options);
+const get = function (url, opts) {
+  return send("GET", url, null, opts);
 };
 
 // [function]
 
-const post = function (url, body, options) {
-  return send("POST", url, body, options);
+const post = function (url, form, opts) {
+  return send("POST", url, form, opts);
 };
 
 // [function]
 
-const patch = function (url, body, options) {
-  return send("PATCH", url, body, options);
+const patch = function (url, form, opts) {
+  return send("PATCH", url, form, opts);
 };
 
 // [function]
 
-const del = function (url, options) {
-  return send("DELETE", url, null, options);
+const del = function (url, opts) {
+  return send("DELETE", url, null, opts);
 };
 
 // [export]

package/src/util/s3.js

@@ -16,7 +16,7 @@ const request = https.request;
 
 // [function]
 
-const requestOptions = function (size) {
+const requestOpts = function (size) {
   return {
     headers: {
       "Content-Length": size,
@@ -29,7 +29,7 @@ const requestOptions = function (size) {
 // [function]
 
 const upload = function (url, { path, size }, onProgress, cb) {
-  const req = request(url, requestOptions(size), (resp) => {
+  const req = request(url, requestOpts(size), (resp) => {
     resp.resume();
     const status = resp.statusCode;
     if (status >= 200 && status < 300) {