@shaxpir/duiduidui-models 1.24.3 → 1.25.0

package/dist/models/Chat.js

@@ -69,8 +69,8 @@ class Chat extends SharedContent_1.SharedContent {
                     workspace.release();
                 }
             }
-            catch {
-                // Workspace may not exist yet for this user
+            catch (err) {
+                this.shareSync.onError(err, 'Chat.modelUpdated.workspaceStub');
             }
         }
     }

package/dist/models/SharedContent.js

@@ -30,12 +30,16 @@ class SharedContent extends Content_1.Content {
         this.acquire();
         const userIds = this.getAllSharedUserIds();
         for (const userId of userIds) {
-            const manifestId = Manifest_1.Manifest.makeManifestId(userId);
-            const manifest = this.shareSync.load(ContentKind_1.ContentKind.MANIFEST, manifestId);
-            if (manifest) {
-                await manifest.acquire();
-                manifest.update(this);
-                manifest.release();
+            try {
+                const manifestId = Manifest_1.Manifest.makeManifestId(userId);
+                const manifest = await this.shareSync.acquire(ContentKind_1.ContentKind.MANIFEST, manifestId);
+                if (manifest && manifest.exists()) {
+                    manifest.update(this);
+                    manifest.release();
+                }
+            }
+            catch (err) {
+                this.shareSync.onError(err, 'SharedContent.modelUpdated.manifest');
             }
         }
         this.release();

package/dist/repo/ShareSync.d.ts

@@ -17,6 +17,7 @@ export interface ShareSyncOptions {
     connectionListener: ConnectionListener;
     urlProvider: () => Promise<string>;
     opErrorCallback: (error?: any) => void;
+    errorCallback?: (error: any, context: string) => void;
     onReadyCallback?: () => void;
     pingInterval?: number;
     encryptionKey?: string;
@@ -53,6 +54,7 @@ export declare class ShareSync {
     private _debug;
     private _disposalStrategy;
     private _opErrorCallback;
+    private _errorCallback;
     private _modelCache;
     private _encryption;
     private _hasDurableStore;
@@ -94,6 +96,7 @@ export declare class ShareSync {
     isDocInInventory(kind: ContentKind, ref: ContentRef, minVersion?: CompactDateTime): boolean;
     dispose(model: Model): void;
     onOperationError(opError: any): void;
+    onError(error: any, context: string): void;
     private wrap;
     /**
      * Flush control methods for optimizing bulk write operations

package/dist/repo/ShareSync.js

@@ -121,6 +121,7 @@ class ShareSync {
         shareSync._debug = options.debug;
         shareSync._disposalStrategy = options.disposalStrategy;
         shareSync._opErrorCallback = options.opErrorCallback;
+        shareSync._errorCallback = options.errorCallback || null;
         shareSync._hasDurableStore = options.enableDurableStore === true && options.namespace && options.namespace.length > 0;
         shareSync._useDurableStoreEncryption = options.encryptionKey && options.encryptionKey.length > 0;
         shareSync._durableStoreEncryptionKey = options.encryptionKey;
@@ -324,7 +325,7 @@ class ShareSync {
         shareSync.isDebug() && console.log(`created content ${compoundKey}`);
         const content = shareSync.wrap(body.meta.kind, doc, true);
         this._modelCache.set(compoundKey, content);
-        this.updateManifestForContent(content);
+        content.modelUpdated();
         return content;
     }
     async acquire(kind, id, timestamp) {
@@ -474,6 +475,11 @@ class ShareSync {
     onOperationError(opError) {
         this._opErrorCallback && this._opErrorCallback(opError);
     }
+    onError(error, context) {
+        if (this._errorCallback) {
+            this._errorCallback(error, context);
+        }
+    }
     wrap(kind, doc, shouldAcquire) {
         const shareSync = this;
         if (kind === ContentKind_1.ContentKind.BILLING) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.24.3",
+  "version": "1.25.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"