Skip to content

Commit

Permalink
feat: rename new memos api to v0.22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
RyoJerryYu committed May 26, 2024
1 parent 94964ee commit d3b4f49
Show file tree
Hide file tree
Showing 51 changed files with 27 additions and 43 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
26 changes: 11 additions & 15 deletions api/memos-v0.22.1.ts → api/memos-v0.22.0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,14 @@ import {
FetchTransport,
Client,
Metadata,
Channel,
ClientFactory,
} from "nice-grpc-web";
import axios, { AxiosInstance } from "axios";
import * as log from "utils/log";
import {
ListMemosRequest,
MemoServiceDefinition,
} from "./memos-proto-v0.22.1/gen/api/v1/memo_service";
import { ResourceServiceDefinition } from "./memos-proto-v0.22.1/gen/api/v1/resource_service";
import { MemoServiceDefinition } from "./memos-proto-v0.22.0/gen/api/v1/memo_service";
import { ResourceServiceDefinition } from "./memos-proto-v0.22.0/gen/api/v1/resource_service";

export type MemoCli = Client<MemoServiceDefinition>;
export type ResourceCli = Client<ResourceServiceDefinition>;

export function newClients(
endpoint: string,
token: string
) {
export function newClients(endpoint: string, token: string) {
const channel = createChannel(
endpoint,
FetchTransport({
Expand All @@ -40,7 +30,13 @@ export function newClients(
);

return {
memoCli: clientFactory.create(MemoServiceDefinition, channel) as MemoCli,
resourceCli: clientFactory.create(ResourceServiceDefinition, channel) as ResourceCli,
memoCli: clientFactory.create(
MemoServiceDefinition,
channel
) as MemoCli,
resourceCli: clientFactory.create(
ResourceServiceDefinition,
channel
) as ResourceCli,
};
}
2 changes: 1 addition & 1 deletion gen-proto.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd ./api/memos-proto-v0.22.1/
cd ./api/memos-proto-v0.22.0/
buf generate
6 changes: 3 additions & 3 deletions main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ class SampleSettingTab extends PluginSettingTab {
.setDesc("Memos API Version")
.addDropdown((dropDown)=>{
dropDown.addOptions({
"v0.19.1": "v0.19.1",
"v0.22.1": "v0.22.1",
"v0.19.1": "before v0.21.x",
"v0.22.0": "after v0.22.x",
});
dropDown.setValue(this.plugin.settings.memosAPIVersion);
dropDown.onChange((value) => {
this.saveSettings({
memosAPIVersion: value as "v0.19.1" | "v0.22.1",
memosAPIVersion: value as "v0.19.1" | "v0.22.0",
});
})
})
Expand Down
5 changes: 2 additions & 3 deletions services/DailyMemos/MemosPaginator.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { DailyRecordType, MemosClient0191 } from "api/memos-v0.19.1";
import * as log from "utils/log";
import { MemoCli } from "api/memos-v0.22.1";
import { Memo } from "api/memos-proto-v0.22.1/gen/api/v1/memo_service";
import { PluginSettings } from "types/PluginSettings";
import { MemoCli } from "api/memos-v0.22.0";
import { Memo } from "api/memos-proto-v0.22.0/gen/api/v1/memo_service";
import {
APIResource,
convert0220ResourceToAPIResource,
Expand Down
2 changes: 1 addition & 1 deletion services/DailyMemos/MemosResource.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Resource } from "api/memos-proto-v0.22.1/gen/api/v1/resource_service";
import { Resource } from "api/memos-proto-v0.22.0/gen/api/v1/resource_service";

export type APIResource = {
name?: string;
Expand Down
15 changes: 2 additions & 13 deletions services/DailyMemos/MemosResourceFetcher.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { MemosClient0191 } from "api/memos-v0.19.1";
import { Client } from "nice-grpc-web";
import * as log from "utils/log";
import {
ResourceServiceDefinition,
} from "../../api/memos-proto-v0.22.1/gen/api/v1/resource_service";
import { ResourceCli, newClients } from "api/memos-v0.22.1";
import { ResourceCli, newClients } from "api/memos-v0.22.0";
import { APIResource, convert0220ResourceToAPIResource } from "./MemosResource";

export type MemosResourceFetcher = {
Expand Down Expand Up @@ -55,15 +51,8 @@ export class MemosResourceFetcher0191 {
};
}

export class MemosResourceFetcher0210 {
export class MemosResourceFetcher0220 {
constructor(private resourceCli: ResourceCli) {}
static new(
endpoint: string, // http://localhost:5230
token: string
): MemosResourceFetcher0210 {
const { resourceCli } = newClients(endpoint, token);
return new MemosResourceFetcher0210(resourceCli);
}

listResources = async (): Promise<APIResource[] | undefined> => {
try {
Expand Down
12 changes: 6 additions & 6 deletions services/DailyMemos/MemosVersionFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
MemosPaginator0191,
MemosPaginator0220,
} from "./MemosPaginator";
import { MemoCli, ResourceCli, newClients } from "api/memos-v0.22.1";
import { MemoCli, ResourceCli, newClients } from "api/memos-v0.22.0";
import { MemosClient0191 } from "api/memos-v0.19.1";
import {
MemosResourceFetcher,
MemosResourceFetcher0191,
MemosResourceFetcher0210,
MemosResourceFetcher0220,
} from "./MemosResourceFetcher";

/**
Expand All @@ -22,13 +22,13 @@ export class MemosAbstractFactory {
private inner: MemosFactory;

constructor(private settings: PluginSettings) {
if (this.settings.memosAPIVersion === "v0.22.1") {
if (this.settings.memosAPIVersion === "v0.22.0") {
const { memoCli, resourceCli } = newClients(
this.settings.usememosAPI,
this.settings.usememosToken
);

this.inner = new MemosFactory0210(this.settings);
this.inner = new MemosFactory0220(this.settings);
return;
}

Expand Down Expand Up @@ -85,7 +85,7 @@ class MemosFactory0191 {
};
}

class MemosFactory0210 {
class MemosFactory0220 {
private memoCli: MemoCli;
private resourceCli: ResourceCli;
constructor(private settings: PluginSettings) {
Expand All @@ -109,6 +109,6 @@ class MemosFactory0210 {
};

createResourceFetcher = () => {
return new MemosResourceFetcher0210(this.resourceCli);
return new MemosResourceFetcher0220(this.resourceCli);
};
}
2 changes: 1 addition & 1 deletion types/PluginSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ export interface PluginSettings {
/**
* Memos Version, for using different version of memos API.
*/
memosAPIVersion: "v0.22.1" | "v0.19.1";
memosAPIVersion: "v0.22.0" | "v0.19.1";
}

0 comments on commit d3b4f49

Please sign in to comment.