fix(core): update

2023-07-25 11:33:13 +02:00
parent b5fcefa93b
commit 4ccbc004db
33 changed files with 5028 additions and 11607 deletions
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartuniverse',
+  version: '1.0.107',
+  description: 'messaging service for your micro services'
+}
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,16 +1,16 @@
 // Client classes
-export * from './smartuniverse.classes.client.universe';
-export * from './smartuniverse.classes.client.universechannel';
-export * from './smartuniverse.classes.client.universemessage';
+export * from './smartuniverse.classes.client.universe.js';
+export * from './smartuniverse.classes.client.universechannel.js';
+export * from './smartuniverse.classes.client.universemessage.js';

 // Server classes
-export * from './smartuniverse.classes.universe';
-export * from './smartuniverse.classes.universecache';
-export * from './smartuniverse.classes.universechannel';
-export * from './smartuniverse.classes.universemessage';
+export * from './smartuniverse.classes.universe.js';
+export * from './smartuniverse.classes.universecache.js';
+export * from './smartuniverse.classes.universechannel.js';
+export * from './smartuniverse.classes.universemessage.js';

 // Reaction Response
-export * from './smartuniverse.classes.event.reactionrequest';
-export * from './smartuniverse.classes.event.reactionresponse';
+export * from './smartuniverse.classes.event.reactionrequest.js';
+export * from './smartuniverse.classes.event.reactionresponse.js';

-export * from './interfaces';
+export * from './interfaces/index.js';
--- a/ts/interfaces/index.ts
+++ b/ts/interfaces/index.ts
@ -1,5 +1,5 @@
-export * from './http.interfaces';
-export * from './socketfunctionrequests';
-export * from './universechannel.interfaces';
-export * from './universemessage.interfaces';
-export * from './universeactions.interfaces';
+export * from './http.interfaces.js';
+export * from './socketfunctionrequests.js';
+export * from './universechannel.interfaces.js';
+export * from './universemessage.interfaces.js';
+export * from './universeactions.interfaces.js';
--- a/ts/interfaces/socketfunctionrequests.ts
+++ b/ts/interfaces/socketfunctionrequests.ts
@ -1,4 +1,4 @@
-import * as interfaces from './index';
+import * as interfaces from './index.js';

 export interface ISocketRequest_SubscribeChannel {
  method: 'subscribeChannel';
--- a/ts/smartuniverse.classes.client.universe.ts
+++ b/ts/smartuniverse.classes.client.universe.ts
@ -1,14 +1,11 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';
+import { Smartsocket, SmartsocketClient } from '@push.rocks/smartsocket';

-import { Observable } from 'rxjs';
-import { Smartsocket, SmartsocketClient } from '@pushrocks/smartsocket';
-import * as url from 'url';
+import * as interfaces from './interfaces/index.js';

-import * as interfaces from './interfaces';
-
-import { ClientUniverseChannel, ClientUniverseMessage } from '.';
-import { ClientUniverseCache } from './smartuniverse.classes.client.universecache';
-import { logger } from './smartuniverse.logging';
+import { ClientUniverseChannel, ClientUniverseMessage } from './index.js';
+import { ClientUniverseCache } from './smartuniverse.classes.client.universecache.js';
+import { logger } from './smartuniverse.logging.js';

 export interface IClientOptions {
  serverAddress: string;
@ -57,7 +54,7 @@ export class ClientUniverse {
   * @param passphraseArg
   */
  public getChannel(channelName: string): ClientUniverseChannel {
-    const clientUniverseChannel = this.clientUniverseCache.channelMap.find((channel) => {
+    const clientUniverseChannel = this.clientUniverseCache.channelMap.findSync((channel) => {
      return channel.name === channelName;
    });
    return clientUniverseChannel;
@ -68,7 +65,7 @@ export class ClientUniverse {
   * @param messageArg
   */
  public removeChannel(channelNameArg, notifyServer = true) {
-    const clientUniverseChannel = this.clientUniverseCache.channelMap.findOneAndRemove(
+    const clientUniverseChannel = this.clientUniverseCache.channelMap.findOneAndRemoveSync(
      (channelItemArg) => {
        return channelItemArg.name === channelNameArg;
      }
@ -93,12 +90,10 @@ export class ClientUniverse {
   */
  private async checkConnection(): Promise<void> {
    if (!this.smartsocketClient) {
-      const parsedURL = url.parse(this.options.serverAddress);
+      const parsedURL = plugins.smarturl.Smarturl.createFromUrl(this.options.serverAddress);
      const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = {
        alias: 'universeclient',
-        password: 'UniverseClient',
        port: parseInt(parsedURL.port, 10),
-        role: 'UniverseClient',
        url: parsedURL.protocol + '//' + parsedURL.hostname,
      };
      this.smartsocketClient = new SmartsocketClient(socketConfig);
@ -117,9 +112,8 @@ export class ClientUniverse {
       */
      const socketFunctionUnsubscribe = new plugins.smartsocket.SocketFunction({
        funcName: 'unsubscribe',
-        allowedRoles: [],
        funcDef: async (dataArg: interfaces.IServerUnsubscribeActionPayload) => {
-          const channel = this.clientUniverseCache.channelMap.find((channelArg) => {
+          const channel = this.clientUniverseCache.channelMap.findSync((channelArg) => {
            return channelArg.name === dataArg.name;
          });
          if (channel) {
@ -132,32 +126,29 @@ export class ClientUniverse {
      /**
       * handles message reception
       */
-      const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<
-        interfaces.ISocketRequest_ProcessMessage
-      >({
-        funcName: 'processMessage',
-        allowedRoles: [],
-        funcDef: async (messageDescriptorArg) => {
-          logger.log('info', 'Got message from server');
-          const clientUniverseMessage = ClientUniverseMessage.createMessageFromMessageDescriptor(
-            messageDescriptorArg
-          );
-          this.messageRxjsSubject.next(clientUniverseMessage);
+      const socketFunctionProcessMessage =
+        new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_ProcessMessage>({
+          funcName: 'processMessage',
+          funcDef: async (messageDescriptorArg) => {
+            logger.log('info', 'Got message from server');
+            const clientUniverseMessage =
+              ClientUniverseMessage.createMessageFromMessageDescriptor(messageDescriptorArg);
+            this.messageRxjsSubject.next(clientUniverseMessage);

-          // lets find the corresponding channel
-          const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName);
-          if (targetChannel) {
-            await targetChannel.emitMessageLocally(clientUniverseMessage);
-            return {
-              messageStatus: 'ok',
-            };
-          } else {
-            return {
-              messageStatus: 'channel not found',
-            };
-          }
-        },
-      });
+            // lets find the corresponding channel
+            const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName);
+            if (targetChannel) {
+              await targetChannel.emitMessageLocally(clientUniverseMessage);
+              return {
+                messageStatus: 'ok',
+              };
+            } else {
+              return {
+                messageStatus: 'channel not found',
+              };
+            }
+          },
+        });

      // add functions
      this.smartsocketClient.addSocketFunction(socketFunctionUnsubscribe);
--- a/ts/smartuniverse.classes.client.universecache.ts
+++ b/ts/smartuniverse.classes.client.universecache.ts
@ -1,5 +1,5 @@
-import * as plugins from './smartuniverse.plugins';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel';
+import * as plugins from './smartuniverse.plugins.js';
+import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';

 /**
 * a cache for clients
--- a/ts/smartuniverse.classes.client.universechannel.ts
+++ b/ts/smartuniverse.classes.client.universechannel.ts
@ -1,10 +1,10 @@
-import * as plugins from './smartuniverse.plugins';
-import * as interfaces from './interfaces';
+import * as plugins from './smartuniverse.plugins.js';
+import * as interfaces from './interfaces/index.js';

-import { ClientUniverse } from '.';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage';
-import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest';
-import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse';
+import { ClientUniverse } from './index.js';
+import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
+import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest.js';
+import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';

 export class ClientUniverseChannel implements interfaces.IUniverseChannel {
  // ======
@ -69,12 +69,14 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
  public async populateSubscriptionToServer() {
    // lets make sure the channel is connected
    if (this.status === 'unsubscribed') {
-      const response = await this.clientUniverseRef.smartsocketClient.serverCall<
-        interfaces.ISocketRequest_SubscribeChannel
-      >('subscribeChannel', {
-        name: this.name,
-        passphrase: this.passphrase,
-      });
+      const response =
+        await this.clientUniverseRef.smartsocketClient.serverCall<interfaces.ISocketRequest_SubscribeChannel>(
+          'subscribeChannel',
+          {
+            name: this.name,
+            passphrase: this.passphrase,
+          }
+        );
      this.status = response.subscriptionStatus;
    }
  }
--- a/ts/smartuniverse.classes.client.universemessage.ts
+++ b/ts/smartuniverse.classes.client.universemessage.ts
@ -1,6 +1,6 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';

-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';

 export class ClientUniverseMessage<T> implements interfaces.IUniverseMessage {
  // ======
--- a/ts/smartuniverse.classes.event.broadcastevent.ts
+++ b/ts/smartuniverse.classes.event.broadcastevent.ts
@ -1,4 +1,4 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';

 /**
 * broadcasts an event to multiple channels
--- a/ts/smartuniverse.classes.event.reactionrequest.ts
+++ b/ts/smartuniverse.classes.event.reactionrequest.ts
@ -1,9 +1,9 @@
-import * as plugins from './smartuniverse.plugins';
-import { UniverseChannel } from './smartuniverse.classes.universechannel';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel';
-import { ReactionResult } from './smartuniverse.classes.event.reactionresult';
-import { UniverseMessage } from './smartuniverse.classes.universemessage';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage';
+import * as plugins from './smartuniverse.plugins.js';
+import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
+import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
+import { ReactionResult } from './smartuniverse.classes.event.reactionresult.js';
+import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
+import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';

 export interface IReactionRequestConstructorOptions<
  T extends plugins.typedrequestInterfaces.ITypedRequest
--- a/ts/smartuniverse.classes.event.reactionresponse.ts
+++ b/ts/smartuniverse.classes.event.reactionresponse.ts
@ -1,10 +1,10 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';

-import { ICombinatorPayload } from './smartuniverse.classes.event.reactionrequest';
-import { UniverseChannel } from './smartuniverse.classes.universechannel';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel';
-import { UniverseMessage } from './smartuniverse.classes.universemessage';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage';
+import { type ICombinatorPayload } from './smartuniverse.classes.event.reactionrequest.js';
+import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
+import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
+import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
+import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';

 export type TReactionResponseFuncDef<T extends plugins.typedrequestInterfaces.ITypedRequest> = (
  dataArg: T['request']
--- a/ts/smartuniverse.classes.event.reactionresult.ts
+++ b/ts/smartuniverse.classes.event.reactionresult.ts
@ -1,5 +1,5 @@
-import * as plugins from './smartuniverse.plugins';
-import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse';
+import * as plugins from './smartuniverse.plugins.js';
+import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';

 export class ReactionResult<T extends plugins.typedrequestInterfaces.ITypedRequest> {
  private resultReplaySubject = new plugins.smartrx.rxjs.ReplaySubject<T['response']>();
--- a/ts/smartuniverse.classes.universe.ts
+++ b/ts/smartuniverse.classes.universe.ts
@ -1,16 +1,15 @@
-import * as plugins from './smartuniverse.plugins';
-import * as pluginsTyped from './smartuniverse.pluginstyped';
+import * as plugins from './smartuniverse.plugins.js';
+import * as pluginsTyped from './smartuniverse.pluginstyped.js';

-import { Handler, Route, Server } from '@pushrocks/smartexpress';
-import { UniverseCache, UniverseChannel, UniverseMessage } from './';
+import { UniverseCache, UniverseChannel, UniverseMessage } from './index.js';

-import * as interfaces from './interfaces';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection';
-import { logger } from './smartuniverse.logging';
+import * as interfaces from './interfaces/index.js';
+import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
+import { logger } from './smartuniverse.logging.js';

 export interface ISmartUniverseConstructorOptions {
  messageExpiryInMilliseconds: number;
-  externalServer?: pluginsTyped.smartexpress.Server;
+  externalServer?: pluginsTyped.typedserver.servertools.Server;
 }

 /**
@ -26,7 +25,7 @@ export class Universe {
  /**
   * the smartexpress server used
   */
-  private smartexpressServer: pluginsTyped.smartexpress.Server;
+  private server: pluginsTyped.typedserver.servertools.Server;

  /**
   * the smartsocket used
@ -69,7 +68,7 @@ export class Universe {
   * returns a channel
   */
  public getChannel(channelNameArg: string) {
-    return this.universeCache.channelMap.find((channelArg) => {
+    return this.universeCache.channelMap.findSync((channelArg) => {
      return channelArg.name === channelNameArg;
    });
  }
@ -86,44 +85,35 @@ export class Universe {

    // add websocket upgrade
    this.smartsocket = new plugins.smartsocket.Smartsocket({
-      port: portArg
+      alias: 'smartuniverse',
+      port: portArg,
    });

    // lets create the base smartexpress server
    if (this.options.externalServer) {
      console.log('Universe is using externally supplied server');
-      this.smartsocket.setExternalServer('smartexpress' ,this.options.externalServer);
+      this.smartsocket.setExternalServer('smartexpress', this.options.externalServer);
    }

-    // add a role for the clients
-    const ClientRole = new plugins.smartsocket.SocketRole({
-      name: 'UniverseClient',
-      passwordHash: await plugins.isohash.sha256FromString('UniverseClient'), // authentication happens on another level
-    });

-    // add the role to smartsocket
-    this.smartsocket.addSocketRoles([ClientRole]);
+    const socketFunctionSubscription =
+      new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_SubscribeChannel>({
+        funcName: 'subscribeChannel',
+        funcDef: async (dataArg, socketConnectionArg) => {
+          const universeConnection = new UniverseConnection({
+            universe: this,
+            socketConnection: socketConnectionArg,
+            authenticationRequests: [dataArg],
+          });
+          await UniverseConnection.addConnectionToCache(this, universeConnection);
+          return {
+            subscriptionStatus: 'subscribed',
+          };
+        },
+      });

-    const socketFunctionSubscription = new plugins.smartsocket.SocketFunction<
-      interfaces.ISocketRequest_SubscribeChannel
-    >({
-      allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
-      funcName: 'subscribeChannel',
-      funcDef: async (dataArg, socketConnectionArg) => {
-        const universeConnection = new UniverseConnection({
-          universe: this,
-          socketConnection: socketConnectionArg,
-          authenticationRequests: [dataArg],
-        });
-        await UniverseConnection.addConnectionToCache(this, universeConnection);
-        return {
-          subscriptionStatus: 'subscribed',
-        };
-      },
-    });
-
-    const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<any>({ // TODO proper ITypedRequest here instead of any
-      allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
+    const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<any>({
+      // TODO proper ITypedRequest here instead of any
      funcName: 'processMessage',
      funcDef: async (messageDataArg: interfaces.IUniverseMessage, socketConnectionArg) => {
        const universeConnection = UniverseConnection.findUniverseConnectionBySocketConnection(
--- a/ts/smartuniverse.classes.universecache.ts
+++ b/ts/smartuniverse.classes.universecache.ts
@ -1,14 +1,11 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';

-import { UniverseChannel } from './smartuniverse.classes.universechannel';
-import { UniverseMessage } from './smartuniverse.classes.universemessage';
+import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
+import { UniverseMessage } from './smartuniverse.classes.universemessage.js';

-import { ObjectMap } from '@pushrocks/lik';
-
-import { Observable, from } from 'rxjs';
-import { filter } from 'rxjs/operators';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection';
-import { Universe } from './smartuniverse.classes.universe';
+import { ObjectMap } from '@push.rocks/lik';
+import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
+import { Universe } from './smartuniverse.classes.universe.js';

 /**
 * universe store handles the creation, storage and retrieval of messages.
@ -68,9 +65,9 @@ export class UniverseCache {
  public readMessagesYoungerThan(
    unixTimeArg?: number,
    channelName?: string
-  ): Observable<UniverseMessage<any>> {
-    const messageObservable = from(this.messageMap.getArray()).pipe(
-      filter((messageArg) => {
+  ): plugins.smartrx.rxjs.Observable<UniverseMessage<any>> {
+    const messageObservable = plugins.smartrx.rxjs.from(this.messageMap.getArray()).pipe(
+      plugins.smartrx.rxjs.ops.filter((messageArg) => {
        return messageArg.smartTimestamp.isYoungerThanMilliSeconds(this.destructionTime);
      })
    );
--- a/ts/smartuniverse.classes.universechannel.ts
+++ b/ts/smartuniverse.classes.universechannel.ts
@ -1,11 +1,11 @@
-import * as plugins from './smartuniverse.plugins';
-import * as interfaces from './interfaces';
+import * as plugins from './smartuniverse.plugins.js';
+import * as interfaces from './interfaces/index.js';

-import { UniverseCache } from './smartuniverse.classes.universecache';
-import { UniverseMessage } from './smartuniverse.classes.universemessage';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection';
-import { Universe } from './smartuniverse.classes.universe';
-import { logger } from './smartuniverse.logging';
+import { UniverseCache } from './smartuniverse.classes.universecache.js';
+import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
+import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
+import { Universe } from './smartuniverse.classes.universe.js';
+import { logger } from './smartuniverse.logging.js';

 /**
 * enables messages to stay within a certain scope.
@ -34,7 +34,7 @@ export class UniverseChannel {
   * returns boolean wether certain channel exists
   */
  public static async doesChannelExists(universeCacheArg: UniverseCache, channelNameArg: string) {
-    const channel = universeCacheArg.channelMap.find((channelArg) => {
+    const channel = universeCacheArg.channelMap.findSync((channelArg) => {
      return channelArg.name === channelNameArg;
    });
    if (channel) {
@ -55,7 +55,7 @@ export class UniverseChannel {
    universeCacheArg: UniverseCache,
    universeMessageArg: UniverseMessage<any>
  ): UniverseChannel {
-    const foundChannel = universeCacheArg.channelMap.find((universeChannel) => {
+    const foundChannel = universeCacheArg.channelMap.findSync((universeChannel) => {
      const result = universeChannel.authenticate(universeMessageArg);
      return result;
    });
@ -73,7 +73,7 @@ export class UniverseChannel {
  }

  public static getUniverseChannelByName(universeRef: Universe, universeChannelName: string) {
-    return universeRef.universeCache.channelMap.find((channelArg) => {
+    return universeRef.universeCache.channelMap.findSync((channelArg) => {
      return channelArg.name === universeChannelName;
    });
  }
--- a/ts/smartuniverse.classes.universeconnection.ts
+++ b/ts/smartuniverse.classes.universeconnection.ts
@ -1,8 +1,8 @@
-import * as plugins from './smartuniverse.plugins';
-import * as interfaces from './interfaces';
-import { UniverseChannel } from './smartuniverse.classes.universechannel';
-import { UniverseCache } from './smartuniverse.classes.universecache';
-import { Universe } from './smartuniverse.classes.universe';
+import * as plugins from './smartuniverse.plugins.js';
+import * as interfaces from './interfaces/index.js';
+import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
+import { UniverseCache } from './smartuniverse.classes.universecache.js';
+import { Universe } from './smartuniverse.classes.universe.js';

 /**
 * represents a connection to the universe
@ -87,7 +87,7 @@ export class UniverseConnection {
    universeCache: UniverseCache,
    socketConnectionArg: plugins.smartsocket.SocketConnection
  ): UniverseConnection {
-    const universeConnection = universeCache.connectionMap.find((universeConnectionArg) => {
+    const universeConnection = universeCache.connectionMap.findSync((universeConnectionArg) => {
      return universeConnectionArg.socketConnection === socketConnectionArg;
    });
    return universeConnection;
--- a/ts/smartuniverse.classes.universemessage.ts
+++ b/ts/smartuniverse.classes.universemessage.ts
@ -1,10 +1,10 @@
-import * as plugins from './smartuniverse.plugins';
-import * as interfaces from './interfaces';
-import { Universe } from './smartuniverse.classes.universe';
-import { UniverseChannel } from './smartuniverse.classes.universechannel';
-import { UniverseCache } from './smartuniverse.classes.universecache';
-import { SocketConnection } from '@pushrocks/smartsocket';
-import { logger } from './smartuniverse.logging';
+import * as plugins from './smartuniverse.plugins.js';
+import * as interfaces from './interfaces/index.js';
+import { Universe } from './smartuniverse.classes.universe.js';
+import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
+import { UniverseCache } from './smartuniverse.classes.universecache.js';
+import { SocketConnection } from '@push.rocks/smartsocket';
+import { logger } from './smartuniverse.logging.js';

 /**
 * represents a message within a universe
--- a/ts/smartuniverse.logging.ts
+++ b/ts/smartuniverse.logging.ts
@ -1,2 +1,2 @@
-import * as plugins from './smartuniverse.plugins';
+import * as plugins from './smartuniverse.plugins.js';
 export const logger = new plugins.smartlog.ConsoleLog();
--- a/ts/smartuniverse.plugins.ts
+++ b/ts/smartuniverse.plugins.ts
@ -4,24 +4,26 @@ import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
 export { typedrequestInterfaces };

 // pushrocks scope
-import * as lik from '@pushrocks/lik';
-import * as isohash from '@pushrocks/isohash';
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartrx from '@pushrocks/smartrx';
-import * as smartsocket from '@pushrocks/smartsocket';
-import * as smarttime from '@pushrocks/smarttime';
-import * as isounique from '@pushrocks/isounique';
+import * as lik from '@push.rocks/lik';
+import * as isohash from '@push.rocks/isohash';
+import * as isounique from '@push.rocks/isounique';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrx from '@push.rocks/smartrx';
+import * as smartsocket from '@push.rocks/smartsocket';
+import * as smarttime from '@push.rocks/smarttime';
+import * as smarturl from '@push.rocks/smarturl';

 export {
  lik,
  isohash,
+  isounique,
  smartdelay,
  smartlog,
  smartpromise,
  smartrx,
  smartsocket,
  smarttime,
-  isounique,
+  smarturl,
 };
--- a/ts/smartuniverse.pluginstyped.ts
+++ b/ts/smartuniverse.pluginstyped.ts
@ -1,5 +1,5 @@
-import type * as smartexpress from '@pushrocks/smartexpress';
+import type * as typedserver from '@apiglobal/typedserver';

-export {
-  smartexpress
-};
+export type {
+  typedserver
+};