Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); perf(google): concurrent composite channel enumeration + connect/enable-path docs by KrisBraun · Pull Request #232 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions connectors/AGENTS.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,26 @@ Plot but is not dispatched — there is no instance to deliver to.

Set `readonly scopes = Integrations.MergeScopes(MyGoogleConnector.SCOPES, GoogleContacts.SCOPES)` and add `googleContacts: build(GoogleContacts)` to your `build()` return (see `gmail/`, `google-drive/`). Alternatively declare the contacts scopes as an optional `ScopeConfig` group so the user can decline them (see `google-calendar/`).

### Connect / enable-path performance contract

The connect and channel-enable paths are on the user's critical path. The
runtime keeps them fast, and connectors must not undo that:

- **`getChannels` runs synchronously during connect.** Keep it lean and
**parallelize independent enumeration** — when you list resources across
several products/APIs, run them with `Promise.all`, never a serial
`for … await` loop (see `connectors/google/src/compose.ts`). A serial loop
pays the sum of every round-trip while the user waits.
- **`onChannelEnabled` is dispatched OFF the user's critical path.** When a user
activates a connection, the runtime persists the enabled-channel state
synchronously and runs `onChannelEnabled` in the background. So: never assume
`onChannelEnabled` has run by the time the user sees the connection, and keep
using `runTask()` for webhook setup and initial sync — the background dispatch
still has the normal per-execution budget. Heavy *inline* work in
`onChannelEnabled` (or in `getChannels` on enable) is the recurring mistake;
the activate path used to do an inline `getChannels` that paginated every
Google Drive folder and blocked for seconds.

## Architecture

Connectors persist data directly via `integrations.saveLink()` (building `NewLinkWithNotes`). They do not push through a parent twist, and should not call `plot.createThread()`.
Expand Down
22 changes: 13 additions & 9 deletions connectors/google/src/compose.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,18 +34,22 @@ export async function composeChannels(
): Promise<Channel[]> {
const grantedScopes = new Set(token.scopes ?? []);

const result: Channel[] = [];

for (const product of products) {
const hasAllScopes = product.requiredScopes.every((s) => grantedScopes.has(s));
if (!hasAllScopes) continue;
// Enumerate every eligible product concurrently (each getRawChannels is an
// independent network call to Google). Order is preserved by enumerating
// results in `eligible` order, which is products' declaration order.
const eligible = products.filter((product) =>
product.requiredScopes.every((s) => grantedScopes.has(s))
);
const perProduct = await Promise.all(
eligible.map((product) => product.getRawChannels(token))
);

const rawChannels = await product.getRawChannels(token);
for (const raw of rawChannels) {
const result: Channel[] = [];
eligible.forEach((product, i) => {
for (const raw of perProduct[i]) {
result.push(prefixChannel(product.key, raw, product.linkTypes));
}
}

});
return result;
}

Expand Down
42 changes: 42 additions & 0 deletions connectors/google/test/compose.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,48 @@ describe("composeChannels", () => {
const channels = await composeChannels([calendarFake, mailFake], token);
expect(channels).toEqual([]);
});

describe("composeChannels (concurrency)", () => {
function fakeProduct(key: string, scopes: string[], ids: string[], onCall: () => void, onDone: () => void = () => {}) {
return {
key,
requiredScopes: scopes,
linkTypes: [{ type: `${key}-type`, label: key }],
getRawChannels: async () => {
onCall();
// resolve on a later microtask so concurrency is observable
await Promise.resolve();
onDone(); // call is now resolving — decrement inFlight so serial vs concurrent is distinguishable
return ids.map((id) => ({ id, title: id }));
},
} as any;
}

it("enumerates eligible products concurrently and preserves order", async () => {
let inFlight = 0;
let maxInFlight = 0;
const bump = () => { inFlight++; maxInFlight = Math.max(maxInFlight, inFlight); };
const done = () => { inFlight--; };
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], bump, done),
fakeProduct("calendar", ["s.cal"], ["primary"], bump, done),
];
const token = { token: "t", scopes: ["s.mail", "s.cal"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX", "calendar:primary"]);
expect(maxInFlight).toBe(2); // both started before either resolved → concurrent
});

it("skips products whose required scopes are not all granted", async () => {
const products = [
fakeProduct("mail", ["s.mail"], ["INBOX"], () => {}),
fakeProduct("calendar", ["s.cal"], ["primary"], () => {}),
];
const token = { token: "t", scopes: ["s.mail"] } as any;
const out = await composeChannels(products, token);
expect(out.map((c) => c.id)).toEqual(["mail:INBOX"]);
});
});
});

// ---------------------------------------------------------------------------
Expand Down
Loading