@coffer-org/plugin-transit 1.3.1 → 1.4.0

package/dist/index.js

@@ -16,7 +16,6 @@ export default definePlugin({
     settings: defineSettings({
         label: 'transit.settings.label',
         fields: [
-            field.boolean({ key: 'use_nextcloud', label: 'transit.settings.use_nextcloud' }),
             field.string({ key: 'caldav_calendar', label: 'transit.settings.caldav_calendar' }),
             field.string({ key: 'caldav_url', label: 'transit.settings.caldav_url' }),
             field.string({ key: 'caldav_username', label: 'transit.settings.caldav_username' }),

package/dist/runtime/index.js

@@ -1,8 +1,10 @@
 import { startSync, stopSync } from "./sync.js";
+import { getLogger } from '@coffer-org/sdk/logger';
+const log = getLogger('transit');
 export { startSync, stopSync } from "./sync.js";
 export const serverHooks = {
     init: () => {
-        void startSync().catch((e) => console.warn(`[transit-sync] failed to start: ${e.message}`));
+        void startSync().catch((e) => log.warn(`sync failed to start: ${e.message}`));
     },
     teardown: () => {
         stopSync();

package/dist/runtime/sync.js

@@ -1,6 +1,8 @@
 import { getEm } from '@coffer-org/server/db';
 import { getPluginSettings } from '@coffer-org/server/plugin-runtime';
 import { resolveDavSettings, WebDavClient, CalDavCollection, buildVEvent, buildRRule, } from '@coffer-org/dav';
+import { getLogger } from '@coffer-org/sdk/logger';
+const log = getLogger('transit');
 const REF_DATE = { weekday: '20240101', saturday: '20240106', sunday: '20240107' };
 const BYDAY = {
     weekday: ['MO', 'TU', 'WE', 'TH', 'FR'],
@@ -61,19 +63,8 @@ async function runOnce() {
     const calendar = pluginSettings['caldav_calendar'];
     if (!calendar)
         throw new Error('[transit-sync] caldav_calendar is required but not set');
-    let principal;
-    let password;
-    if (pluginSettings['use_nextcloud']) {
-        const nc = await getPluginSettings('nextcloud');
-        if (!nc['nextcloud_url'])
-            throw new Error('[transit-sync] nextcloud_url not configured');
-        principal = String(nc['login'] ?? '');
-        password = String(nc['password'] ?? '');
-    }
-    else {
-        principal = pluginSettings['caldav_username'] ?? '';
-        password = pluginSettings['caldav_password'] ?? '';
-    }
+    const principal = pluginSettings['caldav_username'] ?? '';
+    const password = pluginSettings['caldav_password'] ?? '';
     const settings = resolveDavSettings(calendar, { principal, password });
     const ops = new WebDavClient({
         collectionUrl: settings.collectionUrl,
@@ -82,7 +73,7 @@ async function runOnce() {
     });
     const coll = new CalDavCollection(ops);
     const result = await coll.syncEvents('bus-route-', icsFiles);
-    console.log(`[transit-sync] synced: ${result.written.length} written, ${result.deleted.length} deleted, ${result.failed.length} failed`);
+    log.debug(`synced: ${result.written.length} written, ${result.deleted.length} deleted, ${result.failed.length} failed`);
 }
 const INTERVAL_MS = Number(process.env['TRANSIT_SYNC_INTERVAL_MS'] ?? 0) || 6 * 60 * 60 * 1000;
 let timer;
@@ -91,10 +82,10 @@ export async function startSync() {
         await runOnce();
     }
     catch (e) {
-        console.error(`[transit-sync] initial sync failed: ${e.message}`);
+        log.error(`initial sync failed: ${e.message}`);
     }
     timer = setInterval(() => {
-        void runOnce().catch((e) => console.error(`[transit-sync] sync error: ${e.message}`));
+        void runOnce().catch((e) => log.error(`sync error: ${e.message}`));
     }, INTERVAL_MS);
 }
 export function stopSync() {

package/dist/schema.js

@@ -7786,10 +7786,6 @@ var src_default = definePlugin({
 	settings: defineSettings({
 		label: "transit.settings.label",
 		fields: [
-			field.boolean({
-				key: "use_nextcloud",
-				label: "transit.settings.use_nextcloud"
-			}),
 			field.string({
 				key: "caldav_calendar",
 				label: "transit.settings.caldav_calendar"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/plugin-transit",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -25,8 +25,8 @@
     "test": "node --import tsx/esm --test 'src/runtime/*.test.ts'"
   },
   "dependencies": {
-    "@coffer-org/sdk": "^1.3.1",
-    "@coffer-org/server": "^1.3.1",
+    "@coffer-org/sdk": "^1.4.0",
+    "@coffer-org/server": "^1.6.0",
     "@coffer-org/dav": "^1.4.0"
   },
   "coffer": {