@ngrok/ngrok-api 0.1.0 → 0.7.0

package/src/util.ts

@@ -0,0 +1,48 @@
+export function onFulfilled(f) {
+  return f;
+}
+
+export function onRejected(e: Error) {
+  const errMsg = deserializeResult(JSON.parse(e.message));
+  errMsg.details = new Map(Object.entries(errMsg.details));
+  throw errMsg;
+}
+
+export function deserializeResult(obj) {
+  return objectKeysTo(obj, snakeToLowerCamel);
+}
+
+export function serializeArgument(obj) {
+  return JSON.stringify(objectKeysTo(obj, lowerCamelToSnake), replacer);
+}
+
+function replacer(key, value) {
+  if (value instanceof Map) {
+    return Object.fromEntries(value);
+  } else {
+    return value;
+  }
+}
+
+function snakeToLowerCamel(s: string): string {
+  return s.replace(/([-_]\w)/g, g => g[1].toUpperCase());
+}
+
+function lowerCamelToSnake(s: string): string {
+  return s.replace(/[A-Z]/g, g => `_${g.toLowerCase()}`);
+}
+
+function objectKeysTo(obj, keyFunc) {
+  if (obj === null) {
+    return obj;
+  } else if (Array.isArray(obj)) {
+    return obj.map(item => objectKeysTo(item, keyFunc));
+  } else if (typeof obj === 'object') {
+    return Object.keys(obj).reduce((acc, k) => {
+      acc[keyFunc(k)] = objectKeysTo(obj[k], keyFunc);
+      return acc;
+    }, {});
+  } else {
+    return obj;
+  }
+}

package/test/apikey.test.js

@@ -5,54 +5,65 @@ global.fetch = require('node-fetch');
 
 describe('valid ngrok api key', () => {
   let ngrok;
+  let noMocks = process.env.TEST_NO_MOCK == '1';
+  let ifMock = fn => {
+    if (!noMocks) {
+      return fn();
+    }
+  };
 
   beforeAll(() => {
     ngrok = new Ngrok({
       apiToken: process.env.NGROK_API_KEY,
-      baseUrl: 'https://api.ngrok.com.lan',
+      baseUrl: 'https://api.ngrok.com',
     });
   });
 
   test('non-empty api keys list', () => {
-    nock('https://api.ngrok.com.lan')
-      .get('/api_keys')
-      .query({
-        limit: '100',
-      })
-      .reply(200, {
-        keys: [
-          {
-            id: 'ak_1jCnOTFMXku4RbU8icW3lncpCoz',
-            uri: 'https://api.ngrok.com.lan/api_keys/ak_1jCnOTFMXku4RbU8icW3lncpCoz',
-            description: '',
-            metadata: '',
-            created_at: '2020-10-21T21:48:28Z',
-            token: null,
-          },
-        ],
-        uri: 'https://api.ngrok.com.lan/api_keys',
-        next_page_uri: null,
-      });
+    ifMock(() =>
+      nock('https://api.ngrok.com')
+        .get('/api_keys')
+        .query({
+          limit: '100',
+        })
+        .reply(200, {
+          keys: [
+            {
+              id: 'ak_1jCnOTFMXku4RbU8icW3lncpCoz',
+              uri: 'https://api.ngrok.com/api_keys/ak_1jCnOTFMXku4RbU8icW3lncpCoz',
+              description: '',
+              metadata: '',
+              created_at: '2020-10-21T21:48:28Z',
+              token: null,
+            },
+          ],
+          uri: 'https://api.ngrok.com/api_keys',
+          next_page_uri: null,
+        })
+    );
 
     expect.assertions(1);
-    return ngrok.APIKeys.list().then(result => {
+    return ngrok.apiKeys.list().then(result => {
       expect(result.length).toBeGreaterThan(0);
     });
   });
 
   test('api keys invalid id', () => {
-    nock('https://api.ngrok.com.lan')
-      .get('/api_keys/1000')
-      .reply(404, {
-        error_code: 'ERR_NGROK_222',
-        status_code: 404,
-        msg: "The API Key resource identified by '100' could not be found because the identifier is not a valid identifier.",
-        details: { operation_id: 'op_1jF49fn7npJRATGKUgqig5GgHMA' },
-      });
+    ifMock(() =>
+      nock('https://api.ngrok.com')
+        .get('/api_keys/1000')
+        .reply(404, {
+          error_code: 'ERR_NGROK_222',
+          status_code: 404,
+          msg: "The API Key resource identified by '100' could not be found because the identifier is not a valid identifier.",
+          details: { operation_id: 'op_1jF49fn7npJRATGKUgqig5GgHMA' },
+        })
+    );
 
     expect.assertions(1);
     return (
-      ngrok.APIKeys.get({ id: '1000' })
+      ngrok.apiKeys
+        .get({ id: '1000' })
         /* eslint jest/no-conditional-expect: "warn" */
         .catch(result => {
           expect(JSON.stringify(result)).toMatch(