@open-webapp/drive-sync 0.3.0 → 0.4.1

package/README.md

@@ -29,7 +29,7 @@ const folderId = await p.ensureFolderPath()
 await p.files.write({ folderId, name: 'data.json', content: '{}', mimeType: 'application/json' })
 ```
 
-See `SPEC.md` for the full design: the 34 resolved decisions, storage layout,
+See `SPEC.md` for the full design: the 36 resolved decisions, storage layout,
 and refresh state machine. `SPEC.md` is descriptive, written from the shipped
 code — if it ever disagrees with the source, the source wins.
 

package/SPEC.md

@@ -50,7 +50,7 @@ Files implementing the surface: `index.ts` (factory + `ProjectHandle`/`FilesHand
 
 `getAccessToken()` is the one deliberate exception to `Connection` never exposing secret material (types.ts): it exists solely so an app can feed the token to Google Picker (`setOAuthToken()`), which runs outside this library's control and has no other way to read it. Reuses a cached token while it has more than 5 minutes left; otherwise acquires one (interactive by default, since callers use this to drive a UI the user is actively interacting with).
 
-## 2. The 35 resolved design decisions
+## 2. The 36 resolved design decisions
 
 **Bugs fixed (both source apps carried these):**
 
@@ -94,6 +94,8 @@ Files implementing the surface: `index.ts` (factory + `ProjectHandle`/`FilesHand
 34. **`interactive` option, default `false`** — every `BaseCallOptions`-shaped call in `files.ts`/`permissions.ts`/`http.ts` defaults `interactive` to falsy; a non-interactive call with no usable token throws `NeedsReauthError` rather than silently prompting.
 35. **Google Picker integration** — `picker.ts`'s `pickFile` accepts an `apiKey` and an `appId` (the OAuth client's Cloud project number) per-call (not stored in `DriveSyncOptions`); `appId` is mandatory because drive-sync holds only a `drive.file`-scoped token and Picker rejects a scoped session it cannot attribute to an app — omitting it makes Picker drop the OAuth token, show its own sign-in prompt, and fail with "The API developer key is invalid"; `index.ts` and `connection.ts` resolve the token, but `picker.ts` only ever sees a plain string token to avoid secret exposure. Script loading is cached at module level to avoid repeated GIS-loader calls. On user cancel, `PickerCancelledError` is thrown; on success, `FileRef` is returned. Drive scope prerequisites and token refresh are handled transparently (`picker.ts` takes the token and makes the Picker call; no token-boundary complexity leaks to callers).
 
+36. **`list()` returns `modifiedTime`** — `files.ts`'s `list()` requests `modifiedTime` alongside `id,name,mimeType,version` (same field `fetchRemoteVersion` already fetches per-file for `status()`); `FileRef.modifiedTime` (`types.ts`) is optional since older/unfetched responses may omit it.
+
 ## 3. Storage layout
 
 Each project gets its own IndexedDB database: **`owa-drive-{appId}-{projectId}`**, version 1, containing one object store, `auth` (`storage.ts`). The store holds exactly two keys:

package/dist/files.js

@@ -292,8 +292,10 @@ function buildQuery(opts) {
 export async function list(opts) {
     const q = buildQuery(opts);
     // `version` comes back so the name-resolution path in write() can run its
-    // staleness check without a follow-up metadata fetch.
-    const url = `${DRIVE_BASE}/files?q=${encodeURIComponent(q)}&fields=${encodeURIComponent('files(id,name,mimeType,version)')}`;
+    // staleness check without a follow-up metadata fetch. `modifiedTime` is
+    // also requested so callers can get a last-modified timestamp per file
+    // without an extra round trip.
+    const url = `${DRIVE_BASE}/files?q=${encodeURIComponent(q)}&fields=${encodeURIComponent('files(id,name,mimeType,version,modifiedTime)')}`;
     const res = await driveFetch({
         appId: opts.appId,
         projectId: opts.projectId,

package/dist/http.js

@@ -1,9 +1,11 @@
 import { acquireToken } from './token.js';
 import { getConnection, refreshSilently } from './connection.js';
-import { clearToken } from './storage.js';
+import { clearToken, getToken } from './storage.js';
 import { DriveSyncError, NeedsReauthError, ScopeInsufficientError, NotFoundError, RateLimitedError, TransientError, WrongAccountError, } from './errors.js';
 const MAX_ATTEMPTS = 3;
 const BASE_DELAY_MS = 500;
+/** Mirrors connection.ts's own buffer: a cached token this close to expiry is treated as unusable. */
+const TOKEN_REUSE_BUFFER_MS = 5 * 60 * 1000;
 function isRetryableStatus(status) {
     return status === 429 || (status >= 500 && status <= 599);
 }
@@ -40,6 +42,17 @@ async function sleep(ms) {
 export async function driveFetch(opts) {
     const { appId, projectId, clientId, requiredScopes, logger } = opts;
     const interactive = !!opts.interactive;
+    // Reuse a still-valid cached token as-is on the non-interactive path,
+    // exactly like connection.ts's getAccessToken() already does — without
+    // this check every single Drive call (not just an actual token expiry)
+    // forced its own live, non-interactive GIS round-trip via acquireToken
+    // below, even when the cached token had plenty of life left.
+    if (!interactive) {
+        const cached = await getToken(appId, projectId);
+        if (cached && cached.expiresAt > Date.now() + TOKEN_REUSE_BUFFER_MS) {
+            return performFetch(opts, cached.accessToken, /* isRetryAfter401 */ false);
+        }
+    }
     // Resolve a hint email from the current connection (if any) so a
     // non-interactive silent refresh can target the right account. If there is
     // no connection at all and interactive is false, acquireToken's silent

package/dist/testing/driveFake.d.ts

@@ -25,6 +25,12 @@ export interface DriveFakeFile {
      * Optional so tests may seed files without it; treated as 1 when absent.
      */
     version?: number;
+    /**
+     * Drive's last-modified timestamp; optional so tests may seed files
+     * without it (omitted from the fake's response in that case, matching
+     * real Drive's `fields`-gated behavior).
+     */
+    modifiedTime?: string;
 }
 export interface DriveFakePermission {
     id: string;

package/dist/testing/driveFake.js

@@ -142,7 +142,14 @@ export function createDriveFake() {
         return override;
     }
     function fileToMetadata(f) {
-        return { id: f.id, name: f.name, mimeType: f.mimeType, parents: f.parents, version: String(f.version ?? 1) };
+        return {
+            id: f.id,
+            name: f.name,
+            mimeType: f.mimeType,
+            parents: f.parents,
+            version: String(f.version ?? 1),
+            modifiedTime: f.modifiedTime,
+        };
     }
     async function handleFilesList(url) {
         const q = url.searchParams.get('q') ?? '';

package/dist/types.d.ts

@@ -29,6 +29,8 @@ export interface FileRef {
     name?: string;
     /** Drive's monotonic change counter, when the call requested it. */
     version?: string;
+    /** Drive's last-modified timestamp (RFC3339), when the call requested it. */
+    modifiedTime?: string;
 }
 /**
  * Sync state of one file relative to what this client last restored.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-webapp/drive-sync",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "type": "module",
   "repository": {
     "type": "git",