@forge/cache 0.10.0-next.2 → 0.10.0

package/out/__test__/cache.test.js

@@ -55,7 +55,6 @@ describe('createFetch', () => {
         await expect((0, cache_1.createFetchRmsRuntimeV2)()).rejects.toThrowError(new Error('RMS config not available.'));
     });
     it('creates a fetch that adds the right headers and url', async () => {
-        var _a;
         global['__forge_runtime__'] = {
             proxy: {
                 token: 'token',
@@ -72,10 +71,10 @@ describe('createFetch', () => {
         };
         const fetch = (0, cache_1.createFetchRmsRuntimeV2)();
         await fetch('path');
-        const [absoluteUrl, options] = (_a = fetchMock.mock.lastCall) !== null && _a !== void 0 ? _a : ['', {}];
+        const [absoluteUrl, options] = fetchMock.mock.lastCall ?? ['', {}];
         expect(absoluteUrl.toString()).toEqual('https://rms/path');
-        expect((options === null || options === void 0 ? void 0 : options.agent)['passthrough']['keepAlive']).toBeTruthy();
-        expect(options === null || options === void 0 ? void 0 : options.headers).toMatchObject({
+        expect((options?.agent)['passthrough']['keepAlive']).toBeTruthy();
+        expect(options?.headers).toMatchObject({
             Authorization: 'Bearer token',
             Host: 'rockmelon-storage.dev.atl-paas.net',
             'x-b3-traceid': 'trace-id-test',

package/out/cache.js

@@ -7,6 +7,9 @@ const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const api_1 = require("@forge/api");
 const tunnel_1 = require("./tunnel");
 class ApiError extends Error {
+    status;
+    code;
+    data;
     constructor(status, code, message, data) {
         super(message);
         this.status = status;
@@ -16,12 +19,11 @@ class ApiError extends Error {
 }
 exports.ApiError = ApiError;
 async function getResponseBody(response) {
-    var _a, _b, _c;
     const responseText = await response.text();
     if (!response.ok) {
         try {
             const parsedError = JSON.parse(responseText);
-            throw new ApiError(response.status, (_a = parsedError === null || parsedError === void 0 ? void 0 : parsedError.error) === null || _a === void 0 ? void 0 : _a.code, `"title":"${(_b = parsedError === null || parsedError === void 0 ? void 0 : parsedError.error) === null || _b === void 0 ? void 0 : _b.title}"`, (_c = parsedError === null || parsedError === void 0 ? void 0 : parsedError.error) === null || _c === void 0 ? void 0 : _c.data);
+            throw new ApiError(response.status, parsedError?.error?.code, `"title":"${parsedError?.error?.title}"`, parsedError?.error?.data);
         }
         catch (e) {
             if (!(e instanceof ApiError)) {
@@ -41,6 +43,7 @@ async function getResponseBody(response) {
 }
 exports.getResponseBody = getResponseBody;
 class Cache {
+    client;
     constructor(client) {
         this.client = client;
     }
@@ -54,11 +57,11 @@ class Cache {
         };
     }
     async set(key, value, opt) {
-        const response = await this.client('rms/store/set', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/set', this.buildRequest({ key, value, ...opt }));
         await getResponseBody(response);
     }
     async setIfNotExists(key, value, opt) {
-        const response = await this.client('rms/store/setnx', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/setnx', this.buildRequest({ key, value, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
@@ -68,17 +71,17 @@ class Cache {
         return result;
     }
     async getAndSet(key, value, opt) {
-        const response = await this.client('rms/store/getset', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/getset', this.buildRequest({ key, value, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
     async incrementAndGet(key, opt) {
-        const response = await this.client('rms/store/incr', this.buildRequest(Object.assign({ key }, opt)));
+        const response = await this.client('rms/store/incr', this.buildRequest({ key, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
     async decrementAndGet(key, opt) {
-        const response = await this.client('rms/store/decr', this.buildRequest(Object.assign({ key }, opt)));
+        const response = await this.client('rms/store/decr', this.buildRequest({ key, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
@@ -110,29 +113,37 @@ class Cache {
 }
 exports.Cache = Cache;
 function getFetchRmsRuntimeV1() {
-    var _a;
-    return (_a = global.api) === null || _a === void 0 ? void 0 : _a.requestRmsStore;
+    return global.api?.requestRmsStore;
 }
 exports.getFetchRmsRuntimeV1 = getFetchRmsRuntimeV1;
 function createFetchRmsRuntimeV2() {
     const agent = new https_1.Agent({ keepAlive: true });
     return async function (path, options) {
         const { proxy, rms, tracing } = (0, api_1.__getRuntime)();
-        if (!(rms === null || rms === void 0 ? void 0 : rms.url) || !(rms === null || rms === void 0 ? void 0 : rms.host)) {
+        if (!rms?.url || !rms?.host) {
             throw new Error('RMS config not available.');
         }
         const rmsAgent = new String('FORGE_PRODUCT_REQUEST');
         rmsAgent['passthrough'] = agent;
-        return await (0, node_fetch_1.default)(new URL(path, 'https://rms/'), Object.assign(Object.assign({}, options), { agent: rmsAgent, headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { Authorization: `Bearer ${proxy.token}`, Host: rms.host, 'x-b3-traceid': tracing.traceId, 'x-b3-spanid': tracing.spanId }) }));
+        return await (0, node_fetch_1.default)(new URL(path, 'https://rms/'), {
+            ...options,
+            agent: rmsAgent,
+            headers: {
+                ...options?.headers,
+                Authorization: `Bearer ${proxy.token}`,
+                Host: rms.host,
+                'x-b3-traceid': tracing.traceId,
+                'x-b3-spanid': tracing.spanId
+            }
+        });
     };
 }
 exports.createFetchRmsRuntimeV2 = createFetchRmsRuntimeV2;
 function connect(localCacheFileName) {
-    var _a;
     if (global.__forge_tunnel__) {
         return new tunnel_1.TunnelCache(localCacheFileName);
     }
-    const fetch = (_a = getFetchRmsRuntimeV1()) !== null && _a !== void 0 ? _a : createFetchRmsRuntimeV2();
+    const fetch = getFetchRmsRuntimeV1() ?? createFetchRmsRuntimeV2();
     return new Cache(fetch);
 }
 exports.connect = connect;

package/out/tunnel.js

@@ -10,15 +10,18 @@ const LOG_PREFIX = '@forge/cache tunnel: ';
 exports.CACHE_DIR = '.forge';
 exports.CACHE_FILE = exports.CACHE_DIR + '/cache.json';
 const warn = (message, meta) => {
-    console.warn(LOG_PREFIX + message, meta !== null && meta !== void 0 ? meta : '');
+    console.warn(LOG_PREFIX + message, meta ?? '');
 };
 const info = (message, meta) => {
-    console.info(LOG_PREFIX + message, meta !== null && meta !== void 0 ? meta : '');
+    console.info(LOG_PREFIX + message, meta ?? '');
 };
 const error = (err) => {
     console.error(LOG_PREFIX, err);
 };
 class TunnelCache {
+    fileName;
+    __localStore;
+    events;
     constructor(fileName = exports.CACHE_FILE) {
         this.fileName = fileName;
         warn('Using local implementation of @forge/cache.');
@@ -70,7 +73,7 @@ class TunnelCache {
         (0, validator_1.assertIsValidKey)(key);
         const value = this.__localStore.get(key);
         (0, validator_1.assertAndThrowIfArray)(value);
-        const { response: result } = await this.parseSuccessResponse(value !== null && value !== void 0 ? value : null);
+        const { response: result } = await this.parseSuccessResponse(value ?? null);
         return result;
     }
     async setIfNotExists(key, value, opt) {
@@ -87,11 +90,10 @@ class TunnelCache {
         return result;
     }
     async getAndSet(key, value, opt) {
-        var _a;
         (0, validator_1.assertIsValidKey)(key);
         (0, validator_1.assertIsValidValue)(value);
         (0, validator_1.assertIsSizedValue)(value);
-        const oldValue = (_a = this.__localStore.get(key)) !== null && _a !== void 0 ? _a : null;
+        const oldValue = this.__localStore.get(key) ?? null;
         this.__localStore.set(key, value);
         this.events.emit('change');
         const { response: result } = await this.parseSuccessResponse(oldValue);
@@ -109,11 +111,10 @@ class TunnelCache {
         return result;
     }
     async incrementAndGet(key, opt) {
-        var _a;
         (0, validator_1.assertIsValidKey)(key);
         const oldValue = this.__localStore.get(key);
         (0, validator_1.assertAndThrowIfArray)(oldValue);
-        const newValue = Number.parseInt((_a = oldValue) !== null && _a !== void 0 ? _a : '0') + 1;
+        const newValue = Number.parseInt(oldValue ?? '0') + 1;
         this.__localStore.set(key, newValue.toString());
         this.events.emit('change');
         const { response: result } = await this.parseSuccessResponse(newValue);
@@ -157,19 +158,18 @@ class TunnelCache {
         return result;
     }
     async decrementAndGet(key, opt) {
-        var _a;
         (0, validator_1.assertIsValidKey)(key);
         const oldValue = this.__localStore.get(key);
         (0, validator_1.assertAndThrowIfArray)(oldValue);
-        const newValue = Number.parseInt((_a = oldValue) !== null && _a !== void 0 ? _a : '0') - 1;
+        const newValue = Number.parseInt(oldValue ?? '0') - 1;
         this.__localStore.set(key, newValue.toString());
         this.events.emit('change');
         const { response: result } = await this.parseSuccessResponse(newValue);
         return result;
     }
     async scan(pattern, opt) {
-        const cursor = (opt === null || opt === void 0 ? void 0 : opt.cursor) ? Number(opt.cursor) : 0;
-        const count = (opt === null || opt === void 0 ? void 0 : opt.count) || 10;
+        const cursor = opt?.cursor ? Number(opt.cursor) : 0;
+        const count = opt?.count || 10;
         const escapedPattern = pattern.replace(/([.+^${}()|\\])/g, '\\$1');
         const regexPattern = escapedPattern.replace(/\*/g, '.*').replace(/\?/g, '.');
         const regex = new RegExp(regexPattern);
@@ -184,7 +184,7 @@ class TunnelCache {
     }
     parseSuccessResponse(response) {
         return Promise.resolve({
-            response: response !== null && response !== void 0 ? response : null
+            response: response ?? null
         });
     }
 }

package/out/utils/validator.js

@@ -9,6 +9,9 @@ const VALID_KEY_REGEX = /^(?!\s+$)[a-zA-Z0-9:._\s-#]+$/;
 const KiB = 1024;
 const MAX_VALID_VALUE_LENGTH = 240 * KiB;
 class TunnelError extends Error {
+    status;
+    code;
+    data;
     constructor(status, code, message, data) {
         super(`"title":"${message}"`);
         this.status = status;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cache",
-  "version": "0.10.0-next.2",
+  "version": "0.10.0",
   "description": "Forge Cache methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -21,7 +21,7 @@
     "tmp": "^0.2.3"
   },
   "dependencies": {
-    "@forge/api": "^3.7.0-next.0",
+    "@forge/api": "^3.7.0",
     "object-sizeof": "^2.6.4"
   }
 }