@dinoxx/dinox-cli 1.1.1 → 2.0.0

package/dist/dinox.js

@@ -2,6 +2,7 @@
 import { createCli } from './cli.js';
 import { buildStructuredErrorPayload, isDinoxError } from './utils/errors.js';
 import { clearRequestedStructuredOutputFormat, parseStructuredOutputFormatFromArgv, printError, printHumanReadableError, setRequestedStructuredOutputFormat, } from './utils/output.js';
+import { exitProcessAfterFlushing } from './utils/processExit.js';
 function normalizeArgv(argv) {
     // pnpm/npm script forwarding can prepend a standalone "--".
     if (argv[0] === '--') {
@@ -25,7 +26,12 @@ function isCommanderError(error) {
         && error.code.startsWith('commander.')
         && typeof error.exitCode === 'number';
 }
-main().catch((error) => {
+async function exitAfterFatalCleanup(error, exitCode) {
+    if (isDinoxError(error) && error.requiresProcessExit) {
+        await exitProcessAfterFlushing(exitCode);
+    }
+}
+main().catch(async (error) => {
     if (isCommanderError(error)) {
         process.exitCode = error.exitCode === 0 ? 0 : 2;
         return;
@@ -46,6 +52,7 @@ main().catch((error) => {
         setRequestedStructuredOutputFormat(format);
         printError(payload, format);
         clearRequestedStructuredOutputFormat();
+        await exitAfterFatalCleanup(error, exitCode);
         return;
     }
     printHumanReadableError(payload.message);
@@ -59,4 +66,5 @@ main().catch((error) => {
     if (verbose && payload.stack) {
         printHumanReadableError(payload.stack);
     }
+    await exitAfterFatalCleanup(error, exitCode);
 });

package/dist/powersync/exclusiveRuntime.d.ts

@@ -13,6 +13,7 @@ export declare function withExclusivePowerSync<T>(args: {
     offline: boolean;
     timeoutMs: number;
     deadlineAtMs?: number;
+    operationDeadlineAtMs?: number;
     waitForInitialSync?: boolean;
     expectedTokenFingerprint?: string | null;
     cleanupFailureMode?: 'warn' | 'throw';

package/dist/powersync/exclusiveRuntime.js

@@ -1,4 +1,6 @@
 import { withDaemonExclusiveAccess } from '../daemon/lifecycle.js';
+import { runWithinDeadline, remainingDeadlineMs } from '../utils/deadline.js';
+import { DinoxError } from '../utils/errors.js';
 import { printHumanReadableWarning } from '../utils/output.js';
 import { closePowerSyncAndReleaseOwner, connectPowerSync, } from './runtime.js';
 const exclusivePowerSyncDependencies = {
@@ -10,16 +12,24 @@ const exclusivePowerSyncDependencies = {
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function createRuntimeCleanupDeadlineError() {
+    return new DinoxError('Sync deadline exceeded while closing the local PowerSync runtime.', {
+        code: 'SYNC_TIMEOUT',
+        details: { phase: 'powersync-cleanup' },
+        suggestion: 'Run `dino doctor --format json` to verify the local runtime before retrying sync.',
+        recoverable: true,
+        requiresProcessExit: true,
+    });
+}
 export async function withExclusivePowerSync(args, run, overrides = {}) {
     const dependencies = { ...exclusivePowerSyncDependencies, ...overrides };
-    const { cleanupFailureMode, deadlineAtMs, ...connectArgs } = args;
-    const remainingTimeoutMs = () => deadlineAtMs === undefined
-        ? args.timeoutMs
-        : Math.max(1, Math.min(args.timeoutMs, deadlineAtMs - Date.now()));
-    return dependencies.withDaemonExclusiveAccess(args.config, remainingTimeoutMs(), async (daemonLifecycle) => {
+    const { cleanupFailureMode, deadlineAtMs, operationDeadlineAtMs = deadlineAtMs, ...connectArgs } = args;
+    const remainingOperationTimeoutMs = () => Math.max(1, remainingDeadlineMs(operationDeadlineAtMs, args.timeoutMs));
+    const remainingTotalTimeoutMs = () => Math.max(1, remainingDeadlineMs(deadlineAtMs, args.timeoutMs));
+    return dependencies.withDaemonExclusiveAccess(args.config, remainingTotalTimeoutMs(), async (daemonLifecycle) => {
         const connected = await dependencies.connectPowerSync({
             ...connectArgs,
-            timeoutMs: remainingTimeoutMs(),
+            timeoutMs: remainingOperationTimeoutMs(),
         });
         let outcome;
         try {
@@ -30,7 +40,11 @@ export async function withExclusivePowerSync(args, run, overrides = {}) {
         }
         let cleanupError;
         try {
-            await dependencies.closePowerSyncAndReleaseOwner(connected.db, connected.releaseOwner);
+            await runWithinDeadline(() => dependencies.closePowerSyncAndReleaseOwner(connected.db, connected.releaseOwner), {
+                deadlineAtMs,
+                maximumTimeoutMs: args.timeoutMs,
+                createTimeoutError: createRuntimeCleanupDeadlineError,
+            });
         }
         catch (error) {
             cleanupError = error;
@@ -44,5 +58,9 @@ export async function withExclusivePowerSync(args, run, overrides = {}) {
             throw cleanupError;
         }
         return outcome.value;
-    }, {}, { deadlineAtMs });
+    }, {}, {
+        deadlineAtMs,
+        operationDeadlineAtMs,
+        cleanupFailureMode,
+    });
 }

package/dist/powersync/runtime.d.ts

@@ -1,6 +1,7 @@
 import { PowerSyncDatabase } from '@powersync/node';
-import type { AbstractPowerSyncDatabase, SyncStatusOptions } from '@powersync/common';
+import type { AbstractPowerSyncDatabase } from '@powersync/common';
 import type { ResolvedDinoxConfig } from '../config/types.js';
+import type { SyncStatusRaw } from './syncGate.js';
 export type ConnectResult = {
     db: PowerSyncDatabase;
     dbPath: string;
@@ -29,7 +30,7 @@ export declare function getStatusSnapshot(db: AbstractPowerSyncDatabase): {
             message: string;
         };
     };
-    raw: SyncStatusOptions;
+    raw: SyncStatusRaw;
 };
 export declare function connectPowerSync(args: {
     config: ResolvedDinoxConfig;

package/dist/powersync/runtime.js

@@ -88,8 +88,25 @@ async function ensureDataDir() {
     await fs.mkdir(dir, { recursive: true, mode: 0o700 });
     return dir;
 }
+function readSyncStatus(status) {
+    if (!status)
+        return {};
+    return {
+        connected: status.connected,
+        connecting: status.connecting,
+        hasSynced: status.hasSynced,
+        lastSyncedAt: status.lastSyncedAt,
+        dataFlow: {
+            downloading: status.downloading,
+            uploading: status.uploading,
+            downloadError: status.downloadError,
+            uploadError: status.uploadError,
+        },
+        priorityStatusEntries: status.priorityStatusEntries,
+    };
+}
 export function getStatusSnapshot(db) {
-    const raw = db.currentStatus?.toJSON?.() ?? {};
+    const raw = readSyncStatus(db.currentStatus);
     const lastSyncedAt = raw.lastSyncedAt instanceof Date ? raw.lastSyncedAt.toISOString() : raw.lastSyncedAt ?? null;
     const dataFlow = raw.dataFlow ?? {};
     return {
@@ -185,8 +202,7 @@ export async function connectPowerSync(args) {
             ? createPowerSyncUploadHandler({
                 authorization: args.config.auth.authorization,
                 uploadBaseUrl: args.config.powersync.uploadBaseUrl,
-                uploadV4Path: args.config.powersync.uploadV4Path,
-                uploadV2Path: args.config.powersync.uploadV2Path,
+                uploadPath: args.config.powersync.uploadPath,
                 timeoutMs: args.timeoutMs,
             })
             : undefined;

package/dist/powersync/schema/content.d.ts

@@ -1,78 +1 @@
-import { Table } from '@powersync/common';
-export declare const c_card_box: Table<{
-    id: import("@powersync/common").BaseColumnType<string | null>;
-    name: import("@powersync/common").BaseColumnType<string | null>;
-    type: import("@powersync/common").BaseColumnType<string | null>;
-    cover_url: import("@powersync/common").BaseColumnType<string | null>;
-    prompt: import("@powersync/common").BaseColumnType<string | null>;
-    headers: import("@powersync/common").BaseColumnType<string | null>;
-    priority: import("@powersync/common").BaseColumnType<number | null>;
-    created_at: import("@powersync/common").BaseColumnType<string | null>;
-    updated_at: import("@powersync/common").BaseColumnType<string | null>;
-    extra_data: import("@powersync/common").BaseColumnType<string | null>;
-    user_no: import("@powersync/common").BaseColumnType<string | null>;
-    is_del: import("@powersync/common").BaseColumnType<number | null>;
-    template_id: import("@powersync/common").BaseColumnType<string | null>;
-}>;
-export declare const c_card_note: Table<{
-    id: import("@powersync/common").BaseColumnType<string | null>;
-    box_id: import("@powersync/common").BaseColumnType<string | null>;
-    content: import("@powersync/common").BaseColumnType<string | null>;
-    created_at: import("@powersync/common").BaseColumnType<string | null>;
-    updated_at: import("@powersync/common").BaseColumnType<string | null>;
-    extra_data: import("@powersync/common").BaseColumnType<string | null>;
-    user_no: import("@powersync/common").BaseColumnType<string | null>;
-    is_del: import("@powersync/common").BaseColumnType<number | null>;
-    origin_note_id: import("@powersync/common").BaseColumnType<string | null>;
-    origin_type: import("@powersync/common").BaseColumnType<string | null>;
-    output_type: import("@powersync/common").BaseColumnType<string | null>;
-    is_array: import("@powersync/common").BaseColumnType<number | null>;
-}>;
-export declare const c_cmd: Table<{
-    id: import("@powersync/common").BaseColumnType<string | null>;
-    zone: import("@powersync/common").BaseColumnType<string | null>;
-    type: import("@powersync/common").BaseColumnType<string | null>;
-    cmd: import("@powersync/common").BaseColumnType<string | null>;
-    name: import("@powersync/common").BaseColumnType<string | null>;
-    priority: import("@powersync/common").BaseColumnType<number | null>;
-    is_show: import("@powersync/common").BaseColumnType<number | null>;
-    description: import("@powersync/common").BaseColumnType<string | null>;
-    extra_data: import("@powersync/common").BaseColumnType<string | null>;
-    user_id: import("@powersync/common").BaseColumnType<string | null>;
-    insert_at: import("@powersync/common").BaseColumnType<string | null>;
-    update_at: import("@powersync/common").BaseColumnType<string | null>;
-    is_del: import("@powersync/common").BaseColumnType<number | null>;
-    template_id: import("@powersync/common").BaseColumnType<string | null>;
-    meta_data: import("@powersync/common").BaseColumnType<string | null>;
-    output: import("@powersync/common").BaseColumnType<string | null>;
-    output_param: import("@powersync/common").BaseColumnType<string | null>;
-    category: import("@powersync/common").BaseColumnType<string | null>;
-}>;
-export declare const c_note_template: Table<{
-    id: import("@powersync/common").BaseColumnType<string | null>;
-    content: import("@powersync/common").BaseColumnType<string | null>;
-    name: import("@powersync/common").BaseColumnType<string | null>;
-    priority: import("@powersync/common").BaseColumnType<number | null>;
-    is_show: import("@powersync/common").BaseColumnType<number | null>;
-    extra_data: import("@powersync/common").BaseColumnType<string | null>;
-    user_id: import("@powersync/common").BaseColumnType<string | null>;
-    insert_at: import("@powersync/common").BaseColumnType<string | null>;
-    update_at: import("@powersync/common").BaseColumnType<string | null>;
-    is_del: import("@powersync/common").BaseColumnType<number | null>;
-}>;
-export declare const c_zettel_box: Table<{
-    id: import("@powersync/common").BaseColumnType<string | null>;
-    name: import("@powersync/common").BaseColumnType<string | null>;
-    path: import("@powersync/common").BaseColumnType<string | null>;
-    parent_id: import("@powersync/common").BaseColumnType<string | null>;
-    description: import("@powersync/common").BaseColumnType<string | null>;
-    color: import("@powersync/common").BaseColumnType<string | null>;
-    priority: import("@powersync/common").BaseColumnType<number | null>;
-    is_show: import("@powersync/common").BaseColumnType<number | null>;
-    cover_url: import("@powersync/common").BaseColumnType<string | null>;
-    created_at: import("@powersync/common").BaseColumnType<string | null>;
-    updated_at: import("@powersync/common").BaseColumnType<string | null>;
-    extra_data: import("@powersync/common").BaseColumnType<string | null>;
-    user_no: import("@powersync/common").BaseColumnType<string | null>;
-    is_del: import("@powersync/common").BaseColumnType<number | null>;
-}>;
+export { c_card_box, c_card_note, c_cmd, c_note_template, c_zettel_box, } from './electronCanonical.js';

package/dist/powersync/schema/content.js

@@ -1,78 +1 @@
-import { column, Table } from '@powersync/common';
-export const c_card_box = new Table({
-    id: column.text,
-    name: column.text,
-    type: column.text,
-    cover_url: column.text,
-    prompt: column.text,
-    headers: column.text,
-    priority: column.integer,
-    created_at: column.text,
-    updated_at: column.text,
-    extra_data: column.text,
-    user_no: column.text,
-    is_del: column.integer,
-    template_id: column.text,
-});
-export const c_card_note = new Table({
-    id: column.text,
-    box_id: column.text,
-    content: column.text,
-    created_at: column.text,
-    updated_at: column.text,
-    extra_data: column.text,
-    user_no: column.text,
-    is_del: column.integer,
-    origin_note_id: column.text,
-    origin_type: column.text,
-    output_type: column.text,
-    is_array: column.integer,
-});
-export const c_cmd = new Table({
-    id: column.text,
-    zone: column.text,
-    type: column.text,
-    cmd: column.text,
-    name: column.text,
-    priority: column.integer,
-    is_show: column.integer,
-    description: column.text,
-    extra_data: column.text,
-    user_id: column.text,
-    insert_at: column.text,
-    update_at: column.text,
-    is_del: column.integer,
-    template_id: column.text,
-    meta_data: column.text,
-    output: column.text,
-    output_param: column.text,
-    category: column.text,
-});
-export const c_note_template = new Table({
-    id: column.text,
-    content: column.text,
-    name: column.text,
-    priority: column.integer,
-    is_show: column.integer,
-    extra_data: column.text,
-    user_id: column.text,
-    insert_at: column.text,
-    update_at: column.text,
-    is_del: column.integer,
-});
-export const c_zettel_box = new Table({
-    id: column.text,
-    name: column.text,
-    path: column.text,
-    parent_id: column.text,
-    description: column.text,
-    color: column.text,
-    priority: column.integer,
-    is_show: column.integer,
-    cover_url: column.text,
-    created_at: column.text,
-    updated_at: column.text,
-    extra_data: column.text,
-    user_no: column.text,
-    is_del: column.integer,
-});
+export { c_card_box, c_card_note, c_cmd, c_note_template, c_zettel_box, } from './electronCanonical.js';