@mulmoclaude/core 1.0.1 → 1.2.0

package/dist/google/index.cjs

@@ -1,38 +1,30 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("../rolldown-runtime-D6vf50IK.cjs");
-const require_errors = require("../errors-7P5eMOSX.cjs");
+const require_dist = require("../dist-pWpC-b04.cjs");
 const require_text = require("../text-CaAh9ZSO.cjs");
-const require_discovery = require("../discovery-Dpz6SWwe.cjs");
+const require_atomic = require("../atomic-C_7YpMiM.cjs");
+const require_utils_fetch = require("../utils/fetch.cjs");
+const require_discovery = require("../discovery-UxkvBxV-.cjs");
+let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
-let node_fs = require("node:fs");
-let node_fs_promises = require("node:fs/promises");
 let node_crypto = require("node:crypto");
+let node_fs_promises = require("node:fs/promises");
 let node_os = require("node:os");
 let _receptron_task_scheduler = require("@receptron/task-scheduler");
 let node_http = require("node:http");
 node_http = require_rolldown_runtime.__toESM(node_http, 1);
 let google_auth_library = require("google-auth-library");
 //#region src/google/host.ts
-var hostLog = {
-	error: () => void 0,
-	warn: () => void 0,
-	info: () => void 0,
-	debug: () => void 0
-};
+var hostSlot = require_discovery.createHostSlot("@mulmoclaude/core/google: configureGoogleHost()");
 function configureGoogleHost(binding) {
-	hostLog = binding.log;
+	hostSlot.set(binding.log);
 }
-var log = {
-	error: (prefix, message, data) => hostLog.error(prefix, message, data),
-	warn: (prefix, message, data) => hostLog.warn(prefix, message, data),
-	info: (prefix, message, data) => hostLog.info(prefix, message, data),
-	debug: (prefix, message, data) => hostLog.debug(prefix, message, data)
-};
+var log = require_discovery.createForwardingLogger(() => hostSlot.peek());
 //#endregion
 //#region src/google/datetime.ts
 var ISO_DATE_TIME_WITH_OFFSET_RE = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:Z|[+-](\d{2}):(\d{2}))$/;
-var FRACTIONAL_SECONDS_RE = /\.\d+(?=Z|[+-])/;
+var FRACTIONAL_SECONDS_RE$1 = /\.\d+(?=Z|[+-])/;
 var MAX_HOUR = 23;
 var MAX_MINUTE = 59;
 var MAX_SECOND = 59;
@@ -41,7 +33,7 @@ var isRealCalendarDate = (year, month, day) => {
 	return roundTrip.getUTCFullYear() === year && roundTrip.getUTCMonth() === month - 1 && roundTrip.getUTCDate() === day;
 };
 var isIsoDateTimeWithOffset = (value) => {
-	const match = ISO_DATE_TIME_WITH_OFFSET_RE.exec(value.replace(FRACTIONAL_SECONDS_RE, ""));
+	const match = ISO_DATE_TIME_WITH_OFFSET_RE.exec(value.replace(FRACTIONAL_SECONDS_RE$1, ""));
 	if (!match) return false;
 	const [year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0] = match.slice(1, 7).map(Number);
 	const timeInRange = hour <= MAX_HOUR && minute <= MAX_MINUTE && second <= MAX_SECOND;
@@ -118,6 +110,7 @@ async function loadClientSecret(home) {
 }
 //#endregion
 //#region src/google/fsJson.ts
+var JSON_INDENT = 2;
 async function readJsonOrNull(filePath) {
 	try {
 		const raw = await node_fs.promises.readFile(filePath, "utf-8");
@@ -126,39 +119,14 @@ async function readJsonOrNull(filePath) {
 		return null;
 	}
 }
-var IS_WINDOWS = process.platform === "win32";
-var RENAME_RETRY_DELAYS_MS = [
-	30,
-	100,
-	300
-];
-var hasErrnoCode = (err) => typeof err === "object" && err !== null && "code" in err && typeof err.code === "string";
-var isTransientRenameError = (err) => IS_WINDOWS && hasErrnoCode(err) && (err.code === "EPERM" || err.code === "EBUSY" || err.code === "EACCES");
-async function renameWithWindowsRetry(fromPath, toPath) {
-	for (const delayMs of RENAME_RETRY_DELAYS_MS) try {
-		await node_fs.promises.rename(fromPath, toPath);
-		return;
-	} catch (err) {
-		if (!isTransientRenameError(err)) throw err;
-		await new Promise((resolve) => setTimeout(resolve, delayMs));
-	}
-	await node_fs.promises.rename(fromPath, toPath);
-}
-/** tmp-write + rename so readers never see a half-written file; `mode`
-*  applies to the tmp file and survives the rename. */
+/** tmp-write + rename so readers never see a half-written file; `mode` applies
+*  to the tmp file and survives the rename. A single-writer token file, so the
+*  staging name is stable (`uniqueTmp: false`). */
 async function writeJsonAtomicWithMode(filePath, data, mode) {
-	const tmp = `${filePath}.tmp`;
-	await node_fs.promises.mkdir(node_path.default.dirname(filePath), { recursive: true });
-	try {
-		await node_fs.promises.writeFile(tmp, JSON.stringify(data, null, 2), {
-			encoding: "utf-8",
-			mode
-		});
-		await renameWithWindowsRetry(tmp, filePath);
-	} catch (err) {
-		await node_fs.promises.unlink(tmp).catch(() => void 0);
-		throw err;
-	}
+	await require_atomic.writeFileAtomic(filePath, JSON.stringify(data, null, JSON_INDENT), {
+		mode,
+		uniqueTmp: false
+	});
 }
 //#endregion
 //#region src/google/tokenStore.ts
@@ -200,36 +168,6 @@ async function deleteGoogleTokens(home) {
 	await (0, node_fs_promises.rm)(googleTokenPath(home), { force: true });
 }
 //#endregion
-//#region src/google/fetch.ts
-var DEFAULT_FETCH_TIMEOUT_MS = 10 * ONE_SECOND_MS;
-/** `fetch` with a finite timeout. Rejects with a `TimeoutError` once
-*  `timeoutMs` elapses. Composes with a caller-supplied `signal` so external
-*  cancellation still works. */
-async function fetchWithTimeout(url, init = {}) {
-	const { timeoutMs = DEFAULT_FETCH_TIMEOUT_MS, signal: callerSignal, ...rest } = init;
-	if (callerSignal?.aborted) throw callerSignal.reason ?? new DOMException("Aborted", "AbortError");
-	const controller = new AbortController();
-	const timer = setTimeout(() => {
-		controller.abort(new DOMException(`fetch timed out after ${timeoutMs}ms`, "TimeoutError"));
-	}, timeoutMs);
-	const unsubscribeCaller = bridgeExternalSignal(callerSignal, controller);
-	try {
-		return await fetch(url, {
-			...rest,
-			signal: controller.signal
-		});
-	} finally {
-		clearTimeout(timer);
-		unsubscribeCaller?.();
-	}
-}
-function bridgeExternalSignal(external, controller) {
-	if (!external) return null;
-	const onAbort = () => controller.abort(external.reason);
-	external.addEventListener("abort", onAbort, { once: true });
-	return () => external.removeEventListener("abort", onAbort);
-}
-//#endregion
 //#region src/google/broker.ts
 var DEFAULT_BROKER_BASE_URL = "https://asia-northeast1-mulmoserver.cloudfunctions.net";
 var BROKER_TIMEOUT_MS = 20 * ONE_SECOND_MS;
@@ -266,13 +204,13 @@ var brokerFetch = async (url, init = {}) => {
 	assertSecureBrokerUrl(url);
 	let response;
 	try {
-		response = await fetchWithTimeout(url, {
+		response = await require_utils_fetch.fetchWithTimeout(url, {
 			...init,
 			timeoutMs: BROKER_TIMEOUT_MS,
 			headers: { "Content-Type": "application/json" }
 		});
 	} catch (err) {
-		throw new Error(`Google sign-in service unreachable — check the network connection and retry (${require_errors.errorMessage(err)})`);
+		throw new Error(`Google sign-in service unreachable — check the network connection and retry (${require_dist.errorMessage(err)})`);
 	}
 	if (!response.ok) throw new Error(`Google sign-in service returned HTTP ${response.status}`);
 	try {
@@ -403,7 +341,7 @@ var REVOKE_URL = "https://oauth2.googleapis.com/revoke";
 *  Revoke failures are logged but never block the local delete — Google may
 *  already consider the token invalid, and keeping the file would leave the
 *  user unable to unlink. */
-async function unlinkGoogle(home, revokeFetch = fetchWithTimeout) {
+async function unlinkGoogle(home, revokeFetch = require_utils_fetch.fetchWithTimeout) {
 	const saved = await loadGoogleTokens(home);
 	const token = saved?.refresh_token ?? saved?.access_token;
 	if (token) try {
@@ -414,7 +352,7 @@ async function unlinkGoogle(home, revokeFetch = fetchWithTimeout) {
 		});
 		if (!response.ok) log.warn("google", "token revoke returned non-ok", { status: response.status });
 	} catch (err) {
-		log.warn("google", "token revoke failed, deleting local tokens anyway", { error: require_errors.errorMessage(err) });
+		log.warn("google", "token revoke failed, deleting local tokens anyway", { error: require_dist.errorMessage(err) });
 	}
 	await deleteGoogleTokens(home);
 }
@@ -565,7 +503,7 @@ var createGoogleAuthFlow = (authorize) => {
 				signal: controller.signal
 			}).then(() => log.info("google", "authorize flow completed")).catch((err) => {
 				if (!controller.signal.aborted) {
-					lastError = require_errors.errorMessage(err);
+					lastError = require_dist.errorMessage(err);
 					log.warn("google", "authorize flow failed", { error: lastError });
 				}
 				reject(err instanceof Error ? err : new Error(String(err)));
@@ -621,7 +559,7 @@ var googleApiError = (apiLabel, status, body) => {
 };
 async function googleRequest(apiLabel, accessToken, url, init = {}) {
 	const { contentType = "application/json", expectText = false, ...rest } = init;
-	const response = await fetchWithTimeout(url, {
+	const response = await require_utils_fetch.fetchWithTimeout(url, {
 		...rest,
 		timeoutMs: GOOGLE_API_TIMEOUT_MS,
 		headers: {
@@ -630,7 +568,7 @@ async function googleRequest(apiLabel, accessToken, url, init = {}) {
 		}
 	});
 	if (!response.ok) {
-		const body = await response.text().catch((err) => require_errors.errorMessage(err));
+		const body = await response.text().catch((err) => require_dist.errorMessage(err));
 		throw googleApiError(apiLabel, response.status, body);
 	}
 	if (expectText) return await response.text();
@@ -848,15 +786,49 @@ async function clearCalendarSyncToken(calendarId, workspaceRoot) {
 	await updateState((tokens) => Object.fromEntries(Object.entries(tokens).filter(([key]) => key !== dropped)), workspaceRoot);
 }
 //#endregion
+//#region src/google/collectionDateTime.ts
+/** All-day events carry no clock; midnight is where the day view places them. */
+var ALL_DAY_CLOCK = "00:00";
+var DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
+/** RFC3339 zone designator: `Z`, `+09:00`, `-0500`. */
+var ZONE_SUFFIX_RE = /(?:Z|[+-]\d{2}:?\d{2})$/;
+/** Fractional seconds have no place in the collection datetime shape. */
+var FRACTIONAL_SECONDS_RE = /\.\d+$/;
+/** Normalise one Google Calendar time value for storage in a `datetime` field.
+*  Anything that isn't a recognisable Google shape (empty string, non-string,
+*  free text) is returned untouched — the record lint should report it rather
+*  than have this function invent a value. */
+function toCollectionDateTime(value) {
+	if (typeof value !== "string") return value;
+	const trimmed = value.trim();
+	if (DATE_ONLY_RE.test(trimmed)) return `${trimmed}T${ALL_DAY_CLOCK}`;
+	if (!trimmed.includes("T")) return value;
+	return trimmed.replace(ZONE_SUFFIX_RE, "").replace(FRACTIONAL_SECONDS_RE, "");
+}
+//#endregion
 //#region src/google/collectionSync.ts
 var GOOGLE_CALENDAR_SYNC_TASK_ID = "system:google-calendar-sync";
 var DEFAULT_SYNC_INTERVAL_MS = 3600 * 1e3;
 var CANCELLED_STATUS = "cancelled";
+var DATETIME_FIELD_TYPE = "datetime";
+/** Own-property lookup, mirroring what the record lint reads: a spec reachable
+*  only through the prototype chain is not a DECLARED field, so it must not
+*  decide how a value is stored. */
+function declaredSpec(fields, field) {
+	return Object.hasOwn(fields, field) ? fields[field] : void 0;
+}
+/** Google's raw value is normalised only into a field the schema declares as
+*  `datetime` — that is the type whose stored shape the record lint, the
+*  calendar grid and the day view all parse (#2310). A user who maps `start`
+*  onto a `string` field asked for Google's value verbatim and keeps it. */
+function projectValue(fields, field, value) {
+	return declaredSpec(fields, field)?.type === DATETIME_FIELD_TYPE ? toCollectionDateTime(value) : value;
+}
 /** Project one Google event onto the collection's own field names. The
 *  primary field always takes the event id — upsert-by-id is what keeps the
 *  sync idempotent, so it is deliberately not remappable. */
-function toCollectionRecord(event, map, primaryKey) {
-	const mapped = Object.entries(map).map(([field, source]) => [field, event[source]]);
+function toCollectionRecord(event, map, primaryKey, fields) {
+	const mapped = Object.entries(map).map(([field, source]) => [field, projectValue(fields, field, event[source])]);
 	return {
 		...Object.fromEntries(mapped),
 		[primaryKey]: event.id
@@ -897,7 +869,7 @@ async function applyEvent(collection, event, workspaceRoot) {
 			const deleted = await store.delete(event.id);
 			return classifyDelete(event.id, deleted.kind);
 		}
-		const record = toCollectionRecord(event, schema.googleCalendar?.map ?? {}, schema.primaryKey);
+		const record = toCollectionRecord(event, schema.googleCalendar?.map ?? {}, schema.primaryKey, schema.fields);
 		const written = await store.write(event.id, record);
 		return classifyWrite(event.id, written.kind);
 	} catch (error) {
@@ -1231,6 +1203,7 @@ exports.syncCalendarEvents = syncCalendarEvents;
 exports.syncCalendarGroup = syncCalendarGroup;
 exports.syncDueCalendarCollections = syncDueCalendarCollections;
 exports.toCalendarSummary = toCalendarSummary;
+exports.toCollectionDateTime = toCollectionDateTime;
 exports.toCollectionRecord = toCollectionRecord;
 exports.toDriveFileSummary = toDriveFileSummary;
 exports.toEventSummary = toEventSummary;