@omerlo/omerlo-webkit 0.0.31 → 0.0.33

package/dist/omerlo/reader/endpoints/integration.js

@@ -1,4 +1,4 @@
-import { requestPublisher } from '../utils/request';
+import { requestOmerlo } from '../utils/request';
 export const integrationFetchers = (f) => {
     return {
         getReference: getReference(f)
@@ -7,7 +7,7 @@ export const integrationFetchers = (f) => {
 export function getReference(f) {
     return async (key) => {
         const opts = { parser: parseReference };
-        return requestPublisher(f, `/references/${key}`, opts);
+        return requestOmerlo(f, `/core/v2/references/${key}`, opts);
     };
 }
 export function parseReference(data, _assocs) {

package/dist/omerlo/reader/server/hooks.js

@@ -64,6 +64,10 @@ export const proxyHook = async ({ event, resolve }) => {
         event.url.pathname = event.url.pathname.replace('/api/publisher/', `/api/public/publisher/v2/`);
         return handleApiProxy({ event, resolve });
     }
+    if (event.url.pathname.startsWith('/api/omerlo/')) {
+        event.url.pathname = event.url.pathname.replace('/api/omerlo/', '/api/public/');
+        return handleApiProxy({ event, resolve });
+    }
     return resolve(event);
 };
 export const handleUserToken = async ({ event, resolve }) => {

package/dist/omerlo/reader/server/utils.js

@@ -52,7 +52,8 @@ const applicationToken = {
     accessToken: '',
     refreshToken: '',
     expiredAt: 0,
-    init: false
+    init: false,
+    refreshErrorCounter: 0
 };
 /**
  * Get the token used by the application.
@@ -66,16 +67,36 @@ export async function getApplicationToken() {
     }
     return applicationToken.accessToken;
 }
+let refreshingPromise = null;
 async function refreshApplicationToken() {
     if (!applicationToken.refreshToken) {
         throw new Error('Could not refresh the application token because the refresh token is null');
     }
-    const token = await refresh(applicationToken.refreshToken);
-    applicationToken.accessToken = token.accessToken;
-    applicationToken.refreshToken = token.refreshToken;
-    const date = new Date();
-    const timestamps = date.setSeconds(date.getSeconds() + token.expiresIn - 60);
-    applicationToken.expiredAt = timestamps;
+    if (refreshingPromise) {
+        return refreshingPromise;
+    }
+    refreshingPromise = (async () => {
+        try {
+            const token = await refresh(applicationToken.refreshToken);
+            applicationToken.accessToken = token.accessToken;
+            applicationToken.refreshToken = token.refreshToken;
+            const date = new Date();
+            const timestamps = date.setSeconds(date.getSeconds() + token.expiresIn - 60);
+            applicationToken.expiredAt = timestamps;
+            applicationToken.refreshErrorCounter = 0;
+        }
+        catch (e) {
+            applicationToken.refreshErrorCounter += 1;
+            if (applicationToken.refreshErrorCounter >= 10) {
+                applicationToken.init = false;
+            }
+            throw e;
+        }
+        finally {
+            refreshingPromise = null;
+        }
+    })();
+    return refreshingPromise;
 }
 async function newApplicationToken() {
     const token = await getAnonymousToken('application');

package/dist/omerlo/reader/utils/request.d.ts

@@ -16,4 +16,10 @@ export declare function dirtyRequest(f: typeof fetch, path: string, opts: DirtyF
  */
 export declare function requestPublisher<T>(f: typeof fetch, path: string, opts: Partial<FetchOptions<T>>): Promise<ApiResponse<T>>;
 export declare function dirtyRequestPublisher(f: typeof fetch, path: string, opts: DirtyFetchOptions): Promise<Response>;
+/**
+ * NOTE: This is for OLD api and will be removed once every API will
+ * be developped in Reader.
+ */
+export declare function requestOmerlo<T>(f: typeof fetch, path: string, opts: Partial<FetchOptions<T>>): Promise<ApiResponse<T>>;
+export declare function dirtyRequestOmerlo(f: typeof fetch, path: string, opts: DirtyFetchOptions): Promise<Response>;
 export {};

package/dist/omerlo/reader/utils/request.js

@@ -62,3 +62,24 @@ export async function dirtyRequestPublisher(f, path, opts) {
     }
     return f(path.toString(), opts);
 }
+/**
+ * NOTE: This is for OLD api and will be removed once every API will
+ * be developped in Reader.
+ */
+export async function requestOmerlo(f, path, opts) {
+    const { body, headers, method, queryParams, parser } = parseRequestOpts(opts);
+    return dirtyRequestOmerlo(f, path, { body, headers, method, queryParams }).then(async (resp) => {
+        return parseApiResponse(resp, parser);
+    });
+}
+export async function dirtyRequestOmerlo(f, path, opts) {
+    const queryParams = new URLSearchParams();
+    path = `/api/omerlo/${path}`;
+    if (opts?.queryParams) {
+        Object.entries(opts.queryParams).forEach(([key, value]) => {
+            queryParams.append(key, String(value));
+        });
+        path = `${path}?${queryParams}`;
+    }
+    return f(path.toString(), opts);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omerlo/omerlo-webkit",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run package",