@karakeep/cli 0.30.0 → 0.31.0

package/dist/index.mjs

@@ -786,6 +786,9 @@ function createChain(opts) {
 function isObject(value) {
   return !!value && !Array.isArray(value) && typeof value === "object";
 }
+function emptyObject() {
+  return /* @__PURE__ */ Object.create(null);
+}
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -843,7 +846,7 @@ function createInnerProxy(callback, path2, memo) {
   }));
   return memo[cacheKey];
 }
-const createRecursiveProxy = (callback) => createInnerProxy(callback, [], /* @__PURE__ */ Object.create(null));
+const createRecursiveProxy = (callback) => createInnerProxy(callback, [], emptyObject());
 const createFlatProxy = (callback) => {
   return new Proxy(noop, { get(_obj, name) {
     if (name === "then") return void 0;
@@ -1093,15 +1096,15 @@ async function fetchHTTPResponse(opts) {
   throwIfAborted(opts.signal);
   const url = opts.getUrl(opts);
   const body = opts.getBody(opts);
-  const { type } = opts;
+  const method = (_opts$methodOverride = opts.methodOverride) !== null && _opts$methodOverride !== void 0 ? _opts$methodOverride : METHOD[opts.type];
   const resolvedHeaders = await (async () => {
     const heads = await opts.headers();
     if (Symbol.iterator in heads) return Object.fromEntries(heads);
     return heads;
   })();
-  const headers = (0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)({}, opts.contentTypeHeader ? { "content-type": opts.contentTypeHeader } : {}), opts.trpcAcceptHeader ? { "trpc-accept": opts.trpcAcceptHeader } : void 0), resolvedHeaders);
+  const headers = (0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)((0, import_objectSpread2$1.default)({}, opts.contentTypeHeader && method !== "GET" ? { "content-type": opts.contentTypeHeader } : {}), opts.trpcAcceptHeader ? { "trpc-accept": opts.trpcAcceptHeader } : void 0), resolvedHeaders);
   return getFetch(opts.fetch)(url, {
-    method: (_opts$methodOverride = opts.methodOverride) !== null && _opts$methodOverride !== void 0 ? _opts$methodOverride : METHOD[type],
+    method,
     signal: opts.signal,
     body,
     headers
@@ -1420,6 +1423,7 @@ var WsConnection = class WsConnection2 {
     const wsPromise = prepareUrl(_this.urlOptions).then((url) => new _this.WebSocketPonyfill(url));
     _this.openPromise = wsPromise.then(async (ws) => {
       _this.ws = ws;
+      ws.binaryType = "arraybuffer";
       ws.addEventListener("message", function({ data }) {
         if (data === "PING") this.send("PONG");
       });
@@ -11369,15 +11373,23 @@ async function addToList(listId, bookmarkId) {
     )
   );
 }
-listsCmd.command("get").description("gets all the ids of the bookmarks assigned to the list").requiredOption("--list <id>", "the id of the list").action(async (opts) => {
+listsCmd.command("get").description("gets all the ids of the bookmarks assigned to the list").requiredOption("--list <id>", "the id of the list").option(
+  "--include-content",
+  "include full bookmark content in results",
+  false
+).action(async (opts) => {
   const api2 = getAPIClient();
   try {
-    let resp = await api2.bookmarks.getBookmarks.query({ listId: opts.list });
+    let resp = await api2.bookmarks.getBookmarks.query({
+      listId: opts.list,
+      includeContent: opts.includeContent
+    });
     let results = resp.bookmarks.map((b) => b.id);
     while (resp.nextCursor) {
       resp = await api2.bookmarks.getBookmarks.query({
         listId: opts.list,
-        cursor: resp.nextCursor
+        cursor: resp.nextCursor,
+        includeContent: opts.includeContent
       });
       results = [...results, ...resp.bookmarks.map((b) => b.id)];
     }
@@ -15502,6 +15514,7 @@ const zTagCursorSchema = z.object({
 });
 const zTagListRequestSchema = z.object({
   nameContains: z.string().optional(),
+  ids: z.array(z.string()).optional(),
   attachedBy: z.enum([...zAttachedByEnumSchema.options, "none"]).optional(),
   sortBy: z.enum(["name", "usage", "relevance"]).optional().default("usage"),
   cursor: zTagCursorSchema.nullish().default({ page: 0 }),
@@ -15684,6 +15697,7 @@ z.object({
   // A mechanism to prioritize crawling of bookmarks depending on whether
   // they were created by a user interaction or by a bulk import.
   crawlPriority: z.enum(["low", "normal"]).optional(),
+  // Deprecated
   importSessionId: z.string().optional(),
   source: zBookmarkSourceSchema.optional()
 }).and(
@@ -15761,7 +15775,8 @@ z.object({
   // At least one of the two must be set
   tagId: z.string().optional(),
   // If the tag already exists and we know its id we should pass it
-  tagName: z.string().optional()
+  tagName: z.string().optional(),
+  attachedBy: zAttachedByEnumSchema.optional().default("human")
 }).refine((val) => !!val.tagId || !!val.tagName, {
   message: "You must provide either a tagId or a tagName",
   path: ["tagId", "tagName"]
@@ -15822,16 +15837,10 @@ function collect(val, acc) {
   return acc;
 }
 function normalizeBookmark(bookmark) {
-  const ret = {
+  return {
     ...bookmark,
     tags: bookmark.tags.map((t) => t.name)
   };
-  if (ret.content.type == BookmarkTypes.LINK && ret.content.htmlContent) {
-    if (ret.content.htmlContent.length > 10) {
-      ret.content.htmlContent = ret.content.htmlContent.substring(0, 10) + "... <CROPPED>";
-    }
-  }
-  return ret;
 }
 function printBookmark(bookmark) {
   printObject(normalizeBookmark(bookmark));
@@ -15912,9 +15921,13 @@ bookmarkCmd.command("add").description("creates a new bookmark").option(
     ])
   );
 });
-bookmarkCmd.command("get").description("fetch information about a bookmark").argument("<id>", "The id of the bookmark to get").action(async (id) => {
+bookmarkCmd.command("get").description("fetch information about a bookmark").argument("<id>", "The id of the bookmark to get").option(
+  "--include-content",
+  "include full bookmark content in results",
+  false
+).action(async (id, opts) => {
   const api2 = getAPIClient();
-  await api2.bookmarks.getBookmark.query({ bookmarkId: id }).then(printBookmark).catch(printError(`Failed to get the bookmark with id "${id}"`));
+  await api2.bookmarks.getBookmark.query({ bookmarkId: id, includeContent: opts.includeContent }).then(printBookmark).catch(printError(`Failed to get the bookmark with id "${id}"`));
 });
 function printTagMessage(tags, bookmarkId, action) {
   tags.forEach((tag) => {
@@ -15974,13 +15987,18 @@ bookmarkCmd.command("list").description("list all bookmarks").option(
   "--include-archived",
   "If set, archived bookmarks will be fetched as well",
   false
-).option("--list-id <id>", "if set, only items from that list will be fetched").action(async (opts) => {
+).option("--list-id <id>", "if set, only items from that list will be fetched").option(
+  "--include-content",
+  "include full bookmark content in results",
+  false
+).action(async (opts) => {
   const api2 = getAPIClient();
   const request = {
     archived: opts.includeArchived ? void 0 : false,
     listId: opts.listId,
     limit: MAX_NUM_BOOKMARKS_PER_PAGE,
-    useCursorV2: true
+    useCursorV2: true,
+    includeContent: opts.includeContent
   };
   try {
     let resp = await api2.bookmarks.getBookmarks.query(request);
@@ -15997,6 +16015,56 @@ bookmarkCmd.command("list").description("list all bookmarks").option(
     printStatusMessage(false, "Failed to query bookmarks");
   }
 });
+bookmarkCmd.command("search").description("search bookmarks using query matchers").argument(
+  "<query>",
+  "the search query (supports matchers like tag:name, is:fav, etc.)"
+).option(
+  "--limit <limit>",
+  "number of results per page",
+  (val) => parseInt(val, 10),
+  50
+).option(
+  "--sort-order <order>",
+  "sort order for results",
+  (val) => {
+    if (val !== "relevance" && val !== "asc" && val !== "desc") {
+      throw new Error("sort-order must be one of: relevance, asc, desc");
+    }
+    return val;
+  },
+  "relevance"
+).option(
+  "--include-content",
+  "include full bookmark content in results",
+  false
+).option("--all", "fetch all results (paginate through all pages)", false).action(async (query, opts) => {
+  const api2 = getAPIClient();
+  const request = {
+    text: query,
+    limit: opts.limit,
+    sortOrder: opts.sortOrder,
+    includeContent: opts.includeContent
+  };
+  try {
+    let resp = await api2.bookmarks.searchBookmarks.query(request);
+    let results = resp.bookmarks;
+    if (opts.all) {
+      while (resp.nextCursor) {
+        resp = await api2.bookmarks.searchBookmarks.query({
+          ...request,
+          cursor: resp.nextCursor
+        });
+        results = [...results, ...resp.bookmarks];
+      }
+    }
+    printObject(results.map(normalizeBookmark), { maxArrayLength: null });
+  } catch (error2) {
+    printStatusMessage(false, "Failed to search bookmarks");
+    if (error2 instanceof Error) {
+      printStatusMessage(false, error2.message);
+    }
+  }
+});
 bookmarkCmd.command("delete").description("delete a bookmark").argument("<id>", "the id of the bookmark to delete").action(async (id) => {
   const api2 = getAPIClient();
   await api2.bookmarks.deleteBookmark.mutate({ bookmarkId: id }).then(printSuccess(`Bookmark with id '${id}' got deleted`)).catch(printError(`Failed to delete bookmark with id "${id}"`));
@@ -17306,7 +17374,7 @@ async function wipeTags(api2) {
     throw error2;
   }
 }
-const __vite_import_meta_env__ = { "BASE_URL": "/", "CLI_VERSION": "0.30.0", "DEV": false, "MODE": "production", "PROD": true, "SSR": true };
+const __vite_import_meta_env__ = { "BASE_URL": "/", "CLI_VERSION": "0.31.0", "DEV": false, "MODE": "production", "PROD": true, "SSR": true };
 const program = new Command().name("karakeep").description("A CLI interface to interact with the karakeep api").addOption(
   new Option("--api-key <key>", "the API key to interact with the API").makeOptionMandatory(true).env("KARAKEEP_API_KEY")
 ).addOption(
@@ -17315,7 +17383,7 @@ const program = new Command().name("karakeep").description("A CLI interface to i
     "the address of the server to connect to"
   ).makeOptionMandatory(true).env("KARAKEEP_SERVER_ADDR")
 ).addOption(new Option("--json", "to output the result as JSON")).version(
-  __vite_import_meta_env__ && "CLI_VERSION" in __vite_import_meta_env__ ? "0.30.0" : "0.0.0"
+  __vite_import_meta_env__ && "CLI_VERSION" in __vite_import_meta_env__ ? "0.31.0" : "0.0.0"
 );
 program.addCommand(adminCmd);
 program.addCommand(bookmarkCmd);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@karakeep/cli",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "Command Line Interface (CLI) for Karakeep",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
@@ -20,8 +20,8 @@
     "@karakeep/shared": "^0.1.0",
     "@karakeep/trpc": "^0.1.0",
     "@karakeep/tsconfig": "^0.1.0",
-    "@trpc/client": "^11.4.3",
-    "@trpc/server": "^11.4.3",
+    "@trpc/client": "^11.9.0",
+    "@trpc/server": "^11.9.0",
     "@tsconfig/node22": "^22.0.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",