-
diff --git a/src/main/connect-locator.js b/src/main/connect-locator.js
index 7f078f4a..894566e4 100644
--- a/src/main/connect-locator.js
+++ b/src/main/connect-locator.js
@@ -37,11 +37,19 @@ class ConnectLocator extends ServiceWorkerComponent {
return this.worker.serverConnector
.asRuntimeInfo()
.then((info) => ({ connectRegistration: { connectUrl: undefined }, ...info }))
+ .then((info) => {
+ this
+ .asConsole()
+ .then((console) => console
+ .log('connect-locator.asRegistration', info));
+ return info;
+ })
.then(({ serverUrl: nuxeoUrl, connectRegistration: { connectUrl: connectLocation } }) => {
if (!connectLocation) {
return {
location: 'about:blank',
- credentials: undefined
+ credentials: undefined,
+ cookiesGranted: false // Assuming no permission needed for 'about:blank'
};
}
const nuxeoKey = this.nuxeoKeyOf(new URL(nuxeoUrl));
@@ -50,17 +58,25 @@ class ConnectLocator extends ServiceWorkerComponent {
const credentialsKey = this.credentialsKeyOf(location);
return this.worker.browserStore
.set({ [nuxeoKey]: location, [credentialsKey]: credentials })
- .then((store) => (console.warn('connect-locator.asRegistration', store), store))
.then(() => this.asRegistration());
}
return this.worker.browserStore
.get({ [nuxeoKey]: connectLocation })
- .then((store) => new URL(store[nuxeoKey]))
- .then((location) => ({ location, credentialsKey: this.credentialsKeyOf(location) }))
- .then(({ location, credentialsKey }) => this.worker.browserStore.get({ [credentialsKey]: undefined })
+ .then((store) => store[nuxeoKey])
+ .then((storedLocation) => chrome.permissions
+ .contains({ origins: [`${storedLocation}/*`], permissions: ['cookies'] })
+ .then((cookiesGranted) => ({
+ location: storedLocation,
+ credentialsKey: this.credentialsKeyOf(storedLocation),
+ cookiesGranted
+ }))
+ )
+ .then(({ location, credentialsKey, cookiesGranted }) => this.worker
+ .browserStore.get({ [credentialsKey]: undefined })
.then((credentialsStore) => ({
location,
- credentials: credentialsStore[credentialsKey]
+ credentials: credentialsStore[credentialsKey],
+ cookiesGranted
})));
});
}
diff --git a/src/main/cookie-manager.js b/src/main/cookie-manager.js
index 1be43d42..99a67d87 100644
--- a/src/main/cookie-manager.js
+++ b/src/main/cookie-manager.js
@@ -1,105 +1,42 @@
import ServiceWorkerComponent from './service-worker-component';
class CookieManager extends ServiceWorkerComponent {
- constructor(worker) {
- super(worker);
- this._domainCookies = new Map();
- this._undoStack = [];
-
- // Bind methods
- Object.getOwnPropertyNames(Object.getPrototypeOf(this))
- .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
- .forEach((method) => {
- this[method] = this[method].bind(this);
- });
- }
-
- enable() {
- chrome.tabs.query({}, (tabs) => {
- tabs.forEach((tab) => {
- const urlObj = new URL(tab.url);
- const domain = urlObj.hostname;
- chrome.cookies.getAll({ domain }, (cookies) => {
- this._domainCookies.set(domain, cookies);
- });
- });
- });
- chrome.cookies.onChanged.addListener(this.onChanged);
- this._undoStack.push(() => chrome.cookies.onChanged.removeListener(this.onCookieChanged));
- }
-
- disable() {
- this._undoStack.forEach((undo) => undo());
- this._undoStack = [];
- }
-
- onCookieChanged(changeInfo) {
- const cookieDomain = changeInfo.cookie.domain;
- return this.asPromise()
- .then(() => {
- if (!changeInfo.removed) return;
- // Remove the cookie from the map
- const domainCookies = this._domainCookies.get(cookieDomain);
- if (!domainCookies) return;
- const cookieIndex = domainCookies.findIndex((cookie) => cookie.name === changeInfo.cookie.name);
- if (cookieIndex === -1) {
- return;
- }
- domainCookies.splice(cookieIndex, 1);
- })
- .then(() => {
- if (changeInfo.removed) return;
- // Add or update the cookie in the map
- let domainCookies = this._domainCookies.get(cookieDomain);
- if (!domainCookies) {
- // shoud allocate the entry for the domain
- domainCookies = [];
- this._domainCookies.set(cookieDomain, domainCookies);
- }
- const existingCookie = domainCookies.find((cookie) => cookie.name === changeInfo.cookie.name);
- if (existingCookie) {
- // update cookie
- Object.assign(existingCookie, changeInfo.cookie);
- return;
- }
- // add cookie
- domainCookies.push(changeInfo.cookie);
- });
- }
-
+ // eslint-disable-next-line class-methods-use-this
cookieHeaderOf(url) {
- const urlObj = new URL(url);
- const scheme = urlObj.protocol.slice(0, -1); // Remove the last character (colon)
- const domain = urlObj.hostname;
- const cookies = this._domainCookies.get(domain);
- if (!cookies) {
- return {
- domain,
- cookieHeader: ''
- };
- }
- return {
- domain,
- cookieHeader: cookies.map((cookie) => {
- if (cookie.secure && scheme !== 'https') {
- return null; // Skip secure cookies if not on https
- }
- if (cookie.httpOnly && !(scheme === 'https' || scheme === 'http')) {
- return null; // Skip httpOnly cookies if not on http or https
- }
- let cookieString = `${cookie.name}=${cookie.value}`;
- if (cookie.secure) {
- cookieString += '; Secure';
- }
- if (cookie.httpOnly) {
- cookieString += '; HttpOnly';
- }
- if (cookie.sameSite) {
- cookieString += `; SameSite=${cookie.sameSite}`;
- }
- return cookieString;
- }).filter(Boolean).join('; ')
- };
+ const scheme = url.protocol.slice(0, -1); // Remove the last character (colon)
+ const domain = url.hostname;
+ return chrome.cookies.getAll({ domain })
+ .then((cookies) => {
+ if (!cookies) {
+ return {
+ domain,
+ cookieHeader: ''
+ };
+ }
+ const info = {
+ domain,
+ cookieHeader: cookies.map((cookie) => {
+ if (cookie.secure && scheme !== 'https') {
+ return null; // Skip secure cookies if not on https
+ }
+ if (cookie.httpOnly && !(scheme === 'https' || scheme === 'http')) {
+ return null; // Skip httpOnly cookies if not on http or https
+ }
+ let cookieString = `${cookie.name}=${cookie.value}`;
+ if (cookie.secure) {
+ cookieString += '; Secure';
+ }
+ if (cookie.httpOnly) {
+ cookieString += '; HttpOnly';
+ }
+ if (cookie.sameSite) {
+ cookieString += `; SameSite=${cookie.sameSite}`;
+ }
+ return cookieString;
+ }).filter(Boolean).join('; ')
+ };
+ return info;
+ });
}
}
diff --git a/src/main/declarative-net-engine.js b/src/main/declarative-net-engine.js
index 9315031b..b39624dd 100644
--- a/src/main/declarative-net-engine.js
+++ b/src/main/declarative-net-engine.js
@@ -3,7 +3,7 @@ import ServiceWorkerComponent from './service-worker-component';
class BaseRule {
constructor() {
- this.priority = 1;
+ this.priority = 100;
}
hashCode() {
@@ -106,10 +106,54 @@ class BasicAuthenticationHeaderRule extends BaseRule {
}
}
+class CacheControlHeaderRule extends BaseRule {
+ constructor(url, cacheControlHeader) {
+ super();
+
+ // Set properties
+ this.cacheControlHeader = cacheControlHeader;
+ this.url = url;
+
+ // Bind methods
+ Object.getOwnPropertyNames(Object.getPrototypeOf(this))
+ .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
+ .forEach((method) => {
+ this[method] = this[method].bind(this);
+ });
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ key() {
+ return `cacheControlHeader-${this.url}`;
+ }
+
+ toJson(priority = 1) {
+ return {
+ id: this.hashCode(),
+ priority,
+ condition: {
+ urlFilter: this.url.toString(),
+ },
+ action: {
+ type: 'modifyHeaders',
+ requestHeaders: [
+ {
+ header: 'Cache-Control',
+ operation: 'set',
+ value: this.cacheControlHeader,
+ },
+ ],
+ },
+ };
+ }
+}
+
class RedirectRule extends BaseRule {
constructor(from, to) {
super();
+ this.priority -= 10;
+
// Set properties
this.from = from;
this.to = to;
@@ -127,11 +171,11 @@ class RedirectRule extends BaseRule {
}
toJson(priority = 1) {
- return {
+ const json = {
id: this.hashCode(),
priority,
condition: {
- urlFilter: this.from.toString(),
+ urlFilter: this.from.toString()
},
action: {
type: 'redirect',
@@ -139,12 +183,13 @@ class RedirectRule extends BaseRule {
transform: {
scheme: this.to.protocol.slice(0, -1), // Use the scheme from the `to` URL
host: this.to.host,
- port: (this.to.port && this.to.port !== '') ? this.to.port : '443', // Handle the case where the port is an empty string
+ port: (this.to.port && this.to.port !== '') ? this.to.port : '', // Use the default port if the port is an empty string
path: this.to.pathname,
},
},
},
};
+ return json;
}
}
@@ -171,6 +216,29 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
});
}
+ activate() {
+ return this.asPromise()
+ .then(() => {
+ this
+ .asDevelopmentMode()
+ // eslint-disable-next-line no-unused-vars
+ .then((developmentMode) => {
+ console.log('DeclarativeNetEngine activated');
+ const debugListener = (info) => {
+ console.log('Rule matched:', info);
+ };
+ if (!chrome.declarativeNetRequest.onRuleMatchedDebug) {
+ console.warn('Cannot listen on rules matched in declarative net engine');
+ return () => {};
+ }
+ chrome.declarativeNetRequest
+ .onRuleMatchedDebug.addListener(debugListener);
+ return () => chrome.declarativeNetRequest
+ .onRuleMatchedDebug.removeListener(debugListener);
+ });
+ });
+ }
+
push(rule) {
return Promise.resolve(rule)
.then((r) => {
@@ -179,7 +247,7 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
return r;
})
.then((r) => {
- this.worker.developmentMode
+ this.worker
.asConsole()
.then((console) => console
.log(`Pushed rule: ${JSON.stringify(r.toJson())}`));
@@ -196,7 +264,7 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
return rule;
})
.then((rule) => {
- this.worker.developmentMode
+ this
.asConsole()
.then((console) => console
.log(`Popped rule: ${JSON.stringify(rule.toJson())}`));
@@ -213,7 +281,8 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
.then(({ pendingRules, undoRules }) => chrome.declarativeNetRequest
.updateSessionRules(pendingRules)
.catch((cause) => {
- this.worker.developmentMode.asConsole()
+ this
+ .asConsole()
.then((console) => console
.log(`Failed to flush rules: ${JSON.stringify(pendingRules)}`, cause));
throw cause;
@@ -224,7 +293,8 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
})
.then(() => () => chrome.declarativeNetRequest
.updateSessionRules(undoRules))
- .then((undo) => this.worker.developmentMode.asConsole()
+ .then((undo) => this
+ .asConsole()
.then((console) => console.log(`Successfully flushed rules: ${JSON.stringify(pendingRules)}`))
.then(() => undo)));
}
@@ -237,11 +307,13 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
undo(rules) {
return chrome.declarativeNetRequest
.updateSessionRules(rules)
- .then(() => this.worker.developmentMode.asConsole()
+ .then(() => this
+ .asConsole()
.then((console) => console
.log(`Successfully undid flush of rules: ${JSON.stringify(rules)}`)))
.catch((cause) => {
- this.worker.developmentMode.asConsole()
+ this
+ .asConsole()
.then((console) => console
.log(`Failed to undo flush of rules: ${JSON.stringify(rules)}`, cause));
throw cause;
@@ -252,7 +324,7 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
return Promise.resolve()
.then(() => chrome.declarativeNetRequest.getSessionRules())
.then((rules) => {
- this.worker.developmentMode
+ this
.asConsole()
.then((console) => console
.log(`Flushed rules: ${JSON.stringify(rules)}`));
@@ -297,5 +369,5 @@ class DeclarativeNetEngine extends ServiceWorkerComponent {
}
export default {
- BasicAuthenticationHeaderRule, CookieHeaderRule, RedirectRule, DeclarativeNetEngine,
+ BasicAuthenticationHeaderRule, CookieHeaderRule, CacheControlHeaderRule, RedirectRule, DeclarativeNetEngine,
};
diff --git a/src/main/designer-live-preview.js b/src/main/designer-live-preview.js
index 562c9740..d17fc734 100644
--- a/src/main/designer-live-preview.js
+++ b/src/main/designer-live-preview.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-sequences */
/* eslint-disable function-paren-newline */
/* eslint-disable implicit-arrow-linebreak */
/* eslint-disable max-classes-per-file */
@@ -23,6 +24,7 @@ import ServiceWorkerComponent from './service-worker-component';
const BasicAuthenticationHeaderRule = DeclarativeNetComponents.BasicAuthenticationHeaderRule;
const CookieHeaderRule = DeclarativeNetComponents.CookieHeaderRule;
+const CacheControlHeaderRule = DeclarativeNetComponents.CacheControlHeaderRule;
const RedirectRule = DeclarativeNetComponents.RedirectRule;
class DesignerLivePreview extends ServiceWorkerComponent {
@@ -49,12 +51,20 @@ class DesignerLivePreview extends ServiceWorkerComponent {
}
pushCookieHeaderOf(url) {
- const { domain, cookieHeader } = this.worker.cookieManager.cookieHeaderOf(url);
- return this.worker.declarativeNetEngine.push(new CookieHeaderRule(domain, cookieHeader));
+ return this.worker.cookieManager.cookieHeaderOf(url)
+ .then(({ domain, cookieHeader }) => this.worker
+ .declarativeNetEngine.push(new CookieHeaderRule(domain, cookieHeader)));
}
- pushRedirectionsOf(json, credentials = undefined, rootUrl = this.worker.serverConnector.serverUrl) {
- const nuxeoBase = rootUrl.href.endsWith('/') ? rootUrl.href : `${rootUrl.href}/`;
+ pushNoCacheControlHeaderOf(url) {
+ return this.worker.declarativeNetEngine.push(new CacheControlHeaderRule(url, 'no-cache, no-store, must-revalidate'));
+ }
+
+ pushRedirectionsOf(json, credentials = undefined, runtimeInfo = this.worker.serverConnector.runtimeInfo) {
+ const { serverUrl: serverLocation, connectRegistration: { connectUrl: connectLocation } } = runtimeInfo;
+ const serverUrl = new URL(serverLocation);
+ const connectUrl = new URL(connectLocation);
+ const nuxeoBase = serverUrl.href.endsWith('/') ? serverUrl.href : `${serverUrl.href}/`;
const promises = Object.keys(json).flatMap((basePath) => {
const nuxeoBasePath = basePath.replace(
@@ -66,12 +76,18 @@ class DesignerLivePreview extends ServiceWorkerComponent {
}
const files = Object.keys(json[basePath]);
return files.map((resourcePath) => {
- const connectUrl = new URL(json[basePath][resourcePath]);
- const nuxeoUrl = new URL(`${nuxeoBasePath}/${resourcePath}`, nuxeoBase);
+ const resourceNuxeoUrl = new URL(`${nuxeoBasePath}/${resourcePath}`, nuxeoBase);
+ const resourceConnectUrl = new URL(json[basePath][resourcePath]);
+ const updatedResourceConnectUrl = new URL(`${resourceConnectUrl.pathname}${resourceConnectUrl.search}${resourceConnectUrl.hash}`, connectUrl);
+
+ const subPromises = [
+ this.pushNoCacheControlHeaderOf(resourceConnectUrl),
+ this.pushRedirection(resourceNuxeoUrl, updatedResourceConnectUrl),
+ ];
if (credentials) {
- this.pushAuthentication(connectUrl, credentials);
+ subPromises.push(this.pushAuthentication(updatedResourceConnectUrl, credentials));
}
- return this.pushRedirection(nuxeoUrl, connectUrl);
+ return Promise.all(subPromises);
});
});
@@ -107,13 +123,20 @@ class DesignerLivePreview extends ServiceWorkerComponent {
}
pushRedirection(from, to) {
+ const patchUrlForUIPath = (url) => {
+ const fragments = url.pathname.split('/');
+ if (fragments[2] !== 'ui') {
+ return url;
+ }
+ fragments.splice(3, 0, ''); // Insert '*' after 'ui'
+ // Create a new URL with the modified pathname
+ const modifiedUrl = new URL(url.toString());
+ modifiedUrl.pathname = fragments.join('/');
+ return modifiedUrl;
+ };
+ from = patchUrlForUIPath(from); // Update 'from' with the modified URL string
return this.worker.declarativeNetEngine
- .push(new RedirectRule(from, to))
- .then(() => this.modifyUrlForUIPath(from))
- .then((modifiedFrom) => {
- if (modifiedFrom === from) return;
- this.worker.declarativeNetEngine.push(new RedirectRule(modifiedFrom, to));
- });
+ .push(new RedirectRule(from, to));
}
popRedirection(from) {
@@ -126,18 +149,6 @@ class DesignerLivePreview extends ServiceWorkerComponent {
});
}
- // eslint-disable-next-line class-methods-use-this
- modifyUrlForUIPath(url) {
- const fragments = url.pathname.split('/');
- if (fragments[2] !== 'ui') {
- return Promise.resolve(url);
- }
- fragments.splice(3, 0, ''); // Insert an empty string after 'ui'
- const newUrl = new URL(url);
- newUrl.pathname = fragments.join('/');
- return Promise.resolve(newUrl);
- }
-
toggle(projectName) {
return this.isEnabled(projectName)
.then((enabled) => {
@@ -150,10 +161,10 @@ class DesignerLivePreview extends ServiceWorkerComponent {
return this.worker.connectLocator
.asRegistration()
.then(({ location, credentials }) => {
- const url = new URL(`studio/v2/project/${projectName}/workspace/ws.resources`, location);
- return { url, credentials };
+ const workspaceUrl = new URL(`studio/v2/project/${projectName}/workspace/ws.resources`, location);
+ return { workspaceUrl, credentials };
})
- .then(({ url: workspaceUrl, credentials }) => fetch(workspaceUrl, {
+ .then(({ workspaceUrl, credentials }) => fetch(workspaceUrl, {
credentials: 'include',
})
.then((response) => ({ workspaceUrl, response, credentials })))
@@ -188,11 +199,13 @@ class DesignerLivePreview extends ServiceWorkerComponent {
enable(projectName) {
return this.asWorkspace(projectName)
+ // eslint-disable-next-line no-unused-vars
.then(({ workspaceUrl, credentials, json }) =>
this.disable()
.then(() => this.pushCookieHeaderOf(workspaceUrl))
.then(() => this.pushRedirectionsOf(json, credentials))
.then(() => this.worker.declarativeNetEngine.flush())
+ .then((undo) => (this.worker.tabNavigationHandler.reloadServerTab({ byPassCache: true }), undo))
.then((undo) => this.undoByProjectNames.set(projectName, undo))
.then(() => true));
}
diff --git a/src/main/desktop-notifier.js b/src/main/desktop-notifier.js
index 16d4183c..43ed58fc 100644
--- a/src/main/desktop-notifier.js
+++ b/src/main/desktop-notifier.js
@@ -22,16 +22,18 @@ const namespacedIdOf = (id) => `nuxeo-web-extension-${id}`;
class DesktopNotifier extends ServiceWorkerComponent {
constructor(worker) {
super(worker);
-
+ // disable timeout in development mode
+ this._notificationTimeout = worker.developmentMode?.isEnabled() ? 0 : 10000;
// Bind methods
Object.getOwnPropertyNames(Object.getPrototypeOf(this))
.filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
.forEach((method) => {
this[method] = this[method].bind(this);
});
+ return this;
}
- notify(id, options) {
+ notify(id, options, notificationTimeout = this._notificationTimeout) {
// Check if options has an imageUrl property
const type = options.imageUrl ? 'image' : 'basic';
@@ -42,30 +44,43 @@ class DesktopNotifier extends ServiceWorkerComponent {
iconUrl: '../images/nuxeo-128.png',
...options
};
-
return new Promise((resolve, reject) => {
chrome.notifications.create(namespacedIdOf(id), options, (notificationId) => {
+ const notification = { id: notificationId, options };
if (chrome.runtime.lastError) {
- console.groupCollapsed('Notification Error');
- console.warn('Failed to create notification');
+ // log the error
+ console.groupCollapsed('Notification: creation error');
+ console.info('Options', options);
console.error(chrome.runtime.lastError);
- console.info('Notification ID:', notificationId);
- console.info('Options:', options);
console.groupEnd();
const error = new Error('Failed to create notification');
error.cause = chrome.runtime.lastError;
- error.info = { id: notificationId, options };
+ error.info = notification;
return reject(error);
}
+
+ // always log the notification
+ console.group(`Notification: ${notificationId}`);
+ console.info(`${JSON.stringify(options)}`);
+ console.groupEnd();
+
if (!options.requireInteraction) {
- return resolve(notificationId);
- }
- chrome.notifications.onClicked.addListener((clickedId) => {
- if (clickedId === notificationId) {
- resolve(notificationId);
+ if (notificationTimeout) {
+ setTimeout(
+ () => chrome.notifications.clear(notificationId, () => {}),
+ notificationTimeout
+ );
}
- });
+ return resolve(notification);
+ }
+
+ // wait for user acknowledge
+ const resolveIfMatchingId = (clickedId) => {
+ if (clickedId !== notificationId) return;
+ resolve(notification);
+ };
+ chrome.notifications.onClicked.addListener(resolveIfMatchingId);
return undefined;
});
});
diff --git a/src/main/groovy/developed-studio-projects.js b/src/main/groovy/developed-studio-projects.js
index 1a9fe363..4eb0fd08 100644
--- a/src/main/groovy/developed-studio-projects.js
+++ b/src/main/groovy/developed-studio-projects.js
@@ -37,10 +37,10 @@ export default function developedStudioProjects(login = '', token = '') {
};
// compute the final output
- boolean developmentMode = Framework.isDevMode();
+ boolean developmentMode = Framework.isDevModeSet();
Map output = [
- projects: packagesOutput,
+ projects: projectsOutput,
developmentMode: developmentMode
];
diff --git a/src/main/main-chrome.js b/src/main/main-chrome.js
index 9536d25c..5b1dba0b 100644
--- a/src/main/main-chrome.js
+++ b/src/main/main-chrome.js
@@ -20,7 +20,7 @@ import ServiceWorker from './service-worker';
const buildTime = import.meta.env.VITE_BUILD_TIMESTAMP;
const buildVersion = import.meta.env.VITE_BUILD_VERSION;
const browserVendor = import.meta.env.VITE_BROWSER_VENDOR;
-const developmentMode = import.meta.env.VITE_DEVELOPMENT_MODE;
+const developmentMode = import.meta.env.VITE_DEVELOPMENT_MODE === 'true';
self.addEventListener('activate', new ServiceWorker(developmentMode, buildTime, buildVersion, browserVendor)
.asPromise()
diff --git a/src/main/manifest-chrome.json b/src/main/manifest-chrome.json
index 3d32b965..f1889eea 100644
--- a/src/main/manifest-chrome.json
+++ b/src/main/manifest-chrome.json
@@ -19,15 +19,19 @@
"activeTab",
"cookies",
"declarativeNetRequest",
+ "declarativeNetRequestFeedback",
"notifications",
"storage",
"tabs"
],
"host_permissions": [
- "http://localhost:8080/*",
"https://nos-preprod-connect.nuxeocloud.com/*",
"https://connect.nuxeo.com/*"
],
+ "optional_host_permissions": [
+ "http://*/*",
+ "https://*/*"
+ ],
"omnibox": {
"keyword": "nx"
},
diff --git a/src/main/repository-indexer.js b/src/main/repository-indexer.js
index 0577930f..5b865d82 100644
--- a/src/main/repository-indexer.js
+++ b/src/main/repository-indexer.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
/*
Copyright 2016-2024 Nuxeo
@@ -31,27 +32,27 @@ class RepositoryIndexer extends ServiceWorkerComponent {
}
reindex(input = undefined) {
+ const errorMessage = `Your repository index is rebuilding (${input ? JSON.stringify(input) : 'all documents'}).`;
return this.worker.serverConnector
.executeOperation('Elasticsearch.Index', {}, input)
- .then(() => {
- this.worker.desktopNotifier.notify('repository-reindexing', {
- title: 'Indexing!',
- message: `Your repository index is rebuilding (${input ? JSON.stringify(input) : 'all documents'}).`,
- iconUrl: '../images/nuxeo-128.png',
- });
+ .then(() => this.worker.desktopNotifier.notify('repository-reindexing', {
+ title: 'Indexing!',
+ message: errorMessage,
+ iconUrl: '../images/nuxeo-128.png',
})
- .then(() => {
- this.waiting = this.waitForIndexing();
- return true;
- })
- .catch((cause) => {
- this.worker.desktopNotifier.notify('repository-reindexing', {
- title: 'Something went wrong...',
- message: `${cause.message}\nPlease try again later.`,
- iconUrl: '../images/access_denied.png',
- });
- return false;
- });
+ .then(() => {
+ this.waiting = this.waitForIndexing();
+ return true;
+ })
+ .catch((cause) => {
+ class IndexingError extends Error {
+ constructor() {
+ super(errorMessage);
+ this.cause = cause;
+ }
+ }
+ throw new IndexingError();
+ }));
}
waitForIndexing() {
@@ -62,14 +63,7 @@ class RepositoryIndexer extends ServiceWorkerComponent {
.then((response) => {
return this.worker.desktopNotifier.cancel('repository-reindexing');
})
- .then(() => { this.waiting = undefined; })
- .catch((cause) => {
- this.worker.desktopNotifier.notify('repository-reindexing', {
- title: 'Something went wrong...',
- message: `${cause.message}\nPlease try again later.`,
- iconUrl: '../images/access_denied.png',
- });
- });
+ .then(() => { this.waiting = undefined; });
return this.waiting;
}
}
diff --git a/src/main/runtime-build-info.js b/src/main/runtime-build-info.js
index d3da98df..baceb6d6 100644
--- a/src/main/runtime-build-info.js
+++ b/src/main/runtime-build-info.js
@@ -1,45 +1,19 @@
+/* eslint-disable no-return-assign */
/* eslint-disable max-classes-per-file */
import ServiceWorkerComponent from './service-worker-component';
-class RuntimeBuildInfo extends ServiceWorkerComponent {
- constructor(worker, buildTime, buildVersion, browserVendor) {
- super(worker);
-
- this._developer = 'NOS Team
';
- this._browserVendor = browserVendor;
- this._buildTime = buildTime;
- this._buildVersion = buildVersion;
-
- // Bind methods
- Object.getOwnPropertyNames(Object.getPrototypeOf(this))
- .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
- .forEach((method) => {
- this[method] = this[method].bind(this);
- });
- }
-
- developer() {
- return Promise.resolve(this._developer);
- }
-
- browserVendor() {
- return Promise.resolve(this._browserVendor);
- }
-
- buildTime() {
- return Promise.resolve(this._buildtime);
- }
-
- buildVersion() {
- return Promise.resolve(this._version);
- }
-}
-
class DevelopmentMode extends ServiceWorkerComponent {
constructor(worker, isEnabled) {
super(worker);
+ const noopConsoleProvider = () => {
+ const noop = () => {};
+ return {
+ log: noop, error: noop, warn: noop, info: noop
+ };
+ };
this._isEnabled = isEnabled;
- this._featureFlags = {};
+ this._featureFlags = { };
+ this._console = isEnabled ? console : noopConsoleProvider();
// bind this methods
Object.getOwnPropertyNames(Object.getPrototypeOf(this))
@@ -49,7 +23,7 @@ class DevelopmentMode extends ServiceWorkerComponent {
});
// rebind isEnabled to checkAvailability for asPromise enforcing
- this.checkAvailability = this.isEnabled;
+ this.isAvailable = this.isEnabled;
}
isEnabled() {
@@ -57,11 +31,11 @@ class DevelopmentMode extends ServiceWorkerComponent {
}
toggle() {
- this._isEnabled = !this._isEnabled;
+ return this._isEnabled = !this._isEnabled;
}
setFeatureFlag(flag, value) {
- this._featureFlags[flag] = value;
+ return this._featureFlags[flag] = value;
}
isFeatureFlagSet(flag) {
@@ -72,18 +46,52 @@ class DevelopmentMode extends ServiceWorkerComponent {
}
toggleFeatureFlag(flag) {
- this._featureFlags[flag] = !this._featureFlags[flag];
+ return this._featureFlags[flag] = !this._featureFlags[flag];
}
- asConsole() {
+ asConsole(options = { force: false }) {
return this.asPromise()
- .then(() => console)
- .catch(() => {
- const noop = () => {};
- return {
- log: noop, error: noop, warn: noop, info: noop
- };
+ .then(() => (options.force ? console : this._console));
+ }
+
+ asExecutor() {
+ return this._isEnabled ? Promise.reject() : Promise.resolve();
+ }
+}
+
+class RuntimeBuildInfo extends ServiceWorkerComponent {
+ constructor(worker, buildTime, buildVersion, browserVendor, developmentMode) {
+ super(worker);
+
+ this._developer = 'NOS Team ';
+ this._browserVendor = browserVendor;
+ this._buildTime = buildTime;
+ this._buildVersion = buildVersion;
+
+ // Bind methods
+ Object.getOwnPropertyNames(Object.getPrototypeOf(this))
+ .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
+ .forEach((method) => {
+ this[method] = this[method].bind(this);
});
+
+ worker.developmentMode = new DevelopmentMode(worker, developmentMode);
+ }
+
+ developer() {
+ return Promise.resolve(this._developer);
+ }
+
+ browserVendor() {
+ return Promise.resolve(this._browserVendor);
+ }
+
+ buildTime() {
+ return Promise.resolve(this._buildtime);
+ }
+
+ buildVersion() {
+ return Promise.resolve(this._version);
}
}
diff --git a/src/main/server-connector.js b/src/main/server-connector.js
index 9148dad7..b3f911c5 100644
--- a/src/main/server-connector.js
+++ b/src/main/server-connector.js
@@ -28,17 +28,33 @@ class GroovyScriptManager {
}
class ServerConnector extends ServiceWorkerComponent {
+ static noop = () => {};
+
constructor(worker) {
super(worker);
this.groovyScriptManager = new GroovyScriptManager();
// Define properties
- this.disconnect = () => {};
+ this.disconnect = this.noop;
this.nuxeo = undefined;
this.serverUrl = undefined;
this.project = undefined;
+ this.serverUrlOf = (tabLocation) => {
+ // Simplified regular expression pattern to match the web context
+ const pattern = new RegExp('^(https?:\\/\\/[A-Za-z_\\.0-9:-]+\\/)([A-Za-z_\\.0-9-]+)');
+
+ // Execute the pattern on the tabLocation
+ const matchGroups = pattern.exec(tabLocation);
+
+ // Check if there is a match
+ const isMatching = Boolean(matchGroups && matchGroups[1] && matchGroups[2]);
+
+ // Extract the web context if matched
+ return isMatching ? new URL(`${matchGroups[1]}${matchGroups[2]}`) : undefined;
+ };
+
// Bind methods
Object.getOwnPropertyNames(Object.getPrototypeOf(this))
.filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
@@ -55,73 +71,110 @@ class ServerConnector extends ServiceWorkerComponent {
};
}
- checkAvailability() {
- return this.isConnected()
- .then((isConnected) => {
- if (!isConnected) throw new Error('Not connected to Nuxeo');
- });
- }
+ checkOperableDomain(serverUrl, connectOptions) {
+ const { forceForbiddenDomains } = connectOptions;
+ const forbiddenDomains = [
+ { host: 'connect.nuxeo.com', production: true },
+ { host: 'nos-preprod-connect.nuxeocloud.com', production: false },
+ ];
+ const forbiddenDomainByHost = forbiddenDomains.reduce((acc, domain) => {
+ acc[domain.host] = domain;
+ return acc;
+ }, {});
+ // check domains
+ if (
+ forceForbiddenDomains ||
+ !(serverUrl.host in forbiddenDomainByHost)) {
+ return Promise.resolve();
+ }
+ const forbiddenDomain = forbiddenDomainByHost[serverUrl.host];
+ // should use another way to detect a connect server
+ let notification = {
+ id: 'forbidden_domain',
+ options: {
+ ...ServerConnector.serverErrorDesktopNotification.options,
+ message: `
+You are trying to connect to a Nuxeo Connect server.
+This extension is only compatible with Nuxeo Platform servers.
+`
+ }
+ };
+ const isDevelopmentMode = this.worker.developmentMode.isEnabled();
+ if (isDevelopmentMode && !forbiddenDomain.production) {
+ notification = {
+ ...notification,
+ buttons: [
+ { title: 'Force' },
+ { title: 'Close' }
+ ],
+ requireInteraction: true,
+ };
+ notification.requireInteraction = true; // Keep the notification until an action is taken
+ }
- onNewLocation(serverUrl) {
- return this.isConnected()
- .then((isConnected) => {
- if (isConnected) this.disconnect();
- return false;
- })
- .then(() => (serverUrl ? this.connect(serverUrl) : Promise.resolve()));
+ return Promise.reject(this.connectionErrorOf(`Connection to ${serverUrl.host} is forbidden`, notification));
}
- connect(serverUrl) {
- const url = new URL(serverUrl);
- const forbiddenDomains = ['connect.nuxeo.com', 'nos-preprod-connect.nuxeo.com'];
- if (forbiddenDomains.includes(url.host)) {
- const error = new Error(`Connection to ${url.host} is forbidden`);
- error.isForbidden = true;
- throw error;
- }
- this.nuxeo = new Nuxeo({ baseURL: serverUrl });
- this.serverUrl = serverUrl;
- return this.nuxeo
- .login()
- // eslint-disable-next-line no-return-assign
- .then(() => {
- chrome.omnibox.onInputChanged.addListener(this.onInputChanged = this.suggestDocument);
- })
- .then(() => () => {
- this.disconnect = undefined;
- this.nuxeo = undefined;
- this.serverUrl = undefined;
- chrome.omnibox.onInputChanged.removeListener(this.suggestDocument);
- })
- .then((disconnect) => {
- this.disconnect = disconnect.bind(this);
- return this.disconnect;
- })
- .catch((cause) => {
- if (cause.response) {
- this.handleErrors(cause);
- return () => {};
- }
- console.warn('Error connecting to Nuxeo', cause);
- throw cause;
- });
+ connect(serverUrl, tabInfo, connectOptions = { forceForbiddenDomains: false }) {
+ return this.checkOperableDomain(serverUrl, connectOptions)
+ .then(() => new Nuxeo({ baseURL: serverUrl })
+ .connect()
+ .then((nuxeo) => {
+ this.nuxeo = nuxeo;
+ this.serverUrl = serverUrl;
+ return Promise.all([
+ this.asInstalledAddons().catch(() => []), // Return empty array on error
+ this.asConnectRegistration().catch(() => ({})), // Return empty object on error
+ ])
+ .then(([installedAddons, connectRegistration]) => ({
+ nuxeo,
+ serverUrl: nuxeo._baseURL,
+ installedAddons,
+ connectRegistration,
+ }))
+ .then((runtimeInfo) => {
+ this.disconnect = () => {
+ this.nuxeo = undefined;
+ this.runtimeInfo = undefined;
+ this.serverUrl = undefined;
+ this.worker.tabNavigationHandler.disableTabExtension(tabInfo);
+ };
+ this.nuxeo = nuxeo;
+ this.runtimeInfo = runtimeInfo;
+ this.worker.tabNavigationHandler.enableTabExtension(tabInfo);
+ });
+ })
+ .catch((cause) => {
+ this.disconnect = this.noop;
+ this.nuxeo = undefined;
+ this.runtimeInfo = undefined;
+ this.serverUrl = undefined;
+ const notification = this.notifyError(cause);
+ return Promise.reject(this.connectionErrorOf(`Cannot establish connection with ${serverUrl}`, notification));
+ }));
}
isConnected() {
- return Promise.resolve(this.disconnect != null);
+ return Promise
+ .resolve(this.disconnect !== this.noop);
+ }
+
+ checkLiveConnection() {
+ return this.isConnected()
+ .then((isConnected) => {
+ if (!isConnected) return false;
+ return this.nuxeo
+ .users()
+ .fetch(this.nuxeo.user.username)
+ .then(() => true);
+ });
}
asRuntimeInfo() {
- return Promise.all([
- this.asInstalledAddons(),
- this.asConnectRegistration(),
- ])
- .then(([installedAddons, connectRegistration]) => ({
- nuxeo: this.nuxeo,
- serverUrl: this.serverUrl,
- installedAddons,
- connectRegistration,
- }));
+ if (!this.runtimeInfo) {
+ return Promise.reject(this.connectionErrorOf('Not connected to Nuxeo'));
+ }
+ return Promise.resolve(this.runtimeInfo);
}
asConnectLocation() {
@@ -131,7 +184,8 @@ class ServerConnector extends ServiceWorkerComponent {
asConnectRegistration() {
return this
.executeScript('connect-registration')
- .then((result) => ({ ...result, serverUrl: this.serverUrl }));
+ .then((result) => ({ ...result, serverUrl: this.serverUrl }))
+ .catch((cause) => ({ cause, serverUrl: this.serverUrl }));
}
asInstalledAddons() {
@@ -198,17 +252,32 @@ class ServerConnector extends ServiceWorkerComponent {
.executeScript('register-developed-studio-project', [login, token, projectName, clid])));
}
- asNuxeo() {
- return new Promise((resolve, reject) => {
- if (this.nuxeo) {
- resolve(this.nuxeo);
- } else {
- reject(new Error('Not connected to Nuxeo'));
- }
- });
+ asNuxeo(connectionOptions) {
+ return this.worker.tabNavigationHandler
+ .asTabInfo()
+ .then((tabInfo) => {
+ const serverUrl = this.serverUrlOf(tabInfo.url);
+ const attemptConnection = () => this.connect(serverUrl, tabInfo, connectionOptions).then(() => this.nuxeo);
+ const urlEquals = (url1, url2) => url1.protocol === url2.protocol &&
+ url1.hostname === url2.hostname &&
+ url1.port === url2.port &&
+ url1.pathname === url2.pathname;
+ if (this.nuxeo !== undefined && urlEquals(this.nuxeo._baseURL, serverUrl) && this.nuxeo.connected) {
+ // Attempt to refetch the logged user to ensure connection is still valid
+ const refetchUser = () => this.nuxeo.users().fetch(this.nuxeo.user.id);
+ return refetchUser()
+ .then(() => this.nuxeo) // Connection is valid
+ .catch((error) => {
+ console.error('Failed to refetch the user, connection might be lost.', error);
+ return attemptConnection();
+ });
+ }
+ // Not connected or different server, attempt to connect
+ return attemptConnection();
+ });
}
- serverErrorDesktopNotification = {
+ static serverErrorDesktopNotification = {
id: 'server_error',
options: {
title: 'Server Error',
@@ -217,17 +286,21 @@ class ServerConnector extends ServiceWorkerComponent {
}
};
- desktopNotify(id, notification) {
- const { title, message, imageUrl } = notification;
- console.group(`Notification: ${id}`);
- console.log(`Title: ${title}`);
- console.log(`Message: ${message}`);
- console.log(`Image URL: ${imageUrl}`);
- console.groupEnd();
+ // eslint-disable-next-line class-methods-use-this
+ connectionErrorOf(message, options = ServerConnector.serverErrorDesktopNotification) {
+ class ConnectionError extends Error {
+ constructor() {
+ super(message);
+ this.notification = options;
+ }
+ }
+ return new ConnectionError(message);
+ }
+ desktopNotify(id = ServerConnector.serverErrorDesktopNotification.id, notification) {
return this.worker
.desktopNotifier
- .notify(id, { ...this.serverErrorDesktopNotification.options, ...notification });
+ .notify(id, { ...ServerConnector.serverErrorDesktopNotification.options, ...notification });
}
desktopCancelNotification(id) {
@@ -236,56 +309,46 @@ class ServerConnector extends ServiceWorkerComponent {
.cancel(id);
}
- handleErrors(error, defaultNotification = this.serverErrorDesktopNotification) {
- const toMessage = (response) => {
+ notifyError(cause) {
+ const jsonErrorOf = (response) => {
const contentType = response.headers.get('content-type');
if (contentType && !contentType.includes('application/json')) {
- return error.response
+ return cause.response
.text()
.then((text) => ({
message: `status: ${response.status} ${response.statusText}\ntext: ${text}`
}));
}
- return error.response.json();
+ return cause.response.json();
};
- return toMessage(error.response)
+ return jsonErrorOf(cause.response)
.then((json) => {
- const err = error.response.status;
+ const status = cause.response.status;
if (json.message === null) {
- this.desktopNotify('no_hot_reload', {
- ...defaultNotification.options,
+ return this.desktopNotify('no_hot_reload', {
title: 'Hot Reload Operation not found.',
message: 'Your current version of Nuxeo does not support the Hot Reload function.',
- iconUrl: '/images/access_denied.png',
});
- } else if (err === 401) {
- this.desktopNotify('access_denied', {
- ...defaultNotification.options,
+ }
+ if (status === 401) {
+ return this.desktopNotify('access_denied', {
title: 'Access denied!',
- message: 'You must have Administrator rights to perform this function.',
- iconUrl: '../images/access_denied.png',
+ message: 'You should login to interact with the nuxeo web extension.',
});
- } else if (err >= 500) {
- this.desktopNotify(defaultNotification.id, {
- ...defaultNotification.options,
- message: `${defaultNotification.message}...\n${json.message}`,
- });
- } else if (err >= 300 && err < 500) {
- this.desktopNotify('bad_login', {
- ...defaultNotification.options,
+ }
+ if (status >= 500) {
+ return this.desktopNotify();
+ }
+ if (status >= 300 && status < 500) {
+ return this.desktopNotify('bad_login', {
title: 'Bad Login',
message: 'Your Login and/or Password are incorrect',
- iconUrl: '/images/access_denied.png',
- });
- } else {
- this.desktopNotify('unknown_error', {
- ...defaultNotification.options,
- title: 'Unknown Error',
- message: `An unknown error has occurred. Please try again later...\n${json.message}`,
- iconUrl: '/images/access_denied.png',
});
}
- return error.response;
+ return this.desktopNotify('unknown_error', {
+ title: 'Unknown Error',
+ message: `An unknown error has occurred. Please try again later...\n${json.message}`,
+ });
});
}
@@ -333,7 +396,7 @@ class ServerConnector extends ServiceWorkerComponent {
if (!cause.response) {
throw cause;
}
- return this.handleErrors(cause, this.defaultServerError);
+ return this.notifyError(cause);
}));
}
@@ -361,28 +424,17 @@ class ServerConnector extends ServiceWorkerComponent {
}
restart() {
- return this.asPromise()
- .then(() => this
- .desktopNotify('reload', {
- title: 'Restarting server...',
- message: `Attempting to restart Nuxeo server (${this.serverUrl})`,
- iconUrl: '../images/nuxeo-128.png',
- }))
+ return Promise.resolve()
.then(() => this.worker.tabNavigationHandler
- .updateServerTab('site/connectClient/restartView', true))
- .then(() => this
- .desktopCancelNotification('reload'))
- .catch((cause) => {
- this
- .desktopNotify('error', {
- title: 'Something went wrong...',
- message: `An error occurred (${this.serverUrl}) : ${cause.message}`,
- iconUrl: '../images/access_denied.png',
- });
- const error = new Error(`Error restarting server '${cause.message}'`);
- error.cause = cause;
- throw error;
- });
+ .updateServerTab(`${this.serverUrl}/site/connectClient/restartView`, false))
+ .catch((cause) => this
+ .desktopNotify('error', {
+ title: 'Something went wrong...',
+ message: `An error occurred (${this.serverUrl}) : ${cause?.message}`,
+ iconUrl: '../images/access_denied.png',
+ })
+ .then((notification) => Promise
+ .reject(new Error(notification.options.message))));
}
}
diff --git a/src/main/service-worker-component.js b/src/main/service-worker-component.js
index cd28bda8..ec8e25fc 100644
--- a/src/main/service-worker-component.js
+++ b/src/main/service-worker-component.js
@@ -1,6 +1,3 @@
-/* eslint-disable no-return-assign */
-/* eslint-disable no-sequences */
-
class ServiceWorkerComponent {
constructor(worker = this) {
this.worker = worker;
@@ -71,38 +68,49 @@ class ServiceWorkerComponent {
}
// overidden in components which need to check for availability
- checkAvailability(self = this) {
- return Promise.resolve(self);
+ // eslint-disable-next-line class-methods-use-this
+ isAvailable() {
+ return true;
}
// bootstrapping asynch logic
asPromise() {
- if (this._isProxy) {
+ const isProxyKey = Symbol(`${this.constructor.name}:isProxy`);
+ if (this[isProxyKey]) {
return Promise.resolve(this);
}
- const checkAvailability = (target, origProperty) => Promise.resolve()
+ if (this._proxy) {
+ return Promise.resolve(this._proxy);
+ }
+ const checkAvailabilityOn = (target, key) => Promise.resolve()
.then(() => {
- if (origProperty && typeof origProperty === 'object') {
- console.log(`Checking availability of ${origProperty.constructor.name}`);
- }
- console.log(`Target constructor: ${target.constructor.name}`);
- if (!target.checkAvailability()) {
- throw new Error(`${origProperty && origProperty.constructor ? origProperty.constructor.name : 'Property'} is not available`);
+ if (!target.isAvailable()) {
+ return Promise.reject(new Error(`${target.constructor.name}.${key} unavailale`));
}
+ return Promise.resolve();
});
- const proxy = new Proxy(this, {
+ this._proxy = new Proxy(this, {
// eslint-disable-next-line no-unused-vars
get(target, propKey, receiver) {
+ if (propKey === isProxyKey) {
+ return true;
+ }
+ if (propKey === 'then' || propKey === 'catch' || propKey === 'finally') {
+ const origMethod = Reflect.get(target, propKey, receiver);
+ return typeof origMethod === 'function' ? origMethod.bind(target) : origMethod;
+ }
+ if (target.constructor.name === 'DevelopmentMode') {
+ if (propKey === 'toJSON') {
+ const origMethod = Reflect.get(target, propKey, receiver);
+ return typeof origMethod === 'function' ? origMethod.bind(target) : origMethod;
+ }
+ }
const origProperty = target[propKey];
- const promise = checkAvailability(target, origProperty);
+ const promise = checkAvailabilityOn(target, propKey);
if (typeof origProperty === 'function') {
return function (...args) {
return promise
- .then(() => origProperty.apply(target, args))
- .then((result) => {
- console.log(`${origProperty.constructor.name} with arguments: ${JSON.stringify(args)} <- ${JSON.stringify(result)}`);
- return result;
- });
+ .then(() => origProperty.apply(target, args));
};
}
// Wrap property in a Promise
@@ -110,27 +118,35 @@ class ServiceWorkerComponent {
},
// eslint-disable-next-line no-unused-vars
set(target, propKey, value, receiver) {
- checkAvailability(target, value)
+ if (propKey === isProxyKey) {
+ return false;
+ }
+ checkAvailabilityOn(target, value)
.then(() => ({ previous: target[propKey], next: value }))
.then(({ previous, next }) => {
target[propKey] = value;
return { previous, next };
})
.then(({ previous, next }) => {
- const consolePromise = target.worker.developmentMode
- ? target.worker.developmentMode.asConsole()
- : Promise.resolve(console);
- consolePromise
+ target
+ .asConsole()
.then((console) => {
- console.log(`Setting value '${value}' to property '${propKey}'`);
- return { previous, next };
+ console.log(`Setting value '${value}' to property '${target.constructor.name}.${propKey}'`);
});
+ return { previous, next };
});
return true; // Indicates that the assignment succeeded
},
});
- proxy._isProxy = true;
- return Promise.resolve(proxy);
+ return Promise.resolve(this._proxy);
+ }
+
+ asDevelopmentMode() {
+ return this.worker.developmentMode.asPromise();
+ }
+
+ asConsole(options = { force: false }) {
+ return this.worker.developmentMode.asConsole(options);
}
}
diff --git a/src/main/service-worker.js b/src/main/service-worker.js
index 1ad945c0..398103e2 100644
--- a/src/main/service-worker.js
+++ b/src/main/service-worker.js
@@ -54,25 +54,47 @@ class ServiceWorkerMessageHandler extends ServiceWorkerComponent {
if (typeof component[request.action] !== 'function') {
return Promise.reject(new Error(`Invalid action ${JSON.stringify(request)}`));
}
- this.worker.developmentMode
+ this
.asConsole()
.then((console) => console
.log(`ServiceWorkerMessageHandler.handle(${JSON.stringify(request)}) called`));
+
+ const errorResponseOf = async (cause) => {
+ const errorProperties = await Object.getOwnPropertyNames(cause).reduce(async (accPromise, key) => {
+ const acc = await accPromise;
+ const value = cause[key];
+
+ // Check if the property is a promise and await its resolution if it is
+ if (value instanceof Promise) {
+ try {
+ acc[key] = await value;
+ } catch (innerError) {
+ acc[key] = `Error resolving promise for ${key}: ${innerError}`;
+ }
+ } else {
+ acc[key] = value;
+ }
+
+ return acc;
+ }, Promise.resolve({}));
+
+ // Construct and return the error response
+ return {
+ error: {
+ message: cause.message,
+ stack: cause.stack,
+ ...errorProperties
+ }
+ };
+ };
return component.asPromise()
.then((componentInstance) => componentInstance[request.action](...request.params))
- .then((response) => this.worker.developmentMode
- .asConsole()
+ .catch(errorResponseOf)
+ .then((response) => this
+ .asConsole({ force: true })
.then((console) => console
- .log(`${JSON.stringify(response)} <- ServiceWorkerMessageHandler.handle(${JSON.stringify(request)})`))
- .then(() => response))
- .catch((cause) => {
- const response = { error: { message: cause.message, stack: cause.stack, response: cause.response } };
- this.worker.developmentMode
- .asConsole()
- .then((console) => console
- .log(`${JSON.stringify(response)} <- ServiceWorkerMessageHandler.handle(${JSON.stringify(request)})`, cause.stack));
- return response;
- });
+ .log(`ServiceWorkerMessageHandler.handle(${JSON.stringify(request)}) <- ${JSON.stringify(response)}`))
+ .then(() => response));
};
withConnectedWorker(this.worker)
@@ -112,7 +134,7 @@ class ServiceWorker extends ServiceWorkerComponent {
// in order to invoke other services. The order is important as
// services may be invoked while constructing.
this.buildInfo = new RuntimeBuildComponent
- .RuntimeBuildInfo(this, buildTime, buildVersion, browserVendor);
+ .RuntimeBuildInfo(this, buildTime, buildVersion, browserVendor, developmentMode);
this.browserStore = new BrowserStore(this);
this.cookieManager = new CookieManager(this);
this.componentInventory = new ServiceWorkerComponentInventory(this);
@@ -120,7 +142,6 @@ class ServiceWorker extends ServiceWorkerComponent {
this.declarativeNetEngine = new DeclarativeNetEngine(this);
this.designerLivePreview = new DesignerLivePreview(this);
this.desktopNotifier = new DesktopNotifier(this);
- this.developmentMode = new RuntimeBuildComponent.DevelopmentMode(this, developmentMode);
this.documentBrowser = new DocumentBrowser(this);
this.jsonHighlighter = new JSONHighlighter(this);
this.repositoryIndexer = new RepositoryIndexer(this);
@@ -165,7 +186,8 @@ class ServiceWorker extends ServiceWorkerComponent {
if (typeof component.activate !== 'function') return () => {};
return component
.activate(self)
- .then((cleanup) => worker.developmentMode.asConsole()
+ .then((cleanup) => this
+ .asConsole()
.then((console) => console
.log(`ServiceWorkerComponent.activate(${component.constructor.name}) called`))
.then(() => cleanup));
diff --git a/src/main/tab-navigation-handler.js b/src/main/tab-navigation-handler.js
index fb7724c9..2c15b488 100644
--- a/src/main/tab-navigation-handler.js
+++ b/src/main/tab-navigation-handler.js
@@ -16,26 +16,6 @@ class TabNavigationHandler extends ServiceWorkerComponent {
.forEach((method) => {
this[method] = this[method].bind(this);
});
-
- // ...
- this.nuxeoUrlOf = (tabInfo) => {
- // eslint-disable-next-line operator-linebreak
- // Regular expression pattern
- const nxPattern = new RegExp([
- '(^https?:\\/\\/[A-Za-z_\\.0-9:-]+\\/[A-Za-z_\\.0-9-]+)', // Match the start of a URL
- '(',
- '\\/(?:',
- '(?:nxdoc|nxpath|nxsearch|nxadmin|nxhome|nxdam|nxdamid|site\\/[A-Za-z_\\.0-9-]+)\\/[A-Za-z_\\.0-9-]+|',
- 'view_documents\\.faces|ui\\/|ui\\/#!\\/|view_domains\\.faces|home\\.html|view_home\\.faces',
- '))'
- ].join(''));
- // match and reject non matching URLs
- const matchGroups = nxPattern.exec(tabInfo.url);
- const isMatching = Boolean(matchGroups && matchGroups[2]);
- const [, extractedLocation] = isMatching ? matchGroups : [];
-
- return isMatching ? new URL(extractedLocation) : undefined;
- };
}
isTabExtensionEnabled() {
@@ -61,164 +41,62 @@ class TabNavigationHandler extends ServiceWorkerComponent {
.then(() => tabInfo));
}
- // eslint-disable-next-line no-unused-vars
- activate(self) {
- // disable extension by default
- chrome.action.disable();
-
- return Promise.resolve([])
- .then((undoStack) => {
- // tab activation handle
- const tabActivatedHandle = (activeInfo) => chrome
- .tabs.get(activeInfo.tabId, (tabInfo) => this
- .enableExtensionIfNuxeoServerTab(tabInfo));
- chrome.tabs.onActivated.addListener(tabActivatedHandle);
- undoStack.push(() => chrome.tabs.onActivated.removeListener(tabActivatedHandle));
- return undoStack;
- })
- .then((undoStack) => {
- // tab update handle
- const tabUpdatedHandle = (tabId, changeInfo, tabInfo) => {
- if (changeInfo.status !== 'complete') return;
-
- this.enableExtensionIfNuxeoServerTab(tabInfo);
- };
- chrome.tabs.onUpdated.addListener(tabUpdatedHandle);
- undoStack.push(() => chrome.tabs.onUpdated.removeListener(tabUpdatedHandle));
- return undoStack;
- })
- .then((undoStack) => {
- // windows focus handle
- const windowFocusHandle = (windowId) => {
- if (windowId === chrome.windows.WINDOW_ID_NONE) return;
- chrome.tabs.query({ active: true, windowId }, (tabs) => {
- if (!tabs || tabs.length === 0) return;
-
- this.enableExtensionIfNuxeoServerTab(tabs[0]);
- });
- };
- chrome.windows.onFocusChanged.addListener(windowFocusHandle);
- undoStack.push(() => chrome.windows.onFocusChanged.removeListener(windowFocusHandle));
- return undoStack;
- })
- .then((undoStack) => {
- // tab removed handle
- // eslint-disable-next-line no-unused-vars
- const tabRemovedHandle = (tabId, removeInfo) => {
- chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
- if (!tabs || tabs.length === 0) return;
-
- this.enableExtensionIfNuxeoServerTab(tabs[0]);
- });
- };
- chrome.tabs.onRemoved.addListener(tabRemovedHandle);
- undoStack.push(() => chrome.tabs.onRemoved.removeListener(tabRemovedHandle));
- return undoStack;
- })
- .then((undoStack) => () => undoStack.forEach((cleanup) => cleanup()));
+ // eslint-disable-next-line class-methods-use-this
+ asTabInfo(input) {
+ if (input) {
+ return Promise.resolve(input);
+ }
+ return chrome.tabs
+ .query({ active: true, currentWindow: true })
+ .then(([tabInfo]) => tabInfo);
}
- enableExtensionIfNuxeoServerTab(tabInfo) {
- return this.worker.developmentMode.asConsole()
- .then((console) => this
- .asServerUrl(tabInfo)
- .then((serverUrl) => {
- console.log('Handling tab activation', tabInfo);
- return Promise.resolve()
- .then(() => this.worker.serverConnector.onNewLocation(serverUrl))
- .then(() => (serverUrl ? this.worker.cookieManager.enable() : this.worker.cookieManager.disable()))
- .then(() => (serverUrl ? this.enableTabExtension(tabInfo) : this.disableTabExtension(tabInfo)))
- .then(() => chrome.action.isEnabled(tabInfo.id)
- .then((isEnabled) => console
- .log(`Handled tab activation <- serverUrl=${serverUrl}, extension=${isEnabled ? 'enabled' : 'disabled'}`, tabInfo)))
- .then(() => serverUrl);
- })
- .catch((cause) => {
- if (cause.isForbidden) {
- return;
+ reloadServerTab(overrideOptions = {}) {
+ const defaultOptions = {
+ rootUrl: this.worker.serverConnector.serverUrl,
+ tabInfo: this.tabInfo,
+ maxAttempts: 1,
+ waitingTime: 4000,
+ bypassCache: false
+ };
+ const {
+ rootUrl, tabInfo, maxAttempts, waitingTime, bypassCache
+ } = { ...defaultOptions, ...overrideOptions };
+ if (!tabInfo) {
+ return Promise.reject(new Error('No nuxeo server tab info selected'));
+ }
+ const runningStatusUrl = `${rootUrl}/runningstatus`;
+ let attempts = 0;
+ const checkStatus = () => {
+ attempts += 1;
+ if (attempts > maxAttempts) {
+ throw new Error(`Maximum number of attempts reached on ${rootUrl}...`);
+ }
+ return fetch(runningStatusUrl)
+ .then((response) => {
+ if (!response.ok) {
+ // If the status page is not available, check again after a delay
+ return new Promise((resolve) => setTimeout(resolve, waitingTime))
+ .then(checkStatus);
}
- console.error('Handled tab activation <- caught error', tabInfo, cause);
- }));
- }
-
- asServerUrl(tabInfo) {
- return this.asPromise()
- .then((self) => self.nuxeoUrlOf(tabInfo))
- .then((nuxeoUrl) => {
- if (!nuxeoUrl) return undefined;
- return fetch(`${nuxeoUrl}/site/automation`, {
- method: 'GET',
- credentials: 'include', // Include cookies in the request
+ chrome.tabs.reload(tabInfo.id, { bypassCache });
+ return response;
})
- .then((response) => {
- if (response.ok || response.status !== 401) return response;
- this.worker.desktopNotifier.notify('unauthenticated', {
- title: `Not logged in page: ${tabInfo.url}...`,
- message: 'You are not authenticated. Please log in and try again.',
- iconUrl: '../images/access_denied.png',
- });
- return this.reloadServerTab({ rootUrl: nuxeoUrl, tabInfo });
- })
- .then((response) => {
- if (response.ok) return response;
- response.text().then((errorText) => {
- this.worker.desktopNotifier.notify('error', {
- title: `Not a Nuxeo server tab : ${tabInfo.url}...`,
- message: `Got errors while accessing automation status page at ${response.url}. Error: ${errorText}`,
- iconUrl: '../images/access_denied.png',
- });
- });
- throw new Error(`Not a nuxeo server tab : ${tabInfo.url}...`);
- })
- .then(() => {
- this.worker.desktopNotifier.cancel('unauthenticated');
- return nuxeoUrl;
- });
- });
- }
-
- reloadServerTab(context = {
- rootUrl: this.worker.serverConnector.serverUrl,
- tabInfo: this.tabInfo
- }, maxAttempts = 1, waitingTime = 4000) {
- return Promise.resolve(context)
- .then(({ rootUrl, tabInfo }) => {
- if (!tabInfo) {
- throw new Error('No nuxeo server tab info selected');
- }
- return { rootUrl, tabInfo };
- }).then(({ rootUrl, tabInfo }) => {
- const runnningstatusUrl = `${rootUrl}/runningstatus`;
- let attempts = 0;
- const checkStatus = () => {
- attempts += 1;
- if (attempts > maxAttempts) {
- throw new Error(`Maximum number of attempts reached on ${rootUrl}...`);
- }
- return fetch(runnningstatusUrl)
- .then((response) => {
- if (!response.ok) {
- // If the status page is not available, check again after a delay
- return new Promise((resolve) => setTimeout(resolve, waitingTime))
- .then(checkStatus);
- }
- chrome.tabs.reload(tabInfo.id);
- return tabInfo;
- })
- .catch(() => new Promise((resolve) => setTimeout(resolve, waitingTime))
- .then(checkStatus));
- };
- // Start checking the status
- return checkStatus();
- });
+ .catch(() => new Promise((resolve) => setTimeout(resolve, waitingTime))
+ .then(checkStatus));
+ };
+ // Start checking the status
+ return checkStatus();
}
updateServerTab(inputUrl, appendNuxeBasePath = false) {
return this.asTabParams(inputUrl, appendNuxeBasePath)
- .then((tabParams) => chrome.tabs.update(tabParams.openerTabId, {
- url: tabParams.url,
- selected: true
- }));
+ .then((tabParams) => chrome.tabs
+ .update(tabParams.openerTabId, {
+ url: tabParams.url,
+ active: true,
+ highlighted: true,
+ }));
}
loadNewExtensionTab(inputUrl, appendNuxeBasePath = false) {
@@ -230,18 +108,16 @@ class TabNavigationHandler extends ServiceWorkerComponent {
}));
}
- asTabParams(inputUrl = this.tabInfo.url, appendNuxeBasePath = false) {
- return this.asPromise()
- .then((self) => ({
- url: inputUrl,
- openerTabId: self.tabInfo.id
- }))
- .then(({ url, openerTabId }) => {
- if (!appendNuxeBasePath) return { url, openerTabId };
+ asTabParams(inputUrl, appendNuxeBasePath = false) {
+ return this.asTabInfo()
+ .then((tabInfo) => {
+ if (!appendNuxeBasePath) return { url: inputUrl, openerTabId: tabInfo.id };
+ if (!inputUrl) return { url: tabInfo.url, openerTabId: tabInfo.id };
return this.worker.serverConnector.asPromise()
- .then((serverConnector) => ({
- url: `${serverConnector.serverUrl}/${url}`,
- openerTabId
+ .then((serverConnector) => serverConnector.serverUrl)
+ .then((serverUrl) => ({
+ url: `${serverUrl}/${inputUrl}`,
+ openerTabId: tabInfo.id
}));
});
}
diff --git a/public/styles/main.css b/src/popup/index.css
similarity index 84%
rename from public/styles/main.css
rename to src/popup/index.css
index c36f3db2..418fcfe6 100644
--- a/public/styles/main.css
+++ b/src/popup/index.css
@@ -176,7 +176,7 @@ HEADINGS
align-self: flex-start;
width: 36px;
height: 36px;
- background-image: url("../images/nuxeo_block-30.png");
+ background-image: url("/images/nuxeo_block-30.png");
background-size: cover;
background-repeat: no-repeat;
background-position: 50% 50%;
@@ -216,19 +216,16 @@ HEADINGS
color: #fff;
}
-.reset {
- position: absolute;
- height: 15px;
- margin: auto;
- font-size: 15px;
- cursor: pointer;
- font-weight: normal;
- color: #fff;
- right: 8px;
- top: 40px;
+.server-name:empty::before,
+.server-name-url:empty::before,
+.studio-package-name:empty::before {
+ content: '\00a0'; /* Non-breaking space */
+ display: inline-block;
}
-.save {
+.reset,
+.save,
+.grant {
position: absolute;
height: 15px;
margin: auto;
@@ -240,13 +237,42 @@ HEADINGS
top: 40px;
}
+
.reset:hover,
-.save:hover {
+.save:hover,
+.grant:hover {
color: #006CFA;
}
+.reset {
+ right: 10px;
+}
+
+.grant {
+ right: 30px;
+}
+
+.save {
+ right: 50px;
+}
+
+.testgrant {
+ right: 70px;
+}
+
+.testgranted {
+ right: 90px;
+}
+
+.highlight-option {
+ display: flex;
+ align-items: center; /* Centers items vertically in the container */
+ justify-content: left; /* Centers items horizontally in the container */
+ gap: 5px; /* Adjust this value as needed to increase or decrease the space */
+ height: 15px; /* Optional: Define a specific height if needed */
+}
+
#highlight-label {
- height: 15px;
padding-top: 0.1em;
padding-left: 0.1em;
color: #006CFA;
@@ -265,6 +291,26 @@ label[for="studio-package-name-input"] {
width: 380px;
}
+#connect-url #buttons {
+ gap: .1em; /* Adjusts the space between the buttons */
+}
+
+/*==============================================================================
+FORMS
+==============================================================================*/
+
+.read-only-form input,
+.read-only-form textarea,
+.read-only-form select {
+ background-color: #f3f3f3; /* Light grey background */
+ color: #666; /* Darker text */
+ border: 1px solid #ccc; /* Light grey border */
+}
+
+.read-only-form select {
+ pointer-events: none; /* Prevent opening dropdown */
+}
+
/*==============================================================================
BUTTONS
==============================================================================*/
@@ -353,6 +399,13 @@ a.reindex-page {
font-size: 0.75em;
}
+#hot-reload-message {
+ display: none;
+ text-align: center;
+ font-size: 0.75em;
+ text-decoration: underline;
+}
+
#log-into-studio {
cursor: pointer;
}
@@ -363,7 +416,7 @@ a.reindex-page {
height: 55px;
width: 54px;
z-index: 9;
- background: transparent url('../images/loading_big.gif') no-repeat center;
+ background: transparent url('/images/loading_big.gif') no-repeat center;
opacity: 1;
}
@@ -473,7 +526,7 @@ SEARCH
position: absolute;
top: 5px;
left: 5px;
- background-image: url("../images/loading-20.gif");
+ background-image: url("/images/loading-20.gif");
height: 20px;
min-width: 20px;
display: none;
@@ -498,21 +551,15 @@ SEARCH
#reindex-nxql {
width: 165px;
font-weight: 600;
- background-color: #fff;
- color: #1F28BF;
}
#reindex-repo:hover,
#reindex-nxql:hover {
- background-color: #fff;
- color: #FF9E00;
transition: all 300ms ease;
}
.active#reindex-repo,
.active#reindex-nxql {
- background-color: #0D112A;
- color: #fff;
}
#reindex-form {
@@ -662,7 +709,7 @@ ABOUT
left: 35%;
height: 200px;
width: 160px;
- background-image: url("../images/1_.png");
+ background-image: url("/images/1_.png");
background-size: cover;
background-repeat: no-repeat;
background-position: 50% 50%;
@@ -681,6 +728,21 @@ ABOUT
to {transform: rotate(-15deg);}
}
+/*==============================================================================
+Content messages
+==============================================================================*/
+
+#messages > #designer-livepreview-need-update {
+ display: none;
+ font-size: 0.75em;
+}
+
+#messages > #no-admin-rights {
+ display: none;
+ animation: blink 1s infinite alternate;
+ font-size: 0.75em;
+}
+
/*==============================================================================
SHADE POPUP
==============================================================================*/
@@ -748,4 +810,4 @@ div.monospace {
#deps-mismatch {
display: none;
-}
\ No newline at end of file
+}
diff --git a/src/popup/index.html b/src/popup/index.html
index 871a7aa7..4cf02093 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -2,6 +2,7 @@
+
Nuxeo Dev Tools
-
-
-
-
🚫
-
💾
+
+ 🚫
+ 💾
+
+
@@ -147,16 +138,21 @@
+
+
Chrome version 72 or upper is needed to enable designer live preview functionality
+
You need to be an administrator to enable the other features.
+
-
-
Chrome version 72 or upper is needed to enable designer live preview functionality
-
+
diff --git a/src/popup/index.js b/src/popup/index.js
index 69785ae0..0f9597e4 100644
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -18,6 +18,8 @@
import $ from 'jquery';
import 'bootstrap/dist/css/bootstrap.min.css';
+import '@fortawesome/fontawesome-free/css/all.min.css';
+import './index.css';
import debounce from 'just-debounce';
import DOMPurify from 'dompurify';
import NuxeoServerVersion from 'nuxeo/lib/server-version';
@@ -25,41 +27,108 @@ import Swal from 'sweetalert2';
import ServiceWorkerBridge from '../service-worker-bridge';
-function loadPage(worker) {
- let position;
+function loadPage(worker, options = { forceForbiddenDomains: false }) {
+ const startLoading = () => {
+ const headingElement = $('.heading'); // Select the heading div
+ const headingPosition = headingElement.position(); // Get its position
+ const headingHeight = headingElement.outerHeight(); // Get its height
+ const headingWidth = headingElement.outerWidth(); // Get its width
- const startLoadingHR = () => new Promise((resolve) => {
- const a = $('a#hot-reload-button');
- position = a.position();
- $('#loading').css({
+ const loadingElement = $('#loading'); // Select the loading element
+ const loadingHeight = loadingElement.outerHeight(); // Get the loading element's height
+ const loadingWidth = loadingElement.outerWidth(); // Get the loading element's width
+ // Calculate the top position to center the loading vertically within the heading
+ const topPosition = headingPosition.top + (headingHeight / 2) - (loadingHeight / 2);
+
+ // Position the loading element to the right of the heading div with a margin
+ const leftPosition = headingPosition.left + headingWidth - loadingWidth - 10;
+
+ // Apply the calculated positions to the loading element
+ loadingElement.css({
display: 'block',
- top: position.top - 5,
- left: position.left - 50,
+ position: 'absolute', // Ensure the loading element is positioned absolutely
+ top: `${topPosition}px`,
+ left: `${leftPosition}px`,
});
- resolve();
- });
+ };
- const startLoadingRS = () => new Promise((resolve) => {
- const a = $('a#restart-button');
- position = a.position();
+ const startLoadingHR = () => new Promise((resolve) => {
+ const a = $('a#hot-reload-button');
+ const position = a.position();
$('#loading').css({
display: 'block',
top: position.top - 5,
- left: position.left - 50,
+ left: position.left - 50
});
resolve();
});
- const stopLoading = (cause) => {
+ // eslint-disable-next-line no-shadow
+ const stopLoading = (error) => {
+ $('#logo').css('visibility', 'visible');
$('#loading').css('display', 'none');
- if (cause instanceof Error) {
- Swal.fire({
- icon: 'error',
+ if (!error) return;
+ if (worker.isDevelopmentModeError(error)) return;
+ const alertInfo = () => {
+ let info = {
title: 'Oops...',
- text: `Something went wrong while loading! (${cause})`,
- footer: '
Why do I have this issue?'
- });
+ text: 'An internal error comes up while loading the popup!',
+ footer: `
+ Please open the JavaScript console of the
nuxeo web extension for more details
+
+ - enable the development mode
,
+ - inspect the nuxeo web extension
.
+
`,
+ icon: 'error',
+ showConfirmButton: false
+ };
+ if (!worker.isComponentError(error)) {
+ // not a component request , inform user to read the log
+ return info;
+ }
+ const jsonError = error.json();
+ info = {
+ ...info,
+ footer: jsonError.message
+ };
+ const notification = jsonError.notification;
+ if (notification) {
+ // If there's a notification, enrich the info object
+ info = {
+ ...info,
+ title: notification.options.title,
+ text: notification.options.message,
+ icon: null,
+ imageUrl: notification.options.iconUrl,
+ imageAlt: 'Error'
+ };
+ if (notification.id === 'forbidden_domain') {
+ const reloadPage = () => {
+ loadPage(worker, { ...options, forceForbiddenDomains: true });
+ };
+ info = {
+ ...info,
+ showCancelButton: true,
+ showConfirmButton: true,
+ confirmButtonText: 'Force',
+ cancelButtonText: 'Close',
+ preConfirm: () => reloadPage(),
+ onClose: () => {
+ window.close();
+ }
+ };
+ }
+ }
+ return info;
+ };
+
+ // log error if not a jsonError
+ if (!Object.hasOwn(error, 'jsonError')) {
+ console.error('Popup loading error', error);
}
+
+ // advertise the user
+ Swal.fire(alertInfo());
};
const showDependencyError = (deps) => {
@@ -73,7 +142,8 @@ function loadPage(worker) {
$('div.nuxeoctl-command').append(nuxeoctlCommand);
$('div.shade').show();
$('div.deps-mismatch').show();
- const msgHeight = document.getElementsByClassName('deps-popup')[0].offsetHeight;
+ const msgHeight =
+ document.getElementsByClassName('deps-popup')[0].offsetHeight;
const htmlHeight = $('html').height();
if (msgHeight > 360) {
const heightDiff = msgHeight - 360;
@@ -91,7 +161,8 @@ function loadPage(worker) {
resolve();
});
- const studioPackageFound = (connectUrl, packageName) => {
+ const studioPackageFound = (developmentMode, connectUrl, packageName) => {
+ $('div.studio-package-name').text(packageName);
worker.desktopNotifier.cancel('no_studio_project');
const toogleDesignerLivePreviewButton = (isEnabled) => {
$('#designer-live-preview-button').toggleClass('enabled', isEnabled);
@@ -99,8 +170,11 @@ function loadPage(worker) {
const toogleDesignerLivePreviewMessage = (cause) => {
toogleDesignerLivePreviewButton(false);
if (cause) {
+ const message = worker.isComponentError(cause)
+ ? cause.json().message
+ : cause.message;
$('#designer-livepreview-message').css('display', 'block');
- $('#designer-livepreview-message a').text(cause);
+ $('#designer-livepreview-message a').text(message);
$('#designer-live-preview-button').css('filter', 'invert(1)');
} else {
$('#designer-livepreview-message').css('display', 'none');
@@ -131,29 +205,41 @@ function loadPage(worker) {
`studio/ide?project=${packageName}`,
connectUrl.href
).toString();
- $('#log-into-studio').attr(
- 'href',
- packageLocation.toString()
- );
+ $('#log-into-studio').attr('href', packageLocation.toString());
$('#studio').click(() => {
worker.tabNavigationHandler.loadNewExtensionTab(packageLocation);
});
+ if (!developmentMode) {
+ $('#hot-reload-button').css('filter', 'invert(1)');
+ $('#hot-reload-message').css('display', 'block');
+ } else {
+ $('#hot-reload-message').css('display', 'none');
+ $('#hot-reload-message a').text('');
+ }
$('#hot-reload-button').click(() => {
startLoadingHR()
.then(() => worker.studioHotReloader.reload())
- .then(stopLoading)
+ .then(() => stopLoading())
.then(() => worker.tabNavigationHandler.reloadServerTab())
- .catch(stopLoading);
+ .catch((cause) => stopLoading(cause));
+ });
+ $('#hot-reload-message a').click(() => {
+ Swal.fire({
+ title: 'Info!',
+ html: `You are not in development mode,
+ you can't hot-reload studio package.
+ Please add the following parameters to your
nuxeo.conf file:
+
org.nuxeo.dev=true
+
org.nuxeo.runtime.reload_strategy=standby`
+ });
});
$('#force-hot-reload-button').click(() => {
hideDependencyError()
.then(startLoadingHR)
- .then(() => worker
- .studioHotReloader
- .reload(false))
- .then(stopLoading)
- .catch(stopLoading);
+ .then(() => worker.studioHotReloader.reload(false))
+ .then(() => stopLoading())
+ .catch((cause) => stopLoading(cause));
});
$('#cancel-button').click(() => {
hideDependencyError()
@@ -163,18 +249,17 @@ function loadPage(worker) {
};
const noStudioPackageFound = () => {
+ $('div.studio-package-name').text('
');
$('#no-studio-buttons').hide();
// $('div.nuxeoctl-command').append('nuxeoctl register');
// $('div.shade').show();
// $('#no-studio-package-registered').show();
- worker.desktopNotifier.notify(
- 'no_studio_project',
- {
- title: 'No associated Studio project',
- message: 'If you\'d like to use this function, please associate your Nuxeo server with a studio project',
- iconUrl: '/images/access_denied.png'
- }
- );
+ worker.desktopNotifier.notify('no_studio_project', {
+ title: 'No associated Studio project',
+ message:
+ "If you'd like to use this function, please associate your Nuxeo server with a studio project",
+ iconUrl: '../images/access_denied.png'
+ });
};
const registerLink = (element, url) => {
@@ -201,694 +286,796 @@ function loadPage(worker) {
$('#reset').css('top', 5);
};
- worker.connectLocator
- .asRegistration()
- .then(({ location, credentials }) => {
- const connectUrl = new URL(location);
- const connectCredentials = credentials;
- return { connectUrl, connectCredentials };
- })
- // wait for the document to be ready
- .then(({ connectUrl, connectCredentials }) => new Promise((resolve) => {
- $(document).ready(() => resolve({ connectUrl, connectCredentials }));
- }))
- // remove the studio package name input if the feature flag is not set
- .then(({ connectUrl, connectCredentials }) => worker.developmentMode
- .isFeatureFlagSet('studio-package-name')
- .then((isEnabled) => {
- if (!isEnabled) {
- $('#studio-package-name-input').remove();
- }
- return { connectUrl, connectCredentials };
- }))
- // process the page, should split this in multiple functions
- // eslint-disable-next-line no-unused-vars
- .then(({ connectUrl, connectCredentials }) => {
- const pendingPromises = [];
- // reset jQuery event handlers
- $('body').find('*').addBack().off();
-
- $('#connect-url-input').val(connectUrl);
-
- // update the page according to the feature flags
- pendingPromises.push(worker.developmentMode
- .isFeatureFlagSet('studio-package-name')
- .then((isEnabled) => {
- if (isEnabled) return;
- $('#studio-package-name-input').remove();
- }));
-
- // process the page
- const browserVendor = worker.buildInfo.browserVendor();
- if (browserVendor === 'Firefox') {
- adjustStorageButtons();
- }
-
- // For chrome browser, the designer live preview is enable
- // for version upper 72
- $('#designer-livepreview-need-update').hide();
- if (browserVendor === 'Chrome') {
- const version = parseInt(
- /(Firefox|Chrome)\/(?[0-9\.]*)/g
- .exec(navigator.userAgent)
- .groups.version.split('.')[0]
- );
- if (version < 72) {
- $('#designer-livepreview').hide();
- $('#designer-livepreview-need-update').show();
- }
- }
-
- $('#nxql-clear').click(() => {
- $('#nxql-docid').val('');
- });
+ // reset jQuery event handlers
+ $('body').find('*').addBack().off();
+
+ Promise.resolve()
+ .then(() => startLoading())
+ .then(worker.serverConnector.asNuxeo(options)
+ .then((nuxeo) => worker.connectLocator
+ .asRegistration()
+ .then((input) => {
+ const { location, credentials } = input;
+ const connectUrl = new URL(location);
+ const connectCredentials = credentials;
+ return { connectUrl, connectCredentials, ...input };
+ })
+ // process the page, should split this in multiple functions
+ // eslint-disable-next-line no-unused-vars
+ .then(({ connectUrl, connectCredentials, cookiesGranted }) => {
+ // bind the fields with the js worker
+ const pendingPromises = [];
+
+ pendingPromises.push(
+ worker.asDevelopmentMode()
+ .then(() => {
+ // set values
+ $('#connect-url-input').val(connectUrl);
+
+ $('#save').click(() => {
+ const savingPromises = [];
+
+ // connect URL
+ savingPromises.push(
+ Promise.resolve($('#connect-url-input'))
+ .then(
+ (inputField) => (
+ $('#connect-url').hide(),
+ { field: inputField, value: inputField.val() }
+ )
+ )
+ .then(({ field, value }) => {
+ const registration =
+ value.length !== 0
+ ? worker.connectLocator.asRegistration(value)
+ : worker.connectLocator.asRegistration();
+ return registration.then(
+ ({ location }) => (field.val(location), new URL(location))
+ );
+ })
+ );
+
+ // studio package name
+ savingPromises.push(
+ Promise.resolve($('#studio-package-name-input'))
+ .then((selectBox) => (selectBox.length === 0 ? undefined : selectBox.val()))
+ .then((name) => {
+ if (!name) {
+ return undefined;
+ }
+ return worker.serverConnector
+ .registerDevelopedStudioProject(name)
+ .then(() => name);
+ })
+ );
+
+ // highlight
+ savingPromises.push(
+ worker.browserStore
+ .set({ highlight: $('#highlight-input').prop('checked') })
+ .then((store) => store.highlight)
+ );
+
+ Promise.all(savingPromises).then(() => worker.componentInventory.reload());
+ });
+
+ $('#reset').click(() => {
+ Swal.fire({
+ title: 'Reset Options',
+ text: 'Click Reset to reset all options to default settings.',
+ showCancelButton: true,
+ confirmButtonText: 'Reset',
+ cancelButtonText: 'Cancel'
+ }).then((result) => {
+ if (!result.isConfirmed) return;
+ worker.componentInventory.reset();
+ });
+ });
+ // Grant cookies permissions to connect if needed
+ // Define a variable in memory to keep track of the permission state
+ // eslint-disable-next-line no-unused-vars
+ let newCookiesGranted = cookiesGranted;
+ const onCookiesGranted = (granted) => {
+ const style = ``;
+ $('#grant').html(style);
+ newCookiesGranted = granted;
+ };
+ onCookiesGranted(cookiesGranted);
+ $('#grant').click(() => {
+ const permissions = {
+ origins: [`${connectUrl.origin}/*`],
+ permissions: ['cookies']
+ };
+ chrome.permissions
+ .contains(permissions)
+ .then((isGranted) => (isGranted
+ ? chrome.permissions.remove(permissions)
+ : chrome.permissions.request(permissions)))
+ .then(() => chrome.permissions.contains(permissions))
+ .then((granted) => onCookiesGranted(granted))
+ .catch((error) => {
+ console.error(
+ 'Error handling permissions',
+ permissions,
+ error
+ );
+ // Handle the error appropriately in your extension
+ // For example, you might want to inform the user that the permissions cannot be modified
+ });
+ });
+ })
+ .catch(() => {})
+ );
- $('#logo').click(() => {
- $('#connect-url').toggle();
- });
+ // process the page
+ const browserVendor = worker.buildInfo.browserVendor();
+ if (browserVendor === 'Firefox') {
+ adjustStorageButtons();
+ }
- $('#save').click(() => {
- const savingPromises = [];
-
- // connect URL
- savingPromises.push(Promise.resolve($('#connect-url-input'))
- .then((inputField) => ($('#connect-url').hide(), { field: inputField, value: inputField.val() }))
- .then(({ field, value }) => {
- const registration = value.length !== 0
- ? worker.connectLocator.asRegistration(value)
- : worker.connectLocator.asRegistration();
- return registration
- .then(({ location }) => (field.val(location), new URL(location)));
- }));
-
- // studio package name
- savingPromises.push(Promise.resolve($('#studio-package-name-input'))
- .then((selectBox) => (selectBox.length === 0 ? undefined : selectBox.val()))
- .then((name) => {
- if (!name) {
- return undefined;
+ // For chrome browser, the designer live preview is enable
+ // for version upper 72
+ if (browserVendor === 'Chrome') {
+ const version = parseInt(
+ /(Firefox|Chrome)\/(?[0-9\.]*)/g
+ .exec(navigator.userAgent)
+ .groups.version.split('.')[0]
+ );
+ if (version < 72) {
+ $('#designer-livepreview').hide();
+ $('#designer-livepreview-need-update').show();
}
- return worker.serverConnector
- .registerDevelopedStudioProject(name)
- .then(() => name);
- }));
-
- // highlight
- savingPromises.push(worker.browserStore
- .set({ highlight: $('#highlight-input').prop('checked') })
- .then((store) => store.highlight));
-
- Promise
- .all(savingPromises)
- .then(() => worker.componentInventory.reload());
- });
+ }
- $('#reset').click(() => {
- Swal.fire({
- title: 'Reset Options',
- text: 'Click Reset to reset all options to default settings.',
- showCancelButton: true,
- confirmButtonText: 'Reset',
- cancelButtonText: 'Cancel',
- }).then((result) => {
- if (!result.isConfirmed) return;
- worker.componentInventory.reset();
- });
- });
+ $('#nxql-clear').click(() => {
+ $('#nxql-docid').val('');
+ });
+
+ worker.asDevelopmentMode()
+ .then(() => {
+ $('#logo').click(() => {
+ $('#connect-url').toggle();
+ });
+ });
- // being resolved in promise for handles, better be bound in a dedicated class I think
- let onUI;
- let repository = 'default';
- let serverUrl;
-
- const regexes = {};
- regexes.uuid = /[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/;
- regexes.repo = /[A-Za-z_\.0-9-]+/;
- regexes.path = /\/[A-Za-z\.0-9_\- \/%~:?#'"]+/;
-
- regexes.jsf = {};
- regexes.jsf.nxpath = new RegExp(
- `(?:nxpath/(?${regexes.repo.source})(?${regexes.path.source}))`
- );
- regexes.jsf.nxdoc = new RegExp(
- `(?:nxdoc/(?${regexes.repo.source})/(?${regexes.uuid.source}))`
- );
- regexes.jsf.doc = new RegExp(
- `/(${regexes.jsf.nxpath.source}|${regexes.jsf.nxdoc.source})`
- );
-
- regexes.ui = {};
- regexes.ui.home = new RegExp('(?:home$)');
- regexes.ui.browse = new RegExp('(?:browse(?/.+?(?=\\?|$)))');
- regexes.ui.docid = new RegExp(
- `(?:doc/(?${regexes.uuid.source}))`
- );
- regexes.ui.doc = new RegExp(
- `/(?:repo/(?${regexes.repo.source})|)ui/#!/(?:${regexes.ui.browse.source}|${regexes.ui.docid.source}|${regexes.ui.home.source})`
- );
-
- function doGetJson(path) {
- worker.browserStore.get({ highlight: true }).then((res) => {
- if (res.highlight) {
- worker.documentBrowser.jsonOf(repository, path)
- .then(openJsonWindow);
- } else {
- const jsonPath = `api/v1/repo/${repository}/${path}?enrichers.document=acls,permissions&properties=*`;
- worker.tabNavigationHandler.loadNewExtensionTab(jsonPath, true);
+ // being resolved in promise for handles, better be bound in a dedicated class I think
+ let onUI;
+ let repository = 'default';
+ let serverRuntimeInfo;
+ let serverUrl;
+
+ const regexes = {};
+ regexes.uuid =
+ /(?:(?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})|uuid:(?.*))/;
+ regexes.repo = /[A-Za-z_\.0-9-]+/;
+ regexes.path = /\/[A-Za-z\.0-9_\- \/%~:?#'"]+/;
+
+ regexes.jsf = {};
+ regexes.jsf.nxpath = new RegExp(
+ `(?:nxpath/(?${regexes.repo.source})(?${regexes.path.source}))`
+ );
+ regexes.jsf.nxdoc = new RegExp(
+ `(?:nxdoc/(?${regexes.repo.source})/(?${regexes.uuid.source}))`
+ );
+ regexes.jsf.doc = new RegExp(
+ `/(${regexes.jsf.nxpath.source}|${regexes.jsf.nxdoc.source})`
+ );
+
+ regexes.ui = {};
+ regexes.ui.home = new RegExp('(?:home$)');
+ regexes.ui.browse = new RegExp('(?:browse(?/.+?(?=\\?|$)))');
+ regexes.ui.docid = new RegExp(
+ `(?:doc/(?${regexes.uuid.source}))`
+ );
+ regexes.ui.doc = new RegExp(
+ `/(?:repo/(?${regexes.repo.source})|)ui/#!/(?:${regexes.ui.browse.source}|${regexes.ui.docid.source}|${regexes.ui.home.source})`
+ );
+
+ function doGetJson(path) {
+ worker.browserStore.get({ highlight: true }).then((res) => {
+ if (res.highlight) {
+ worker.documentBrowser
+ .jsonOf(repository, path)
+ .then(openJsonWindow);
+ } else {
+ const jsonPath = `api/v1/repo/${repository}/${path}?enrichers.document=acls,permissions&properties=*`;
+ worker.tabNavigationHandler.loadNewExtensionTab(jsonPath, true);
+ }
+ });
}
- });
- }
- function getJsonFromPath(input) {
- doGetJson(`path/${decodeURIComponent(input)}`);
- }
+ function getJsonFromPath(input) {
+ doGetJson(`path/${decodeURIComponent(input)}`);
+ }
- function getJsonFromGuid(input) {
- doGetJson(`id/${input}`);
- }
+ function getJsonFromGuid(input) {
+ doGetJson(`id/${input}`);
+ }
- function hideActionsAndToggles() {
- $('.buttons').css('display', 'none');
- $('.toggles').css('display', 'none');
- }
+ function hideActionsAndToggles(messageId = 'no-admin-rights') {
+ $('.buttons').css('display', 'none');
+ $('.toggles').css('display', 'none');
+ $(`#messages > #${messageId}`).css('display', 'block');
+ }
- pendingPromises.push(
- worker.browserStore
- .get({ highlight: true })
- .then(({ highlight: isChecked }) => $('#highlight-input').prop('checked', isChecked))
- );
- pendingPromises.push(checkDependencyMismatch());
-
- pendingPromises.push(worker.serverConnector
- .asNuxeo()
- .then((nuxeo) => {
- if (nuxeo.user.isAdministrator) return;
- hideActionsAndToggles();
- })
- .catch((error) => {
- worker.developmentMode.asConsole()
- .then((console) => console.warn('Not connected, cannot check user role', error));
- hideActionsAndToggles();
- }));
-
- pendingPromises.push(Promise.resolve($('#studio-package-name-input'))
- .then((selectBox) => (selectBox.length === 0 ? undefined : selectBox))
- .then((selectBox) => {
- if (!selectBox) {
- return worker.serverConnector
- .asConnectRegistration()
- .then((registration) => {
- const { package: studioPackage } = registration;
- if (!studioPackage) return registration;
- return { ...registration, package: studioPackage.name };
- });
+ if (!nuxeo.user.isAdministrator) {
+ hideActionsAndToggles();
}
- return worker.serverConnector
- .asDevelopedStudioProjects()
- .then((info) => {
- // Remove any existing options
- while (selectBox[0].firstChild) {
- selectBox[0].removeChild(selectBox[0].firstChild);
- }
- return info;
- })
- .then((info) => {
- const { projects } = info;
-
- // skip if no projects
- if (!projects) return info;
-
- // Add an option for each studio package
- let registeredPackageFound = null;
- projects.forEach((project) => {
- const option = document.createElement('option');
- option.value = project.packageName;
- option.text = project.packageName;
- if (project.isRegistered) {
- option.selected = true;
- registeredPackageFound = project.packageName;
- }
- selectBox[0].appendChild(option);
- });
- // Return whether an enabled package was found
- return { ...info, package: registeredPackageFound };
- });
- })
- // eslint-disable-next-line no-shadow
- .then((registration) => {
- const {
+ pendingPromises.push(
+ worker.browserStore
+ .get({ highlight: true })
+ .then(({ highlight: isChecked }) => $('#highlight-input').prop('checked', isChecked))
+ );
+ pendingPromises.push(checkDependencyMismatch());
+
+ pendingPromises.push(
+ Promise.resolve($('#studio-package-name-input'))
+ .then((selectBox) => (selectBox.length === 0 ? undefined : selectBox))
+ .then((selectBox) => {
+ if (!selectBox) {
+ return worker.serverConnector
+ .asConnectRegistration()
+ .then((registration) => {
+ const { package: studioPackage } = registration;
+ if (!studioPackage) return registration;
+ return { ...registration, package: studioPackage.name };
+ });
+ }
+ return Promise.all([
+ worker.serverConnector
+ .asConnectRegistration(),
+ worker.serverConnector
+ .asDevelopedStudioProjects()
+ .then((projects) => {
+ // Remove any existing options
+ while (selectBox[0].firstChild) {
+ selectBox[0].removeChild(selectBox[0].firstChild);
+ }
+ // Add an option for each studio package
+ let registeredPackageFound = null;
+ projects.forEach((project) => {
+ const option = document.createElement('option');
+ option.value = project.packageName;
+ option.text = project.packageName;
+ if (project.isRegistered) {
+ option.selected = true;
+ registeredPackageFound = project.packageName;
+ }
+ selectBox[0].appendChild(option);
+ });
+
+ // Return whether an enabled package was found
+ return { ...projects, package: registeredPackageFound };
+ })])
+ .then(([registration, projects]) => ({ ...registration, ...projects }));
+ })
// eslint-disable-next-line no-shadow
- serverUrl: serverLocation,
- connectUrl: connectLocation,
- connectSubscription,
- developmentMode,
- package: registeredPackage
- } = registration;
- if (!developmentMode) {
- $('div.shade').show();
- $('#development-mode-disabled').show();
- $('#development-mode-disabled #serverUrl').text(serverLocation);
- }
- if (connectSubscription.errorMessage) {
- const alertText = `
+ .then((registration) => {
+ const {
+ // eslint-disable-next-line no-shadow, no-unused-vars
+ serverUrl: serverLocation,
+ connectUrl: connectLocation,
+ connectSubscription,
+ // eslint-disable-next-line no-unused-vars
+ developmentMode,
+ package: registeredPackage
+ } = registration;
+ if (connectSubscription && connectSubscription.errorMessage) {
+ const alertText = `
Cannot retrieve your server registration from \`${connectUrl}\`...
Most probably your CLID is invalid or missing !
(see console logs for mor details)`;
- Swal.fire({
- title: 'Warning',
- html: alertText,
- icon: 'warning',
- });
- }
- if (registeredPackage) {
- studioPackageFound(new URL(connectLocation), registeredPackage);
- } else {
- noStudioPackageFound();
- }
- }));
-
- pendingPromises.push(worker.serverConnector.executeOperation('Traces.ToggleRecording', { readOnly: true })
- // eslint-disable-next-line no-sequences
- .then((json) => json.value)
- .then((value) => Boolean(value))
- .then((isEnabled) => {
- $('#traces-button').toggleClass('enabled', isEnabled);
- }));
-
- pendingPromises.push(worker
- .serverConnector
- .asRuntimeInfo()
- .then((info) => {
- const nuxeoServerVersion = NuxeoServerVersion.create(info.nuxeo.serverVersion.version);
- const lts2019 = NuxeoServerVersion.create('10.10');
- serverUrl = info.serverUrl.replace(/\/$/, '');
- const serverString = DOMPurify.sanitize(serverUrl);
-
- const promises = [
- Promise.resolve($('#platform-version').text(` ${info.nuxeo.serverVersion.version}`)),
- nuxeoServerVersion.lt(lts2019)
- ? worker.browserStore.set({ highlight: true }).then(() => adjustStorageButtons())
- : Promise.resolve(),
- Promise.resolve($('div.server-name-url').text(serverString)),
- Promise.resolve(registerLink('#automation-doc', serverUrl.concat('/site/automation/doc/'))),
- Promise.resolve(info.installedAddons)
- .then((addons) => {
- if (!addons.includes('nuxeo-web-ui')) {
- $('#designer-livepreview').hide();
+ Swal.fire({
+ title: 'Warning',
+ html: alertText,
+ icon: 'warning'
+ });
+ }
+ if (registeredPackage) {
+ studioPackageFound(
+ developmentMode,
+ new URL(connectLocation),
+ registeredPackage
+ );
+ } else {
+ noStudioPackageFound();
}
- const playgroundUrl = addons.includes('nuxeo-api-playground')
- ? `${serverUrl}/playground/#/${serverUrl}`
- : `http://nuxeo.github.io/api-playground/#/${serverUrl}`;
- return registerLink('#api-playground', playgroundUrl);
})
- ];
-
- return Promise.all(promises);
- }));
-
- pendingPromises.push(worker.tabNavigationHandler
- .asTabParams()
- .then(({ url }) => {
- const jsfMatchs = regexes.jsf.doc.exec(url);
- const uiMatchs = regexes.ui.doc.exec(url);
-
- function exportCurrentLink(docPathOrId) {
- $('#export-current').css('display', 'block');
- $('#export-current').click(() => {
- if (regexes.uuid.test(docPathOrId)) {
- getJsonFromGuid(docPathOrId);
- } else if (docPathOrId.startsWith('/')) {
- getJsonFromPath(docPathOrId);
+ );
+
+ pendingPromises.push(
+ worker.serverConnector
+ .executeOperation('Traces.ToggleRecording', { readOnly: true })
+ // eslint-disable-next-line no-sequences
+ .then((json) => json.value)
+ .then((value) => Boolean(value))
+ .then((isEnabled) => {
+ $('#traces-button').toggleClass('enabled', isEnabled);
+ })
+ );
+
+ pendingPromises.push(
+ worker.serverConnector.asRuntimeInfo().then((runtimeInfo) => {
+ if (!runtimeInfo.nuxeo.connected) {
+ return Promise.resolve();
}
- });
- }
+ const nuxeoServerVersion = NuxeoServerVersion.create(
+ runtimeInfo.nuxeo.serverVersion.version
+ );
+ const lts2019 = NuxeoServerVersion.create('10.10');
+ serverRuntimeInfo = runtimeInfo;
+ serverUrl = runtimeInfo.serverUrl.replace(/\/$/, '');
+ const serverString = DOMPurify.sanitize(serverUrl);
+
+ const promises = [
+ Promise.resolve(
+ $('#platform-version').text(
+ ` ${runtimeInfo.nuxeo.serverVersion.version}`
+ )
+ ),
+ nuxeoServerVersion.lt(lts2019)
+ ? worker.browserStore
+ .set({ highlight: true })
+ .then(() => adjustStorageButtons())
+ : Promise.resolve(),
+ Promise.resolve($('div.server-name-url').text(serverString)),
+ Promise.resolve(
+ registerLink(
+ '#automation-doc',
+ serverUrl.concat('/site/automation/doc/')
+ )
+ ),
+ Promise.resolve(runtimeInfo.installedAddons).then((addons) => {
+ if (!addons.includes('nuxeo-web-ui')) {
+ $('#designer-livepreview').hide();
+ }
+ const playgroundUrl = addons.includes('nuxeo-api-playground')
+ ? `${serverUrl}/playground/#/${serverUrl}`
+ : `http://nuxeo.github.io/api-playground/#/${serverUrl}`;
+ return registerLink('#api-playground', playgroundUrl);
+ })
+ ];
+
+ return Promise.all(promises);
+ })
+ );
+
+ pendingPromises.push(
+ worker.tabNavigationHandler
+ .asTabParams(undefined, true)
+ .then(({ url }) => {
+ const jsfMatchs = regexes.jsf.doc.exec(url);
+ const uiMatchs = regexes.ui.doc.exec(url);
+
+ function exportCurrentLink(docPathOrId) {
+ $('#export-current').css('display', 'block');
+ $('#export-current').click(() => {
+ if (docPathOrId.startsWith('/')) {
+ getJsonFromPath(docPathOrId);
+ } else {
+ getJsonFromGuid(docPathOrId);
+ }
+ });
+ }
- if (jsfMatchs || uiMatchs) {
- onUI = uiMatchs;
- const groups = (jsfMatchs || uiMatchs).groups;
- repository = groups.repoPath || groups.repoId || groups.repo || 'default';
- if (groups.path || groups.docid) {
- exportCurrentLink(groups.path || groups.docid);
+ if (jsfMatchs || uiMatchs) {
+ onUI = uiMatchs;
+ const groups = (jsfMatchs || uiMatchs).groups;
+ repository =
+ groups.repoPath || groups.repoId || groups.repo || 'default';
+ if (groups.path || groups.docid) {
+ exportCurrentLink(groups.path || groups.docid);
+ }
+ }
+ return url;
+ })
+ );
+
+ registerLink('#nuxeo-status', 'https://status.nuxeo.com/');
+ registerLink('#explorer', 'https://explorer.nuxeo.com');
+ registerLink('#nxql', 'https://doc.nuxeo.com/nxdoc/nxql/');
+ registerLink(
+ '#el-scripting',
+ 'https://doc.nuxeo.com/nxdoc/understand-expression-and-scripting-languages-used-in-nuxeo/'
+ );
+ registerLink(
+ '#mvel',
+ 'https://doc.nuxeo.com/nxdoc/use-of-mvel-in-automation-chains/'
+ );
+ registerLink(
+ '#workflow-variables',
+ 'https://doc.nuxeo.com/nxdoc/variables-available-in-the-automation-context/'
+ );
+ registerLink(
+ '#escalation-rules',
+ 'https://doc.nuxeo.com/nxdoc/escalation-service/'
+ );
+ registerLink(
+ '#nuxeo-elements',
+ 'https://www.webcomponents.org/author/nuxeo'
+ );
+ registerLink(
+ '#nuxeo-layouts',
+ 'http://showcase.nuxeo.com/nuxeo/layoutDemo/'
+ );
+ registerLink(
+ '#style-guide',
+ 'http://showcase.nuxeo.com/nuxeo/styleGuide/'
+ );
+
+ function showSearchResults(icon, title, path, uid, vMajor, vMinor) {
+ const iconLink = serverUrl.concat(icon);
+ const iconTag = document.createElement('td');
+ const image = document.createElement('img');
+ const titleTag = document.createElement('td');
+ const jsonTag = document.createElement('td');
+ const jsonIcon = $('.json-icon-large').clone();
+ const pathTag = document.createElement('td');
+ const searchResult = document.createElement('tr');
+ const searchResultPath = document.createElement('tr');
+ iconTag.setAttribute('colspan', '1');
+ iconTag.className = 'icon';
+ image.className = 'doc-icon';
+ image.setAttribute('src', `${iconLink}`);
+ image.setAttribute('alt', 'icon');
+ iconTag.appendChild(image);
+ titleTag.setAttribute('colspan', '18');
+ titleTag.setAttribute('title', 'Open document in another tab');
+ titleTag.className = 'doc-title';
+ titleTag.id = `${uid}`;
+ if (
+ typeof vMajor !== 'undefined' &&
+ typeof vMinor !== 'undefined' &&
+ (vMajor !== 0 || vMinor !== 0)
+ ) {
+ titleTag.textContent = `${title} `;
+ const span = document.createElement('span');
+ span.className = 'version';
+ span.textContent = `v${vMajor}.${vMinor}`;
+ titleTag.appendChild(span);
+ } else {
+ titleTag.textContent = `${title}`;
}
+ jsonTag.setAttribute('colspan', '1');
+ jsonTag.className = 'icon';
+ jsonIcon.removeClass('json-icon-large');
+ jsonIcon.addClass('json-icon');
+ jsonIcon.attr('id', `${uid}`);
+ $('title', jsonIcon).text('View document JSON');
+ jsonTag.appendChild(jsonIcon[0]);
+ pathTag.setAttribute('colspan', '20');
+ pathTag.className = 'doc-path';
+ pathTag.textContent = `${path}`;
+ searchResult.className = 'search-result';
+ searchResult.appendChild(iconTag);
+ searchResult.appendChild(titleTag);
+ searchResult.appendChild(jsonTag);
+ searchResultPath.appendChild(pathTag);
+ $('tbody').append(searchResult);
+ $('tbody').append(searchResultPath);
}
- return url;
- }));
-
- registerLink('#nuxeo-status', 'https://status.nuxeo.com/');
- registerLink('#explorer', 'https://explorer.nuxeo.com');
- registerLink('#nxql', 'https://doc.nuxeo.com/nxdoc/nxql/');
- registerLink(
- '#el-scripting',
- 'https://doc.nuxeo.com/nxdoc/understand-expression-and-scripting-languages-used-in-nuxeo/'
- );
- registerLink(
- '#mvel',
- 'https://doc.nuxeo.com/nxdoc/use-of-mvel-in-automation-chains/'
- );
- registerLink(
- '#workflow-variables',
- 'https://doc.nuxeo.com/nxdoc/variables-available-in-the-automation-context/'
- );
- registerLink(
- '#escalation-rules',
- 'https://doc.nuxeo.com/nxdoc/escalation-service/'
- );
- registerLink(
- '#nuxeo-elements',
- 'https://www.webcomponents.org/author/nuxeo'
- );
- registerLink(
- '#nuxeo-layouts',
- 'http://showcase.nuxeo.com/nuxeo/layoutDemo/'
- );
- registerLink(
- '#style-guide',
- 'http://showcase.nuxeo.com/nuxeo/styleGuide/'
- );
-
- function showSearchResults(icon, title, path, uid, vMajor, vMinor) {
- const iconLink = serverUrl.concat(icon);
- const iconTag = document.createElement('td');
- const image = document.createElement('img');
- const titleTag = document.createElement('td');
- const jsonTag = document.createElement('td');
- const jsonIcon = $('.json-icon-large').clone();
- const pathTag = document.createElement('td');
- const searchResult = document.createElement('tr');
- const searchResultPath = document.createElement('tr');
- iconTag.setAttribute('colspan', '1');
- iconTag.className = 'icon';
- image.className = 'doc-icon';
- image.setAttribute('src', `${iconLink}`);
- image.setAttribute('alt', 'icon');
- iconTag.appendChild(image);
- titleTag.setAttribute('colspan', '18');
- titleTag.setAttribute('title', 'Open document in another tab');
- titleTag.className = 'doc-title';
- titleTag.id = `${uid}`;
- if (
- typeof vMajor !== 'undefined'
- && typeof vMinor !== 'undefined'
- && (vMajor !== 0 || vMinor !== 0)
- ) {
- titleTag.textContent = `${title} `;
- const span = document.createElement('span');
- span.className = 'version';
- span.textContent = `v${vMajor}.${vMinor}`;
- titleTag.appendChild(span);
- } else {
- titleTag.textContent = `${title}`;
- }
- jsonTag.setAttribute('colspan', '1');
- jsonTag.className = 'icon';
- jsonIcon.removeClass('json-icon-large');
- jsonIcon.addClass('json-icon');
- jsonIcon.attr('id', `${uid}`);
- $('title', jsonIcon).text('View document JSON');
- jsonTag.appendChild(jsonIcon[0]);
- pathTag.setAttribute('colspan', '20');
- pathTag.className = 'doc-path';
- pathTag.textContent = `${path}`;
- searchResult.className = 'search-result';
- searchResult.appendChild(iconTag);
- searchResult.appendChild(titleTag);
- searchResult.appendChild(jsonTag);
- searchResultPath.appendChild(pathTag);
- $('tbody').append(searchResult);
- $('tbody').append(searchResultPath);
- }
- function docSearch(nxqlQuery, input) {
- return worker.serverConnector
- .query({ query: nxqlQuery, sortBy: 'dc:modified' })
- .then((res) => {
- if (res.entries.length > 0) {
- $('.no-result').css('display', 'none');
- $('body').css('overflow-y', 'auto');
- const thead = document.createElement('thead');
- const tr = document.createElement('tr');
- const th = document.createElement('th');
- const tbody = document.createElement('tbody');
- th.setAttribute('colspan', '20');
- th.textContent = 'Search Results:';
- tr.appendChild(th);
- thead.appendChild(tr);
- $('#search-results').append(thead);
- $('#search-results').append(tbody);
- $('table').css('margin-top', '20px');
- res.entries.forEach((doc) => {
- $('html').outerHeight($('html').height());
- const icon = doc.properties['common:icon'];
- const title = doc.properties['dc:title'];
- const re = /^(.*[\/])/;
- const path = re.exec(doc.path)[1];
- const uid = doc.uid;
- const vMajor = doc.properties['uid:major_version'];
- const vMinor = doc.properties['uid:minor_version'];
- showSearchResults(icon, title, path, uid, vMajor, vMinor);
- });
- $('.doc-title').click((event) => {
- const docPath = onUI ? `ui/#!/doc/${event.currentTarget.id}` : `nxdoc/default/${event.currentTarget.id}/view_documents`;
- worker.tabNavigationHandler.loadNewExtensionTab(docPath, true);
+ function docSearch(nxqlQuery, input) {
+ return worker.serverConnector
+ .query({ query: nxqlQuery, sortBy: 'dc:modified' })
+ .then((res) => {
+ if (res.entries.length > 0) {
+ $('.no-result').css('display', 'none');
+ $('body').css('overflow-y', 'auto');
+ const thead = document.createElement('thead');
+ const tr = document.createElement('tr');
+ const th = document.createElement('th');
+ const tbody = document.createElement('tbody');
+ th.setAttribute('colspan', '20');
+ th.textContent = 'Search Results:';
+ tr.appendChild(th);
+ thead.appendChild(tr);
+ $('#search-results').append(thead);
+ $('#search-results').append(tbody);
+ $('table').css('margin-top', '20px');
+ res.entries.forEach((doc) => {
+ $('html').outerHeight($('html').height());
+ const icon = doc.properties['common:icon'];
+ const title = doc.properties['dc:title'];
+ const re = /^(.*[\/])/;
+ const path = re.exec(doc.path)[1];
+ const uid = doc.uid;
+ const vMajor = doc.properties['uid:major_version'];
+ const vMinor = doc.properties['uid:minor_version'];
+ showSearchResults(icon, title, path, uid, vMajor, vMinor);
+ });
+ $('.doc-title').click((event) => {
+ const docPath = onUI
+ ? `ui/#!/doc/${event.currentTarget.id}`
+ : `nxdoc/default/${event.currentTarget.id}/view_documents`;
+ worker.tabNavigationHandler.loadNewExtensionTab(docPath, true);
+ });
+ $('.json-icon').click((event) => {
+ event.preventDefault();
+ getJsonFromGuid(event.currentTarget.id);
+ });
+ } else {
+ const searchTerm = DOMPurify.sanitize(input);
+ $('.no-result span').text(searchTerm);
+ $('.no-result').css('display', 'block');
+ }
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ })
+ .catch((error) => {
+ console.error(error);
+ error.response.json().then((json) => {
+ worker.desktopNotifier.notify(
+ 'error',
+ json.code,
+ json.message,
+ '../images/access_denied.png'
+ );
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ });
});
- $('.json-icon').click((event) => {
- event.preventDefault();
- getJsonFromGuid(event.currentTarget.id);
+ }
+
+ let openJsonWindow = (jsonObject) => {
+ const jsonString = JSON.stringify(jsonObject, undefined, 2);
+ return worker.jsonHighlighter
+ .input(DOMPurify.sanitize(jsonString))
+ .then(() => worker.tabNavigationHandler.loadNewExtensionTab('json/index.html'));
+ };
+
+ $('#restart-button').on('click', () => {
+ // Function to show confirmation dialog
+ const confirmRestart = () => Swal.fire({
+ title: 'Warning!',
+ text: `You have administrator privileges but the server is not in development mode.
+ Are you sure you want to restart the server now ?`,
+ showCancelButton: true,
+ confirmButtonText: 'Restart',
+ cancelButtonText: 'Cancel'
+ });
+
+ // Main perform function
+ const performRestart = () => worker.serverConnector
+ .restart()
+ .then(() => window.close());
+
+ // Decision logic for restart
+ if (!serverRuntimeInfo.connectRegistration.developmentMode) {
+ confirmRestart().then((result) => {
+ if (result.isConfirmed) {
+ performRestart();
+ }
});
} else {
- const searchTerm = DOMPurify.sanitize(input);
- $('.no-result span').text(searchTerm);
- $('.no-result').css('display', 'block');
+ performRestart();
}
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- })
- .catch((error) => {
- console.error(error);
- error.response.json().then((json) => {
- worker.desktopNotifier.notify(
- 'error',
- json.code,
- json.message,
- '../images/access_denied.png'
- );
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- });
});
- }
- let openJsonWindow = (jsonObject) => {
- const jsonString = JSON.stringify(jsonObject, undefined, 2);
- return worker.jsonHighlighter
- .input(DOMPurify.sanitize(jsonString))
- .then(() => worker.tabNavigationHandler
- .loadNewExtensionTab('json/index.html'));
- };
-
- $('#restart-button').on('click', () => {
- Swal.fire({
- title: 'Warning!',
- text: 'Are you sure you want to restart the server?',
- showCancelButton: true,
- confirmButtonText: 'Restart',
- cancelButtonText: 'Cancel',
- }).then((result) => {
- if (result.isConfirmed) {
- startLoadingRS()
- .then(() => worker.serverConnector.restart())
- .then(stopLoading)
- .catch(stopLoading);
- }
- });
- });
+ const navigateLink = (event) => {
+ event.preventDefault();
+ const linkHref = $(event.currentTarget).attr('href');
- // Handle click events for the radio buttons
- $('#reindex-repo, #reindex-nxql').click(function () {
- // Toggle 'active' class for the clicked button
- $(this).toggleClass('active');
+ return fetch(chrome.runtime.getURL(linkHref))
+ .then((response) => {
+ if (!response.ok) {
+ throw new Error('Network response was not ok');
+ }
+ return response.text();
+ })
+ .then((html) => {
+ $('body').html(html);
+ // If the loaded page has its own scripts, you might need to reinitialize them here
+ })
+ .catch((error) => {
+ console.error('Error loading page:', error);
+ });
+ };
+ $('#reindex-es-button').on('click', navigateLink);
+ // eslint-disable-next-line prefer-arrow-callback
+ $(document).on('click', '#back', function (event) {
+ navigateLink(event).then(() => loadPage(worker));
+ });
- // If the other button is active, remove its 'active' class
- if ($(this).is('#reindex-repo') && $('#reindex-nxql').hasClass('active')) {
- $('#reindex-nxql').removeClass('active');
- } else if ($(this).is('#reindex-nxql') && $('#reindex-repo').hasClass('active')) {
- $('#reindex-repo').removeClass('active');
- }
+ // Handle click events for the radio buttons
+ $(document).on('click', '#reindex-buttons .btn', function () {
+ // Toggle 'active' class for the clicked button and remove from the other
+ $(this).addClass('active').siblings('.btn').removeClass('active');
- // Show or hide the form based on which button is active
- if ($('#reindex-repo').hasClass('active')) {
- $('#reindex-form').css('display', 'none');
- } else {
- $('#reindex-form').css('display', 'block');
- }
- });
+ // Show or hide the form based on which button is active
+ if ($('#reindex-repo').hasClass('active')) {
+ $('#reindex-form').hide();
+ } else {
+ $('#reindex-form').show();
+ }
+ });
- // Handle click event for the 'reindex' button
- $('#reindex').click(() => {
- if ($('#reindex-repo').hasClass('active')) {
- worker.repositoryIndexer.reindex();
- } else {
- $('#reindex-form').show();
- const input = $('#reindex-input').val();
- $('#reindex-input').val('');
- worker.repositoryIndexer.reindex(input);
- }
- });
+ // Handle click event for the 'reindex' button
+ $(document).on('click', '#reindex', () => {
+ const reindex = () => {
+ if ($('#reindex-repo').hasClass('active')) {
+ worker.repositoryIndexer.reindex();
+ } else {
+ $('#reindex-form').show();
+ const input = $('#reindex-input').val();
+ $('#reindex-input').val('');
+ worker.repositoryIndexer.reindex(input);
+ }
+ window.close();
+ };
+ if (serverRuntimeInfo.connectRegistration.developmentMode) {
+ reindex();
+ } else {
+ Swal.fire({
+ title: 'Warning!',
+ text: 'You are not in development development mode, are you sure you want to re-index the server?',
+ showCancelButton: true,
+ confirmButtonText: 'Re-index',
+ cancelButtonText: 'Cancel'
+ }).then((result) => {
+ if (!result.isConfirmed) {
+ return;
+ }
+ reindex();
+ });
+ }
+ });
- $('#nxql-docid').keydown((e) => {
- if (e.which === 13) {
- e.preventDefault();
- $('#reindex-nxql-doc').click();
- }
- });
+ $('#nxql-docid').keydown((e) => {
+ if (e.which === 13) {
+ e.preventDefault();
+ $('#reindex-nxql-doc').click();
+ }
+ });
- $('#traces-button').click(() => worker.serverConnector
- .executeOperation('Traces.ToggleRecording', { readOnly: false })
- .then((response) => response.value)
- .then((value) => Boolean(value))
- .then((isEnabled) => {
- $('#traces-button').toggleClass('enabled', isEnabled);
- })
- .catch((cause) => {
- console.error("Can't toggle automation traces", cause);
- return worker.serverConnector
- .executeOperation('Traces.ToggleRecording', { readOnly: true })
+ $('#traces-button').click(() => worker.serverConnector
+ .executeOperation('Traces.ToggleRecording', { readOnly: false })
.then((response) => response.value)
.then((value) => Boolean(value))
- .catch(() => false);
- }));
-
- $('#search').keydown((event) => {
- $('#loading-gif').css({ display: 'inline' });
- $('#search').css('text-indent', '23px');
- if (event.keyCode === 13) {
- // prevent submit on enter
- event.preventDefault();
- }
- });
-
- $('#search').keyup(
- debounce(() => {
- $('#search-results').empty();
- const pathPattern = /^\//;
- const input = $('#search').val();
- if (input === '') {
- $('.no-result').css('display', 'none');
- $('#search-results').empty();
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- $('body').css('overflow-y', 'hidden');
- $('html').css('height', 'auto');
- } else if (regexes.uuid.test(input)) {
- getJsonFromGuid(input);
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- } else if (pathPattern.test(input)) {
- getJsonFromPath(input);
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- } else if (
- input.toUpperCase().indexOf('SELECT ') !== -1
- && input.toUpperCase().indexOf(' FROM ') !== -1
- ) {
- const query = input.replace(/'/g, '"');
- docSearch(query, input);
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- } else {
- let searchTerm = input;
- if (searchTerm.indexOf('_') > -1) {
- searchTerm = searchTerm.replace(/_/g, '&UNDERSCORE');
- }
- if (searchTerm.indexOf('\\') > -1) {
- searchTerm = searchTerm.replace('\\', '&BACKSLASH');
- }
- if (searchTerm.indexOf('"') > -1) {
- searchTerm = searchTerm.replace('"', '\\"');
- }
- if (searchTerm.indexOf("'") > -1) {
- searchTerm = searchTerm.replace("'", "\\'");
+ .then((isEnabled) => {
+ $('#traces-button').toggleClass('enabled', isEnabled);
+ })
+ .catch((cause) => {
+ console.error("Can't toggle automation traces", cause);
+ return worker.serverConnector
+ .executeOperation('Traces.ToggleRecording', { readOnly: true })
+ .then((response) => response.value)
+ .then((value) => Boolean(value))
+ .catch(() => false);
+ }));
+
+ $('#search').keydown((event) => {
+ $('#loading-gif').css({ display: 'inline' });
+ $('#search').css('text-indent', '23px');
+ if (event.keyCode === 13) {
+ // prevent submit on enter
+ event.preventDefault();
}
- const jsonQuery = `SELECT * FROM Document WHERE ecm:fulltext = "${searchTerm}"`;
- docSearch(jsonQuery, input);
- $('#loading-gif').css('display', 'none');
- $('#search').css('text-indent', '5px');
- }
- }, 1000)
- );
-
- function konamiCanada(cb) {
- let input = '';
- const key = '38384040373937396665';
- document.addEventListener('keydown', (e) => {
- input += `${e.keyCode}`;
- if (input === key) {
- cb();
- return;
+ });
+
+ $('#search').keyup(
+ debounce(() => {
+ $('#search-results').empty();
+ const pathPattern = /^\//;
+ const input = $('#search').val();
+ if (input === '') {
+ $('.no-result').css('display', 'none');
+ $('#search-results').empty();
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ $('body').css('overflow-y', 'hidden');
+ $('html').css('height', 'auto');
+ } else if (pathPattern.test(input)) {
+ getJsonFromPath(input);
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ } else if (regexes.uuid.test(input)) {
+ const match = regexes.uuid.exec(input);
+ const uuid = match.groups.uuid || match.groups.uuidAny;
+ getJsonFromGuid(uuid);
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ } else if (
+ input.toUpperCase().indexOf('SELECT ') !== -1 &&
+ input.toUpperCase().indexOf(' FROM ') !== -1
+ ) {
+ const query = input.replace(/'/g, '"');
+ docSearch(query, input);
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ } else {
+ let searchTerm = input;
+ if (searchTerm.indexOf('_') > -1) {
+ searchTerm = searchTerm.replace(/_/g, '&UNDERSCORE');
+ }
+ if (searchTerm.indexOf('\\') > -1) {
+ searchTerm = searchTerm.replace('\\', '&BACKSLASH');
+ }
+ if (searchTerm.indexOf('"') > -1) {
+ searchTerm = searchTerm.replace('"', '\\"');
+ }
+ if (searchTerm.indexOf("'") > -1) {
+ searchTerm = searchTerm.replace("'", "\\'");
+ }
+ const jsonQuery = `SELECT * FROM Document WHERE ecm:fulltext = "${searchTerm}"`;
+ docSearch(jsonQuery, input);
+ $('#loading-gif').css('display', 'none');
+ $('#search').css('text-indent', '5px');
+ }
+ }, 1000)
+ );
+
+ function konamiCanada(cb) {
+ let input = '';
+ const key = '38384040373937396665';
+ document.addEventListener('keydown', (e) => {
+ input += `${e.keyCode}`;
+ if (input === key) {
+ cb();
+ return;
+ }
+ if (!key.indexOf(input)) return;
+ input = `${e.keyCode}`;
+ });
}
- if (!key.indexOf(input)) return;
- input = `${e.keyCode}`;
- });
- }
- function canada() {
- $('#logo').css('background-image', 'url("../images/icon.png")');
- $('a.button:hover').css('background', '#910B0B');
- $('#search-term').css('color', '#FE0000');
- $('body').css('color', '#FE0000');
- $('body').css('background-color', '#fff');
- $('.server-name').css('color', '#FE0000');
- $('a.button').css('background', '#FE0000');
- $('.useful-links').css('color', '#FE0000');
- $('.useful-link').css('color', '#FE0000');
- $('.nav-link').css('color', '#FE0000');
- $('#search').attr(
- 'placeholder',
- 'Sorry, please enter a search term, eh?'
- );
- $('::-webkit-input-placeholder').css('color', '#FE0000');
- $('#about').text('About');
- }
+ function canada() {
+ $('#logo').css('background-image', 'url("../images/icon.png")');
+ $('a.button:hover').css('background', '#910B0B');
+ $('#search-term').css('color', '#FE0000');
+ $('body').css('color', '#FE0000');
+ $('body').css('background-color', '#fff');
+ $('.server-name').css('color', '#FE0000');
+ $('a.button').css('background', '#FE0000');
+ $('.useful-links').css('color', '#FE0000');
+ $('.useful-link').css('color', '#FE0000');
+ $('.nav-link').css('color', '#FE0000');
+ $('#search').attr(
+ 'placeholder',
+ 'Sorry, please enter a search term, eh?'
+ );
+ $('::-webkit-input-placeholder').css('color', '#FE0000');
+ $('#about').text('About');
+ }
- function k() {
- $('#k').css('display', 'block');
- setInterval(() => {
- const imgUrl = $('#k').css('background-image');
- console.log(imgUrl.indexOf('1_'));
- if (imgUrl.indexOf('1_') === -1) {
- $('#k').css('background-image', 'url("../images/1_.png")');
- } else {
- $('#k').css('background-image', 'url("../images/1.png")');
+ function k() {
+ $('#k').css('display', 'block');
+ setInterval(() => {
+ const imgUrl = $('#k').css('background-image');
+ console.log(imgUrl.indexOf('1_'));
+ if (imgUrl.indexOf('1_') === -1) {
+ $('#k').css('background-image', 'url("../images/1_.png")');
+ } else {
+ $('#k').css('background-image', 'url("../images/1.png")');
+ }
+ }, 200);
+ setTimeout(() => {
+ $('#k').animate({ left: '-150%' }, 500);
+ setTimeout(() => {
+ canada();
+ }, 500);
+ }, 2500);
}
- }, 200);
- setTimeout(() => {
- $('#k').animate({ left: '-150%' }, 500);
- setTimeout(() => {
- canada();
- }, 500);
- }, 2500);
- }
- konamiCanada(() => {
- k();
- console.log('O Canada!');
- });
- return Promise
- .all(pendingPromises)
- .then(() => {
- $('.popup-loading-message').hide();
- $('.content').show();
- })
- .then(() => worker)
- .catch((error) => console.error(error));
- })
- .catch((error) => {
- console.error(error);
- });
+ konamiCanada(() => {
+ k();
+ console.log('O Canada!');
+ });
+ return Promise.all(pendingPromises)
+ .then(() => worker)
+ .finally(() => {
+ stopLoading();
+ });
+ }))
+ .catch((cause) => stopLoading(cause)))
+ .catch((cause) => stopLoading(cause));
}
-new ServiceWorkerBridge()
- .bootstrap({ name: 'reloadPopup', entrypoint: loadPage })
- .catch((error) => console.error(error));
+document.addEventListener('DOMContentLoaded', () => {
+ const worker = new ServiceWorkerBridge();
+ worker
+ .bootstrap({ name: 'popup', entrypoint: loadPage })
+ .catch((error) => console.error(error));
+});
diff --git a/src/service-worker-bridge.js b/src/service-worker-bridge.js
index de90b80e..b0a4c921 100644
--- a/src/service-worker-bridge.js
+++ b/src/service-worker-bridge.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
/* eslint-disable comma-dangle */
class ServiceWorkerBridge {
@@ -22,54 +23,49 @@ class ServiceWorkerBridge {
}
);
})
- // eslint-disable-next-line no-return-assign, no-sequences
.then((worker) => {
worker[name] = entrypoint;
- return worker.developmentMode
- .asPromise()
+ // Determine the global scope more cleanly
+ // eslint-disable-next-line no-restricted-globals, no-undef
+ const globalScope = typeof window !== 'undefined' ? window : self;
+ // First, check and set the development mode
+ return worker.asDevelopmentMode()
.then(() => {
- // Check if 'window' is defined, otherwise use 'window'
- // eslint-disable-next-line no-restricted-globals, no-undef
- const globalScope = typeof self !== 'undefined' ? self : window;
- // eslint-disable-next-line no-return-assign
- return globalScope.nuxeoWebExtension = worker;
+ globalScope.nuxeoWebExtension = worker;
+ // After setting the development mode, execute the entrypoint function
+ return entrypoint(worker);
})
- // eslint-disable-next-line no-sequences
- .catch(() => (worker));
- })
- .then((worker) => (
- // eslint-disable-next-line no-sequences
- entrypoint(worker),
- worker
- ));
+ .catch(() => entrypoint(worker))
+ .then(() => worker); // Return the worker after all operations are complete
+ });
}
createProxies(components) {
components.forEach((component) => {
this[component] = new Proxy({}, {
- get: (target, action) => (...params) => new Promise((resolve, reject) => {
- chrome.runtime.sendMessage(
- {
- extension: 'nuxeo-web-extension',
- component: `${component}`,
- action,
- params,
- },
- (response) => {
- if (chrome.runtime.lastError) {
- reject(chrome.runtime.lastError);
- } else if (response && response.error) {
- const error = new Error(response.error.message);
- error.name = response.error.name;
- error.stack = response.error.stack;
- error.originalError = response.error; // Include the original error
- reject(error);
- } else {
- resolve(response);
+ get: (target, action) => async (...params) => {
+ const request = {
+ extension: 'nuxeo-web-extension',
+ component,
+ action,
+ params,
+ };
+ const awaitedResponse = await new Promise((resolve, reject) => {
+ chrome.runtime.sendMessage(
+ request,
+ (response) => {
+ if (chrome.runtime.lastError) {
+ reject(chrome.runtime.lastError);
+ } else if (response && response.error) {
+ reject(this.componentErrorOf(component, request, response.error));
+ } else {
+ resolve(response);
+ }
}
- }
- );
- }),
+ );
+ });
+ return awaitedResponse;
+ },
});
});
}
@@ -77,6 +73,49 @@ class ServiceWorkerBridge {
asPromise() {
return Promise.resolve(this);
}
+
+ asDevelopmentMode() {
+ return this.developmentMode.asPromise();
+ }
+
+ asConsole() {
+ return this.developmentMode.asConsole().catch(() => {});
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ componentErrorOf(component, request, json) {
+ class ComponentError extends Error {
+ constructor() {
+ super('component request error, use \'component,request,json\' accessors');
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ component() {
+ return component;
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ request() {
+ return request;
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ json() {
+ return json;
+ }
+ }
+ return new ComponentError();
+ }
+
+ // eslint-disable-next-line class-methods-use-this
+ isComponentError(error) {
+ return error.constructor && error.constructor.name === 'ComponentError';
+ }
+
+ isDevelopmentModeError(error) {
+ return this.isComponentError(error) &&
+ error.component() === 'developmentMode';
+ }
}
export default ServiceWorkerBridge;
diff --git a/vite.config.d/ast-patch-plugin.js b/vite.config.d/ast-patch-plugin.js
new file mode 100644
index 00000000..18adbf20
--- /dev/null
+++ b/vite.config.d/ast-patch-plugin.js
@@ -0,0 +1,103 @@
+import traverse from '@babel/traverse';
+import generate from '@babel/generator';
+import * as parser from '@babel/parser';
+import * as types from '@babel/types';
+
+// eslint-disable-next-line no-unused-vars
+function patch(options = {}) {
+ const { buildEntry: { root: buildEntry } } = options;
+ return {
+ name: 'ast-patcher',
+ apply: 'build',
+ renderChunk(code, chunk) {
+ // Parse the code into an AST
+ const ast = parser.parse(code, { sourceType: 'module' });
+
+ let isModified = false;
+
+ // Traverse the AST to find and modify the `assetsURL` function
+ traverse.default(ast, {
+ ImportDeclaration(path) {
+ const { code: nodeCode } = generate.default(path.node);
+ console.log(`Considering ${nodeCode} for CSS imports in ${chunk.fileName}`);
+ const sourceValue = path.node.source.value;
+ // Check if the import is a CSS file
+ if (!sourceValue.endsWith('.css')) {
+ return;
+ }
+ // Create a dynamic import expression
+ const dynamicImport = types.callExpression(
+ types.import(),
+ [types.stringLiteral(sourceValue)]
+ );
+ // Wrap the dynamic import in a .then() to extract the default export
+ const thenExpression = types.callExpression(
+ types.memberExpression(dynamicImport, types.identifier('then')),
+ [types.arrowFunctionExpression(
+ [types.identifier('css')],
+ types.memberExpression(types.identifier('css'), types.identifier('default'))
+ )]
+ );
+ // Replace the original import declaration with the dynamic import expression
+ path.replaceWith(thenExpression);
+
+ console.log(`Modified dynamic CSS import in ${chunk.fileName}`);
+ isModified = true;
+ },
+ VariableDeclarator(path) {
+ const { code: nodeCode } = generate.default(path.node);
+ console.log(`Considering ${nodeCode} for assetsURL in ${chunk.fileName}`);
+ if (!(
+ path.node.id &&
+ path.node.id.name === 'assetsURL' &&
+ types.isFunctionExpression(path.node.init)
+ )) {
+ return;
+ }
+
+ // Replace the function body directly
+ path.node.init.body = types.blockStatement([
+ types.returnStatement(types.identifier('dep'))
+ ]);
+
+ console.log(`Modified assetsURL function in ${chunk.fileName}`);
+ isModified = true;
+ },
+ exit(path) {
+ if (buildEntry !== 'main') return;
+ try {
+ if (!(
+ path.isIdentifier({ name: 'window' }) &&
+ path.scope.hasGlobal('window') &&
+ (path.parent.type === 'MemberExpression' || path.parent.type === 'ThisExpression')
+ )) {
+ return;
+ }
+ path.node.name = 'self';
+ console.log(`Modified window variable in ${chunk.fileName}`);
+ } catch (error) {
+ console.error(`Error generating code for node type: ${path.node.type} at position: ${path.node.start}`);
+ console.error(error);
+ }
+ },
+ });
+
+ // Log the modification status
+ if (!isModified) {
+ console.log(`No modifications applied in ${chunk.fileName}`);
+ return null;
+ }
+
+ // Generate the modified code from the AST
+ const { code: newCode, map } = generate.default(ast, {
+ sourceMaps: true,
+ sourceFileName: chunk.fileName,
+ });
+
+ // Return the modified code and source map
+ return { code: newCode, map };
+ },
+ };
+}
+
+export default patch;
diff --git a/vite.config.d/css-patch-plugin.js b/vite.config.d/css-patch-plugin.js
new file mode 100644
index 00000000..ac9a8990
--- /dev/null
+++ b/vite.config.d/css-patch-plugin.js
@@ -0,0 +1,51 @@
+import fs from 'fs';
+import path from 'path';
+import MagicString from 'magic-string';
+
+// eslint-disable-next-line no-unused-vars
+function patch(patchOptions = {}) {
+ return {
+ name: 'patch-css',
+ apply: 'build',
+ writeBundle(bundleOptions, bundle) {
+ Object.keys(bundle).forEach((fileName) => {
+ const chunk = bundle[fileName];
+ if (!(chunk.type === 'asset' && chunk.fileName.endsWith('.css'))) {
+ return;
+ }
+ const filePath = path.join(bundleOptions.dir || '.', chunk.fileName);
+ fs.readFile(filePath, 'utf8', (err, data) => {
+ if (err) {
+ console.error(`Error reading ${filePath}: ${err}`);
+ return;
+ }
+ // Updated regex to exclude URLs starting with "/images/"
+ const urlRegex = /url\("\/(?!images\/)(.*?)"\)/g;
+ const magicString = new MagicString(data);
+ let hasChanges = false;
+
+ data.replace(urlRegex, (match, p1, offset) => {
+ const originalUrl = `url("/${p1}")`;
+ const fixedUrl = `url("${p1}")`;
+ magicString.overwrite(offset, offset + originalUrl.length, fixedUrl);
+ hasChanges = true;
+ return fixedUrl;
+ });
+
+ if (!hasChanges) {
+ return;
+ }
+ console.log(`Patching URLs in ${filePath}`);
+ fs.writeFile(filePath, magicString.toString(), 'utf8', (writeErr) => {
+ if (!writeErr) {
+ return;
+ }
+ console.error(`Error writing ${filePath}: ${writeErr}`);
+ });
+ });
+ });
+ }
+ };
+}
+
+export default patch;
diff --git a/vite.config.d/debug-plugin.js b/vite.config.d/debug-plugin.js
new file mode 100644
index 00000000..436b8a80
--- /dev/null
+++ b/vite.config.d/debug-plugin.js
@@ -0,0 +1,61 @@
+// eslint-disable-next-line no-unused-vars
+function debug(debugOptions = {}) {
+ return {
+ name: 'extended-debug-build',
+ generateBundle(options, bundle) {
+ console.log('--- generateBundle ---');
+ this.bundleState = {};
+
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+ console.log(` - ${file.fileName}`);
+
+ if (file.fileName.endsWith('.map')) {
+ console.log(` - Source map size: ${file.source.length}`);
+ console.log(` - Source map content: ${file.source.slice(0, 100)}...`); // Log first 100 characters for brevity
+ }
+
+ this.bundleState[file.fileName] = {
+ code: file.code,
+ sourceMap: file.source,
+ };
+ });
+ },
+ writeBundle(options, bundle) {
+ console.log('--- writeBundle ---');
+
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+ console.log(` - ${file.fileName}`);
+
+ if (file.fileName.endsWith('.map')) {
+ const originalSourceMap = this.bundleState[file.fileName]?.sourceMap;
+ const currentSourceMap = file.source;
+
+ if (originalSourceMap !== currentSourceMap) {
+ console.log(` - Source map has changed for ${file.fileName}`);
+ console.log(` - Original source map content: ${originalSourceMap?.slice(0, 100)}...`);
+ console.log(` - Current source map content: ${currentSourceMap.slice(0, 100)}...`);
+ } else {
+ console.log(` - Source map has not changed for ${file.fileName}`);
+ }
+
+ console.log(` - Current source map size: ${currentSourceMap.length}`);
+ }
+
+ const originalCode = this.bundleState[file.fileName]?.code;
+ const currentCode = file.code;
+
+ if (originalCode !== currentCode) {
+ console.log(` - Code has changed for ${file.fileName}`);
+ console.log(` - Original code size: ${originalCode?.length}`);
+ console.log(` - Current code size: ${currentCode.length}`);
+ } else {
+ console.log(` - Code has not changed for ${file.fileName}`);
+ }
+ });
+ }
+ };
+}
+
+export default debug;
diff --git a/vite.config.d/html-reparent-plugin.js b/vite.config.d/html-reparent-plugin.js
new file mode 100644
index 00000000..c5aa2543
--- /dev/null
+++ b/vite.config.d/html-reparent-plugin.js
@@ -0,0 +1,56 @@
+import fs from 'fs';
+import path from 'path';
+import * as rimraf from 'rimraf';
+import MagicString from 'magic-string';
+
+function reparentHtml(htmlOptions = {}) {
+ const { browserVendor, buildEntry, outputDir } = htmlOptions;
+ let isReparented = false;
+ return {
+ name: 'reparent-bundles',
+ apply: 'build',
+ generateBundle(_, chunks) {
+ if (!buildEntry.input.endsWith('.html')) return; // Process only html entry points
+
+ console.log(`Reparenting html entry ${buildEntry.root} ...`);
+ Object.keys(chunks).forEach((name) => {
+ const file = chunks[name];
+ file.fileName = file.fileName.replace('index/', '');
+ console.log(` - ${file.fileName}...`);
+ isReparented = true;
+ });
+ },
+ // eslint-disable-next-line no-unused-vars
+ writeBundle(options, bundle) {
+ if (!isReparented) return; // Only process if html bundles were reparented
+
+ const resolvePath = (filePath) => path.resolve(outputDir, `${buildEntry.root}/${filePath}`);
+ // Move index.html to root and update script source
+ const htmlFilePath = resolvePath(`src/${buildEntry.root}/index.html`);
+ fs.promises.readFile(htmlFilePath, 'utf-8')
+ .then((data) => {
+ const magicString = new MagicString(data);
+ const matches = [...data.matchAll(/"\/(index[^"]*)"/g)];
+ matches.forEach((match) => {
+ const start = match.index;
+ const end = start + match[0].length;
+ magicString.overwrite(start, end, `"./${match[1]}"`);
+ });
+ return magicString.toString(); // Use the modified content
+ })
+ .then((modifiedHtmlContent) => {
+ fs.promises.writeFile(resolvePath('index.html'), modifiedHtmlContent);
+ return fs.promises.unlink(htmlFilePath);
+ })
+ .then(() => {
+ // Remove src directory
+ rimraf.sync(resolvePath('src'));
+ })
+ .catch((err) => {
+ console.error(`Got an error trying to read or write the file: ${err.message}`);
+ });
+ }
+ };
+}
+
+export default reparentHtml;
diff --git a/vite.config.d/main-reparent-plugin.js b/vite.config.d/main-reparent-plugin.js
new file mode 100644
index 00000000..9e2ea376
--- /dev/null
+++ b/vite.config.d/main-reparent-plugin.js
@@ -0,0 +1,52 @@
+import path from 'path';
+import fs from 'fs';
+import fse from 'fs-extra';
+import * as rimraf from 'rimraf';
+
+function mainReparent(reparentOptions = {}) {
+ const {
+ browserVendor, buildEntry: { root: buildEntry }, sourceDir, outputDir
+ } = reparentOptions;
+ const mainDir = path.resolve(outputDir, 'main');
+ return {
+ name: 'rename-main-service',
+ generateBundle(options, chunks) {
+ if (buildEntry !== 'main') return; // Only process the main entry
+
+ console.log(`Renaming service_worker for ${browserVendor}... `);
+
+ const manifestPath = path.resolve(sourceDir, `main/manifest-${browserVendor}.json`);
+ const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+ const mainRegex = new RegExp('^main-.*.js$');
+
+ Object.keys(chunks).forEach((name) => {
+ const file = chunks[name];
+
+ console.log(`Processing ${file.fileName}...`);
+
+ if (mainRegex.test(file.fileName)) {
+ // Update the manifest with the new service worker file name
+ console.log(`Updating manifest for ${file.fileName}...`);
+ manifest.background.service_worker = file.fileName;
+ manifest.version = process.env.VITE_BUILD_VERSION;
+ manifest.version_name = process.env.VITE_BUILD_VERSION_NAME;
+ }
+ });
+
+ this.emitFile({
+ type: 'asset',
+ fileName: 'manifest.json',
+ source: JSON.stringify(manifest, null, 2),
+ });
+ },
+ writeBundle() {
+ if (buildEntry !== 'main') return; // Only process the main entry
+
+ // Move contents of main directory to root
+ fse.copySync(mainDir, outputDir);
+ rimraf.sync(mainDir);
+ }
+ };
+}
+
+export default mainReparent;
diff --git a/vite.config.d/patch-css-imports.js b/vite.config.d/patch-css-imports.js
new file mode 100644
index 00000000..3c41de68
--- /dev/null
+++ b/vite.config.d/patch-css-imports.js
@@ -0,0 +1,40 @@
+import MagicString from 'magic-string';
+
+// eslint-disable-next-line no-unused-vars
+function patchCss(options = {}) {
+ return {
+ name: 'patch-css',
+ transform(code, id) {
+ const allowedSuffixes = ['.js', '.ts'];
+ const fileSuffix = id.slice(id.lastIndexOf('.'));
+ if (!allowedSuffixes.some((suffix) => fileSuffix === suffix)) {
+ return null; // Skip transformation for non-JS/TS files
+ }
+ // Separate function to handle CSS imports
+ function handleCSSImports() {
+ const cssImportRegex = /import\s+['"](.+\.css)['"]/g;
+ code.replace(cssImportRegex, (match, cssPath, offset) => {
+ const start = offset;
+ const end = start + match.length;
+ const replacementText = `import('${cssPath}').then(css => css.default)`;
+ magicString.overwrite(start, end, replacementText);
+ return replacementText; // This return value is not used since we're modifying magicString directly
+ });
+ }
+
+ console.log(`Processing CSS imports in ${id}...`);
+
+ const magicString = new MagicString(code);
+
+ // Call the separate functions
+ handleCSSImports(magicString);
+
+ return {
+ code: magicString.toString(),
+ map: magicString.generateMap({ hires: true })
+ };
+ }
+ };
+}
+
+export default patchCss;
diff --git a/vite.config.d/vite.config.js b/vite.config.d/vite.config.js
new file mode 100644
index 00000000..ce0d0faa
--- /dev/null
+++ b/vite.config.d/vite.config.js
@@ -0,0 +1,388 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable no-cond-assign */
+/* eslint-disable comma-dangle */
+import copy from 'rollup-plugin-copy';
+import cssnano from 'cssnano';
+import dotenv from 'dotenv';
+import inject from '@rollup/plugin-inject';
+import fs from 'fs';
+import fse from 'fs-extra';
+import path from 'path';
+import * as rimraf from 'rimraf';
+import { defineConfig } from 'vite';
+import * as parser from '@babel/parser';
+import * as types from '@babel/types';
+import traverse from '@babel/traverse';
+import generate from '@babel/generator';
+import MagicString from 'magic-string';
+
+export default defineConfig(({ mode }) => {
+ const isProduction = process.env.NODE_ENV === 'production';
+
+ console.log(`Loading env from .env.${mode}`);
+
+ dotenv.config({ path: path.resolve(process.cwd(), `.env.${mode}`) });
+
+ const browserVendor = process.env.VITE_BROWSER_VENDOR;
+
+ const buildEntries = [
+ { root: 'about', input: 'index.html' },
+ { root: 'content', input: 'main.js' },
+ { root: 'json', input: 'index.html' },
+ { root: 'options', input: 'index.html' },
+ { root: 'main', input: `main-${browserVendor}.js`, copyPublicDir: true },
+ { root: 'popup', input: 'index.html' },
+ { root: 'es-reindex', input: 'index.html' },
+ ];
+
+ const buildEntryByRoot = buildEntries.reduce((acc, entry) => {
+ acc[entry.root] = entry;
+ return acc;
+ }, {});
+
+ const buildEntry = buildEntryByRoot[process.env.BUILD_ENTRY];
+ if (!buildEntry) {
+ throw new Error(`Invalid entry: ${process.env.BUILD_ENTRY}`);
+ }
+ console.log(`Building ${buildEntry.root} for ${browserVendor}...`);
+
+ const viteConfig = {
+ css: {
+ transformer: 'lightningcss',
+ postcss: {
+ plugins: [cssnano(['default', { normalizeUrl: false }])],
+ },
+ },
+ build: {
+ base: `/${buildEntry.root}/`,
+ assetsDir: './', // relative to outDir
+ outDir: `dist/${browserVendor}`,
+ copyPublicDir: buildEntry.copyPublicDir || false,
+ minify: isProduction ? 'terser' : false,
+ plugins: [
+ inject({
+ $: 'jquery',
+ jQuery: 'jquery'
+ })
+ ],
+ publicDir: 'public',
+ rollupOptions: {
+ input: `src/${buildEntry.root}/${buildEntry.input}`,
+ output: {
+ dir: `dist/${browserVendor}/${buildEntry.root}`,
+ format: 'es',
+ inlineDynamicImports: true,
+ assetFileNames: '[name]-[hash][extname]',
+ entryFileNames: () => {
+ if (buildEntry.root === 'main') {
+ return `main-${browserVendor}.js`;
+ }
+ return '[name]-[hash].js';
+ },
+ },
+ },
+ sourcemap: true,
+ target: 'es2022',
+ },
+ plugins: [
+ copy({
+ targets: [
+ {
+ src: 'src/browser.js',
+ dest: `dist/${browserVendor}`,
+ rename: 'scripts/browser.js',
+ },
+ ],
+ hook: 'writeBundle', // run the plugin at the end of bundling
+ }),
+ {
+ name: 'css-in-js-handler',
+ transform(code, id) {
+ const allowedSuffixes = ['.js', '.ts'];
+ const fileSuffix = id.slice(id.lastIndexOf('.'));
+ if (!allowedSuffixes.some((suffix) => fileSuffix === suffix)) {
+ return null; // Skip transformation for non-JS/TS files
+ }
+ // Separate function to handle CSS imports
+ function handleCSSImports() {
+ const cssImportRegex = /import\s+['"](.+\.css)['"]/g;
+ code.replace(cssImportRegex, (match, cssPath, offset) => {
+ const start = offset;
+ const end = start + match.length;
+ const replacementText = `import('${cssPath}').then(css => css.default)`;
+ magicString.overwrite(start, end, replacementText);
+ return replacementText; // This return value is not used since we're modifying magicString directly
+ });
+ }
+
+ console.log(`Processing CSS imports in ${id}...`);
+
+ const magicString = new MagicString(code);
+
+ // Call the separate functions
+ handleCSSImports(magicString);
+
+ return {
+ code: magicString.toString(),
+ map: magicString.generateMap({ hires: true })
+ };
+ },
+ },
+ {
+ name: 'patch-java-url',
+ apply: 'build',
+ renderChunk(code, chunk) {
+ // Parse the code into an AST
+ const ast = parser.parse(code, { sourceType: 'module' });
+
+ let isModified = false;
+
+ // Traverse the AST to find and modify the `assetsURL` function
+ traverse.default(ast, {
+ // eslint-disable-next-line no-shadow
+ VariableDeclarator(path) {
+ if (!(
+ path.node.id &&
+ path.node.id.name === 'assetsURL' &&
+ types.isFunctionExpression(path.node.init)
+ )) {
+ return;
+ }
+ // Log the function is found
+ console.log(`Found assetsURL function in ${chunk.fileName}`);
+
+ // Replace the function body directly
+ path.node.init.body = types.blockStatement([
+ types.returnStatement(types.identifier('dep'))
+ ]);
+
+ console.log(`Modified assetsURL function in ${chunk.fileName}`);
+ isModified = true;
+ },
+ // eslint-disable-next-line no-shadow
+ enter(path) {
+ if (!(
+ buildEntry.root === 'main' &&
+ path.isIdentifier({ name: 'window' }) &&
+ path.scope.hasGlobal('window') &&
+ (path.parent.type === 'MemberExpression' || path.parent.type === 'ThisExpression')
+ )) {
+ return;
+ }
+ path.node.name = 'self';
+
+ console.log(`Modified window variable in ${chunk.fileName}`);
+ },
+ });
+
+ // Log the modification status
+ if (!isModified) {
+ console.log(`No modifications applied in ${chunk.fileName}`);
+ return null;
+ }
+
+ // Generate the modified code from the AST
+ const { code: newCode, map } = generate.default(ast, {
+ sourceMaps: true,
+ sourceFileName: chunk.fileName,
+ });
+
+ // Return the modified code and source map
+ return { code: newCode, map };
+ },
+ },
+ {
+ name: 'patch-css-urls',
+ apply: 'build',
+ writeBundle(options, bundle) {
+ Object.keys(bundle).forEach((fileName) => {
+ const chunk = bundle[fileName];
+ if (!(chunk.type === 'asset' && chunk.fileName.endsWith('.css'))) {
+ return;
+ }
+ const filePath = path.join(options.dir || '.', chunk.fileName);
+ fs.readFile(filePath, 'utf8', (err, data) => {
+ if (err) {
+ console.error(`Error reading ${filePath}: ${err}`);
+ return;
+ }
+ // Updated regex to exclude URLs starting with "/images/"
+ const urlRegex = /url\("\/(?!images\/)(.*?)"\)/g;
+ const magicString = new MagicString(data);
+ let hasChanges = false;
+
+ data.replace(urlRegex, (match, p1, offset) => {
+ const originalUrl = `url("/${p1}")`;
+ const fixedUrl = `url("${p1}")`;
+ magicString.overwrite(offset, offset + originalUrl.length, fixedUrl);
+ hasChanges = true;
+ return fixedUrl;
+ });
+
+ if (!hasChanges) {
+ return;
+ }
+ console.log(`Patching URLs in ${filePath}`);
+ fs.writeFile(filePath, magicString.toString(), 'utf8', (writeErr) => {
+ if (!writeErr) {
+ return;
+ }
+ console.error(`Error writing ${filePath}: ${writeErr}`);
+ });
+ });
+ });
+ }
+ },
+ {
+ name: 'rename-main-service',
+ generateBundle(options, bundle) {
+ if (buildEntry.root !== 'main') return; // Only process the main entry
+
+ console.log(`Renaming service_worker for ${browserVendor}... `);
+
+ const manifestPath = path.resolve(
+ __dirname,
+ `src/main/manifest-${browserVendor}.json`,
+ );
+ const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+ const mainRegex = new RegExp('^main-.*.js$');
+
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+
+ console.log(`Processing ${file.fileName}...`);
+
+ if (mainRegex.test(file.fileName)) {
+ // Update the manifest with the new service worker file name
+ console.log(`Updating manifest for ${file.fileName}...`);
+ manifest.background.service_worker = file.fileName;
+ manifest.version = process.env.VITE_BUILD_VERSION;
+ manifest.version_name = process.env.VITE_BUILD_VERSION_NAME;
+ }
+ });
+
+ this.emitFile({
+ type: 'asset',
+ fileName: 'manifest.json',
+ source: JSON.stringify(manifest, null, 2),
+ });
+ },
+ writeBundle() {
+ if (buildEntry.root !== 'main') return; // Only process the main entry
+
+ // Move contents of main directory to root
+ fse.copySync(path.resolve(__dirname, `dist/${browserVendor}/main`), path.resolve(__dirname, `dist/${browserVendor}`));
+ rimraf.sync(path.resolve(__dirname, `dist/${browserVendor}/main`));
+ }
+ },
+ {
+ name: 'reparent-bundles',
+ apply: 'build',
+ generateBundle(_, bundle) {
+ if (!buildEntry.input.endsWith('.html')) return; // Process only html entry points
+
+ console.log('Reparenting bundles ...');
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+ file.fileName = file.fileName.replace('index/', '');
+ console.log(` - ${file.fileName}...`);
+ });
+ },
+ // eslint-disable-next-line no-unused-vars
+ writeBundle(options, bundle) {
+ if (!buildEntry.input.endsWith('.html')) return; // Process only html entry points
+
+ // Move index.html to root and update script source
+ const htmlFilePath = path.resolve(__dirname, `dist/${browserVendor}/${buildEntry.root}/src/${buildEntry.root}/index.html`);
+ fs.promises.readFile(htmlFilePath, 'utf-8')
+ .then((data) => {
+ const magicString = new MagicString(data);
+ const matches = [...data.matchAll(/"\/(index[^"]*)"/g)];
+ matches.forEach((match) => {
+ const start = match.index;
+ const end = start + match[0].length;
+ magicString.overwrite(start, end, `"./${match[1]}"`);
+ });
+ return magicString.toString(); // Use the modified content
+ })
+ .then((modifiedHtmlContent) => {
+ fs.promises.writeFile(path.resolve(__dirname, `dist/${browserVendor}/${buildEntry.root}/index.html`), modifiedHtmlContent);
+ return fs.promises.unlink(htmlFilePath);
+ })
+ .then(() => {
+ // Remove src directory
+ rimraf.sync(path.resolve(__dirname, `dist/${browserVendor}/${buildEntry.root}/src`));
+ })
+ .catch((err) => {
+ console.error(`Got an error trying to read or write the file: ${err.message}`);
+ });
+ }
+ },
+ {
+ name: 'extended-debug-build',
+ generateBundle(options, bundle) {
+ console.log('--- generateBundle ---');
+ this.bundleState = {};
+
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+ console.log(`- ${file.fileName}`);
+
+ if (file.fileName.endsWith('.map')) {
+ console.log(` - Source map size: ${file.source.length}`);
+ console.log(` - Source map content: ${file.source.slice(0, 100)}...`); // Log first 100 characters for brevity
+ }
+
+ this.bundleState[file.fileName] = {
+ code: file.code,
+ sourceMap: file.source,
+ };
+ });
+ },
+ writeBundle(options, bundle) {
+ console.log('--- writeBundle ---');
+
+ Object.keys(bundle).forEach((name) => {
+ const file = bundle[name];
+ console.log(`- ${file.fileName}`);
+
+ if (file.fileName.endsWith('.map')) {
+ const originalSourceMap = this.bundleState[file.fileName]?.sourceMap;
+ const currentSourceMap = file.source;
+
+ if (originalSourceMap !== currentSourceMap) {
+ console.log(` - Source map has changed for ${file.fileName}`);
+ console.log(` - Original source map content: ${originalSourceMap?.slice(0, 100)}...`);
+ console.log(` - Current source map content: ${currentSourceMap.slice(0, 100)}...`);
+ } else {
+ console.log(` - Source map has not changed for ${file.fileName}`);
+ }
+
+ console.log(` - Current source map size: ${currentSourceMap.length}`);
+ }
+
+ const originalCode = this.bundleState[file.fileName]?.code;
+ const currentCode = file.code;
+
+ if (originalCode !== currentCode) {
+ console.log(` - Code has changed for ${file.fileName}`);
+ console.log(` - Original code size: ${originalCode?.length}`);
+ console.log(` - Current code size: ${currentCode.length}`);
+ } else {
+ console.log(` - Code has not changed for ${file.fileName}`);
+ }
+ });
+ }
+ },
+ ],
+ server: {
+ watch: {
+ // Directories to be watched for changes
+ include: ['src', 'public'],
+ },
+ },
+ }; // end of config return
+
+ console.log('Vite config:', JSON.stringify(viteConfig, null, 2));
+ return viteConfig;
+}); // end of export
diff --git a/vite.config.js b/vite.config.js
index 90d5952c..da6636e8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,19 +1,15 @@
-/* eslint-disable comma-dangle */
-import copy from 'rollup-plugin-copy';
-import dotenv from 'dotenv';
import inject from '@rollup/plugin-inject';
-import fs from 'fs';
-import fse from 'fs-extra';
+import cssnano from 'cssnano';
+import dotenv from 'dotenv';
import path from 'path';
-import * as rimraf from 'rimraf';
+import copy from 'rollup-plugin-copy';
import { defineConfig } from 'vite';
-import { createRequire } from 'module';
-
-const require = createRequire(import.meta.url);
-const parser = require('@babel/parser');
-const traverse = require('@babel/traverse');
-const generate = require('@babel/generator');
+import astPatch from './vite.config.d/ast-patch-plugin';
+import cssPatch from './vite.config.d/css-patch-plugin';
+import debug from './vite.config.d/debug-plugin';
+import htmlReparent from './vite.config.d/html-reparent-plugin';
+import mainReparent from './vite.config.d/main-reparent-plugin';
export default defineConfig(({ mode }) => {
const isProduction = process.env.NODE_ENV === 'production';
@@ -22,50 +18,70 @@ export default defineConfig(({ mode }) => {
dotenv.config({ path: path.resolve(process.cwd(), `.env.${mode}`) });
- const buildEntry = process.env.BUILD_ENTRY;
const browserVendor = process.env.VITE_BROWSER_VENDOR;
- console.log(`Building ${buildEntry} for ${browserVendor}...`);
-
- const paths = {
- about: { input: 'about/index.html' },
- content: { input: 'content/main.js' },
- json: { input: 'json/index.html' },
- options: { input: 'options/index.html' },
- main: { input: `main/main-${browserVendor}.js`, copyPublicDir: true },
- popup: { input: 'popup/index.html' },
- };
-
- if (!Object.prototype.hasOwnProperty.call(paths, buildEntry)) {
- throw new Error(`Invalid entry: ${buildEntry}`);
+ const buildEntries = [
+ { root: 'about', input: 'index.html' },
+ { root: 'content', input: 'main.js' },
+ { root: 'json', input: 'index.html' },
+ { root: 'options', input: 'index.html' },
+ { root: 'main', input: `main-${browserVendor}.js`, copyPublicDir: true },
+ { root: 'popup', input: 'index.html' },
+ { root: 'es-reindex', input: 'index.html' },
+ ];
+
+ const buildEntryByRoot = buildEntries.reduce((acc, entry) => {
+ acc[entry.root] = entry;
+ return acc;
+ }, {});
+
+ const buildEntry = buildEntryByRoot[process.env.BUILD_ENTRY];
+ if (!buildEntry) {
+ throw new Error(`Invalid entry: ${process.env.BUILD_ENTRY}`);
}
+ console.log(`Building ${buildEntry.root} for ${browserVendor}...`);
const viteConfig = {
+ css: {
+ transformer: 'lightningcss',
+ postcss: {
+ plugins: [cssnano(['default', { normalizeUrl: false }])],
+ },
+ },
build: {
- assetsDir: '.', // relative to outDir
+ base: `/${buildEntry.root}/`,
+ assetsDir: './', // relative to outDir
outDir: `dist/${browserVendor}`,
- copyPublicDir: paths[buildEntry].copyPublicDir || false,
+ copyPublicDir: buildEntry.copyPublicDir || false,
minify: isProduction ? 'terser' : false,
- plugins: [
- inject({
- $: 'jquery',
- jQuery: 'jquery'
- })
- ],
+ terserOptions: {
+ // Terser options
+ keep_classnames: true, // Prevent class name mangling
+ keep_fnames: true // Optionally, keep function names as well
+ },
+ sourcemap: true, // Ensure sourcemap is enabled
+ target: 'es2022',
rollupOptions: {
- input: `src/${paths[buildEntry].input}`,
+ input: `src/${buildEntry.root}/${buildEntry.input}`,
output: {
- dir: `dist/${browserVendor}/${buildEntry}`,
+ dir: `dist/${browserVendor}/${buildEntry.root}`,
format: 'es',
- inlineDynamicImports: false,
- entryFileNames: '[name]/index.js',
- chunkFileNames: 'chunks/[name].js',
+ inlineDynamicImports: true,
+ assetFileNames: '[name]-[hash][extname]',
+ entryFileNames: () => {
+ if (buildEntry.root === 'main') {
+ return `main-${browserVendor}.js`;
+ }
+ return '[name]-[hash].js';
+ },
},
},
- sourcemap: true,
- target: 'es2020',
},
plugins: [
+ inject({
+ $: 'jquery',
+ jQuery: 'jquery'
+ }),
copy({
targets: [
{
@@ -76,120 +92,17 @@ export default defineConfig(({ mode }) => {
],
hook: 'writeBundle', // run the plugin at the end of bundling
}),
- {
- name: 'rename-main-service',
- generateBundle(options, bundle) {
- if (buildEntry !== 'main') return; // Only process the main entry
-
- console.log(`Renaming service_worker for ${browserVendor}... `);
-
- const manifestPath = path.resolve(
- __dirname,
- `src/main/manifest-${browserVendor}.json`,
- );
- const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
- const mainRegex = new RegExp('^main-.*.js$');
-
- Object.keys(bundle).forEach((name) => {
- const file = bundle[name];
-
- console.log(`Processing ${file.fileName}...`);
-
- if (mainRegex.test(file.fileName)) {
- // Update the manifest with the new service worker file name
- console.log(`Updating manifest for ${file.fileName}...`);
- manifest.background.service_worker = file.fileName;
- manifest.version = process.env.VITE_BUILD_VERSION;
- manifest.version_name = process.env.VITE_BUILD_VERSION_NAME;
- }
- });
-
- this.emitFile({
- type: 'asset',
- fileName: 'manifest.json',
- source: JSON.stringify(manifest, null, 2),
- });
- },
- writeBundle() {
- if (buildEntry !== 'main') return; // Only process the main entry
-
- // Move contents of main directory to root
- fse.copySync(path.resolve(__dirname, `dist/${browserVendor}/main`), path.resolve(__dirname, `dist/${browserVendor}`));
- rimraf.sync(path.resolve(__dirname, `dist/${browserVendor}/main`));
- }
- },
- {
- name: 'replace-global-window-with-self',
- apply: 'build',
- renderChunk(code, chunk) {
- if (buildEntry !== 'main') return null; // Only process the main entry
-
- // Parse the code into an AST
- const ast = parser.parse(code);
-
- // Traverse the AST and replace global window with self
- traverse.default(ast, {
- // eslint-disable-next-line no-shadow
- enter(path) {
- if (
- path.isIdentifier({ name: 'window' }) &&
- path.scope.hasGlobal('window') &&
- (path.parent.type === 'MemberExpression' || path.parent.type === 'ThisExpression')
- ) {
- path.node.name = 'self';
- }
- },
- });
-
- // Generate the modified code from the AST
- const { code: newCode, map } = generate.default(ast, {
- sourceMaps: true,
- sourceFileName: chunk.fileName,
- });
-
- // Return the modified code and source map
- return { code: newCode, map };
- },
- },
- {
- name: 'rename-popup-bundles',
- apply: 'build',
- generateBundle(_, bundle) {
- if (!paths[buildEntry].input.endsWith('.html')) return; // Process only html entry points
-
- console.log('Reparenting popup bundles ...');
- Object.keys(bundle).forEach((name) => {
- const file = bundle[name];
-
- console.log(`Processing file: ${file.fileName}, type: ${file.type}, isEntry: ${file.isEntry}...`);
-
- file.fileName = file.fileName.replace('index/', '');
-
- console.log(`Reparented to: ${file.fileName}...`);
- });
- },
- writeBundle() {
- console.log(`vendor is ${browserVendor}...`);
- if (!paths[buildEntry].input.endsWith('.html')) return; // Process only html entry points
-
- // Move index.html to root and update script source
- const htmlFilePath = path.resolve(__dirname, `dist/${browserVendor}/${buildEntry}/src/${buildEntry}/index.html`);
- let htmlContent = fs.readFileSync(htmlFilePath, 'utf-8');
- htmlContent = htmlContent.replace(/"\/(index[^"]*)"/g, '"./$1"');
- fs.writeFileSync(path.resolve(__dirname, `dist/${browserVendor}/${buildEntry}/index.html`), htmlContent);
- fs.unlinkSync(htmlFilePath);
-
- // Remove src directory
- rimraf.sync(path.resolve(__dirname, `dist/${browserVendor}/${buildEntry}/src`));
- }
- },
- // other plugins...
+ htmlReparent({ browserVendor, buildEntry, sourceDir: 'src', outputDir: `dist/${browserVendor}` }),
+ mainReparent({ browserVendor, buildEntry, sourceDir: 'src', outputDir: `dist/${browserVendor}` }),
+ astPatch({ browserVendor, buildEntry }),
+ cssPatch({ browserVendor, buildEntry }),
+ debug(),
],
server: {
watch: {
- // Directories to be watched for changes
- include: ['src', 'public'],
+ include: ['src', 'public'], // Directories to be watched for changes
},
+ sourcemap: true, // Ensure sourcemap is enabled in development
},
}; // end of config return
diff --git a/vite.env.js b/vite.env.js
index 9c3c76bb..73378a34 100644
--- a/vite.env.js
+++ b/vite.env.js
@@ -15,7 +15,7 @@ const env = {
VITE_BUILD_TIMESTAMP: Date.now(),
VITE_BUILD_VERSION: buildVersion,
VITE_BUILD_VERSION_NAME: buildVersionName,
- VITE_DEVELOPMENT_MODE: process.env.NODE_ENV === 'development',
+ VITE_DEVELOPMENT_MODE: process.env.NODE_ENV !== 'production',
};
const content = Object.entries(env)