react-native-update-cli 2.6.0 → 2.7.1

package/lib/api.js

@@ -21,6 +21,9 @@ _export(exports, {
     getAllPackages: function() {
         return getAllPackages;
     },
+    getApiToken: function() {
+        return getApiToken;
+    },
     getSession: function() {
         return getSession;
     },
@@ -39,6 +42,9 @@ _export(exports, {
     saveSession: function() {
         return saveSession;
     },
+    setApiToken: function() {
+        return setApiToken;
+    },
     uploadFile: function() {
         return uploadFile;
     }
@@ -63,12 +69,25 @@ function _interop_require_default(obj) {
 const tcpPing = _util.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
+let apiToken;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
+const getApiToken = ()=>apiToken;
+const setApiToken = (token)=>{
+    apiToken = token;
+};
+const loadApiTokenFromEnv = ()=>{
+    // Use CRESC_API_TOKEN for cresc, PUSHY_API_TOKEN for pushy
+    const envToken = _constants.IS_CRESC ? process.env.CRESC_API_TOKEN : process.env.PUSHY_API_TOKEN;
+    if (envToken) {
+        apiToken = envToken;
+    }
+};
 const replaceSession = (newSession)=>{
     session = newSession;
 };
 const loadSession = async ()=>{
+    loadApiTokenFromEnv();
     if (_fs.default.existsSync(_constants.credentialFile)) {
         try {
             replaceSession(JSON.parse(_fs.default.readFileSync(_constants.credentialFile, 'utf8')));
@@ -114,24 +133,38 @@ async function query(url, options) {
     return json;
 }
 function queryWithoutBody(method) {
-    return (api)=>query(api, {
+    return (api)=>{
+        const headers = {
+            'User-Agent': userAgent
+        };
+        if (apiToken) {
+            headers['x-api-token'] = apiToken;
+        } else if (session == null ? void 0 : session.token) {
+            headers['X-AccessToken'] = session.token;
+        }
+        return query(api, {
             method,
-            headers: {
-                'User-Agent': userAgent,
-                'X-AccessToken': session ? session.token : ''
-            }
+            headers
         });
+    };
 }
 function queryWithBody(method) {
-    return (api, body)=>query(api, {
+    return (api, body)=>{
+        const headers = {
+            'User-Agent': userAgent,
+            'Content-Type': 'application/json'
+        };
+        if (apiToken) {
+            headers['x-api-token'] = apiToken;
+        } else if (session == null ? void 0 : session.token) {
+            headers['X-AccessToken'] = session.token;
+        }
+        return query(api, {
             method,
-            headers: {
-                'User-Agent': userAgent,
-                'Content-Type': 'application/json',
-                'X-AccessToken': session ? session.token : ''
-            },
+            headers,
             body: JSON.stringify(body)
         });
+    };
 }
 const get = queryWithoutBody('GET');
 const post = queryWithBody('POST');
@@ -185,6 +218,9 @@ async function uploadFile(fn, key) {
         form.append('key', key);
     }
     form.append('file', fileStream);
+    // form.append('file', fileStream, {
+    //   contentType: 'application/octet-stream',
+    // });
     const res = await (0, _nodefetch.default)(realUrl, {
         method: 'POST',
         body: form

package/lib/package.js

@@ -233,7 +233,7 @@ const packageCommands = {
         const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
             name: versionName,
             hash,
-            buildTime,
+            buildTime: String(buildTime),
             deps: _depversions.depVersions,
             commit: await (0, _git.getCommitInfo)()
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.6.0",
+  "version": "2.7.1",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/api.ts

@@ -9,23 +9,41 @@ import tcpp from 'tcp-ping';
 import { getBaseUrl } from 'utils/http-helper';
 import packageJson from '../package.json';
 import type { Package, Session } from './types';
-import { credentialFile, pricingPageUrl } from './utils/constants';
+import { credentialFile, pricingPageUrl, IS_CRESC } from './utils/constants';
 import { t } from './utils/i18n';
 
 const tcpPing = util.promisify(tcpp.ping);
 
 let session: Session | undefined;
 let savedSession: Session | undefined;
+let apiToken: string | undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
 export const getSession = () => session;
 
+export const getApiToken = () => apiToken;
+
+export const setApiToken = (token: string) => {
+  apiToken = token;
+};
+
+const loadApiTokenFromEnv = () => {
+  // Use CRESC_API_TOKEN for cresc, PUSHY_API_TOKEN for pushy
+  const envToken = IS_CRESC
+    ? process.env.CRESC_API_TOKEN
+    : process.env.PUSHY_API_TOKEN;
+  if (envToken) {
+    apiToken = envToken;
+  }
+};
+
 export const replaceSession = (newSession: { token: string }) => {
   session = newSession;
 };
 
 export const loadSession = async () => {
+  loadApiTokenFromEnv();
   if (fs.existsSync(credentialFile)) {
     try {
       replaceSession(JSON.parse(fs.readFileSync(credentialFile, 'utf8')));
@@ -78,27 +96,39 @@ async function query(url: string, options: fetch.RequestInit) {
 }
 
 function queryWithoutBody(method: string) {
-  return (api: string) =>
-    query(api, {
+  return (api: string) => {
+    const headers: Record<string, string> = {
+      'User-Agent': userAgent,
+    };
+    if (apiToken) {
+      headers['x-api-token'] = apiToken;
+    } else if (session?.token) {
+      headers['X-AccessToken'] = session.token;
+    }
+    return query(api, {
       method,
-      headers: {
-        'User-Agent': userAgent,
-        'X-AccessToken': session ? session.token : '',
-      },
+      headers,
     });
+  };
 }
 
 function queryWithBody(method: string) {
-  return (api: string, body?: Record<string, any>) =>
-    query(api, {
+  return (api: string, body?: Record<string, any>) => {
+    const headers: Record<string, string> = {
+      'User-Agent': userAgent,
+      'Content-Type': 'application/json',
+    };
+    if (apiToken) {
+      headers['x-api-token'] = apiToken;
+    } else if (session?.token) {
+      headers['X-AccessToken'] = session.token;
+    }
+    return query(api, {
       method,
-      headers: {
-        'User-Agent': userAgent,
-        'Content-Type': 'application/json',
-        'X-AccessToken': session ? session.token : '',
-      },
+      headers,
       body: JSON.stringify(body),
     });
+  };
 }
 
 export const get = queryWithoutBody('GET');
@@ -161,6 +191,9 @@ export async function uploadFile(fn: string, key?: string) {
     form.append('key', key);
   }
   form.append('file', fileStream);
+  // form.append('file', fileStream, {
+  //   contentType: 'application/octet-stream',
+  // });
 
   const res = await fetch(realUrl, {
     method: 'POST',

package/src/package.ts

@@ -229,7 +229,7 @@ export const packageCommands = {
     const { id } = await post(`/app/${appId}/package/create`, {
       name: versionName,
       hash,
-      buildTime,
+      buildTime: String(buildTime),
       deps: depVersions,
       commit: await getCommitInfo(),
     });