@dxos/protocols 0.5.3-main.37bbd91 → 0.5.3-main.3b535c7

package/dist/esm/src/proto/gen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA+DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA2iB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,4o0GAA4o0G,CAAC,CAAC,CAAC;AACrs0G,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA+DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA0iB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,y/zGAAy/zG,CAAC,CAAC,CAAC;AAClj0G,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.5.3-main.37bbd91",
+  "version": "0.5.3-main.3b535c7",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/invariant": "0.5.3-main.37bbd91",
-    "@dxos/codec-protobuf": "0.5.3-main.37bbd91",
-    "@dxos/keys": "0.5.3-main.37bbd91",
-    "@dxos/timeframe": "0.5.3-main.37bbd91"
+    "@dxos/codec-protobuf": "0.5.3-main.3b535c7",
+    "@dxos/invariant": "0.5.3-main.3b535c7",
+    "@dxos/keys": "0.5.3-main.3b535c7",
+    "@dxos/timeframe": "0.5.3-main.3b535c7"
   },
   "devDependencies": {
     "glob": "~7.1.6"

package/src/indexing.ts

@@ -3,58 +3,19 @@
 //
 
 export type ObjectPointerDecoded = {
-  spaceKey: string | undefined;
   documentId: string;
   objectId: string;
 };
 
 /**
- * Encoded object pointer: `#01|${spaceKey}|${documentId}|${objectId}`.
- * Old format without spaceKey: `${documentId}|${objectId}`.
- * The spaceKey is optional and was added in the later version.
- * Space key is encoded in the front to allow prefix iteration.
+ * Encoded object pointer: `${documentId}|${objectId}`.
  */
 export type ObjectPointerEncoded = string;
 
-const V1_PREFIX = '#01';
-
-export enum ObjectPointerVersion {
-  /**
-   * `${documentId}|${objectId}`
-   */
-  V0 = 0,
-  /**
-   * `#01|${spaceKey}|${documentId}|${objectId}`
-   */
-  V1 = 1,
-}
-
-export const objectPointerCodec = {
-  encode: ({ spaceKey, documentId, objectId }: ObjectPointerDecoded): ObjectPointerEncoded => {
-    if (spaceKey === undefined) {
-      return `${documentId}|${objectId}`;
-    } else {
-      return `${V1_PREFIX}|${spaceKey}|${documentId}|${objectId}`;
-    }
-  },
+export const idCodec = {
+  encode: ({ documentId, objectId }: ObjectPointerDecoded): ObjectPointerEncoded => `${documentId}|${objectId}`,
   decode: (id: ObjectPointerEncoded): ObjectPointerDecoded => {
-    if (id.startsWith(V1_PREFIX)) {
-      const [_, spaceKey, documentId, objectId] = id.split('|');
-      return { spaceKey, documentId, objectId };
-    } else {
-      const [documentId, objectId] = id.split('|');
-      return { spaceKey: undefined, documentId, objectId };
-    }
-  },
-  getVersion: (id: ObjectPointerEncoded): ObjectPointerVersion => {
-    if (id.startsWith(V1_PREFIX)) {
-      return ObjectPointerVersion.V1;
-    } else {
-      return ObjectPointerVersion.V0;
-    }
-  },
-  convertV1ToV0: (id: ObjectPointerEncoded): ObjectPointerEncoded => {
-    const { documentId, objectId } = objectPointerCodec.decode(id);
-    return objectPointerCodec.encode({ documentId, objectId, spaceKey: undefined });
+    const [documentId, objectId] = id.split('|');
+    return { documentId, objectId };
   },
 };

package/src/proto/dxos/agent/functions.proto

@@ -14,13 +14,14 @@ message FunctionsConfig {
   optional string manifest = 2;
 }
 
+// TODO(burdon): Reconcile with typedefs.
 message Function {
-  string id = 1;
-  string route = 2;
+  string name = 1;
 }
 
 message RegisterRequest {
   string endpoint = 1;
+  repeated Function functions = 2;
 }
 
 message RegisterResponse {
@@ -28,17 +29,11 @@ message RegisterResponse {
   string endpoint = 2;
 }
 
-message UpdateRegistrationRequest {
-  string registration_id = 1;
-  repeated Function functions = 2;
-}
-
 message UnregisterRequest {
   string registration_id = 1;
 }
 
 service FunctionRegistryService {
   rpc Register(RegisterRequest) returns (RegisterResponse) {}
-  rpc UpdateRegistration(UpdateRegistrationRequest) returns (google.protobuf.Empty) {}
   rpc Unregister(UnregisterRequest) returns (google.protobuf.Empty) {}
 }

package/src/proto/dxos/halo/credentials.proto

@@ -170,13 +170,13 @@ message DeviceProfileDocument {
 
   optional string platform = 2;
   optional string platform_version = 3;
-  optional string architecture = 4;
+  optional string architecture = 4; 
   optional string os = 5;
   optional string os_version = 6;
   optional DeviceType type = 7;
 }
 
-/// [ASSERTION]: Sets device profile information.
+/// [ASSERTION]: Sets device profile information. 
 message DeviceProfile {
   DeviceProfileDocument profile = 1;
 }

package/src/proto/gen/dxos/agent/functions.ts

@@ -82,8 +82,7 @@ export interface FunctionsConfig {
  *   {@link file://./../../../dxos/agent/functions.proto}
  */
 export interface Function {
-    id: string;
-    route: string;
+    name: string;
 }
 /**
  * Defined in:
@@ -91,6 +90,7 @@ export interface Function {
  */
 export interface RegisterRequest {
     endpoint: string;
+    functions?: Function[];
 }
 /**
  * Defined in:
@@ -100,14 +100,6 @@ export interface RegisterResponse {
     registrationId: string;
     endpoint: string;
 }
-/**
- * Defined in:
- *   {@link file://./../../../dxos/agent/functions.proto}
- */
-export interface UpdateRegistrationRequest {
-    registrationId: string;
-    functions?: Function[];
-}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/agent/functions.proto}
@@ -121,6 +113,5 @@ export interface UnregisterRequest {
  */
 export interface FunctionRegistryService {
     register: (request: RegisterRequest, options?: RequestOptions) => Promise<RegisterResponse>;
-    updateRegistration: (request: UpdateRegistrationRequest, options?: RequestOptions) => Promise<void>;
     unregister: (request: UnregisterRequest, options?: RequestOptions) => Promise<void>;
 }

package/src/proto/gen/dxos/devtools/host.ts

@@ -61,37 +61,6 @@ import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";
 import * as example_testing_rpc from "../../example/testing/rpc";
 import * as google_protobuf from "../../google/protobuf";
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface Services {
-    spaces?: SpaceStats[];
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface SpaceStats {
-    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
-    peers?: PeerStats[];
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface PeerStats {
-    controlFeed: FeedStats;
-    dataFeed: FeedStats;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface FeedStats {
-    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
-    length: number;
-}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/devtools/host.proto}
@@ -514,3 +483,34 @@ export interface SubscribeToSwarmInfoRequest {
 export interface SubscribeToSwarmInfoResponse {
     data?: dxos_devtools_swarm.SwarmInfo[];
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface Services {
+    spaces?: SpaceStats[];
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface SpaceStats {
+    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    peers?: PeerStats[];
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface PeerStats {
+    controlFeed: FeedStats;
+    dataFeed: FeedStats;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface FeedStats {
+    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    length: number;
+}

package/src/proto/gen/google/protobuf.ts

@@ -80,14 +80,14 @@ export enum NullValue {
 export interface ListValue {
     values?: Value[];
 }
-export interface Timestamp {
-    seconds: string;
-    nanos: number;
-}
 export interface Any {
     type_url: string;
     value: Uint8Array;
 }
+export interface Timestamp {
+    seconds: string;
+    nanos: number;
+}
 export interface FileDescriptorSet {
     file?: FileDescriptorProto[];
 }